Bump to 8.2.6 for #204760. Thanks to Michael Kefeder for ebuilds.

Package-Manager: portage-2.1.4

5 files changed, 181 insertions, 6 deletions

diff --git a/dev-db/libpq/ChangeLog b/dev-db/libpq/ChangeLog
index 7999652f8821..bfbabf0d7ac6 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.123 2007/06/24 22:54:52 dev-zero Exp $
+# Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/dev-db/libpq/ChangeLog,v 1.124 2008/01/13 01:38:02 mjolnir Exp $
+
+*libpq-8.2.6 (13 Jan 2008)
+
+  13 Jan 2008; Martin Jackson <mjolnir@gentoo.org>
+  +files/libpq-8.2.6-gentoo.patch, +libpq-8.2.6.ebuild:
+  Bump to 8.2.6 for #204760.  Thanks to Michael Kefeder for ebuilds.
 
   24 Jun 2007; Tiziano Müller <dev-zero@gentoo.org>
   -files/libpq-8.0.8-gentoo.patch, -files/libpq-8.0.12-gentoo.patch,
diff --git a/dev-db/libpq/Manifest b/dev-db/libpq/Manifest
index 21c16cff675f..cdf2c67b6595 100644
--- a/dev-db/libpq/Manifest
+++ b/dev-db/libpq/Manifest
@@ -18,6 +18,11 @@ AUX libpq-8.2.4-gentoo.patch 2129 RMD160 551e884dc7c0bbc2f8afc7df0be75d88a27dc2a
 MD5 980303573b4a4f07e114eabd23ee701a files/libpq-8.2.4-gentoo.patch 2129
 RMD160 551e884dc7c0bbc2f8afc7df0be75d88a27dc2aa files/libpq-8.2.4-gentoo.patch 2129
 SHA256 399103e68dd1862ad7b4318e34e702b234c50910db77bb3c90d3d814dd022a62 files/libpq-8.2.4-gentoo.patch 2129
+AUX libpq-8.2.6-gentoo.patch 2129 RMD160 551e884dc7c0bbc2f8afc7df0be75d88a27dc2aa SHA1 aa118e8fc035f52e7ded940c1bb1dba1c6e14bf8 SHA256 399103e68dd1862ad7b4318e34e702b234c50910db77bb3c90d3d814dd022a62
+MD5 980303573b4a4f07e114eabd23ee701a files/libpq-8.2.6-gentoo.patch 2129
+RMD160 551e884dc7c0bbc2f8afc7df0be75d88a27dc2aa files/libpq-8.2.6-gentoo.patch 2129
+SHA256 399103e68dd1862ad7b4318e34e702b234c50910db77bb3c90d3d814dd022a62 files/libpq-8.2.6-gentoo.patch 2129
+DIST postgresql-8.2.6.tar.bz2 12559117 RMD160 fa12ce310919cb52be3558d38a7e329bc73bbe33 SHA1 8934dfbd4c1d8c4f2945cb80f02072611681f967 SHA256 ee41327e821f933de2894d6e0c319edc4b63e80cb902e673b490b7eaf4ead114
 DIST postgresql-base-7.3.19.tar.bz2 5691127 RMD160 802bbba70d1368097a74de6b67589ab9645597cc SHA1 09206cd4d9c2b5648756eff70f101cec89365776 SHA256 1804e0424e4444f67acfb98b4e4ad2ede26748d1ddb4a9201cbff7627e394e6a
 DIST postgresql-base-7.4.17.tar.bz2 6609512 RMD160 cd5aed1fb45cc42e12cca0cd31174b6726dae97b SHA1 2e413d570ed657f941ca77b1ac00ef1eeecddbcc SHA256 f1b7ff754ccb43d4a3a62a9124b1c8ac215e48e5549e620bfcde59124c6f1bc5
 DIST postgresql-base-8.0.13.tar.bz2 7848290 RMD160 de34ef01b76d777e9b22bcd16dd29328a11d35cf SHA1 aaee4e481644645f3ba66dd7a66377ef3b22cd9c SHA256 5627ad76e6a6c8eb85c1debe5fce2c12b42611434dabe0fd5763b8a72c7ac49d
@@ -48,10 +53,14 @@ EBUILD libpq-8.2.4.ebuild 3417 RMD160 937cf7a61ebbcabb14a7025010121d9e0eae2111 S
 MD5 8896c73b1aa929abd003411124e5b796 libpq-8.2.4.ebuild 3417
 RMD160 937cf7a61ebbcabb14a7025010121d9e0eae2111 libpq-8.2.4.ebuild 3417
 SHA256 abdb20ba7632ac666bd7c54cab23e130d537905bf0c230c0ac536ead2549496f libpq-8.2.4.ebuild 3417
-MISC ChangeLog 20478 RMD160 878dda882d0a25abdcd6a0717cb5ddbfa1b6a166 SHA1 06756c4066fdc834b38b20ccc04ecdda9e30af6d SHA256 57dc2ecd01c6bcb0fabdd1ee349449576bc94742cc9ea6e9e5069f83d83483bb
-MD5 723bf8c54d5c313a1e2c2158c191f545 ChangeLog 20478
-RMD160 878dda882d0a25abdcd6a0717cb5ddbfa1b6a166 ChangeLog 20478
-SHA256 57dc2ecd01c6bcb0fabdd1ee349449576bc94742cc9ea6e9e5069f83d83483bb ChangeLog 20478
+EBUILD libpq-8.2.6.ebuild 3191 RMD160 42b46e74ac37126afe54da8c7c63593436ac2d6a SHA1 c879f6a5f28495ecbf7b692f8b31fa43d0fe11e1 SHA256 455950ead2a875bc774b30a6bb3f2627f449daa1e5190ed0799bc644bb4dcceb
+MD5 f0db580b5d2d5c2091a1b8cbbe6cdad2 libpq-8.2.6.ebuild 3191
+RMD160 42b46e74ac37126afe54da8c7c63593436ac2d6a libpq-8.2.6.ebuild 3191
+SHA256 455950ead2a875bc774b30a6bb3f2627f449daa1e5190ed0799bc644bb4dcceb libpq-8.2.6.ebuild 3191
+MISC ChangeLog 20682 RMD160 8151fd5bffaaa1c4954a7b5071440e9e53753630 SHA1 c667200b5d98a8326609015ec709e5b4c08fa4bd SHA256 f374677ad1820bad72acb9ec5fae9630dc0e54152158e45c8d5d9442f05dca52
+MD5 39cbb418437d115e3504e10d0d029c8a ChangeLog 20682
+RMD160 8151fd5bffaaa1c4954a7b5071440e9e53753630 ChangeLog 20682
+SHA256 f374677ad1820bad72acb9ec5fae9630dc0e54152158e45c8d5d9442f05dca52 ChangeLog 20682
 MISC metadata.xml 164 RMD160 becfe652663bd65719dd11fa6ffb588b3d5b4ecc SHA1 f67b7ac1c5e6e65ef5a19a589d4759c84918f86c SHA256 7e8e8126bc8701c4a42c7dfed8bb755ac6040fe3d0e3f994d888f8b2b4fa7d8b
 MD5 6fe52df942ef15801d56449cd8299604 metadata.xml 164
 RMD160 becfe652663bd65719dd11fa6ffb588b3d5b4ecc metadata.xml 164
@@ -71,3 +80,6 @@ SHA256 ff2546fec0ed5c6baa1d2e715638b4a4a38557d2b1161aef5f1ad4d3119f0f67 files/di
 MD5 3a893edb4f7e630212e8290c0e25f51d files/digest-libpq-8.2.4 804
 RMD160 9a0f5467132994cbb0c2f8b9b226d8b0d6b9eb5e files/digest-libpq-8.2.4 804
 SHA256 1719fd513e4f6cc7b7f20fe98214a0fdb89348548c0d17086ba6c4497d70c43e files/digest-libpq-8.2.4 804
+MD5 82e0a8c26d6b4ca23a88e14f9c1364dd files/digest-libpq-8.2.6 259
+RMD160 eaeca374a581f849a0d441e81a9a195696422978 files/digest-libpq-8.2.6 259
+SHA256 dd2fd7fd45f83726f1cdcdd60e97ae51bb222030679916ff44a3f623a41930e9 files/digest-libpq-8.2.6 259
diff --git a/dev-db/libpq/files/digest-libpq-8.2.6 b/dev-db/libpq/files/digest-libpq-8.2.6
new file mode 100644
index 000000000000..eb9626c8dd16
--- /dev/null
+++ b/dev-db/libpq/files/digest-libpq-8.2.6
@@ -0,0 +1,3 @@
+MD5 17b9049b4fcad42ee95410833c1db228 postgresql-8.2.6.tar.bz2 12559117
+RMD160 fa12ce310919cb52be3558d38a7e329bc73bbe33 postgresql-8.2.6.tar.bz2 12559117
+SHA256 ee41327e821f933de2894d6e0c319edc4b63e80cb902e673b490b7eaf4ead114 postgresql-8.2.6.tar.bz2 12559117
diff --git a/dev-db/libpq/files/libpq-8.2.6-gentoo.patch b/dev-db/libpq/files/libpq-8.2.6-gentoo.patch
new file mode 100644
index 000000000000..428232c131e9
--- /dev/null
+++ b/dev-db/libpq/files/libpq-8.2.6-gentoo.patch
@@ -0,0 +1,44 @@
+--- postgresql-8.2.3.orig/src/interfaces/libpq/Makefile	2006-12-28 01:01:12.000000000 +0100
++++ postgresql-8.2.3/src/interfaces/libpq/Makefile	2007-03-29 10:24:27.000000000 +0200
+@@ -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
+ ifneq ($(PORTNAME), win32)
+ override CFLAGS += $(PTHREAD_CFLAGS)
+@@ -160,7 +162,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)'
+--- postgresql-8.2.3.orig/src/interfaces/libpq/nls.mk	2005-01-14 09:57:06.000000000 +0100
++++ postgresql-8.2.3/src/interfaces/libpq/nls.mk	2007-03-29 10:24:55.000000000 +0200
+@@ -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
+--- postgresql-8.2.3.orig/src/Makefile.shlib	2006-09-19 17:36:07.000000000 +0200
++++ postgresql-8.2.3/src/Makefile.shlib	2007-03-29 10:28:42.000000000 +0200
+@@ -346,10 +346,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.2.6.ebuild b/dev-db/libpq/libpq-8.2.6.ebuild
new file mode 100644
index 000000000000..2c4aadcf8b1c
--- /dev/null
+++ b/dev-db/libpq/libpq-8.2.6.ebuild
@@ -0,0 +1,110 @@
+# Copyright 1999-2008 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-db/libpq/libpq-8.2.6.ebuild,v 1.1 2008/01/13 01:38:02 mjolnir Exp $
+
+inherit eutils flag-o-matic toolchain-funcs
+
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~sparc-fbsd ~x86 ~x86-fbsd"
+
+DESCRIPTION="PostgreSQL libraries."
+HOMEPAGE="http://www.postgresql.org/"
+SRC_URI="mirror://postgresql/source/v${PV}/postgresql-${PV}.tar.bz2"
+LICENSE="POSTGRESQL"
+SLOT="4"
+IUSE="kerberos nls pam pg-intdatetime readline ssl threads zlib"
+
+RDEPEND="!<=dev-db/postgresql-8.1.4
+		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
+
+	econf --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."
+}