public inbox for gentoo-commits@lists.gentoo.org
 help / color / mirror / Atom feed
* [gentoo-commits] gentoo-x86 commit in app-admin/conary: conary-2.0.21.ebuild conary-2.0.9.ebuild conary-2.0.23.ebuild ChangeLog conary-2.0.12.ebuild
@ 2008-11-15 14:55 Diego Petteno (flameeyes)
  0 siblings, 0 replies; only message in thread
From: Diego Petteno (flameeyes) @ 2008-11-15 14:55 UTC (permalink / raw
  To: gentoo-commits

flameeyes    08/11/15 14:55:15

  Modified:             conary-2.0.21.ebuild conary-2.0.9.ebuild
                        conary-2.0.23.ebuild ChangeLog conary-2.0.12.ebuild
  Log:
  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)

Revision  Changes    Path
1.2                  app-admin/conary/conary-2.0.21.ebuild

file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/app-admin/conary/conary-2.0.21.ebuild?rev=1.2&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/app-admin/conary/conary-2.0.21.ebuild?rev=1.2&content-type=text/plain
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/app-admin/conary/conary-2.0.21.ebuild?r1=1.1&r2=1.2

Index: conary-2.0.21.ebuild
===================================================================
RCS file: /var/cvsroot/gentoo-x86/app-admin/conary/conary-2.0.21.ebuild,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- conary-2.0.21.ebuild	8 Jul 2008 23:56:05 -0000	1.1
+++ conary-2.0.21.ebuild	15 Nov 2008 14:55:15 -0000	1.2
@@ -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 @@
 		dev-python/pycrypto
 		dev-libs/elfutils"
 
+RDEPEND="${DEPEND}
+	!app-arch/rpm"
+
 PDEPEND="app-admin/conary-policy"
 
 src_compile() {



1.2                  app-admin/conary/conary-2.0.9.ebuild

file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/app-admin/conary/conary-2.0.9.ebuild?rev=1.2&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/app-admin/conary/conary-2.0.9.ebuild?rev=1.2&content-type=text/plain
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/app-admin/conary/conary-2.0.9.ebuild?r1=1.1&r2=1.2

Index: conary-2.0.9.ebuild
===================================================================
RCS file: /var/cvsroot/gentoo-x86/app-admin/conary/conary-2.0.9.ebuild,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- conary-2.0.9.ebuild	20 Mar 2008 21:33:21 -0000	1.1
+++ conary-2.0.9.ebuild	15 Nov 2008 14:55:15 -0000	1.2
@@ -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 @@
 		dev-python/pycrypto
 		dev-libs/elfutils"
 
+RDEPEND="${DEPEND}
+	!app-arch/rpm"
+
 PDEPEND="app-admin/conary-policy"
 
 src_compile() {



1.2                  app-admin/conary/conary-2.0.23.ebuild

file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/app-admin/conary/conary-2.0.23.ebuild?rev=1.2&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/app-admin/conary/conary-2.0.23.ebuild?rev=1.2&content-type=text/plain
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/app-admin/conary/conary-2.0.23.ebuild?r1=1.1&r2=1.2

Index: conary-2.0.23.ebuild
===================================================================
RCS file: /var/cvsroot/gentoo-x86/app-admin/conary/conary-2.0.23.ebuild,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- conary-2.0.23.ebuild	2 Sep 2008 06:30:21 -0000	1.1
+++ conary-2.0.23.ebuild	15 Nov 2008 14:55:15 -0000	1.2
@@ -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 @@
 		dev-python/pycrypto
 		dev-libs/elfutils"
 
+RDEPEND="${DEPEND}
+	!app-arch/rpm"
+
 PDEPEND="app-admin/conary-policy"
 
 src_compile() {



1.24                 app-admin/conary/ChangeLog

file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/app-admin/conary/ChangeLog?rev=1.24&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/app-admin/conary/ChangeLog?rev=1.24&content-type=text/plain
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/app-admin/conary/ChangeLog?r1=1.23&r2=1.24

Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/app-admin/conary/ChangeLog,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -r1.23 -r1.24
--- ChangeLog	2 Sep 2008 06:30:21 -0000	1.23
+++ ChangeLog	15 Nov 2008 14:55:15 -0000	1.24
@@ -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)
 



1.2                  app-admin/conary/conary-2.0.12.ebuild

file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/app-admin/conary/conary-2.0.12.ebuild?rev=1.2&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/app-admin/conary/conary-2.0.12.ebuild?rev=1.2&content-type=text/plain
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/app-admin/conary/conary-2.0.12.ebuild?r1=1.1&r2=1.2

Index: conary-2.0.12.ebuild
===================================================================
RCS file: /var/cvsroot/gentoo-x86/app-admin/conary/conary-2.0.12.ebuild,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- conary-2.0.12.ebuild	18 Apr 2008 17:48:12 -0000	1.1
+++ conary-2.0.12.ebuild	15 Nov 2008 14:55:15 -0000	1.2
@@ -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 @@
 		dev-python/pycrypto
 		dev-libs/elfutils"
 
+RDEPEND="${DEPEND}
+	!app-arch/rpm"
+
 PDEPEND="app-admin/conary-policy"
 
 src_compile() {






^ permalink raw reply	[flat|nested] only message in thread

only message in thread, other threads:[~2008-11-15 14:55 UTC | newest]

Thread overview: (only message) (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2008-11-15 14:55 [gentoo-commits] gentoo-x86 commit in app-admin/conary: conary-2.0.21.ebuild conary-2.0.9.ebuild conary-2.0.23.ebuild ChangeLog conary-2.0.12.ebuild Diego Petteno (flameeyes)

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox