diff options
| author |   Michael Sterrett <mr_bones_@gentoo.org> | 2006-07-05 07:45:33 +0000 |
|---|---|---|
| committer | Michael Sterrett <mr_bones_@gentoo.org> | 2006-07-05 07:45:33 +0000 |
| commit | 3241e6913cd41857bbc18f0f2d973442f97bdb4e (patch) | |
| tree | c3ab52c649731240c410d42b294e6d3e3b662e4a /dev-db/postgresql/postgresql-7.4.7-r2.ebuild | |
| parent | Version bump wrt bug #136124 (diff) | |
| download | gentoo-2-3241e6913cd41857bbc18f0f2d973442f97bdb4e.tar.gz gentoo-2-3241e6913cd41857bbc18f0f2d973442f97bdb4e.tar.bz2 gentoo-2-3241e6913cd41857bbc18f0f2d973442f97bdb4e.zip | |
xml2 use flag changed to xml
(Portage version: 2.1.1_pre2-r2)
Diffstat (limited to 'dev-db/postgresql/postgresql-7.4.7-r2.ebuild')
| -rw-r--r-- | dev-db/postgresql/postgresql-7.4.7-r2.ebuild | 18 |
1 files changed, 9 insertions, 9 deletions
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} |