gentoo resync : 10.02.2020

5 files changed, 4 insertions, 59 deletions

diff --git a/dev-tcltk/Manifest.gz b/dev-tcltk/Manifest.gz
index 28bbcfafcc95..bfbb4dce9e76 100644
--- a/dev-tcltk/Manifest.gz
+++ b/dev-tcltk/Manifest.gz
diff --git a/dev-tcltk/tclpython/Manifest b/dev-tcltk/tclpython/Manifest
index 2c682edd02b2..76c4a3e28399 100644
--- a/dev-tcltk/tclpython/Manifest
+++ b/dev-tcltk/tclpython/Manifest
@@ -2,7 +2,6 @@ AUX tclpython-4.1-python-3.patch 8863 BLAKE2B 6c1c2fa8f29240b6703911fde24519961f
 AUX tclpython-5.0-gentoo.patch 379 BLAKE2B f5f45d701998af7398a074f59bc25cc613b72f2f8825b46d7060fa039e04cfafc649959c451ec31b194ba47dd3f274e6ba20f8a1fd98b8c73392f0f4398257cc SHA512 8e5caec03836fdd8e2c50e49c6142e1349d577d5f73dc673e6bfdeee5b2d50cc20207dd59e75e7639fb780fda217e500104b4332cddca793e6749d047d5246ee
 DIST tclpython-4.1.tar.bz2 10580 BLAKE2B 98d4783cc52bc907c21d50ee393e25ee084b449db7c393c16b0b1f0420469bd0904d16dc2a6806b776dad7dabd521e5f2e8cc942c720d9e69750385302355608 SHA512 5f08e7129a7d9afeb1ac6bf1ab1c83ad3bb481593c9516c0653c7b4ba0dfb1b3129a336e64b998cec8ef2d2377a6a366b73c640d25839ab280d5079c0b220d54
 DIST tclpython-5.0.tar.gz 19327 BLAKE2B bad25a6eb04dbcd9ca3e9bc81d44f098f31f2acf367ecc32307596d5da3ed95752b3c60d9ee74fc04e21669e0361f0790edad3ad5793c78ece4904beacd92900 SHA512 fe15218fe00e921384dbd9611685b86cb6dfacb515a95545079550aeadaaafc3964e6ef0594a268a3fd900f40d178659e8b7f6f2a6d9aa507b59a8be0bd116af
-EBUILD tclpython-4.1-r4.ebuild 1255 BLAKE2B b54520a550d6ce5449b8fcc4124f35d37c0f2f51d0a9d4e23c2ea44342a25ab0834cd51f4c83a7bc99ad9c548fd83335862a625aa835424dd44172ce50b75943 SHA512 0e8f249e76f33f2723aeb87a0b731396b69625fcb81c4c05d27c90dbe41780e0f620a3ba037b94d11a75756681bcd951817cdc49277d79e179d534da7b4ad827
-EBUILD tclpython-4.1-r6.ebuild 1285 BLAKE2B 5d3ff5d40312c67fa7bf9e1542f7608e3882d2c73da2b98a6221c0c8057d58b253e4af2ad2d1b838aad331907369fe8ad2dfa7b11d94b1b438685eac275f76c2 SHA512 2b41c1d759bf29239ca9f7510aa8d7dc5a7b6387a98746972d2a61d0935651bf1ce6f6b89f4b8897d8cd1bcd8f32b00cf4d6a2a29babb6123e5aa4653d25c769
-EBUILD tclpython-5.0.ebuild 1266 BLAKE2B 162fdbd929090b08fd0f66d8186c539187f6270c2b9b2d7090efac2b3dcfe43dd11296533f0b759d3354bd983dd1a6809cb0d167fe0feb2196003669d15d1cf3 SHA512 5859b729031ac8de2c6301e33c2689bcb8b9f22958d0b8a0348d22599f29c502c76c9439f8a69806b9984df00f3021fb45afb78903134715634e5db27d657f81
+EBUILD tclpython-4.1-r6.ebuild 1279 BLAKE2B 684acb03b7a6d3a5684d16494f3a10d23abfd1da164b528c6dccb78c131bc67554809e318b44604eb4dc07697f5f950dd4634ef8a9c5a0df6d3678fdfb0b6a57 SHA512 addcbf2fb4e252dfdc7915f7df82086c1c62d62f27372e8dbd2b6eccf9d9334d5a89f5b3ae0151666d65974729dbe351d18c1908e2309d471508913ae7daa1f2
+EBUILD tclpython-5.0.ebuild 1260 BLAKE2B 34766b4c2feba32e959202ca17f3ba060cdfb962c79767cb1f536a71ed12da55f011c280427ce97e4ede9bccbc572b93725df9006f37e0ed5ae086cc5b91d807 SHA512 a444ee78eb6b83f1c63b28010b529f9d02a5c28d9160630609455832a94ef5a112a53f5457ae9a4737a90fe0d405b6eae50bd99b0421b07a415a46c1004ca6a1
 MISC metadata.xml 259 BLAKE2B 174c3c7b4292350e73a38b09d473abba172ee6e82ca1b5bcb6815a9927609a7fbac063a19498e7c5deaa32530d10d8c493760ff5b6e489f821410cfeccadf566 SHA512 5943f2c9dc9a55862bae4c01be9e1f27304ffc1ce48d67341b4a19793c0bb11fe3d1a419af924ac360aeeafbce28018971602019a559a8a6c5939e05e3567639
diff --git a/dev-tcltk/tclpython/tclpython-4.1-r4.ebuild b/dev-tcltk/tclpython/tclpython-4.1-r4.ebuild
deleted file mode 100644
index 3508b6c02a13..000000000000
--- a/dev-tcltk/tclpython/tclpython-4.1-r4.ebuild
+++ /dev/null
@@ -1,54 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-PYTHON_COMPAT=( python2_7 )
-
-inherit eutils multilib python-single-r1 toolchain-funcs
-
-DESCRIPTION="Python package for Tcl"
-HOMEPAGE="http://jfontain.free.fr/tclpython.htm"
-SRC_URI="http://jfontain.free.fr/${P}.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 ppc x86"
-IUSE=""
-
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-
-DEPEND="${PYTHON_DEPS}
-	dev-lang/tcl:0="
-RDEPEND="${DEPEND}"
-
-PATCHES=(
-	"${FILESDIR}"/${P}-python-3.patch
-)
-
-src_prepare() {
-	epatch "${PATCHES[@]}"
-}
-
-src_compile() {
-	local cfile="tclpython tclthread"
-	for src in ${cfile}; do
-		compile="$(tc-getCC) -shared -fPIC ${CFLAGS} -I$(python_get_includedir) -c ${src}.c"
-		einfo "${compile}"
-		eval "${compile}" || die
-	done
-
-	link="$(tc-getCC) -fPIC -shared ${LDFLAGS} -o tclpython.so.${PV} tclpython.o tclthread.o -lpthread -lutil $(python_get_LIBS) -ltcl"
-	einfo "${link}"
-	eval "${link}" || die
-}
-
-src_install() {
-	insinto /usr/$(get_libdir)/tclpython
-	doins tclpython.so.${PV} pkgIndex.tcl
-	fperms 775 /usr/$(get_libdir)/tclpython/tclpython.so.${PV}
-	dosym tclpython.so.${PV} /usr/$(get_libdir)/tclpython/tclpython.so
-
-	dodoc CHANGES INSTALL README
-	dohtml tclpython.htm
-}
diff --git a/dev-tcltk/tclpython/tclpython-4.1-r6.ebuild b/dev-tcltk/tclpython/tclpython-4.1-r6.ebuild
index 3c865021275b..e6896c3a0158 100644
--- a/dev-tcltk/tclpython/tclpython-4.1-r6.ebuild
+++ b/dev-tcltk/tclpython/tclpython-4.1-r6.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=5
 
-PYTHON_COMPAT=( python{2_7,3_6} )
+PYTHON_COMPAT=( python3_6 )
 
 inherit eutils multilib python-single-r1 toolchain-funcs
 
diff --git a/dev-tcltk/tclpython/tclpython-5.0.ebuild b/dev-tcltk/tclpython/tclpython-5.0.ebuild
index 484457e30484..92786421ee10 100644
--- a/dev-tcltk/tclpython/tclpython-5.0.ebuild
+++ b/dev-tcltk/tclpython/tclpython-5.0.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=6
 
-PYTHON_COMPAT=( python{2_7,3_6} )
+PYTHON_COMPAT=( python3_6 )
 
 inherit multilib python-single-r1 toolchain-funcs