diff options
author | Aaron W. Swenson <titanofold@gentoo.org> | 2011-03-20 03:30:35 +0000 |
---|---|---|
committer | Aaron W. Swenson <titanofold@gentoo.org> | 2011-03-20 03:30:35 +0000 |
commit | 623e37d33c88ec453b02be8673f8b5f1002257f5 (patch) | |
tree | 6b25afc91a0e629561b22b5fc4a7848b3f33e04f /dev-db | |
parent | EOL'd upstream. (diff) | |
download | gentoo-2-623e37d33c88ec453b02be8673f8b5f1002257f5.tar.gz gentoo-2-623e37d33c88ec453b02be8673f8b5f1002257f5.tar.bz2 gentoo-2-623e37d33c88ec453b02be8673f8b5f1002257f5.zip |
EOL'd upstream
(Portage version: 2.1.9.42/cvs/Linux i686)
Diffstat (limited to 'dev-db')
-rw-r--r-- | dev-db/postgresql-base/ChangeLog | 7 | ||||
-rw-r--r-- | dev-db/postgresql-base/files/postgresql-8.1-base.patch | 132 | ||||
-rw-r--r-- | dev-db/postgresql-base/files/postgresql-8.1-common.patch | 74 | ||||
-rw-r--r-- | dev-db/postgresql-base/postgresql-base-8.1.22.ebuild | 144 | ||||
-rw-r--r-- | dev-db/postgresql-base/postgresql-base-8.1.23.ebuild | 144 |
5 files changed, 6 insertions, 495 deletions
diff --git a/dev-db/postgresql-base/ChangeLog b/dev-db/postgresql-base/ChangeLog index 9cc4039e294d..5642eea8da08 100644 --- a/dev-db/postgresql-base/ChangeLog +++ b/dev-db/postgresql-base/ChangeLog @@ -1,6 +1,11 @@ # ChangeLog for dev-db/postgresql-base # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/dev-db/postgresql-base/ChangeLog,v 1.106 2011/03/06 17:49:40 armin76 Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-db/postgresql-base/ChangeLog,v 1.107 2011/03/20 03:30:35 titanofold Exp $ + + 20 Mar 2011; Mr. Aaron W. Swenson (TitanOfOld) <titan@gentoo.org> + -postgresql-base-8.1.22.ebuild, -postgresql-base-8.1.23.ebuild, + -files/postgresql-8.1-base.patch, -files/postgresql-8.1-common.patch: + EOL'd upstream 06 Mar 2011; Raúl Porcel <armin76@gentoo.org> postgresql-base-8.2.20.ebuild, postgresql-base-8.3.14.ebuild, postgresql-base-8.4.7.ebuild, diff --git a/dev-db/postgresql-base/files/postgresql-8.1-base.patch b/dev-db/postgresql-base/files/postgresql-8.1-base.patch deleted file mode 100644 index d84514f285a1..000000000000 --- a/dev-db/postgresql-base/files/postgresql-8.1-base.patch +++ /dev/null @@ -1,132 +0,0 @@ -=== contrib/Makefile -================================================================== ---- contrib/Makefile (revision 10) -+++ contrib/Makefile (local) -@@ -5,32 +5,8 @@ - include $(top_builddir)/src/Makefile.global - - WANTED_DIRS = \ -- btree_gist \ -- chkpass \ -- cube \ -- dbase \ -- dblink \ -- dbmirror \ -- earthdistance \ -- fulltextindex \ -- fuzzystrmatch \ -- intagg \ -- intarray \ -- isbn_issn \ -- lo \ -- ltree \ - oid2name \ -- pg_buffercache \ -- pg_trgm \ - pgbench \ -- pgcrypto \ -- pgstattuple \ -- seg \ -- spi \ -- tablefunc \ -- tips \ -- tsearch2 \ -- userlock \ - vacuumlo - - # Missing: -=== src/Makefile -================================================================== ---- src/Makefile (revision 10) -+++ src/Makefile (local) -@@ -15,15 +15,11 @@ - - all install installdirs uninstall dep depend distprep: - $(MAKE) -C port $@ -- $(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 utils $@ - - install: install-local - -=== src/backend/Makefile -================================================================== ---- src/backend/Makefile (revision 10) -+++ src/backend/Makefile (local) -@@ -34,7 +34,7 @@ - - ########################################################################## - --all: submake-libpgport postgres $(POSTGRES_IMP) -+all: someheaders - - ifneq ($(PORTNAME), cygwin) - ifneq ($(PORTNAME), win32) -@@ -106,8 +106,7 @@ - - .PHONY: $(DIRS:%=%-recursive) - # Update the commonly used headers before building the subdirectories --$(DIRS:%=%-recursive): $(top_builddir)/src/include/parser/parse.h $(top_builddir)/src/include/utils/fmgroids.h -- $(MAKE) -C $(subst -recursive,,$@) all -+someheaders $(DIRS:%=%-recursive): $(top_builddir)/src/include/parser/parse.h $(top_builddir)/src/include/utils/fmgroids.h - - - $(DLLINIT): $(DLLINIT:%.o=%.c) -@@ -153,22 +152,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 -- $(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) -=== src/bin/Makefile -================================================================== ---- src/bin/Makefile (revision 10) -+++ src/bin/Makefile (local) -@@ -13,8 +13,8 @@ - top_builddir = ../.. - include $(top_builddir)/src/Makefile.global - --DIRS := initdb ipcclean pg_ctl pg_dump \ -- psql scripts pg_config pg_controldata pg_resetxlog -+DIRS := pg_dump \ -+ psql scripts pg_config - ifeq ($(PORTNAME), win32) - DIRS+=pgevent - endif -=== src/include/pg_config_manual.h -================================================================== ---- src/include/pg_config_manual.h (revision 10) -+++ src/include/pg_config_manual.h (local) -@@ -175,7 +175,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 --git a/dev-db/postgresql-base/files/postgresql-8.1-common.patch b/dev-db/postgresql-base/files/postgresql-8.1-common.patch deleted file mode 100644 index 56704f0c5afa..000000000000 --- a/dev-db/postgresql-base/files/postgresql-8.1-common.patch +++ /dev/null @@ -1,74 +0,0 @@ -diff --git a/config/programs.m4 b/config/programs.m4 -index 3f87396..9c7fbf0 100644 ---- a/config/programs.m4 -+++ b/config/programs.m4 -@@ -153,13 +153,13 @@ AC_DEFUN([PGAC_CHECK_GETTEXT], - dnl FIXME: We should probably check for version >=0.10.36. - AC_CHECK_PROGS(XGETTEXT, xgettext) - -- # Note: share/locale is always the default, independent of $datadir -- localedir='${prefix}/share/locale' -- if test x"$prefix" = x"NONE"; then -- exp_localedir="$ac_default_prefix/share/locale" -- else -- exp_localedir="$prefix/share/locale" -- fi -+ # Note: share/locale *WAS* always the default, independent of $datadir -+ AC_ARG_WITH([locale-dir], -+ AC_HELP_STRING([--with-locale-dir],[Set path to locale files]), -+ [ localedir="${withval}" ], -+ [ localedir='${prefix}/share/locale' ] -+ ) -+ exp_localedir="${localedir}" - - AC_SUBST(localedir) - AC_DEFINE_UNQUOTED(LOCALEDIR, ["$exp_localedir"], -diff --git a/configure.in b/configure.in -index d071f00..b203648 100644 ---- a/configure.in -+++ b/configure.in -@@ -19,10 +19,6 @@ m4_pattern_forbid(^PGAC_)dnl to catch undefined macros - - AC_INIT([PostgreSQL], [8.1.11], [pgsql-bugs@postgresql.org]) - --m4_if(m4_defn([m4_PACKAGE_VERSION]), [2.59], [], [m4_fatal([Autoconf version 2.59 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-2005, PostgreSQL Global Development Group]) - AC_CONFIG_SRCDIR([src/backend/access/common/heaptuple.c]) - AC_CONFIG_AUX_DIR(config) -diff --git a/src/include/storage/s_lock.h b/src/include/storage/s_lock.h -index c5731fd..8ec70b4 100644 ---- a/src/include/storage/s_lock.h -+++ b/src/include/storage/s_lock.h -@@ -299,6 +299,29 @@ tas(volatile slock_t *lock) - - #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__) - #define HAS_TEST_AND_SET diff --git a/dev-db/postgresql-base/postgresql-base-8.1.22.ebuild b/dev-db/postgresql-base/postgresql-base-8.1.22.ebuild deleted file mode 100644 index be24433bee65..000000000000 --- a/dev-db/postgresql-base/postgresql-base-8.1.22.ebuild +++ /dev/null @@ -1,144 +0,0 @@ -# Copyright 1999-2011 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/dev-db/postgresql-base/postgresql-base-8.1.22.ebuild,v 1.8 2011/01/08 12:54:03 armin76 Exp $ - -EAPI="2" - -WANT_AUTOMAKE="none" - -inherit eutils multilib versionator autotools - -KEYWORDS="alpha amd64 arm hppa ia64 ppc s390 sh sparc x86" - -DESCRIPTION="PostgreSQL libraries and clients" -HOMEPAGE="http://www.postgresql.org/" -SRC_URI="mirror://postgresql/source/v${PV}/postgresql-${PV}.tar.bz2" -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 pg-intdatetime readline ssl threads zlib ${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" -DEPEND="${RDEPEND} - sys-devel/flex - >=sys-devel/bison-1.875 - nls? ( sys-devel/gettext )" -PDEPEND="doc? ( ~dev-db/postgresql-docs-${PV} )" - -S="${WORKDIR}/postgresql-${PV}" - -src_prepare() { - - epatch "${FILESDIR}/postgresql-${SLOT}-common.patch" \ - "${FILESDIR}/postgresql-${SLOT}-base.patch" \ - "${FILESDIR}/postgresql-8.x-relax_ssl_perms.patch" - - # to avoid collision - it only should be installed by server - rm "${S}/src/backend/nls.mk" - - # because psql/help.c includes the file - ln -s "${S}/src/include/libpq/pqsignal.h" "${S}/src/bin/psql/" - - eautoconf -} - -src_configure() { - export LDFLAGS_SL="${LDFLAGS}" - econf --prefix=/usr/$(get_libdir)/postgresql-${SLOT} \ - --datadir=/usr/share/postgresql-${SLOT} \ - --sysconfdir=/etc/postgresql-${SLOT} \ - --includedir=/usr/include/postgresql-${SLOT} \ - --with-locale-dir=/usr/share/postgresql-${SLOT}/locale \ - --mandir=/usr/share/postgresql-${SLOT}/man \ - --without-docdir \ - --without-tcl \ - --without-perl \ - --without-python \ - $(use_with kerberos krb5) \ - "$(use_enable nls nls "$(wanted_languages)")" \ - $(use_with pam) \ - $(use_enable pg-intdatetime integer-datetimes ) \ - $(use_with readline) \ - $(use_with ssl openssl) \ - $(use_enable threads thread-safety) \ - $(use_with zlib) \ - || die "configure failed" -} - -src_compile() { - emake || die "emake failed" - - cd "${S}/contrib" - emake || die "emake failed" -} - -src_install() { - emake DESTDIR="${D}" install || die "emake install failed" - insinto /usr/include/postgresql-${SLOT}/postmaster - doins "${S}"/src/include/postmaster/*.h - dodir /usr/share/postgresql-${SLOT}/man/man1 - tar -zxf "${S}/doc/man.tar.gz" -C "${D}"/usr/share/postgresql-${SLOT}/man man1/{ecpg,pg_config}.1 - - rm "${D}/usr/share/postgresql-${SLOT}/man/man1"/{initdb,ipcclean,pg_controldata,pg_ctl,pg_resetxlog,pg_restore,postgres,postmaster}.1 - dodoc README HISTORY doc/{README.*,TODO,bug.template} - - cd "${S}/contrib" - emake DESTDIR="${D}" install || die "emake install failed" - cd "${S}" - - dodir /etc/eselect/postgresql/slots/${SLOT} - - IDIR="/usr/include/postgresql-${SLOT}" - cat > "${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-96-${SLOT}" <<-__EOF__ - LDPATH=/usr/$(get_libdir)/postgresql-${SLOT}/$(get_libdir) - MANPATH=/usr/share/postgresql-${SLOT}/man - __EOF__ - doenvd "${T}/50postgresql-96-${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 '${ROOT}/etc/postgresql-${SLOT}/'." -} - -pkg_postrm() { - eselect postgresql update -} diff --git a/dev-db/postgresql-base/postgresql-base-8.1.23.ebuild b/dev-db/postgresql-base/postgresql-base-8.1.23.ebuild deleted file mode 100644 index fbd612c8583f..000000000000 --- a/dev-db/postgresql-base/postgresql-base-8.1.23.ebuild +++ /dev/null @@ -1,144 +0,0 @@ -# Copyright 1999-2011 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/dev-db/postgresql-base/postgresql-base-8.1.23.ebuild,v 1.1 2011/01/06 12:23:35 patrick Exp $ - -EAPI="2" - -WANT_AUTOMAKE="none" - -inherit eutils multilib versionator autotools - -KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~s390 ~sh ~sparc ~x86" - -DESCRIPTION="PostgreSQL libraries and clients" -HOMEPAGE="http://www.postgresql.org/" -SRC_URI="mirror://postgresql/source/v${PV}/postgresql-${PV}.tar.bz2" -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 pg-intdatetime readline ssl threads zlib ${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" -DEPEND="${RDEPEND} - sys-devel/flex - >=sys-devel/bison-1.875 - nls? ( sys-devel/gettext )" -PDEPEND="doc? ( ~dev-db/postgresql-docs-${PV} )" - -S="${WORKDIR}/postgresql-${PV}" - -src_prepare() { - - epatch "${FILESDIR}/postgresql-${SLOT}-common.patch" \ - "${FILESDIR}/postgresql-${SLOT}-base.patch" \ - "${FILESDIR}/postgresql-8.x-relax_ssl_perms.patch" - - # to avoid collision - it only should be installed by server - rm "${S}/src/backend/nls.mk" - - # because psql/help.c includes the file - ln -s "${S}/src/include/libpq/pqsignal.h" "${S}/src/bin/psql/" - - eautoconf -} - -src_configure() { - export LDFLAGS_SL="${LDFLAGS}" - econf --prefix=/usr/$(get_libdir)/postgresql-${SLOT} \ - --datadir=/usr/share/postgresql-${SLOT} \ - --sysconfdir=/etc/postgresql-${SLOT} \ - --includedir=/usr/include/postgresql-${SLOT} \ - --with-locale-dir=/usr/share/postgresql-${SLOT}/locale \ - --mandir=/usr/share/postgresql-${SLOT}/man \ - --without-docdir \ - --without-tcl \ - --without-perl \ - --without-python \ - $(use_with kerberos krb5) \ - "$(use_enable nls nls "$(wanted_languages)")" \ - $(use_with pam) \ - $(use_enable pg-intdatetime integer-datetimes ) \ - $(use_with readline) \ - $(use_with ssl openssl) \ - $(use_enable threads thread-safety) \ - $(use_with zlib) \ - || die "configure failed" -} - -src_compile() { - emake || die "emake failed" - - cd "${S}/contrib" - emake || die "emake failed" -} - -src_install() { - emake DESTDIR="${D}" install || die "emake install failed" - insinto /usr/include/postgresql-${SLOT}/postmaster - doins "${S}"/src/include/postmaster/*.h - dodir /usr/share/postgresql-${SLOT}/man/man1 - tar -zxf "${S}/doc/man.tar.gz" -C "${D}"/usr/share/postgresql-${SLOT}/man man1/{ecpg,pg_config}.1 - - rm "${D}/usr/share/postgresql-${SLOT}/man/man1"/{initdb,ipcclean,pg_controldata,pg_ctl,pg_resetxlog,pg_restore,postgres,postmaster}.1 - dodoc README HISTORY doc/{README.*,TODO,bug.template} - - cd "${S}/contrib" - emake DESTDIR="${D}" install || die "emake install failed" - cd "${S}" - - dodir /etc/eselect/postgresql/slots/${SLOT} - - IDIR="/usr/include/postgresql-${SLOT}" - cat > "${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-96-${SLOT}" <<-__EOF__ - LDPATH=/usr/$(get_libdir)/postgresql-${SLOT}/$(get_libdir) - MANPATH=/usr/share/postgresql-${SLOT}/man - __EOF__ - doenvd "${T}/50postgresql-96-${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 '${ROOT}/etc/postgresql-${SLOT}/'." -} - -pkg_postrm() { - eselect postgresql update -} |