Fix repoman warnings in 7.4.17 and 7.4.19 and fix 8.1.11 commit

(Portage version: 2.1.4)

6 files changed, 198 insertions, 26 deletions

diff --git a/dev-db/libpq/ChangeLog b/dev-db/libpq/ChangeLog
index d0190072e0ad..7a2815f4b645 100644
--- a/dev-db/libpq/ChangeLog
+++ b/dev-db/libpq/ChangeLog
@@ -1,6 +1,13 @@
 # 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.132 2008/01/14 01:14:51 ranger Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-db/libpq/ChangeLog,v 1.133 2008/01/14 02:10:47 mjolnir Exp $
+
+*libpq-8.1.11 (14 Jan 2008)
+
+  14 Jan 2008; Martin Jackson <mjolnir@gentoo.org>
+  +files/libpq-8.1.11-gentoo.patch, libpq-7.4.17.ebuild,
+  +libpq-8.1.11.ebuild:
+  Fix repoman warnings in 7.4.17 and 7.4.19 and fix 8.1.11 commit
 
   14 Jan 2008; Brent Baude <ranger@gentoo.org> libpq-7.3.21.ebuild:
   Marking libpq-7.3.21 ppc64 for bug 204760
diff --git a/dev-db/libpq/files/digest-libpq-8.1.11 b/dev-db/libpq/files/digest-libpq-8.1.11
new file mode 100644
index 000000000000..86701fa789ce
--- /dev/null
+++ b/dev-db/libpq/files/digest-libpq-8.1.11
@@ -0,0 +1,3 @@
+MD5 48922512bcf683d5ea22a99df5eaaecd postgresql-8.1.11.tar.bz2 11735420
+RMD160 9fb98eadc4f1015205970f26b31b68ea0378bda9 postgresql-8.1.11.tar.bz2 11735420
+SHA256 3e91cdfc1353fa9c6416d9fc8ae9d6ab3171565f00aeb6c882214c2f08a03e2e postgresql-8.1.11.tar.bz2 11735420
diff --git a/dev-db/libpq/files/libpq-8.1.11-gentoo.patch b/dev-db/libpq/files/libpq-8.1.11-gentoo.patch
new file mode 100644
index 000000000000..859daa58735b
--- /dev/null
+++ b/dev-db/libpq/files/libpq-8.1.11-gentoo.patch
@@ -0,0 +1,47 @@
+diff -Nru postgresql-8.1.5.orig/src/interfaces/libpq/Makefile postgresql-8.1.5/src/interfaces/libpq/Makefile
+--- postgresql-8.1.5.orig/src/interfaces/libpq/Makefile	2006-11-05 13:20:34.000000000 +0100
++++ postgresql-8.1.5/src/interfaces/libpq/Makefile	2006-11-05 13:28:00.000000000 +0100
+@@ -20,6 +20,8 @@
+ SO_MINOR_VERSION= 1
+ 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)
+@@ -135,7 +137,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.1.5.orig/src/interfaces/libpq/nls.mk postgresql-8.1.5/src/interfaces/libpq/nls.mk
+--- postgresql-8.1.5.orig/src/interfaces/libpq/nls.mk	2006-11-05 13:20:34.000000000 +0100
++++ postgresql-8.1.5/src/interfaces/libpq/nls.mk	2006-11-05 13:28:00.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.1.5.orig/src/Makefile.shlib postgresql-8.1.5/src/Makefile.shlib
+--- postgresql-8.1.5.orig/src/Makefile.shlib	2006-11-05 13:20:34.000000000 +0100
++++ postgresql-8.1.5/src/Makefile.shlib	2006-11-05 13:28:00.000000000 +0100
+@@ -366,10 +366,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-7.4.17.ebuild b/dev-db/libpq/libpq-7.4.17.ebuild
index 7d2f229850d1..937d36b1e14d 100644
--- a/dev-db/libpq/libpq-7.4.17.ebuild
+++ b/dev-db/libpq/libpq-7.4.17.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2007 Gentoo Foundation
+# 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.4.17.ebuild,v 1.9 2007/06/24 21:20:43 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-db/libpq/libpq-7.4.17.ebuild,v 1.10 2008/01/14 02:10:47 mjolnir Exp $
 
 inherit eutils gnuconfig flag-o-matic toolchain-funcs
 
@@ -33,8 +33,8 @@ MAKEOPTS="${MAKEOPTS} -j1"
 
 pkg_preinst() {
 	# removing wrong symlink which is created by previous ebuild.
-	if [ -L ${ROOT}/usr/include/libpq ]; then
-		rm ${ROOT}/usr/include/libpq
+	if [ -L "${ROOT}/usr/include/libpq" ]; then
+		rm "${ROOT}/usr/include/libpq"
 	fi
 }
 
@@ -72,34 +72,34 @@ src_compile() {
 		--enable-depend \
 		$myconf || die
 
-	cd ${S}/src/interfaces/libpq
+	cd "${S}/src/interfaces/libpq"
 	emake LD="$(tc-getLD) $(get_abi_LDFLAGS)" || die
 }
 
 src_install() {
-	cd ${S}/src/interfaces/libpq
-	make DESTDIR=${D} LIBDIR=${D}/usr/$(get_libdir) install || die
+	cd "${S}/src/interfaces/libpq"
+	make DESTDIR="${D}" LIBDIR="${D}/usr/$(get_libdir)" install || die
 
-	cd ${S}/src/include
-	make DESTDIR=${D} install || die
+	cd "${S}/src/include"
+	make DESTDIR="${D}" install || die
 
-	cd ${S}
+	cd "${S}"
 	dodoc README HISTORY COPYRIGHT INSTALL
 
 	dosym libpq-${SLOT}.a /usr/$(get_libdir)/libpq.a
 
-	for f in ${D}/usr/include/postgresql/libpq-${SLOT}/*.h
+	for f in "${D}/usr/include/postgresql/libpq-${SLOT}/*.h"
 	do
 		dosym postgresql/libpq-${SLOT}/$(basename $f) /usr/include/
 	done
 
 	dodir /usr/include/libpq
-	for f in ${D}/usr/include/postgresql/libpq-${SLOT}/libpq/*.h
+	for f in "${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}
+	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
diff --git a/dev-db/libpq/libpq-7.4.19.ebuild b/dev-db/libpq/libpq-7.4.19.ebuild
index 779210bf9675..562566d2ade7 100644
--- a/dev-db/libpq/libpq-7.4.19.ebuild
+++ b/dev-db/libpq/libpq-7.4.19.ebuild
@@ -1,6 +1,6 @@
 # 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.4.19.ebuild,v 1.2 2008/01/13 23:15:02 maekke Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-db/libpq/libpq-7.4.19.ebuild,v 1.3 2008/01/14 02:10:47 mjolnir Exp $
 
 inherit eutils gnuconfig flag-o-matic toolchain-funcs
 
@@ -33,8 +33,8 @@ MAKEOPTS="${MAKEOPTS} -j1"
 
 pkg_preinst() {
 	# removing wrong symlink which is created by previous ebuild.
-	if [ -L ${ROOT}/usr/include/libpq ]; then
-		rm ${ROOT}/usr/include/libpq
+	if [ -L "${ROOT}/usr/include/libpq" ]; then
+		rm "${ROOT}/usr/include/libpq"
 	fi
 }
 
@@ -72,34 +72,34 @@ src_compile() {
 		--enable-depend \
 		$myconf || die
 
-	cd ${S}/src/interfaces/libpq
+	cd "${S}/src/interfaces/libpq"
 	emake LD="$(tc-getLD) $(get_abi_LDFLAGS)" || die
 }
 
 src_install() {
-	cd ${S}/src/interfaces/libpq
-	make DESTDIR=${D} LIBDIR=${D}/usr/$(get_libdir) install || die
+	cd "${S}/src/interfaces/libpq"
+	make DESTDIR="${D}" LIBDIR="${D}/usr/$(get_libdir)" install || die
 
-	cd ${S}/src/include
-	make DESTDIR=${D} install || die
+	cd "${S}/src/include"
+	make DESTDIR="${D}" install || die
 
-	cd ${S}
+	cd "${S}"
 	dodoc README HISTORY COPYRIGHT INSTALL
 
 	dosym libpq-${SLOT}.a /usr/$(get_libdir)/libpq.a
 
-	for f in ${D}/usr/include/postgresql/libpq-${SLOT}/*.h
+	for f in "${D}/usr/include/postgresql/libpq-${SLOT}/*.h"
 	do
 		dosym postgresql/libpq-${SLOT}/$(basename $f) /usr/include/
 	done
 
 	dodir /usr/include/libpq
-	for f in ${D}/usr/include/postgresql/libpq-${SLOT}/libpq/*.h
+	for f in "${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}
+	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
diff --git a/dev-db/libpq/libpq-8.1.11.ebuild b/dev-db/libpq/libpq-8.1.11.ebuild
new file mode 100644
index 000000000000..01eea19add37
--- /dev/null
+++ b/dev-db/libpq/libpq-8.1.11.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-8.1.11.ebuild,v 1.1 2008/01/14 02:10:47 mjolnir Exp $
+
+inherit eutils gnuconfig 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}/${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} \
+		--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."
+}