app-arch/lbzip2: Block other packages installing the /usr/bin/bzip2 symlink, #436354; drop old

Package-Manager: portage-2.2.0_alpha135/cvs/Linux x86_64

6 files changed, 15 insertions, 132 deletions

diff --git a/app-arch/lbzip2/ChangeLog b/app-arch/lbzip2/ChangeLog
index 262116ce24fa..671a03b6090a 100644
--- a/app-arch/lbzip2/ChangeLog
+++ b/app-arch/lbzip2/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for app-arch/lbzip2
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-arch/lbzip2/ChangeLog,v 1.39 2012/09/30 16:56:48 armin76 Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-arch/lbzip2/ChangeLog,v 1.40 2012/10/07 11:55:08 jlec Exp $
+
+  07 Oct 2012; Justin Lecher <jlec@gentoo.org> -lbzip2-0.23-r2.ebuild,
+  -lbzip2-2.1.ebuild, -lbzip2-2.1-r2.ebuild, lbzip2-2.2.ebuild:
+  Block other packages installing the /usr/bin/bzip2 symlink, #436354; drop old
 
   30 Sep 2012; Raúl Porcel <armin76@gentoo.org> lbzip2-2.2.ebuild:
   ia64/m68k/s390/sh/sparc stable wrt #435228
diff --git a/app-arch/lbzip2/Manifest b/app-arch/lbzip2/Manifest
index e6a320a26026..af53ce378f5b 100644
--- a/app-arch/lbzip2/Manifest
+++ b/app-arch/lbzip2/Manifest
@@ -6,19 +6,15 @@ AUX 0.23-s_isreg.patch 350 SHA256 38c1c133faf8c30440164fad7c1539df555cee606934a3
 AUX 0.23-test.sh.patch 648 SHA256 e37454a09697a49574068ad5c89d2047a9f4f5d9df32aacd3b01584f2b0477a1 SHA512 2fe226cb030d444d9a0866487596ed039b4e66af39762f1bc93625c1e93a7336697fa01311c3f0d0eee4a528ae513d18f197534d85539f3185dd8e58e1819dc7 WHIRLPOOL d06585234803278d593499af1e439b89f5dbe721d299018eb78f2b947db98bc882580b958b59a1abf1ef59b08abf9ec521b57fd32b99640d74e6d9c0787aa591
 AUX 2.1-crc-missmatch.patch 552 SHA256 3263d1b9452ac65a01a6127e1078ba6cc3ba040c8001e764af2f06d323d13c89 SHA512 b5113b0fe23adc17811b6e7812ca6e671d978c6765519729998077d6aed000f1fd22241b06ab4330534a6813b5b9f5d7aec62ed007957a34d39a39d5041f5b77 WHIRLPOOL d71c7954c2b24528359f05fd7917de75b0aa0cf872b8a38384e95a588d3ab19e7c3bac8492a9a37bdb5ae497d6a3cd7621b0dd698bd94102b363c5a25f81b669
 AUX lbzip2-2.2-s_isreg.patch 456 SHA256 d3564db329d05fde2866a113066e21478ef8c504c3765ac934afbe3e31df00c3 SHA512 5c5c221befa34b50b1cd299608fea4d0871ede7c53a297fe05504ac34b3088378f1734d9e7a1c1649ede44894481786b0c417d38852963606b127090c97b33bb WHIRLPOOL 6a5c6f6d566f8dd4880047fe0f2c49626b07174785715c3cd06e736117133dc23d67020d8cba6b4dd66a013f60ac8da0582af64c08629e2010a29938404219d0
-DIST lbzip2-0.23.tar.gz 77720 SHA256 2838cc2be818b8107ab1311208e6344baf9969168199be84287a32fef4733411 SHA512 0a7f27459c042cf84306b448b77df6605fde9c0d10a943478091774d572c5c039a69eb1ca8e8e90d279d5054dd99ac05e0f6887505cd67dc7caf5d3475ca786f WHIRLPOOL 9a3108903f31e7dae8215d1a455902f2ff9e1833b2724677342434692ce96ff290e6c366374512a41537907dffffaa229ec8953fdfa20f43e5daacf82d0355fb
-DIST lbzip2-2.1.tar.gz 616985 SHA256 c2551c219e0eff9d1bf17a13db2b6902ba5b02ca66c53e6d734bbfb5add29edc SHA512 b958d5aeea838d5a5587d380eaa1e61b44666cdc364882b0b2b7a57896f3499e1b42ccfe2548332ab7f0fe39225d9ad590110129dc32087ca5d7ef35c3da7bb1 WHIRLPOOL bfc7137d755d43fd1f71e7ff4e2c0d8fd157c0b383170af7ee3ae81355570b1880342efc2eb6a5a36f88b2f21e4ecea048bd931edaad8b06541e63424867df5e
 DIST lbzip2-2.2.tar.gz 622154 SHA256 b905f763a5859670e36b15d016fb6bb73d6718905fc0e2a9fa1dbc11f30b0d80 SHA512 9b194eee262e44d4665d97307f73f20075c301c2a8fbc0f989805359645387bb3ad0a6b7507edc5463a017eaf7002ee177e9fc00cf808c02c7a9c16e7b58b918 WHIRLPOOL 241c6cf473171be56b94efdc152eecb15482977ed47cb46ed47dad641bca9f73d7ec52f13947677aa619387707d5d17f7fa3421f9bc83fc28ced9e7c49b607d1
-EBUILD lbzip2-0.23-r2.ebuild 1523 SHA256 df5e22d08e7d20866ba3843adee90290cf358f8739b3cec5c5ce0410b99eaa44 SHA512 a9da0cff2ec199d09a7deca7f63ac75b911459e6e75c228f035d02649b23ac2cf80a58d0cddc277091059dff56de190162fe15408df0dd7e4cce00f5908bcea2 WHIRLPOOL 002483fbdc96dc75d6e451b9c4cf7abf9a74db81bc6dc06bfa27a1134c8e0fc3ff418f066e2d124d0dda146e2cd95c77bb0f57650b1ab2b8f667515ca148ccae
-EBUILD lbzip2-2.1-r2.ebuild 731 SHA256 e4fcfafb948383957c223c774af9ace50355e89e89289b26e0a46201906fc81f SHA512 425420f423374445e0caacfd6135b230a661c1fadf0a042c3de86adc4e6223dc0a88684b9771251a43fd85eec7a6e6f998d28761d93c8ac1b8e5cb3e3f99acb6 WHIRLPOOL ac73f4d1b001f4593c317e27555babc7740df647ba70d15e1e422e14d4675a7d6c7e7798093fe216bd0863f1c53b1b3a08b7a374f18e19df0ec996be0ca3dec9
-EBUILD lbzip2-2.1.ebuild 680 SHA256 8c7db321df6e0a98b2c98a672f4d058660b7cf418cfcaf73216ad5a9b6df6593 SHA512 b132fc80e7ae382a66b8e2885afdbdcfd893b19612ed468b875c140f2699a44960d95e0514ca439a583bfdcb73455c0ec01b2d4f8d276b1150bb71ab0cfabcac WHIRLPOOL 56aa7c8d282d7046a90269a7a04345d2665fbdd194fbe63842d03b96814de85d08ca4bb7e19b7004253e2d560e780917ad20283572f5a72fb687877743eaaef5
-EBUILD lbzip2-2.2.ebuild 803 SHA256 fcf04629da37d6856a54c4db470b599361cf9b64b03f6d104b5485bde2dfa02e SHA512 7eb2e5648389ab3817135a6c729f9b6c0bf439ee433b05a078e9d9fdbcee7c98cadd99e2c403823596274fb1408ea90aeb90f1c2265ab64569ae43bc967118ca WHIRLPOOL 7569fef60d94aa082e297239394f11e19723df1d93c5c6d754335a133be6cd76de3ece4d58fc264680c0e112ea9496d7f39607214da2d138aae64a70362c8599
-MISC ChangeLog 5518 SHA256 567edf112609c93190c27526eb29a4c8303229887a3249a40d90d4b45e282882 SHA512 4952bd312e60e27c1692da40d8ac9105d9ce1b361bd3c6d1acdd805e6276b31861269a3e685355cc0df5fbb732b70d08600c0e2f8b356e9c6837bfe0e37a7121 WHIRLPOOL b312d4d0d43de820a24bb30f910212951f96d590e7f7beaf0b38823c4dda24e366411579db6d15361115883e06a479708da41ff437b6b34d61af8db8d67a1bea
+EBUILD lbzip2-2.2.ebuild 860 SHA256 eb15019cae723c280bc30742ae1d2cf177861971301245d720bab14c70890a3e SHA512 0ba223c40b6f82d09b77a4813dc749e6a997a91ba8e9f662966704389ae7b69d4cf61b9d8c5dfcd7500560c84387b1839087c158016abf1c00d81302cd156a79 WHIRLPOOL 5fe79226012e8d32ba84aa75709bd688c0dffc8547cf643a8418aa217c323b609ed6609fbc80d9cc8791818ad735bd2443bcc7ad5e32f6ab33773b66fa6a35c3
+MISC ChangeLog 5731 SHA256 a06852a75e998980452d3797e88462d194e150237a5c849da8d6960accf03546 SHA512 f049be33f4b99decb504a5a85709989a0238e6f38bf06d8b3f44f433be74998fd18dd4f50f831c0b376d6047f51c93659d2d49cb57475d4088e7683dba7f1484 WHIRLPOOL 2aef5e4f9048cffd28e06e284f0e2fab729645149172f7ddd2e9ee36537be47198a53f12e4784eaa512620a91406b1b2dfde30582e134667119fc751211c359c
 MISC metadata.xml 506 SHA256 23c838cae918b805fef6c43f9cf06570ad578cbbe1d6153efc03f1e1fd65f62a SHA512 7880c37760b09c98256d18bba14250fbe7a8cffe39299028bf605ffee240ced75894b8210510bc8d4b2d8f48612fcd15e516b95d5f2513489a02ed38bd14aa62 WHIRLPOOL ea0e3ea77ea2787d1d7bf4945c9acad01a312433bf9908cae72f22d575c5cf50221e49d75e7a32e9ba66153d4235ca585cae2371cb6f0a9556b4a3b0d75cf02f
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.19 (GNU/Linux)
+Comment: GPGTools - http://gpgtools.org
 
-iEYEAREIAAYFAlBoedYACgkQuQc30/atMkByRgCfdPfkpCfPjhYz3c3n31vskDuF
-AVcAnR19f18JuA36MNpYytH8zawQGYoe
-=w52c
+iEYEAREIAAYFAlBxbZ0ACgkQgAnW8HDreRb7EgCeNszt+KIvy7WdJi9WQeXyRBdB
+888AoK6FhgXjOdty9cG0Be+zCku1e/y3
+=h5OP
 -----END PGP SIGNATURE-----
diff --git a/app-arch/lbzip2/lbzip2-0.23-r2.ebuild b/app-arch/lbzip2/lbzip2-0.23-r2.ebuild
deleted file mode 100644
index f3802aa87e78..000000000000
--- a/app-arch/lbzip2/lbzip2-0.23-r2.ebuild
+++ /dev/null
@@ -1,60 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-arch/lbzip2/lbzip2-0.23-r2.ebuild,v 1.10 2012/02/14 21:25:31 jer Exp $
-
-EAPI="3"
-
-inherit eutils flag-o-matic toolchain-funcs
-
-DESCRIPTION="Parallel bzip2 utility"
-HOMEPAGE="http://lacos.hu/"
-SRC_URI="http://lacos.web.elte.hu/pub/${PN}/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="alpha amd64 arm hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~x86-fbsd"
-IUSE="symlink test"
-
-RDEPEND="app-arch/bzip2"
-DEPEND="${REDEPEND}
-	test? (
-		app-shells/bash
-		sys-devel/bc
-		|| ( sys-process/time sys-freebsd/freebsd-ubin )
-	)"
-
-S=${WORKDIR}/${PN}
-
-src_prepare() {
-	epatch "${FILESDIR}"/0.23-s_isreg.patch
-	epatch "${FILESDIR}"/0.23-Makefile.patch
-	epatch "${FILESDIR}"/0.23-test.sh.patch
-}
-
-src_compile() {
-	append-lfs-flags
-	emake CC=$(tc-getCC) || die "emake failed"
-}
-
-src_test() {
-	if [ -t 0 ] || return; then
-		rm -rf "${T}/scratch" "${T}/results" "${T}/rnd"
-		hexdump -n 10485760 /dev/urandom > "${T}/rnd"
-		emake -j1 SHELL="${EPREFIX}/bin/bash --posix" PATH="${S}:${PATH}" TESTFILE="${T}/rnd" check \
-			|| die "make check failed"
-	else
-		ewarn "make check must be run attached to a terminal"
-	fi
-}
-
-src_install() {
-	dobin ${PN} || die "Installation of ${PN} failed"
-	dodoc ChangeLog README || die "no docs"
-	doman ${PN}.1 || die "no man"
-	insinto /usr/share/${PN}
-	doins corr-perf.sh malloc_trace.pl || die
-
-	if use symlink; then
-		dosym ${PN} /usr/bin/bzip2 || die
-	fi
-}
diff --git a/app-arch/lbzip2/lbzip2-2.1-r2.ebuild b/app-arch/lbzip2/lbzip2-2.1-r2.ebuild
deleted file mode 100644
index 80247c9bba9c..000000000000
--- a/app-arch/lbzip2/lbzip2-2.1-r2.ebuild
+++ /dev/null
@@ -1,31 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-arch/lbzip2/lbzip2-2.1-r2.ebuild,v 1.1 2011/12/05 19:42:45 jlec Exp $
-
-EAPI=4
-
-inherit eutils
-
-DESCRIPTION="Parallel bzip2 utility"
-HOMEPAGE="https://github.com/kjn/lbzip2/"
-SRC_URI="mirror://github/kjn/${PN}/${P}.tar.gz"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux"
-IUSE="symlink"
-
-src_prepare() {
-	cd src
-	epatch \
-		"${FILESDIR}"/0.23-s_isreg.patch \
-		"${FILESDIR}"/${PV}-crc-missmatch.patch
-}
-
-src_install() {
-	default
-
-	if use symlink; then
-		dosym ${PN} /usr/bin/bzip2
-	fi
-}
diff --git a/app-arch/lbzip2/lbzip2-2.1.ebuild b/app-arch/lbzip2/lbzip2-2.1.ebuild
deleted file mode 100644
index 94706ec91f56..000000000000
--- a/app-arch/lbzip2/lbzip2-2.1.ebuild
+++ /dev/null
@@ -1,29 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-arch/lbzip2/lbzip2-2.1.ebuild,v 1.2 2011/11/28 10:25:37 jlec Exp $
-
-EAPI=4
-
-inherit eutils
-
-DESCRIPTION="Parallel bzip2 utility"
-HOMEPAGE="https://github.com/kjn/lbzip2/"
-SRC_URI="mirror://github/kjn/${PN}/${P}.tar.gz"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux"
-IUSE="symlink"
-
-src_prepare() {
-	cd src
-	epatch "${FILESDIR}"/0.23-s_isreg.patch
-}
-
-src_install() {
-	default
-
-	if use symlink; then
-		dosym ${PN} /usr/bin/bzip2
-	fi
-}
diff --git a/app-arch/lbzip2/lbzip2-2.2.ebuild b/app-arch/lbzip2/lbzip2-2.2.ebuild
index dba198e8e842..3d054cc45b4d 100644
--- a/app-arch/lbzip2/lbzip2-2.2.ebuild
+++ b/app-arch/lbzip2/lbzip2-2.2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-arch/lbzip2/lbzip2-2.2.ebuild,v 1.8 2012/09/30 16:56:48 armin76 Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-arch/lbzip2/lbzip2-2.2.ebuild,v 1.9 2012/10/07 11:55:08 jlec Exp $
 
 EAPI=4
 
@@ -17,6 +17,9 @@ IUSE="debug symlink"
 
 PATCHES=( "${FILESDIR}"/${P}-s_isreg.patch )
 
+RDEPEND="symlink? ( !app-arch/pbzip2[symlink] )"
+DEPEND=""
+
 src_configure() {
 	local myeconfargs=(
 		--disable-silent-rules