diff options
| author |   Diego Elio Pettenò <flameeyes@gentoo.org> | 2008-11-15 14:55:15 +0000 |
|---|---|---|
| committer | Diego Elio Pettenò <flameeyes@gentoo.org> | 2008-11-15 14:55:15 +0000 |
| commit | d0decab87d204925158987abe91072ab485f940b (patch) | |
| tree | 585daf77fe34729c9fe49d9ca74877f88e9075bd /app-admin | |
| parent | Added a note on the ServerTimeout option in case kdm dies for X taking too lo... (diff) | |
| download | gentoo-2-d0decab87d204925158987abe91072ab485f940b.tar.gz gentoo-2-d0decab87d204925158987abe91072ab485f940b.tar.bz2 gentoo-2-d0decab87d204925158987abe91072ab485f940b.zip | |
Block app-arch/rpm2cpio since they both provide rpcm2cio (and this actually breaks a huge amount of packages).
(Portage version: 2.2_rc14/cvs/Linux 2.6.27-gentoo-r2 x86_64)
Diffstat (limited to 'app-admin')
| -rw-r--r-- | app-admin/conary/ChangeLog | 7 | ||||
| -rw-r--r-- | app-admin/conary/conary-2.0.12.ebuild | 5 | ||||
| -rw-r--r-- | app-admin/conary/conary-2.0.21.ebuild | 5 | ||||
| -rw-r--r-- | app-admin/conary/conary-2.0.23.ebuild | 5 | ||||
| -rw-r--r-- | app-admin/conary/conary-2.0.9.ebuild | 5 |
5 files changed, 22 insertions, 5 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/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() { |