From: Konstantin V. Arkhipov Date: Tue, 1 May 2007 19:30:23 +0000 (+0000) Subject: * bump, closing bug #157337 X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=89ee587e757dca87a8e8923f929a5de92bb71768;p=gentoo.git * bump, closing bug #157337 Package-Manager: portage-2.1.2.5 --- diff --git a/dev-db/libpq/ChangeLog b/dev-db/libpq/ChangeLog index f5bb36e605b1..00e33df95b15 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.106 2007/04/30 23:35:17 aross Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-db/libpq/ChangeLog,v 1.107 2007/05/01 19:28:59 voxus Exp $ + +*libpq-8.2.4 (01 May 2007) + + 01 May 2007; Konstantin V. Arkhipov + +files/libpq-8.2.4-gentoo.patch, +libpq-8.2.4.ebuild: + Version bump, closing bug #157337. *libpq-8.0.13 (30 Apr 2007) diff --git a/dev-db/libpq/files/digest-libpq-8.2.4 b/dev-db/libpq/files/digest-libpq-8.2.4 new file mode 100644 index 000000000000..0758b13da12d --- /dev/null +++ b/dev-db/libpq/files/digest-libpq-8.2.4 @@ -0,0 +1,6 @@ +MD5 5c0576627c9969a3cedb6b014fb6ae05 postgresql-base-8.2.4.tar.bz2 8549159 +RMD160 876105c3cc9d36b66cf9dc9b687d4b6f6b2c3d9c postgresql-base-8.2.4.tar.bz2 8549159 +SHA256 8ee5ad364ee21079ce3d726b4abcfa0f318015a331e37e9856a3500fcce74cca postgresql-base-8.2.4.tar.bz2 8549159 +MD5 b71b0526e7c8af22d82fbc7b6f81a750 postgresql-opt-8.2.4.tar.bz2 167612 +RMD160 aaacb743be86afbfe0f885b7994c15c94fef2413 postgresql-opt-8.2.4.tar.bz2 167612 +SHA256 5977ca1f0913aa98bc889e49b38768621865959b14e2674e7716d44b7fe9eb35 postgresql-opt-8.2.4.tar.bz2 167612 diff --git a/dev-db/libpq/files/libpq-8.2.4-gentoo.patch b/dev-db/libpq/files/libpq-8.2.4-gentoo.patch new file mode 100644 index 000000000000..428232c131e9 --- /dev/null +++ b/dev-db/libpq/files/libpq-8.2.4-gentoo.patch @@ -0,0 +1,44 @@ +--- postgresql-8.2.3.orig/src/interfaces/libpq/Makefile 2006-12-28 01:01:12.000000000 +0100 ++++ postgresql-8.2.3/src/interfaces/libpq/Makefile 2007-03-29 10:24:27.000000000 +0200 +@@ -20,6 +20,8 @@ + SO_MINOR_VERSION= 0 + 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) +@@ -160,7 +162,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)' +--- postgresql-8.2.3.orig/src/interfaces/libpq/nls.mk 2005-01-14 09:57:06.000000000 +0100 ++++ postgresql-8.2.3/src/interfaces/libpq/nls.mk 2007-03-29 10:24:55.000000000 +0200 +@@ -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 +--- postgresql-8.2.3.orig/src/Makefile.shlib 2006-09-19 17:36:07.000000000 +0200 ++++ postgresql-8.2.3/src/Makefile.shlib 2007-03-29 10:28:42.000000000 +0200 +@@ -346,10 +346,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-8.2.4.ebuild b/dev-db/libpq/libpq-8.2.4.ebuild new file mode 100644 index 000000000000..dfd589c21e5f --- /dev/null +++ b/dev-db/libpq/libpq-8.2.4.ebuild @@ -0,0 +1,116 @@ +# 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-8.2.4.ebuild,v 1.1 2007/05/01 19:28:59 voxus 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-base-${PV}.tar.bz2 + mirror://postgresql/source/v${PV}/postgresql-opt-${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}/${PN}-${PV}-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." +} diff --git a/dev-db/postgresql/ChangeLog b/dev-db/postgresql/ChangeLog index c92c95b24b34..fd35ad451373 100644 --- a/dev-db/postgresql/ChangeLog +++ b/dev-db/postgresql/ChangeLog @@ -1,6 +1,16 @@ # ChangeLog for dev-db/postgresql # Copyright 2002-2007 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/dev-db/postgresql/ChangeLog,v 1.332 2007/05/01 05:59:46 aross Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-db/postgresql/ChangeLog,v 1.333 2007/05/01 19:30:23 voxus Exp $ + +*postgresql-8.2.4 (01 May 2007) + + 01 May 2007; Konstantin V. Arkhipov + +files/postgresql-8.2.4-gentoo.patch, + +files/postgresql-8.2.4-no-test.patch, + +files/postgresql-8.2.4-regress_fix.patch, + +files/postgresql-8.2.4-regress_su.patch, + +files/postgresql-8.2.4-sh.patch, +postgresql-8.2.4.ebuild: + Version bump, closing bug #157337. *postgresql-8.0.13 (01 May 2007) diff --git a/dev-db/postgresql/files/digest-postgresql-8.2.4 b/dev-db/postgresql/files/digest-postgresql-8.2.4 new file mode 100644 index 000000000000..6035a30b4e46 --- /dev/null +++ b/dev-db/postgresql/files/digest-postgresql-8.2.4 @@ -0,0 +1,12 @@ +MD5 5c0576627c9969a3cedb6b014fb6ae05 postgresql-base-8.2.4.tar.bz2 8549159 +RMD160 876105c3cc9d36b66cf9dc9b687d4b6f6b2c3d9c postgresql-base-8.2.4.tar.bz2 8549159 +SHA256 8ee5ad364ee21079ce3d726b4abcfa0f318015a331e37e9856a3500fcce74cca postgresql-base-8.2.4.tar.bz2 8549159 +MD5 7d520a0fc88c8b59338c25cf18331f6a postgresql-docs-8.2.4.tar.bz2 2769630 +RMD160 bcdb176f509f69141524ababa0f6c9b1a1dd5c3f postgresql-docs-8.2.4.tar.bz2 2769630 +SHA256 2bb5bea974a68f562e40104d756ea87dbd831cf8fbd4bb54faca38f23c87de4c postgresql-docs-8.2.4.tar.bz2 2769630 +MD5 b71b0526e7c8af22d82fbc7b6f81a750 postgresql-opt-8.2.4.tar.bz2 167612 +RMD160 aaacb743be86afbfe0f885b7994c15c94fef2413 postgresql-opt-8.2.4.tar.bz2 167612 +SHA256 5977ca1f0913aa98bc889e49b38768621865959b14e2674e7716d44b7fe9eb35 postgresql-opt-8.2.4.tar.bz2 167612 +MD5 0fefe28b8c9d16ebdf6f05c366477a9d postgresql-test-8.2.4.tar.bz2 985819 +RMD160 c5fcbef081565f7ba02fc4ac96ce8e1f4141c3ae postgresql-test-8.2.4.tar.bz2 985819 +SHA256 fc4471ecece04251289cfe7feb0acbafa3a18cf8f35c2d61ce3f68bd4394e504 postgresql-test-8.2.4.tar.bz2 985819 diff --git a/dev-db/postgresql/files/postgresql-8.2.4-gentoo.patch b/dev-db/postgresql/files/postgresql-8.2.4-gentoo.patch new file mode 100644 index 000000000000..6d47d2535980 --- /dev/null +++ b/dev-db/postgresql/files/postgresql-8.2.4-gentoo.patch @@ -0,0 +1,58 @@ +--- postgresql-8.2.3.orig/src/bin/Makefile 2006-03-05 16:58:50.000000000 +0100 ++++ postgresql-8.2.3/src/bin/Makefile 2007-03-29 12:12:26.000000000 +0200 +@@ -14,7 +14,7 @@ + include $(top_builddir)/src/Makefile.global + + DIRS := initdb ipcclean pg_ctl pg_dump \ +- psql scripts pg_config pg_controldata pg_resetxlog ++ psql scripts pg_controldata pg_resetxlog + ifeq ($(PORTNAME), win32) + DIRS+=pgevent + endif +--- postgresql-8.2.3.orig/src/interfaces/Makefile 2004-04-20 02:33:51.000000000 +0200 ++++ postgresql-8.2.3/src/interfaces/Makefile 2007-03-29 12:14:01.000000000 +0200 +@@ -12,7 +12,7 @@ + top_builddir = ../.. + include $(top_builddir)/src/Makefile.global + +-DIRS := libpq ecpg ++DIRS := ecpg + + ALLDIRS := $(DIRS) + +--- postgresql-8.2.3.orig/src/Makefile 2006-06-23 01:50:35.000000000 +0200 ++++ postgresql-8.2.3/src/Makefile 2007-03-29 12:54:59.000000000 +0200 +@@ -18,12 +18,10 @@ + $(MAKE) -C timezone $@ + $(MAKE) -C backend $@ + $(MAKE) -C backend/utils/mb/conversion_procs $@ +- $(MAKE) -C include $@ + $(MAKE) -C interfaces $@ + $(MAKE) -C bin $@ + $(MAKE) -C pl $@ + $(MAKE) -C makefiles $@ +- $(MAKE) -C test/regress $@ + + install: install-local + +@@ -47,7 +45,6 @@ + $(MAKE) -C port $@ + $(MAKE) -C timezone $@ + $(MAKE) -C backend $@ +- $(MAKE) -C include $@ + $(MAKE) -C interfaces $@ + $(MAKE) -C bin $@ + $(MAKE) -C pl $@ +@@ -60,12 +57,10 @@ + -$(MAKE) -C port $@ + -$(MAKE) -C timezone $@ + -$(MAKE) -C backend $@ +- -$(MAKE) -C include $@ + -$(MAKE) -C interfaces $@ + -$(MAKE) -C bin $@ + -$(MAKE) -C pl $@ + -$(MAKE) -C makefiles $@ +- -$(MAKE) -C test $@ + -$(MAKE) -C tutorial NO_PGXS=1 $@ + -$(MAKE) -C test/thread $@ + rm -f Makefile.port Makefile.global diff --git a/dev-db/postgresql/files/postgresql-8.2.4-no-test.patch b/dev-db/postgresql/files/postgresql-8.2.4-no-test.patch new file mode 100644 index 000000000000..0f887e28d22c --- /dev/null +++ b/dev-db/postgresql/files/postgresql-8.2.4-no-test.patch @@ -0,0 +1,12 @@ +diff --git a/src/Makefile b/src/Makefile +index 5eb7c4a..0f9fff0 100644 +--- a/src/Makefile ++++ b/src/Makefile +@@ -22,7 +22,6 @@ all install installdirs uninstall dep de + $(MAKE) -C bin $@ + $(MAKE) -C pl $@ + $(MAKE) -C makefiles $@ +- $(MAKE) -C test/regress $@ + + install: install-local + diff --git a/dev-db/postgresql/files/postgresql-8.2.4-regress_fix.patch b/dev-db/postgresql/files/postgresql-8.2.4-regress_fix.patch new file mode 100644 index 000000000000..0af8c3fbfd80 --- /dev/null +++ b/dev-db/postgresql/files/postgresql-8.2.4-regress_fix.patch @@ -0,0 +1,31 @@ +diff --git a/src/test/regress/expected/interval.out b/src/test/regress/expected/interval.out +index f7c35de..183a963 100644 +--- a/src/test/regress/expected/interval.out ++++ b/src/test/regress/expected/interval.out +@@ -293,12 +293,6 @@ (10 rows) + -- test avg(interval), which is somewhat fragile since people have been + -- known to change the allowed input syntax for type interval without + -- updating pg_aggregate.agginitval +-select avg(f1) from interval_tbl; +- avg +-------------------------------------------------- +- @ 4 years 1 mon 10 days 4 hours 18 mins 23 secs +-(1 row) +- + -- test long interval input + select '4 millenniums 5 centuries 4 decades 1 year 4 months 4 days 17 minutes 31 seconds'::interval; + interval +diff --git a/src/test/regress/sql/interval.sql b/src/test/regress/sql/interval.sql +index 9b2e625..cb44d12 100644 +--- a/src/test/regress/sql/interval.sql ++++ b/src/test/regress/sql/interval.sql +@@ -101,9 +101,6 @@ SELECT '' AS ten, * FROM INTERVAL_TBL; + -- test avg(interval), which is somewhat fragile since people have been + -- known to change the allowed input syntax for type interval without + -- updating pg_aggregate.agginitval +- +-select avg(f1) from interval_tbl; +- + -- test long interval input + select '4 millenniums 5 centuries 4 decades 1 year 4 months 4 days 17 minutes 31 seconds'::interval; + diff --git a/dev-db/postgresql/files/postgresql-8.2.4-regress_su.patch b/dev-db/postgresql/files/postgresql-8.2.4-regress_su.patch new file mode 100644 index 000000000000..83c56d7ab100 --- /dev/null +++ b/dev-db/postgresql/files/postgresql-8.2.4-regress_su.patch @@ -0,0 +1,15 @@ +diff --git a/src/test/regress/GNUmakefile b/src/test/regress/GNUmakefile +index f2319d2..b14a6f0 100644 +--- a/src/test/regress/GNUmakefile ++++ b/src/test/regress/GNUmakefile +@@ -148,7 +148,8 @@ ## + check: all + -rm -rf ./testtablespace + mkdir ./testtablespace +- ./pg_regress --temp-install=./tmp_check --top-builddir=$(top_builddir) --temp-port=$(TEMP_PORT) --schedule=$(srcdir)/parallel_schedule --multibyte=$(MULTIBYTE) --load-language=plpgsql $(MAXCONNOPT) $(NOLOCALE) ++ chown portage testtablespace . ++ su -s /bin/sh portage -c "./pg_regress --psqldir=`pwd`/../../bin/psql --temp-install=./tmp_check --top-builddir=$(top_builddir) --temp-port=$(TEMP_PORT) --schedule=$(srcdir)/parallel_schedule --multibyte=$(MULTIBYTE) --load-language=plpgsql $(MAXCONNOPT) $(NOLOCALE)" + + installcheck: all + -rm -rf ./testtablespace +diff --git a/src/test/regress/pg_regress.c b/src/test/regress/pg_regress.c diff --git a/dev-db/postgresql/files/postgresql-8.2.4-sh.patch b/dev-db/postgresql/files/postgresql-8.2.4-sh.patch new file mode 100644 index 000000000000..295bb6cfb600 --- /dev/null +++ b/dev-db/postgresql/files/postgresql-8.2.4-sh.patch @@ -0,0 +1,34 @@ +--- postgresql-8.2.3.orig/src/include/storage/s_lock.h 2006-06-08 00:24:45.000000000 +0200 ++++ postgresql-8.2.3/src/include/storage/s_lock.h 2007-03-29 12:25:56.000000000 +0200 +@@ -299,6 +299,31 @@ + #endif /* __s390__ || __s390x__ */ + + ++#if defined(__sh__) ++#define HAS_TEST_AND_SET ++ ++typedef unsigned char slock_t; ++ ++#define TAS(lock) tas(lock) ++ ++static __inline__ int ++tas(volatile slock_t *lock) ++{ ++ register int _res = 1; ++ ++ __asm__ __volatile__( ++ "tas.b @%1\n\t" ++ "movt %0\n\t" ++ "xor #1,%0" ++: "=z"(_res) ++: "r"(lock) ++: "t","memory"); ++ return _res; ++} ++ ++#endif /* __sh__ */ ++ ++ + #if defined(__sparc__) /* Sparc */ + #define HAS_TEST_AND_SET + diff --git a/dev-db/postgresql/postgresql-8.2.4.ebuild b/dev-db/postgresql/postgresql-8.2.4.ebuild new file mode 100644 index 000000000000..3911538bb4dc --- /dev/null +++ b/dev-db/postgresql/postgresql-8.2.4.ebuild @@ -0,0 +1,247 @@ +# Copyright 1999-2007 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: /var/cvsroot/gentoo-x86/dev-db/postgresql/postgresql-8.2.4.ebuild,v 1.1 2007/05/01 19:30:23 voxus Exp $ + +inherit eutils gnuconfig flag-o-matic multilib toolchain-funcs versionator + +KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~sparc-fbsd ~x86 ~x86-fbsd" + +DESCRIPTION="Sophisticated and powerful Object-Relational DBMS." +HOMEPAGE="http://www.postgresql.org/" +SRC_URI="mirror://postgresql/source/v${PV}/${PN}-base-${PV}.tar.bz2 + mirror://postgresql/source/v${PV}/${PN}-opt-${PV}.tar.bz2 + doc? ( mirror://postgresql/source/v${PV}/${PN}-docs-${PV}.tar.bz2 ) + test? ( mirror://postgresql/source/v${PV}/${PN}-test-${PV}.tar.bz2 )" +LICENSE="POSTGRESQL" +SLOT="0" +IUSE="doc kerberos nls pam perl pg-intdatetime python readline selinux ssl tcl test xml zlib" + +RDEPEND="~dev-db/libpq-${PV} + >=sys-libs/ncurses-5.2 + kerberos? ( virtual/krb5 ) + pam? ( virtual/pam ) + perl? ( >=dev-lang/perl-5.6.1-r2 ) + python? ( >=dev-lang/python-2.2 dev-python/egenix-mx-base ) + readline? ( >=sys-libs/readline-4.1 ) + selinux? ( sec-policy/selinux-postgresql ) + ssl? ( >=dev-libs/openssl-0.9.6-r1 ) + tcl? ( >=dev-lang/tcl-8 ) + xml? ( dev-libs/libxml2 dev-libs/libxslt ) + zlib? ( >=sys-libs/zlib-1.1.3 )" +DEPEND="${RDEPEND} + sys-devel/autoconf + >=sys-devel/bison-1.875 + nls? ( sys-devel/gettext ) + xml? ( dev-util/pkgconfig )" + +PG_DIR="/var/lib/postgresql" +[[ -z "${PG_MAX_CONNECTIONS}" ]] && PG_MAX_CONNECTIONS="512" + +pkg_setup() { + if [[ -f "${PG_DIR}/data/PG_VERSION" ]] ; then + if [[ $(cat "${PG_DIR}/data/PG_VERSION") != $(get_version_component_range 1-2) ]] ; then + eerror "PostgreSQL ${PV} cannot upgrade your existing databases, you must" + eerror "use pg_dump to export your existing databases to a file, and then" + eerror "pg_restore to import them when you have upgraded completely." + eerror "You must remove your entire database directory to continue." + eerror "(database directory = ${PG_DIR})." + die "Remove your database directory to continue" + fi + fi + enewgroup postgres 70 + enewuser postgres 70 /bin/bash /var/lib postgres +} + +src_unpack() { + unpack ${A} + cd "${S}" + + epatch "${FILESDIR}/${PN}-${PV}-gentoo.patch" + epatch "${FILESDIR}/${PN}-${PV}-sh.patch" + + # Prepare package for future tests + if use test ; then + # Fix sandbox violation + sed -e "s|/no/such/location|${S}/src/test/regress/tmp_check/no/such/location|g" -i src/test/regress/{input,output}/tablespace.source + + # Fix broken tests + epatch "${FILESDIR}/${PN}-${PV}-regress_fix.patch" + + # We need to run the tests as a non-root user, portage seems the most fitting here, + # so if userpriv is enabled, we use it directly. If userpriv is disabled, we need to + # su - to a valid user, portage again, so we patch the test-scripts to do that. + mkdir -p "${S}/src/test/regress/tmp_check" + chown portage "${S}/src/test/regress/tmp_check" + einfo "Tests will be run as user portage." + if ! hasq userpriv ${FEATURES} ; then + mkdir -p "${S}/src/test/regress/results" + chown portage "${S}/src/test/regress/results" + epatch "${FILESDIR}/${PN}-${PV}-regress_su.patch" + fi + else + epatch ${FILESDIR}/${PN}-${PV}-no-test.patch + fi +} + +src_compile() { + filter-flags -ffast-math -feliminate-dwarf2-dups + + # Detect mips systems properly + gnuconfig_update + + cd "${S}" + + ./configure --prefix=/usr \ + --includedir=/usr/include/postgresql/pgsql \ + --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) \ + $(use_with perl) \ + $(use_enable pg-intdatetime integer-datetimes ) \ + $(use_with python) \ + $(use_with readline) \ + $(use_with ssl openssl) \ + $(use_with tcl) \ + $(use_with zlib) \ + || die "configure failed" + + emake -j1 LD="$(tc-getLD) $(get_abi_LDFLAGS)" || die "main emake failed" + + cd "${S}/contrib" + emake -j1 LD="$(tc-getLD) $(get_abi_LDFLAGS)" || die "contrib emake failed" + + if use xml ; then + cd "${S}/contrib/xml2" + emake -j1 LD="$(tc-getLD) $(get_abi_LDFLAGS)" || die "contrib/xml2 emake failed" + fi +} + +src_install() { + if use perl ; then + mv -f "${S}/src/pl/plperl/GNUmakefile" "${S}/src/pl/plperl/GNUmakefile_orig" + sed -e "s:\$(DESTDIR)\$(plperl_installdir):\$(plperl_installdir):" \ + "${S}/src/pl/plperl/GNUmakefile_orig" > "${S}/src/pl/plperl/GNUmakefile" + fi + + cd "${S}" + emake -j1 DESTDIR="${D}" LIBDIR="${D}/usr/$(get_libdir)" install || die "main emake install failed" + + cd "${S}/contrib" + emake -j1 DESTDIR="${D}" LIBDIR="${D}/usr/$(get_libdir)" install || die "contrib emake install failed" + + if use xml ; then + cd "${S}/contrib/xml2" + emake -j1 DESTDIR="${D}" LIBDIR="${D}/usr/$(get_libdir)" install || die "contrib/xml2 emake install failed" + fi + + cd "${S}" + dodoc README HISTORY + + cd "${S}/doc" + dodoc FAQ* README.* TODO bug.template + + if use doc ; then + cd "${S}/doc" + docinto FAQ_html + dodoc src/FAQ/* + docinto sgml + dodoc src/sgml/*.{sgml,dsl} + docinto sgml/ref + dodoc src/sgml/ref/*.sgml + docinto TODO.detail + dodoc TODO.detail/* + fi + + newinitd "${FILESDIR}/postgresql.init-${PV%.*}" postgresql || die "Inserting init.d-file failed" + newconfd "${FILESDIR}/postgresql.conf-${PV%.*}" postgresql || die "Inserting conf.d-file failed" +} + +pkg_postinst() { + elog "Execute the following command to setup the initial database environment:" + elog + elog "emerge --config =${PF}" + elog + elog "The autovacuum function, which was in contrib, has been moved to the main" + elog "PostgreSQL functions starting with 8.1." + elog "You can enable it in ${ROOT}/etc/postgresql/postgresql.conf." + elog + elog "If you need a global psqlrc-file, you can place it in '${ROOT}/etc/postgresql/'." +} + +pkg_config() { + einfo "Creating the data directory ..." + mkdir -p "${PG_DIR}/data" + chown -Rf postgres:postgres "${PG_DIR}" + chmod 0700 "${PG_DIR}/data" + + einfo "Initializing the database ..." + if [[ -f "${PG_DIR}/data/PG_VERSION" ]] ; then + eerror "PostgreSQL ${PV} cannot upgrade your existing databases." + eerror "You must remove your entire database directory to continue." + eerror "(database directory = ${PG_DIR})." + die "Remove your database directory to continue" + else + if use kernel_linux ; then + local SEM=`sysctl -n kernel.sem | cut -f-3` + local SEMMNI=`sysctl -n kernel.sem | cut -f4` + local SEMMNI_MIN=`expr \( ${PG_MAX_CONNECTIONS} + 15 \) / 16` + local SHMMAX=`sysctl -n kernel.shmmax` + local SHMMAX_MIN=`expr 500000 + 30600 \* ${PG_MAX_CONNECTIONS}` + + if [ ${SEMMNI} -lt ${SEMMNI_MIN} ] ; then + eerror "The current value of SEMMNI is too low" + eerror "for PostgreSQL to run ${PG_MAX_CONNECTIONS} connections!" + eerror "Temporary setting this value to ${SEMMNI_MIN} while creating the initial database." + echo ${SEM} ${SEMMNI_MIN} > /proc/sys/kernel/sem + fi + + su postgres -c "/usr/bin/initdb --pgdata ${PG_DIR}/data" + + if [ ! `sysctl -n kernel.sem | cut -f4` -eq ${SEMMNI} ] ; then + echo ${SEM} ${SEMMNI} > /proc/sys/kernel/sem + ewarn "Restoring the SEMMNI value to the previous value." + ewarn "Please edit the last value of kernel.sem in /etc/sysctl.conf" + ewarn "and set it to at least ${SEMMNI_MIN}:" + ewarn + ewarn " kernel.sem = ${SEM} ${SEMMNI_MIN}" + ewarn + fi + + if [ ${SHMMAX} -lt ${SHMMAX_MIN} ] ; then + eerror "The current value of SHMMAX is too low for postgresql to run." + eerror "Please edit /etc/sysctl.conf and set this value to at least ${SHMMAX_MIN}:" + eerror + eerror " kernel.shmmax = ${SHMMAX_MIN}" + eerror + fi + else + su postgres -c "/usr/bin/initdb --pgdata ${PG_DIR}/data" + fi + + einfo + einfo "You can use the '${ROOT}/etc/init.d/postgresql' script to run PostgreSQL instead of 'pg_ctl'." + einfo + fi +} + +src_test() { + cd "${S}" + + einfo ">>> Test phase [check]: ${CATEGORY}/${PF}" + if ! emake -j1 check ; then + hasq test ${FEATURES} && die "Make check failed. See above for details." + hasq test ${FEATURES} || eerror "Make check failed. See above for details." + fi + + einfo "Yes, there are other tests which could be run." + einfo "... and no, we don't plan to add/support them." + einfo "For now, the main regressions tests will suffice." + einfo "If you think other tests are necessary, please submit a" + einfo "bug including a patch for this ebuild to enable them." +}