summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMike Frysinger <vapier@gentoo.org>2011-11-13 20:34:59 +0000
committerMike Frysinger <vapier@gentoo.org>2011-11-13 20:34:59 +0000
commita5f301a902b93eb3ba7c96e79c938c1599ab73c0 (patch)
tree545abe47fec882787f23efc0cf145ff31a062b4b
parentarm stable, bug #389995 (diff)
downloadgentoo-2-a5f301a902b93eb3ba7c96e79c938c1599ab73c0.tar.gz
gentoo-2-a5f301a902b93eb3ba7c96e79c938c1599ab73c0.tar.bz2
gentoo-2-a5f301a902b93eb3ba7c96e79c938c1599ab73c0.zip
Convert db[-nocxx] to db[cxx].
(Portage version: 2.2.0_alpha74/cvs/Linux x86_64)
-rw-r--r--dev-libs/dbxml/ChangeLog8
-rw-r--r--dev-libs/dbxml/dbxml-2.5.16-r1.ebuild6
-rw-r--r--dev-libs/dbxml/dbxml-2.5.16-r2.ebuild6
3 files changed, 12 insertions, 8 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/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