Fix dependencies and set active version of Python.
authorArfrever Frehtes Taifersar Arahesis <arfrever@gentoo.org>
Sun, 21 Feb 2010 15:59:55 +0000 (15:59 +0000)
committerArfrever Frehtes Taifersar Arahesis <arfrever@gentoo.org>
Sun, 21 Feb 2010 15:59:55 +0000 (15:59 +0000)
Package-Manager: portage-15417-svn/cvs/Linux x86_64

dev-db/postgresql-server/Manifest
dev-db/postgresql-server/postgresql-server-8.4.2-r1.ebuild
dev-db/postgresql-server/postgresql-server-8.5_alpha3.ebuild

index 47425068f2fa4698484fd899d39fd4f0af3fc404..92a37b37104bba49eb7d8f29f5faccd3e41cf2c9 100644 (file)
@@ -69,8 +69,8 @@ EBUILD postgresql-server-8.3.8.ebuild 9660 RMD160 e1aabd52fb70c926c2f922190a61f4
 EBUILD postgresql-server-8.3.9.ebuild 9663 RMD160 da7640e17133a50f91d4cf63f7fb0971df426dbb SHA1 6450736d029c23845a91c2159f370717fe330687 SHA256 cba2238674f07b32480a70e908190bb21d90d4489b86d64f20dc0bad4bb60232
 EBUILD postgresql-server-8.4.1-r1.ebuild 9289 RMD160 2180e8cea703eee1a99bda2f8b64f6a45644168b SHA1 23c97c2a2483956ab90b729732227848873595a4 SHA256 774f506e8ecb0ac621917aa529ccdc4f28f539bcfbf9f434124f9e277ebe40b1
 EBUILD postgresql-server-8.4.1.ebuild 9212 RMD160 d6ca51e5913bb375a13978a7e1ae88ef192d16ac SHA1 1553ad55191b840a6890231d36f5bcb14807303c SHA256 43ea6ef24b6bab47d9aec598f21e77fd3819281244f2e5504c9c324eee62a963
-EBUILD postgresql-server-8.4.2-r1.ebuild 9657 RMD160 e5a68d7fe6ed293c7b07e9cb0863ad371497aac7 SHA1 56ae974883d1ffde33e873c50eeff09c3f1828d9 SHA256 8c1152e4f838d462205bc503a77d84674b4734c36f026ac0ed7137be4533053f
+EBUILD postgresql-server-8.4.2-r1.ebuild 9705 RMD160 a7e64414bf8d5a74ffc3cf7e0d8f5aefe32ce734 SHA1 440ff3742659b169c5df40a3c82c7d9643a79372 SHA256 3a2c129896cabbfe222d798ecbad27ea74b0c6dfb8de22accad0497b7fffd653
 EBUILD postgresql-server-8.4.2.ebuild 9290 RMD160 8476f8ccf7411693f7839f014264e53ce697a6d4 SHA1 4a69f21f392bd9833e86343bfe16995ad498bf41 SHA256 d318e8d111cf0ec188038a0b240959f8737dc07adc0aa970d1b3a8c0fb497721
-EBUILD postgresql-server-8.5_alpha3.ebuild 9752 RMD160 002041397f26a5c21c51d237ee29a9e382c0cc76 SHA1 caefc899ed7d16c03dc2be7929877e1ed5ad4b5a SHA256 bbc1594b48474b0fa27a55d4cbe91175ffe316e332aa93db141a14e7d45bfcdd
+EBUILD postgresql-server-8.5_alpha3.ebuild 9811 RMD160 6f5eebe898164889a043112cba765b395288d854 SHA1 5af0f991d219a3728c8da9f74ff7a55734b39d94 SHA256 50459d276bb9329f67932979836582e2e9f7f0f6bdaaffbf49096d813ff8248e
 MISC ChangeLog 20305 RMD160 29321e46d24eb1d2585a0d7ee719d23749d506c9 SHA1 4aecf42524571d0921f58bf9c485b5dc9132c192 SHA256 40f5fe4d10cf17048f637a3405bcdcb94265257680f31c11e3a605dff47c8443
 MISC metadata.xml 420 RMD160 789f5a0ce45d05125098fd7e74a816cf08f4c39b SHA1 d308d7434a37f12cd320f74ed85e1d3ca7dabc75 SHA256 ac37a5084450a782d02510149d030bd0d4a63164f2ffb7bdda3ddf344606ca62
index 6ce62ae45aa4fc8d50142f1b77f419e82c0ed8fd..df2bc23f20e17ff118d8c3920dc03ca0b739222d 100644 (file)
@@ -1,15 +1,16 @@
 # Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-db/postgresql-server/postgresql-server-8.4.2-r1.ebuild,v 1.6 2010/02/21 10:19:48 patrick Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-db/postgresql-server/postgresql-server-8.4.2-r1.ebuild,v 1.7 2010/02/21 15:59:55 arfrever Exp $
 
 EAPI="2"
+PYTHON_DEPEND="python? 2"
 
 # weird test failures.
 RESTRICT="test"
 
 WANT_AUTOCONF="latest"
 WANT_AUTOMAKE="none"
-inherit eutils multilib toolchain-funcs versionator autotools
+inherit autotools eutils multilib python toolchain-funcs versionator
 
 KEYWORDS="~alpha amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc x86 ~x86-fbsd"
 
@@ -33,7 +34,7 @@ wanted_languages() {
 
 RDEPEND="~dev-db/postgresql-base-${PV}:${SLOT}[pg_legacytimestamp=]
        perl? ( >=dev-lang/perl-5.6.1-r2 )
-       python? ( >=dev-lang/python-2.2 dev-python/egenix-mx-base )
+       python? ( dev-python/egenix-mx-base )
        selinux? ( sec-policy/selinux-postgresql )
        tcl? ( >=dev-lang/tcl-8 )
        uuid? ( dev-libs/ossp-uuid )
@@ -48,6 +49,10 @@ S="${WORKDIR}/postgresql-${PV}"
 pkg_setup() {
        enewgroup postgres 70
        enewuser postgres 70 /bin/bash /var/lib/postgresql postgres
+
+       if use python; then
+               python_set_active_version 2
+       fi
 }
 
 src_prepare() {
@@ -78,11 +83,11 @@ src_configure() {
                --with-system-tzdata="/usr/share/zoneinfo" \
                --with-includes="/usr/include/postgresql-${SLOT}/" \
                --with-libraries="/usr/$(get_libdir)/postgresql-${SLOT}/$(get_libdir)" \
-               "$(built_with_use ~dev-db/postgresql-base-${PV} nls && use_enable nls nls "$(wanted_languages)")" \
-               || die "configure failed"
+               "$(built_with_use ~dev-db/postgresql-base-${PV} nls && use_enable nls nls "$(wanted_languages)")"
 }
 
 src_compile() {
+       local bd
        for bd in .  contrib $(use xml && echo contrib/xml2); do
                PATH="/usr/$(get_libdir)/postgresql-${SLOT}/bin:${PATH}" \
                        emake -C $bd -j1 LD="$(tc-getLD) $(get_abi_LDFLAGS)" || die "emake in $bd failed"
index f5e851364f67124cd69825e228c183e6b1e735b8..a5d973a63d9147e8bd4deddcb223a542cf291314 100644 (file)
@@ -1,15 +1,16 @@
 # Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-db/postgresql-server/postgresql-server-8.5_alpha3.ebuild,v 1.2 2010/01/27 04:11:34 mr_bones_ Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-db/postgresql-server/postgresql-server-8.5_alpha3.ebuild,v 1.3 2010/02/21 15:59:55 arfrever Exp $
 
 EAPI="2"
+PYTHON_DEPEND="python? 2"
 
 # weird test failures.
 RESTRICT="test"
 
 WANT_AUTOCONF="latest"
 WANT_AUTOMAKE="none"
-inherit eutils multilib toolchain-funcs versionator autotools
+inherit autotools eutils multilib python toolchain-funcs versionator
 
 KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86 ~x86-fbsd"
 
@@ -37,7 +38,7 @@ wanted_languages() {
 
 RDEPEND="~dev-db/postgresql-base-${PV}:${SLOT}[pg_legacytimestamp=]
        perl? ( >=dev-lang/perl-5.6.1-r2 )
-       python? ( >=dev-lang/python-2.2 dev-python/egenix-mx-base )
+       python? ( dev-python/egenix-mx-base )
        selinux? ( sec-policy/selinux-postgresql )
        tcl? ( >=dev-lang/tcl-8 )
        uuid? ( dev-libs/ossp-uuid )
@@ -50,10 +51,14 @@ PDEPEND="doc? ( dev-db/postgresql-docs:${SLOT} )"
 pkg_setup() {
        enewgroup postgres 70
        enewuser postgres 70 /bin/bash /var/lib/postgresql postgres
+
+       if use python; then
+               python_set_active_version 2
+       fi
 }
 
 src_prepare() {
-        epatch "${FILESDIR}/postgresql-${SLOT}-common.patch" \
+       epatch "${FILESDIR}/postgresql-${SLOT}-common.patch" \
                "${FILESDIR}/postgresql-${SLOT}-server.patch" \
                "${FILESDIR}/postgresql-${SLOT}-makefile.patch"
 
@@ -66,7 +71,7 @@ src_prepare() {
        eautoconf
 }
 
-src_compile() {
+src_configure() {
        # TODO: test if PPC really cannot work with other CFLAGS settings
        # use ppc && CFLAGS="-pipe -fsigned-char"
 
@@ -82,9 +87,11 @@ src_compile() {
                --with-system-tzdata="/usr/share/zoneinfo" \
                --with-includes="/usr/include/postgresql-${SLOT}/" \
                --with-libraries="/usr/$(get_libdir)/postgresql-${SLOT}/$(get_libdir)" \
-               "$(built_with_use ~dev-db/postgresql-base-${PV} nls && use_enable nls nls "$(wanted_languages)")" \
-               || die "configure failed"
+               "$(built_with_use ~dev-db/postgresql-base-${PV} nls && use_enable nls nls "$(wanted_languages)")"
+}
 
+src_compile() {
+       local bd
        for bd in .  contrib $(use xml && echo contrib/xml2); do
                PATH="/usr/$(get_libdir)/postgresql-${SLOT}/bin:${PATH}" \
                        emake -C $bd -j1 LD="$(tc-getLD) $(get_abi_LDFLAGS)" || die "emake in $bd failed"