summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--app-arch/lzma-utils/ChangeLog5
-rw-r--r--app-arch/lzma-utils/lzma-utils-4.32.6.ebuild5
2 files changed, 7 insertions, 3 deletions
diff --git a/app-arch/lzma-utils/ChangeLog b/app-arch/lzma-utils/ChangeLog
index 68970dd65fc5..53c58de0f159 100644
--- a/app-arch/lzma-utils/ChangeLog
+++ b/app-arch/lzma-utils/ChangeLog
@@ -1,6 +1,9 @@
# ChangeLog for app-arch/lzma-utils
# Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-arch/lzma-utils/ChangeLog,v 1.34 2008/05/31 07:56:43 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-arch/lzma-utils/ChangeLog,v 1.35 2008/06/21 04:25:19 vapier Exp $
+
+ 21 Jun 2008; Mike Frysinger <vapier@gentoo.org> lzma-utils-4.32.6.ebuild:
+ Block older p7zip to force smooth upgrade #228113 by Andrey Kislyuk.
*lzma-utils-4.32.6 (31 May 2008)
diff --git a/app-arch/lzma-utils/lzma-utils-4.32.6.ebuild b/app-arch/lzma-utils/lzma-utils-4.32.6.ebuild
index b5252460430e..2d13977820eb 100644
--- a/app-arch/lzma-utils/lzma-utils-4.32.6.ebuild
+++ b/app-arch/lzma-utils/lzma-utils-4.32.6.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2008 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-arch/lzma-utils/lzma-utils-4.32.6.ebuild,v 1.1 2008/05/31 07:56:43 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-arch/lzma-utils/lzma-utils-4.32.6.ebuild,v 1.2 2008/06/21 04:25:19 vapier Exp $
# Remember: we cannot leverage autotools in this ebuild in order
# to avoid circular deps with autotools
@@ -18,7 +18,8 @@ SLOT="0"
KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~sparc-fbsd ~x86 ~x86-fbsd"
IUSE="nocxx"
-RDEPEND="!app-arch/lzma"
+RDEPEND="!app-arch/lzma
+ !<app-arch/p7zip-4.57"
S=${WORKDIR}/${MY_P}