gentoo resync : 10.04.2018

9 files changed, 142 insertions, 25 deletions

diff --git a/app-arch/bzip2/Manifest b/app-arch/bzip2/Manifest
index 4c37b3daac3b..da0fcf7a6ea2 100644
--- a/app-arch/bzip2/Manifest
+++ b/app-arch/bzip2/Manifest
@@ -1,12 +1,13 @@
-AUX bzip2-1.0.3-no-test.patch 161 BLAKE2B ed987a2f1f7abc7e3b5d2a87e18e7088ce992188ec3a3ab87a8f1f3660e986dc60e6b9501816e630151ad2a7ee55dc2f9118e9ebd7f05f2241d86c60caa85768 SHA512 a07f04189bce8a53980f324769cc8eb79eed9e42cbed223b74f566802e61eacb45e677c122266689a654d4fc946cba4a2171c72be87f98e4996c6cde5cb0c462
-AUX bzip2-1.0.4-POSIX-shell.patch 672 BLAKE2B cb736ade339c733e19d98d519d38934c850c53d8313cd8751fe7651ff8df2f97392eab7b8b29a65575f7b2a49c91fc3a03bf8fac97d0b5bac280b66cb8d36bdc SHA512 7fc5e34ac2fccb7e096bafa6dd934fb72375c17e0cfa3e0549648ecc82ec44521eb8f8ac3ce49a4064ee67fa9319da9e52db86a971443956f71d11c056289d19
-AUX bzip2-1.0.4-makefile-CFLAGS.patch 569 BLAKE2B 07679d21cca7c425ce1c4b3f67726f97ddf7a2d40c68867f7192b758d75257af19602be8cade40302f6c9c5b049ff66f0fbcc784b73076b79308530874610d60 SHA512 5ad3ecad8b577737386f0e5fc6f9adfd72334598b6dc76755cab6e38611b048c5c6b97462cbca48237a95802e1e2ac0de34b03d579d737edda8eea3e6a31346e
-AUX bzip2-1.0.4-man-links.patch 422 BLAKE2B ca26490930da0425e680aa0e9154e82459f166c2a936c25aab74d85b82bdd952ba3c0aac6cc30422c27c859c406911ff17ff703e5a982580b030d344503c734d SHA512 7c650620dc11522c4d8bd17a55da18ab3f8556cf83452459e86bceecf33a5de39b8e05e23eb11c4c8dffa79cc8d23d54741ccc8bc715dea2e108f5f3c8dde20c
-AUX bzip2-1.0.6-CVE-2016-3189.patch 619 BLAKE2B dd15991a21be9683ac0665d4b1ae86e400f8924419cd452c43db6ded1ea090dc37698c17c719cf5f45801910b93ed920a1dece7eda0fd2254c9689e1c0a59fb3 SHA512 ec8ec21ff795f4caafc7dab727280836894058a7c85e2a094033d71d4b0cdced108a371f15d423f49248707e3eb95303eeb40cb50c96cd136fe7cbf038e628a8
+AUX bzip2-1.0.3-no-test.patch 165 BLAKE2B 48f0f9393d1f7e6f56c93ecc53e80ea7507b7ac921e0d459082c9ac51eb98f9e89233c12975c2346b1c7e424e505116df881b1e57207a7ef325e0c55e2ce90ce SHA512 c6064aada01b9eebdaf5350bcc0f9b52dcc03fa8b5e361d5cb09260de0d301c190e406c5daa0edfb808bc2cb5061a4cd5361f920741024b750fa8e7570715e95
+AUX bzip2-1.0.4-POSIX-shell.patch 676 BLAKE2B f6ba04224ad924979221924dc81398455404a18b36754bc104ec67c4aa44e15512e51b84f5247f4737b1e242b5aa1497c76ebfd5cefa05d3ed4cfb2ee53c1781 SHA512 66e02e9422ecee1ae6e8e007eba95581313fcfa5703fa648470ff8975b5453e3d5323a4acf6264658612a6a2972e5c74cce061ce749e51d5e74769d068e4b365
+AUX bzip2-1.0.4-makefile-CFLAGS.patch 577 BLAKE2B adc265fbd71745e1f688c85386e48389c15569263861efa3aaa76a0328d71724fda22a23e95234cc13c90c95536b21e776bebffa79433d4f42e82d44c88588a7 SHA512 031780e77710619eb8c91350885a602b1cc1768e3776e46313a9535df6d8eb9502fa99624d81e5eccdebfaf97786148c3cd10fb2faed69c5a2ba24158915c0cd
+AUX bzip2-1.0.4-man-links.patch 402 BLAKE2B 9a3cabc0e3964f75408445d7a2d94422ffa38e22d0869e4f97b252ef2947173ab9a504f0c1cd82fc7479494038f899f4a2429e39729d6f3d80e570ca8ef97797 SHA512 91abd3af9ffb339cbf85e28cc65b9193d8799d81281320d4709e234f3f40483b390fd9517ad3a8aab8d240f011786df8f17e9240104a43d1292bca983c1c22cc
+AUX bzip2-1.0.6-CVE-2016-3189.patch 594 BLAKE2B b4a9f6e0267637d1f815e1b8cdbddfdd5e54fcc05cbd2f31c7e64494626b7531f2bb2b5ae8b288ce0ca116abc131235dbf31f32411b58b91e156a136adbc7ad1 SHA512 0b1d5814b93397c588c9b22a7bba57e2a7360ec30a781ca3c9236781089fb8e9f0393a9fd93c880517d084f54712b631302cffa4af81a91dff791717645ec81b
 AUX bzip2-1.0.6-mingw.patch 556 BLAKE2B 1885f5fe9a895e365606fd48d616553a23aa40d381ee87de8f725ed39b936e778ab517d00807a3a84120802d23fc5b54df48b3d33bebb18c7f9ba1c9afa961cc SHA512 e28442acc456c996eb6bc1866cd3814a9aea9c8a4ac2767a59bd03273ee95e34efdb4d00a17c64242a3395056b38c7083ec6f4c986e91d02f5348af1af2a35c8
 AUX bzip2-1.0.6-out-of-tree-build.patch 2121 BLAKE2B ff2d18e161e2ed437b3452639b352984e1037bbfa86857d90836994f306ddc375353c36a0afad15c58ad84021f1180bcdd10002c0ce546acc9426a68d263570b SHA512 f4a85c8b9ba0fe0ffadcb058550bb948e84c51f4c213957ffeb1072258efb1caa957c496ce0a0fb4d4b5f7dfdf062995a819487b9475389cfb25583fa061143e
-AUX bzip2-1.0.6-progress.patch 5756 BLAKE2B f41a60fb77f1aea7e3e2cdf0fe8379e4712dd597ee67df850f9c757dbd7625c2cf0ece0b40363e293fe468fc06f1793b70fabae05957150bb6e712ccaa646371 SHA512 c3f5959027346a471182fbcac72fe3b755d9327557ac31fd8d36746c643afd418f5a59bf434493109af4536b90e69220e985a25eb3ce7e3d05029583a9d0bcdc
-AUX bzip2-1.0.6-saneso.patch 439 BLAKE2B 839aa554d8fc7eeff16cb0dd19aa6bff68437c98ed974f7af25c07232ce2db05f3e366ea005a57bde85cc2dc4d5d4d6156b07c3133f3032b11e368f55058ed18 SHA512 4f5d499227e3381e87c43b4afa48b5cd1f796142805dee19bf7f9f3a8547ca5baaf0b1d1f42079a61b63e3c279650292cca119e7d177ad04425c93e23f1bbd88
+AUX bzip2-1.0.6-progress.patch 5716 BLAKE2B 8f89dcc1f9d95440cba7df54ee80e861e02e8f88d1ad906ef4bcecf4796ec125434b0e4d56f83715f30114d808aad9811b72cc890e85ace1901350d96f9d3f91 SHA512 e72ada256b08b539e4489d714d4d8612c643549cd25b1ec4e455b2c769c0955fe0e1f54504b259db213f3c72aa78c08d1f0513ce1ae113182691b504bd9c09b7
+AUX bzip2-1.0.6-saneso.patch 443 BLAKE2B b496406e6f3c520886fff99c9206d6d1a01dc0e55a8491bec0318741dc53ad6da321553e73c8929c5fb4938e7275671c04d4b5c86730b580a042a18bb81b7116 SHA512 b9798368d12ab3547ccd3bb614e3a81f1b232990c0f9e3e4472532a8070a3c212274d5b9d093cd046cfee7c8d25da9cfd368c7ca4bd86fbb67f34510107159ab
 DIST bzip2-1.0.6.tar.gz 782025 BLAKE2B b31533af7c71d715e6600874bb0a11b9b3aebbb08af0414a6d88bd5a2ad879a482ad408338159cb6c241815da8f48798d2ea7789ea971431d0be42ee827b0a7e SHA512 00ace5438cfa0c577e5f578d8a808613187eff5217c35164ffe044fbafdfec9e98f4192c02a7d67e01e5a5ccced630583ad1003c37697219b0f147343a3fdd12
 EBUILD bzip2-1.0.6-r8.ebuild 3016 BLAKE2B 1f48f0161c93dabc18beeab6f064b5ec44b901ca474525c3159c7859cafe3fd6207bafeb7254e763c5a9261f9d4b59271af564771d9201c00ecc408928154388 SHA512 b969bde987920cd44a90c4b89efc90f35f71c988852e0c623c38b461d8ec5ab9e969963aaf7b2177e5dad1fa4d0e0da7c61092527a5aebf2a6d17d5d6949bc85
+EBUILD bzip2-1.0.6-r9.ebuild 3061 BLAKE2B 9524a49b0eb6605bea586dccf9ff822e30e3b845239f4027126656e72f406657a8c1755a299e6638462a2195d652596cb0f220e21bc0b35b16ccf9b5d879abb4 SHA512 d0b6898314fe2498421a6f516ad5946dab295ca84459389a2dad32e5d09acf4e6806bd776d2100d10d5fb06f3d98ff1f0000d8420df84d988a46e7893566cdc1
 MISC metadata.xml 332 BLAKE2B b949c1c7d17334fcb499bbbd042cb217092743b6ae29fc64e634f7957767bf8c6a46f865b1681ce165d60143307795ebc417887fa8ba7a69afee95062411ea07 SHA512 1a7f730b73728875e428e7b123cd8e7773e8ea88a02d6891727775b50196854c608ae541846063a258874a83aab38800dc697b37196fe1c75162abe21b8f92d0
diff --git a/app-arch/bzip2/bzip2-1.0.6-r9.ebuild b/app-arch/bzip2/bzip2-1.0.6-r9.ebuild
new file mode 100644
index 000000000000..35cf13b6d7b6
--- /dev/null
+++ b/app-arch/bzip2/bzip2-1.0.6-r9.ebuild
@@ -0,0 +1,116 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+# XXX: atm, libbz2.a is always PIC :(, so it is always built quickly
+#      (since we're building shared libs) ...
+
+EAPI=6
+
+inherit toolchain-funcs multilib-minimal
+
+DESCRIPTION="A high-quality data compressor used extensively by Gentoo Linux"
+HOMEPAGE="http://www.bzip.org/"
+SRC_URI="http://www.bzip.org/${PV}/${P}.tar.gz"
+
+LICENSE="BZIP2"
+SLOT="0/1" # subslot = SONAME
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd"
+IUSE="static static-libs"
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-1.0.4-makefile-CFLAGS.patch
+	"${FILESDIR}"/${PN}-1.0.6-saneso.patch
+	"${FILESDIR}"/${PN}-1.0.4-man-links.patch #172986
+	"${FILESDIR}"/${PN}-1.0.6-progress.patch
+	"${FILESDIR}"/${PN}-1.0.3-no-test.patch
+	"${FILESDIR}"/${PN}-1.0.4-POSIX-shell.patch #193365
+	"${FILESDIR}"/${PN}-1.0.6-mingw.patch #393573
+	"${FILESDIR}"/${PN}-1.0.6-out-of-tree-build.patch
+	"${FILESDIR}"/${PN}-1.0.6-CVE-2016-3189.patch #620466
+)
+
+DOCS=( CHANGES README{,.COMPILATION.PROBLEMS,.XML.STUFF} manual.pdf )
+HTML_DOCS=( manual.html )
+
+src_prepare() {
+	default
+
+	# - Use right man path
+	# - Generate symlinks instead of hardlinks
+	# - pass custom variables to control libdir
+	sed -i \
+		-e 's:\$(PREFIX)/man:\$(PREFIX)/share/man:g' \
+		-e 's:ln -s -f $(PREFIX)/bin/:ln -s -f :' \
+		-e 's:$(PREFIX)/lib:$(PREFIX)/$(LIBDIR):g' \
+		Makefile || die
+}
+
+bemake() {
+	emake \
+		VPATH="${S}" \
+		CC="$(tc-getCC)" \
+		AR="$(tc-getAR)" \
+		RANLIB="$(tc-getRANLIB)" \
+		"$@"
+}
+
+multilib_src_compile() {
+	bemake -f "${S}"/Makefile-libbz2_so all
+	# Make sure we link against the shared lib #504648
+	ln -s libbz2.so.${PV} libbz2.so || die
+	bemake -f "${S}"/Makefile all LDFLAGS="${LDFLAGS} $(usex static -static '')"
+}
+
+multilib_src_install() {
+	into /usr
+
+	# Install the shared lib manually.  We install:
+	#  .x.x.x - standard shared lib behavior
+	#  .x.x   - SONAME some distros use #338321
+	#  .x     - SONAME Gentoo uses
+	dolib.so libbz2.so.${PV}
+	local v
+	for v in libbz2.so{,.{${PV%%.*},${PV%.*}}} ; do
+		dosym libbz2.so.${PV} /usr/$(get_libdir)/${v}
+	done
+	use static-libs && dolib.a libbz2.a
+
+	if multilib_is_native_abi ; then
+		gen_usr_ldscript -a bz2
+
+		dobin bzip2recover
+		into /
+		dobin bzip2
+	fi
+}
+
+multilib_src_install_all() {
+	# `make install` doesn't cope with out-of-tree builds, nor with
+	# installing just non-binaries, so handle things ourselves.
+	insinto /usr/include
+	doins bzlib.h
+	into /usr
+	dobin bz{diff,grep,more}
+	doman *.1
+
+	dosym bzdiff /usr/bin/bzcmp
+	dosym bzdiff.1 /usr/share/man/man1/bzcmp.1
+
+	dosym bzmore /usr/bin/bzless
+	dosym bzmore.1 /usr/share/man/man1/bzless.1
+
+	local x
+	for x in bunzip2 bzcat bzip2recover ; do
+		dosym bzip2.1 /usr/share/man/man1/${x}.1
+	done
+	for x in bz{e,f}grep ; do
+		dosym bzgrep /usr/bin/${x}
+		dosym bzgrep.1 /usr/share/man/man1/${x}.1
+	done
+
+	einstalldocs
+
+	# move "important" bzip2 binaries to /bin and use the shared libbz2.so
+	dosym bzip2 /bin/bzcat
+	dosym bzip2 /bin/bunzip2
+}
diff --git a/app-arch/bzip2/files/bzip2-1.0.3-no-test.patch b/app-arch/bzip2/files/bzip2-1.0.3-no-test.patch
index 672c89dfbd20..9e554f79515f 100644
--- a/app-arch/bzip2/files/bzip2-1.0.3-no-test.patch
+++ b/app-arch/bzip2/files/bzip2-1.0.3-no-test.patch
@@ -1,5 +1,5 @@
---- Makefile
-+++ Makefile
+--- a/Makefile
++++ b/Makefile
 @@ -23,5 +23,5 @@
        bzlib.o
  
diff --git a/app-arch/bzip2/files/bzip2-1.0.4-POSIX-shell.patch b/app-arch/bzip2/files/bzip2-1.0.4-POSIX-shell.patch
index b31cc061db6f..74f8df000b1a 100644
--- a/app-arch/bzip2/files/bzip2-1.0.4-POSIX-shell.patch
+++ b/app-arch/bzip2/files/bzip2-1.0.4-POSIX-shell.patch
@@ -3,8 +3,8 @@ with calls to sed so POSIX shells work
 
 http://bugs.gentoo.org/193365
 
---- bzgrep
-+++ bzgrep
+--- a/bzgrep
++++ b/bzgrep
 @@ -63,10 +63,9 @@
      bzip2 -cdfq "$i" | $grep $opt "$pat"
      r=$?
diff --git a/app-arch/bzip2/files/bzip2-1.0.4-makefile-CFLAGS.patch b/app-arch/bzip2/files/bzip2-1.0.4-makefile-CFLAGS.patch
index 5a95ed68b2d0..04bd0d9abda7 100644
--- a/app-arch/bzip2/files/bzip2-1.0.4-makefile-CFLAGS.patch
+++ b/app-arch/bzip2/files/bzip2-1.0.4-makefile-CFLAGS.patch
@@ -1,5 +1,5 @@
---- Makefile
-+++ Makefile
+--- a/Makefile
++++ b/Makefile
 @@ -18,10 +18,9 @@
  CC=gcc
  AR=ar
@@ -12,8 +12,8 @@
  
  # Where you want it installed when you do 'make install'
  PREFIX=/usr/local
---- Makefile-libbz2_so
-+++ Makefile-libbz2_so
+--- a/Makefile-libbz2_so
++++ b/Makefile-libbz2_so
 @@ -24,7 +24,7 @@
  SHELL=/bin/sh
  CC=gcc
diff --git a/app-arch/bzip2/files/bzip2-1.0.4-man-links.patch b/app-arch/bzip2/files/bzip2-1.0.4-man-links.patch
index 308f5f9b3e89..deaa981adccb 100644
--- a/app-arch/bzip2/files/bzip2-1.0.4-man-links.patch
+++ b/app-arch/bzip2/files/bzip2-1.0.4-man-links.patch
@@ -1,7 +1,7 @@
 http://bugs.gentoo.org/172986
 
---- bzip2-1.0.4/Makefile
-+++ bzip2-1.0.4/Makefile
+--- a/Makefile
++++ b/Makefile
 @@ -85,4 +85,7 @@
  	cp -f bzip2.1 $(PREFIX)/share/man/man1
  	chmod a+r $(PREFIX)/share/man/man1/bzip2.1
diff --git a/app-arch/bzip2/files/bzip2-1.0.6-CVE-2016-3189.patch b/app-arch/bzip2/files/bzip2-1.0.6-CVE-2016-3189.patch
index 1d0c3a6dd34f..b031c808fef3 100644
--- a/app-arch/bzip2/files/bzip2-1.0.6-CVE-2016-3189.patch
+++ b/app-arch/bzip2/files/bzip2-1.0.6-CVE-2016-3189.patch
@@ -6,8 +6,8 @@ Signed-off-by: Armin Kuster <akuster@mvista.com>
 
 Index: bzip2-1.0.6/bzip2recover.c
 ===================================================================
---- bzip2-1.0.6.orig/bzip2recover.c
-+++ bzip2-1.0.6/bzip2recover.c
+--- a/bzip2recover.c
++++ b/bzip2recover.c
 @@ -457,6 +457,7 @@ Int32 main ( Int32 argc, Char** argv )
              bsPutUChar ( bsWr, 0x50 ); bsPutUChar ( bsWr, 0x90 );
              bsPutUInt32 ( bsWr, blockCRC );
diff --git a/app-arch/bzip2/files/bzip2-1.0.6-progress.patch b/app-arch/bzip2/files/bzip2-1.0.6-progress.patch
index 7691d63e27c8..8369597714b5 100644
--- a/app-arch/bzip2/files/bzip2-1.0.6-progress.patch
+++ b/app-arch/bzip2/files/bzip2-1.0.6-progress.patch
@@ -2,8 +2,8 @@ Ripped from Mandrake
 
 http://bugs.gentoo.org/82192
 
---- bzip2-1.0.6/bzip2.1
-+++ bzip2-1.0.6/bzip2.1
+--- a/bzip2.1
++++ b/bzip2.1
 @@ -235,6 +235,10 @@
  Suppress non-essential warning messages.  Messages pertaining to
  I/O errors and other critical events will not be suppressed.
@@ -15,8 +15,8 @@ http://bugs.gentoo.org/82192
  .B \-v --verbose
  Verbose mode -- show the compression ratio for each file processed.
  Further \-v's increase the verbosity level, spewing out lots of
---- bzip2-1.0.6/bzip2.c
-+++ bzip2-1.0.6/bzip2.c
+--- a/bzip2.c
++++ b/bzip2.c
 @@ -145,6 +145,7 @@
  #include <signal.h>
  #include <math.h>
diff --git a/app-arch/bzip2/files/bzip2-1.0.6-saneso.patch b/app-arch/bzip2/files/bzip2-1.0.6-saneso.patch
index 9c4ddf05307b..52ea791ce34a 100644
--- a/app-arch/bzip2/files/bzip2-1.0.6-saneso.patch
+++ b/app-arch/bzip2/files/bzip2-1.0.6-saneso.patch
@@ -1,5 +1,5 @@
---- Makefile-libbz2_so
-+++ Makefile-libbz2_so
+--- a/Makefile-libbz2_so
++++ b/Makefile-libbz2_so
 @@ -35,8 +35,8 @@
        bzlib.o