public inbox for gentoo-commits@lists.gentoo.org
 help / color / mirror / Atom feed
* [gentoo-commits] repo/proj/guru:dev commit in: media-gfx/zwcad/
@ 2022-06-02  7:34 Rui Huang
  0 siblings, 0 replies; 9+ messages in thread
From: Rui Huang @ 2022-06-02  7:34 UTC (permalink / raw
  To: gentoo-commits

commit:     3eb98fd2a9ca186c41ee83b2de717bdfc003f6d1
Author:     Huang Rui <vowstar <AT> gmail <DOT> com>
AuthorDate: Thu Jun  2 07:34:18 2022 +0000
Commit:     Rui Huang <vowstar <AT> gmail <DOT> com>
CommitDate: Thu Jun  2 07:34:18 2022 +0000
URL:        https://gitweb.gentoo.org/repo/proj/guru.git/commit/?id=3eb98fd2

media-gfx/zwcad: new package, add 2022.22.2.2.3

Signed-off-by: Huang Rui <vowstar <AT> gmail.com>

 media-gfx/zwcad/Manifest                   |   2 +
 media-gfx/zwcad/metadata.xml               |  21 ++++++
 media-gfx/zwcad/zwcad-2022.22.2.2.3.ebuild | 107 +++++++++++++++++++++++++++++
 3 files changed, 130 insertions(+)

diff --git a/media-gfx/zwcad/Manifest b/media-gfx/zwcad/Manifest
new file mode 100644
index 000000000..362eed4ab
--- /dev/null
+++ b/media-gfx/zwcad/Manifest
@@ -0,0 +1,2 @@
+DIST zwcad-2022.22.2.2.3.deb 159649900 BLAKE2B 7584f2e4ed61b4f29a75a613ba51494230a4f4db9c3ca73ca25656b058bf45ed2ad66cd92ee9238afc1a3dca649d4e90bcb5fef022c65887d3991f2a5c0de246 SHA512 dc9c415bb9d4c66ad943a5b237c3a52ba1f783ae54a37a586942da47b6b68be9e46146716750f181dfc5a4678d71234a0b18f8b216fc619498d4ebd497553fdf
+DIST zwcad-python-3.7.13.tar.bz2 56117484 BLAKE2B b81d58d4c8854c4c014276ef7e03e7a2cc16cd6e5aa50c69ac63346087d527e7083f36ab489530aea59a8e07828e315f53bd5075223471471134842f3c09c084 SHA512 22eaff6624f6dacbc903a033e99738f67faf2e221ba75cd13f201dfb0ec6f1d09e31e7fe82677d8f1f4f5ae732306213c9864c2615d61827316b782dfacceac4

diff --git a/media-gfx/zwcad/metadata.xml b/media-gfx/zwcad/metadata.xml
new file mode 100644
index 000000000..de9f36081
--- /dev/null
+++ b/media-gfx/zwcad/metadata.xml
@@ -0,0 +1,21 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="person">
+		<email>vowstar@gmail.com</email>
+		<name>Huang Rui</name>
+	</maintainer>
+	<longdescription lang="en">
+	The visual computer-aided drawing software based on Linux system developed
+	by Zhongwang Software is compatible with various versions of
+	DWG/DXF/DWF/DWFX files, providing powerful drawing browsing, drawing,
+	editing, marking and printing, as well as intelligent voice,
+	mouse gestures, two-dimensional code functions.
+	</longdescription>
+	<longdescription lang="zh">
+	中望CAD是由中望软件研发的基于Linux系统的可视化计算机辅助绘图软件,可兼容查看各种版本
+	的DWG/DXF/DWF/DWFX文件,提供了强大的图纸浏览、绘制、编辑、标注和打印,以及
+	智能语音、鼠标手势、二维码功能,是目前国内首款基于Linux系统的国产CAD产品,
+	填补了目前国内无基于Linux系统的纯国产CAD产品的空白。
+	</longdescription>
+</pkgmetadata>

diff --git a/media-gfx/zwcad/zwcad-2022.22.2.2.3.ebuild b/media-gfx/zwcad/zwcad-2022.22.2.2.3.ebuild
new file mode 100644
index 000000000..9931adb9d
--- /dev/null
+++ b/media-gfx/zwcad/zwcad-2022.22.2.2.3.ebuild
@@ -0,0 +1,107 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+MY_PGK_NAME="com.zwsoft.zwcad2022"
+inherit desktop unpacker xdg
+
+DESCRIPTION="CAD software for 2D drawing, reviewing and printing work"
+HOMEPAGE="https://www.zwsoft.cn/product/zwcad/linux"
+SRC_URI="
+	https://download.zwcad.com/zwcad/cad_linux/2022/SP2/signed_com.zwsoft.zwcad2022_22.2.2.3_amd64.deb -> ${P}.deb
+	https://anaconda.org/anaconda/python/3.7.13/download/linux-64/python-3.7.13-h12debd9_0.tar.bz2 -> ${PN}-python-3.7.13.tar.bz2
+"
+
+LICENSE="all-rights-reserved"
+SLOT="0"
+KEYWORDS="-* ~amd64"
+
+RESTRICT="strip mirror bindist"
+
+RDEPEND="
+	media-libs/fontconfig
+	media-libs/libglvnd
+	sys-apps/util-linux
+	sys-libs/zlib
+	virtual/libcrypt:=
+"
+
+DEPEND="${RDEPEND}"
+
+BDEPEND="dev-util/patchelf"
+
+S=${WORKDIR}
+
+QA_PREBUILT="*"
+
+src_unpack() {
+	unpack_deb "${DISTDIR}/${P}.deb"
+	tar -xf "${DISTDIR}/${PN}-python-3.7.13.tar.bz2" -C "${S}/opt/apps/"${MY_PGK_NAME}"/files/ZwPyRuntime/python3.7/" || die
+}
+
+src_install() {
+	# Install scalable icons
+	doicon -s scalable "${S}"/opt/apps/${MY_PGK_NAME}/files/Icons/ZWCAD.svg
+
+	# Fix python and QA problems about python
+	rm -rf "${S}/opt/apps/"${MY_PGK_NAME}"/files/ZwPyRuntime/python3.6/" || die
+	rm -rf "${S}/opt/apps/"${MY_PGK_NAME}"/files/libZwPythonLoad6.so" || die
+	rm -rf "${S}/opt/apps/"${MY_PGK_NAME}"/files/ZwPyRuntime/python3.5/" || die
+	rm -rf "${S}/opt/apps/"${MY_PGK_NAME}"/files/libZwPythonLoad5.so" || die
+	rm -rf "${S}/opt/apps/"${MY_PGK_NAME}"/files/ZwPyRuntime/python3.4/" || die
+	rm -rf "${S}/opt/apps/"${MY_PGK_NAME}"/files/libZwPythonLoad4.so" || die
+	rm -rf "${S}/opt/apps/"${MY_PGK_NAME}"/files/ZwPyRuntime/python3.7/compiler_compat" || die
+
+	# Set RPATH for preserve-libs handling
+	pushd "${S}"/opt/apps/${MY_PGK_NAME}/files || die
+	local x
+	for x in $(find) ; do
+		# Use \x7fELF header to separate ELF executables and libraries
+		[[ -f "${x}" && "${x: -2}" != ".o" && $(od -t x1 -N 4 "${x}") == *"7f 45 4c 46"* ]] || continue
+		local RPATH_ROOT="/opt/apps/${MY_PGK_NAME}/files"
+		local RPATH_S="${RPATH_ROOT}/:${RPATH_ROOT}/lib/:${RPATH_ROOT}/lib/mono/lib/:${RPATH_ROOT}/plugins/:${RPATH_ROOT}/zh-CN/:${RPATH_ROOT}/ZwPyRuntime/python3.7/lib"
+		patchelf --set-rpath "${RPATH_S}" "${x}" || \
+			die "patchelf failed on ${x}"
+	done
+	popd || die
+
+	# Fix desktop files
+	sed -E -i 's/^Exec=.*$/Exec=zwcad %F/g' "${S}/opt/apps/${MY_PGK_NAME}/entries/applications/com.zwsoft.zwcad.desktop" || die
+	sed -E -i 's/^Icon=.*$/Icon=ZWCAD/g' "${S}/opt/apps/${MY_PGK_NAME}/entries/applications/com.zwsoft.zwcad.desktop" || die
+	sed -E -i 's/Application;//g' "${S}/opt/apps/${MY_PGK_NAME}/entries/applications/com.zwsoft.zwcad.desktop" || die
+	# The Version entry in a .desktop file doesn't refer to the version of the
+	# target program. It's the version of the desktop file specification that
+	# this desktop file conforms to.
+	sed -E -i 's/^Version=.*$/Version=1.0/g' "${S}/opt/apps/${MY_PGK_NAME}/entries/applications/com.zwsoft.zwcad.desktop" || die
+	sed -E -i 's/^Categories=.*$/Categories=Graphics;VectorGraphics;Engineering;Construction;2DGraphics;/g' "${S}/opt/apps/${MY_PGK_NAME}/entries/applications/com.zwsoft.zwcad.desktop" || die
+	domenu "${S}/opt/apps/${MY_PGK_NAME}/entries/applications/com.zwsoft.zwcad.desktop"
+
+	# Add zw3d command
+	mkdir -p "${S}"/usr/bin/ || die
+
+	cat >> "${S}"/opt/apps/${MY_PGK_NAME}/zwcad <<- EOF || die
+#!/bin/sh
+export MONO_PATH=/opt/apps/${MY_PGK_NAME}/files/lib/mono/lib/mono/4.5
+sh /opt/apps/${MY_PGK_NAME}/files/ZWCADRUN.sh \$*
+	EOF
+
+	ln -s /opt/apps/${MY_PGK_NAME}/zwcad "${S}"/usr/bin/zwcad || die
+
+	# Install package and fix permissions
+	insinto /opt/apps/
+	doins -r opt/apps/${MY_PGK_NAME}
+	insinto /usr
+	doins -r usr/*
+
+	fperms 0755 /opt/apps/${MY_PGK_NAME}/zwcad
+
+	pushd "${S}" || die
+	for x in $(find "opt/apps/${MY_PGK_NAME}") ; do
+		# Fix shell script permissions
+		[[ "${x: -3}" == ".sh" ]] && fperms 0755 "/${x}"
+		# Use \x7fELF header to separate ELF executables and libraries
+		[[ -f ${x} && $(od -t x1 -N 4 "${x}") == *"7f 45 4c 46"* ]] && fperms 0755 "/${x}"
+	done
+	popd || die
+}


^ permalink raw reply related	[flat|nested] 9+ messages in thread

* [gentoo-commits] repo/proj/guru:dev commit in: media-gfx/zwcad/
@ 2022-06-02  9:15 Rui Huang
  0 siblings, 0 replies; 9+ messages in thread
From: Rui Huang @ 2022-06-02  9:15 UTC (permalink / raw
  To: gentoo-commits

commit:     71c6721b890bf8fffb2b877fee660dfa6dd0606a
Author:     Huang Rui <vowstar <AT> gmail <DOT> com>
AuthorDate: Thu Jun  2 09:09:57 2022 +0000
Commit:     Rui Huang <vowstar <AT> gmail <DOT> com>
CommitDate: Thu Jun  2 09:15:02 2022 +0000
URL:        https://gitweb.gentoo.org/repo/proj/guru.git/commit/?id=71c6721b

media-gfx/zwcad: fix fcitx problem and start script

Signed-off-by: Huang Rui <vowstar <AT> gmail.com>

 media-gfx/zwcad/zwcad-2022.22.2.2.3.ebuild | 18 ++++++++++++++++++
 1 file changed, 18 insertions(+)

diff --git a/media-gfx/zwcad/zwcad-2022.22.2.2.3.ebuild b/media-gfx/zwcad/zwcad-2022.22.2.2.3.ebuild
index 9931adb9d..6c50bfc2c 100644
--- a/media-gfx/zwcad/zwcad-2022.22.2.2.3.ebuild
+++ b/media-gfx/zwcad/zwcad-2022.22.2.2.3.ebuild
@@ -77,11 +77,29 @@ src_install() {
 	sed -E -i 's/^Categories=.*$/Categories=Graphics;VectorGraphics;Engineering;Construction;2DGraphics;/g' "${S}/opt/apps/${MY_PGK_NAME}/entries/applications/com.zwsoft.zwcad.desktop" || die
 	domenu "${S}/opt/apps/${MY_PGK_NAME}/entries/applications/com.zwsoft.zwcad.desktop"
 
+	sed -i "1i\\export MONO_PATH=/opt/apps/${MY_PGK_NAME}/files/lib/mono/lib/mono/4.5\n" "${S}/opt/apps/${MY_PGK_NAME}/files/ZWCADRUN.sh" || die
+	sed -E -i 's/export QT_IM_MODULE=fcitx//g' "${S}/opt/apps/${MY_PGK_NAME}/files/ZWCADRUN.sh" || die
+
 	# Add zw3d command
 	mkdir -p "${S}"/usr/bin/ || die
 
 	cat >> "${S}"/opt/apps/${MY_PGK_NAME}/zwcad <<- EOF || die
 #!/bin/sh
+if [ -z "\${QT_IM_MODULE}" ]
+then
+	if [ -n "\$(pidof fcitx5)" ]
+	then
+		export XMODIFIERS="@im=fcitx5"
+		export QT_IM_MODULE=fcitx5
+	elif [ -n "\$(pidof ibus-daemon)" ]
+	then
+		export XMODIFIERS="@im=ibus"
+		export QT_IM_MODULE=ibus
+	else
+		export XMODIFIERS="@im=fcitx"
+		export QT_IM_MODULE=fcitx
+	fi
+fi
 export MONO_PATH=/opt/apps/${MY_PGK_NAME}/files/lib/mono/lib/mono/4.5
 sh /opt/apps/${MY_PGK_NAME}/files/ZWCADRUN.sh \$*
 	EOF


^ permalink raw reply related	[flat|nested] 9+ messages in thread

* [gentoo-commits] repo/proj/guru:dev commit in: media-gfx/zwcad/
@ 2022-06-02 12:06 Rui Huang
  0 siblings, 0 replies; 9+ messages in thread
From: Rui Huang @ 2022-06-02 12:06 UTC (permalink / raw
  To: gentoo-commits

commit:     34dc180aaa2b72704ed86c351b6139cd95149c7d
Author:     Huang Rui <vowstar <AT> gmail <DOT> com>
AuthorDate: Thu Jun  2 12:05:51 2022 +0000
Commit:     Rui Huang <vowstar <AT> gmail <DOT> com>
CommitDate: Thu Jun  2 12:05:51 2022 +0000
URL:        https://gitweb.gentoo.org/repo/proj/guru.git/commit/?id=34dc180a

media-gfx/zwcad: fix fcitx5 environment

Signed-off-by: Huang Rui <vowstar <AT> gmail.com>

 media-gfx/zwcad/zwcad-2022.22.2.2.3.ebuild | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/media-gfx/zwcad/zwcad-2022.22.2.2.3.ebuild b/media-gfx/zwcad/zwcad-2022.22.2.2.3.ebuild
index 6c50bfc2c..ca643b08b 100644
--- a/media-gfx/zwcad/zwcad-2022.22.2.2.3.ebuild
+++ b/media-gfx/zwcad/zwcad-2022.22.2.2.3.ebuild
@@ -89,13 +89,14 @@ if [ -z "\${QT_IM_MODULE}" ]
 then
 	if [ -n "\$(pidof fcitx5)" ]
 	then
-		export XMODIFIERS="@im=fcitx5"
-		export QT_IM_MODULE=fcitx5
+		export XMODIFIERS="@im=fcitx"
+		export QT_IM_MODULE=fcitx
 	elif [ -n "\$(pidof ibus-daemon)" ]
 	then
 		export XMODIFIERS="@im=ibus"
 		export QT_IM_MODULE=ibus
-	else
+	elif [ -n "\$(pidof fcitx)" ]
+	then
 		export XMODIFIERS="@im=fcitx"
 		export QT_IM_MODULE=fcitx
 	fi


^ permalink raw reply related	[flat|nested] 9+ messages in thread

* [gentoo-commits] repo/proj/guru:dev commit in: media-gfx/zwcad/
@ 2022-06-24  7:58 Rui Huang
  0 siblings, 0 replies; 9+ messages in thread
From: Rui Huang @ 2022-06-24  7:58 UTC (permalink / raw
  To: gentoo-commits

commit:     403a49314fc5375fd7f775581c7868d3b0d5c41b
Author:     Huang Rui <vowstar <AT> gmail <DOT> com>
AuthorDate: Fri Jun 24 07:58:30 2022 +0000
Commit:     Rui Huang <vowstar <AT> gmail <DOT> com>
CommitDate: Fri Jun 24 07:58:30 2022 +0000
URL:        https://gitweb.gentoo.org/repo/proj/guru.git/commit/?id=403a4931

media-gfx/zwcad: add 2023.23.0.3.4

Signed-off-by: Huang Rui <vowstar <AT> gmail.com>

 media-gfx/zwcad/Manifest                   |   1 +
 media-gfx/zwcad/zwcad-2023.23.0.3.4.ebuild | 129 +++++++++++++++++++++++++++++
 2 files changed, 130 insertions(+)

diff --git a/media-gfx/zwcad/Manifest b/media-gfx/zwcad/Manifest
index d159e473d..2fe1ceda9 100644
--- a/media-gfx/zwcad/Manifest
+++ b/media-gfx/zwcad/Manifest
@@ -1,2 +1,3 @@
 DIST zwcad-2022.22.2.2.3.deb 159631816 BLAKE2B 39892032de774e85b472c238caed6c3f09992bc55c967a954099275925bb5c967c887d0bdf3b03d7cdb6cedb6725089a98828dbfdb6aebe82f34c3688373b0c7 SHA512 9d5e9a694f459643a7ad2d20cbafbb5847a39e88ab7fef4c7d6c5cbcc61628dda7138b537c3a9b5aec36b430289dd0814395e0e89cc1aacaef75bb5029c5d10d
+DIST zwcad-2023.23.0.3.4.deb 187029904 BLAKE2B 257c0ff67718d56fadd63e01c47e249d999f5ba1f1425f010ad295009aabfe2d8a6df5fadd78726bbc80efa6d01aa5ee4addba39a19018f0e099de504c4fc30b SHA512 95be727f0474b1c649ea714ec937ea70bac614f86036729b092edd9e5f6d944a8054601743734e54337eaa4b6251c15acd36b8f853f25e0d0bb66e208947ecae
 DIST zwcad-python-3.7.13.tar.bz2 56117484 BLAKE2B b81d58d4c8854c4c014276ef7e03e7a2cc16cd6e5aa50c69ac63346087d527e7083f36ab489530aea59a8e07828e315f53bd5075223471471134842f3c09c084 SHA512 22eaff6624f6dacbc903a033e99738f67faf2e221ba75cd13f201dfb0ec6f1d09e31e7fe82677d8f1f4f5ae732306213c9864c2615d61827316b782dfacceac4

diff --git a/media-gfx/zwcad/zwcad-2023.23.0.3.4.ebuild b/media-gfx/zwcad/zwcad-2023.23.0.3.4.ebuild
new file mode 100644
index 000000000..e1cec7c63
--- /dev/null
+++ b/media-gfx/zwcad/zwcad-2023.23.0.3.4.ebuild
@@ -0,0 +1,129 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+MY_PV_YEAR="$(ver_cut 1)"
+MY_PV="$(ver_cut 2).$(ver_cut 3).$(ver_cut 4).$(ver_cut 5)"
+MY_PGK_NAME="com.zwsoft.${PN}${MY_PV_YEAR}"
+inherit desktop unpacker xdg
+
+DESCRIPTION="CAD software for 2D drawing, reviewing and printing work"
+HOMEPAGE="https://www.zwsoft.cn/product/zwcad/linux"
+
+SRC_URI="
+	https://home-store-packages.uniontech.com/appstore/pool/appstore/c/${MY_PGK_NAME}/${MY_PGK_NAME}_${MY_PV}_amd64.deb -> ${P}.deb
+	https://anaconda.org/anaconda/python/3.7.13/download/linux-64/python-3.7.13-h12debd9_0.tar.bz2 -> ${PN}-python-3.7.13.tar.bz2
+"
+
+LICENSE="all-rights-reserved"
+SLOT="0"
+KEYWORDS="-* ~amd64"
+
+RESTRICT="strip mirror bindist"
+
+RDEPEND="
+	media-libs/fontconfig
+	media-libs/libglvnd
+	sys-apps/util-linux
+	sys-libs/zlib
+	virtual/libcrypt:=
+"
+
+DEPEND="${RDEPEND}"
+
+BDEPEND="dev-util/patchelf"
+
+S=${WORKDIR}
+
+QA_PREBUILT="*"
+
+src_unpack() {
+	unpack_deb "${DISTDIR}/${P}.deb"
+	tar -xf "${DISTDIR}/${PN}-python-3.7.13.tar.bz2" -C "${S}/opt/apps/"${MY_PGK_NAME}"/files/ZwPyRuntime/python3.7/" || die
+}
+
+src_install() {
+	# Install scalable icons
+	doicon -s scalable "${S}"/opt/apps/${MY_PGK_NAME}/files/Icons/ZWCAD.svg
+
+	# Fix python and QA problems about python
+	rm -rf "${S}/opt/apps/"${MY_PGK_NAME}"/files/ZwPyRuntime/python3.6/" || die
+	rm -rf "${S}/opt/apps/"${MY_PGK_NAME}"/files/libZwPythonLoad6.so" || die
+	rm -rf "${S}/opt/apps/"${MY_PGK_NAME}"/files/ZwPyRuntime/python3.5/" || die
+	rm -rf "${S}/opt/apps/"${MY_PGK_NAME}"/files/libZwPythonLoad5.so" || die
+	rm -rf "${S}/opt/apps/"${MY_PGK_NAME}"/files/ZwPyRuntime/python3.4/" || die
+	rm -rf "${S}/opt/apps/"${MY_PGK_NAME}"/files/libZwPythonLoad4.so" || die
+	rm -rf "${S}/opt/apps/"${MY_PGK_NAME}"/files/ZwPyRuntime/python3.7/compiler_compat" || die
+
+	# Set RPATH for preserve-libs handling
+	pushd "${S}"/opt/apps/${MY_PGK_NAME}/files || die
+	local x
+	for x in $(find) ; do
+		# Use \x7fELF header to separate ELF executables and libraries
+		[[ -f "${x}" && "${x: -2}" != ".o" && $(od -t x1 -N 4 "${x}") == *"7f 45 4c 46"* ]] || continue
+		local RPATH_ROOT="/opt/apps/${MY_PGK_NAME}/files"
+		local RPATH_S="${RPATH_ROOT}/:${RPATH_ROOT}/lib/:${RPATH_ROOT}/lib/mono/lib/:${RPATH_ROOT}/plugins/:${RPATH_ROOT}/zh-CN/:${RPATH_ROOT}/ZwPyRuntime/python3.7/lib"
+		patchelf --set-rpath "${RPATH_S}" "${x}" || \
+			die "patchelf failed on ${x}"
+	done
+	popd || die
+
+	# Fix desktop files
+	sed -E -i 's/^Exec=.*$/Exec=zwcad %F/g' "${S}/opt/apps/${MY_PGK_NAME}/entries/applications/${MY_PGK_NAME}.desktop" || die
+	sed -E -i 's/^Icon=.*$/Icon=ZWCAD/g' "${S}/opt/apps/${MY_PGK_NAME}/entries/applications/${MY_PGK_NAME}.desktop" || die
+	sed -E -i 's/Application;//g' "${S}/opt/apps/${MY_PGK_NAME}/entries/applications/${MY_PGK_NAME}.desktop" || die
+	# The Version entry in a .desktop file doesn't refer to the version of the
+	# target program. It's the version of the desktop file specification that
+	# this desktop file conforms to.
+	sed -E -i 's/^Version=.*$/Version=1.0/g' "${S}/opt/apps/${MY_PGK_NAME}/entries/applications/${MY_PGK_NAME}.desktop" || die
+	sed -E -i 's/^Categories=.*$/Categories=Graphics;VectorGraphics;Engineering;Construction;2DGraphics;/g' "${S}/opt/apps/${MY_PGK_NAME}/entries/applications/${MY_PGK_NAME}.desktop" || die
+	domenu "${S}/opt/apps/${MY_PGK_NAME}/entries/applications/${MY_PGK_NAME}.desktop"
+
+	sed -i "1i\\export MONO_PATH=/opt/apps/${MY_PGK_NAME}/files/lib/mono/lib/mono/4.5\n" "${S}/opt/apps/${MY_PGK_NAME}/files/ZWCADRUN.sh" || die
+	sed -E -i 's/export QT_IM_MODULE=fcitx//g' "${S}/opt/apps/${MY_PGK_NAME}/files/ZWCADRUN.sh" || die
+
+	# Add zw3d command
+	mkdir -p "${S}"/usr/bin/ || die
+
+	cat >> "${S}"/opt/apps/${MY_PGK_NAME}/zwcad <<- EOF || die
+#!/bin/sh
+if [ -z "\${QT_IM_MODULE}" ]
+then
+	if [ -n "\$(pidof fcitx5)" ]
+	then
+		export XMODIFIERS="@im=fcitx"
+		export QT_IM_MODULE=fcitx
+	elif [ -n "\$(pidof ibus-daemon)" ]
+	then
+		export XMODIFIERS="@im=ibus"
+		export QT_IM_MODULE=ibus
+	elif [ -n "\$(pidof fcitx)" ]
+	then
+		export XMODIFIERS="@im=fcitx"
+		export QT_IM_MODULE=fcitx
+	fi
+fi
+export MONO_PATH=/opt/apps/${MY_PGK_NAME}/files/lib/mono/lib/mono/4.5
+sh /opt/apps/${MY_PGK_NAME}/files/ZWCADRUN.sh \$*
+	EOF
+
+	ln -s /opt/apps/${MY_PGK_NAME}/zwcad "${S}"/usr/bin/zwcad || die
+
+	# Install package and fix permissions
+	insinto /opt/apps/
+	doins -r opt/apps/${MY_PGK_NAME}
+	insinto /usr
+	doins -r usr/*
+
+	fperms 0755 /opt/apps/${MY_PGK_NAME}/zwcad
+
+	pushd "${S}" || die
+	for x in $(find "opt/apps/${MY_PGK_NAME}") ; do
+		# Fix shell script permissions
+		[[ "${x: -3}" == ".sh" ]] && fperms 0755 "/${x}"
+		# Use \x7fELF header to separate ELF executables and libraries
+		[[ -f ${x} && $(od -t x1 -N 4 "${x}") == *"7f 45 4c 46"* ]] && fperms 0755 "/${x}"
+	done
+	popd || die
+}


^ permalink raw reply related	[flat|nested] 9+ messages in thread

* [gentoo-commits] repo/proj/guru:dev commit in: media-gfx/zwcad/
@ 2022-06-24  7:58 Rui Huang
  0 siblings, 0 replies; 9+ messages in thread
From: Rui Huang @ 2022-06-24  7:58 UTC (permalink / raw
  To: gentoo-commits

commit:     76400b0aa9dac405312d7983d5c012c55a8b638b
Author:     Huang Rui <vowstar <AT> gmail <DOT> com>
AuthorDate: Fri Jun 24 07:57:40 2022 +0000
Commit:     Rui Huang <vowstar <AT> gmail <DOT> com>
CommitDate: Fri Jun 24 07:57:40 2022 +0000
URL:        https://gitweb.gentoo.org/repo/proj/guru.git/commit/?id=76400b0a

media-gfx/zwcad: changed download URL

Signed-off-by: Huang Rui <vowstar <AT> gmail.com>

 media-gfx/zwcad/Manifest                   | 2 +-
 media-gfx/zwcad/metadata.xml               | 2 +-
 media-gfx/zwcad/zwcad-2022.22.2.2.3.ebuild | 7 +++++--
 3 files changed, 7 insertions(+), 4 deletions(-)

diff --git a/media-gfx/zwcad/Manifest b/media-gfx/zwcad/Manifest
index 362eed4ab..d159e473d 100644
--- a/media-gfx/zwcad/Manifest
+++ b/media-gfx/zwcad/Manifest
@@ -1,2 +1,2 @@
-DIST zwcad-2022.22.2.2.3.deb 159649900 BLAKE2B 7584f2e4ed61b4f29a75a613ba51494230a4f4db9c3ca73ca25656b058bf45ed2ad66cd92ee9238afc1a3dca649d4e90bcb5fef022c65887d3991f2a5c0de246 SHA512 dc9c415bb9d4c66ad943a5b237c3a52ba1f783ae54a37a586942da47b6b68be9e46146716750f181dfc5a4678d71234a0b18f8b216fc619498d4ebd497553fdf
+DIST zwcad-2022.22.2.2.3.deb 159631816 BLAKE2B 39892032de774e85b472c238caed6c3f09992bc55c967a954099275925bb5c967c887d0bdf3b03d7cdb6cedb6725089a98828dbfdb6aebe82f34c3688373b0c7 SHA512 9d5e9a694f459643a7ad2d20cbafbb5847a39e88ab7fef4c7d6c5cbcc61628dda7138b537c3a9b5aec36b430289dd0814395e0e89cc1aacaef75bb5029c5d10d
 DIST zwcad-python-3.7.13.tar.bz2 56117484 BLAKE2B b81d58d4c8854c4c014276ef7e03e7a2cc16cd6e5aa50c69ac63346087d527e7083f36ab489530aea59a8e07828e315f53bd5075223471471134842f3c09c084 SHA512 22eaff6624f6dacbc903a033e99738f67faf2e221ba75cd13f201dfb0ec6f1d09e31e7fe82677d8f1f4f5ae732306213c9864c2615d61827316b782dfacceac4

diff --git a/media-gfx/zwcad/metadata.xml b/media-gfx/zwcad/metadata.xml
index de9f36081..a59c09a06 100644
--- a/media-gfx/zwcad/metadata.xml
+++ b/media-gfx/zwcad/metadata.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<maintainer type="person">
 		<email>vowstar@gmail.com</email>

diff --git a/media-gfx/zwcad/zwcad-2022.22.2.2.3.ebuild b/media-gfx/zwcad/zwcad-2022.22.2.2.3.ebuild
index ca643b08b..bbbd04477 100644
--- a/media-gfx/zwcad/zwcad-2022.22.2.2.3.ebuild
+++ b/media-gfx/zwcad/zwcad-2022.22.2.2.3.ebuild
@@ -3,13 +3,16 @@
 
 EAPI=8
 
-MY_PGK_NAME="com.zwsoft.zwcad2022"
+MY_PV_YEAR="$(ver_cut 1)"
+MY_PV="$(ver_cut 2).$(ver_cut 3).$(ver_cut 4).$(ver_cut 5)"
+MY_PGK_NAME="com.zwsoft.${PN}${MY_PV_YEAR}"
 inherit desktop unpacker xdg
 
 DESCRIPTION="CAD software for 2D drawing, reviewing and printing work"
 HOMEPAGE="https://www.zwsoft.cn/product/zwcad/linux"
+
 SRC_URI="
-	https://download.zwcad.com/zwcad/cad_linux/2022/SP2/signed_com.zwsoft.zwcad2022_22.2.2.3_amd64.deb -> ${P}.deb
+	https://home-store-packages.uniontech.com/appstore/pool/appstore/c/${MY_PGK_NAME}/${MY_PGK_NAME}_${MY_PV}_amd64.deb -> ${P}.deb
 	https://anaconda.org/anaconda/python/3.7.13/download/linux-64/python-3.7.13-h12debd9_0.tar.bz2 -> ${PN}-python-3.7.13.tar.bz2
 "
 


^ permalink raw reply related	[flat|nested] 9+ messages in thread

* [gentoo-commits] repo/proj/guru:dev commit in: media-gfx/zwcad/
@ 2022-12-21  4:34 Rui Huang
  0 siblings, 0 replies; 9+ messages in thread
From: Rui Huang @ 2022-12-21  4:34 UTC (permalink / raw
  To: gentoo-commits

commit:     396814872321069413b32f06a88a5a7416c7fa19
Author:     Huang Rui <vowstar <AT> gmail <DOT> com>
AuthorDate: Wed Dec 21 04:34:22 2022 +0000
Commit:     Rui Huang <vowstar <AT> gmail <DOT> com>
CommitDate: Wed Dec 21 04:34:22 2022 +0000
URL:        https://gitweb.gentoo.org/repo/proj/guru.git/commit/?id=39681487

media-gfx/zwcad: add missing dep media-libs/tiff-compat

https://bugs.gentoo.org/886341
Signed-off-by: Huang Rui <vowstar <AT> gmail.com>

 .../zwcad/{zwcad-2023.23.0.3.4.ebuild => zwcad-2023.23.0.3.4-r1.ebuild}  | 1 +
 1 file changed, 1 insertion(+)

diff --git a/media-gfx/zwcad/zwcad-2023.23.0.3.4.ebuild b/media-gfx/zwcad/zwcad-2023.23.0.3.4-r1.ebuild
similarity index 98%
rename from media-gfx/zwcad/zwcad-2023.23.0.3.4.ebuild
rename to media-gfx/zwcad/zwcad-2023.23.0.3.4-r1.ebuild
index e1cec7c63..59f3e3f75 100644
--- a/media-gfx/zwcad/zwcad-2023.23.0.3.4.ebuild
+++ b/media-gfx/zwcad/zwcad-2023.23.0.3.4-r1.ebuild
@@ -25,6 +25,7 @@ RESTRICT="strip mirror bindist"
 RDEPEND="
 	media-libs/fontconfig
 	media-libs/libglvnd
+	|| ( <media-libs/tiff-4.5.0 media-libs/tiff-compat:4 )
 	sys-apps/util-linux
 	sys-libs/zlib
 	virtual/libcrypt:=


^ permalink raw reply related	[flat|nested] 9+ messages in thread

* [gentoo-commits] repo/proj/guru:dev commit in: media-gfx/zwcad/
@ 2022-12-21  4:34 Rui Huang
  0 siblings, 0 replies; 9+ messages in thread
From: Rui Huang @ 2022-12-21  4:34 UTC (permalink / raw
  To: gentoo-commits

commit:     089985f467c1f37b5aece751054f1b3c98c76d5d
Author:     Huang Rui <vowstar <AT> gmail <DOT> com>
AuthorDate: Wed Dec 21 04:33:53 2022 +0000
Commit:     Rui Huang <vowstar <AT> gmail <DOT> com>
CommitDate: Wed Dec 21 04:33:53 2022 +0000
URL:        https://gitweb.gentoo.org/repo/proj/guru.git/commit/?id=089985f4

media-gfx/zwcad: drop 2022.22.2.2.3

Signed-off-by: Huang Rui <vowstar <AT> gmail.com>

 media-gfx/zwcad/Manifest                   |   1 -
 media-gfx/zwcad/zwcad-2022.22.2.2.3.ebuild | 129 -----------------------------
 2 files changed, 130 deletions(-)

diff --git a/media-gfx/zwcad/Manifest b/media-gfx/zwcad/Manifest
index 2fe1ceda9..2f1395e70 100644
--- a/media-gfx/zwcad/Manifest
+++ b/media-gfx/zwcad/Manifest
@@ -1,3 +1,2 @@
-DIST zwcad-2022.22.2.2.3.deb 159631816 BLAKE2B 39892032de774e85b472c238caed6c3f09992bc55c967a954099275925bb5c967c887d0bdf3b03d7cdb6cedb6725089a98828dbfdb6aebe82f34c3688373b0c7 SHA512 9d5e9a694f459643a7ad2d20cbafbb5847a39e88ab7fef4c7d6c5cbcc61628dda7138b537c3a9b5aec36b430289dd0814395e0e89cc1aacaef75bb5029c5d10d
 DIST zwcad-2023.23.0.3.4.deb 187029904 BLAKE2B 257c0ff67718d56fadd63e01c47e249d999f5ba1f1425f010ad295009aabfe2d8a6df5fadd78726bbc80efa6d01aa5ee4addba39a19018f0e099de504c4fc30b SHA512 95be727f0474b1c649ea714ec937ea70bac614f86036729b092edd9e5f6d944a8054601743734e54337eaa4b6251c15acd36b8f853f25e0d0bb66e208947ecae
 DIST zwcad-python-3.7.13.tar.bz2 56117484 BLAKE2B b81d58d4c8854c4c014276ef7e03e7a2cc16cd6e5aa50c69ac63346087d527e7083f36ab489530aea59a8e07828e315f53bd5075223471471134842f3c09c084 SHA512 22eaff6624f6dacbc903a033e99738f67faf2e221ba75cd13f201dfb0ec6f1d09e31e7fe82677d8f1f4f5ae732306213c9864c2615d61827316b782dfacceac4

diff --git a/media-gfx/zwcad/zwcad-2022.22.2.2.3.ebuild b/media-gfx/zwcad/zwcad-2022.22.2.2.3.ebuild
deleted file mode 100644
index bbbd04477..000000000
--- a/media-gfx/zwcad/zwcad-2022.22.2.2.3.ebuild
+++ /dev/null
@@ -1,129 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-MY_PV_YEAR="$(ver_cut 1)"
-MY_PV="$(ver_cut 2).$(ver_cut 3).$(ver_cut 4).$(ver_cut 5)"
-MY_PGK_NAME="com.zwsoft.${PN}${MY_PV_YEAR}"
-inherit desktop unpacker xdg
-
-DESCRIPTION="CAD software for 2D drawing, reviewing and printing work"
-HOMEPAGE="https://www.zwsoft.cn/product/zwcad/linux"
-
-SRC_URI="
-	https://home-store-packages.uniontech.com/appstore/pool/appstore/c/${MY_PGK_NAME}/${MY_PGK_NAME}_${MY_PV}_amd64.deb -> ${P}.deb
-	https://anaconda.org/anaconda/python/3.7.13/download/linux-64/python-3.7.13-h12debd9_0.tar.bz2 -> ${PN}-python-3.7.13.tar.bz2
-"
-
-LICENSE="all-rights-reserved"
-SLOT="0"
-KEYWORDS="-* ~amd64"
-
-RESTRICT="strip mirror bindist"
-
-RDEPEND="
-	media-libs/fontconfig
-	media-libs/libglvnd
-	sys-apps/util-linux
-	sys-libs/zlib
-	virtual/libcrypt:=
-"
-
-DEPEND="${RDEPEND}"
-
-BDEPEND="dev-util/patchelf"
-
-S=${WORKDIR}
-
-QA_PREBUILT="*"
-
-src_unpack() {
-	unpack_deb "${DISTDIR}/${P}.deb"
-	tar -xf "${DISTDIR}/${PN}-python-3.7.13.tar.bz2" -C "${S}/opt/apps/"${MY_PGK_NAME}"/files/ZwPyRuntime/python3.7/" || die
-}
-
-src_install() {
-	# Install scalable icons
-	doicon -s scalable "${S}"/opt/apps/${MY_PGK_NAME}/files/Icons/ZWCAD.svg
-
-	# Fix python and QA problems about python
-	rm -rf "${S}/opt/apps/"${MY_PGK_NAME}"/files/ZwPyRuntime/python3.6/" || die
-	rm -rf "${S}/opt/apps/"${MY_PGK_NAME}"/files/libZwPythonLoad6.so" || die
-	rm -rf "${S}/opt/apps/"${MY_PGK_NAME}"/files/ZwPyRuntime/python3.5/" || die
-	rm -rf "${S}/opt/apps/"${MY_PGK_NAME}"/files/libZwPythonLoad5.so" || die
-	rm -rf "${S}/opt/apps/"${MY_PGK_NAME}"/files/ZwPyRuntime/python3.4/" || die
-	rm -rf "${S}/opt/apps/"${MY_PGK_NAME}"/files/libZwPythonLoad4.so" || die
-	rm -rf "${S}/opt/apps/"${MY_PGK_NAME}"/files/ZwPyRuntime/python3.7/compiler_compat" || die
-
-	# Set RPATH for preserve-libs handling
-	pushd "${S}"/opt/apps/${MY_PGK_NAME}/files || die
-	local x
-	for x in $(find) ; do
-		# Use \x7fELF header to separate ELF executables and libraries
-		[[ -f "${x}" && "${x: -2}" != ".o" && $(od -t x1 -N 4 "${x}") == *"7f 45 4c 46"* ]] || continue
-		local RPATH_ROOT="/opt/apps/${MY_PGK_NAME}/files"
-		local RPATH_S="${RPATH_ROOT}/:${RPATH_ROOT}/lib/:${RPATH_ROOT}/lib/mono/lib/:${RPATH_ROOT}/plugins/:${RPATH_ROOT}/zh-CN/:${RPATH_ROOT}/ZwPyRuntime/python3.7/lib"
-		patchelf --set-rpath "${RPATH_S}" "${x}" || \
-			die "patchelf failed on ${x}"
-	done
-	popd || die
-
-	# Fix desktop files
-	sed -E -i 's/^Exec=.*$/Exec=zwcad %F/g' "${S}/opt/apps/${MY_PGK_NAME}/entries/applications/com.zwsoft.zwcad.desktop" || die
-	sed -E -i 's/^Icon=.*$/Icon=ZWCAD/g' "${S}/opt/apps/${MY_PGK_NAME}/entries/applications/com.zwsoft.zwcad.desktop" || die
-	sed -E -i 's/Application;//g' "${S}/opt/apps/${MY_PGK_NAME}/entries/applications/com.zwsoft.zwcad.desktop" || die
-	# The Version entry in a .desktop file doesn't refer to the version of the
-	# target program. It's the version of the desktop file specification that
-	# this desktop file conforms to.
-	sed -E -i 's/^Version=.*$/Version=1.0/g' "${S}/opt/apps/${MY_PGK_NAME}/entries/applications/com.zwsoft.zwcad.desktop" || die
-	sed -E -i 's/^Categories=.*$/Categories=Graphics;VectorGraphics;Engineering;Construction;2DGraphics;/g' "${S}/opt/apps/${MY_PGK_NAME}/entries/applications/com.zwsoft.zwcad.desktop" || die
-	domenu "${S}/opt/apps/${MY_PGK_NAME}/entries/applications/com.zwsoft.zwcad.desktop"
-
-	sed -i "1i\\export MONO_PATH=/opt/apps/${MY_PGK_NAME}/files/lib/mono/lib/mono/4.5\n" "${S}/opt/apps/${MY_PGK_NAME}/files/ZWCADRUN.sh" || die
-	sed -E -i 's/export QT_IM_MODULE=fcitx//g' "${S}/opt/apps/${MY_PGK_NAME}/files/ZWCADRUN.sh" || die
-
-	# Add zw3d command
-	mkdir -p "${S}"/usr/bin/ || die
-
-	cat >> "${S}"/opt/apps/${MY_PGK_NAME}/zwcad <<- EOF || die
-#!/bin/sh
-if [ -z "\${QT_IM_MODULE}" ]
-then
-	if [ -n "\$(pidof fcitx5)" ]
-	then
-		export XMODIFIERS="@im=fcitx"
-		export QT_IM_MODULE=fcitx
-	elif [ -n "\$(pidof ibus-daemon)" ]
-	then
-		export XMODIFIERS="@im=ibus"
-		export QT_IM_MODULE=ibus
-	elif [ -n "\$(pidof fcitx)" ]
-	then
-		export XMODIFIERS="@im=fcitx"
-		export QT_IM_MODULE=fcitx
-	fi
-fi
-export MONO_PATH=/opt/apps/${MY_PGK_NAME}/files/lib/mono/lib/mono/4.5
-sh /opt/apps/${MY_PGK_NAME}/files/ZWCADRUN.sh \$*
-	EOF
-
-	ln -s /opt/apps/${MY_PGK_NAME}/zwcad "${S}"/usr/bin/zwcad || die
-
-	# Install package and fix permissions
-	insinto /opt/apps/
-	doins -r opt/apps/${MY_PGK_NAME}
-	insinto /usr
-	doins -r usr/*
-
-	fperms 0755 /opt/apps/${MY_PGK_NAME}/zwcad
-
-	pushd "${S}" || die
-	for x in $(find "opt/apps/${MY_PGK_NAME}") ; do
-		# Fix shell script permissions
-		[[ "${x: -3}" == ".sh" ]] && fperms 0755 "/${x}"
-		# Use \x7fELF header to separate ELF executables and libraries
-		[[ -f ${x} && $(od -t x1 -N 4 "${x}") == *"7f 45 4c 46"* ]] && fperms 0755 "/${x}"
-	done
-	popd || die
-}


^ permalink raw reply related	[flat|nested] 9+ messages in thread

* [gentoo-commits] repo/proj/guru:dev commit in: media-gfx/zwcad/
@ 2022-12-21 11:17 Rui Huang
  0 siblings, 0 replies; 9+ messages in thread
From: Rui Huang @ 2022-12-21 11:17 UTC (permalink / raw
  To: gentoo-commits

commit:     b62e602abe86048cbca8bd2ee711217a5725250f
Author:     Huang Rui <vowstar <AT> gmail <DOT> com>
AuthorDate: Wed Dec 21 11:17:14 2022 +0000
Commit:     Rui Huang <vowstar <AT> gmail <DOT> com>
CommitDate: Wed Dec 21 11:17:14 2022 +0000
URL:        https://gitweb.gentoo.org/repo/proj/guru.git/commit/?id=b62e602a

media-gfx/zwcad: fix media-libs/tiff depends and use subslot

Signed-off-by: Huang Rui <vowstar <AT> gmail.com>

 media-gfx/zwcad/zwcad-2023.23.0.3.4-r1.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/media-gfx/zwcad/zwcad-2023.23.0.3.4-r1.ebuild b/media-gfx/zwcad/zwcad-2023.23.0.3.4-r1.ebuild
index 59f3e3f75..afcee5eec 100644
--- a/media-gfx/zwcad/zwcad-2023.23.0.3.4-r1.ebuild
+++ b/media-gfx/zwcad/zwcad-2023.23.0.3.4-r1.ebuild
@@ -25,7 +25,7 @@ RESTRICT="strip mirror bindist"
 RDEPEND="
 	media-libs/fontconfig
 	media-libs/libglvnd
-	|| ( <media-libs/tiff-4.5.0 media-libs/tiff-compat:4 )
+	|| ( media-libs/tiff:0/0 media-libs/tiff-compat:4 )
 	sys-apps/util-linux
 	sys-libs/zlib
 	virtual/libcrypt:=


^ permalink raw reply related	[flat|nested] 9+ messages in thread

* [gentoo-commits] repo/proj/guru:dev commit in: media-gfx/zwcad/
@ 2023-08-24  3:46 Rui Huang
  0 siblings, 0 replies; 9+ messages in thread
From: Rui Huang @ 2023-08-24  3:46 UTC (permalink / raw
  To: gentoo-commits

commit:     bdb902d625da8425600efaf9c0225e8a86e47d11
Author:     Huang Rui <vowstar <AT> gmail <DOT> com>
AuthorDate: Thu Aug 24 03:46:12 2023 +0000
Commit:     Rui Huang <vowstar <AT> gmail <DOT> com>
CommitDate: Thu Aug 24 03:46:12 2023 +0000
URL:        https://gitweb.gentoo.org/repo/proj/guru.git/commit/?id=bdb902d6

media-gfx/zwcad: fix ebuild QA issues

Signed-off-by: Huang Rui <vowstar <AT> gmail.com>

 ...3.4-r1.ebuild => zwcad-2023.23.0.3.4-r2.ebuild} | 27 ++++++++++++++--------
 1 file changed, 17 insertions(+), 10 deletions(-)

diff --git a/media-gfx/zwcad/zwcad-2023.23.0.3.4-r1.ebuild b/media-gfx/zwcad/zwcad-2023.23.0.3.4-r2.ebuild
similarity index 79%
rename from media-gfx/zwcad/zwcad-2023.23.0.3.4-r1.ebuild
rename to media-gfx/zwcad/zwcad-2023.23.0.3.4-r2.ebuild
index afcee5eecf..2f72246741 100644
--- a/media-gfx/zwcad/zwcad-2023.23.0.3.4-r1.ebuild
+++ b/media-gfx/zwcad/zwcad-2023.23.0.3.4-r2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2022 Gentoo Authors
+# Copyright 1999-2023 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -11,21 +11,23 @@ inherit desktop unpacker xdg
 DESCRIPTION="CAD software for 2D drawing, reviewing and printing work"
 HOMEPAGE="https://www.zwsoft.cn/product/zwcad/linux"
 
+URI_UNIONTECH="https://home-store-packages.uniontech.com/appstore/pool/appstore/c"
+URI_ANACONDA="https://anaconda.org/anaconda"
 SRC_URI="
-	https://home-store-packages.uniontech.com/appstore/pool/appstore/c/${MY_PGK_NAME}/${MY_PGK_NAME}_${MY_PV}_amd64.deb -> ${P}.deb
-	https://anaconda.org/anaconda/python/3.7.13/download/linux-64/python-3.7.13-h12debd9_0.tar.bz2 -> ${PN}-python-3.7.13.tar.bz2
+	${URI_UNIONTECH}/${MY_PGK_NAME}/${MY_PGK_NAME}_${MY_PV}_amd64.deb -> ${P}.deb
+	${URI_ANACONDA}/python/3.7.13/download/linux-64/python-3.7.13-h12debd9_0.tar.bz2 -> ${PN}-python-3.7.13.tar.bz2
 "
 
 LICENSE="all-rights-reserved"
 SLOT="0"
 KEYWORDS="-* ~amd64"
 
-RESTRICT="strip mirror bindist"
+RESTRICT="bindist mirror preserve-libs strip"
 
 RDEPEND="
 	media-libs/fontconfig
 	media-libs/libglvnd
-	|| ( media-libs/tiff:0/0 media-libs/tiff-compat:4 )
+	media-libs/tiff-compat:4
 	sys-apps/util-linux
 	sys-libs/zlib
 	virtual/libcrypt:=
@@ -41,7 +43,8 @@ QA_PREBUILT="*"
 
 src_unpack() {
 	unpack_deb "${DISTDIR}/${P}.deb"
-	tar -xf "${DISTDIR}/${PN}-python-3.7.13.tar.bz2" -C "${S}/opt/apps/"${MY_PGK_NAME}"/files/ZwPyRuntime/python3.7/" || die
+	tar -xf "${DISTDIR}/${PN}-python-3.7.13.tar.bz2" \
+		-C "${S}/opt/apps/"${MY_PGK_NAME}"/files/ZwPyRuntime/python3.7/" || die
 }
 
 src_install() {
@@ -71,17 +74,21 @@ src_install() {
 	popd || die
 
 	# Fix desktop files
-	sed -E -i 's/^Exec=.*$/Exec=zwcad %F/g' "${S}/opt/apps/${MY_PGK_NAME}/entries/applications/${MY_PGK_NAME}.desktop" || die
+	sed -E -i 's/^Exec=.*$/Exec=zwcad %F/g' \
+		"${S}/opt/apps/${MY_PGK_NAME}/entries/applications/${MY_PGK_NAME}.desktop" || die
 	sed -E -i 's/^Icon=.*$/Icon=ZWCAD/g' "${S}/opt/apps/${MY_PGK_NAME}/entries/applications/${MY_PGK_NAME}.desktop" || die
 	sed -E -i 's/Application;//g' "${S}/opt/apps/${MY_PGK_NAME}/entries/applications/${MY_PGK_NAME}.desktop" || die
 	# The Version entry in a .desktop file doesn't refer to the version of the
 	# target program. It's the version of the desktop file specification that
 	# this desktop file conforms to.
-	sed -E -i 's/^Version=.*$/Version=1.0/g' "${S}/opt/apps/${MY_PGK_NAME}/entries/applications/${MY_PGK_NAME}.desktop" || die
-	sed -E -i 's/^Categories=.*$/Categories=Graphics;VectorGraphics;Engineering;Construction;2DGraphics;/g' "${S}/opt/apps/${MY_PGK_NAME}/entries/applications/${MY_PGK_NAME}.desktop" || die
+	sed -E -i 's/^Version=.*$/Version=1.0/g' \
+		"${S}/opt/apps/${MY_PGK_NAME}/entries/applications/${MY_PGK_NAME}.desktop" || die
+	sed -E -i 's/^Categories=.*$/Categories=Graphics;VectorGraphics;Engineering;Construction;2DGraphics;/g' \
+		"${S}/opt/apps/${MY_PGK_NAME}/entries/applications/${MY_PGK_NAME}.desktop" || die
 	domenu "${S}/opt/apps/${MY_PGK_NAME}/entries/applications/${MY_PGK_NAME}.desktop"
 
-	sed -i "1i\\export MONO_PATH=/opt/apps/${MY_PGK_NAME}/files/lib/mono/lib/mono/4.5\n" "${S}/opt/apps/${MY_PGK_NAME}/files/ZWCADRUN.sh" || die
+	sed -i "1i\\export MONO_PATH=/opt/apps/${MY_PGK_NAME}/files/lib/mono/lib/mono/4.5\n" \
+		"${S}/opt/apps/${MY_PGK_NAME}/files/ZWCADRUN.sh" || die
 	sed -E -i 's/export QT_IM_MODULE=fcitx//g' "${S}/opt/apps/${MY_PGK_NAME}/files/ZWCADRUN.sh" || die
 
 	# Add zw3d command


^ permalink raw reply related	[flat|nested] 9+ messages in thread

end of thread, other threads:[~2023-08-24  3:46 UTC | newest]

Thread overview: 9+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2022-06-02  9:15 [gentoo-commits] repo/proj/guru:dev commit in: media-gfx/zwcad/ Rui Huang
  -- strict thread matches above, loose matches on Subject: below --
2023-08-24  3:46 Rui Huang
2022-12-21 11:17 Rui Huang
2022-12-21  4:34 Rui Huang
2022-12-21  4:34 Rui Huang
2022-06-24  7:58 Rui Huang
2022-06-24  7:58 Rui Huang
2022-06-02 12:06 Rui Huang
2022-06-02  7:34 Rui Huang

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox