From 37182d22034855fe732733fa6c3b97a3f4cd0402 Mon Sep 17 00:00:00 2001 From: Patrick Lauer Date: Wed, 14 Jul 2010 18:44:36 +0000 Subject: [PATCH] Bump Package-Manager: portage-2.2_rc67/cvs/Linux x86_64 --- dev-db/postgresql-base/ChangeLog | 9 +- .../files/postgresql-9.0-base.3.patch | 147 +++++++++ .../files/postgresql-9.0-common.3.patch | 14 + .../postgresql-base-9.0_beta3.ebuild | 161 ++++++++++ dev-db/postgresql-docs/ChangeLog | 8 +- .../files/postgresql-9.0-common.3.patch | 14 + .../postgresql-docs-9.0_beta3.ebuild | 62 ++++ dev-db/postgresql-server/ChangeLog | 9 +- .../files/postgresql-9.0-common.3.patch | 14 + .../files/postgresql-9.0-server.3.patch | 213 +++++++++++++ .../postgresql-server-9.0_beta3.ebuild | 289 ++++++++++++++++++ 11 files changed, 937 insertions(+), 3 deletions(-) create mode 100644 dev-db/postgresql-base/files/postgresql-9.0-base.3.patch create mode 100644 dev-db/postgresql-base/files/postgresql-9.0-common.3.patch create mode 100644 dev-db/postgresql-base/postgresql-base-9.0_beta3.ebuild create mode 100644 dev-db/postgresql-docs/files/postgresql-9.0-common.3.patch create mode 100644 dev-db/postgresql-docs/postgresql-docs-9.0_beta3.ebuild create mode 100644 dev-db/postgresql-server/files/postgresql-9.0-common.3.patch create mode 100644 dev-db/postgresql-server/files/postgresql-9.0-server.3.patch create mode 100644 dev-db/postgresql-server/postgresql-server-9.0_beta3.ebuild diff --git a/dev-db/postgresql-base/ChangeLog b/dev-db/postgresql-base/ChangeLog index 88b2b4a517d7..f26c7c62d45b 100644 --- a/dev-db/postgresql-base/ChangeLog +++ b/dev-db/postgresql-base/ChangeLog @@ -1,6 +1,13 @@ # ChangeLog for dev-db/postgresql-base # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/dev-db/postgresql-base/ChangeLog,v 1.65 2010/07/13 14:21:28 fauli Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-db/postgresql-base/ChangeLog,v 1.66 2010/07/14 18:40:22 patrick Exp $ + +*postgresql-base-9.0_beta3 (14 Jul 2010) + + 14 Jul 2010; Patrick Lauer + +postgresql-base-9.0_beta3.ebuild, +files/postgresql-9.0-base.3.patch, + +files/postgresql-9.0-common.3.patch: + Bump 13 Jul 2010; Christian Faulhammer postgresql-base-8.4.4-r2.ebuild: diff --git a/dev-db/postgresql-base/files/postgresql-9.0-base.3.patch b/dev-db/postgresql-base/files/postgresql-9.0-base.3.patch new file mode 100644 index 000000000000..ba6a92688bb8 --- /dev/null +++ b/dev-db/postgresql-base/files/postgresql-9.0-base.3.patch @@ -0,0 +1,147 @@ +diff -Naur postgresql-9.0beta3.orig/contrib/Makefile postgresql-9.0beta3/contrib/Makefile +--- postgresql-9.0beta3.orig/contrib/Makefile 2010-06-14 12:17:56.000000000 -0400 ++++ postgresql-9.0beta3/contrib/Makefile 2010-07-11 23:41:57.680531730 -0400 +@@ -5,51 +5,14 @@ + include $(top_builddir)/src/Makefile.global + + SUBDIRS = \ +- adminpack \ +- auto_explain \ +- btree_gin \ +- btree_gist \ +- chkpass \ +- citext \ +- cube \ +- dblink \ +- dict_int \ +- dict_xsyn \ +- earthdistance \ +- fuzzystrmatch \ +- hstore \ +- intagg \ +- intarray \ +- isn \ +- lo \ +- ltree \ + oid2name \ +- pageinspect \ + passwordcheck \ +- pg_archivecleanup \ +- pg_buffercache \ +- pg_freespacemap \ +- pg_standby \ +- pg_stat_statements \ +- pg_trgm \ + pg_upgrade \ + pg_upgrade_support \ + pgbench \ +- pgcrypto \ +- pgrowlocks \ +- pgstattuple \ +- seg \ +- spi \ +- tablefunc \ +- test_parser \ +- tsearch2 \ + unaccent \ + vacuumlo + +-ifeq ($(with_openssl),yes) +-SUBDIRS += sslinfo +-endif +- + ifeq ($(with_ossp_uuid),yes) + SUBDIRS += uuid-ossp + endif +diff -Naur postgresql-9.0beta3.orig/src/backend/Makefile postgresql-9.0beta3/src/backend/Makefile +--- postgresql-9.0beta3.orig/src/backend/Makefile 2010-07-05 14:54:37.000000000 -0400 ++++ postgresql-9.0beta3/src/backend/Makefile 2010-07-11 23:46:58.347527452 -0400 +@@ -45,7 +45,7 @@ + + ########################################################################## + +-all: submake-libpgport submake-schemapg postgres $(POSTGRES_IMP) ++all: someheaders + + ifneq ($(PORTNAME), cygwin) + ifneq ($(PORTNAME), win32) +@@ -114,7 +114,7 @@ + endif # aix + + # Update the commonly used headers before building the subdirectories +-$(SUBDIRS:%=%-recursive): $(top_builddir)/src/include/parser/gram.h $(top_builddir)/src/include/catalog/schemapg.h $(top_builddir)/src/include/utils/fmgroids.h $(top_builddir)/src/include/utils/probes.h ++someheaders $(SUBDIRS:%=%-recursive): $(top_builddir)/src/include/parser/gram.h $(top_builddir)/src/include/utils/fmgroids.h $(top_builddir)/src/include/utils/probes.h + + # run this unconditionally to avoid needing to know its dependencies here: + submake-schemapg: +@@ -191,23 +191,7 @@ + + ########################################################################## + +-install: all installdirs install-bin +-ifeq ($(PORTNAME), cygwin) +-ifeq ($(MAKE_DLL), true) +- $(INSTALL_DATA) libpostgres.a '$(DESTDIR)$(libdir)/libpostgres.a' +-endif +-endif +-ifeq ($(PORTNAME), win32) +-ifeq ($(MAKE_DLL), true) +- $(INSTALL_DATA) libpostgres.a '$(DESTDIR)$(libdir)/libpostgres.a' +-endif +-endif +- $(MAKE) -C catalog install-data +- $(MAKE) -C tsearch install-data +- $(INSTALL_DATA) $(srcdir)/libpq/pg_hba.conf.sample '$(DESTDIR)$(datadir)/pg_hba.conf.sample' +- $(INSTALL_DATA) $(srcdir)/libpq/pg_ident.conf.sample '$(DESTDIR)$(datadir)/pg_ident.conf.sample' +- $(INSTALL_DATA) $(srcdir)/utils/misc/postgresql.conf.sample '$(DESTDIR)$(datadir)/postgresql.conf.sample' +- $(INSTALL_DATA) $(srcdir)/access/transam/recovery.conf.sample '$(DESTDIR)$(datadir)/recovery.conf.sample' ++install: + + install-bin: postgres $(POSTGRES_IMP) installdirs + $(INSTALL_PROGRAM) postgres$(X) '$(DESTDIR)$(bindir)/postgres$(X)' +diff -Naur postgresql-9.0beta3.orig/src/bin/Makefile postgresql-9.0beta3/src/bin/Makefile +--- postgresql-9.0beta3.orig/src/bin/Makefile 2010-01-02 11:57:58.000000000 -0500 ++++ postgresql-9.0beta3/src/bin/Makefile 2010-07-11 23:50:10.762585482 -0400 +@@ -13,8 +13,7 @@ + top_builddir = ../.. + include $(top_builddir)/src/Makefile.global + +-SUBDIRS = initdb pg_ctl pg_dump \ +- psql scripts pg_config pg_controldata pg_resetxlog ++SUBDIRS = pg_dump psql scripts pg_config + ifeq ($(PORTNAME), win32) + SUBDIRS+=pgevent + endif +diff -Naur postgresql-9.0beta3.orig/src/include/pg_config_manual.h postgresql-9.0beta3/src/include/pg_config_manual.h +--- postgresql-9.0beta3.orig/src/include/pg_config_manual.h 2010-01-06 23:53:35.000000000 -0500 ++++ postgresql-9.0beta3/src/include/pg_config_manual.h 2010-07-11 23:51:39.925527262 -0400 +@@ -141,7 +141,7 @@ + * here's where to twiddle it. You can also override this at runtime + * with the postmaster's -k switch. + */ +-#define DEFAULT_PGSOCKET_DIR "/tmp" ++#define DEFAULT_PGSOCKET_DIR "/var/run/postgresql" + + /* + * The random() function is expected to yield values between 0 and +diff -Naur postgresql-9.0beta3.orig/src/Makefile postgresql-9.0beta3/src/Makefile +--- postgresql-9.0beta3.orig/src/Makefile 2010-01-20 04:16:23.000000000 -0500 ++++ postgresql-9.0beta3/src/Makefile 2010-07-11 23:53:43.768528995 -0400 +@@ -15,17 +15,12 @@ + + all install installdirs uninstall distprep: + $(MAKE) -C port $@ +- $(MAKE) -C timezone $@ + $(MAKE) -C backend $@ +- $(MAKE) -C backend/utils/mb/conversion_procs $@ +- $(MAKE) -C backend/snowball $@ + $(MAKE) -C include $@ + $(MAKE) -C interfaces $@ + $(MAKE) -C backend/replication/libpqwalreceiver $@ + $(MAKE) -C bin $@ +- $(MAKE) -C pl $@ + $(MAKE) -C makefiles $@ +- $(MAKE) -C test/regress $@ + + install: install-local + diff --git a/dev-db/postgresql-base/files/postgresql-9.0-common.3.patch b/dev-db/postgresql-base/files/postgresql-9.0-common.3.patch new file mode 100644 index 000000000000..ab47b0cb9707 --- /dev/null +++ b/dev-db/postgresql-base/files/postgresql-9.0-common.3.patch @@ -0,0 +1,14 @@ +diff -Naur postgresql-9.0beta3.orig/configure.in postgresql-9.0beta3/configure.in +--- postgresql-9.0beta3.orig/configure.in 2010-07-08 22:43:12.000000000 -0400 ++++ postgresql-9.0beta3/configure.in 2010-07-12 00:13:37.585527031 -0400 +@@ -19,10 +19,6 @@ + + AC_INIT([PostgreSQL], [9.0beta3], [pgsql-bugs@postgresql.org]) + +-m4_if(m4_defn([m4_PACKAGE_VERSION]), [2.63], [], [m4_fatal([Autoconf version 2.63 is required. +-Untested combinations of 'autoconf' and PostgreSQL versions are not +-recommended. You can remove the check from 'configure.in' but it is then +-your responsibility whether the result works or not.])]) + AC_COPYRIGHT([Copyright (c) 1996-2010, PostgreSQL Global Development Group]) + AC_CONFIG_SRCDIR([src/backend/access/common/heaptuple.c]) + AC_CONFIG_AUX_DIR(config) diff --git a/dev-db/postgresql-base/postgresql-base-9.0_beta3.ebuild b/dev-db/postgresql-base/postgresql-base-9.0_beta3.ebuild new file mode 100644 index 000000000000..6e2a8057a37b --- /dev/null +++ b/dev-db/postgresql-base/postgresql-base-9.0_beta3.ebuild @@ -0,0 +1,161 @@ +# Copyright 1999-2010 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: /var/cvsroot/gentoo-x86/dev-db/postgresql-base/postgresql-base-9.0_beta3.ebuild,v 1.1 2010/07/14 18:40:22 patrick Exp $ + +EAPI="2" + +WANT_AUTOMAKE="none" + +inherit eutils multilib versionator autotools + +KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~sparc-fbsd ~x86-fbsd" + +DESCRIPTION="PostgreSQL libraries and clients" +HOMEPAGE="http://www.postgresql.org/" + +MY_PV=${PV/_/} +SRC_URI="mirror://postgresql/source/v${MY_PV}/postgresql-${MY_PV}.tar.bz2" +S=${WORKDIR}/postgresql-${MY_PV} + +LICENSE="POSTGRESQL" +SLOT="$(get_version_component_range 1-2)" +IUSE_LINGUAS=" + linguas_af linguas_cs linguas_de linguas_es linguas_fa linguas_fr + linguas_hr linguas_hu linguas_it linguas_ko linguas_nb linguas_pl + linguas_pt_BR linguas_ro linguas_ru linguas_sk linguas_sl linguas_sv + linguas_tr linguas_zh_CN linguas_zh_TW" +IUSE="doc kerberos nls pam readline ssl threads zlib ldap pg_legacytimestamp ${IUSE_LINGUAS}" +RESTRICT="test" + +wanted_languages() { + for u in ${IUSE_LINGUAS} ; do + use $u && echo -n "${u#linguas_} " + done +} + +RDEPEND="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 ) + >=app-admin/eselect-postgresql-0.3 + virtual/libintl + !!dev-db/postgresql-libs + !!dev-db/postgresql-client + !!dev-db/libpq + !!dev-db/postgresql + ldap? ( net-nds/openldap )" +DEPEND="${RDEPEND} + sys-devel/flex + >=sys-devel/bison-1.875 + nls? ( sys-devel/gettext )" +PDEPEND="doc? ( ~dev-db/postgresql-docs-${PV} )" + +src_prepare() { + epatch "${FILESDIR}/postgresql-9.0-common.3.patch" \ + "${FILESDIR}/postgresql-${SLOT}-base.3.patch" + + if use kerberos && has_version " "${D}/etc/eselect/postgresql/slots/${SLOT}/base" <<-__EOF__ +postgres_ebuilds="\${postgres_ebuilds} ${PF}" +postgres_prefix=/usr/$(get_libdir)/postgresql-${SLOT} +postgres_datadir=/usr/share/postgresql-${SLOT} +postgres_bindir=/usr/$(get_libdir)/postgresql-${SLOT}/bin +postgres_symlinks=( + ${IDIR} /usr/include/postgresql + ${IDIR}/libpq-fe.h /usr/include/libpq-fe.h + ${IDIR}/pg_config_manual.h /usr/include/pg_config_manual.h + ${IDIR}/libpq /usr/include/libpq + ${IDIR}/postgres_ext.h /usr/include/postgres_ext.h +) +__EOF__ + + cat >"${T}/50postgresql-94-${SLOT}" <<-__EOF__ + LDPATH=/usr/$(get_libdir)/postgresql-${SLOT}/$(get_libdir) + MANPATH=/usr/share/postgresql-${SLOT}/man + __EOF__ + doenvd "${T}/50postgresql-94-${SLOT}" + + keepdir /etc/postgresql-${SLOT} +} + +pkg_postinst() { + eselect postgresql update + [[ "$(eselect postgresql show)" = "(none)" ]] && eselect postgresql set ${SLOT} + elog "If you need a global psqlrc-file, you can place it in:" + elog " '${ROOT}/etc/postgresql-${SLOT}/'" + elog + elog "The PostgreSQL community has called for more testers of the upcoming 9.0" + elog "release. This beta version of the PostgreSQL client applications and libraries," + elog "while moved to ~arch, will never be marked stable. As such, you may not want to" + elog "use this package in an environment where incompatible changes are" + elog "unacceptable. Bear in mind, though, that these packages are slotted and that you" + elog "may have multiple installations simultaneously without conflict. However, you" + elog "may only use one set of client applications and libraries via 'eselect'." +} + +pkg_postrm() { + eselect postgresql update +} diff --git a/dev-db/postgresql-docs/ChangeLog b/dev-db/postgresql-docs/ChangeLog index 6f758203a390..b02a0aae0148 100644 --- a/dev-db/postgresql-docs/ChangeLog +++ b/dev-db/postgresql-docs/ChangeLog @@ -1,6 +1,12 @@ # ChangeLog for dev-db/postgresql-docs # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/dev-db/postgresql-docs/ChangeLog,v 1.49 2010/07/10 19:21:06 armin76 Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-db/postgresql-docs/ChangeLog,v 1.50 2010/07/14 18:44:36 patrick Exp $ + +*postgresql-docs-9.0_beta3 (14 Jul 2010) + + 14 Jul 2010; Patrick Lauer + +postgresql-docs-9.0_beta3.ebuild, +files/postgresql-9.0-common.3.patch: + Bump 10 Jul 2010; Raúl Porcel postgresql-docs-7.4.29.ebuild, postgresql-docs-8.0.25.ebuild, diff --git a/dev-db/postgresql-docs/files/postgresql-9.0-common.3.patch b/dev-db/postgresql-docs/files/postgresql-9.0-common.3.patch new file mode 100644 index 000000000000..ab47b0cb9707 --- /dev/null +++ b/dev-db/postgresql-docs/files/postgresql-9.0-common.3.patch @@ -0,0 +1,14 @@ +diff -Naur postgresql-9.0beta3.orig/configure.in postgresql-9.0beta3/configure.in +--- postgresql-9.0beta3.orig/configure.in 2010-07-08 22:43:12.000000000 -0400 ++++ postgresql-9.0beta3/configure.in 2010-07-12 00:13:37.585527031 -0400 +@@ -19,10 +19,6 @@ + + AC_INIT([PostgreSQL], [9.0beta3], [pgsql-bugs@postgresql.org]) + +-m4_if(m4_defn([m4_PACKAGE_VERSION]), [2.63], [], [m4_fatal([Autoconf version 2.63 is required. +-Untested combinations of 'autoconf' and PostgreSQL versions are not +-recommended. You can remove the check from 'configure.in' but it is then +-your responsibility whether the result works or not.])]) + AC_COPYRIGHT([Copyright (c) 1996-2010, PostgreSQL Global Development Group]) + AC_CONFIG_SRCDIR([src/backend/access/common/heaptuple.c]) + AC_CONFIG_AUX_DIR(config) diff --git a/dev-db/postgresql-docs/postgresql-docs-9.0_beta3.ebuild b/dev-db/postgresql-docs/postgresql-docs-9.0_beta3.ebuild new file mode 100644 index 000000000000..81aaf0cc556b --- /dev/null +++ b/dev-db/postgresql-docs/postgresql-docs-9.0_beta3.ebuild @@ -0,0 +1,62 @@ +# Copyright 1999-2010 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: /var/cvsroot/gentoo-x86/dev-db/postgresql-docs/postgresql-docs-9.0_beta3.ebuild,v 1.1 2010/07/14 18:44:36 patrick Exp $ + +EAPI=2 + +inherit versionator autotools + +KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~sparc-fbsd ~x86-fbsd" + +# Nothing to test here per 232157 +RESTRICT="test" + +DESCRIPTION="PostgreSQL documentation" +HOMEPAGE="http://www.postgresql.org/" + +MY_PV=${PV/_/} +SRC_URI="mirror://postgresql/source/v${MY_PV}/postgresql-${MY_PV}.tar.bz2" +S=${WORKDIR}/postgresql-${MY_PV} + +LICENSE="POSTGRESQL" +SLOT="$(get_version_component_range 1-2)" +IUSE="" + +DEPEND="app-text/openjade + app-text/docbook2X + app-text/docbook-sgml + app-text/docbook-sgml-dtd:4.2 + app-text/docbook-xml-dtd:4.2 + app-text/docbook-dsssl-stylesheets + app-text/sgmltools-lite" + +src_prepare() { + epatch "${FILESDIR}/postgresql-${SLOT}-common.3.patch" + eautoconf || die "Failed to eautoconf" +} + +src_compile() { + cd doc + emake html || die +} + +src_install() { + dodir /usr/share/doc/${PF}/html + #tar -zxf "${S}/doc/postgres.tar.gz" -C "${D}/usr/share/doc/${PF}/html" + cd "${S}/doc" + docinto FAQ_html + #dodoc src/FAQ/* # no longer there? + docinto sgml + dodoc src/sgml/*.{sgml,dsl} + docinto sgml/ref + dodoc src/sgml/ref/*.sgml + docinto html + dodoc src/sgml/html/*.html + docinto + dodoc TODO + + dodir /etc/eselect/postgresql/slots/${SLOT} + { + echo "postgres_ebuilds=\"\${postgres_ebuilds} ${PF}\"" + } >"${D}/etc/eselect/postgresql/slots/${SLOT}/docs" +} diff --git a/dev-db/postgresql-server/ChangeLog b/dev-db/postgresql-server/ChangeLog index 06b92641fa9b..4c580b3f22f6 100644 --- a/dev-db/postgresql-server/ChangeLog +++ b/dev-db/postgresql-server/ChangeLog @@ -1,6 +1,13 @@ # ChangeLog for dev-db/postgresql-server # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/dev-db/postgresql-server/ChangeLog,v 1.74 2010/07/13 14:29:32 fauli Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-db/postgresql-server/ChangeLog,v 1.75 2010/07/14 18:41:30 patrick Exp $ + +*postgresql-server-9.0_beta3 (14 Jul 2010) + + 14 Jul 2010; Patrick Lauer + +postgresql-server-9.0_beta3.ebuild, +files/postgresql-9.0-common.3.patch, + +files/postgresql-9.0-server.3.patch: + Bump 13 Jul 2010; Christian Faulhammer postgresql-server-8.4.4-r1.ebuild: diff --git a/dev-db/postgresql-server/files/postgresql-9.0-common.3.patch b/dev-db/postgresql-server/files/postgresql-9.0-common.3.patch new file mode 100644 index 000000000000..ab47b0cb9707 --- /dev/null +++ b/dev-db/postgresql-server/files/postgresql-9.0-common.3.patch @@ -0,0 +1,14 @@ +diff -Naur postgresql-9.0beta3.orig/configure.in postgresql-9.0beta3/configure.in +--- postgresql-9.0beta3.orig/configure.in 2010-07-08 22:43:12.000000000 -0400 ++++ postgresql-9.0beta3/configure.in 2010-07-12 00:13:37.585527031 -0400 +@@ -19,10 +19,6 @@ + + AC_INIT([PostgreSQL], [9.0beta3], [pgsql-bugs@postgresql.org]) + +-m4_if(m4_defn([m4_PACKAGE_VERSION]), [2.63], [], [m4_fatal([Autoconf version 2.63 is required. +-Untested combinations of 'autoconf' and PostgreSQL versions are not +-recommended. You can remove the check from 'configure.in' but it is then +-your responsibility whether the result works or not.])]) + AC_COPYRIGHT([Copyright (c) 1996-2010, PostgreSQL Global Development Group]) + AC_CONFIG_SRCDIR([src/backend/access/common/heaptuple.c]) + AC_CONFIG_AUX_DIR(config) diff --git a/dev-db/postgresql-server/files/postgresql-9.0-server.3.patch b/dev-db/postgresql-server/files/postgresql-9.0-server.3.patch new file mode 100644 index 000000000000..ab01e047a606 --- /dev/null +++ b/dev-db/postgresql-server/files/postgresql-9.0-server.3.patch @@ -0,0 +1,213 @@ +diff -Naur postgresql-9.0beta3.orig/contrib/adminpack/Makefile postgresql-9.0beta3/contrib/adminpack/Makefile +--- postgresql-9.0beta3.orig/contrib/adminpack/Makefile 2007-11-10 18:59:50.000000000 -0500 ++++ postgresql-9.0beta3/contrib/adminpack/Makefile 2010-07-12 08:41:54.894528045 -0400 +@@ -1,7 +1,7 @@ + # $PostgreSQL: pgsql/contrib/adminpack/Makefile,v 1.6 2007/11/10 23:59:50 momjian Exp $ + + MODULE_big = adminpack +-PG_CPPFLAGS = -I$(libpq_srcdir) ++PG_CPPFLAGS = -I$(libpq_srcdir) -I../../src/include/ + DATA_built = adminpack.sql + DATA = uninstall_adminpack.sql + OBJS = adminpack.o +diff -Naur postgresql-9.0beta3.orig/contrib/dblink/Makefile postgresql-9.0beta3/contrib/dblink/Makefile +--- postgresql-9.0beta3.orig/contrib/dblink/Makefile 2007-11-10 18:59:50.000000000 -0500 ++++ postgresql-9.0beta3/contrib/dblink/Makefile 2010-07-12 08:41:54.894528045 -0400 +@@ -1,7 +1,7 @@ + # $PostgreSQL: pgsql/contrib/dblink/Makefile,v 1.15 2007/11/10 23:59:50 momjian Exp $ + + MODULE_big = dblink +-PG_CPPFLAGS = -I$(libpq_srcdir) ++PG_CPPFLAGS = -I$(libpq_srcdir) -I../../src/include/ + OBJS = dblink.o + SHLIB_LINK = $(libpq) + +diff -Naur postgresql-9.0beta3.orig/contrib/Makefile postgresql-9.0beta3/contrib/Makefile +--- postgresql-9.0beta3.orig/contrib/Makefile 2010-06-14 12:17:56.000000000 -0400 ++++ postgresql-9.0beta3/contrib/Makefile 2010-07-12 08:41:54.895528185 -0400 +@@ -23,18 +23,13 @@ + isn \ + lo \ + ltree \ +- oid2name \ + pageinspect \ +- passwordcheck \ + pg_archivecleanup \ + pg_buffercache \ + pg_freespacemap \ + pg_standby \ + pg_stat_statements \ + pg_trgm \ +- pg_upgrade \ +- pg_upgrade_support \ +- pgbench \ + pgcrypto \ + pgrowlocks \ + pgstattuple \ +@@ -42,9 +37,7 @@ + spi \ + tablefunc \ + test_parser \ +- tsearch2 \ +- unaccent \ +- vacuumlo ++ tsearch2 + + ifeq ($(with_openssl),yes) + SUBDIRS += sslinfo +diff -Naur postgresql-9.0beta3.orig/contrib/uuid-ossp/Makefile postgresql-9.0beta3/contrib/uuid-ossp/Makefile +--- postgresql-9.0beta3.orig/contrib/uuid-ossp/Makefile 2007-11-12 19:13:19.000000000 -0500 ++++ postgresql-9.0beta3/contrib/uuid-ossp/Makefile 2010-07-12 08:41:54.895528185 -0400 +@@ -1,11 +1,13 @@ + # $PostgreSQL: pgsql/contrib/uuid-ossp/Makefile,v 1.4 2007/11/13 00:13:19 tgl Exp $ + ++PG_CPPFLAGS += "-DHAVE_OSSP_UUID_H" ++ + MODULE_big = uuid-ossp + OBJS = uuid-ossp.o + DATA_built = uuid-ossp.sql + DATA = uninstall_uuid-ossp.sql + +-SHLIB_LINK += $(OSSP_UUID_LIBS) ++SHLIB_LINK += -lossp-uuid + + ifdef USE_PGXS + PG_CONFIG = pg_config +diff -Naur postgresql-9.0beta3.orig/contrib/xml2/Makefile postgresql-9.0beta3/contrib/xml2/Makefile +--- postgresql-9.0beta3.orig/contrib/xml2/Makefile 2010-03-01 13:07:59.000000000 -0500 ++++ postgresql-9.0beta3/contrib/xml2/Makefile 2010-07-12 08:41:54.895528185 -0400 +@@ -4,7 +4,8 @@ + + OBJS = xpath.o xslt_proc.o + +-SHLIB_LINK += $(filter -lxslt, $(LIBS)) $(filter -lxml2, $(LIBS)) ++PG_CPPFLAGS = $(shell xml2-config --cflags) ++SHLIB_LINK += $(shell xml2-config --libs) $(shell xslt-config --libs) + + DATA_built = pgxml.sql + DATA = uninstall_pgxml.sql +diff -Naur postgresql-9.0beta3.orig/GNUmakefile.in postgresql-9.0beta3/GNUmakefile.in +--- postgresql-9.0beta3.orig/GNUmakefile.in 2010-03-29 20:10:46.000000000 -0400 ++++ postgresql-9.0beta3/GNUmakefile.in 2010-07-12 08:41:54.895528185 -0400 +@@ -10,7 +10,6 @@ + + all: + $(MAKE) -C src all +- $(MAKE) -C config all + @echo "All of PostgreSQL successfully made. Ready to install." + + docs: +@@ -28,7 +27,6 @@ + + install: + $(MAKE) -C src $@ +- $(MAKE) -C config $@ + @echo "PostgreSQL installation complete." + + install-docs: +@@ -44,7 +42,6 @@ + installdirs uninstall coverage: + $(MAKE) -C doc $@ + $(MAKE) -C src $@ +- $(MAKE) -C config $@ + + distprep: + $(MAKE) -C doc $@ +diff -Naur postgresql-9.0beta3.orig/src/bin/initdb/Makefile postgresql-9.0beta3/src/bin/initdb/Makefile +--- postgresql-9.0beta3.orig/src/bin/initdb/Makefile 2010-07-05 14:54:37.000000000 -0400 ++++ postgresql-9.0beta3/src/bin/initdb/Makefile 2010-07-12 08:41:54.895528185 -0400 +@@ -16,7 +16,7 @@ + top_builddir = ../../.. + include $(top_builddir)/src/Makefile.global + +-override CPPFLAGS := -DFRONTEND -I$(libpq_srcdir) $(CPPFLAGS) ++override CPPFLAGS := -DFRONTEND -I$(top_srcdir)/src/interfaces/libpq $(CPPFLAGS) + + OBJS= initdb.o encnames.o pqsignal.o $(WIN32RES) + +diff -Naur postgresql-9.0beta3.orig/src/bin/Makefile postgresql-9.0beta3/src/bin/Makefile +--- postgresql-9.0beta3.orig/src/bin/Makefile 2010-01-02 11:57:58.000000000 -0500 ++++ postgresql-9.0beta3/src/bin/Makefile 2010-07-12 08:41:54.896527913 -0400 +@@ -13,8 +13,8 @@ + top_builddir = ../.. + include $(top_builddir)/src/Makefile.global + +-SUBDIRS = initdb pg_ctl pg_dump \ +- psql scripts pg_config pg_controldata pg_resetxlog ++SUBDIRS = initdb pg_ctl \ ++ pg_controldata pg_resetxlog + ifeq ($(PORTNAME), win32) + SUBDIRS+=pgevent + endif +diff -Naur postgresql-9.0beta3.orig/src/include/pg_config_manual.h postgresql-9.0beta3/src/include/pg_config_manual.h +--- postgresql-9.0beta3.orig/src/include/pg_config_manual.h 2010-01-06 23:53:35.000000000 -0500 ++++ postgresql-9.0beta3/src/include/pg_config_manual.h 2010-07-12 08:41:54.896527913 -0400 +@@ -141,7 +141,7 @@ + * here's where to twiddle it. You can also override this at runtime + * with the postmaster's -k switch. + */ +-#define DEFAULT_PGSOCKET_DIR "/tmp" ++#define DEFAULT_PGSOCKET_DIR "/var/run/postgresql" + + /* + * The random() function is expected to yield values between 0 and +diff -Naur postgresql-9.0beta3.orig/src/Makefile postgresql-9.0beta3/src/Makefile +--- postgresql-9.0beta3.orig/src/Makefile 2010-01-20 04:16:23.000000000 -0500 ++++ postgresql-9.0beta3/src/Makefile 2010-07-12 08:41:54.896527913 -0400 +@@ -19,15 +19,11 @@ + $(MAKE) -C backend $@ + $(MAKE) -C backend/utils/mb/conversion_procs $@ + $(MAKE) -C backend/snowball $@ +- $(MAKE) -C include $@ +- $(MAKE) -C interfaces $@ +- $(MAKE) -C backend/replication/libpqwalreceiver $@ + $(MAKE) -C bin $@ + $(MAKE) -C pl $@ +- $(MAKE) -C makefiles $@ + $(MAKE) -C test/regress $@ + +-install: install-local ++install: + + install-local: installdirs-local + $(INSTALL_DATA) Makefile.global '$(DESTDIR)$(pgxsdir)/$(subdir)/Makefile.global' +diff -Naur postgresql-9.0beta3.orig/src/Makefile.global.in postgresql-9.0beta3/src/Makefile.global.in +--- postgresql-9.0beta3.orig/src/Makefile.global.in 2010-07-06 18:03:05.000000000 -0400 ++++ postgresql-9.0beta3/src/Makefile.global.in 2010-07-12 08:41:54.897527811 -0400 +@@ -458,6 +458,7 @@ + LDFLAGS += $(PROFILE) + endif + ++CFLAGS += -I${top_srcdir}/src/include + + ########################################################################## + # +diff -Naur postgresql-9.0beta3.orig/src/port/Makefile postgresql-9.0beta3/src/port/Makefile +--- postgresql-9.0beta3.orig/src/port/Makefile 2010-07-02 13:03:30.000000000 -0400 ++++ postgresql-9.0beta3/src/port/Makefile 2010-07-12 08:41:54.898529044 -0400 +@@ -39,11 +39,10 @@ + # foo_srv.o and foo.o are both built from foo.c, but only foo.o has -DFRONTEND + OBJS_SRV = $(OBJS:%.o=%_srv.o) + +-all: libpgport.a libpgport_srv.a ++all: libpgport_srv.a + + # libpgport is needed by some contrib +-install: all installdirs +- $(INSTALL_STLIB) libpgport.a '$(DESTDIR)$(libdir)/libpgport.a' ++install: + + installdirs: + $(MKDIR_P) '$(DESTDIR)$(libdir)' +diff -Naur postgresql-9.0beta3.orig/src/test/regress/GNUmakefile postgresql-9.0beta3/src/test/regress/GNUmakefile +--- postgresql-9.0beta3.orig/src/test/regress/GNUmakefile 2010-07-05 14:54:38.000000000 -0400 ++++ postgresql-9.0beta3/src/test/regress/GNUmakefile 2010-07-12 08:41:54.898529044 -0400 +@@ -141,7 +141,7 @@ + pg_regress_call = ./pg_regress --inputdir=$(srcdir) --dlpath=. --multibyte=$(MULTIBYTE) $(NOLOCALE) + + check: all +- $(pg_regress_call) --temp-install=./tmp_check --top-builddir=$(top_builddir) --schedule=$(srcdir)/parallel_schedule $(MAXCONNOPT) $(TEMP_CONF) ++ $(pg_regress_call) --temp-install=./tmp_check --top-builddir=$(top_builddir) --schedule=$(srcdir)/parallel_schedule $(MAXCONNOPT) $(TEMP_CONF) --psqldir=/usr/lib/postgresql-${SLOT}/bin/ + + installcheck: all + $(pg_regress_call) --psqldir=$(PSQLDIR) --schedule=$(srcdir)/serial_schedule diff --git a/dev-db/postgresql-server/postgresql-server-9.0_beta3.ebuild b/dev-db/postgresql-server/postgresql-server-9.0_beta3.ebuild new file mode 100644 index 000000000000..a383fe85701b --- /dev/null +++ b/dev-db/postgresql-server/postgresql-server-9.0_beta3.ebuild @@ -0,0 +1,289 @@ +# Copyright 1999-2010 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: /var/cvsroot/gentoo-x86/dev-db/postgresql-server/postgresql-server-9.0_beta3.ebuild,v 1.1 2010/07/14 18:41:30 patrick Exp $ + +EAPI="2" +PYTHON_DEPEND="python? 2" + +# weird test failures. +RESTRICT="test" + +WANT_AUTOMAKE="none" +inherit autotools eutils multilib python versionator + +KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86 ~x86-fbsd" + +DESCRIPTION="PostgreSQL server" +HOMEPAGE="http://www.postgresql.org/" + +MY_PV=${PV/_/} +SRC_URI="mirror://postgresql/source/v${MY_PV}/postgresql-${MY_PV}.tar.bz2" +S=${WORKDIR}/postgresql-${MY_PV} + +LICENSE="POSTGRESQL" +SLOT="$(get_version_component_range 1-2)" +IUSE_LINGUAS=" + linguas_af linguas_cs linguas_de linguas_es linguas_fa linguas_fr + linguas_hr linguas_hu linguas_it linguas_ko linguas_nb linguas_pl + linguas_pt_BR linguas_ro linguas_ru linguas_sk linguas_sl linguas_sv + linguas_tr linguas_zh_CN linguas_zh_TW" +IUSE="pg_legacytimestamp doc perl python selinux tcl uuid xml nls kernel_linux ${IUSE_LINGUAS}" + +wanted_languages() { + for u in ${IUSE_LINGUAS} ; do + use $u && echo -n "${u#linguas_} " + done +} + +RDEPEND="~dev-db/postgresql-base-${PV}:${SLOT}[pg_legacytimestamp=] + perl? ( >=dev-lang/perl-5.6.1-r2 ) + python? ( dev-python/egenix-mx-base ) + selinux? ( sec-policy/selinux-postgresql ) + tcl? ( >=dev-lang/tcl-8 ) + uuid? ( dev-libs/ossp-uuid ) + xml? ( dev-libs/libxml2 dev-libs/libxslt )" +DEPEND="${RDEPEND} + sys-devel/flex + xml? ( dev-util/pkgconfig )" +PDEPEND="doc? ( ~dev-db/postgresql-docs-${PV} )" + +pkg_setup() { + enewgroup postgres 70 + enewuser postgres 70 /bin/bash /var/lib/postgresql postgres + + if use python; then + python_set_active_version 2 + fi +} + +src_prepare() { + epatch "${FILESDIR}/postgresql-${SLOT}-common.3.patch" \ + "${FILESDIR}/postgresql-${SLOT}-server.3.patch" + + if use test; then + sed -e "s|/no/such/location|${S}/src/test/regress/tmp_check/no/such/location|g" -i src/test/regress/{input,output}/tablespace.source + else + echo "all install:" > "${S}/src/test/regress/GNUmakefile" + fi + + eautoconf +} + +src_configure() { + # TODO: test if PPC really cannot work with other CFLAGS settings + # use ppc && CFLAGS="-pipe -fsigned-char" + + # eval is needed to get along with pg_config quotation of space-rich entities. + eval econf "$(/usr/$(get_libdir)/postgresql-${SLOT}/bin/pg_config --configure)" \ + --disable-thread-safety \ + $(use_with perl) \ + $(use_with python) \ + $(use_with tcl) \ + $(use_with xml libxml) \ + $(use_with xml libxslt) \ + $(use_with uuid ossp-uuid) \ + --with-system-tzdata="/usr/share/zoneinfo" \ + --with-includes="/usr/include/postgresql-${SLOT}/" \ + --with-libraries="/usr/$(get_libdir)/postgresql-${SLOT}/$(get_libdir)" \ + "$(has_version ~dev-db/postgresql-base-${PV}[nls] && use_enable nls nls "$(wanted_languages)")" +} + +src_compile() { + local bd + for bd in . contrib $(use xml && echo contrib/xml2); do + PATH="/usr/$(get_libdir)/postgresql-${SLOT}/bin:${PATH}" \ + emake -C $bd -j1 || die "emake in $bd failed" + done +} + +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 + + for bd in . contrib $(use xml && echo contrib/xml2) ; do + PATH="/usr/$(get_libdir)/postgresql-${SLOT}/bin:${PATH}" \ + emake install -C $bd -j1 DESTDIR="${D}" || die "emake install in $bd failed" + done + + rm -rf "${D}/usr/share/postgresql-${SLOT}/man/man7/" "${D}/usr/share/doc/postgresql-${SLOT}/html" + rm "${D}"/usr/share/postgresql-${SLOT}/man/man1/{clusterdb,create{db,lang,user},drop{db,lang,user},ecpg,pg_{config,dump,dumpall,restore},psql,reindexdb,vacuumdb}.1 + + dodoc README HISTORY doc/{README.*,TODO,bug.template} + + dodir /etc/eselect/postgresql/slots/${SLOT} + cat >"${D}/etc/eselect/postgresql/slots/${SLOT}/service" <<-__EOF__ + postgres_ebuilds="\${postgres_ebuilds} ${PF}" + postgres_service="postgresql-${SLOT}" + __EOF__ + + newinitd "${FILESDIR}/postgresql.init-${SLOT}-r1" postgresql-${SLOT} || die "Inserting init.d-file failed" + newconfd "${FILESDIR}/postgresql.conf-${SLOT}-r1" postgresql-${SLOT} || die "Inserting conf.d-file failed" + + keepdir /var/run/postgresql + fperms 0770 /var/run/postgresql + fowners postgres:postgres /var/run/postgresql +} + +pkg_postinst() { + eselect postgresql update + [[ "$(eselect postgresql show)" = "(none)" ]] && eselect postgresql set ${SLOT} + [[ "$(eselect postgresql show-service)" = "(none)" ]] && eselect postgresql set-service ${SLOT} + + ewarn "Please note that the standard location of the socket has changed from /tmp to" + ewarn "/var/run/postgresql and you have to be in the 'postgres' group to access the" + ewarn "socket. This can break applications which have the standard location" + ewarn "hard-coded. If such an application links against the libpq, please reemerge" + ewarn "it. If that doesn't help or the application accesses the socket without using" + ewarn "libpq, please file a bug-report." + ewarn + ewarn "You can set PGOPTS='-k /tmp' in /etc/conf.d/postgresql-${SLOT} to restore the" + ewarn "original location." + ewarn + + elog "The PostgreSQL community has called for more testers of the upcoming 9.0" + elog "release. This beta version of the PostgreSQL server, while moved to ~arch, will" + elog "never be marked stable. As such, you may not want to use this package in an" + elog "environment where incompatible changes are unacceptable. Bear in mind, though," + elog "that these packages are slotted and that you may run multiple server instances" + elog "simultaneously without conflict." + elog + + elog "Before initializing the database, you may want to edit PG_INITDB_OPTS so that it" + elog "contains your preferred locale and character encoding in:" + elog + elog " /etc/conf.d/postgresql-${SLOT}" + elog + elog "Then, execute the following command to setup the initial database environment:" + elog + elog " emerge --config =${CATEGORY}/${PF}" + elog + elog "The autovacuum function, which was in contrib, has been moved to the main" + elog "PostgreSQL functions starting with 8.1, and starting with 8.4 is now enabled by" + elog "default. You can disable it in the cluster's postgresql.conf." + elog + elog "The timestamp format is 64 bit integers now. If you upgrade from older" + elog "databases, this may force you to either do a dump and reload or enable" + elog "pg_legacytimestamp until you find time to do so. If the database can't start" + elog "please try enabling pg_legacytimestamp and rebuild." +} + +pkg_postrm() { + eselect postgresql update +} + +pkg_config() { + [[ -f /etc/conf.d/postgresql-${SLOT} ]] && source /etc/conf.d/postgresql-${SLOT} + [[ -z "${PGDATA}" ]] && PGDATA="/var/lib/postgresql/${SLOT}/data" + + # environment.bz2 may not contain the same locale as the current system + # locale. Unset and source from the current system locale. + if [ -f /etc/env.d/02locale ]; then + unset LANG + unset LC_CTYPE + unset LC_NUMERIC + unset LC_TIME + unset LC_COLLATE + unset LC_MONETARY + unset LC_MESSAGES + unset LC_ALL + source /etc/env.d/02locale + [ -n "${LANG}" ] && export LANG + [ -n "${LC_CTYPE}" ] && export LC_CTYPE + [ -n "${LC_NUMERIC}" ] && export LC_NUMERIC + [ -n "${LC_TIME}" ] && export LC_TIME + [ -n "${LC_COLLATE}" ] && export LC_COLLATE + [ -n "${LC_MONETARY}" ] && export LC_MONETARY + [ -n "${LC_MESSAGES}" ] && export LC_MESSAGES + [ -n "${LC_ALL}" ] && export LC_ALL + fi + + einfo "You can pass options to initdb by setting the PG_INITDB_OPTS variable." + einfo "More information can be found here:" + einfo " http://www.postgresql.org/docs/${SLOT}/static/creating-cluster.html" + einfo " http://www.postgresql.org/docs/${SLOT}/static/app-initdb.html" + einfo "Simply add the options you would have added to initdb to the PG_INITDB_OPTS" + einfo "variable." + einfo + einfo "You can change the directory where the database cluster is being created by" + einfo "setting the PGDATA variable." + einfo + einfo "PG_INITDB_OPTS is currently set to:" + einfo " \"${PG_INITDB_OPTS}\"" + einfo "and the database cluster will be created in:" + einfo " \"${PGDATA}\"" + einfo "Are you ready to continue? (Y/n)" + read answer + [ -z $answer ] && answer=Y + [ "$answer" == "Y" ] || [ "$answer" == "y" ] || die "aborted" + + if [[ -f "${PGDATA}/PG_VERSION" ]] ; then + eerror "The given directory \"${PGDATA}\" already contains a database cluster." + die "cluster already exists" + fi + + [ -z "${PG_MAX_CONNECTIONS}" ] && PG_MAX_CONNECTIONS="128" + einfo "Checking system parameters..." + + if ! use kernel_linux ; then + SKIP_SYSTEM_TESTS=yes + einfo " Tests not supported on this OS (yet)" + fi + + if [ -z ${SKIP_SYSTEM_TESTS} ] ; then + einfo "Checking whether your system supports at least ${PG_MAX_CONNECTIONS} connections..." + + local SEMMSL=$(sysctl -n kernel.sem | cut -f1) + local SEMMNS=$(sysctl -n kernel.sem | cut -f2) + local SEMMNI=$(sysctl -n kernel.sem | cut -f4) + local SHMMAX=$(sysctl -n kernel.shmmax) + + local SEMMSL_MIN=17 + local SEMMNS_MIN=$(( ( ${PG_MAX_CONNECTIONS}/16 ) * 17 )) + local SEMMNI_MIN=$(( ( ${PG_MAX_CONNECTIONS}+15 ) / 16 )) + local SHMMAX_MIN=$(( 500000 + ( 30600 * ${PG_MAX_CONNECTIONS} ) )) + + for p in SEMMSL SEMMNS SEMMNI SHMMAX ; do + if [ $(eval echo \$$p) -lt $(eval echo \$${p}_MIN) ] ; then + eerror "The value for ${p} $(eval echo \$$p) is below the recommended value $(eval echo \$${p}_MIN)" + eerror "You have now several options:" + eerror " - Change the mentioned system parameter" + eerror " - Lower the number of max.connections by setting PG_MAX_CONNECTIONS to a value lower than ${PG_MAX_CONNECTIONS}" + eerror " - Set SKIP_SYSTEM_TESTS in case you want to ignore this test completely" + eerror "More information can be found here:" + eerror " http://www.postgresql.org/docs/${SLOT}/static/kernel-resources.html" + die "System test failed." + fi + done + einfo "Passed." + else + einfo "Skipped." + fi + + einfo "Creating the data directory ..." + mkdir -p "${PGDATA}" + chown -Rf postgres:postgres "${PGDATA}" + chmod 0700 "${PGDATA}" + + einfo "Initializing the database ..." + + su postgres -c "/usr/$(get_libdir)/postgresql-${SLOT}/bin/initdb --pgdata \"${PGDATA}\" ${PG_INITDB_OPTS}" + + einfo + einfo "You can use the '${ROOT}/etc/init.d/postgresql-${SLOT}' script to run PostgreSQL" + einfo "instead of 'pg_ctl'." + einfo +} + +src_test() { + einfo ">>> Test phase [check]: ${CATEGORY}/${PF}" + PATH="/usr/$(get_libdir)/postgresql-${SLOT}/bin:${PATH}" \ + emake -j1 check || die "Make check failed. See above for details." + + 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. If you think other tests are" + einfo "necessary, please submit a bug including a patch for this ebuild to enable them." +} -- 2.26.2