diff options
author | Patrick Lauer <patrick@gentoo.org> | 2010-01-07 00:49:32 +0000 |
---|---|---|
committer | Patrick Lauer <patrick@gentoo.org> | 2010-01-07 00:49:32 +0000 |
commit | 2844fc068450eab600b62238ea6e6b4386bf9655 (patch) | |
tree | ee11c9df1a383b2668a9d66635d2dbfbc31ad2a9 /dev-db/postgresql-base | |
parent | Marked ppc stable for bug #288801. (diff) | |
download | gentoo-2-2844fc068450eab600b62238ea6e6b4386bf9655.tar.gz gentoo-2-2844fc068450eab600b62238ea6e6b4386bf9655.tar.bz2 gentoo-2-2844fc068450eab600b62238ea6e6b4386bf9655.zip |
Bump
(Portage version: 2.2_rc61/cvs/Linux x86_64)
Diffstat (limited to 'dev-db/postgresql-base')
-rw-r--r-- | dev-db/postgresql-base/ChangeLog | 8 | ||||
-rw-r--r-- | dev-db/postgresql-base/files/postgresql-7.4.27-autoconf.patch | 48 | ||||
-rw-r--r-- | dev-db/postgresql-base/postgresql-base-7.4.27.ebuild | 150 |
3 files changed, 205 insertions, 1 deletions
diff --git a/dev-db/postgresql-base/ChangeLog b/dev-db/postgresql-base/ChangeLog index ee6d44f83e72..fb34f5b5aa7e 100644 --- a/dev-db/postgresql-base/ChangeLog +++ b/dev-db/postgresql-base/ChangeLog @@ -1,6 +1,12 @@ # 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.34 2010/01/07 00:23:37 patrick Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-db/postgresql-base/ChangeLog,v 1.35 2010/01/07 00:49:31 patrick Exp $ + +*postgresql-base-7.4.27 (07 Jan 2010) + + 07 Jan 2010; Patrick Lauer <patrick@gentoo.org> + +postgresql-base-7.4.27.ebuild, +files/postgresql-7.4.27-autoconf.patch: + Bump of 7.4 slot *postgresql-base-8.4.2-r1 (07 Jan 2010) diff --git a/dev-db/postgresql-base/files/postgresql-7.4.27-autoconf.patch b/dev-db/postgresql-base/files/postgresql-7.4.27-autoconf.patch new file mode 100644 index 000000000000..2c324c52d8c6 --- /dev/null +++ b/dev-db/postgresql-base/files/postgresql-7.4.27-autoconf.patch @@ -0,0 +1,48 @@ +diff --git a/config/programs.m4 b/config/programs.m4 +index ae3b91a..6af24d2 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 f7bdec3..c8b5b7e 100644 +--- a/configure.in ++++ b/configure.in +@@ -19,17 +19,8 @@ m4_pattern_forbid(^PGAC_)dnl to catch undefined macros + dnl + dnl The GNU folks apparently haven't heard that some people don't use + dnl Texinfo. Use this sorcery to use "docdir" instead of "infodir". +-m4_define([info], [doc]) +-m4_define([infodir], [docdir]) + AC_INIT([PostgreSQL], [7.4.27], [pgsql-bugs@postgresql.org]) +-m4_undefine([infodir]) +-m4_undefine([info]) +-AC_SUBST(docdir) +- +-m4_if(m4_defn([m4_PACKAGE_VERSION]), [2.53], [], [m4_fatal([Autoconf version 2.53 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 2004 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-7.4.27.ebuild b/dev-db/postgresql-base/postgresql-base-7.4.27.ebuild new file mode 100644 index 000000000000..7df19ba34ec4 --- /dev/null +++ b/dev-db/postgresql-base/postgresql-base-7.4.27.ebuild @@ -0,0 +1,150 @@ +# 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-7.4.27.ebuild,v 1.1 2010/01/07 00:49:31 patrick Exp $ + +EAPI="1" + +WANT_AUTOCONF="latest" +WANT_AUTOMAKE="none" + +inherit eutils multilib toolchain-funcs versionator autotools + +KEYWORDS="~amd64 ~hppa ~ppc ~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_cs linguas_de linguas_es linguas_fr linguas_hr linguas_hu + linguas_it linguas_nb linguas_pt_BR linguas_ru 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:${SLOT} )" + +S="${WORKDIR}/postgresql-${PV}" + +src_unpack() { + unpack ${A} + cd "${S}" + + epatch "${FILESDIR}/postgresql-${PV}-autoconf.patch" \ + "${FILESDIR}/postgresql-${SLOT}-hppa.patch" \ + "${FILESDIR}/postgresql-${SLOT}-base.patch" \ + "${FILESDIR}/postgresql-${SLOT}-com_err.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/" + + eautoreconf +} + +src_compile() { + 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 \ + --host=${CHOST} \ + --docdir=/usr/share/doc/${PF} \ + --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" + + emake LD="$(tc-getLD) $(get_abi_LDFLAGS)" || die "emake failed" + + cd "${S}/contrib" + emake LD="$(tc-getLD) $(get_abi_LDFLAGS)" || 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 + + # Install missing libpgport.a + insinto /usr/$(get_libdir)/postgresql-${SLOT}/$(get_libdir) + doins "${S}/src/port/libpgport.a" + + 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 -rf "${D}/usr/share/doc/${PF}/html" + rm "${D}/usr/share/postgresql-${SLOT}/man/man1"/{initdb,initlocation,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}/libpq /usr/include/libpq + ${IDIR}/postgres_ext.h /usr/include/postgres_ext.h +) +__EOF__ + + cat >"${T}/50postgresql-98-${SLOT}" <<-__EOF__ + LDPATH=/usr/$(get_libdir)/postgresql-${SLOT}/$(get_libdir) + MANPATH=/usr/share/postgresql-${SLOT}/man + __EOF__ + doenvd "${T}/50postgresql-98-${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 +} |