fix 7.3.12 multilib-strict wise, mark 7.4.9 and 8.0.4 stable on amd64

Package-Manager: portage-2.0.51.22-r3

4 files changed, 20 insertions, 11 deletions

diff --git a/dev-db/postgresql/ChangeLog b/dev-db/postgresql/ChangeLog
index c1fdd6eba926..d22aa37e395a 100644
--- a/dev-db/postgresql/ChangeLog
+++ b/dev-db/postgresql/ChangeLog
@@ -1,6 +1,11 @@
 # 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.253 2005/12/25 11:32:46 nakano Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-db/postgresql/ChangeLog,v 1.254 2005/12/26 13:30:07 blubb Exp $
+
+  26 Dec 2005; Simon Stelling <blubb@gentoo.org> postgresql-7.3.12.ebuild,
+  postgresql-7.4.9.ebuild, postgresql-8.0.4.ebuild:
+  - 7.3.12: fix multilib-strict wise
+  - 7.4.9 & 8.0.4: mark stable on amd64
 
 *postgresql-8.1.1 (25 Dec 2005)
 *postgresql-8.0.5 (25 Dec 2005)
diff --git a/dev-db/postgresql/postgresql-7.3.12.ebuild b/dev-db/postgresql/postgresql-7.3.12.ebuild
index 2872719fbf6b..36f1813a9dfb 100644
--- a/dev-db/postgresql/postgresql-7.3.12.ebuild
+++ b/dev-db/postgresql/postgresql-7.3.12.ebuild
@@ -1,8 +1,8 @@
 # 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.3.12.ebuild,v 1.1 2005/12/25 11:32:46 nakano Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-db/postgresql/postgresql-7.3.12.ebuild,v 1.2 2005/12/26 13:30:07 blubb Exp $
 
-inherit eutils gnuconfig flag-o-matic java-pkg
+inherit eutils gnuconfig flag-o-matic java-pkg multilib
 
 DESCRIPTION="sophisticated Object-Relational DBMS"
 
@@ -108,7 +108,7 @@ src_compile() {
 		--mandir=/usr/share/man \
 		--host=${CHOST} \
 		--docdir=/usr/share/doc/${PF} \
-		--libdir=/usr/lib \
+		--libdir=/usr/$(get_libdir) \
 		--includedir=/usr/include/postgresql/pgsql \
 		--enable-depend \
 		--with-maxbackends=1024 \
@@ -122,17 +122,21 @@ src_compile() {
 src_install() {
 	if use perl; then
 		mv ${S}/src/pl/plperl/Makefile ${S}/src/pl/plperl/Makefile_orig
-		sed -e "s:(INST_DYNAMIC) /usr/lib:(INST_DYNAMIC) ${D}/usr/lib:" \
+		sed -e "s:(INST_DYNAMIC) /usr/lib:(INST_DYNAMIC) ${D}/usr/$(get_libdir):" \
 			${S}/src/pl/plperl/Makefile_orig > ${S}/src/pl/plperl/Makefile
 		mv ${S}/src/pl/plperl/GNUmakefile ${S}/src/pl/plperl/GNUmakefile_orig
 		sed -e "s:\$(DESTDIR)\$(plperl_installdir):\$(plperl_installdir):" \
 			${S}/src/pl/plperl/GNUmakefile_orig > ${S}/src/pl/plperl/GNUmakefile
 	fi
 
-	make DESTDIR=${D} includedir_server=/usr/include/postgresql/server includedir_internal=/usr/include/postgresql/internal LIBDIR=${D}/usr/lib install || die
+	make DESTDIR=${D} includedir_server=/usr/include/postgresql/server \
+		includedir_internal=/usr/include/postgresql/internal \
+		LIBDIR=${D}/usr/$(get_libdir) \
+		python_moduleexecdir="${python_execprefix}/$(get_libdir)/python${python_version}/site-packages" \
+		install || die
 	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
+	make DESTDIR=${D} LIBDIR=${D}/usr/$(get_libdir) install || die
 	cd ${S}
 	dodoc COPYRIGHT HISTORY INSTALL README register.txt
 	dodoc contrib/adddepend/*
diff --git a/dev-db/postgresql/postgresql-7.4.9.ebuild b/dev-db/postgresql/postgresql-7.4.9.ebuild
index 890ff506f992..928492b8a080 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-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.9.ebuild,v 1.8 2005/11/21 18:45:01 josejx Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-db/postgresql/postgresql-7.4.9.ebuild,v 1.9 2005/12/26 13:30:07 blubb Exp $
 
 inherit eutils gnuconfig flag-o-matic java-pkg multilib toolchain-funcs
 
@@ -14,7 +14,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 sparc x86"
+KEYWORDS="~alpha amd64 ~arm ~hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86"
 IUSE="ssl nls java python tcltk perl libg++ pam readline zlib doc pg-hier pg-vacuumdelay pg-intdatetime threads xml2 selinux"
 
 DEPEND="virtual/libc
diff --git a/dev-db/postgresql/postgresql-8.0.4.ebuild b/dev-db/postgresql/postgresql-8.0.4.ebuild
index 28db7e463bdf..1dcf8c86fb40 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-2005 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.10 2005/11/21 18:45:01 josejx Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-db/postgresql/postgresql-8.0.4.ebuild,v 1.11 2005/12/26 13:30:07 blubb Exp $
 
 inherit eutils gnuconfig flag-o-matic multilib toolchain-funcs
 
@@ -16,7 +16,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"
+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"
 
 S=${WORKDIR}/${MY_P}