summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMike Frysinger <vapier@gentoo.org>2008-06-21 04:25:19 +0000
committerMike Frysinger <vapier@gentoo.org>2008-06-21 04:25:19 +0000
commit342c2bf2dc63d979ddda17f4ae6815dfcaaccda4 (patch)
tree493676b2ea9459b673d5ee52fffdaa484dfe1f26 /app-arch
parentForce newer glibc to keep things sane #228631 by Andrey Kislyuk. (diff)
downloadhistorical-342c2bf2dc63d979ddda17f4ae6815dfcaaccda4.tar.gz
historical-342c2bf2dc63d979ddda17f4ae6815dfcaaccda4.tar.bz2
historical-342c2bf2dc63d979ddda17f4ae6815dfcaaccda4.zip
Block older p7zip to force smooth upgrade #228113 by Andrey Kislyuk.
Package-Manager: portage-2.2_pre8/cvs/Linux 2.6.25 x86_64
Diffstat (limited to 'app-arch')
-rw-r--r--app-arch/lzma-utils/ChangeLog5
-rw-r--r--app-arch/lzma-utils/Manifest12
-rw-r--r--app-arch/lzma-utils/lzma-utils-4.32.6.ebuild5
3 files changed, 13 insertions, 9 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/Manifest b/app-arch/lzma-utils/Manifest
index 20b3120d1e89..f80da6e420ba 100644
--- a/app-arch/lzma-utils/Manifest
+++ b/app-arch/lzma-utils/Manifest
@@ -7,13 +7,13 @@ DIST lzma-4.32.6.tar.gz 478661 RMD160 b21761d2abd0b9e471467777ae515023767cd80f S
DIST lzma-utils-4.32.5-nocxx.patch.bz2 9853 RMD160 fc5adcd187f567b47b60485e65c7f0532d07d2bf SHA1 a5d84a7a0932965841a00d7282fc49b7f3978beb SHA256 3c80278f9903374c69b51bca44a7967a21bb553bf9f02aa27cf289ea0165720b
DIST lzma-utils-4.32.6-nocxx.patch.bz2 23716 RMD160 e8ce73a025dc92b7a6f3e47d69674ca8ac850c95 SHA1 090d2c11b1010c418c552809a12e18b357d2cb54 SHA256 d692459fec80959b6995fc0443800e62ed38b57653b8ad5f5534e8d5005dd150
EBUILD lzma-utils-4.32.5.ebuild 1183 RMD160 a0f1e8b0794e944bb0d0a46d374d6c880671bd28 SHA1 665fbf34c7d871a81ca175e1522d20fb062b0121 SHA256 62eac6c8e4cb094fcf9bd170942734d5a89fb9f3cc7597757b8cc037304a1471
-EBUILD lzma-utils-4.32.6.ebuild 1248 RMD160 7d03e2806f34c418c92eb40d9d90c5fcad301b57 SHA1 95d806d01fab18b4555de71dc38c54987479fc13 SHA256 776ae9ce805be6a42bb964ad230ea867211821b5e432b2bc75dd5ccd0905897a
-MISC ChangeLog 4266 RMD160 26c3de70a0f5eda696a7073c8c05fb2fdf2398d5 SHA1 cc798f3e092af1f5422d7c98ece52f062fd971a4 SHA256 e3cb4257192eecbf5e6263ae5e0b73752a3765352c71ee4cb874a7d4d867445d
+EBUILD lzma-utils-4.32.6.ebuild 1271 RMD160 e0e27d2184eec657c2413bb087c53351543abb75 SHA1 f4ef3065348dbbe60540869f1df0763cfe75c6b9 SHA256 3daadad1a7e78c47664c30ad370d2d61726df2cf9adebcabeec00c213cf0f550
+MISC ChangeLog 4414 RMD160 eb7c8cd14df8774ca75e47ce353a9bcb1246465a SHA1 b6f032671cd9597956dfa42f857915b31df6a506 SHA256 c52ba6f687b357761855a21434ce68470d6b7e76fb7cd6c4394913c0dfd0f789
MISC metadata.xml 164 RMD160 f43cbec30b7074319087c9acffdb9354b17b0db3 SHA1 9c213f5803676c56439df3716be07d6692588856 SHA256 f5f2891f2a4791cd31350bb2bb572131ad7235cd0eeb124c9912c187ac10ce92
-----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.7 (GNU/Linux)
+Version: GnuPG v2.0.9 (GNU/Linux)
-iD8DBQFIQQTBj9hvisErhMIRAugJAJ4mP3mStZXrXg0chC7qRqBn/HjyUgCfQeKM
-qwbUi7Ox5Crr0p9r9DjBiPk=
-=HLvF
+iEYEARECAAYFAkhcgrUACgkQ67wieSYcaxd+/wCgkIry4oxhVPc+GYdE6iX7fNrN
+2jkAn1veXRUK7OwTvDIbgGYpQ4pzvtFw
+=qpJ+
-----END PGP SIGNATURE-----
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}