gentoo resync : 14.07.2018

5 files changed, 2 insertions, 59 deletions

diff --git a/app-shells/Manifest.gz b/app-shells/Manifest.gz
index 3828fb9c801e..46e288d1b1ec 100644
--- a/app-shells/Manifest.gz
+++ b/app-shells/Manifest.gz
diff --git a/app-shells/pdsh/Manifest b/app-shells/pdsh/Manifest
index 407dc48281bf..9b8e39ef2b5d 100644
--- a/app-shells/pdsh/Manifest
+++ b/app-shells/pdsh/Manifest
@@ -1,4 +1,3 @@
-AUX pdsh-2.18-unbundle-libtool.patch 1738 BLAKE2B dff39459032013b770cfab19407475c06b246369092aac77c071f0654f89f9874f1883068542a606b88cc83fd735ec4091c4f9b6b0ce6c1df677b1ec6fe346ba SHA512 e36e284cc9fde9cedc9d2daac31dd1c272c306b1b84d2ee6a55430ad755ced23d6bd5e5a50bf4f6621fcebe96cb105cf49e70c6d4c5cf5913deb66ba0d86491f
 DIST pdsh-2.26.tar.bz2 490732 BLAKE2B 809a7ee0a1026e0cdaea8bf97c046a3a6e2994199dbbdb2cebe56de0393e8422a07e86f1ff60d6e750bf7279ccb43c03ea3aa4529b6fa6a34e3d77d90f0c3597 SHA512 3f15b3bb4fc2cff27a3b5d68de3e6cb74bb4001288a787763358a0641d0cc77c840b2c6641213ef31bc9d9d69cfe9531b25d7a9375630a5b008b1bcffbe95c0a
 EBUILD pdsh-2.26-r1.ebuild 1287 BLAKE2B 4acd78fedf0a8ec33a223502d0c93d0038d912ddea66fa0513a018f2e8ca3a437c17566feee8c63f3cd527a50c2b1968354c7940764bb3c1e49366f5411c266e SHA512 5af633bc908bb1176ffbe79c8ca69689807315aac079a0ba80cfedd08bce905ec7dbb2c97e2aab564db47db9a7139459fbfab995624e6b9780388407514ca20a
 MISC metadata.xml 1204 BLAKE2B db664f8622eaf0976ab1899583abab0268758d2edcdf0dd038ef59f54f1cf86c30956aa9cac35fa1a28a6760196050da01cfdbfcb56742aa233075aaa77a4eed SHA512 abaa972d578e11c47d16497fecbf7d72a07915b0b57c7f6458f82b0a36b55575b2d94a43f6f6a71a925a0e4ed56346056f9bc1d939a4190f2c899fcf58c9c752
diff --git a/app-shells/pdsh/files/pdsh-2.18-unbundle-libtool.patch b/app-shells/pdsh/files/pdsh-2.18-unbundle-libtool.patch
deleted file mode 100644
index e73fb12d2e79..000000000000
--- a/app-shells/pdsh/files/pdsh-2.18-unbundle-libtool.patch
+++ /dev/null
@@ -1,56 +0,0 @@
-From d055c4e9e2d414c9d51f7a6f2cf51cedfc79260f Mon Sep 17 00:00:00 2001
-From: Justin Bronder <jsbronder@gmail.com>
-Date: Tue, 6 Apr 2010 11:48:28 -0400
-Subject: [PATCH] unbundle libtool
-
-Bundled libltdl is vulnerable, CVE-2009-3736.
-Patch grabbed from Debian:
-http://ftp.de.debian.org/debian/pool/main/p/pdsh/pdsh_2.18-6.debian.tar.gz
----
- configure.ac         |    6 ++++--
- src/pdsh/Makefile.am |    5 ++---
- 2 files changed, 6 insertions(+), 5 deletions(-)
-
-diff --git a/configure.ac b/configure.ac
-index 2680344..196356b 100644
---- a/configure.ac
-+++ b/configure.ac
-@@ -38,8 +38,10 @@ AC_DEBUG
- # Libtool and ltld.[ch] support
- #
- AC_LIBTOOL_DLOPEN
--AC_PROG_LIBTOOL
--AC_LIB_LTDL
-+LT_INIT
-+AC_SUBST(LT_CURRENT)
-+AC_SUBST(LT_REVISION)
-+AC_SUBST(LT_AGE)
- 
- AM_CONDITIONAL(WITH_GNU_LD, test "$with_gnu_ld" = "yes")
- 
-diff --git a/src/pdsh/Makefile.am b/src/pdsh/Makefile.am
-index dfc48a3..beac854 100644
---- a/src/pdsh/Makefile.am
-+++ b/src/pdsh/Makefile.am
-@@ -14,8 +14,7 @@ if WITH_STATIC_MODULES
- MODULE_LIBS =              $(top_builddir)/src/modules/libmods.la 
- else
- MODULE_FLAGS =             -export-dynamic $(AIX_PDSH_LDFLAGS)
--LTDL_FILES =               ltdl.h ltdl.c
--LTDL_LDADD =               $(LIBADD_DL)
-+LTDL_LDADD =               $(LIBADD_DL) -lltdl
- endif
- 
- pdsh_LDADD =               $(READLINE_LIBS) $(LTDL_LDADD)
-@@ -25,7 +24,7 @@ pdsh_LDFLAGS =             $(MODULE_LIBS) $(MODULE_FLAGS) \
- pdsh_inst_LDADD =          $(pdsh_LDADD)
- pdsh_inst_LDFLAGS =        $(pdsh_LDFLAGS)
- 
--pdsh_SOURCES =             $(PDSH_SOURCES) $(LTDL_FILES)
-+pdsh_SOURCES =             $(PDSH_SOURCES)
- pdsh_inst_SOURCES =        $(pdsh_SOURCES)
- nodist_pdsh_SOURCES =      testconfig.c
- nodist_pdsh_inst_SOURCES = config.c
--- 
-1.6.6.2
-
diff --git a/app-shells/zsh/Manifest b/app-shells/zsh/Manifest
index bede219fea05..cfdf35eaf97f 100644
--- a/app-shells/zsh/Manifest
+++ b/app-shells/zsh/Manifest
@@ -6,7 +6,7 @@ DIST zsh-5.5-doc.tar.xz 3216400 BLAKE2B 3d07b336222b08d7deff0ded6f603a47bcdcec97
 DIST zsh-5.5.1-doc.tar.xz 3216632 BLAKE2B ef1274799604d74eb9cec3c29927703c98bb63bde3aa5ce4880eda45420fe1eb79c54a693fe529c9e79161f924a76bc2a650253216c7b1e565af65f1ac3c0d91 SHA512 e240f6c6aa2efb941c2baaaf749c66c9e304ba54ce2be90586671ba47e380aac89315516e5dce41fa0ae1d8fccfc36f61ed1400b6aab3382927e2715a77d62e6
 DIST zsh-5.5.1.tar.gz 4578700 BLAKE2B b58fc763bc64e8ed6de0db2e0fd454aef995fcc86b18c2ffd4b39e037ce1cdeb04e6e2a44b2495ca89218af41ad1dd7d29e429d21fbab39377d95e62d249732e SHA512 c4f7327a3f5480bd9a169fb07e34812e0106fa9de3b5f7d38bb0db85a3e4d01b9a4a8f35553da03a15d7d819108305cfaa2811c945273e2cac84512219e69ebb
 DIST zsh-5.5.tar.gz 4576506 BLAKE2B 4f5923d519b0c96475f4832cf0e5cabc1432e765d201c992903ead45b175d5bc76410ebe248c2bd01ad75a5b5939bc5bc58e9263bb4501f9b2c1f5b4d7755896 SHA512 aafa29e1bc29d35fb5822ad4ca5f4c64b1e4a4e3f9bff70e9e5976918fa9e7906467bd11f69291e694dfa77efa1e5433d7839fc668aa572228623f1c131c381f
-EBUILD zsh-5.5.1-r1.ebuild 5819 BLAKE2B ce90b05f67237ac99adce8927cc29985dad103c9fe1b781b134d144bc8dd46e19a08fdfe86655dde9acb289b7d7dbd3ff3b367fd69ceed0961b61125cce4381b SHA512 4e23162334c1a521adc76fbed5b185546c1dc539272ec215359a13fb8d146151098c6437b27d9eb49c24f9a2a487f874276150edf16ff42bc7067e62296ac13b
+EBUILD zsh-5.5.1-r1.ebuild 5815 BLAKE2B 2de69268e1f33af03aeaa916c5bd131ce2af119289188009a77f411b438133a14fcba24930d428a6f9d164dbd136827875289ae323a5a74889e81a786efd6c84 SHA512 635d6e440d16c5ebde6695f49085974f3ffc6be21770051c29582fd8efcc2f2d7fa208099c5979ebfa54bbaf5f264025cb7a6e654081ea81d68d7fab0b7a2d6a
 EBUILD zsh-5.5.ebuild 5809 BLAKE2B bc7175e593de89a97c11d613881fe269417b5f2ef9a0cb131292dc3299c45041a87e03572620156723194bb24fbe77245b0fc64bedf6a9c9cea98dfbfb33a0e5 SHA512 5fe29eeafee8b5de30e8a606aa8b6b7950740cd0b1f6852955ff4f4cca30f9cf1be28a74adf760189f9a010334408ab3eddec1243a6faee335296efb39e08ed3
 EBUILD zsh-9999.ebuild 5819 BLAKE2B ce90b05f67237ac99adce8927cc29985dad103c9fe1b781b134d144bc8dd46e19a08fdfe86655dde9acb289b7d7dbd3ff3b367fd69ceed0961b61125cce4381b SHA512 4e23162334c1a521adc76fbed5b185546c1dc539272ec215359a13fb8d146151098c6437b27d9eb49c24f9a2a487f874276150edf16ff42bc7067e62296ac13b
 MISC metadata.xml 627 BLAKE2B 075ca50a779af22aa7664943a0ec270d99869d615d73aa65f5483d4ae30821ca535f18e8841c43f2359ae83650f32931a6f91e8b0eab63ceee7ec4754db55f3c SHA512 489307b83b15893965874824d59bf9d54a6f82aa13c62e1e7a12ada87d10b8e5d3ab63c6e1dc327b087f7403c871ce3cb766423e3513ed0c3b2304342775fbb1
diff --git a/app-shells/zsh/zsh-5.5.1-r1.ebuild b/app-shells/zsh/zsh-5.5.1-r1.ebuild
index 9f6dc303d882..82381ec8d41a 100644
--- a/app-shells/zsh/zsh-5.5.1-r1.ebuild
+++ b/app-shells/zsh/zsh-5.5.1-r1.ebuild
@@ -9,7 +9,7 @@ if [[ ${PV} == 9999* ]] ; then
 	inherit git-r3 autotools
 	EGIT_REPO_URI="git://git.code.sf.net/p/zsh/code"
 else
-	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+	KEYWORDS="~alpha amd64 ~arm arm64 ~hppa ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 	SRC_URI="https://www.zsh.org/pub/${P}.tar.gz
 		doc? ( https://www.zsh.org/pub/${P}-doc.tar.xz )"
 fi