* [gentoo-commits] gentoo-x86 commit in dev-db/postgresql-server: postgresql-server-8.4.2-r1.ebuild postgresql-server-8.5_alpha3.ebuild
@ 2010-02-21 15:59 Arfrever Frehtes Taifersar Arahesis (arfrever)
0 siblings, 0 replies; only message in thread
From: Arfrever Frehtes Taifersar Arahesis (arfrever) @ 2010-02-21 15:59 UTC (permalink / raw
To: gentoo-commits
arfrever 10/02/21 15:59:56
Modified: postgresql-server-8.4.2-r1.ebuild
postgresql-server-8.5_alpha3.ebuild
Log:
Fix dependencies and set active version of Python.
(Portage version: 15417-svn/cvs/Linux x86_64)
Revision Changes Path
1.7 dev-db/postgresql-server/postgresql-server-8.4.2-r1.ebuild
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/dev-db/postgresql-server/postgresql-server-8.4.2-r1.ebuild?rev=1.7&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/dev-db/postgresql-server/postgresql-server-8.4.2-r1.ebuild?rev=1.7&content-type=text/plain
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/dev-db/postgresql-server/postgresql-server-8.4.2-r1.ebuild?r1=1.6&r2=1.7
Index: postgresql-server-8.4.2-r1.ebuild
===================================================================
RCS file: /var/cvsroot/gentoo-x86/dev-db/postgresql-server/postgresql-server-8.4.2-r1.ebuild,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- postgresql-server-8.4.2-r1.ebuild 21 Feb 2010 10:19:48 -0000 1.6
+++ postgresql-server-8.4.2-r1.ebuild 21 Feb 2010 15:59:55 -0000 1.7
@@ -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 @@
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 @@
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 @@
--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"
1.3 dev-db/postgresql-server/postgresql-server-8.5_alpha3.ebuild
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/dev-db/postgresql-server/postgresql-server-8.5_alpha3.ebuild?rev=1.3&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/dev-db/postgresql-server/postgresql-server-8.5_alpha3.ebuild?rev=1.3&content-type=text/plain
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/dev-db/postgresql-server/postgresql-server-8.5_alpha3.ebuild?r1=1.2&r2=1.3
Index: postgresql-server-8.5_alpha3.ebuild
===================================================================
RCS file: /var/cvsroot/gentoo-x86/dev-db/postgresql-server/postgresql-server-8.5_alpha3.ebuild,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- postgresql-server-8.5_alpha3.ebuild 27 Jan 2010 04:11:34 -0000 1.2
+++ postgresql-server-8.5_alpha3.ebuild 21 Feb 2010 15:59:55 -0000 1.3
@@ -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 @@
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 @@
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 @@
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 @@
--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"
^ permalink raw reply [flat|nested] only message in thread
only message in thread, other threads:[~2010-02-21 15:59 UTC | newest]
Thread overview: (only message) (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2010-02-21 15:59 [gentoo-commits] gentoo-x86 commit in dev-db/postgresql-server: postgresql-server-8.4.2-r1.ebuild postgresql-server-8.5_alpha3.ebuild Arfrever Frehtes Taifersar Arahesis (arfrever)
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox