diff options
| author |   Justin Lecher <jlec@gentoo.org> | 2012-10-07 11:58:14 +0000 |
|---|---|---|
| committer | Justin Lecher <jlec@gentoo.org> | 2012-10-07 11:58:14 +0000 |
| commit | e181859be0c5b21e244a32b0913ae89981ca09f5 (patch) | |
| tree | 73550941a3b75dc275249e0f078e7b060acc2c86 /app-arch | |
| parent | app-arch/lbzip2: Block other packages installing the /usr/bin/bzip2 symlink, ... (diff) | |
| download | gentoo-2-e181859be0c5b21e244a32b0913ae89981ca09f5.tar.gz gentoo-2-e181859be0c5b21e244a32b0913ae89981ca09f5.tar.bz2 gentoo-2-e181859be0c5b21e244a32b0913ae89981ca09f5.zip | |
app-arch/pbzip2: Block other packages installing the /usr/bin/bzip2 symlink, #436354
(Portage version: 2.2.0_alpha135/cvs/Linux x86_64)
Diffstat (limited to 'app-arch')
| -rw-r--r-- | app-arch/pbzip2/ChangeLog | 6 | ||||
| -rw-r--r-- | app-arch/pbzip2/pbzip2-1.1.5.ebuild | 7 | ||||
| -rw-r--r-- | app-arch/pbzip2/pbzip2-1.1.6.ebuild | 6 | ||||
| -rw-r--r-- | app-arch/pbzip2/pbzip2-1.1.8.ebuild | 6 |
4 files changed, 17 insertions, 8 deletions
diff --git a/app-arch/pbzip2/ChangeLog b/app-arch/pbzip2/ChangeLog index a7267e3b4ac2..129cae60a878 100644 --- a/app-arch/pbzip2/ChangeLog +++ b/app-arch/pbzip2/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for app-arch/pbzip2 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/app-arch/pbzip2/ChangeLog,v 1.116 2012/10/07 10:20:11 pacho Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-arch/pbzip2/ChangeLog,v 1.117 2012/10/07 11:58:14 jlec Exp $ + + 07 Oct 2012; Justin Lecher <jlec@gentoo.org> pbzip2-1.1.5.ebuild, + pbzip2-1.1.6.ebuild, pbzip2-1.1.8.ebuild: + Block other packages installing the /usr/bin/bzip2 symlink, #436354 07 Oct 2012; Pacho Ramos <pacho@gentoo.org> metadata.xml: Drop maintainer due retirement, #274113 diff --git a/app-arch/pbzip2/pbzip2-1.1.5.ebuild b/app-arch/pbzip2/pbzip2-1.1.5.ebuild index 52c186dd9828..6f80b7c1672e 100644 --- a/app-arch/pbzip2/pbzip2-1.1.5.ebuild +++ b/app-arch/pbzip2/pbzip2-1.1.5.ebuild @@ -1,6 +1,6 @@ -# Copyright 1999-2011 Gentoo Foundation +# Copyright 1999-2012 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/app-arch/pbzip2/pbzip2-1.1.5.ebuild,v 1.8 2011/12/30 16:00:57 halcy0n Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-arch/pbzip2/pbzip2-1.1.5.ebuild,v 1.9 2012/10/07 11:58:14 jlec Exp $ EAPI=4 @@ -16,7 +16,8 @@ KEYWORDS="alpha amd64 arm hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~x86- IUSE="static symlink" DEPEND="app-arch/bzip2" -RDEPEND="${DEPEND}" +RDEPEND="${DEPEND} + symlink? ( !app-arch/lbzip2[symlink] )" src_prepare() { epatch "${FILESDIR}"/${PN}-1.1.2-makefile.patch diff --git a/app-arch/pbzip2/pbzip2-1.1.6.ebuild b/app-arch/pbzip2/pbzip2-1.1.6.ebuild index 66b4a7eaf60b..0165fdf62784 100644 --- a/app-arch/pbzip2/pbzip2-1.1.6.ebuild +++ b/app-arch/pbzip2/pbzip2-1.1.6.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/pbzip2/pbzip2-1.1.6.ebuild,v 1.3 2012/07/29 21:52:44 ottxor Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-arch/pbzip2/pbzip2-1.1.6.ebuild,v 1.4 2012/10/07 11:58:14 jlec Exp $ EAPI=4 @@ -16,7 +16,9 @@ KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~spar IUSE="static symlink" LIB_DEPEND="app-arch/bzip2[static-libs(+)]" -RDEPEND="!static? ( ${LIB_DEPEND//\[static-libs(+)]} )" +RDEPEND=" + !static? ( ${LIB_DEPEND//\[static-libs(+)]} ) + symlink? ( !app-arch/lbzip2[symlink] )" DEPEND="${RDEPEND} static? ( ${LIB_DEPEND} )" diff --git a/app-arch/pbzip2/pbzip2-1.1.8.ebuild b/app-arch/pbzip2/pbzip2-1.1.8.ebuild index 31b08e756418..169d9fbebedd 100644 --- a/app-arch/pbzip2/pbzip2-1.1.8.ebuild +++ b/app-arch/pbzip2/pbzip2-1.1.8.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/pbzip2/pbzip2-1.1.8.ebuild,v 1.8 2012/09/29 16:09:05 armin76 Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-arch/pbzip2/pbzip2-1.1.8.ebuild,v 1.9 2012/10/07 11:58:14 jlec Exp $ EAPI=4 @@ -16,7 +16,9 @@ KEYWORDS="alpha amd64 arm hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~x86- IUSE="static symlink" LIB_DEPEND="app-arch/bzip2[static-libs(+)]" -RDEPEND="!static? ( ${LIB_DEPEND//\[static-libs(+)]} )" +RDEPEND=" + !static? ( ${LIB_DEPEND//\[static-libs(+)]} ) + symlink? ( !app-arch/lbzip2[symlink] )" DEPEND="${RDEPEND} static? ( ${LIB_DEPEND} )" |