gentoo resync : 23.09.2020

3 files changed, 6 insertions, 40 deletions

diff --git a/app-text/stardict/Manifest b/app-text/stardict/Manifest
index d7d197d8e717..97324d63b6ea 100644
--- a/app-text/stardict/Manifest
+++ b/app-text/stardict/Manifest
@@ -3,6 +3,6 @@ DIST QQWry.Dat.bz2 4114875 BLAKE2B 3fb1a3b223b799645fcc7adc3d8158c80551bd1d35689
 DIST WyabdcRealPeopleTTS.tar.bz2 84329208 BLAKE2B 1dd9c00e4e914b0d747876aa566db59a4b973b3ec61fa1ed7a55f885d7f415f573f2f8783eca46c565bc52df4ba3576b3a0f4e863b4f7ba688007f6d6b375209 SHA512 1553e62c139ecb005bb04163147d94aa58e4ba7f9ee3172b760c6e4776587c12bf816c42e0131c82195b7c738ec9ee5082f39b974790f5cacd522367919beaa0
 DIST stardict-3.0.6.tar.bz2 9341740 BLAKE2B df0ccfbd485dfb514bdcf4edaf92b2faf3c11016b025ca09596adcc12738027395a049d9d27420427acdf5c46923cb43ba521d334f875070f5451b7ff147e36f SHA512 81d93324b6e8954af7c20ea6d2a3054bb564d786a21b1cb541c728da7a18a6e7ddb23e595055ccc77e6866bbb8c89fb4f17023e33664761dbe1ee8cd55768658
 DIST stardict-4.0.0_pre20170304.tar.xz 3603012 BLAKE2B c9ac41f1e27c013e9c20e5b5477889cb4933ebaf35629311362ec48e820b10a7492d464ac7eddded697ca49f56f65032a1af36088e8e731643e83532e0586e48 SHA512 ec27bb95069d727fd96cb30f2d7ad94992cc53e55903b373612e29265263ea5da2c8a25f6c9618db50dc38c33efebe13324c2b8eb09b198559a1ee70029f0b6a
-EBUILD stardict-3.0.6-r3.ebuild 6058 BLAKE2B 06cc43bf8f00ebc08a8bbcbe7482f3ba009cd3c92519c71f1613e745985f7e0b8bf31bb54a15241fd9d362e22e980381ac307661d3233bd161b60c1745255576 SHA512 80708e6f0a022f531a5e706ed72054819f395ff182907d60960deb9a9a62e7533a4c8f88c86503ff200cc80afb5537029c04f39a23c6c1fc8416093e8d1f3523
-EBUILD stardict-4.0.0_pre20170304.ebuild 6471 BLAKE2B 8886d9b8488d049ea0d99770290f914da06873c4b4486063dc27ccc75c1df6d23387d9ebd8aac71b9f6ec9eb7d417b9af47d72954329afb73f8c57270d193a75 SHA512 8d091ac639c52eaa9d17df4b7bbf1aa20a421214067cc6c0bd3a34204007988e73f79e21af34bfc7f64d4ca36798e1b87925e3cbae6425d196c51bc02cbfdf86
+EBUILD stardict-3.0.6-r4.ebuild 5389 BLAKE2B a4926bb81e81b31181ede64891197b2e05d43a69423bfa7cd6ca669627891798784b0a7bc52c597cec045ef3f2bf8e76282a0a193169906b406a81889376a3ab SHA512 d5643b2e9f262ef7c22ca3ba5694ca49cf298f6a48d91471e5c75223414051a75d3489334e1048484acd6aae8317416311ddac98493b2c40187958cf4e4dc92a
+EBUILD stardict-4.0.0_pre20170304-r1.ebuild 5802 BLAKE2B 7f0401d5d338d0c1c08ec07dce73bfd8498a77c410f5f864ed2cc2af587b7624c56461c64220b02ce0ad42e42b5e135779bd8c3c3a99903c5c13ff677a451dff SHA512 92f2df7ece70b5df32285fe2b7976fa3fa75b1f01c5698d9c55188d53214fe78bcecde0caebd301caefbc8b6c99a0c9aa08f4a9b61d87df1936aeb99a853a7f0
 MISC metadata.xml 2668 BLAKE2B f5d9f4b43187c2140f84addb9bf1c2d209d7ef0de7a5081fae594c27b439ef77686ac9fd8b555bc95b76bdef041dab75fbdbe1bf5451bd754b4cfd1dd5d7771d SHA512 caae150f5dd42c45ee5f17659df5700b52ed38c9005c37316df9c4828dcfbbeed1dd585c8c9b44acfe16f1f68f745354ac40e4dc5695df183cbf5c64e82826d7
diff --git a/app-text/stardict/stardict-3.0.6-r3.ebuild b/app-text/stardict/stardict-3.0.6-r4.ebuild
index 66ab1895618e..c41fc396803b 100644
--- a/app-text/stardict/stardict-3.0.6-r3.ebuild
+++ b/app-text/stardict/stardict-3.0.6-r4.ebuild
@@ -8,9 +8,8 @@ EAPI=6
 #       seperate for now.
 
 GNOME2_LA_PUNT=yes
-PYTHON_COMPAT=( python2_7 )
 
-inherit flag-o-matic gnome2 python-single-r1
+inherit flag-o-matic gnome2
 
 DESCRIPTION="A international dictionary supporting fuzzy and glob style matching"
 HOMEPAGE="http://stardict-4.sourceforge.net/"
@@ -22,7 +21,7 @@ LICENSE="CPL-1.0 GPL-3 LGPL-2"
 SLOT="0"
 KEYWORDS="amd64 ~arm ~arm64 ppc ppc64 sparc x86"
 IUSE="advertisement debug dictdotcn espeak examples +gucharmap
-+htmlparse man perl +powerwordparse pronounce python qqwry spell
++htmlparse man perl +powerwordparse pronounce qqwry spell
 tools updateinfo +wikiparse +wordnet +xdxfparse"
 
 RESTRICT="test"
@@ -41,7 +40,6 @@ COMMON_DEPEND="
 		dev-db/mysql-connector-c
 		dev-libs/libpcre:=
 		dev-libs/libxml2:=
-		python? ( ${PYTHON_DEPS} )
 	)
 "
 RDEPEND="${COMMON_DEPEND}
@@ -56,7 +54,6 @@ DEPEND="${COMMON_DEPEND}
 	sys-devel/gettext
 	virtual/pkgconfig
 "
-REQUIRED_USE="tools? ( python? ( ${PYTHON_REQUIRED_USE} ) )"
 
 # docs are messy, installed manually below
 DOCS=""
@@ -71,17 +68,6 @@ src_prepare() {
 	# libsigc++ started to require c++11 support
 	append-cxxflags "-std=c++11"
 
-	if use python; then
-		local f
-		# force python shebangs handlable by python_doscript
-		for f in tools/src/*.py; do
-			[[ $(head -n1 "${f}") =~ ^#! ]] || continue
-			sed -i '1 s|.*|#!/usr/bin/python|' tools/src/*.py || die
-		done
-		# script contains UTF-8 symbols, but has no ecoding set
-		sed -i '1 a # -*- coding: utf-8 -*-' tools/src/uyghur2dict.py || die
-	fi
-
 	eapply_user
 	gnome2_src_prepare
 }
@@ -162,8 +148,6 @@ src_install() {
 			${PN}-bin2text ${PN}-repair"
 
 		use perl && apps+=" dicts-dump.pl ncce2stardict.pl parse-oxford.perl"
-		use python && apps+=" hanzim2dict.py jm2stardict.py lingea-trd-decoder.py
-			makevietdict.py uyghur2dict.py"
 
 		for app in ${apps}; do
 			if [[ "${app}" =~ ^${PN} ]]; then
@@ -172,7 +156,6 @@ src_install() {
 				newbin "tools/src/${app}" "${PN}_${app}"
 			fi
 		done
-		use python && python_doscript "${ED}"usr/bin/*.py
 
 		docinto tools
 		dodoc tools/{AUTHORS,ChangeLog,README}
diff --git a/app-text/stardict/stardict-4.0.0_pre20170304.ebuild b/app-text/stardict/stardict-4.0.0_pre20170304-r1.ebuild
index 068d4a3d51c6..41900b018b60 100644
--- a/app-text/stardict/stardict-4.0.0_pre20170304.ebuild
+++ b/app-text/stardict/stardict-4.0.0_pre20170304-r1.ebuild
@@ -8,9 +8,8 @@ EAPI=6
 #       seperate for now.
 
 GNOME2_LA_PUNT=yes
-PYTHON_COMPAT=( python2_7 )
 
-inherit autotools flag-o-matic gnome2 python-single-r1
+inherit autotools flag-o-matic gnome2
 
 DESCRIPTION="A international dictionary supporting fuzzy and glob style matching"
 HOMEPAGE="http://stardict-4.sourceforge.net/
@@ -24,7 +23,7 @@ SLOT="0"
 KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~sparc ~x86"
 IUSE="advertisement cal debug dictdotcn espeak examples flite
 fortune gucharmap +htmlparse info man perl +powerwordparse
-pronounce python qqwry spell tools updateinfo +wikiparse +wordnet
+pronounce qqwry spell tools updateinfo +wikiparse +wordnet
 +xdxfparse youdaodict"
 
 RESTRICT="test"
@@ -47,7 +46,6 @@ COMMON_DEPEND="
 		dev-libs/expat
 		dev-libs/libpcre:=
 		dev-libs/libxml2:=
-		python? ( ${PYTHON_DEPS} )
 	)
 "
 RDEPEND="${COMMON_DEPEND}
@@ -63,7 +61,6 @@ DEPEND="${COMMON_DEPEND}
 	sys-devel/gettext
 	virtual/pkgconfig
 "
-REQUIRED_USE="tools? ( python? ( ${PYTHON_REQUIRED_USE} ) )"
 
 # docs are messy, installed manually below
 DOCS=""
@@ -80,17 +77,6 @@ src_prepare() {
 	# libsigc++ started to require c++11 support
 	append-cxxflags "-std=c++11"
 
-	if use python; then
-		local f
-		# force python shebangs handlable by python_doscript
-		for f in tools/src/*.py; do
-			[[ $(head -n1 "${f}") =~ ^#! ]] || continue
-			sed -i '1 s|.*|#!/usr/bin/python|' tools/src/*.py || die
-		done
-		# script contains UTF-8 symbols, but has no ecoding set
-		sed -i '1 a # -*- coding: utf-8 -*-' tools/src/uyghur2dict.py || die
-	fi
-
 	# bug 604318
 	sed -i '/AM_GCONF_SOURCE_2/d' dict/configure.ac || die
 
@@ -179,8 +165,6 @@ src_install() {
 			${PN}-text2bin ${PN}-bin2text ${PN}-repair"
 
 		use perl && apps+=" dicts-dump.pl ncce2stardict.pl parse-oxford.perl"
-		use python && apps+=" hanzim2dict.py jm2stardict.py lingea-trd-decoder.py
-			makevietdict.py uyghur2dict.py"
 
 		for app in ${apps}; do
 			if [[ "${app}" =~ ^${PN} ]]; then
@@ -189,7 +173,6 @@ src_install() {
 				newbin "tools/src/${app}" "${PN}_${app}"
 			fi
 		done
-		use python && python_doscript "${ED}"usr/bin/*.py
 
 		docinto tools
 		dodoc tools/{AUTHORS,ChangeLog,README}