Convert db[-nocxx] to db[cxx].

Package-Manager: portage-2.2.0_alpha74/cvs/Linux x86_64

4 files changed, 18 insertions, 16 deletions

diff --git a/dev-libs/dbxml/ChangeLog b/dev-libs/dbxml/ChangeLog
index 74aa0921f500..edde551aefc4 100644
--- a/dev-libs/dbxml/ChangeLog
+++ b/dev-libs/dbxml/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for dev-libs/dbxml
-# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/dbxml/ChangeLog,v 1.12 2010/09/03 20:05:42 dev-zero Exp $
+# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/dbxml/ChangeLog,v 1.13 2011/11/13 20:34:59 vapier Exp $
+
+  13 Nov 2011; Mike Frysinger <vapier@gentoo.org> dbxml-2.5.16-r1.ebuild,
+  dbxml-2.5.16-r2.ebuild:
+  Convert db[-nocxx] to db[cxx].
 
   03 Sep 2010; Tiziano Müller <dev-zero@gentoo.org> dbxml-2.5.16-r2.ebuild:
   corrected some minor syns
diff --git a/dev-libs/dbxml/Manifest b/dev-libs/dbxml/Manifest
index 60f0804bf95b..586d97a1aa70 100644
--- a/dev-libs/dbxml/Manifest
+++ b/dev-libs/dbxml/Manifest
@@ -3,16 +3,14 @@ Hash: SHA256
 
 AUX 2.5.16-respect-ldflags-no-rpath.patch 871 RMD160 7d3f925d3b03d270330d87354eb65024828906d5 SHA1 5bc0b39bea67ff4efca6f8c62aeb576c71a416a1 SHA256 d568af37c26c1470685eb585c776719e8014f5e79e9b09feace47cc2a9da0c68
 DIST dbxml-2.5.16.tar.gz 52819154 RMD160 fdb4c85271cb84a8e31931d8fb287ad17fafff9c SHA1 46f0e6b301e556c2502e4da0cd96a599acc53837 SHA256 f2423be3805811a9cca71d6877c0b1bdc1941cd76c3f26d6eb011a5724a3edd2
-EBUILD dbxml-2.5.16-r1.ebuild 4739 RMD160 f3df2436b990b9e54da5490585081c313510ff90 SHA1 8446441e9a68227f62c2acde4d28dfb023c4a813 SHA256 3117fd41ed91114cde2882bae0153396c9c375e6a31f0c609cc0a9942bc75b16
-EBUILD dbxml-2.5.16-r2.ebuild 5085 RMD160 85b1b385b059b07208150f761548996b1653209b SHA1 cab795a58ddcbcce0145b99c03510e33b310077e SHA256 d65e4b7d5ce2e475873deb2f1b8209c5d128d9b726d5a8f401b2c5918ac774e5
-MISC ChangeLog 2800 RMD160 fa3a861aba9055eec1b17b9c5d3cc71f22442a42 SHA1 ac9ced69570b1b13a6c4f4744a0ca95c375a77eb SHA256 ad3d606ea915c53b7f627b5f209d367a994ea09b70b93d2c446ae82e47bfc900
+EBUILD dbxml-2.5.16-r1.ebuild 4778 RMD160 d2228d1324818031e81f33b2ac0bcca854ff1e09 SHA1 ee945afaed3668d012aaeb891f0f5cf578a051b4 SHA256 c31be04744739ef6f47f361c9c55aa8791af31d4063d573aa34c2e15937249a2
+EBUILD dbxml-2.5.16-r2.ebuild 5123 RMD160 6e845b4cb3710fa39fa1c05e140357f4a79aba21 SHA1 5117249afa579d687359ebcfae30605ac63542e6 SHA256 ab98491818e4bba93b862760ef347801efc2dfa57c62f5f479d09e190edb35ac
+MISC ChangeLog 2932 RMD160 bcc568ac30c5aa17641ebe084da9f72586671da9 SHA1 6d00b2f931a8941834baf176beb89fd90cf79254 SHA256 58884c2bcc320e988c326c4fa5116974f04cb29f350262904ada72791d657c5a
 MISC metadata.xml 234 RMD160 71429d1d4a30b5ab923cc277f1697e48cd5778cb SHA1 e4587261387a7dad22cdba0a6f2a928dc982c32a SHA256 3299defd0e5e3780bf8db22ac755b39ecc0d5ae97b62507f6795c1dd74b4949b
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.18 (GNU/Linux)
 
-iJwEAQEIAAYFAk59C6sACgkQfXuS5UK5QB0K/AP/fOVIzTppX8hoirO+RcZOKC3x
-a8XIn0uUawy9qVHiTbh/qgs8ZXN5MW+PySmAi7g0hGtt2vbIxM5EjGD3QizVk5TL
-1CaZjoT8qgwLKvTGoxPEnl/zPVR3CmNfrB2KpBklvfuiqGSqR17cejpr5TrUBDVB
-gHoQtkdkOb5hgCOZtqc=
-=uAfx
+iF4EAREIAAYFAk7AKfsACgkQaC/OocHi7JackAEAhHn1OSr+ekRVoIX2M7yk6E2i
+kMrm17VO9UuAYeUeXlUA/13ykhXUNRyv0UscGLD6OvBl1lG058Y4uHrNZwAAR/V7
+=r7Fq
 -----END PGP SIGNATURE-----
diff --git a/dev-libs/dbxml/dbxml-2.5.16-r1.ebuild b/dev-libs/dbxml/dbxml-2.5.16-r1.ebuild
index c5500e24996f..fe7bb8bf321b 100644
--- a/dev-libs/dbxml/dbxml-2.5.16-r1.ebuild
+++ b/dev-libs/dbxml/dbxml-2.5.16-r1.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2010 Gentoo Foundation
+# Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/dbxml/dbxml-2.5.16-r1.ebuild,v 1.2 2010/06/03 06:07:41 grobian Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/dbxml/dbxml-2.5.16-r1.ebuild,v 1.3 2011/11/13 20:34:59 vapier Exp $
 
 EAPI="3"
 PYTHON_DEPEND="python? 2"
@@ -25,7 +25,7 @@ SLOT="0"
 KEYWORDS="~amd64 ~x86"
 IUSE="doc examples java perl python tcl"
 
-RDEPEND="sys-libs/db:${DB_VER}[-nocxx,java?]
+RDEPEND="|| ( sys-libs/db:${DB_VER}[cxx,java?] sys-libs/db:${DB_VER}[-nocxx,java?] )
 	>=dev-libs/xerces-c-3
 	>=dev-libs/xqilla-2.1.2
 	sys-libs/zlib
diff --git a/dev-libs/dbxml/dbxml-2.5.16-r2.ebuild b/dev-libs/dbxml/dbxml-2.5.16-r2.ebuild
index dce9330cef90..b6023aab9932 100644
--- a/dev-libs/dbxml/dbxml-2.5.16-r2.ebuild
+++ b/dev-libs/dbxml/dbxml-2.5.16-r2.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2010 Gentoo Foundation
+# Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/dbxml/dbxml-2.5.16-r2.ebuild,v 1.2 2010/09/03 20:05:42 dev-zero Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/dbxml/dbxml-2.5.16-r2.ebuild,v 1.3 2011/11/13 20:34:59 vapier Exp $
 
 EAPI="3"
 PYTHON_DEPEND="python? 2"
@@ -26,7 +26,7 @@ SLOT="0"
 KEYWORDS="~amd64 ~x86"
 IUSE="doc examples java perl python tcl"
 
-RDEPEND="sys-libs/db:${DB_VER}[-nocxx,java?]
+RDEPEND="|| ( sys-libs/db:${DB_VER}[cxx,java?] sys-libs/db:${DB_VER}[-nocxx,java?] )
 	>=dev-libs/xerces-c-3
 	>=dev-libs/xqilla-2.1.2
 	sys-libs/zlib