diff options
| author |   Mike Frysinger <vapier@gentoo.org> | 2011-01-06 02:49:41 +0000 |
|---|---|---|
| committer | Mike Frysinger <vapier@gentoo.org> | 2011-01-06 02:49:41 +0000 |
| commit | aee7fcc00ce8f3551e4aa0c51b2985a5004ea1b0 (patch) | |
| tree | 2b48def9df453fb4dbba0a441835716e7110ea53 /app-arch | |
| parent | Clean up; convert to EAPI=2 and emake. (diff) | |
| download | gentoo-2-aee7fcc00ce8f3551e4aa0c51b2985a5004ea1b0.tar.gz gentoo-2-aee7fcc00ce8f3551e4aa0c51b2985a5004ea1b0.tar.bz2 gentoo-2-aee7fcc00ce8f3551e4aa0c51b2985a5004ea1b0.zip | |
Update blocker to allow newer versions of app-arch/lzma #218459.
(Portage version: 2.2.0_alpha10/cvs/Linux x86_64)
Diffstat (limited to 'app-arch')
| -rw-r--r-- | app-arch/xz-utils/ChangeLog | 8 | ||||
| -rw-r--r-- | app-arch/xz-utils/xz-utils-5.0.0.ebuild | 6 | ||||
| -rw-r--r-- | app-arch/xz-utils/xz-utils-9999.ebuild | 9 |
3 files changed, 13 insertions, 10 deletions
diff --git a/app-arch/xz-utils/ChangeLog b/app-arch/xz-utils/ChangeLog index 216430703528..e1984a3709d2 100644 --- a/app-arch/xz-utils/ChangeLog +++ b/app-arch/xz-utils/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for app-arch/xz-utils -# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/app-arch/xz-utils/ChangeLog,v 1.19 2010/10/26 14:18:45 vapier Exp $ +# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2 +# $Header: /var/cvsroot/gentoo-x86/app-arch/xz-utils/ChangeLog,v 1.20 2011/01/06 02:49:41 vapier Exp $ + + 06 Jan 2011; Mike Frysinger <vapier@gentoo.org> xz-utils-5.0.0.ebuild, + xz-utils-9999.ebuild: + Update blocker to allow newer versions of app-arch/lzma #218459. *xz-utils-5.0.0 (26 Oct 2010) diff --git a/app-arch/xz-utils/xz-utils-5.0.0.ebuild b/app-arch/xz-utils/xz-utils-5.0.0.ebuild index 0b116782d254..8fb5e9fbc4c4 100644 --- a/app-arch/xz-utils/xz-utils-5.0.0.ebuild +++ b/app-arch/xz-utils/xz-utils-5.0.0.ebuild @@ -1,6 +1,6 @@ -# Copyright 1999-2010 Gentoo Foundation +# Copyright 1999-2011 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/app-arch/xz-utils/xz-utils-5.0.0.ebuild,v 1.2 2010/10/26 14:43:14 vapier Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-arch/xz-utils/xz-utils-5.0.0.ebuild,v 1.3 2011/01/06 02:49:41 vapier Exp $ # Remember: we cannot leverage autotools in this ebuild in order # to avoid circular deps with autotools @@ -29,7 +29,7 @@ LICENSE="LGPL-2.1" SLOT="0" IUSE="nls static-libs +threads" -RDEPEND="!app-arch/lzma +RDEPEND="!<app-arch/lzma-4.63 !app-arch/lzma-utils !<app-arch/p7zip-4.57" DEPEND="${RDEPEND} diff --git a/app-arch/xz-utils/xz-utils-9999.ebuild b/app-arch/xz-utils/xz-utils-9999.ebuild index f6c8566eab79..5fc4019b7096 100644 --- a/app-arch/xz-utils/xz-utils-9999.ebuild +++ b/app-arch/xz-utils/xz-utils-9999.ebuild @@ -1,6 +1,6 @@ -# Copyright 1999-2010 Gentoo Foundation +# Copyright 1999-2011 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/app-arch/xz-utils/xz-utils-9999.ebuild,v 1.6 2010/06/19 00:36:37 abcd Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-arch/xz-utils/xz-utils-9999.ebuild,v 1.7 2011/01/06 02:49:41 vapier Exp $ # Remember: we cannot leverage autotools in this ebuild in order # to avoid circular deps with autotools @@ -15,7 +15,7 @@ if [[ ${PV} == "9999" ]] ; then else MY_P="${PN/-utils}-${PV/_}" SRC_URI="http://tukaani.org/xz/${MY_P}.tar.gz" - KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~sparc-fbsd ~x86 ~x86-fbsd" + KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~sparc-fbsd ~x86-fbsd" S=${WORKDIR}/${MY_P} EXTRA_DEPEND= fi @@ -29,7 +29,7 @@ LICENSE="LGPL-2.1" SLOT="0" IUSE="nls static-libs +threads" -RDEPEND="!app-arch/lzma +RDEPEND="!<app-arch/lzma-4.63 !app-arch/lzma-utils !<app-arch/p7zip-4.57" DEPEND="${RDEPEND} @@ -44,7 +44,6 @@ fi src_configure() { econf \ - --enable-dynamic=yes \ $(use_enable nls) \ $(use_enable threads) \ $(use_enable static-libs static) |