diff options
| author |   Samuli Suominen <ssuominen@gentoo.org> | 2009-09-10 15:56:20 +0000 |
|---|---|---|
| committer | Samuli Suominen <ssuominen@gentoo.org> | 2009-09-10 15:56:20 +0000 |
| commit | 10d0f06dd479705e561e5907b1c3d950101bb229 (patch) | |
| tree | eb7d4c7394b30f1b85b9d97504e1746715d5b43d /app-arch | |
| parent | Fix xz-utils vs. lzma-utils deps. (diff) | |
| download | gentoo-2-10d0f06dd479705e561e5907b1c3d950101bb229.tar.gz gentoo-2-10d0f06dd479705e561e5907b1c3d950101bb229.tar.bz2 gentoo-2-10d0f06dd479705e561e5907b1c3d950101bb229.zip | |
Fix xz-utils vs. lzma-utils deps.
(Portage version: 2.2_rc40/cvs/Linux x86_64)
Diffstat (limited to 'app-arch')
| -rw-r--r-- | app-arch/rpm2targz/ChangeLog | 7 | ||||
| -rw-r--r-- | app-arch/rpm2targz/rpm2targz-9.0.0.0g.ebuild | 6 | ||||
| -rw-r--r-- | app-arch/rpm2targz/rpm2targz-9.0.0.2g.ebuild | 6 | ||||
| -rw-r--r-- | app-arch/rpm2targz/rpm2targz-9.0.0.3g.ebuild | 4 |
4 files changed, 14 insertions, 9 deletions
diff --git a/app-arch/rpm2targz/ChangeLog b/app-arch/rpm2targz/ChangeLog index 33f9538781ff..8a40086b2de9 100644 --- a/app-arch/rpm2targz/ChangeLog +++ b/app-arch/rpm2targz/ChangeLog @@ -1,6 +1,11 @@ # ChangeLog for app-arch/rpm2targz # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/app-arch/rpm2targz/ChangeLog,v 1.77 2009/04/29 12:04:10 jer Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-arch/rpm2targz/ChangeLog,v 1.78 2009/09/10 15:56:20 ssuominen Exp $ + + 10 Sep 2009; Samuli Suominen <ssuominen@gentoo.org> + rpm2targz-9.0.0.0g.ebuild, rpm2targz-9.0.0.2g.ebuild, + rpm2targz-9.0.0.3g.ebuild: + Fix xz-utils vs. lzma-utils deps. 29 Apr 2009; Jeroen Roovers <jer@gentoo.org> rpm2targz-9.0.0.3g.ebuild: Stable for HPPA (bug #264429). diff --git a/app-arch/rpm2targz/rpm2targz-9.0.0.0g.ebuild b/app-arch/rpm2targz/rpm2targz-9.0.0.0g.ebuild index 0257bb2b640d..6d5463b4ec21 100644 --- a/app-arch/rpm2targz/rpm2targz-9.0.0.0g.ebuild +++ b/app-arch/rpm2targz/rpm2targz-9.0.0.0g.ebuild @@ -1,6 +1,6 @@ -# Copyright 1999-2008 Gentoo Foundation +# Copyright 1999-2009 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/app-arch/rpm2targz/rpm2targz-9.0.0.0g.ebuild,v 1.1 2008/05/31 21:16:30 vapier Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-arch/rpm2targz/rpm2targz-9.0.0.0g.ebuild,v 1.2 2009/09/10 15:56:20 ssuominen Exp $ inherit toolchain-funcs eutils @@ -17,7 +17,7 @@ IUSE="userland_GNU" # so we don't explicitly set it as a dependency. RDEPEND="app-arch/cpio" DEPEND="${DEPEND} - app-arch/lzma-utils" + || ( app-arch/xz-utils app-arch/lzma-utils )" src_install() { emake install DESTDIR="${D}" || die diff --git a/app-arch/rpm2targz/rpm2targz-9.0.0.2g.ebuild b/app-arch/rpm2targz/rpm2targz-9.0.0.2g.ebuild index 3351ad41d442..a0d047077a5a 100644 --- a/app-arch/rpm2targz/rpm2targz-9.0.0.2g.ebuild +++ b/app-arch/rpm2targz/rpm2targz-9.0.0.2g.ebuild @@ -1,6 +1,6 @@ -# Copyright 1999-2008 Gentoo Foundation +# Copyright 1999-2009 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/app-arch/rpm2targz/rpm2targz-9.0.0.2g.ebuild,v 1.1 2008/08/29 04:12:56 vapier Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-arch/rpm2targz/rpm2targz-9.0.0.2g.ebuild,v 1.2 2009/09/10 15:56:20 ssuominen Exp $ inherit toolchain-funcs eutils @@ -17,7 +17,7 @@ IUSE="userland_GNU" # so we don't explicitly set it as a dependency. RDEPEND="app-arch/cpio" DEPEND="${DEPEND} - app-arch/lzma-utils" + || ( app-arch/xz-utils app-arch/lzma-utils )" src_install() { emake install DESTDIR="${D}" || die diff --git a/app-arch/rpm2targz/rpm2targz-9.0.0.3g.ebuild b/app-arch/rpm2targz/rpm2targz-9.0.0.3g.ebuild index fee8496917d0..209350333d73 100644 --- a/app-arch/rpm2targz/rpm2targz-9.0.0.3g.ebuild +++ b/app-arch/rpm2targz/rpm2targz-9.0.0.3g.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2009 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/app-arch/rpm2targz/rpm2targz-9.0.0.3g.ebuild,v 1.6 2009/04/29 12:04:09 jer Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-arch/rpm2targz/rpm2targz-9.0.0.3g.ebuild,v 1.7 2009/09/10 15:56:20 ssuominen Exp $ inherit toolchain-funcs @@ -17,7 +17,7 @@ IUSE="userland_GNU" # so we don't explicitly set it as a dependency. RDEPEND="app-arch/cpio" DEPEND="${DEPEND} - app-arch/lzma-utils" + || ( app-arch/xz-utils app-arch/lzma-utils )" src_compile() { emake CC="$(tc-getCC)" || die |