Block app-arch/rpm2cpio since they both provide rpcm2cio (and this actually breaks a huge amount of packages).

Package-Manager: portage-2.2_rc14/cvs/Linux 2.6.27-gentoo-r2 x86_64

6 files changed, 37 insertions, 10 deletions

diff --git a/app-admin/conary/ChangeLog b/app-admin/conary/ChangeLog
index 4a67362f020c..76d1c586e3d5 100644
--- a/app-admin/conary/ChangeLog
+++ b/app-admin/conary/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for app-admin/conary
 # Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-admin/conary/ChangeLog,v 1.23 2008/09/02 06:30:21 smithj Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-admin/conary/ChangeLog,v 1.24 2008/11/15 14:55:15 flameeyes Exp $
+
+  15 Nov 2008; Diego E. Pettenò <flameeyes@gentoo.org> conary-2.0.9.ebuild,
+  conary-2.0.12.ebuild, conary-2.0.21.ebuild, conary-2.0.23.ebuild:
+  Block app-arch/rpm2cpio since they both provide rpcm2cio (and this
+  actually breaks a huge amount of packages).
 
 *conary-2.0.23 (02 Sep 2008)
 
diff --git a/app-admin/conary/Manifest b/app-admin/conary/Manifest
index 3aed666153c5..66c45d95139a 100644
--- a/app-admin/conary/Manifest
+++ b/app-admin/conary/Manifest
@@ -1,10 +1,20 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
 DIST conary-2.0.12.tar.bz2 975963 RMD160 52badd421f4803753bb8e614c4b2ecca34d492b9 SHA1 7bfb44e2067088ee74678a21a263a1d0da301b00 SHA256 baede9bd60d07c71240632df43001e36d44fe39489dd36047abfd7003935ef7e
 DIST conary-2.0.21.tar.bz2 989011 RMD160 ab50eea4decc5ba3b28e1a7ee27edcc0e9556279 SHA1 80ba6f7e698efc9d02ebd63782029e28229fcdb4 SHA256 c0df2d26de5ea35869a9e4b0c00a3d5652b3c5f2f32ea02ae5c4c098f046ece7
 DIST conary-2.0.23.tar.bz2 999589 RMD160 f77cfd310809de50254c52fd8d6c570b731d200a SHA1 48a938ebc917c07c90224282332cdc90a8437fe2 SHA256 a8e7546182a77fc1463131d0a34a5df4989dd97237459095c65a5450ed8b5395
 DIST conary-2.0.9.tar.bz2 951464 RMD160 d0684f9eaabdef43015530d8ab10bd8b8eb3a02c SHA1 f6562479b93efdecb29e073ddf6f5d0fd1ea3d1d SHA256 80af73b7ac555ef730679abe27813402e14dc3c902074f544f5ef63ff94c593b
-EBUILD conary-2.0.12.ebuild 776 RMD160 b547a937fd56d84354e0c0e49b4c874859aad1e9 SHA1 1a2dfe09382a08321f309780e1ba92d692255b56 SHA256 bc6cfb7cd5203b8f97fc13a46aefa153416ec1914134fa4b376ffba398eaf1f3
-EBUILD conary-2.0.21.ebuild 776 RMD160 bc9d5b6992b2da89653ab000fb2be1be3039a2fd SHA1 e719d15b6726e9f3c9aafe84411ca88fda7c7dbc SHA256 c50e4e908a9e5d5d1aa25457ac3e71a457d2f51b68b72fb6e4cf3651209f6b79
-EBUILD conary-2.0.23.ebuild 776 RMD160 563e7fc14c057c1698023beabaa5818fea6ec41d SHA1 2f94fc919a9c385c0b01b60f22ab8dfa0ac2aa9c SHA256 9cb7edc9cf04563c852e974cfb9905fe162a17b17a84cea9524194a4fabce74a
-EBUILD conary-2.0.9.ebuild 775 RMD160 fff5d71566d8be99c533b04c7583d8978d3f1bec SHA1 06e66cda0b8df6ae0b8c7047a88ad8d5f8d1f876 SHA256 6560e695675f321539b85ab4c75027f37fa28f3d30a8a7666e6f0529de7c80ea
-MISC ChangeLog 3491 RMD160 eecb9d7dd37f1446c742680807ca35e5bbccbf2f SHA1 4e80eaa9b92da7e54d0ccaf609701ed08823a561 SHA256 47703a7a80963d7474aae423b4eca60d2f49b31c12d4b9454846c11a2357155e
+EBUILD conary-2.0.12.ebuild 815 RMD160 c424b932260741dd4750bce6aed8aad9a937e434 SHA1 1e1be04e8b7085966a85d874a972c8b3b114d193 SHA256 504fd5d20de087f222b1cb9c48f41e92b1fe4e4e3e6db06e1e2cf9864309101d
+EBUILD conary-2.0.21.ebuild 815 RMD160 9e701b2d607aeb87c6c43078f5829e26f2bdd33a SHA1 083496d276483648058781fa14cfcbe5904698e6 SHA256 3f5a9a29e69aee44c8c021ce8391717a5e50c62a0eb5279c315127105d170073
+EBUILD conary-2.0.23.ebuild 815 RMD160 d645542e6703dd20c897c2c84bb7ae33f0c75a15 SHA1 cba6b9e5b69f13413432031a69a32bd2e89bd7f8 SHA256 9d5b4af33b7ff0d6950607b0ac55af981c541e4b68e8efe45eda8513e8f5cab2
+EBUILD conary-2.0.9.ebuild 814 RMD160 1415b1509a3203053aa0d52d03ed7aae2568f659 SHA1 7b043f81b817ca59b97a896b05346ae1cdbc6254 SHA256 ef6ed6fe8f5b9989e882a0d4852681421ccf9810c434cc01dfcf551a86448b6c
+MISC ChangeLog 3755 RMD160 04876ded927cff7b9f305d9f102ffe6ed7021c90 SHA1 310b41132bee7b20e80daade2afe00b813f4501e SHA256 48fcad50dc5cf66994cc7ba0d93750bd371a6872c934a77496b11f1d87b351ac
 MISC metadata.xml 220 RMD160 cfa813a6c82c862e98387c45f3012fe36f8c9ed1 SHA1 2595c14914df656fa3ff0650b807174706b9324a SHA256 83157f032b557bf0087bc7745dce7735ddee44d4b691f24c77a7fcf64908392b
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.9 (GNU/Linux)
+
+iEYEARECAAYFAkke4tMACgkQAiZjviIA2XjLTACgxW3X0AV2FaNYtnZVnfQsoCzA
+LmcAniW+Mk9C3OKeh5zHdbxFbjcFnilZ
+=flkV
+-----END PGP SIGNATURE-----
diff --git a/app-admin/conary/conary-2.0.12.ebuild b/app-admin/conary/conary-2.0.12.ebuild
index 32dbaeb8c91a..4386497a9d5a 100644
--- a/app-admin/conary/conary-2.0.12.ebuild
+++ b/app-admin/conary/conary-2.0.12.ebuild
@@ -1,6 +1,6 @@
 # Copyright 2006-2008 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-admin/conary/conary-2.0.12.ebuild,v 1.1 2008/04/18 17:48:12 smithj Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-admin/conary/conary-2.0.12.ebuild,v 1.2 2008/11/15 14:55:15 flameeyes Exp $
 
 DESCRIPTION="repository-based system management and package-building tool"
 HOMEPAGE="http://wiki.rpath.com/wiki/Conary"
@@ -18,6 +18,9 @@ DEPEND="=dev-lang/python-2.4*
 		dev-python/pycrypto
 		dev-libs/elfutils"
 
+RDEPEND="${DEPEND}
+	!app-arch/rpm"
+
 PDEPEND="app-admin/conary-policy"
 
 src_compile() {
diff --git a/app-admin/conary/conary-2.0.21.ebuild b/app-admin/conary/conary-2.0.21.ebuild
index 838886770bee..250133203fce 100644
--- a/app-admin/conary/conary-2.0.21.ebuild
+++ b/app-admin/conary/conary-2.0.21.ebuild
@@ -1,6 +1,6 @@
 # Copyright 2006-2008 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-admin/conary/conary-2.0.21.ebuild,v 1.1 2008/07/08 23:56:05 smithj Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-admin/conary/conary-2.0.21.ebuild,v 1.2 2008/11/15 14:55:15 flameeyes Exp $
 
 DESCRIPTION="repository-based system management and package-building tool"
 HOMEPAGE="http://wiki.rpath.com/wiki/Conary"
@@ -18,6 +18,9 @@ DEPEND="=dev-lang/python-2.4*
 		dev-python/pycrypto
 		dev-libs/elfutils"
 
+RDEPEND="${DEPEND}
+	!app-arch/rpm"
+
 PDEPEND="app-admin/conary-policy"
 
 src_compile() {
diff --git a/app-admin/conary/conary-2.0.23.ebuild b/app-admin/conary/conary-2.0.23.ebuild
index 8466638c8517..47c16eed0d67 100644
--- a/app-admin/conary/conary-2.0.23.ebuild
+++ b/app-admin/conary/conary-2.0.23.ebuild
@@ -1,6 +1,6 @@
 # Copyright 2006-2008 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-admin/conary/conary-2.0.23.ebuild,v 1.1 2008/09/02 06:30:21 smithj Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-admin/conary/conary-2.0.23.ebuild,v 1.2 2008/11/15 14:55:15 flameeyes Exp $
 
 DESCRIPTION="repository-based system management and package-building tool"
 HOMEPAGE="http://wiki.rpath.com/wiki/Conary"
@@ -18,6 +18,9 @@ DEPEND="=dev-lang/python-2.4*
 		dev-python/pycrypto
 		dev-libs/elfutils"
 
+RDEPEND="${DEPEND}
+	!app-arch/rpm"
+
 PDEPEND="app-admin/conary-policy"
 
 src_compile() {
diff --git a/app-admin/conary/conary-2.0.9.ebuild b/app-admin/conary/conary-2.0.9.ebuild
index 9565773fca85..bb6b3bd20458 100644
--- a/app-admin/conary/conary-2.0.9.ebuild
+++ b/app-admin/conary/conary-2.0.9.ebuild
@@ -1,6 +1,6 @@
 # Copyright 2006-2008 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-admin/conary/conary-2.0.9.ebuild,v 1.1 2008/03/20 21:33:21 smithj Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-admin/conary/conary-2.0.9.ebuild,v 1.2 2008/11/15 14:55:15 flameeyes Exp $
 
 DESCRIPTION="repository-based system management and package-building tool"
 HOMEPAGE="http://wiki.rpath.com/wiki/Conary"
@@ -18,6 +18,9 @@ DEPEND="=dev-lang/python-2.4*
 		dev-python/pycrypto
 		dev-libs/elfutils"
 
+RDEPEND="${DEPEND}
+	!app-arch/rpm"
+
 PDEPEND="app-admin/conary-policy"
 
 src_compile() {