Version bumped. Clean up ebuild.

(Portage version: 2.0.51.19)

5 files changed, 158 insertions, 1 deletions

diff --git a/dev-db/libpq/ChangeLog b/dev-db/libpq/ChangeLog
index bc2d52ce214a..a348c45e7bbc 100644
--- a/dev-db/libpq/ChangeLog
+++ b/dev-db/libpq/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for dev-db/libpq
 # Copyright 1999-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-db/libpq/ChangeLog,v 1.3 2005/05/09 21:38:07 nakano Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-db/libpq/ChangeLog,v 1.4 2005/05/15 04:36:55 matsuu Exp $
+
+*libpq-8.0.3 (15 May 2005)
+
+  15 May 2005; MATSUU Takuto <matsuu@gentoo.org>
+  +files/libpq-8.0.3-gentoo.patch, +libpq-8.0.3.ebuild:
+  Version bumped.
+  Clean up ebuild.
 
   09 May 2005; Masatomo Nakano <nakano@gentoo.org> libpq-3.2.ebuild,
   libpq-4.0.ebuild:
diff --git a/dev-db/libpq/Manifest b/dev-db/libpq/Manifest
index 106766d4df42..dd3db35372d1 100644
--- a/dev-db/libpq/Manifest
+++ b/dev-db/libpq/Manifest
@@ -1,8 +1,11 @@
 MD5 e8990a5be7de6a0bc73ff6ec53d869c4 libpq-3.2.ebuild 2867
 MD5 17574c69b3319df0f21ab1789cfdaca4 libpq-4.0.ebuild 2867
+MD5 9dcd0872bf8b2caca8d894413e283a66 libpq-8.0.3.ebuild 2926
 MD5 adc882481aa3ad05048b8bc1b4d70a5c ChangeLog 669
 MD5 f8d3d207746da2a3cd14dcaab8daab76 metadata.xml 163
+MD5 b8a68c8f7fbe4116f7d39a520a3da8c9 files/digest-libpq-8.0.3 75
 MD5 637716f510743dd4c21c51980eb76659 files/libpq-3.2-gentoo.patch 2300
+MD5 91bb6f54ae3772de8b4b98ef69b79f95 files/libpq-8.0.3-gentoo.patch 2306
 MD5 5f9040f91914a9aba8ebee9bff295909 files/libpq-4.0-gentoo.patch 2300
 MD5 0540e6c42fdd652b981e236ea835c524 files/digest-libpq-3.2 75
 MD5 ed4897962e8062c29d0a6a2256597034 files/digest-libpq-4.0 75
diff --git a/dev-db/libpq/files/digest-libpq-8.0.3 b/dev-db/libpq/files/digest-libpq-8.0.3
new file mode 100644
index 000000000000..e6523151a277
--- /dev/null
+++ b/dev-db/libpq/files/digest-libpq-8.0.3
@@ -0,0 +1 @@
+MD5 35ff2b9a3bc5c65f55b4192a334b0e88 postgresql-base-8.0.3.tar.bz2 7818251
diff --git a/dev-db/libpq/files/libpq-8.0.3-gentoo.patch b/dev-db/libpq/files/libpq-8.0.3-gentoo.patch
new file mode 100644
index 000000000000..fbc3de21c2b7
--- /dev/null
+++ b/dev-db/libpq/files/libpq-8.0.3-gentoo.patch
@@ -0,0 +1,43 @@
+diff -Naur postgresql-8.0.3.orig/src/Makefile.shlib postgresql-8.0.3/src/Makefile.shlib
+--- postgresql-8.0.3.orig/src/Makefile.shlib	2004-11-21 06:13:04.000000000 +0900
++++ postgresql-8.0.3/src/Makefile.shlib	2005-05-15 13:30:59.000000000 +0900
+@@ -355,7 +355,7 @@
+ 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
+diff -Naur postgresql-8.0.3.orig/src/interfaces/libpq/Makefile postgresql-8.0.3/src/interfaces/libpq/Makefile
+--- postgresql-8.0.3.orig/src/interfaces/libpq/Makefile	2005-04-29 23:07:34.000000000 +0900
++++ postgresql-8.0.3/src/interfaces/libpq/Makefile	2005-05-15 13:33:14.000000000 +0900
+@@ -20,6 +20,8 @@
+ SO_MINOR_VERSION= 0
+ DLTYPE= library
+ 
++NAME_STATIC_LIB= pq-$(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 -Naur postgresql-8.0.3.orig/src/interfaces/libpq/nls.mk postgresql-8.0.3/src/interfaces/libpq/nls.mk
+--- postgresql-8.0.3.orig/src/interfaces/libpq/nls.mk	2005-01-14 17:57:06.000000000 +0900
++++ postgresql-8.0.3/src/interfaces/libpq/nls.mk	2005-05-15 13:30:32.000000000 +0900
+@@ -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 --git a/dev-db/libpq/libpq-8.0.3.ebuild b/dev-db/libpq/libpq-8.0.3.ebuild
new file mode 100644
index 000000000000..a3cc6f087882
--- /dev/null
+++ b/dev-db/libpq/libpq-8.0.3.ebuild
@@ -0,0 +1,103 @@
+# Copyright 1999-2005 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-db/libpq/libpq-8.0.3.ebuild,v 1.1 2005/05/15 04:36:55 matsuu Exp $
+
+inherit eutils gnuconfig flag-o-matic toolchain-funcs
+
+DESCRIPTION="Libraries of postgresql"
+HOMEPAGE="http://www.postgresql.org/"
+MY_P="postgresql-${PV}"
+SRC_URI="mirror://postgresql/source/v${PV}/postgresql-base-${PV}.tar.bz2"
+
+LICENSE="POSTGRESQL"
+SLOT="4"
+KEYWORDS="~x86 ~ppc ~sparc ~mips ~alpha ~arm ~hppa ~amd64 ~ia64 ~s390 ~ppc64"
+IUSE="ssl nls pam readline zlib kerberos"
+#pg-hier"
+
+S=${WORKDIR}/${MY_P}
+DEPEND="virtual/libc
+	sys-devel/autoconf
+	>=sys-libs/ncurses-5.2
+	>=sys-devel/bison-1.875
+	zlib? ( >=sys-libs/zlib-1.1.3 )
+	readline? ( >=sys-libs/readline-4.1 )
+	ssl? ( >=dev-libs/openssl-0.9.6-r1 )
+	nls? ( sys-devel/gettext )
+	kerberos? ( virtual/krb5 )"
+RDEPEND="virtual/libc
+	zlib? ( >=sys-libs/zlib-1.1.3 )
+	ssl? ( >=dev-libs/openssl-0.9.6-r1 )
+	kerberos? ( virtual/krb5 )"
+
+MAKEOPTS="${MAKEOPTS} -j1"
+src_unpack() {
+	unpack ${A}
+	epatch ${FILESDIR}/${P}-gentoo.patch
+}
+
+src_compile() {
+	filter-flags -ffast-math -feliminate-dwarf2-dups
+
+	local myconf
+	use ssl && myconf="$myconf --with-openssl"
+	use nls && myconf="$myconf --enable-nls"
+	use pam && myconf="$myconf --with-pam"
+	use readline || myconf="$myconf --without-readline"
+	use zlib || myconf="$myconf --without-zlib"
+	use kerberos && myconf="$myconf --with-krb5"
+
+	# these are the only working CFLAGS I could get on ppc, so locking them
+	# down, anything more aggressive fails (i.e. -mcpu or -Ox)
+	# Gerk - Nov 26, 2002
+	use ppc && CFLAGS="-pipe -fsigned-char"
+
+	# Detect mips systems properly
+	gnuconfig_update
+
+	./configure --prefix=/usr \
+		--include=/usr/include/postgresql/libpq-${SLOT} \
+		--mandir=/usr/share/man \
+		--host=${CHOST} \
+		--with-docdir=/usr/share/doc/${PF} \
+		--libdir=/usr/$(get_libdir) \
+		--enable-depend \
+		--with-gnu-ld \
+		$myconf || die
+
+	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/include
+	make DESTDIR=${D} install || die
+
+	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
+	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
+	do
+		dosym ../postgresql/libpq-${SLOT}/$(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
+}