gentoo resync : 16.04.2018

7 files changed, 12 insertions, 25 deletions

diff --git a/dev-lang/tcl/Manifest b/dev-lang/tcl/Manifest
index 044459e50693..129fa3b72cf3 100644
--- a/dev-lang/tcl/Manifest
+++ b/dev-lang/tcl/Manifest
@@ -1,13 +1,12 @@
-AUX tcl-8.5.13-multilib.patch 419 BLAKE2B e047adaebe0caaeba259bee8fd162a11160a3735881ab451687c03a4194b789c5f16a363be680caec2f7fced2af12c16ed3efd3d0cf7b13c01c0e69fea98f0ce SHA512 946a0274facb0dcefb2129beea14dd8b874558803f8da612c6c00d844270cd9c797089f8e5b21d4f11d206dcfb7bea92ab00b96ce7db4217efc18b82f197347c
-AUX tcl-8.5.14-conf.patch 518 BLAKE2B 5a544faea1d1f018beda8c7663f22ff76f81316babf50847d98542a464e04c2335d4c6487831b867e20ea549eb9ac75f53e17d5e5346fc0aad139e1ec02bb22a SHA512 564779732d4ad1253e4f6fbc760eabf67153e8978c29e434f7796c57a637932bf5d8308edb1e0951e391ec490ea00cd4360b19eae79fc840af02acd4ef03a021
-AUX tcl-8.6.1-conf.patch 518 BLAKE2B 5a544faea1d1f018beda8c7663f22ff76f81316babf50847d98542a464e04c2335d4c6487831b867e20ea549eb9ac75f53e17d5e5346fc0aad139e1ec02bb22a SHA512 564779732d4ad1253e4f6fbc760eabf67153e8978c29e434f7796c57a637932bf5d8308edb1e0951e391ec490ea00cd4360b19eae79fc840af02acd4ef03a021
+AUX tcl-8.5.13-multilib.patch 258 BLAKE2B ca0453e8e0f6fdc1302f024ff81a8a6e012d0bfce592b990a349b10bed87d2adbb5dd0f68590373604327074d8da0bddeedb74549a5b33babaeba565838bf3f5 SHA512 7c5e06ba1028016abb6d1b3160834e311044c85db8ee1ba4f4b4d7a961096afeebff4164b276907de8b807ea8138225f1cad7641f2221284383aa31423353924
+AUX tcl-8.5.14-conf.patch 427 BLAKE2B c7d97bccebc45beec003bcf005fab6ed7f544744d81f08778a997b767ea0a60fd07f7b7cbc464ef8252e47717b34c0c42c871331a04740e23caeddbfb351de16 SHA512 e8097acb127966e6f2914c888278acdd9042d881b4d9436853ad7ed2361e8d67a372d4b0b0d5f0333e6bf90220e72df5c5eeffd4b44bc8e94ea9631ddc98cf16
 DIST tcl-core8.6.5-src.tar.gz 5846556 BLAKE2B 9c3c48acffc13be526b507fc19711b21e710a84642d37d494bb46a2d4ac9445a95749fd9556ffbda57d55f90bd566d0c9cd72a800a34f062616aacf57e811aa4 SHA512 b726f7d3193ad92ba64911b8c724d5454c5a93d5f5e95462ec0a6d8ccbbdf20093888f66c83956d7631392ca805c1a80430f102c0a932de3ed55311101e0e09f
 DIST tcl-core8.6.6-src.tar.gz 5868427 BLAKE2B 3444d474bfdc4958919dbf75527420614251e3cffb0d18fbbf547ffb83ead544f266b6ea868738ae40e02075cf31be6e753e0f89da02a2a81ededf09fc9dd2e6 SHA512 469a0221ed16569b70986cdde261d0c0df3bf64c493b8d6fc8368eb14597f7c2f6a01f082a1c8f27eb720618956e053cc97fbb9aaf7bb29cc96781cdc8e9518c
 DIST tcl-core8.6.7-src.tar.gz 5875027 BLAKE2B bc08e4e6639ba33176c8c1e670b957b8ad62a4790ace4ff8f8dc964f676ca87473c31c28f645d32a8287f844756fa224a077f96f1425f61b9872a4a0ae1429a1 SHA512 95c8c5bcb4fe604a77ca6ba9d49f9e90d156feaa9f3ab97661983f256ab54476b103ec8de01cd47231ed95e6df5e36d60514aed2ba5b8f3619cc5a3698ad3ee5
 DIST tcl8.5.17-src.tar.gz 4546317 BLAKE2B 27031dd3bd5790d03692e77edf91eb7fae8a40d8d193d8c8ce4e79b21f90e683bfc9d5b71764760223987fb163be844e6096d0aea1058b8ce255731d97e2a0ea SHA512 ad5ddb4cd6378fd6bbea8cd85ceb1cf90392b2e8c49fbfb3e4b35c81d3ae3e3f087697c41fcba8c8e06de1d9e7539397e26d58b864dc01ba65abe4ba4efa9568
 EBUILD tcl-8.5.17-r100.ebuild 2790 BLAKE2B d8de982d4d2f103bd5a1271101bc997cd1920c7274078f9004e6983d30326fa0379588d529c3e459f4e93e9e723548aa37fc5e074df768d046bafc3decb4297e SHA512 b09ac13d74992c34c333fba336e07e6baefbe8ee6a94e8c59b17ac40a508bab4146f7a6d00f712ef70b9d5d8d168d259dbbed77d4e5e2e65c2b45ff2769586d7
 EBUILD tcl-8.5.17.ebuild 3706 BLAKE2B 4f5b6c6fb9c25a7d31a1adc45fad8fa432478056d5a0895298ba79f2a5904bcd977a73d60f34355ed5290bf5077f5d74ba050583ebf0e99a119f9d4b14dbfe0b SHA512 11816e9baefbf29264fd844ddeb38fa94686b0b8ca667e7046713860a97945caf122f831d7778b7ac78ab392bd4ac9bc10578c70d74b21c83c5da1b479d9c800
-EBUILD tcl-8.6.5.ebuild 3961 BLAKE2B ee6b3a012eb7fad781ab7593801eea77039940eae7fb8c0cf8d6a28721ee67df92fc1f311158fee2c87f1098a5f08d327d5492c124a67cb71ede902afaed17d5 SHA512 51e845aa8a42f73b00c428a63d07b37562305fe9fc915c0c507cce08141176353c6de00d802ec10a170b443df7e52054e33fc292ce3583140edd08b441bc3269
-EBUILD tcl-8.6.6.ebuild 4051 BLAKE2B 81d90b421abe54a2849ffb7ff0151dd1e3476ee9ec328e17998cbe8974dd01642e0802e6041f2b0cd99bafc6c28436afa89041822cf593e595d5e16f828111d1 SHA512 29f127ccb5954289573aee94cb14d3de2c647e3f2bb2fed5c2222d05bf52dd98a2337b3949139c43f20b3c0a71aaecfab9ad0030aa672b818bd9bf49c41ab008
-EBUILD tcl-8.6.7.ebuild 3974 BLAKE2B 897747e597e14720735bc4a1ecf20f572439515b1e55e29794a203867c59f46a7d416f55627576f5c228c616f4d3ce4f97d4781262128fda2b7b35f34e5caa76 SHA512 19a5ff8e19265c9787a26b644e473739e99c3790a460406eb3b332ec5f77e1e4e2eadc7bac2a5900e4a97c45ae0fe8f7b33fd2e9f1840e321dbbb91097c76d6f
+EBUILD tcl-8.6.5.ebuild 3962 BLAKE2B 3fadd59589caa0bc22a7970c6bb52dd662e36e93f6a2ddf9f73c1f276afc36a2f4dc75e1ffb3b2b3be46b1e9686a8a41c722863a0d8daa116d8e61c40db5b279 SHA512 96f7b910afdd515558dd0f9778ca5cac8e1d9a25fd7e615f8c43adad29ec5237e6a5edf9f702792fdc7eee147b015472a3febc4da98cf07d8c9aa3d5c80851c3
+EBUILD tcl-8.6.6.ebuild 4052 BLAKE2B 8a7f179399498a724248560f5d097f3bd55576dd59e7b89eff778010e7b20d79587e78dd31f213bf49f4000f9067793a9b3621415b0558f5e96cdefdad786aef SHA512 4bc69a1465c801af3d02ba5e1968d4def97e724ae40a43af009aa2281c7999c26e0b4fbd843a6b8cb87515cd6516decef35c85c37fd91232dfebe3f915b6f260
+EBUILD tcl-8.6.7.ebuild 3975 BLAKE2B f634d8ca712b39080fd7949361849e7c33f94c4abae673faf306cd750523ceefcd19aef75700759225a32850ac51d0e59bfcce7cffdf630ddc25852efc0579fe SHA512 a8160b7d89b82d3f66946a33b710aaf570132623d4b9a7ba7c180133c199b4f82ef4cc75508e7e83226a37921c31e38d9d2e9f37b13602bac73b706047e9ca31
 MISC metadata.xml 318 BLAKE2B 7ea8e51656c255c3aea3bee8849423604a164efff556974f6032de44d33e38bb0378b69c18821cc76f0284064bc84a1a56e79f522f8d7fb0adc50e2e191b5fca SHA512 61f3feb8311f1babb8a4df8c9fcddaab009ffc6d69248f18cb9e001a1659dfcf47f2699008ab83fb563b3417f6ead8113af20db7e3893f488e8d75bb2a3483cf
diff --git a/dev-lang/tcl/files/tcl-8.5.13-multilib.patch b/dev-lang/tcl/files/tcl-8.5.13-multilib.patch
index de1580ce55bd..8c4bc7482189 100644
--- a/dev-lang/tcl/files/tcl-8.5.13-multilib.patch
+++ b/dev-lang/tcl/files/tcl-8.5.13-multilib.patch
@@ -1,6 +1,5 @@
-diff -Naur tcl8.5a6.orig/unix/configure.in tcl8.5a6/unix/configure.in
---- tcl8.5a6.orig/unix/configure.in	2007-04-27 02:33:51.000000000 +0900
-+++ tcl8.5a6/unix/configure.in	2007-05-16 10:27:25.000000000 +0900
+--- a/unix/configure.in
++++ b/unix/configure.in
 @@ -645,7 +645,7 @@
  
  eval "TCL_LIB_FILE=${TCL_LIB_FILE}"
diff --git a/dev-lang/tcl/files/tcl-8.5.14-conf.patch b/dev-lang/tcl/files/tcl-8.5.14-conf.patch
index be303e9f3ef8..a8b3aa021014 100644
--- a/dev-lang/tcl/files/tcl-8.5.14-conf.patch
+++ b/dev-lang/tcl/files/tcl-8.5.14-conf.patch
@@ -1,5 +1,5 @@
---- tcl8.5.0/unix/tcl.m4.conf	2007-12-20 10:48:05.000000000 +0100
-+++ tcl8.5.0/unix/tcl.m4	2007-12-20 10:48:52.000000000 +0100
+--- a/unix/tcl.m4
++++ b/unix/tcl.m4
 @@ -1427,7 +1427,7 @@ dnl AC_CHECK_TOOL(AR, ar)
  	    # get rid of the warnings.
  	    #CFLAGS_OPTIMIZE="${CFLAGS_OPTIMIZE} -D__NO_STRING_INLINES -D__NO_MATH_INLINES"
diff --git a/dev-lang/tcl/files/tcl-8.6.1-conf.patch b/dev-lang/tcl/files/tcl-8.6.1-conf.patch
deleted file mode 100644
index be303e9f3ef8..000000000000
--- a/dev-lang/tcl/files/tcl-8.6.1-conf.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- tcl8.5.0/unix/tcl.m4.conf	2007-12-20 10:48:05.000000000 +0100
-+++ tcl8.5.0/unix/tcl.m4	2007-12-20 10:48:52.000000000 +0100
-@@ -1427,7 +1427,7 @@ dnl AC_CHECK_TOOL(AR, ar)
- 	    # get rid of the warnings.
- 	    #CFLAGS_OPTIMIZE="${CFLAGS_OPTIMIZE} -D__NO_STRING_INLINES -D__NO_MATH_INLINES"
- 
--	    SHLIB_LD='${CC} -shared ${CFLAGS} ${LDFLAGS}'
-+	    SHLIB_LD='${CC} -shared ${CFLAGS} ${LDFLAGS} -fPIC -Wl,-soname,${@}'
- 	    DL_OBJS="tclLoadDl.o"
- 	    DL_LIBS="-ldl"
- 	    LDFLAGS="$LDFLAGS -Wl,--export-dynamic"
diff --git a/dev-lang/tcl/tcl-8.6.5.ebuild b/dev-lang/tcl/tcl-8.6.5.ebuild
index 714a452ad868..3639ae997f53 100644
--- a/dev-lang/tcl/tcl-8.6.5.ebuild
+++ b/dev-lang/tcl/tcl-8.6.5.ebuild
@@ -26,7 +26,7 @@ PATCHES=(
 	"${FILESDIR}"/${PN}-8.5.13-multilib.patch
 
 	# Bug 125971
-	"${FILESDIR}"/${PN}-8.6.1-conf.patch
+	"${FILESDIR}"/${PN}-8.5.14-conf.patch
 )
 
 src_prepare() {
diff --git a/dev-lang/tcl/tcl-8.6.6.ebuild b/dev-lang/tcl/tcl-8.6.6.ebuild
index c13faf4b0c59..013773c8fd85 100644
--- a/dev-lang/tcl/tcl-8.6.6.ebuild
+++ b/dev-lang/tcl/tcl-8.6.6.ebuild
@@ -28,7 +28,7 @@ PATCHES=(
 	"${FILESDIR}"/${PN}-8.5.13-multilib.patch
 
 	# Bug 125971
-	"${FILESDIR}"/${PN}-8.6.1-conf.patch
+	"${FILESDIR}"/${PN}-8.5.14-conf.patch
 )
 
 src_prepare() {
diff --git a/dev-lang/tcl/tcl-8.6.7.ebuild b/dev-lang/tcl/tcl-8.6.7.ebuild
index 5195bafb2350..de2ab7c8cdc4 100644
--- a/dev-lang/tcl/tcl-8.6.7.ebuild
+++ b/dev-lang/tcl/tcl-8.6.7.ebuild
@@ -26,7 +26,7 @@ PATCHES=(
 	"${FILESDIR}"/${PN}-8.5.13-multilib.patch
 
 	# Bug 125971
-	"${FILESDIR}"/${PN}-8.6.1-conf.patch
+	"${FILESDIR}"/${PN}-8.5.14-conf.patch
 )
 
 src_prepare() {