xml2 use flag changed to xml

(Portage version: 2.1.1_pre2-r2)

3 files changed, 20 insertions, 16 deletions

diff --git a/dev-db/pgcluster/ChangeLog b/dev-db/pgcluster/ChangeLog
index a04889549e5e..6c070be242f2 100644
--- a/dev-db/pgcluster/ChangeLog
+++ b/dev-db/pgcluster/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for dev-db/pgcluster
-# Copyright 1999-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-db/pgcluster/ChangeLog,v 1.4 2005/12/16 11:56:51 flameeyes Exp $
+# Copyright 1999-2006 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/dev-db/pgcluster/ChangeLog,v 1.5 2006/07/05 07:36:26 mr_bones_ Exp $
+
+  05 Jul 2006; Michael Sterrett <mr_bones_@gentoo.org>
+  pgcluster-1.3.0b.ebuild, pgcluster-1.3.0c.ebuild:
+  xml2 use flag changed to xml
 
   16 Dec 2005; Diego Pettenò <flameeyes@gentoo.org>
   pgcluster-1.3.0c.ebuild:
diff --git a/dev-db/pgcluster/pgcluster-1.3.0b.ebuild b/dev-db/pgcluster/pgcluster-1.3.0b.ebuild
index ee26ee21b584..b403b226dd31 100644
--- a/dev-db/pgcluster/pgcluster-1.3.0b.ebuild
+++ b/dev-db/pgcluster/pgcluster-1.3.0b.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2005 Gentoo Foundation
+# Copyright 1999-2006 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-db/pgcluster/pgcluster-1.3.0b.ebuild,v 1.4 2005/10/24 03:50:17 nakano Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-db/pgcluster/pgcluster-1.3.0b.ebuild,v 1.5 2006/07/05 07:36:26 mr_bones_ Exp $
 
 inherit eutils gnuconfig flag-o-matic multilib
 
@@ -13,7 +13,7 @@ SRC_URI="http://pgfoundry.org/frs/download.php/181/${P}.tar.gz"
 LICENSE="POSTGRESQL"
 SLOT="0"
 KEYWORDS="~x86 ~ppc ~sparc ~mips ~alpha ~arm ~hppa ~amd64 ~ia64 ~s390 ~ppc64"
-IUSE="doc libg++ nls pam perl pg-intdatetime python readline ssl tcltk xml2 zlib"
+IUSE="doc libg++ nls pam perl pg-intdatetime python readline ssl tcltk xml zlib"
 
 S=${WORKDIR}/${MY_P}
 DEPEND="virtual/libc
@@ -26,7 +26,7 @@ DEPEND="virtual/libc
 	perl? ( >=dev-lang/perl-5.6.1-r2 )
 	python? ( >=dev-lang/python-2.2 dev-python/egenix-mx-base )
 	ssl? ( >=dev-libs/openssl-0.9.6-r1 )
-	xml2? ( dev-libs/libxml2 dev-libs/libxslt dev-util/pkgconfig )
+	xml? ( dev-libs/libxml2 dev-libs/libxslt dev-util/pkgconfig )
 	nls? ( sys-devel/gettext )"
 RDEPEND="virtual/libc
 	zlib? ( >=sys-libs/zlib-1.1.3 )
@@ -34,7 +34,7 @@ RDEPEND="virtual/libc
 	perl? ( >=dev-lang/perl-5.6.1-r2 )
 	python? ( >=dev-lang/python-2.2 )
 	ssl? ( >=dev-libs/openssl-0.9.6-r1 )
-	xml2? ( dev-libs/libxml2 dev-libs/libxslt )
+	xml? ( dev-libs/libxml2 dev-libs/libxslt )
 	!dev-db/postgresql"
 
 PG_DIR="/var/lib/postgresql"
@@ -99,7 +99,7 @@ src_compile() {
 	make || die
 	cd contrib
 	make || die
-	if use xml2; then
+	if use xml; then
 		cd xml2
 		make || die
 	fi
@@ -119,7 +119,7 @@ src_install() {
 #	make DESTDIR=${D} install-all-headers || die
 	cd ${S}/contrib
 	make DESTDIR=${D} LIBDIR=${D}/usr/lib install || die
-	if use xml2; then
+	if use xml; then
 		cd ${S}/contrib/xml2
 		make DESTDIR=${D} LIBDIR=${D}/usr/lib install || die
 	fi
diff --git a/dev-db/pgcluster/pgcluster-1.3.0c.ebuild b/dev-db/pgcluster/pgcluster-1.3.0c.ebuild
index c727a4c58245..164e935323f6 100644
--- a/dev-db/pgcluster/pgcluster-1.3.0c.ebuild
+++ b/dev-db/pgcluster/pgcluster-1.3.0c.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2005 Gentoo Foundation
+# Copyright 1999-2006 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-db/pgcluster/pgcluster-1.3.0c.ebuild,v 1.5 2005/12/16 11:56:51 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-db/pgcluster/pgcluster-1.3.0c.ebuild,v 1.6 2006/07/05 07:36:26 mr_bones_ Exp $
 
 inherit eutils gnuconfig flag-o-matic multilib
 
@@ -13,7 +13,7 @@ SRC_URI="http://pgfoundry.org/frs/download.php/218/${P}.tar.gz"
 LICENSE="POSTGRESQL"
 SLOT="0"
 KEYWORDS="~x86 ~ppc ~sparc ~mips ~alpha ~arm ~hppa ~amd64 ~ia64 ~s390 ~ppc64"
-IUSE="doc libg++ nls pam perl pg-intdatetime python readline ssl tcltk xml2 zlib"
+IUSE="doc libg++ nls pam perl pg-intdatetime python readline ssl tcltk xml zlib"
 
 S=${WORKDIR}/${MY_P}
 DEPEND="virtual/libc
@@ -26,7 +26,7 @@ DEPEND="virtual/libc
 	perl? ( >=dev-lang/perl-5.6.1-r2 )
 	python? ( >=dev-lang/python-2.2 dev-python/egenix-mx-base )
 	ssl? ( >=dev-libs/openssl-0.9.6-r1 )
-	xml2? ( dev-libs/libxml2 dev-libs/libxslt dev-util/pkgconfig )
+	xml? ( dev-libs/libxml2 dev-libs/libxslt dev-util/pkgconfig )
 	nls? ( sys-devel/gettext )"
 RDEPEND="virtual/libc
 	zlib? ( >=sys-libs/zlib-1.1.3 )
@@ -34,7 +34,7 @@ RDEPEND="virtual/libc
 	perl? ( >=dev-lang/perl-5.6.1-r2 )
 	python? ( >=dev-lang/python-2.2 )
 	ssl? ( >=dev-libs/openssl-0.9.6-r1 )
-	xml2? ( dev-libs/libxml2 dev-libs/libxslt )
+	xml? ( dev-libs/libxml2 dev-libs/libxslt )
 	!dev-db/postgresql"
 
 PG_DIR="/var/lib/postgresql"
@@ -98,7 +98,7 @@ src_compile() {
 	make || die
 	cd contrib
 	make || die
-	if use xml2; then
+	if use xml; then
 		cd xml2
 		make || die
 	fi
@@ -118,7 +118,7 @@ src_install() {
 #	make DESTDIR=${D} install-all-headers || die
 	cd ${S}/contrib
 	make DESTDIR=${D} LIBDIR=${D}/usr/lib install || die
-	if use xml2; then
+	if use xml; then
 		cd ${S}/contrib/xml2
 		make DESTDIR=${D} LIBDIR=${D}/usr/lib install || die
 	fi