gentoo resync : 06.01.2018

4 files changed, 19 insertions, 19 deletions

diff --git a/dev-tcltk/Manifest.gz b/dev-tcltk/Manifest.gz
index 676e8c6e93a8..1731810e4d1f 100644
--- a/dev-tcltk/Manifest.gz
+++ b/dev-tcltk/Manifest.gz
diff --git a/dev-tcltk/tktreectrl/Manifest b/dev-tcltk/tktreectrl/Manifest
index 041094a4131a..4b2ccd37914f 100644
--- a/dev-tcltk/tktreectrl/Manifest
+++ b/dev-tcltk/tktreectrl/Manifest
@@ -1,8 +1,8 @@
-AUX 2.2.9-as-needed.patch 347 BLAKE2B 37715246ed7f941a5dd204b2a6096dd74a32028ef14db9554164d1e8aa201a152cae6210cd0cdc748d8de14425a03fa578bdc1e4744c40faf47081ae987e31a4 SHA512 6b3a916c97a28a644b04fa7a653e13e594a7d71a70aa64f2ab8b08793268a788737b568a83355dfa94d8dc0df95516dfb4b6cba98ed4cf54b2fceae35e2711a7
+AUX 2.2.9-as-needed.patch 351 BLAKE2B 3687044d67bfccb7d01c46b7f39a449337ebe4ca6ccaa174e217e26e2ce8f59376f2a6cabb353cc6ab4c2fd1eb921cc34f02770830d78d6e739e26a781c59036 SHA512 636bfe9e6d7aacb3ca3ad843b89fef10dc035cf3f714981b3e7191c8559df7be9fb98cb848244aa0ec3d3ef1c974ef99fa50e781233b3a874eb76cc9a864148e
 DIST tktreectrl-2.2.10.tar.gz 742335 BLAKE2B c3840d8a83f5ce973ef2f942c0f303f3507b49b6dbbd7dd6fb4a9134ecd6d3f1c780cf391ded9e8e7dc55b3276c68807b91ec549fded12ed5ee4bcb940e69dca SHA512 20598393d54ee304d0be74ef3de9f242433814b7c5dc8b649f8f18dfa5505dee66aba624e2ac2671a167b8ac491f5edbe0dc397db74cab740c6bc59e564b53e1
 DIST tktreectrl-2.2.9.tar.gz 718999 BLAKE2B adc880e2bc52cf667c086a70f59ebc35113ae5b0ca8d2fb4a2d6abee4cf6ff55922e254b6a0dea13052fc2acec0190294bf8347421f41bfa018b574678f7ef1e SHA512 8e1f5d176e939238cfc6dc83e55dc1df911e13f633bac494b4e9a954729b6047b6436283509f83ec57d43eefd7dae4052ffe3af38a22a162faf7959498bc0b0e
 DIST tktreectrl-2.4.1.tar.gz 945101 BLAKE2B 8b91d0f264df4ab79f897608e259998139ab3cd3ba9359e1d74a23a174465a468c3bec0c5983764d2e23049d5feb70905066419c7c883007c6aa5e655d50dccd SHA512 5ea3f286326cb9dd32a259f8032c37dd3bfe4c4ecdac878cc8e7a283b542c4eb67a5434c97ecc81b9773f08e55563401a173234452ebf63547c00780e5703c1b
 EBUILD tktreectrl-2.2.10.ebuild 814 BLAKE2B b633273afa761c197f8a90fbc6c6d8e43fa4b7dd248f439ea3c397a78be5e6b8217ecb11fd615e376b8b6dfaf7d27f051843eb1ce0eec6bc3d2910f22f7d79db SHA512 712468b548f56334f3da627658448413dc1694f2387ad62bc4ccf1822b857230bef15c1468e4b9671a534f2a23da93158e1698480083f2ee2d13ec3dff8b893b
 EBUILD tktreectrl-2.2.9.ebuild 872 BLAKE2B f577b0d0a31379be283a1ecb9e9c82f9f4efd77ed961c450f5d675fd80c3aeead88e0ea8a8fd4be19477ecb04629bcd82dd6ca1bf799c8cd9f6e8452e57f1d57 SHA512 dd92235605b0bc0e17f8c2b060fb461e1f5bebdb194c4b7004e512b7d69aaf77da7e4212507034891560ee60df65ac1b0e4dc2faaa44d16e3ee650a5c696ab39
-EBUILD tktreectrl-2.4.1.ebuild 814 BLAKE2B bc4bc8925ba3142e23c5642f22ee85d8f529ed220f4aa624351ad3f80f4da4459f551565109c252e14417efd174498ab060bed968d81821d939a31b6799a540b SHA512 a0e838736c77eec8ad8d015bda96b06b2a7b7b307f65abac7d6cc8bfae42bf5c9e4a684f8222abb0d4a8cc0f71f1b35f8b1c6ab4c8bfd6b4be74cf651835a688
+EBUILD tktreectrl-2.4.1.ebuild 822 BLAKE2B 138c41ab3b83db14315fcaaa1f5235ff373c34c3db7d934a9fd8258baedd2c95a3117cd40b0a3d10b6b5b08f86d385843cc27b3eb8d4febb75d05288c6c90eb3 SHA512 99acbd521b7af0fe070754b0b1975252efa6b96626469b644245af4c60dc8b1b09ac0d8e8126415258aca28391223f9194567d3ceba4f5a132d3c69b882a0f47
 MISC metadata.xml 363 BLAKE2B 67d01a5054e7bf5b5a3301e850bae7fcf6c061d5358cb19e4fadc7e493b9b45749810b1e233f273f36d9452c3676407845994c574e9b2139eb24575a16436aaf SHA512 bf1d25c20fa8d56bafb78ee43f041cc28de6c94a0cf05fceb030f6c3ef050a3c028a8ebae51b8c46121aa0d5fe67123de15a2e1dd507efe63308bdc4bc8e32a4
diff --git a/dev-tcltk/tktreectrl/files/2.2.9-as-needed.patch b/dev-tcltk/tktreectrl/files/2.2.9-as-needed.patch
index 8b6dcea48acb..07a1e36f9316 100644
--- a/dev-tcltk/tktreectrl/files/2.2.9-as-needed.patch
+++ b/dev-tcltk/tktreectrl/files/2.2.9-as-needed.patch
@@ -1,5 +1,5 @@
---- Makefile.in	2008-02-24 23:22:10.000000000 +0100
-+++ Makefile.in.new	2009-07-11 23:54:48.000000000 +0200
+--- a/Makefile.in	2008-02-24 23:22:10.000000000 +0100
++++ b/Makefile.in.new	2009-07-11 23:54:48.000000000 +0200
 @@ -107,7 +107,7 @@
  RANLIB		= @RANLIB@
  RANLIB_STUB	= @RANLIB_STUB@
diff --git a/dev-tcltk/tktreectrl/tktreectrl-2.4.1.ebuild b/dev-tcltk/tktreectrl/tktreectrl-2.4.1.ebuild
index 24e9f19a4e36..bd20b2a31822 100644
--- a/dev-tcltk/tktreectrl/tktreectrl-2.4.1.ebuild
+++ b/dev-tcltk/tktreectrl/tktreectrl-2.4.1.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2012 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=4
+EAPI=6
 
-inherit eutils virtualx
+inherit virtualx
 
 DESCRIPTION="A flexible listbox widget for Tk"
 HOMEPAGE="http://tktreectrl.sourceforge.net/"
@@ -14,28 +14,28 @@ SLOT="0"
 KEYWORDS="~amd64 ~ppc ~x86 ~amd64-linux ~x86-linux"
 IUSE="X debug shellicon threads"
 
-RDEPEND=">=dev-lang/tk-8.4"
+RDEPEND=">=dev-lang/tk-8.4:0="
 DEPEND="${RDEPEND}"
 
-src_prepare() {
-	epatch "${FILESDIR}"/2.2.9-as-needed.patch
-}
+PATCHES=( "${FILESDIR}"/2.2.9-as-needed.patch )
 
 src_configure() {
 	econf \
-	$(use_enable threads) \
-	$(use_enable shellicon) \
-	$(use_enable amd64 64bit) \
-	$(use_enable debug symbols) \
-	$(use_enable X x) \
-	--enable-shared
+		$(use_enable threads) \
+		$(use_enable shellicon) \
+		$(use_enable amd64 64bit) \
+		$(use_enable debug symbols) \
+		$(use_enable X x) \
+		--enable-shared
 }
 
 src_test() {
-	Xemake test
+	virtx emake test
 }
 
 src_install() {
 	default
-	mv "${ED}"/usr/lib*/treectrl${PV}/htmldoc "${ED}"/usr/share/doc/${P}/
+	mv \
+		"${ED}"/usr/lib*/treectrl${PV}/htmldoc \
+		"${ED}"/usr/share/doc/${P}/ || die
 }