amd64 stable as part of bug 198314, file-collision with lzma-utils.

Package-Manager: portage-2.1.4_rc7

4 files changed, 22 insertions, 39 deletions

diff --git a/app-arch/lzma-utils/Manifest b/app-arch/lzma-utils/Manifest
index 5f12c0cc8455..21b4cdf4bd02 100644
--- a/app-arch/lzma-utils/Manifest
+++ b/app-arch/lzma-utils/Manifest
@@ -1,6 +1,3 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
 DIST lzma-4.32.0beta5.tar.gz 435099 RMD160 5ff391e344eefe1f15f684a7def18522e9d34540 SHA1 b8a8c26b226f90a9707aedf961fa40c617872355 SHA256 6f99e8d67964a834bde31989b163606f12ffdece5d096162bd0fb032d962f7f1
 DIST lzma-4.32.2.tar.gz 454148 RMD160 a2a49286ca933dac96bf8a4d130e2adc54ec677e SHA1 48f8fea28eb93c326cb512dcb1384030f21a7b84 SHA256 0639c4c177c10f95f39ca28e2489e6f352778f42a42bf998a44aa428ad29e14a
 DIST lzma-4.32.3.tar.gz 471373 RMD160 627945225dce75730c716d0086c99c715b1bd856 SHA1 6d1be75ee482b1086fa231aac82d62ea7a160608 SHA256 8c93a03fab74532e19f502a003428d5afd649020c8bc436a7475efdc6223058f
@@ -8,18 +5,18 @@ EBUILD lzma-utils-4.32.0_beta5.ebuild 640 RMD160 d472cc460fecd5e948fafd4defd70f4
 MD5 227d44523846dd3fbf6a66fde6a5c63a lzma-utils-4.32.0_beta5.ebuild 640
 RMD160 d472cc460fecd5e948fafd4defd70f47d53a35e6 lzma-utils-4.32.0_beta5.ebuild 640
 SHA256 b7554a4b21a5875ff5faeb90364eb15b8b2925942de7f258d5c971b9f09c99fc lzma-utils-4.32.0_beta5.ebuild 640
-EBUILD lzma-utils-4.32.2.ebuild 636 RMD160 819c8f6169d7ae9800c6dccb4bb834302aa7667d SHA1 a6eaad1cd7faf802f35d426de596d274624e488a SHA256 192fb603ac6011d8f83f4498745905f836606891241e4ae509c854571738d070
-MD5 8384384b020a47e5cb9a9abd16a20b6c lzma-utils-4.32.2.ebuild 636
-RMD160 819c8f6169d7ae9800c6dccb4bb834302aa7667d lzma-utils-4.32.2.ebuild 636
-SHA256 192fb603ac6011d8f83f4498745905f836606891241e4ae509c854571738d070 lzma-utils-4.32.2.ebuild 636
+EBUILD lzma-utils-4.32.2.ebuild 633 RMD160 f78cfe6afad5157c829aa4891dd5472bb4eecb17 SHA1 7c5ed42e98eabd14d70307b4f67f4aa2e9bde949 SHA256 3c4b63150cc009649744f870a6e6f992e912c99e88a8a90cded50da1d7c77576
+MD5 52f181a716f887f9f0905021d8042f33 lzma-utils-4.32.2.ebuild 633
+RMD160 f78cfe6afad5157c829aa4891dd5472bb4eecb17 lzma-utils-4.32.2.ebuild 633
+SHA256 3c4b63150cc009649744f870a6e6f992e912c99e88a8a90cded50da1d7c77576 lzma-utils-4.32.2.ebuild 633
 EBUILD lzma-utils-4.32.3.ebuild 644 RMD160 bd242921fcebab7273e2cd3e2c048a4783d37f43 SHA1 1183fdbdfaaf74a8b93cbbf2781abbca92cf3408 SHA256 06bb9ff1ab10d0d8d8844ce38d169f2f2b7e7cb98a56cd9ab047082022358fba
 MD5 8e8924d98679c1acf94a743ce207b86d lzma-utils-4.32.3.ebuild 644
 RMD160 bd242921fcebab7273e2cd3e2c048a4783d37f43 lzma-utils-4.32.3.ebuild 644
 SHA256 06bb9ff1ab10d0d8d8844ce38d169f2f2b7e7cb98a56cd9ab047082022358fba lzma-utils-4.32.3.ebuild 644
-MISC ChangeLog 1449 RMD160 2af82b2b831bf904ddb7feb320330e2f57613101 SHA1 9809dda1e3d5155bd1bc5dcfb701a5704fe9c044 SHA256 dbb9a76d1bdc9ca68750941b8075ba2911828dc07e7caa07c9fb79aa38023c69
-MD5 b99253fdccef488276327ac8d6d90829 ChangeLog 1449
-RMD160 2af82b2b831bf904ddb7feb320330e2f57613101 ChangeLog 1449
-SHA256 dbb9a76d1bdc9ca68750941b8075ba2911828dc07e7caa07c9fb79aa38023c69 ChangeLog 1449
+MISC ChangeLog 1553 RMD160 a69f80f20f03a0f80ec49abcf617dfe497e2f3d3 SHA1 748b5da74a962838c534fde8fbe0785c06db118f SHA256 8b6dcfdf99915ebf9c9fdc6d8313ceb0e358d3467d5adfb001580e8dbd80ffa8
+MD5 fe147375cb71bc1bf3244c0b3a851bef ChangeLog 1553
+RMD160 a69f80f20f03a0f80ec49abcf617dfe497e2f3d3 ChangeLog 1553
+SHA256 8b6dcfdf99915ebf9c9fdc6d8313ceb0e358d3467d5adfb001580e8dbd80ffa8 ChangeLog 1553
 MISC metadata.xml 164 RMD160 f43cbec30b7074319087c9acffdb9354b17b0db3 SHA1 9c213f5803676c56439df3716be07d6692588856 SHA256 f5f2891f2a4791cd31350bb2bb572131ad7235cd0eeb124c9912c187ac10ce92
 MD5 9a09f8d531c582e78977dbfd96edc1f2 metadata.xml 164
 RMD160 f43cbec30b7074319087c9acffdb9354b17b0db3 metadata.xml 164
@@ -33,10 +30,3 @@ SHA256 6c124180880d16080b48ee11e38cd826de1d7a0c7358aee39f5f1572d7858592 files/di
 MD5 f262499b5fc0aa723e94dd8156e21419 files/digest-lzma-utils-4.32.3 235
 RMD160 1d46804854e815db4645ae03ceefd4f82769c2a8 files/digest-lzma-utils-4.32.3 235
 SHA256 a27b0336916f33e1f3b39e44436e88d727386ebbcd32a725e49659be362326e9 files/digest-lzma-utils-4.32.3 235
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.7 (GNU/Linux)
-
-iD8DBQFHVwD9p/wUKkr7RBoRAjjnAJ9G2ePcIKpemwryrLDUeNbFfrIbfwCglnEU
-CbfTm1XMre/mHW70PbgWTDM=
-=Q16b
------END PGP SIGNATURE-----
diff --git a/app-arch/p7zip/ChangeLog b/app-arch/p7zip/ChangeLog
index 4ea41b7d6f26..5e04fb3948a9 100644
--- a/app-arch/p7zip/ChangeLog
+++ b/app-arch/p7zip/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for app-arch/p7zip
 # Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-arch/p7zip/ChangeLog,v 1.83 2007/12/05 20:04:41 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-arch/p7zip/ChangeLog,v 1.84 2007/12/05 20:27:02 drac Exp $
+
+  05 Dec 2007; Samuli Suominen <drac@gentoo.org> p7zip-4.55-r1.ebuild:
+  amd64 stable as part of bug 198314, file-collision with lzma-utils.
 
 *p7zip-4.55-r1 (05 Dec 2007)
 
diff --git a/app-arch/p7zip/Manifest b/app-arch/p7zip/Manifest
index 68ba5416965f..a786468799f6 100644
--- a/app-arch/p7zip/Manifest
+++ b/app-arch/p7zip/Manifest
@@ -1,6 +1,3 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
 AUX p7zip 1210 RMD160 0f331392eb77077ea6c100011326202661e9b6ab SHA1 b4e1e02081e28ece33d2a8303ee69c5f0e9ad239 SHA256 28d181cd1c43628da0adb485e20f270461b6cf8d743d2187a3380f7799fbc2d5
 MD5 7bca8f207e6b570c09854ecb5e0860a6 files/p7zip 1210
 RMD160 0f331392eb77077ea6c100011326202661e9b6ab files/p7zip 1210
@@ -30,18 +27,18 @@ EBUILD p7zip-4.51.ebuild 2248 RMD160 240f7a42b40608678f2867f18b618a26df655b48 SH
 MD5 f5439da02124298a8eb47934e0aa5cd9 p7zip-4.51.ebuild 2248
 RMD160 240f7a42b40608678f2867f18b618a26df655b48 p7zip-4.51.ebuild 2248
 SHA256 55b34fabd3371d052b21dc530ad701b5a15b4699318c450229387364ba8b4b1c p7zip-4.51.ebuild 2248
-EBUILD p7zip-4.55-r1.ebuild 2304 RMD160 e346bc6eda52893ba5917be6cd7fbd1e819b8711 SHA1 88389399d0b09aaead23c3d901a7bdabb0138909 SHA256 92f35b0a1772cf137ba1328b9dd477de37149c4f2ec89aecec9bfb3ae3725835
-MD5 7f32d0d2c50851312b88fc4f11e5f9f3 p7zip-4.55-r1.ebuild 2304
-RMD160 e346bc6eda52893ba5917be6cd7fbd1e819b8711 p7zip-4.55-r1.ebuild 2304
-SHA256 92f35b0a1772cf137ba1328b9dd477de37149c4f2ec89aecec9bfb3ae3725835 p7zip-4.55-r1.ebuild 2304
+EBUILD p7zip-4.55-r1.ebuild 2301 RMD160 b07dfb008af6f84f1cb02329ec771d5af9dc8593 SHA1 b64bed0536e80dbf101aca7b15cc6970655cfca9 SHA256 c189edc767cde63aab526b5cd934b302a497fed9f1637a708afd05f657673714
+MD5 a2cd6c2777fdd404b52edfbe2427dd35 p7zip-4.55-r1.ebuild 2301
+RMD160 b07dfb008af6f84f1cb02329ec771d5af9dc8593 p7zip-4.55-r1.ebuild 2301
+SHA256 c189edc767cde63aab526b5cd934b302a497fed9f1637a708afd05f657673714 p7zip-4.55-r1.ebuild 2301
 EBUILD p7zip-4.55.ebuild 2540 RMD160 f1d28ffdf4caf33015cffc0e716e3ca52571558f SHA1 fdd7396895ba8ca87f04a101a6b1826adbd31a14 SHA256 f3ba929551f5f971a8d9f546438ec31cb898ff127dca0b8aac67d9b068bcdf32
 MD5 01d2b015946fa56cb4c278b65f0d4da8 p7zip-4.55.ebuild 2540
 RMD160 f1d28ffdf4caf33015cffc0e716e3ca52571558f p7zip-4.55.ebuild 2540
 SHA256 f3ba929551f5f971a8d9f546438ec31cb898ff127dca0b8aac67d9b068bcdf32 p7zip-4.55.ebuild 2540
-MISC ChangeLog 10552 RMD160 524733d90a8d1e79cbe22e14d681c00d287776d0 SHA1 d9173833b7000cae92a45cc8abe636925935b4ef SHA256 bc1a98d4fd088e2ad11547b1c3f10e733f5b66484a37d8a044e4de9d43d8208f
-MD5 b4720c4bcc7a5d309ca0979b809e0359 ChangeLog 10552
-RMD160 524733d90a8d1e79cbe22e14d681c00d287776d0 ChangeLog 10552
-SHA256 bc1a98d4fd088e2ad11547b1c3f10e733f5b66484a37d8a044e4de9d43d8208f ChangeLog 10552
+MISC ChangeLog 10692 RMD160 e3b1e69ef36a651e9cd04429a8fc01c7a398710c SHA1 729c340e9b4d552aafc8e0201016974809f45c86 SHA256 fce2836feaef12f5c63c2a18724d8e11841a7fcb54343aa2aa001b8ada99e44f
+MD5 5fbaeece8894d9c6c52db45a0660c856 ChangeLog 10692
+RMD160 e3b1e69ef36a651e9cd04429a8fc01c7a398710c ChangeLog 10692
+SHA256 fce2836feaef12f5c63c2a18724d8e11841a7fcb54343aa2aa001b8ada99e44f ChangeLog 10692
 MISC metadata.xml 221 RMD160 c3fe86fc44653637aea4680b20cf4a3919b7540c SHA1 a1e6cd353cec0a45b588c9995fb801cb82792457 SHA256 1d86ed32a423a4e8e6af86272561dd598d9ce6d5bb55eb6c810b11a6c3383c6a
 MD5 66daf69a44c4ec8add00f66d8ee0661d metadata.xml 221
 RMD160 c3fe86fc44653637aea4680b20cf4a3919b7540c metadata.xml 221
@@ -64,10 +61,3 @@ SHA256 f948ba40c599bfe91c0b1e5b0ef3a2921fdf4c7a0c561e37d7fb77e55789073c files/di
 MD5 0b7a552c87ce54d2b24cda89c34cf3cb files/digest-p7zip-4.55-r1 262
 RMD160 5a5034316deccb119ba32a245b11b12c93920cd6 files/digest-p7zip-4.55-r1 262
 SHA256 f948ba40c599bfe91c0b1e5b0ef3a2921fdf4c7a0c561e37d7fb77e55789073c files/digest-p7zip-4.55-r1 262
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.7 (GNU/Linux)
-
-iD8DBQFHVwRfp/wUKkr7RBoRAgdmAJ9EiQLcvACSWNNVndY+SD3FugRhKQCfQtw9
-CV6A5o2z9DeR2p9s1DdYYLM=
-=j2FE
------END PGP SIGNATURE-----
diff --git a/app-arch/p7zip/p7zip-4.55-r1.ebuild b/app-arch/p7zip/p7zip-4.55-r1.ebuild
index 11495ae0a8c7..0d07c2bac7ec 100644
--- a/app-arch/p7zip/p7zip-4.55-r1.ebuild
+++ b/app-arch/p7zip/p7zip-4.55-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2007 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-arch/p7zip/p7zip-4.55-r1.ebuild,v 1.1 2007/12/05 20:04:41 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-arch/p7zip/p7zip-4.55-r1.ebuild,v 1.2 2007/12/05 20:27:02 drac Exp $
 
 inherit eutils toolchain-funcs multilib
 
@@ -10,7 +10,7 @@ SRC_URI="mirror://sourceforge/${PN}/${PN}_${PV}_src_all.tar.bz2"
 
 LICENSE="LGPL-2.1"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd"
+KEYWORDS="~alpha amd64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd"
 IUSE="static doc"
 
 DEPEND=""