More fixes for 165482

Package-Manager: portage-2.1.2-r9

5 files changed, 193 insertions, 5 deletions

diff --git a/dev-db/libpq/ChangeLog b/dev-db/libpq/ChangeLog
index 4569e744a51b..c00cc32fa58e 100644
--- a/dev-db/libpq/ChangeLog
+++ b/dev-db/libpq/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for dev-db/libpq
 # Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-db/libpq/ChangeLog,v 1.91 2007/02/12 00:07:18 mjolnir Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-db/libpq/ChangeLog,v 1.92 2007/02/12 01:57:25 mjolnir Exp $
+
+*libpq-8.0.12 (12 Feb 2007)
+
+  12 Feb 2007; Martin Jackson <mjolnir@gentoo.org>
+  +files/libpq-8.0.12-gentoo.patch, +libpq-8.0.12.ebuild:
+  More fixes for 165482
 
 *libpq-7.4.16 (12 Feb 2007)
 
diff --git a/dev-db/libpq/Manifest b/dev-db/libpq/Manifest
index 318c89ddd462..0ffe4341996c 100644
--- a/dev-db/libpq/Manifest
+++ b/dev-db/libpq/Manifest
@@ -22,6 +22,10 @@ AUX libpq-7.4.16-gentoo.patch 2868 RMD160 7a942bbf828163dde8407a90fd5ef12775ee06
 MD5 a5bd3f594608dd77e7f190397afd0bd5 files/libpq-7.4.16-gentoo.patch 2868
 RMD160 7a942bbf828163dde8407a90fd5ef12775ee0611 files/libpq-7.4.16-gentoo.patch 2868
 SHA256 4da340868fe316bb7f8d6ecdc9382894deda2160b9fd5a8622381dba3668c3f3 files/libpq-7.4.16-gentoo.patch 2868
+AUX libpq-8.0.12-gentoo.patch 2382 RMD160 ec7e86cb584598196e18904d4b626ccc64750ede SHA1 20c230bdc8c181caa5a524076f65f85e047a5bef SHA256 e4a257b30f1a970fbbea6311ca1ea51e626f1ae9ab79b1b61a04c7969093408e
+MD5 712084754fb5b7aa013d70c34cb21fec files/libpq-8.0.12-gentoo.patch 2382
+RMD160 ec7e86cb584598196e18904d4b626ccc64750ede files/libpq-8.0.12-gentoo.patch 2382
+SHA256 e4a257b30f1a970fbbea6311ca1ea51e626f1ae9ab79b1b61a04c7969093408e files/libpq-8.0.12-gentoo.patch 2382
 AUX libpq-8.0.8-gentoo.patch 2306 RMD160 e4c121a1026a60709b829afbc112efa0fea19a3f SHA1 75d4782553f4619bd4fb71aa44f4204df24bec7a SHA256 3b0405d74be995639b9d021eebc9a40ad72eb717219a8e1c029c1c93e6b72602
 MD5 d923acd31e56034379046074dd88a09a files/libpq-8.0.8-gentoo.patch 2306
 RMD160 e4c121a1026a60709b829afbc112efa0fea19a3f files/libpq-8.0.8-gentoo.patch 2306
@@ -40,12 +44,14 @@ DIST postgresql-base-7.3.18.tar.bz2 5695073 RMD160 62607d50fbf97ae0b954943e2e270
 DIST postgresql-base-7.4.13.tar.bz2 6576973 RMD160 5f90ed85fdceb06fe15e324620e931140e3617ef SHA1 cb326a788833e805a54a80d87aeeb6fa00fb7b1e SHA256 2e2fa6b1cf3fc7a66a58762acfb64ce42d358e0dd799a467316e937d3a116cf7
 DIST postgresql-base-7.4.14.tar.bz2 6575201 RMD160 c5b8ecd20ad2783c3f254f0e7402aab9ad722d0a SHA1 b737a35070bf13f478e8bca346a32243b9599b89 SHA256 5a34fcd56d2d8eebcd2728e5971c0d39d2971dc25e49d88bfeb84d69b5e8ebc9
 DIST postgresql-base-7.4.16.tar.bz2 6586435 RMD160 8536d5f6f26a101240c64084e6adeb260efef891 SHA1 d3f36c6ace31d3725828aa9d86f4c08f266e33e3 SHA256 d8e7df2f06f248e66023452fa9cf565640b93ae43433dade7515f54e643f5c21
+DIST postgresql-base-8.0.12.tar.bz2 7846737 RMD160 e359f574020ef73a1f8f03ebffdc157114b1a454 SHA1 f43277c0463233f7deec434374a3799c372107b6 SHA256 2aec1d7129794fb29546e76bb0594f0c8ee6e37e8a155b201c15504af0740628
 DIST postgresql-base-8.0.8.tar.bz2 7823046 RMD160 2c60dc22f714bc0182051a94c3c1f513b30f574e SHA1 a5e5147497f0c2b548762d232d297b48d6e97d02 SHA256 906d86f2477309b9c2531d12fe720761fdffd73243a83ae31892bd7a0a618183
 DIST postgresql-base-8.0.9.tar.bz2 7824961 RMD160 40cbea0b0a3a0f67670dfbe1670e08b48dbb1999 SHA1 d11bb58349b3e42fd0a19ceb732e9381bba89b16 SHA256 8ed190ee5468f3685a1edbc5279490819ffa6fe64f1b6f0139bdbec365852417
 DIST postgresql-base-8.1.5.tar.bz2 8044522 RMD160 3460f38b720ce3a9687052d5523bcbd027655d6e SHA1 7d6cc07ca1cb8cb57a366a7860310a892fe6a2ba SHA256 cb878499848aa8abb82f1ae79574923174851b0396a5befa31f49089a3abb4df
 DIST postgresql-opt-7.3.16.tar.bz2 341908 RMD160 00e0f059910eed3021ba5b096e86bdc6878c34d6 SHA1 aac3126d50dfb1ea23984ecdff9cc6da7605b531 SHA256 0e1ab00b1439c5930b6c74ed5c4382c01fdb54434857ac3c1599d32fcce2c8d1
 DIST postgresql-opt-7.3.18.tar.bz2 342315 RMD160 fa7cb704ff7bb131f6108217c645821413ecd5b8 SHA1 5c1a8a103d696668abae7d8931c0dd687cdb7766 SHA256 6d422a3d4d56192952c035d01aff59b90c7ab7b3cdb7f300572e40dd20db5e4b
 DIST postgresql-opt-7.4.14.tar.bz2 333417 RMD160 a6279f5b9d52f72ce786bc468c114befb5a1f29a SHA1 becc575260128261dc7f8ed46f166f54f48b8732 SHA256 e670d22812c50512807edd692d867e2b62c6b79f9d7b84cad56ef038cc12475d
+DIST postgresql-opt-8.0.12.tar.bz2 134790 RMD160 be0d57de5000296bfd5b64685f4d4ef81edea347 SHA1 bd26e2cce6ea7b486e29bc983ee76cfb0551f32b SHA256 ceaf90195860694487918032c19e0a11f991d74c77838cac2ea827d6c85f54da
 DIST postgresql-opt-8.0.9.tar.bz2 134706 RMD160 be148e079c20c13aec1767180d993933b91c2116 SHA1 a1263b4ec563ec24165db4657dcc4faab567ef90 SHA256 007d5cded329dfbcc91b4f1d1ddb9473efb4316b1621294446ee611065393020
 DIST postgresql-opt-8.1.5.tar.bz2 144784 RMD160 5ac9b1ffdf1357316ceb1736f7b9be3ee339be3b SHA1 6d62463d6bcadcef1e515d740c15489ab4e428e7 SHA256 4fe0dc14e02d65516348ec0e90633be2a3ada002c151fca8f2e7eba6556c8b1c
 EBUILD libpq-7.3.15.ebuild 3084 RMD160 e482b8aed2f442f082f0321f42f6079acc089874 SHA1 b063ce2b0e36cc13a8396f97ffad282d2572351a SHA256 c12b2dc0901c8e43e763a547cc8fb086d27542c9d7ecb7caaeec65e0c9014881
@@ -72,6 +78,10 @@ EBUILD libpq-7.4.16.ebuild 3096 RMD160 555ba13a66b64fefd7ba238b28e870095f7f7d9c
 MD5 44a7365cde631c4369646f5dcff2e5f7 libpq-7.4.16.ebuild 3096
 RMD160 555ba13a66b64fefd7ba238b28e870095f7f7d9c libpq-7.4.16.ebuild 3096
 SHA256 e0712a60bff0f9a204f37f8cb4c1af341a948c189a05a38ec53f84f58ce3ef68 libpq-7.4.16.ebuild 3096
+EBUILD libpq-8.0.12.ebuild 3319 RMD160 c81f50bba5d730c8c2e2435d101749830810ceef SHA1 2e35ca5316fd996aa9c05525cbe2a74d53d656ce SHA256 9ada7cf2c0f96ee5ea2fac1feaf0f6f21253f3e3046c914ad8edb418ceee5718
+MD5 945c14e0c6c98f48c51b831970dfeac4 libpq-8.0.12.ebuild 3319
+RMD160 c81f50bba5d730c8c2e2435d101749830810ceef libpq-8.0.12.ebuild 3319
+SHA256 9ada7cf2c0f96ee5ea2fac1feaf0f6f21253f3e3046c914ad8edb418ceee5718 libpq-8.0.12.ebuild 3319
 EBUILD libpq-8.0.8.ebuild 3091 RMD160 fab8cbe8c64801c9e036e9e65c6e70a0bcde4cf3 SHA1 70f0990263e2f9d172fd496a46bcda35dc5a62ae SHA256 8aca4733322048c0d1c6f5adcffea108e2214a5b1415799f9674d26a9f173460
 MD5 7d89b6fad58d2880a282da39a4e07e8d libpq-8.0.8.ebuild 3091
 RMD160 fab8cbe8c64801c9e036e9e65c6e70a0bcde4cf3 libpq-8.0.8.ebuild 3091
@@ -84,10 +94,10 @@ EBUILD libpq-8.1.5.ebuild 3339 RMD160 71c2c80b5ea23532ce249a68257b6d3a2c4235b8 S
 MD5 baec1649c32e97f533801f1f0696209a libpq-8.1.5.ebuild 3339
 RMD160 71c2c80b5ea23532ce249a68257b6d3a2c4235b8 libpq-8.1.5.ebuild 3339
 SHA256 42a96033d541d176a30c439cf6fefeecab9d9774d74db74a9a4034abe6d97368 libpq-8.1.5.ebuild 3339
-MISC ChangeLog 15378 RMD160 c7c152d36cfa8d1fe43bcce090bf2d9b208cb409 SHA1 2301acba9ad4612b7b303474b7f92c63a46c55ed SHA256 63124e24242a6cbfeb7c66310eb65b8cc6a3f1f4a118f92a33ec4ae5e1a0882a
-MD5 3ffbcc07845d49975a8de126932fe402 ChangeLog 15378
-RMD160 c7c152d36cfa8d1fe43bcce090bf2d9b208cb409 ChangeLog 15378
-SHA256 63124e24242a6cbfeb7c66310eb65b8cc6a3f1f4a118f92a33ec4ae5e1a0882a ChangeLog 15378
+MISC ChangeLog 15541 RMD160 945331f4a17542586be968a03a5895e1d76252bd SHA1 5c8b35fd3e83758591b85a8f2f223d1c8549b1f5 SHA256 cf638bb35d84c2a85ab840f88369c73b9c38c207a9c8bda7ee5b5a30c47e4f68
+MD5 d9478e209c33a6e86f8650e1ed65701b ChangeLog 15541
+RMD160 945331f4a17542586be968a03a5895e1d76252bd ChangeLog 15541
+SHA256 cf638bb35d84c2a85ab840f88369c73b9c38c207a9c8bda7ee5b5a30c47e4f68 ChangeLog 15541
 MISC metadata.xml 164 RMD160 becfe652663bd65719dd11fa6ffb588b3d5b4ecc SHA1 f67b7ac1c5e6e65ef5a19a589d4759c84918f86c SHA256 7e8e8126bc8701c4a42c7dfed8bb755ac6040fe3d0e3f994d888f8b2b4fa7d8b
 MD5 6fe52df942ef15801d56449cd8299604 metadata.xml 164
 RMD160 becfe652663bd65719dd11fa6ffb588b3d5b4ecc metadata.xml 164
@@ -110,6 +120,9 @@ SHA256 3a4216e93e446fb8920fdf18e300258afe2dd2378a73af96c9efd437ab5720ef files/di
 MD5 45446ad4a51db71f44a90641a728e188 files/digest-libpq-7.4.16 274
 RMD160 da3b525d71aa6af77b2dacbe60bb8c92ac841f2e files/digest-libpq-7.4.16 274
 SHA256 abeff5634ab62fe9a85eb6f35512c3d2d3a84fc8fb1a2ad322b329a7adb7a33b files/digest-libpq-7.4.16 274
+MD5 be4179a9e55a672edcb0717f5ca1fabd files/digest-libpq-8.0.12 542
+RMD160 5008b9a6d81cca000c64a65993cab636a1446058 files/digest-libpq-8.0.12 542
+SHA256 91ba84fe0bf8dd4e607b52bfa71ef1013d1efa749e70e03e407c4fb270ed3c43 files/digest-libpq-8.0.12 542
 MD5 8c0d20dcc5c156bd1a8d9c4e04eef558 files/digest-libpq-8.0.8 271
 RMD160 acda54f9b459839b72f7bfdb00cb9c324f0d0edb files/digest-libpq-8.0.8 271
 SHA256 ba713208da080175629af46705788e433f5883d9213f6b19793ca0e158c79b83 files/digest-libpq-8.0.8 271
diff --git a/dev-db/libpq/files/digest-libpq-8.0.12 b/dev-db/libpq/files/digest-libpq-8.0.12
new file mode 100644
index 000000000000..12fff4a5eec5
--- /dev/null
+++ b/dev-db/libpq/files/digest-libpq-8.0.12
@@ -0,0 +1,6 @@
+MD5 4905afe1beb0e58b348be9558579a24a postgresql-base-8.0.12.tar.bz2 7846737
+RMD160 e359f574020ef73a1f8f03ebffdc157114b1a454 postgresql-base-8.0.12.tar.bz2 7846737
+SHA256 2aec1d7129794fb29546e76bb0594f0c8ee6e37e8a155b201c15504af0740628 postgresql-base-8.0.12.tar.bz2 7846737
+MD5 31722557a313a3690c894d9a6e42244d postgresql-opt-8.0.12.tar.bz2 134790
+RMD160 be0d57de5000296bfd5b64685f4d4ef81edea347 postgresql-opt-8.0.12.tar.bz2 134790
+SHA256 ceaf90195860694487918032c19e0a11f991d74c77838cac2ea827d6c85f54da postgresql-opt-8.0.12.tar.bz2 134790
diff --git a/dev-db/libpq/files/libpq-8.0.12-gentoo.patch b/dev-db/libpq/files/libpq-8.0.12-gentoo.patch
new file mode 100644
index 000000000000..e6a37001ef99
--- /dev/null
+++ b/dev-db/libpq/files/libpq-8.0.12-gentoo.patch
@@ -0,0 +1,47 @@
+diff -Nru postgresql-8.0.9.orig/src/interfaces/libpq/Makefile postgresql-8.0.9/src/interfaces/libpq/Makefile
+--- postgresql-8.0.9.orig/src/interfaces/libpq/Makefile	2006-11-05 13:20:26.000000000 +0100
++++ postgresql-8.0.9/src/interfaces/libpq/Makefile	2006-11-05 13:24:34.000000000 +0100
+@@ -20,6 +20,8 @@
+ SO_MINOR_VERSION= 0
+ DLTYPE= library
+ 
++NAME_STATIC_LIB= $(NAME)-$(SO_MAJOR_VERSION)
++
+ override CPPFLAGS :=  -DFRONTEND -I$(srcdir) $(CPPFLAGS) -I$(top_builddir)/src/port
+ override CFLAGS += $(PTHREAD_CFLAGS)
+ 
+@@ -136,7 +138,7 @@
+ 	$(INSTALL_DATA) $(srcdir)/libpq-fe.h $(DESTDIR)$(includedir)
+ 	$(INSTALL_DATA) $(srcdir)/libpq-int.h $(DESTDIR)$(includedir_internal)
+ 	$(INSTALL_DATA) $(srcdir)/pqexpbuffer.h $(DESTDIR)$(includedir_internal)
+-	$(INSTALL_DATA) $(srcdir)/pg_service.conf.sample $(DESTDIR)$(datadir)/pg_service.conf.sample
++	$(INSTALL_DATA) $(srcdir)/pg_service.conf.sample $(DESTDIR)$(datadir)/pg_service-$(SO_MAJOR_VERSION).conf.sample
+ 
+ installdirs:
+ 	$(mkinstalldirs) $(DESTDIR)$(libdir) $(DESTDIR)$(includedir) $(DESTDIR)$(includedir_internal)
+diff -Nru postgresql-8.0.9.orig/src/interfaces/libpq/nls.mk postgresql-8.0.9/src/interfaces/libpq/nls.mk
+--- postgresql-8.0.9.orig/src/interfaces/libpq/nls.mk	2006-11-05 13:20:26.000000000 +0100
++++ postgresql-8.0.9/src/interfaces/libpq/nls.mk	2006-11-05 13:24:34.000000000 +0100
+@@ -1,5 +1,5 @@
+ # $PostgreSQL: pgsql/src/interfaces/libpq/nls.mk,v 1.20 2005/01/14 08:57:06 petere Exp $
+-CATALOG_NAME	:= libpq
++CATALOG_NAME	:= libpq-4
+ AVAIL_LANGUAGES	:= af cs de es fr hr it ko nb pl pt_BR ru sk sl sv tr zh_CN zh_TW
+ GETTEXT_FILES	:= fe-auth.c fe-connect.c fe-exec.c fe-lobj.c fe-misc.c fe-protocol2.c fe-protocol3.c fe-secure.c
+ GETTEXT_TRIGGERS:= libpq_gettext pqInternalNotice:2
+diff -Nru postgresql-8.0.9.orig/src/Makefile.shlib postgresql-8.0.9/src/Makefile.shlib
+--- postgresql-8.0.9.orig/src/Makefile.shlib	2006-11-05 13:20:26.000000000 +0100
++++ postgresql-8.0.9/src/Makefile.shlib	2006-11-05 13:24:34.000000000 +0100
+@@ -360,10 +360,10 @@
+ install-lib: install-lib-static install-lib-shared
+ 
+ install-lib-static: lib$(NAME).a
+-	$(INSTALL_STLIB) $< $(DESTDIR)$(libdir)/lib$(NAME).a
++	$(INSTALL_STLIB) $< $(DESTDIR)$(libdir)/lib$(NAME_STATIC_LIB).a
+ ifeq ($(PORTNAME), darwin)
+ 	cd $(DESTDIR)$(libdir) && \
+-	ranlib lib$(NAME).a
++	ranlib lib$(NAME_STATIC_LIB).a
+ endif
+ 
+ ifeq ($(enable_shared), yes)
diff --git a/dev-db/libpq/libpq-8.0.12.ebuild b/dev-db/libpq/libpq-8.0.12.ebuild
new file mode 100644
index 000000000000..7230e82a55ec
--- /dev/null
+++ b/dev-db/libpq/libpq-8.0.12.ebuild
@@ -0,0 +1,116 @@
+# Copyright 1999-2007 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-db/libpq/libpq-8.0.12.ebuild,v 1.1 2007/02/12 01:57:25 mjolnir Exp $
+
+inherit eutils gnuconfig flag-o-matic toolchain-funcs
+
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
+
+DESCRIPTION="PostgreSQL libraries."
+HOMEPAGE="http://www.postgresql.org/"
+SRC_URI="mirror://postgresql/source/v${PV}/postgresql-base-${PV}.tar.bz2
+		mirror://postgresql/source/v${PV}/postgresql-opt-${PV}.tar.bz2"
+LICENSE="POSTGRESQL"
+SLOT="4"
+IUSE="kerberos nls pam pg-intdatetime readline ssl threads zlib"
+
+RDEPEND="!<=dev-db/postgresql-8.0.8
+		kerberos? ( virtual/krb5 )
+		pam? ( virtual/pam )
+		readline? ( >=sys-libs/readline-4.1 )
+		ssl? ( >=dev-libs/openssl-0.9.6-r1 )
+		zlib? ( >=sys-libs/zlib-1.1.3 )"
+DEPEND="${RDEPEND}
+		sys-devel/autoconf
+		>=sys-devel/bison-1.875
+		nls? ( sys-devel/gettext )"
+
+S="${WORKDIR}/postgresql-${PV}"
+
+pkg_preinst() {
+	# Removing wrong symlink created by previous ebuild
+	if [[ -L "${ROOT}/usr/include/libpq" ]] ; then
+		rm -f "${ROOT}/usr/include/libpq"
+	fi
+}
+
+src_unpack() {
+	unpack ${A}
+	cd "${S}"
+
+	epatch "${FILESDIR}/${PN}-${PV}-gentoo.patch"
+}
+
+src_compile() {
+	filter-flags -ffast-math -feliminate-dwarf2-dups
+
+	# Detect mips systems properly
+	gnuconfig_update
+
+	cd "${S}"
+
+	./configure --prefix=/usr \
+		--includedir=/usr/include/postgresql/libpq-${SLOT} \
+		--sysconfdir=/etc/postgresql \
+		--mandir=/usr/share/man \
+		--host=${CHOST} \
+		--with-docdir=/usr/share/doc/${PF} \
+		--libdir=/usr/$(get_libdir) \
+		--enable-depend \
+		$(use_with kerberos krb5) \
+		$(use_enable nls ) \
+		$(use_with pam) \
+		--without-perl \
+		$(use_enable pg-intdatetime integer-datetimes ) \
+		--without-python \
+		$(use_with readline) \
+		$(use_with ssl openssl) \
+		--without-tcl \
+		$(use_enable threads thread-safety ) \
+		$(use_with zlib) \
+		|| die "configure failed"
+
+	cd "${S}/src/interfaces/libpq"
+	emake -j1 LD="$(tc-getLD) $(get_abi_LDFLAGS)" || die "emake libpq failed"
+
+	cd "${S}/src/bin/pg_config"
+	emake -j1 LD="$(tc-getLD) $(get_abi_LDFLAGS)" || die "emake pg_config failed"
+}
+
+src_install() {
+	cd "${S}/src/interfaces/libpq"
+	emake DESTDIR="${D}" LIBDIR="${D}/usr/$(get_libdir)" install || die "emake install libpq failed"
+
+	cd "${S}/src/include"
+	emake DESTDIR="${D}" install || die "emake install headers failed"
+
+	cd "${S}/src/bin/pg_config"
+	emake DESTDIR="${D}" install || die "emake install pg_config failed"
+
+	cd "${S}"
+	dodoc README HISTORY
+
+	dosym libpq-${SLOT}.a /usr/$(get_libdir)/libpq.a
+
+	for f in $(ls -1 "${D}"/usr/include/postgresql/libpq-${SLOT}/*.h) ; do
+		dosym postgresql/libpq-${SLOT}/$(basename ${f}) /usr/include/
+	done
+
+	dodir /usr/include/libpq
+	for f in $(ls -1 "${D}"/usr/include/postgresql/libpq-${SLOT}/libpq/*.h) ; do
+		dosym ../postgresql/libpq-${SLOT}/libpq/$(basename ${f}) /usr/include/libpq/
+	done
+
+	cd "${D}/usr/include/postgresql/libpq-${SLOT}"
+	for f in $(find * -name '*.h' -print) ; do
+		destdir=$(dirname ${f})
+		if [[ ! -d "${D}/usr/include/postgresql/${destdir}" ]] ; then
+			dodir "/usr/include/postgresql/${destdir}"
+		fi
+		dosym /usr/include/postgresql/libpq-${SLOT}/${f} "/usr/include/postgresql/${destdir}/"
+	done
+}
+
+src_test() {
+	einfo "No tests available for libpq."
+}