From 685ea1f64e846144a1c6e94e4eb071eb6be53bc0 Mon Sep 17 00:00:00 2001 From: Martin Jackson Date: Mon, 12 Feb 2007 00:07:18 +0000 Subject: [PATCH] New version of 7.4 branch for bug 165482 Package-Manager: portage-2.1.2-r9 --- dev-db/libpq/ChangeLog | 8 +- dev-db/libpq/Manifest | 20 +++- dev-db/libpq/files/digest-libpq-7.4.16 | 3 + dev-db/libpq/files/libpq-7.4.16-gentoo.patch | 67 +++++++++++ dev-db/libpq/libpq-7.4.16.ebuild | 111 +++++++++++++++++++ 5 files changed, 204 insertions(+), 5 deletions(-) create mode 100644 dev-db/libpq/files/digest-libpq-7.4.16 create mode 100644 dev-db/libpq/files/libpq-7.4.16-gentoo.patch create mode 100644 dev-db/libpq/libpq-7.4.16.ebuild diff --git a/dev-db/libpq/ChangeLog b/dev-db/libpq/ChangeLog index 37ef698d73c6..4569e744a51b 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.90 2007/02/11 23:41:22 dev-zero Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-db/libpq/ChangeLog,v 1.91 2007/02/12 00:07:18 mjolnir Exp $ + +*libpq-7.4.16 (12 Feb 2007) + + 12 Feb 2007; Martin Jackson + +files/libpq-7.4.16-gentoo.patch, +libpq-7.4.16.ebuild: + New version for Bug 165482 11 Feb 2007; Tiziano Müller libpq-7.3.18.ebuild: Resetted alpha to ~alpha diff --git a/dev-db/libpq/Manifest b/dev-db/libpq/Manifest index 9a6af6097677..318c89ddd462 100644 --- a/dev-db/libpq/Manifest +++ b/dev-db/libpq/Manifest @@ -18,6 +18,10 @@ AUX libpq-7.4.14-gentoo.patch 2846 RMD160 395aef07550cdc0cb726c7fd1599089bbe5637 MD5 8e845c6bb301c666f6db969f762a1ce8 files/libpq-7.4.14-gentoo.patch 2846 RMD160 395aef07550cdc0cb726c7fd1599089bbe563718 files/libpq-7.4.14-gentoo.patch 2846 SHA256 63fff3f54fb2a0423ae7921a845dcbe70188677559bad81e8134011f7b54557d files/libpq-7.4.14-gentoo.patch 2846 +AUX libpq-7.4.16-gentoo.patch 2868 RMD160 7a942bbf828163dde8407a90fd5ef12775ee0611 SHA1 08931ff2cf647447811a653fd4b3f32b8a2749de SHA256 4da340868fe316bb7f8d6ecdc9382894deda2160b9fd5a8622381dba3668c3f3 +MD5 a5bd3f594608dd77e7f190397afd0bd5 files/libpq-7.4.16-gentoo.patch 2868 +RMD160 7a942bbf828163dde8407a90fd5ef12775ee0611 files/libpq-7.4.16-gentoo.patch 2868 +SHA256 4da340868fe316bb7f8d6ecdc9382894deda2160b9fd5a8622381dba3668c3f3 files/libpq-7.4.16-gentoo.patch 2868 AUX libpq-8.0.8-gentoo.patch 2306 RMD160 e4c121a1026a60709b829afbc112efa0fea19a3f SHA1 75d4782553f4619bd4fb71aa44f4204df24bec7a SHA256 3b0405d74be995639b9d021eebc9a40ad72eb717219a8e1c029c1c93e6b72602 MD5 d923acd31e56034379046074dd88a09a files/libpq-8.0.8-gentoo.patch 2306 RMD160 e4c121a1026a60709b829afbc112efa0fea19a3f files/libpq-8.0.8-gentoo.patch 2306 @@ -35,6 +39,7 @@ DIST postgresql-base-7.3.16.tar.bz2 5696231 RMD160 aaf7e4743bc67c0a45d8d44cef840 DIST postgresql-base-7.3.18.tar.bz2 5695073 RMD160 62607d50fbf97ae0b954943e2e27052bcf2c5aa0 SHA1 29e2121ee6383929e8b90b50e8f7bbac218f203e SHA256 648c7bddcab5477c5d7800795f8392a3ecdd361828c4374d9804bfa61a07b048 DIST postgresql-base-7.4.13.tar.bz2 6576973 RMD160 5f90ed85fdceb06fe15e324620e931140e3617ef SHA1 cb326a788833e805a54a80d87aeeb6fa00fb7b1e SHA256 2e2fa6b1cf3fc7a66a58762acfb64ce42d358e0dd799a467316e937d3a116cf7 DIST postgresql-base-7.4.14.tar.bz2 6575201 RMD160 c5b8ecd20ad2783c3f254f0e7402aab9ad722d0a SHA1 b737a35070bf13f478e8bca346a32243b9599b89 SHA256 5a34fcd56d2d8eebcd2728e5971c0d39d2971dc25e49d88bfeb84d69b5e8ebc9 +DIST postgresql-base-7.4.16.tar.bz2 6586435 RMD160 8536d5f6f26a101240c64084e6adeb260efef891 SHA1 d3f36c6ace31d3725828aa9d86f4c08f266e33e3 SHA256 d8e7df2f06f248e66023452fa9cf565640b93ae43433dade7515f54e643f5c21 DIST postgresql-base-8.0.8.tar.bz2 7823046 RMD160 2c60dc22f714bc0182051a94c3c1f513b30f574e SHA1 a5e5147497f0c2b548762d232d297b48d6e97d02 SHA256 906d86f2477309b9c2531d12fe720761fdffd73243a83ae31892bd7a0a618183 DIST postgresql-base-8.0.9.tar.bz2 7824961 RMD160 40cbea0b0a3a0f67670dfbe1670e08b48dbb1999 SHA1 d11bb58349b3e42fd0a19ceb732e9381bba89b16 SHA256 8ed190ee5468f3685a1edbc5279490819ffa6fe64f1b6f0139bdbec365852417 DIST postgresql-base-8.1.5.tar.bz2 8044522 RMD160 3460f38b720ce3a9687052d5523bcbd027655d6e SHA1 7d6cc07ca1cb8cb57a366a7860310a892fe6a2ba SHA256 cb878499848aa8abb82f1ae79574923174851b0396a5befa31f49089a3abb4df @@ -63,6 +68,10 @@ EBUILD libpq-7.4.14.ebuild 3333 RMD160 b5f187332f8c393711e4fa334938a1f434585814 MD5 cbb85f4b04d1ebeaa8dd522b05374a8c libpq-7.4.14.ebuild 3333 RMD160 b5f187332f8c393711e4fa334938a1f434585814 libpq-7.4.14.ebuild 3333 SHA256 b94f9c74a2fe8e6cd65e69f2a7c5a8d5a4ed2b07e943eac82046681d8f66cb50 libpq-7.4.14.ebuild 3333 +EBUILD libpq-7.4.16.ebuild 3096 RMD160 555ba13a66b64fefd7ba238b28e870095f7f7d9c SHA1 57f4e75a2e16f3d0e7ed32fc0279dd386d898c39 SHA256 e0712a60bff0f9a204f37f8cb4c1af341a948c189a05a38ec53f84f58ce3ef68 +MD5 44a7365cde631c4369646f5dcff2e5f7 libpq-7.4.16.ebuild 3096 +RMD160 555ba13a66b64fefd7ba238b28e870095f7f7d9c libpq-7.4.16.ebuild 3096 +SHA256 e0712a60bff0f9a204f37f8cb4c1af341a948c189a05a38ec53f84f58ce3ef68 libpq-7.4.16.ebuild 3096 EBUILD libpq-8.0.8.ebuild 3091 RMD160 fab8cbe8c64801c9e036e9e65c6e70a0bcde4cf3 SHA1 70f0990263e2f9d172fd496a46bcda35dc5a62ae SHA256 8aca4733322048c0d1c6f5adcffea108e2214a5b1415799f9674d26a9f173460 MD5 7d89b6fad58d2880a282da39a4e07e8d libpq-8.0.8.ebuild 3091 RMD160 fab8cbe8c64801c9e036e9e65c6e70a0bcde4cf3 libpq-8.0.8.ebuild 3091 @@ -75,10 +84,10 @@ EBUILD libpq-8.1.5.ebuild 3339 RMD160 71c2c80b5ea23532ce249a68257b6d3a2c4235b8 S MD5 baec1649c32e97f533801f1f0696209a libpq-8.1.5.ebuild 3339 RMD160 71c2c80b5ea23532ce249a68257b6d3a2c4235b8 libpq-8.1.5.ebuild 3339 SHA256 42a96033d541d176a30c439cf6fefeecab9d9774d74db74a9a4034abe6d97368 libpq-8.1.5.ebuild 3339 -MISC ChangeLog 15211 RMD160 08fd9365f98457b0f5bd199c44deb020aee43fbb SHA1 b8193a9038d36e3f2de2407ccf07a19922331c98 SHA256 82cfacba54ec13eeedec351829d50427b205b1ebdc4eb753465ff4206f8ac0e3 -MD5 5ddbba90d4ff8ba7d8746521b75cde71 ChangeLog 15211 -RMD160 08fd9365f98457b0f5bd199c44deb020aee43fbb ChangeLog 15211 -SHA256 82cfacba54ec13eeedec351829d50427b205b1ebdc4eb753465ff4206f8ac0e3 ChangeLog 15211 +MISC ChangeLog 15378 RMD160 c7c152d36cfa8d1fe43bcce090bf2d9b208cb409 SHA1 2301acba9ad4612b7b303474b7f92c63a46c55ed SHA256 63124e24242a6cbfeb7c66310eb65b8cc6a3f1f4a118f92a33ec4ae5e1a0882a +MD5 3ffbcc07845d49975a8de126932fe402 ChangeLog 15378 +RMD160 c7c152d36cfa8d1fe43bcce090bf2d9b208cb409 ChangeLog 15378 +SHA256 63124e24242a6cbfeb7c66310eb65b8cc6a3f1f4a118f92a33ec4ae5e1a0882a ChangeLog 15378 MISC metadata.xml 164 RMD160 becfe652663bd65719dd11fa6ffb588b3d5b4ecc SHA1 f67b7ac1c5e6e65ef5a19a589d4759c84918f86c SHA256 7e8e8126bc8701c4a42c7dfed8bb755ac6040fe3d0e3f994d888f8b2b4fa7d8b MD5 6fe52df942ef15801d56449cd8299604 metadata.xml 164 RMD160 becfe652663bd65719dd11fa6ffb588b3d5b4ecc metadata.xml 164 @@ -98,6 +107,9 @@ SHA256 708a0dce96b98013656090a67385955fe6c5c7beafbe7de7b1d937564bf3db12 files/di MD5 132dc731fd52b4ea7c73f46ab571c189 files/digest-libpq-7.4.14 542 RMD160 c6d7095b0293d42f84300362a4bb85a1220aca21 files/digest-libpq-7.4.14 542 SHA256 3a4216e93e446fb8920fdf18e300258afe2dd2378a73af96c9efd437ab5720ef files/digest-libpq-7.4.14 542 +MD5 45446ad4a51db71f44a90641a728e188 files/digest-libpq-7.4.16 274 +RMD160 da3b525d71aa6af77b2dacbe60bb8c92ac841f2e files/digest-libpq-7.4.16 274 +SHA256 abeff5634ab62fe9a85eb6f35512c3d2d3a84fc8fb1a2ad322b329a7adb7a33b files/digest-libpq-7.4.16 274 MD5 8c0d20dcc5c156bd1a8d9c4e04eef558 files/digest-libpq-8.0.8 271 RMD160 acda54f9b459839b72f7bfdb00cb9c324f0d0edb files/digest-libpq-8.0.8 271 SHA256 ba713208da080175629af46705788e433f5883d9213f6b19793ca0e158c79b83 files/digest-libpq-8.0.8 271 diff --git a/dev-db/libpq/files/digest-libpq-7.4.16 b/dev-db/libpq/files/digest-libpq-7.4.16 new file mode 100644 index 000000000000..c27a77c1a4c6 --- /dev/null +++ b/dev-db/libpq/files/digest-libpq-7.4.16 @@ -0,0 +1,3 @@ +MD5 a876404e4186537cba0ba9d2afe5e554 postgresql-base-7.4.16.tar.bz2 6586435 +RMD160 8536d5f6f26a101240c64084e6adeb260efef891 postgresql-base-7.4.16.tar.bz2 6586435 +SHA256 d8e7df2f06f248e66023452fa9cf565640b93ae43433dade7515f54e643f5c21 postgresql-base-7.4.16.tar.bz2 6586435 diff --git a/dev-db/libpq/files/libpq-7.4.16-gentoo.patch b/dev-db/libpq/files/libpq-7.4.16-gentoo.patch new file mode 100644 index 000000000000..b2a9730021a0 --- /dev/null +++ b/dev-db/libpq/files/libpq-7.4.16-gentoo.patch @@ -0,0 +1,67 @@ +diff -Nru postgresql-7.4.14.orig/src/interfaces/libpq/Makefile postgresql-7.4.14/src/interfaces/libpq/Makefile +--- postgresql-7.4.14.orig/src/interfaces/libpq/Makefile 2006-11-05 13:20:18.000000000 +0100 ++++ postgresql-7.4.14/src/interfaces/libpq/Makefile 2006-11-05 13:23:46.000000000 +0100 +@@ -18,6 +18,8 @@ + SO_MAJOR_VERSION= 3 + SO_MINOR_VERSION= 1 + ++NAME_STATIC_LIB= $(NAME)-$(SO_MAJOR_VERSION) ++ + override CPPFLAGS := -I$(srcdir) $(CPPFLAGS) $(THREAD_CPPFLAGS) -DFRONTEND -DSYSCONFDIR='"$(sysconfdir)"' + + OBJS= fe-auth.o fe-connect.o fe-exec.o fe-misc.o fe-print.o fe-lobj.o \ +@@ -66,7 +68,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-7.4.14.orig/src/interfaces/libpq/nls.mk postgresql-7.4.14/src/interfaces/libpq/nls.mk +--- postgresql-7.4.14.orig/src/interfaces/libpq/nls.mk 2006-11-05 13:20:18.000000000 +0100 ++++ postgresql-7.4.14/src/interfaces/libpq/nls.mk 2006-11-05 13:23:46.000000000 +0100 +@@ -1,5 +1,5 @@ + # $Header: /cvsroot/pgsql/src/interfaces/libpq/nls.mk,v 1.13.2.1 2004/10/30 08:22:16 petere Exp $ +-CATALOG_NAME := libpq ++CATALOG_NAME := libpq-3 + AVAIL_LANGUAGES := cs de es fr hr it nb pt_BR ru 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-secure.c + GETTEXT_TRIGGERS:= libpq_gettext pqInternalNotice:2 +diff -Nru postgresql-7.4.14.orig/src/Makefile.shlib postgresql-7.4.14/src/Makefile.shlib +--- postgresql-7.4.14.orig/src/Makefile.shlib 2006-11-05 13:20:18.000000000 +0100 ++++ postgresql-7.4.14/src/Makefile.shlib 2006-11-05 13:23:46.000000000 +0100 +@@ -229,7 +229,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) + +@@ -239,7 +239,7 @@ + MK_NO_LORDER := true + endif + +-lib$(NAME).a: $(OBJS) ++lib$(NAME_STATIC_LIB).a: $(OBJS) + ifdef MK_NO_LORDER + $(LINK.static) $@ $^ + else +@@ -310,11 +310,11 @@ + .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 ($(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.16.ebuild b/dev-db/libpq/libpq-7.4.16.ebuild new file mode 100644 index 000000000000..fdbc698a6a9e --- /dev/null +++ b/dev-db/libpq/libpq-7.4.16.ebuild @@ -0,0 +1,111 @@ +# Copyright 1999-2007 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: /var/cvsroot/gentoo-x86/dev-db/libpq/libpq-7.4.16.ebuild,v 1.1 2007/02/12 00:07:18 mjolnir 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="3" +KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86" +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" + +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} + cd "${S}" + 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 \ + $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 +} -- 2.26.2