diff options
author | Samuli Suominen <ssuominen@gentoo.org> | 2009-09-10 15:52:33 +0000 |
---|---|---|
committer | Samuli Suominen <ssuominen@gentoo.org> | 2009-09-10 15:52:33 +0000 |
commit | 87595c2336b611e83503fb6a4f2fcfef3625d6d4 (patch) | |
tree | ba47ada09e8faf1a294a5e50e5d878f10333b328 | |
parent | Fix xz-utils vs. lzma-utils deps. (diff) | |
download | gentoo-2-87595c2336b611e83503fb6a4f2fcfef3625d6d4.tar.gz gentoo-2-87595c2336b611e83503fb6a4f2fcfef3625d6d4.tar.bz2 gentoo-2-87595c2336b611e83503fb6a4f2fcfef3625d6d4.zip |
Fix xz-utils vs. lzma-utils deps.
(Portage version: 2.2_rc40/cvs/Linux x86_64)
-rw-r--r-- | app-doc/linkers-and-loaders/ChangeLog | 6 | ||||
-rw-r--r-- | app-doc/linkers-and-loaders/linkers-and-loaders-1.ebuild | 4 |
2 files changed, 7 insertions, 3 deletions
diff --git a/app-doc/linkers-and-loaders/ChangeLog b/app-doc/linkers-and-loaders/ChangeLog index c89d201b5a1c..68ed88d0a30f 100644 --- a/app-doc/linkers-and-loaders/ChangeLog +++ b/app-doc/linkers-and-loaders/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for app-doc/linkers-and-loaders # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/app-doc/linkers-and-loaders/ChangeLog,v 1.7 2009/03/18 18:01:14 ricmm Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-doc/linkers-and-loaders/ChangeLog,v 1.8 2009/09/10 15:52:33 ssuominen Exp $ + + 10 Sep 2009; Samuli Suominen <ssuominen@gentoo.org> + linkers-and-loaders-1.ebuild: + Fix xz-utils vs. lzma-utils deps. 18 Mar 2009; <ricmm@gentoo.org> linkers-and-loaders-1.ebuild: Drop down to ~mips due to unstable deps diff --git a/app-doc/linkers-and-loaders/linkers-and-loaders-1.ebuild b/app-doc/linkers-and-loaders/linkers-and-loaders-1.ebuild index ec745e89a8e1..546dfc9d8298 100644 --- a/app-doc/linkers-and-loaders/linkers-and-loaders-1.ebuild +++ b/app-doc/linkers-and-loaders/linkers-and-loaders-1.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-doc/linkers-and-loaders/linkers-and-loaders-1.ebuild,v 1.3 2009/03/18 18:01:14 ricmm Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-doc/linkers-and-loaders/linkers-and-loaders-1.ebuild,v 1.4 2009/09/10 15:52:33 ssuominen Exp $ DESCRIPTION="the Linkers and Loaders book" HOMEPAGE="http://linker.iecc.com/" @@ -13,7 +13,7 @@ IUSE="doc" RESTRICT="mirror" RDEPEND="" -DEPEND="app-arch/lzma-utils" +DEPEND="|| ( app-arch/xz-utils app-arch/lzma-utils )" S=${WORKDIR} |