added xml support

diff --git a/dev-db/postgresql/ChangeLog b/dev-db/postgresql/ChangeLog
index c1c2707943123203e26f6336f90967f728929fdb..cef7c1e0250b56aa47b9499a6c65ace64aab7206 100644 (file)
--- a/dev-db/postgresql/ChangeLog
+++ b/dev-db/postgresql/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for dev-db/postgresql
 # Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-db/postgresql/ChangeLog,v 1.165 2005/01/04 13:22:07 nakano Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-db/postgresql/ChangeLog,v 1.166 2005/01/04 15:45:36 nakano Exp $
+
+  04 Jan 2005; Masatomo Nakano <nakano@gentoo.org> postgresql-7.4.6.ebuild:
+  Added xml support. (#75701)
 
 *postgresql-8.0.0_rc3 (04 Jan 2005)
 

diff --git a/dev-db/postgresql/Manifest b/dev-db/postgresql/Manifest
index 2bb9ffef048f78f87c24d182234eb549edbfe28a..d5e52cfd4bcfc9e48ce73f4a00c2ab21787b3efb 100644 (file)
--- a/dev-db/postgresql/Manifest
+++ b/dev-db/postgresql/Manifest
@@ -3,13 +3,13 @@ MD5 69acfa17c1b50b08165f065d7a885daf postgresql-7.3.6-r1.ebuild 7509
 MD5 df9a7b900e529b8daff0c93e5cc44342 postgresql-7.4.3-r1.ebuild 10059
 MD5 40ef4023dbb91ffc0e820a9eca603b84 postgresql-7.4.5-r2.ebuild 10119
 MD5 70d54e3889cd15536b1428f7e1a00a4d postgresql-7.3.8.ebuild 7981
-MD5 3bcf33a005b527699fe803ca40c0e014 postgresql-7.4.6.ebuild 10141
+MD5 e3d30de8e82f60e254f4eec69d6ec5ea postgresql-7.4.6.ebuild 10441
 MD5 f09416694117e0a0cee33645c684ff35 postgresql-7.3.7-r2.ebuild 7954
 MD5 867641bb7281f098bc2aacc094ac1c77 postgresql-7.4.3.ebuild 9766
 MD5 99537073b08406950be7655e973b307d postgresql-7.4.5-r1.ebuild 10089
 MD5 bdfd4a43640f16a47557c34dc6bc618c postgresql-8.0.0_rc3.ebuild 7247
 MD5 7de4b12d2bbae3e1ab01a33a287972fe postgresql-7.4.5.ebuild 10077
-MD5 68b27dc62ce1ead2a2e9367a2dd9d820 ChangeLog 29457
+MD5 df42993f9731da0d8ddf47c53246045a ChangeLog 29564
 MD5 f8d3d207746da2a3cd14dcaab8daab76 metadata.xml 163
 MD5 cd9e32f5a21def1a4e2d1ac0e042aa47 files/postgresql-7.3.7-gentoo.patch 529
 MD5 e9a2e5278a70bebace44f1ecf38129e6 files/postgresql-7.4.6-gentoo.patch 1160

diff --git a/dev-db/postgresql/postgresql-7.4.6.ebuild b/dev-db/postgresql/postgresql-7.4.6.ebuild
index d7322d6da47a18c040091a98ab76dd07d6a0ac02..f36dde768e422d8f75fa6a572add0823f89650ea 100644 (file)
--- a/dev-db/postgresql/postgresql-7.4.6.ebuild
+++ b/dev-db/postgresql/postgresql-7.4.6.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-db/postgresql/postgresql-7.4.6.ebuild,v 1.8 2005/01/01 17:42:02 eradicator Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-db/postgresql/postgresql-7.4.6.ebuild,v 1.9 2005/01/04 15:45:36 nakano Exp $
 
 inherit eutils gnuconfig flag-o-matic java-pkg
 
@@ -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"
+IUSE="ssl nls java python tcltk perl libg++ pam readline zlib doc pg-hier pg-vacuumdelay pg-intdatetime threads xml2"
 
 DEPEND="virtual/libc
        sys-devel/autoconf
@@ -29,7 +29,8 @@ DEPEND="virtual/libc
        java? ( >=virtual/jdk-1.3* >=dev-java/ant-1.3
                dev-java/java-config )
        ssl? ( >=dev-libs/openssl-0.9.6-r1 )
-       nls? ( sys-devel/gettext )"
+       nls? ( sys-devel/gettext )
+       xml2? ( dev-libs/libxml2 dev-libs/libxslt )"
 # java dep workaround for portage bug
 # x86? ( java? ( =dev-java/sun-jdk-1.3* >=dev-java/ant-1.3 ) )
 RDEPEND="virtual/libc
@@ -113,6 +114,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)"
 
        # Detect mips systems properly
        gnuconfig_update
@@ -131,6 +134,9 @@ src_compile() {
        make || die
        cd contrib
        make || die
+       if use xml2; then
+               make -C xml || die
+       fi
 }
 
 src_install() {
@@ -147,6 +153,9 @@ 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
+               make -C xml DESTDIR=${D} IBDIR=${D}/usr/lib install || die
+       fi
        cd ${S}
        if use pg-hier; then
                dodoc ${WORKDIR}/README-${P_HIERPG}.html || die