Bump to 7.3.21 for #204760

(Portage version: 2.1.4)

4 files changed, 179 insertions, 1 deletions

diff --git a/dev-db/libpq/ChangeLog b/dev-db/libpq/ChangeLog
index a06fb59bafd8..e45873eeb6f3 100644
--- a/dev-db/libpq/ChangeLog
+++ b/dev-db/libpq/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for dev-db/libpq
 # Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-db/libpq/ChangeLog,v 1.126 2008/01/13 20:09:59 mjolnir Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-db/libpq/ChangeLog,v 1.127 2008/01/13 20:40:31 mjolnir Exp $
+
+*libpq-7.3.21 (13 Jan 2008)
+
+  13 Jan 2008; Martin Jackson <mjolnir@gentoo.org>
+  +files/libpq-7.3.21-gentoo.patch, +libpq-7.3.21.ebuild:
+  Bump to 7.3.21 for #204760
 
 *libpq-7.4.19 (13 Jan 2008)
 
diff --git a/dev-db/libpq/files/digest-libpq-7.3.21 b/dev-db/libpq/files/digest-libpq-7.3.21
new file mode 100644
index 000000000000..acc9f8c9e8eb
--- /dev/null
+++ b/dev-db/libpq/files/digest-libpq-7.3.21
@@ -0,0 +1,3 @@
+MD5 e0068d0de0540a2d7247749ea830833f postgresql-7.3.21.tar.bz2 9284558
+RMD160 f9de4676b4fbe3d96e6d1462b8bc3c05600d6525 postgresql-7.3.21.tar.bz2 9284558
+SHA256 bf44e0ac259e9f6e14ac102f2977496b6996ecea2fd227fbdcea5fa70e342888 postgresql-7.3.21.tar.bz2 9284558
diff --git a/dev-db/libpq/files/libpq-7.3.21-gentoo.patch b/dev-db/libpq/files/libpq-7.3.21-gentoo.patch
new file mode 100644
index 000000000000..254dafd6a7ee
--- /dev/null
+++ b/dev-db/libpq/files/libpq-7.3.21-gentoo.patch
@@ -0,0 +1,54 @@
+diff -Nru postgresql-7.3.16.orig/src/interfaces/libpq/Makefile postgresql-7.3.16/src/interfaces/libpq/Makefile
+--- postgresql-7.3.16.orig/src/interfaces/libpq/Makefile	2006-11-05 13:20:09.000000000 +0100
++++ postgresql-7.3.16/src/interfaces/libpq/Makefile	2006-11-05 13:21:19.000000000 +0100
+@@ -18,6 +18,8 @@
+ SO_MAJOR_VERSION= 3
+ SO_MINOR_VERSION= 0
+ 
++NAME_STATIC_LIB= $(NAME)-$(SO_MAJOR_VERSION)
++
+ override CPPFLAGS := -I$(srcdir) $(CPPFLAGS) -DFRONTEND -DSYSCONFDIR='"$(sysconfdir)"'
+ 
+ OBJS= fe-auth.o fe-connect.o fe-exec.o fe-misc.o fe-print.o fe-lobj.o \
+diff -Nru postgresql-7.3.16.orig/src/interfaces/libpq/nls.mk postgresql-7.3.16/src/interfaces/libpq/nls.mk
+--- postgresql-7.3.16.orig/src/interfaces/libpq/nls.mk	2006-11-05 13:20:09.000000000 +0100
++++ postgresql-7.3.16/src/interfaces/libpq/nls.mk	2006-11-05 13:21:19.000000000 +0100
+@@ -1,5 +1,5 @@
+ # $Header: /cvsroot/pgsql/src/interfaces/libpq/nls.mk,v 1.8 2002/09/22 20:57:21 petere Exp $
+-CATALOG_NAME	:= libpq
++CATALOG_NAME	:= libpq-3
+ AVAIL_LANGUAGES	:= cs de es fr pt_BR ru sv zh_CN zh_TW
+ GETTEXT_FILES	:= fe-auth.c fe-connect.c fe-exec.c fe-lobj.c fe-misc.c fe-secure.c
+ GETTEXT_TRIGGERS:= libpq_gettext
+diff -Nru postgresql-7.3.16.orig/src/Makefile.shlib postgresql-7.3.16/src/Makefile.shlib
+--- postgresql-7.3.16.orig/src/Makefile.shlib	2006-11-05 13:20:09.000000000 +0100
++++ postgresql-7.3.16/src/Makefile.shlib	2006-11-05 13:23:20.000000000 +0100
+@@ -221,7 +221,7 @@
+ 
+ all-lib: all-static-lib all-shared-lib
+ 
+-all-static-lib: lib$(NAME).a
++all-static-lib: lib$(NAME_STATIC_LIB).a
+ 
+ all-shared-lib: $(shlib)
+ 
+@@ -231,7 +231,7 @@
+ MK_NO_LORDER := true
+ endif
+ 
+-lib$(NAME).a: $(OBJS)
++lib$(NAME_STATIC_LIB).a: $(OBJS)
+ ifdef MK_NO_LORDER
+ 	$(LINK.static) $@ $^
+ else
+@@ -302,8 +302,8 @@
+ .PHONY: install-lib install-lib-static install-lib-shared
+ install-lib: install-lib-static install-lib-shared
+ 
+-install-lib-static: lib$(NAME).a
+-	$(INSTALL_STLIB) $< $(DESTDIR)$(libdir)/lib$(NAME).a
++install-lib-static: lib$(NAME_STATIC_LIB).a
++	$(INSTALL_STLIB) $< $(DESTDIR)$(libdir)/lib$(NAME_STATIC_LIB).a
+ 
+ ifeq ($(enable_shared), yes)
+ install-lib-shared: $(shlib)
diff --git a/dev-db/libpq/libpq-7.3.21.ebuild b/dev-db/libpq/libpq-7.3.21.ebuild
new file mode 100644
index 000000000000..c45312ac7f38
--- /dev/null
+++ b/dev-db/libpq/libpq-7.3.21.ebuild
@@ -0,0 +1,115 @@
+# 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-7.3.21.ebuild,v 1.1 2008/01/13 20:40:31 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-${PV}.tar.bz2"
+LICENSE="POSTGRESQL"
+SLOT="3"
+IUSE="kerberos nls pam pg-intdatetime readline ssl zlib"
+
+RDEPEND="!<=dev-db/postgresql-7.3.15-r1
+		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}/${P}-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} \
+		--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 \
+		--without-tk \
+		$(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-all-headers || 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."
+}