xml2 use flag changed to xml

(Portage version: 2.1.1_pre2-r2)

17 files changed, 129 insertions, 119 deletions

diff --git a/dev-db/postgresql/ChangeLog b/dev-db/postgresql/ChangeLog
index 8c3aae526195..2e821bcde776 100644
--- a/dev-db/postgresql/ChangeLog
+++ b/dev-db/postgresql/ChangeLog
@@ -1,6 +1,16 @@
 # ChangeLog for dev-db/postgresql
 # Copyright 2002-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-db/postgresql/ChangeLog,v 1.279 2006/06/05 02:02:51 tcort Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-db/postgresql/ChangeLog,v 1.280 2006/07/05 07:45:33 mr_bones_ Exp $
+
+  05 Jul 2006; Michael Sterrett <mr_bones_@gentoo.org>
+  postgresql-7.4.7-r1.ebuild, postgresql-7.4.7-r2.ebuild,
+  postgresql-7.4.8.ebuild, postgresql-7.4.9.ebuild,
+  postgresql-7.4.11.ebuild, postgresql-7.4.12.ebuild,
+  postgresql-7.4.13.ebuild, postgresql-8.0.3.ebuild,
+  postgresql-8.0.4.ebuild, postgresql-8.0.6.ebuild, postgresql-8.0.7.ebuild,
+  postgresql-8.0.8.ebuild, postgresql-8.1.2.ebuild, postgresql-8.1.3.ebuild,
+  postgresql-8.1.3-r1.ebuild, postgresql-8.1.4.ebuild:
+  xml2 use flag changed to xml
 
   04 Jun 2006; Thomas Cort <tcort@gentoo.org> postgresql-8.0.8.ebuild:
   Stable on amd64 wrt security Bug #134168.
diff --git a/dev-db/postgresql/postgresql-7.4.11.ebuild b/dev-db/postgresql/postgresql-7.4.11.ebuild
index 0956fa270d05..ca03a16bee79 100644
--- a/dev-db/postgresql/postgresql-7.4.11.ebuild
+++ b/dev-db/postgresql/postgresql-7.4.11.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2006 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-db/postgresql/postgresql-7.4.11.ebuild,v 1.1 2006/01/28 21:24:39 nakano Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-db/postgresql/postgresql-7.4.11.ebuild,v 1.2 2006/07/05 07:45:33 mr_bones_ Exp $
 
 inherit eutils gnuconfig flag-o-matic java-pkg multilib toolchain-funcs
 
@@ -15,7 +15,7 @@ SRC_URI="mirror://postgresql/source/v${PV}/${PN}-base-${PV}.tar.bz2
 LICENSE="POSTGRESQL"
 SLOT="0"
 KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
-IUSE="ssl nls java python tcltk perl libg++ pam readline zlib doc pg-hier pg-vacuumdelay pg-intdatetime threads xml2 selinux"
+IUSE="ssl nls java python tcltk perl libg++ pam readline zlib doc pg-hier pg-vacuumdelay pg-intdatetime threads xml selinux"
 
 DEPEND="virtual/libc
 	=dev-db/libpq-7.4.11*
@@ -31,7 +31,7 @@ DEPEND="virtual/libc
 		dev-java/java-config )
 	ssl? ( >=dev-libs/openssl-0.9.6-r1 )
 	nls? ( sys-devel/gettext )
-	xml2? ( dev-libs/libxml2 dev-libs/libxslt dev-util/pkgconfig )"
+	xml? ( dev-libs/libxml2 dev-libs/libxslt dev-util/pkgconfig )"
 # java dep workaround for portage bug
 # x86? ( java? ( =dev-java/sun-jdk-1.3* >=dev-java/ant-1.3 ) )
 RDEPEND="virtual/libc
@@ -43,7 +43,7 @@ RDEPEND="virtual/libc
 	java? ( >=virtual/jdk-1.3 )
 	selinux? ( sec-policy/selinux-postgresql )
 	ssl? ( >=dev-libs/openssl-0.9.6-r1 )
-	xml2? ( dev-libs/libxml2 dev-libs/libxslt )"
+	xml? ( dev-libs/libxml2 dev-libs/libxslt )"
 
 PG_DIR="/var/lib/postgresql"
 MAX_CONNECTIONS=1024
@@ -122,8 +122,8 @@ src_compile() {
 	# down, anything more aggressive fails (i.e. -mcpu or -Ox)
 	# Gerk - Nov 26, 2002
 	use ppc && CFLAGS="-pipe -fsigned-char"
-	use xml2 && CFLAGS="${CFLAGS} $(pkg-config --cflags libxml-2.0)"
-	use xml2 && LIBS="${LIBS} $(pkg-config --libs libxml-2.0)"
+	use xml && CFLAGS="${CFLAGS} $(pkg-config --cflags libxml-2.0)"
+	use xml && LIBS="${LIBS} $(pkg-config --libs libxml-2.0)"
 
 	# Detect mips systems properly
 	gnuconfig_update
@@ -141,7 +141,7 @@ src_compile() {
 	make LD="$(tc-getLD) $(get_abi_LDFLAGS)" || die
 	cd contrib
 	make LD="$(tc-getLD) $(get_abi_LDFLAGS)" || die
-	if use xml2; then
+	if use xml; then
 		make -C xml LD="$(tc-getLD) $(get_abi_LDFLAGS)" || die
 	fi
 }
@@ -160,7 +160,7 @@ src_install() {
 	make DESTDIR=${D} includedir_server=/usr/include/postgresql/server includedir_internal=/usr/include/postgresql/internal install-all-headers || die
 	cd ${S}/contrib
 	make DESTDIR=${D} LIBDIR=${D}/usr/lib install || die
-	if use xml2; then
+	if use xml; then
 		make -C xml DESTDIR=${D} IBDIR=${D}/usr/lib install || die
 	fi
 	cd ${S}
diff --git a/dev-db/postgresql/postgresql-7.4.12.ebuild b/dev-db/postgresql/postgresql-7.4.12.ebuild
index f3d4e44602b3..a1b0f78012f0 100644
--- a/dev-db/postgresql/postgresql-7.4.12.ebuild
+++ b/dev-db/postgresql/postgresql-7.4.12.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2006 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-db/postgresql/postgresql-7.4.12.ebuild,v 1.2 2006/02/20 06:23:13 kumba Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-db/postgresql/postgresql-7.4.12.ebuild,v 1.3 2006/07/05 07:45:33 mr_bones_ Exp $
 
 inherit eutils gnuconfig flag-o-matic java-pkg multilib toolchain-funcs
 
@@ -15,7 +15,7 @@ SRC_URI="mirror://postgresql/source/v${PV}/${PN}-base-${PV}.tar.bz2
 LICENSE="POSTGRESQL"
 SLOT="0"
 KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
-IUSE="ssl nls java python tcltk perl libg++ pam readline zlib doc pg-hier pg-vacuumdelay pg-intdatetime threads xml2 selinux"
+IUSE="ssl nls java python tcltk perl libg++ pam readline zlib doc pg-hier pg-vacuumdelay pg-intdatetime threads xml selinux"
 
 DEPEND="virtual/libc
 	=dev-db/libpq-7.4.12*
@@ -31,7 +31,7 @@ DEPEND="virtual/libc
 		dev-java/java-config )
 	ssl? ( >=dev-libs/openssl-0.9.6-r1 )
 	nls? ( sys-devel/gettext )
-	xml2? ( dev-libs/libxml2 dev-libs/libxslt dev-util/pkgconfig )"
+	xml? ( dev-libs/libxml2 dev-libs/libxslt dev-util/pkgconfig )"
 # java dep workaround for portage bug
 # x86? ( java? ( =dev-java/sun-jdk-1.3* >=dev-java/ant-1.3 ) )
 RDEPEND="virtual/libc
@@ -43,7 +43,7 @@ RDEPEND="virtual/libc
 	java? ( >=virtual/jdk-1.3 )
 	selinux? ( sec-policy/selinux-postgresql )
 	ssl? ( >=dev-libs/openssl-0.9.6-r1 )
-	xml2? ( dev-libs/libxml2 dev-libs/libxslt )"
+	xml? ( dev-libs/libxml2 dev-libs/libxslt )"
 
 PG_DIR="/var/lib/postgresql"
 MAX_CONNECTIONS=1024
@@ -122,8 +122,8 @@ src_compile() {
 	# down, anything more aggressive fails (i.e. -mcpu or -Ox)
 	# Gerk - Nov 26, 2002
 	use ppc && CFLAGS="-pipe -fsigned-char"
-	use xml2 && CFLAGS="${CFLAGS} $(pkg-config --cflags libxml-2.0)"
-	use xml2 && LIBS="${LIBS} $(pkg-config --libs libxml-2.0)"
+	use xml && CFLAGS="${CFLAGS} $(pkg-config --cflags libxml-2.0)"
+	use xml && LIBS="${LIBS} $(pkg-config --libs libxml-2.0)"
 
 	# Detect mips systems properly
 	gnuconfig_update
@@ -141,7 +141,7 @@ src_compile() {
 	make LD="$(tc-getLD) $(get_abi_LDFLAGS)" || die
 	cd contrib
 	make LD="$(tc-getLD) $(get_abi_LDFLAGS)" || die
-	if use xml2; then
+	if use xml; then
 		make -C xml LD="$(tc-getLD) $(get_abi_LDFLAGS)" || die
 	fi
 }
@@ -160,7 +160,7 @@ src_install() {
 	make DESTDIR=${D} includedir_server=/usr/include/postgresql/server includedir_internal=/usr/include/postgresql/internal install-all-headers || die
 	cd ${S}/contrib
 	make DESTDIR=${D} LIBDIR=${D}/usr/lib install || die
-	if use xml2; then
+	if use xml; then
 		make -C xml DESTDIR=${D} IBDIR=${D}/usr/lib install || die
 	fi
 	cd ${S}
diff --git a/dev-db/postgresql/postgresql-7.4.13.ebuild b/dev-db/postgresql/postgresql-7.4.13.ebuild
index 89c00e73a437..6ca3f5a356bd 100644
--- a/dev-db/postgresql/postgresql-7.4.13.ebuild
+++ b/dev-db/postgresql/postgresql-7.4.13.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2006 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-db/postgresql/postgresql-7.4.13.ebuild,v 1.9 2006/06/28 03:04:22 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-db/postgresql/postgresql-7.4.13.ebuild,v 1.10 2006/07/05 07:45:33 mr_bones_ Exp $
 
 inherit eutils gnuconfig flag-o-matic java-pkg multilib toolchain-funcs
 
@@ -15,7 +15,7 @@ SRC_URI="mirror://postgresql/source/v${PV}/${PN}-base-${PV}.tar.bz2
 LICENSE="POSTGRESQL"
 SLOT="0"
 KEYWORDS="alpha amd64 arm hppa ia64 mips ppc ppc64 s390 sh sparc x86"
-IUSE="ssl nls java python tcltk perl libg++ pam readline zlib doc pg-hier pg-vacuumdelay pg-intdatetime threads xml2 selinux"
+IUSE="ssl nls java python tcltk perl libg++ pam readline zlib doc pg-hier pg-vacuumdelay pg-intdatetime threads xml selinux"
 
 DEPEND="virtual/libc
 	=dev-db/libpq-7.4.13*
@@ -31,7 +31,7 @@ DEPEND="virtual/libc
 		dev-java/java-config )
 	ssl? ( >=dev-libs/openssl-0.9.6-r1 )
 	nls? ( sys-devel/gettext )
-	xml2? ( dev-libs/libxml2 dev-libs/libxslt dev-util/pkgconfig )"
+	xml? ( dev-libs/libxml2 dev-libs/libxslt dev-util/pkgconfig )"
 # java dep workaround for portage bug
 # x86? ( java? ( =dev-java/sun-jdk-1.3* >=dev-java/ant-1.3 ) )
 RDEPEND="virtual/libc
@@ -43,7 +43,7 @@ RDEPEND="virtual/libc
 	java? ( >=virtual/jdk-1.3 )
 	selinux? ( sec-policy/selinux-postgresql )
 	ssl? ( >=dev-libs/openssl-0.9.6-r1 )
-	xml2? ( dev-libs/libxml2 dev-libs/libxslt )"
+	xml? ( dev-libs/libxml2 dev-libs/libxslt )"
 
 PG_DIR="/var/lib/postgresql"
 MAX_CONNECTIONS=1024
@@ -127,8 +127,8 @@ src_compile() {
 	# down, anything more aggressive fails (i.e. -mcpu or -Ox)
 	# Gerk - Nov 26, 2002
 	use ppc && CFLAGS="-pipe -fsigned-char"
-	use xml2 && CFLAGS="${CFLAGS} $(pkg-config --cflags libxml-2.0)"
-	use xml2 && LIBS="${LIBS} $(pkg-config --libs libxml-2.0)"
+	use xml && CFLAGS="${CFLAGS} $(pkg-config --cflags libxml-2.0)"
+	use xml && LIBS="${LIBS} $(pkg-config --libs libxml-2.0)"
 
 	# Detect mips systems properly
 	gnuconfig_update
@@ -146,7 +146,7 @@ src_compile() {
 	make LD="$(tc-getLD) $(get_abi_LDFLAGS)" || die
 	cd contrib
 	make LD="$(tc-getLD) $(get_abi_LDFLAGS)" || die
-	if use xml2; then
+	if use xml; then
 		make -C xml LD="$(tc-getLD) $(get_abi_LDFLAGS)" || die
 	fi
 }
@@ -165,7 +165,7 @@ src_install() {
 	make DESTDIR=${D} includedir_server=/usr/include/postgresql/server includedir_internal=/usr/include/postgresql/internal install-all-headers || die
 	cd ${S}/contrib
 	make DESTDIR=${D} LIBDIR=${D}/usr/lib install || die
-	if use xml2; then
+	if use xml; then
 		make -C xml DESTDIR=${D} IBDIR=${D}/usr/lib install || die
 	fi
 	cd ${S}
diff --git a/dev-db/postgresql/postgresql-7.4.7-r1.ebuild b/dev-db/postgresql/postgresql-7.4.7-r1.ebuild
index eb51796b8699..b8f9ea33fdf6 100644
--- a/dev-db/postgresql/postgresql-7.4.7-r1.ebuild
+++ b/dev-db/postgresql/postgresql-7.4.7-r1.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/postgresql/postgresql-7.4.7-r1.ebuild,v 1.15 2005/11/12 22:48:12 nakano Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-db/postgresql/postgresql-7.4.7-r1.ebuild,v 1.16 2006/07/05 07:45:33 mr_bones_ Exp $
 
 inherit eutils gnuconfig flag-o-matic java-pkg multilib toolchain-funcs
 
@@ -15,7 +15,7 @@ SRC_URI="mirror://postgresql/source/v${PV}/${PN}-base-${PV}.tar.bz2
 LICENSE="POSTGRESQL"
 SLOT="0"
 KEYWORDS="x86 ppc sparc mips alpha arm hppa amd64 ia64 s390 ppc64"
-IUSE="ssl nls java python tcltk perl libg++ pam readline zlib doc pg-hier pg-vacuumdelay pg-intdatetime threads xml2 selinux"
+IUSE="ssl nls java python tcltk perl libg++ pam readline zlib doc pg-hier pg-vacuumdelay pg-intdatetime threads xml selinux"
 
 DEPEND="virtual/libc
 	sys-devel/autoconf
@@ -30,7 +30,7 @@ DEPEND="virtual/libc
 		dev-java/java-config )
 	ssl? ( >=dev-libs/openssl-0.9.6-r1 )
 	nls? ( sys-devel/gettext )
-	xml2? ( dev-libs/libxml2 dev-libs/libxslt dev-util/pkgconfig )"
+	xml? ( dev-libs/libxml2 dev-libs/libxslt dev-util/pkgconfig )"
 # java dep workaround for portage bug
 # x86? ( java? ( =dev-java/sun-jdk-1.3* >=dev-java/ant-1.3 ) )
 RDEPEND="virtual/libc
@@ -41,7 +41,7 @@ RDEPEND="virtual/libc
 	java? ( >=virtual/jdk-1.3 )
 	selinux? ( sec-policy/selinux-postgresql )
 	ssl? ( >=dev-libs/openssl-0.9.6-r1 )
-	xml2? ( dev-libs/libxml2 dev-libs/libxslt )"
+	xml? ( dev-libs/libxml2 dev-libs/libxslt )"
 
 PG_DIR="/var/lib/postgresql"
 MAX_CONNECTIONS=1024
@@ -118,8 +118,8 @@ src_compile() {
 	# down, anything more aggressive fails (i.e. -mcpu or -Ox)
 	# Gerk - Nov 26, 2002
 	use ppc && CFLAGS="-pipe -fsigned-char"
-	use xml2 && CFLAGS="${CFLAGS} $(pkg-config --cflags libxml-2.0)"
-	use xml2 && LIBS="${LIBS} $(pkg-config --libs libxml-2.0)"
+	use xml && CFLAGS="${CFLAGS} $(pkg-config --cflags libxml-2.0)"
+	use xml && LIBS="${LIBS} $(pkg-config --libs libxml-2.0)"
 
 	# Detect mips systems properly
 	gnuconfig_update
@@ -137,7 +137,7 @@ src_compile() {
 	make LD="$(tc-getLD) $(get_abi_LDFLAGS)" || die
 	cd contrib
 	make LD="$(tc-getLD) $(get_abi_LDFLAGS)" || die
-	if use xml2; then
+	if use xml; then
 		make -C xml LD="$(tc-getLD) $(get_abi_LDFLAGS)" || die
 	fi
 }
@@ -156,7 +156,7 @@ src_install() {
 	make DESTDIR=${D} includedir_server=/usr/include/postgresql/server includedir_internal=/usr/include/postgresql/internal install-all-headers || die
 	cd ${S}/contrib
 	make DESTDIR=${D} LIBDIR=${D}/usr/lib install || die
-	if use xml2; then
+	if use xml; then
 		make -C xml DESTDIR=${D} IBDIR=${D}/usr/lib install || die
 	fi
 	cd ${S}
diff --git a/dev-db/postgresql/postgresql-7.4.7-r2.ebuild b/dev-db/postgresql/postgresql-7.4.7-r2.ebuild
index 4e6b3660d2e6..8895eeeb77cc 100644
--- a/dev-db/postgresql/postgresql-7.4.7-r2.ebuild
+++ b/dev-db/postgresql/postgresql-7.4.7-r2.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/postgresql/postgresql-7.4.7-r2.ebuild,v 1.11 2005/12/27 06:36:02 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-db/postgresql/postgresql-7.4.7-r2.ebuild,v 1.12 2006/07/05 07:45:33 mr_bones_ Exp $
 
 inherit eutils gnuconfig flag-o-matic java-pkg multilib toolchain-funcs
 
@@ -15,7 +15,7 @@ SRC_URI="mirror://postgresql/source/v${PV}/${PN}-base-${PV}.tar.bz2
 LICENSE="POSTGRESQL"
 SLOT="0"
 KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 s390 sh ~sparc x86"
-IUSE="ssl nls java python tcltk perl libg++ pam readline zlib doc pg-hier pg-vacuumdelay pg-intdatetime threads xml2 selinux"
+IUSE="ssl nls java python tcltk perl libg++ pam readline zlib doc pg-hier pg-vacuumdelay pg-intdatetime threads xml selinux"
 
 DEPEND="virtual/libc
 	sys-devel/autoconf
@@ -30,7 +30,7 @@ DEPEND="virtual/libc
 		dev-java/java-config )
 	ssl? ( >=dev-libs/openssl-0.9.6-r1 )
 	nls? ( sys-devel/gettext )
-	xml2? ( dev-libs/libxml2 dev-libs/libxslt dev-util/pkgconfig )"
+	xml? ( dev-libs/libxml2 dev-libs/libxslt dev-util/pkgconfig )"
 # java dep workaround for portage bug
 # x86? ( java? ( =dev-java/sun-jdk-1.3* >=dev-java/ant-1.3 ) )
 RDEPEND="virtual/libc
@@ -41,7 +41,7 @@ RDEPEND="virtual/libc
 	java? ( >=virtual/jdk-1.3 )
 	selinux? ( sec-policy/selinux-postgresql )
 	ssl? ( >=dev-libs/openssl-0.9.6-r1 )
-	xml2? ( dev-libs/libxml2 dev-libs/libxslt )"
+	xml? ( dev-libs/libxml2 dev-libs/libxslt )"
 
 PG_DIR="/var/lib/postgresql"
 MAX_CONNECTIONS=1024
@@ -123,8 +123,8 @@ src_compile() {
 	# down, anything more aggressive fails (i.e. -mcpu or -Ox)
 	# Gerk - Nov 26, 2002
 	use ppc && CFLAGS="-pipe -fsigned-char"
-	use xml2 && CFLAGS="${CFLAGS} $(pkg-config --cflags libxml-2.0)"
-	use xml2 && LIBS="${LIBS} $(pkg-config --libs libxml-2.0)"
+	use xml && CFLAGS="${CFLAGS} $(pkg-config --cflags libxml-2.0)"
+	use xml && LIBS="${LIBS} $(pkg-config --libs libxml-2.0)"
 
 	# Detect mips systems properly
 	gnuconfig_update
@@ -142,7 +142,7 @@ src_compile() {
 	make LD="$(tc-getLD) $(get_abi_LDFLAGS)" || die
 	cd contrib
 	make LD="$(tc-getLD) $(get_abi_LDFLAGS)" || die
-	if use xml2; then
+	if use xml; then
 		make -C xml LD="$(tc-getLD) $(get_abi_LDFLAGS)" || die
 	fi
 }
@@ -161,7 +161,7 @@ src_install() {
 	make DESTDIR=${D} includedir_server=/usr/include/postgresql/server includedir_internal=/usr/include/postgresql/internal install-all-headers || die
 	cd ${S}/contrib
 	make DESTDIR=${D} LIBDIR=${D}/usr/lib install || die
-	if use xml2; then
+	if use xml; then
 		make -C xml DESTDIR=${D} IBDIR=${D}/usr/lib install || die
 	fi
 	cd ${S}
diff --git a/dev-db/postgresql/postgresql-7.4.8.ebuild b/dev-db/postgresql/postgresql-7.4.8.ebuild
index 0469e90ad0ef..bc30e0f44dc2 100644
--- a/dev-db/postgresql/postgresql-7.4.8.ebuild
+++ b/dev-db/postgresql/postgresql-7.4.8.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/postgresql/postgresql-7.4.8.ebuild,v 1.7 2005/12/27 06:36:02 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-db/postgresql/postgresql-7.4.8.ebuild,v 1.8 2006/07/05 07:45:33 mr_bones_ Exp $
 
 inherit eutils gnuconfig flag-o-matic java-pkg multilib toolchain-funcs
 
@@ -15,7 +15,7 @@ SRC_URI="mirror://postgresql/source/v${PV}/${PN}-base-${PV}.tar.bz2
 LICENSE="POSTGRESQL"
 SLOT="0"
 KEYWORDS="~alpha ~amd64 arm hppa ia64 ~mips ~ppc ~ppc64 s390 sh ~sparc x86"
-IUSE="ssl nls java python tcltk perl libg++ pam readline zlib doc pg-hier pg-vacuumdelay pg-intdatetime threads xml2 selinux"
+IUSE="ssl nls java python tcltk perl libg++ pam readline zlib doc pg-hier pg-vacuumdelay pg-intdatetime threads xml selinux"
 
 DEPEND="virtual/libc
 	=dev-db/libpq-7.4.8*
@@ -31,7 +31,7 @@ DEPEND="virtual/libc
 		dev-java/java-config )
 	ssl? ( >=dev-libs/openssl-0.9.6-r1 )
 	nls? ( sys-devel/gettext )
-	xml2? ( dev-libs/libxml2 dev-libs/libxslt dev-util/pkgconfig )"
+	xml? ( dev-libs/libxml2 dev-libs/libxslt dev-util/pkgconfig )"
 # java dep workaround for portage bug
 # x86? ( java? ( =dev-java/sun-jdk-1.3* >=dev-java/ant-1.3 ) )
 RDEPEND="virtual/libc
@@ -43,7 +43,7 @@ RDEPEND="virtual/libc
 	java? ( >=virtual/jdk-1.3 )
 	selinux? ( sec-policy/selinux-postgresql )
 	ssl? ( >=dev-libs/openssl-0.9.6-r1 )
-	xml2? ( dev-libs/libxml2 dev-libs/libxslt )"
+	xml? ( dev-libs/libxml2 dev-libs/libxslt )"
 
 PG_DIR="/var/lib/postgresql"
 MAX_CONNECTIONS=1024
@@ -118,8 +118,8 @@ src_compile() {
 	# down, anything more aggressive fails (i.e. -mcpu or -Ox)
 	# Gerk - Nov 26, 2002
 	use ppc && CFLAGS="-pipe -fsigned-char"
-	use xml2 && CFLAGS="${CFLAGS} $(pkg-config --cflags libxml-2.0)"
-	use xml2 && LIBS="${LIBS} $(pkg-config --libs libxml-2.0)"
+	use xml && CFLAGS="${CFLAGS} $(pkg-config --cflags libxml-2.0)"
+	use xml && LIBS="${LIBS} $(pkg-config --libs libxml-2.0)"
 
 	# Detect mips systems properly
 	gnuconfig_update
@@ -137,7 +137,7 @@ src_compile() {
 	make LD="$(tc-getLD) $(get_abi_LDFLAGS)" || die
 	cd contrib
 	make LD="$(tc-getLD) $(get_abi_LDFLAGS)" || die
-	if use xml2; then
+	if use xml; then
 		make -C xml LD="$(tc-getLD) $(get_abi_LDFLAGS)" || die
 	fi
 }
@@ -156,7 +156,7 @@ src_install() {
 	make DESTDIR=${D} includedir_server=/usr/include/postgresql/server includedir_internal=/usr/include/postgresql/internal install-all-headers || die
 	cd ${S}/contrib
 	make DESTDIR=${D} LIBDIR=${D}/usr/lib install || die
-	if use xml2; then
+	if use xml; then
 		make -C xml DESTDIR=${D} IBDIR=${D}/usr/lib install || die
 	fi
 	cd ${S}
diff --git a/dev-db/postgresql/postgresql-7.4.9.ebuild b/dev-db/postgresql/postgresql-7.4.9.ebuild
index 93182e24fb70..c1250d7e91d2 100644
--- a/dev-db/postgresql/postgresql-7.4.9.ebuild
+++ b/dev-db/postgresql/postgresql-7.4.9.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2006 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-db/postgresql/postgresql-7.4.9.ebuild,v 1.11 2006/02/19 20:57:42 kloeri Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-db/postgresql/postgresql-7.4.9.ebuild,v 1.12 2006/07/05 07:45:33 mr_bones_ Exp $
 
 inherit eutils gnuconfig flag-o-matic java-pkg multilib toolchain-funcs
 
@@ -15,7 +15,7 @@ SRC_URI="mirror://postgresql/source/v${PV}/${PN}-base-${PV}.tar.bz2
 LICENSE="POSTGRESQL"
 SLOT="0"
 KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 s390 sh sparc x86"
-IUSE="ssl nls java python tcltk perl libg++ pam readline zlib doc pg-hier pg-vacuumdelay pg-intdatetime threads xml2 selinux"
+IUSE="ssl nls java python tcltk perl libg++ pam readline zlib doc pg-hier pg-vacuumdelay pg-intdatetime threads xml selinux"
 
 DEPEND="virtual/libc
 	=dev-db/libpq-7.4.9*
@@ -31,7 +31,7 @@ DEPEND="virtual/libc
 		dev-java/java-config )
 	ssl? ( >=dev-libs/openssl-0.9.6-r1 )
 	nls? ( sys-devel/gettext )
-	xml2? ( dev-libs/libxml2 dev-libs/libxslt dev-util/pkgconfig )"
+	xml? ( dev-libs/libxml2 dev-libs/libxslt dev-util/pkgconfig )"
 # java dep workaround for portage bug
 # x86? ( java? ( =dev-java/sun-jdk-1.3* >=dev-java/ant-1.3 ) )
 RDEPEND="virtual/libc
@@ -43,7 +43,7 @@ RDEPEND="virtual/libc
 	java? ( >=virtual/jdk-1.3 )
 	selinux? ( sec-policy/selinux-postgresql )
 	ssl? ( >=dev-libs/openssl-0.9.6-r1 )
-	xml2? ( dev-libs/libxml2 dev-libs/libxslt )"
+	xml? ( dev-libs/libxml2 dev-libs/libxslt )"
 
 PG_DIR="/var/lib/postgresql"
 MAX_CONNECTIONS=1024
@@ -122,8 +122,8 @@ src_compile() {
 	# down, anything more aggressive fails (i.e. -mcpu or -Ox)
 	# Gerk - Nov 26, 2002
 	use ppc && CFLAGS="-pipe -fsigned-char"
-	use xml2 && CFLAGS="${CFLAGS} $(pkg-config --cflags libxml-2.0)"
-	use xml2 && LIBS="${LIBS} $(pkg-config --libs libxml-2.0)"
+	use xml && CFLAGS="${CFLAGS} $(pkg-config --cflags libxml-2.0)"
+	use xml && LIBS="${LIBS} $(pkg-config --libs libxml-2.0)"
 
 	# Detect mips systems properly
 	gnuconfig_update
@@ -141,7 +141,7 @@ src_compile() {
 	make LD="$(tc-getLD) $(get_abi_LDFLAGS)" || die
 	cd contrib
 	make LD="$(tc-getLD) $(get_abi_LDFLAGS)" || die
-	if use xml2; then
+	if use xml; then
 		make -C xml LD="$(tc-getLD) $(get_abi_LDFLAGS)" || die
 	fi
 }
@@ -160,7 +160,7 @@ src_install() {
 	make DESTDIR=${D} includedir_server=/usr/include/postgresql/server includedir_internal=/usr/include/postgresql/internal install-all-headers || die
 	cd ${S}/contrib
 	make DESTDIR=${D} LIBDIR=${D}/usr/lib install || die
-	if use xml2; then
+	if use xml; then
 		make -C xml DESTDIR=${D} IBDIR=${D}/usr/lib install || die
 	fi
 	cd ${S}
diff --git a/dev-db/postgresql/postgresql-8.0.3.ebuild b/dev-db/postgresql/postgresql-8.0.3.ebuild
index e5f14f632fba..175333bc08dd 100644
--- a/dev-db/postgresql/postgresql-8.0.3.ebuild
+++ b/dev-db/postgresql/postgresql-8.0.3.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/postgresql/postgresql-8.0.3.ebuild,v 1.14 2005/11/12 22:48:12 nakano Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-db/postgresql/postgresql-8.0.3.ebuild,v 1.15 2006/07/05 07:45:33 mr_bones_ Exp $
 
 inherit eutils gnuconfig flag-o-matic multilib toolchain-funcs
 
@@ -17,7 +17,7 @@ SRC_URI="mirror://postgresql/source/v${PV}/${PN}-base-${MY_PV}.tar.bz2
 LICENSE="POSTGRESQL"
 SLOT="0"
 KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 s390 sh sparc x86"
-IUSE="ssl nls python tcltk perl libg++ pam readline xml2 zlib doc selinux kerberos pg-intdatetime pg-hier"
+IUSE="ssl nls python tcltk perl libg++ pam readline xml zlib doc selinux kerberos pg-intdatetime pg-hier"
 
 S=${WORKDIR}/${MY_P}
 DEPEND="virtual/libc
@@ -31,7 +31,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 )
 	kerberos? ( virtual/krb5 )"
 RDEPEND="virtual/libc
@@ -42,7 +42,7 @@ RDEPEND="virtual/libc
 	python? ( >=dev-lang/python-2.2 )
 	selinux? ( sec-policy/selinux-postgresql )
 	ssl? ( >=dev-libs/openssl-0.9.6-r1 )
-	xml2? ( dev-libs/libxml2 dev-libs/libxslt )
+	xml? ( dev-libs/libxml2 dev-libs/libxslt )
 	kerberos? ( virtual/krb5 )"
 
 PG_DIR="/var/lib/postgresql"
@@ -105,7 +105,7 @@ src_compile() {
 	make LD="$(tc-getLD) $(get_abi_LDFLAGS)" || die
 	cd contrib
 	make LD="$(tc-getLD) $(get_abi_LDFLAGS)" || die
-	if use xml2; then
+	if use xml; then
 		cd xml2
 		make LD="$(tc-getLD) $(get_abi_LDFLAGS)" || die
 	fi
@@ -125,7 +125,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/postgresql/postgresql-8.0.4.ebuild b/dev-db/postgresql/postgresql-8.0.4.ebuild
index 69f3cfb73718..81176b886af7 100644
--- a/dev-db/postgresql/postgresql-8.0.4.ebuild
+++ b/dev-db/postgresql/postgresql-8.0.4.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2006 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-db/postgresql/postgresql-8.0.4.ebuild,v 1.12 2006/02/04 17:43:28 agriffis Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-db/postgresql/postgresql-8.0.4.ebuild,v 1.13 2006/07/05 07:45:33 mr_bones_ Exp $
 
 inherit eutils gnuconfig flag-o-matic multilib toolchain-funcs
 
@@ -17,7 +17,7 @@ SRC_URI="mirror://postgresql/source/v${PV}/${PN}-base-${MY_PV}.tar.bz2
 LICENSE="POSTGRESQL"
 SLOT="0"
 KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 s390 sh sparc x86"
-IUSE="ssl nls python tcltk perl libg++ pam readline xml2 zlib doc selinux kerberos pg-intdatetime pg-hier"
+IUSE="ssl nls python tcltk perl libg++ pam readline xml zlib doc selinux kerberos pg-intdatetime pg-hier"
 
 S=${WORKDIR}/${MY_P}
 DEPEND="virtual/libc
@@ -31,7 +31,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 )
 	kerberos? ( virtual/krb5 )"
 RDEPEND="virtual/libc
@@ -42,7 +42,7 @@ RDEPEND="virtual/libc
 	python? ( >=dev-lang/python-2.2 )
 	selinux? ( sec-policy/selinux-postgresql )
 	ssl? ( >=dev-libs/openssl-0.9.6-r1 )
-	xml2? ( dev-libs/libxml2 dev-libs/libxslt )
+	xml? ( dev-libs/libxml2 dev-libs/libxslt )
 	kerberos? ( virtual/krb5 )"
 
 PG_DIR="/var/lib/postgresql"
@@ -109,7 +109,7 @@ src_compile() {
 	make LD="$(tc-getLD) $(get_abi_LDFLAGS)" || die
 	cd contrib
 	make LD="$(tc-getLD) $(get_abi_LDFLAGS)" || die
-	if use xml2; then
+	if use xml; then
 		cd xml2
 		make LD="$(tc-getLD) $(get_abi_LDFLAGS)" || die
 	fi
@@ -129,7 +129,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/postgresql/postgresql-8.0.6.ebuild b/dev-db/postgresql/postgresql-8.0.6.ebuild
index 1925764f2060..8116d0940922 100644
--- a/dev-db/postgresql/postgresql-8.0.6.ebuild
+++ b/dev-db/postgresql/postgresql-8.0.6.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2006 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-db/postgresql/postgresql-8.0.6.ebuild,v 1.1 2006/01/28 21:24:39 nakano Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-db/postgresql/postgresql-8.0.6.ebuild,v 1.2 2006/07/05 07:45:33 mr_bones_ Exp $
 
 inherit eutils gnuconfig flag-o-matic multilib toolchain-funcs
 
@@ -17,7 +17,7 @@ SRC_URI="mirror://postgresql/source/v${PV}/${PN}-base-${MY_PV}.tar.bz2
 LICENSE="POSTGRESQL"
 SLOT="0"
 KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
-IUSE="ssl nls python tcltk perl libg++ pam readline xml2 zlib doc selinux kerberos pg-intdatetime pg-hier"
+IUSE="ssl nls python tcltk perl libg++ pam readline xml zlib doc selinux kerberos pg-intdatetime pg-hier"
 
 S=${WORKDIR}/${MY_P}
 DEPEND="virtual/libc
@@ -31,7 +31,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 )
 	kerberos? ( virtual/krb5 )"
 RDEPEND="virtual/libc
@@ -42,7 +42,7 @@ RDEPEND="virtual/libc
 	python? ( >=dev-lang/python-2.2 )
 	selinux? ( sec-policy/selinux-postgresql )
 	ssl? ( >=dev-libs/openssl-0.9.6-r1 )
-	xml2? ( dev-libs/libxml2 dev-libs/libxslt )
+	xml? ( dev-libs/libxml2 dev-libs/libxslt )
 	kerberos? ( virtual/krb5 )"
 
 PG_DIR="/var/lib/postgresql"
@@ -109,7 +109,7 @@ src_compile() {
 	make LD="$(tc-getLD) $(get_abi_LDFLAGS)" || die
 	cd contrib
 	make LD="$(tc-getLD) $(get_abi_LDFLAGS)" || die
-	if use xml2; then
+	if use xml; then
 		cd xml2
 		make LD="$(tc-getLD) $(get_abi_LDFLAGS)" || die
 	fi
@@ -129,7 +129,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/postgresql/postgresql-8.0.7.ebuild b/dev-db/postgresql/postgresql-8.0.7.ebuild
index c343e447f124..a73dfe223709 100644
--- a/dev-db/postgresql/postgresql-8.0.7.ebuild
+++ b/dev-db/postgresql/postgresql-8.0.7.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2006 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-db/postgresql/postgresql-8.0.7.ebuild,v 1.3 2006/03/09 22:32:41 agriffis Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-db/postgresql/postgresql-8.0.7.ebuild,v 1.4 2006/07/05 07:45:33 mr_bones_ Exp $
 
 inherit eutils gnuconfig flag-o-matic multilib toolchain-funcs
 
@@ -17,7 +17,7 @@ SRC_URI="mirror://postgresql/source/v${PV}/${PN}-base-${MY_PV}.tar.bz2
 LICENSE="POSTGRESQL"
 SLOT="0"
 KEYWORDS="~alpha ~amd64 ~arm ~hppa ia64 mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
-IUSE="ssl nls python tcltk perl libg++ pam readline xml2 zlib doc selinux kerberos pg-intdatetime pg-hier"
+IUSE="ssl nls python tcltk perl libg++ pam readline xml zlib doc selinux kerberos pg-intdatetime pg-hier"
 
 S=${WORKDIR}/${MY_P}
 DEPEND="virtual/libc
@@ -31,7 +31,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 )
 	kerberos? ( virtual/krb5 )"
 RDEPEND="virtual/libc
@@ -42,7 +42,7 @@ RDEPEND="virtual/libc
 	python? ( >=dev-lang/python-2.2 )
 	selinux? ( sec-policy/selinux-postgresql )
 	ssl? ( >=dev-libs/openssl-0.9.6-r1 )
-	xml2? ( dev-libs/libxml2 dev-libs/libxslt )
+	xml? ( dev-libs/libxml2 dev-libs/libxslt )
 	kerberos? ( virtual/krb5 )"
 
 PG_DIR="/var/lib/postgresql"
@@ -109,7 +109,7 @@ src_compile() {
 	make LD="$(tc-getLD) $(get_abi_LDFLAGS)" || die
 	cd contrib
 	make LD="$(tc-getLD) $(get_abi_LDFLAGS)" || die
-	if use xml2; then
+	if use xml; then
 		cd xml2
 		make LD="$(tc-getLD) $(get_abi_LDFLAGS)" || die
 	fi
@@ -129,7 +129,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/postgresql/postgresql-8.0.8.ebuild b/dev-db/postgresql/postgresql-8.0.8.ebuild
index 4a15f4802107..445ec437397e 100644
--- a/dev-db/postgresql/postgresql-8.0.8.ebuild
+++ b/dev-db/postgresql/postgresql-8.0.8.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2006 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-db/postgresql/postgresql-8.0.8.ebuild,v 1.9 2006/06/28 03:04:22 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-db/postgresql/postgresql-8.0.8.ebuild,v 1.10 2006/07/05 07:45:33 mr_bones_ Exp $
 
 inherit eutils gnuconfig flag-o-matic multilib toolchain-funcs
 
@@ -17,7 +17,7 @@ SRC_URI="mirror://postgresql/source/v${PV}/${PN}-base-${MY_PV}.tar.bz2
 LICENSE="POSTGRESQL"
 SLOT="0"
 KEYWORDS="alpha amd64 arm hppa ia64 mips ppc ppc64 s390 sh sparc x86"
-IUSE="ssl nls python tcltk perl libg++ pam readline xml2 zlib doc selinux kerberos pg-intdatetime pg-hier"
+IUSE="ssl nls python tcltk perl libg++ pam readline xml zlib doc selinux kerberos pg-intdatetime pg-hier"
 
 S=${WORKDIR}/${MY_P}
 DEPEND="virtual/libc
@@ -31,7 +31,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 )
 	kerberos? ( virtual/krb5 )"
 RDEPEND="virtual/libc
@@ -42,7 +42,7 @@ RDEPEND="virtual/libc
 	python? ( >=dev-lang/python-2.2 )
 	selinux? ( sec-policy/selinux-postgresql )
 	ssl? ( >=dev-libs/openssl-0.9.6-r1 )
-	xml2? ( dev-libs/libxml2 dev-libs/libxslt )
+	xml? ( dev-libs/libxml2 dev-libs/libxslt )
 	kerberos? ( virtual/krb5 )"
 
 PG_DIR="/var/lib/postgresql"
@@ -113,7 +113,7 @@ src_compile() {
 	make LD="$(tc-getLD) $(get_abi_LDFLAGS)" || die
 	cd contrib
 	make LD="$(tc-getLD) $(get_abi_LDFLAGS)" || die
-	if use xml2; then
+	if use xml; then
 		cd xml2
 		make LD="$(tc-getLD) $(get_abi_LDFLAGS)" || die
 	fi
@@ -133,7 +133,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/postgresql/postgresql-8.1.2.ebuild b/dev-db/postgresql/postgresql-8.1.2.ebuild
index d338fad03f31..e516687d7a67 100644
--- a/dev-db/postgresql/postgresql-8.1.2.ebuild
+++ b/dev-db/postgresql/postgresql-8.1.2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2006 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-db/postgresql/postgresql-8.1.2.ebuild,v 1.1 2006/01/28 21:24:39 nakano Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-db/postgresql/postgresql-8.1.2.ebuild,v 1.2 2006/07/05 07:45:33 mr_bones_ Exp $
 
 inherit eutils gnuconfig flag-o-matic multilib toolchain-funcs
 
@@ -15,8 +15,8 @@ SRC_URI="mirror://postgresql/source/v${PV}/${PN}-base-${PV}.tar.bz2
 LICENSE="POSTGRESQL"
 SLOT="0"
 KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
-#IUSE="ssl nls python tcltk perl libg++ pam readline xml2 zlib doc selinux kerberos pg-intdatetime pg-hier"
-IUSE="ssl nls python tcltk perl libg++ pam readline xml2 zlib doc selinux kerberos pg-intdatetime"
+#IUSE="ssl nls python tcltk perl libg++ pam readline xml zlib doc selinux kerberos pg-intdatetime pg-hier"
+IUSE="ssl nls python tcltk perl libg++ pam readline xml zlib doc selinux kerberos pg-intdatetime"
 
 DEPEND="virtual/libc
 	=dev-db/libpq-8.1.2*
@@ -29,7 +29,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 )
 	kerberos? ( virtual/krb5 )"
 RDEPEND="virtual/libc
@@ -40,7 +40,7 @@ RDEPEND="virtual/libc
 	python? ( >=dev-lang/python-2.2 )
 	selinux? ( sec-policy/selinux-postgresql )
 	ssl? ( >=dev-libs/openssl-0.9.6-r1 )
-	xml2? ( dev-libs/libxml2 dev-libs/libxslt )
+	xml? ( dev-libs/libxml2 dev-libs/libxslt )
 	kerberos? ( virtual/krb5 )"
 
 PG_DIR="/var/lib/postgresql"
@@ -107,7 +107,7 @@ src_compile() {
 	make LD="$(tc-getLD) $(get_abi_LDFLAGS)" || die
 	cd contrib
 	make LD="$(tc-getLD) $(get_abi_LDFLAGS)" || die
-	if use xml2; then
+	if use xml; then
 		cd xml2
 		make LD="$(tc-getLD) $(get_abi_LDFLAGS)" || die
 	fi
@@ -127,7 +127,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/postgresql/postgresql-8.1.3-r1.ebuild b/dev-db/postgresql/postgresql-8.1.3-r1.ebuild
index f23b6f7acba7..41fd6c2dc461 100644
--- a/dev-db/postgresql/postgresql-8.1.3-r1.ebuild
+++ b/dev-db/postgresql/postgresql-8.1.3-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2006 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-db/postgresql/postgresql-8.1.3-r1.ebuild,v 1.2 2006/04/17 17:48:18 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-db/postgresql/postgresql-8.1.3-r1.ebuild,v 1.3 2006/07/05 07:45:33 mr_bones_ Exp $
 
 inherit eutils gnuconfig flag-o-matic multilib toolchain-funcs
 
@@ -15,8 +15,8 @@ SRC_URI="mirror://postgresql/source/v${PV}/${PN}-base-${PV}.tar.bz2
 LICENSE="POSTGRESQL"
 SLOT="0"
 KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd"
-#IUSE="ssl nls python tcltk perl libg++ pam readline xml2 zlib doc selinux kerberos pg-intdatetime pg-hier"
-IUSE="ssl nls python tcltk perl libg++ pam readline xml2 zlib doc selinux kerberos pg-intdatetime threads"
+#IUSE="ssl nls python tcltk perl libg++ pam readline xml zlib doc selinux kerberos pg-intdatetime pg-hier"
+IUSE="ssl nls python tcltk perl libg++ pam readline xml zlib doc selinux kerberos pg-intdatetime threads"
 
 DEPEND="virtual/libc
 	=dev-db/libpq-8.1.3*
@@ -29,7 +29,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 )
 	kerberos? ( virtual/krb5 )"
 RDEPEND="virtual/libc
@@ -40,7 +40,7 @@ RDEPEND="virtual/libc
 	python? ( >=dev-lang/python-2.2 )
 	selinux? ( sec-policy/selinux-postgresql )
 	ssl? ( >=dev-libs/openssl-0.9.6-r1 )
-	xml2? ( dev-libs/libxml2 dev-libs/libxslt )
+	xml? ( dev-libs/libxml2 dev-libs/libxslt )
 	kerberos? ( virtual/krb5 )"
 
 PG_DIR="/var/lib/postgresql"
@@ -108,7 +108,7 @@ src_compile() {
 	make LD="$(tc-getLD) $(get_abi_LDFLAGS)" || die
 	cd contrib
 	make LD="$(tc-getLD) $(get_abi_LDFLAGS)" || die
-	if use xml2; then
+	if use xml; then
 		cd xml2
 		make LD="$(tc-getLD) $(get_abi_LDFLAGS)" || die
 	fi
@@ -128,7 +128,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/postgresql/postgresql-8.1.3.ebuild b/dev-db/postgresql/postgresql-8.1.3.ebuild
index 8767c7bfc569..6bc024c7f6d9 100644
--- a/dev-db/postgresql/postgresql-8.1.3.ebuild
+++ b/dev-db/postgresql/postgresql-8.1.3.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2006 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-db/postgresql/postgresql-8.1.3.ebuild,v 1.3 2006/02/20 06:36:48 kumba Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-db/postgresql/postgresql-8.1.3.ebuild,v 1.4 2006/07/05 07:45:33 mr_bones_ Exp $
 
 inherit eutils gnuconfig flag-o-matic multilib toolchain-funcs
 
@@ -15,8 +15,8 @@ SRC_URI="mirror://postgresql/source/v${PV}/${PN}-base-${PV}.tar.bz2
 LICENSE="POSTGRESQL"
 SLOT="0"
 KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
-#IUSE="ssl nls python tcltk perl libg++ pam readline xml2 zlib doc selinux kerberos pg-intdatetime pg-hier"
-IUSE="ssl nls python tcltk perl libg++ pam readline xml2 zlib doc selinux kerberos pg-intdatetime"
+#IUSE="ssl nls python tcltk perl libg++ pam readline xml zlib doc selinux kerberos pg-intdatetime pg-hier"
+IUSE="ssl nls python tcltk perl libg++ pam readline xml zlib doc selinux kerberos pg-intdatetime"
 
 DEPEND="virtual/libc
 	=dev-db/libpq-8.1.3*
@@ -29,7 +29,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 )
 	kerberos? ( virtual/krb5 )"
 RDEPEND="virtual/libc
@@ -40,7 +40,7 @@ RDEPEND="virtual/libc
 	python? ( >=dev-lang/python-2.2 )
 	selinux? ( sec-policy/selinux-postgresql )
 	ssl? ( >=dev-libs/openssl-0.9.6-r1 )
-	xml2? ( dev-libs/libxml2 dev-libs/libxslt )
+	xml? ( dev-libs/libxml2 dev-libs/libxslt )
 	kerberos? ( virtual/krb5 )"
 
 PG_DIR="/var/lib/postgresql"
@@ -107,7 +107,7 @@ src_compile() {
 	make LD="$(tc-getLD) $(get_abi_LDFLAGS)" || die
 	cd contrib
 	make LD="$(tc-getLD) $(get_abi_LDFLAGS)" || die
-	if use xml2; then
+	if use xml; then
 		cd xml2
 		make LD="$(tc-getLD) $(get_abi_LDFLAGS)" || die
 	fi
@@ -127,7 +127,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/postgresql/postgresql-8.1.4.ebuild b/dev-db/postgresql/postgresql-8.1.4.ebuild
index 103eb5aae605..9bf0eb8469ed 100644
--- a/dev-db/postgresql/postgresql-8.1.4.ebuild
+++ b/dev-db/postgresql/postgresql-8.1.4.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2006 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-db/postgresql/postgresql-8.1.4.ebuild,v 1.1 2006/05/31 17:41:47 voxus Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-db/postgresql/postgresql-8.1.4.ebuild,v 1.2 2006/07/05 07:45:33 mr_bones_ Exp $
 
 inherit eutils gnuconfig flag-o-matic multilib toolchain-funcs
 
@@ -15,8 +15,8 @@ SRC_URI="mirror://postgresql/source/v${PV}/${PN}-base-${PV}.tar.bz2
 LICENSE="POSTGRESQL"
 SLOT="0"
 KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd"
-#IUSE="ssl nls python tcltk perl libg++ pam readline xml2 zlib doc selinux kerberos pg-intdatetime pg-hier"
-IUSE="ssl nls python tcltk perl libg++ pam readline xml2 zlib doc selinux kerberos pg-intdatetime threads"
+#IUSE="ssl nls python tcltk perl libg++ pam readline xml zlib doc selinux kerberos pg-intdatetime pg-hier"
+IUSE="ssl nls python tcltk perl libg++ pam readline xml zlib doc selinux kerberos pg-intdatetime threads"
 
 DEPEND="virtual/libc
 	=dev-db/libpq-8.1.4*
@@ -29,7 +29,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 )
 	kerberos? ( virtual/krb5 )"
 RDEPEND="virtual/libc
@@ -40,7 +40,7 @@ RDEPEND="virtual/libc
 	python? ( >=dev-lang/python-2.2 )
 	selinux? ( sec-policy/selinux-postgresql )
 	ssl? ( >=dev-libs/openssl-0.9.6-r1 )
-	xml2? ( dev-libs/libxml2 dev-libs/libxslt )
+	xml? ( dev-libs/libxml2 dev-libs/libxslt )
 	kerberos? ( virtual/krb5 )"
 
 PG_DIR="/var/lib/postgresql"
@@ -112,7 +112,7 @@ src_compile() {
 	make LD="$(tc-getLD) $(get_abi_LDFLAGS)" || die
 	cd contrib
 	make LD="$(tc-getLD) $(get_abi_LDFLAGS)" || die
-	if use xml2; then
+	if use xml; then
 		cd xml2
 		make LD="$(tc-getLD) $(get_abi_LDFLAGS)" || die
 	fi
@@ -132,7 +132,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