Re-add threads support (bug #120190). This requires the -opt package, this can be removed in 8.2.

Package-Manager: portage-2.1_pre7-r5

4 files changed, 127 insertions, 4 deletions

diff --git a/dev-db/libpq/ChangeLog b/dev-db/libpq/ChangeLog
index a5f82b65c2a6..2972af43023a 100644
--- a/dev-db/libpq/ChangeLog
+++ b/dev-db/libpq/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for dev-db/libpq
 # Copyright 1999-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-db/libpq/ChangeLog,v 1.50 2006/03/09 22:22:14 agriffis Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-db/libpq/ChangeLog,v 1.51 2006/04/10 14:52:52 chrb Exp $
+
+*libpq-8.1.3-r1 (10 Apr 2006)
+
+  10 Apr 2006; <chrb@gentoo.org> +libpq-8.1.3-r1.ebuild:
+  Re-add threads support (bug #120190). This requires the -opt package, this
+  can be removed in 8.2.
 
   09 Mar 2006; Aron Griffis <agriffis@gentoo.org> libpq-8.0.7.ebuild:
   Mark 8.0.7 stable on ia64
diff --git a/dev-db/libpq/files/digest-libpq-8.1.3-r1 b/dev-db/libpq/files/digest-libpq-8.1.3-r1
new file mode 100644
index 000000000000..decbb822d77b
--- /dev/null
+++ b/dev-db/libpq/files/digest-libpq-8.1.3-r1
@@ -0,0 +1,6 @@
+MD5 4b9466e42b7951d7ec7be4455f64b13f postgresql-base-8.1.3.tar.bz2 8044411
+RMD160 539ec857517d01310225fff2e738ccd6698891ab postgresql-base-8.1.3.tar.bz2 8044411
+SHA256 39a776680997639a100ddbdc33128c210f610e7aadc114624d3d02fdd0350619 postgresql-base-8.1.3.tar.bz2 8044411
+MD5 ad1dd1d66c9c608180418375e36aafcb postgresql-opt-8.1.3.tar.bz2 144608
+RMD160 0427f3b851c3bbaff53699baa0ebdf0c610303cf postgresql-opt-8.1.3.tar.bz2 144608
+SHA256 5f98160060e4fc78996c8b4312304fb4cc3ca4254a5be226cc3c4ff6ff2e5525 postgresql-opt-8.1.3.tar.bz2 144608
diff --git a/dev-db/libpq/libpq-8.1.3-r1.ebuild b/dev-db/libpq/libpq-8.1.3-r1.ebuild
new file mode 100644
index 000000000000..b9fe465382e9
--- /dev/null
+++ b/dev-db/libpq/libpq-8.1.3-r1.ebuild
@@ -0,0 +1,111 @@
+# Copyright 1999-2006 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-db/libpq/libpq-8.1.3-r1.ebuild,v 1.1 2006/04/10 14:52:52 chrb 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
+	mirror://postgresql/source/v${PV}/postgresql-opt-${PV}.tar.bz2"
+
+LICENSE="POSTGRESQL"
+SLOT="4"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
+IUSE="ssl nls pam readline zlib kerberos threads"
+
+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"
+
+pkg_preinst() {
+	# removing wrong symlink which is created by previous ebuild.
+	if [ -L ${ROOT}/usr/include/libpq ]; then
+		rm ${ROOT}/usr/include/libpq
+	fi
+}
+
+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"
+	use threads && myconf="$myconf --enable-thread-safety"
+
+	# 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 \
+		$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}/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
+}
diff --git a/dev-db/postgresql/Manifest b/dev-db/postgresql/Manifest
index 03dde12ec1c6..25d51c90d32e 100644
--- a/dev-db/postgresql/Manifest
+++ b/dev-db/postgresql/Manifest
@@ -1,6 +1,6 @@
-MD5 c20b87fa7ff098d4416fd6bab4369252 ChangeLog 53736
-RMD160 262407487afd401ceb86a886ee158ef42f8b1680 ChangeLog 53736
-SHA256 3806a15e6673ace1dedc77304058fc92d6e448951f574ea093eb62cd0d135eb2 ChangeLog 53736
+MD5 c19c0584543dcf1e17e3bef2556a647a ChangeLog 53750
+RMD160 f7471640c25ab4fa1b2172f6a5ebc98adf9f03ef ChangeLog 53750
+SHA256 10d995c7a6bbe36a5d118ad3c745089153295ec243d1349c60e733683b33a835 ChangeLog 53750
 MD5 8ca6301197c0d45d7530d4117d087b15 files/CAN-2005-1409-doc.patch 1749
 RMD160 a01fb02931799230c9797dacba6f5d28b0b53ab9 files/CAN-2005-1409-doc.patch 1749
 SHA256 6f5e52a18b6fafd50c36659eb8c9980b7987ad262c88bb621640f352208f938b files/CAN-2005-1409-doc.patch 1749