diff options
author | Tomas Chvatal <scarabeus@gentoo.org> | 2010-10-01 10:35:47 +0000 |
---|---|---|
committer | Tomas Chvatal <scarabeus@gentoo.org> | 2010-10-01 10:35:47 +0000 |
commit | d6b34a308e1e074c396cb60ac01b74cb566b660b (patch) | |
tree | a0afec8a926181214d88b345e2e6a3b811205827 /dev-db | |
parent | Added ~arm, removed old version (diff) | |
download | historical-d6b34a308e1e074c396cb60ac01b74cb566b660b.tar.gz historical-d6b34a308e1e074c396cb60ac01b74cb566b660b.tar.bz2 historical-d6b34a308e1e074c396cb60ac01b74cb566b660b.zip |
QA: Cleanup, remove useless patch. Actualy install manpages.
Package-Manager: portage-2.2_rc88/cvs/Linux x86_64
Diffstat (limited to 'dev-db')
-rw-r--r-- | dev-db/postgresql-base/ChangeLog | 6 | ||||
-rw-r--r-- | dev-db/postgresql-base/Manifest | 4 | ||||
-rw-r--r-- | dev-db/postgresql-base/postgresql-base-9.0.0.ebuild | 81 |
3 files changed, 48 insertions, 43 deletions
diff --git a/dev-db/postgresql-base/ChangeLog b/dev-db/postgresql-base/ChangeLog index af196de6aec3..0c134217a879 100644 --- a/dev-db/postgresql-base/ChangeLog +++ b/dev-db/postgresql-base/ChangeLog @@ -1,6 +1,10 @@ # 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.74 2010/09/21 16:17:06 patrick Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-db/postgresql-base/ChangeLog,v 1.75 2010/10/01 10:35:47 scarabeus Exp $ + + 01 Oct 2010; Tomáš Chvátal <scarabeus@gentoo.org> + postgresql-base-9.0.0.ebuild: + QA: Cleanup, remove useless patch. Actualy install manpages. 21 Sep 2010; Patrick Lauer <patrick@gentoo.org> -postgresql-base-9.0_beta4.ebuild, -postgresql-base-9.0_rc1.ebuild: diff --git a/dev-db/postgresql-base/Manifest b/dev-db/postgresql-base/Manifest index acbe78ddeb20..eac75d4fa566 100644 --- a/dev-db/postgresql-base/Manifest +++ b/dev-db/postgresql-base/Manifest @@ -23,6 +23,6 @@ EBUILD postgresql-base-8.1.21-r1.ebuild 4462 RMD160 d15474184366f43d497b9d5ea484 EBUILD postgresql-base-8.2.17-r1.ebuild 4536 RMD160 7553bfe26608d964069794f709776e26b02efb04 SHA1 e7592d9b318f4931555da240829e823767c93b65 SHA256 45c2cccd2efa8312dd86d4c1accc2f97f49b0ff0591994d2adc08cc66209ec32 EBUILD postgresql-base-8.3.11-r1.ebuild 4602 RMD160 6b34fcad6462f8283006f90aa2ba4e93a107ad22 SHA1 0f43ba3928c004a8a360cdc8e999e81c62039b42 SHA256 ef9f3dd44737b2f9f7efd716f6f1656e1ec38ba3e6f1c671f497fe113273fcb7 EBUILD postgresql-base-8.4.4-r2.ebuild 4717 RMD160 883a784dae0fe03b877ad50529fc6beaa767e55d SHA1 e3ccc4721df23347e6e60e85b8dafdea52da3749 SHA256 956d1ff76efe5bab4b9a91fc88ff9c976adb7891708a129607a468bda5beed9b -EBUILD postgresql-base-9.0.0.ebuild 4776 RMD160 bab4a3972a513548dd643dc6b30962e08d3a5bfa SHA1 6be7adf51d65e81255a6c28e68694f567837f0f8 SHA256 032b998e9c2191bb690df99dc2b80e65b2b10b304d84cf5f32c98fcf8acc320a -MISC ChangeLog 24791 RMD160 d41e3c08f070fcc80acfb6bef6e86aed372c41ed SHA1 4a0628f7587d74628f5939c8b8594c8f81dd2005 SHA256 92c0859807838443ec67f8792ba9a694766f2ebf5788748c1f889b5ffd3a3b03 +EBUILD postgresql-base-9.0.0.ebuild 4490 RMD160 48c8906c0cfcf84658e49f73d312464b928fbe7a SHA1 467fc657e9e5ae49c15183db825b191f866c7732 SHA256 4d1115ff87d08f9566f2cebd8d951355826ef14404513b4f9ad6d7cafae15cac +MISC ChangeLog 24944 RMD160 eb6c4903838ed1971a59d6f5f5d0aa937f1ca71e SHA1 f0c4c902d9bcc499dc8e0e09398eafe3dbd9281b SHA256 38f51ec8b76c90e602155309b20d232285a07733d84d994238d8623018f82bb2 MISC metadata.xml 472 RMD160 fe3dc42a49cd1445788d023578d878c6226c72e0 SHA1 f03eda301fc89bf31cfb64bb6cc2cc4ca33cb632 SHA256 ee20753f4083988318c4c30155901e99a800dc8fb19fd77c80f9947c72abbf4c diff --git a/dev-db/postgresql-base/postgresql-base-9.0.0.ebuild b/dev-db/postgresql-base/postgresql-base-9.0.0.ebuild index 49ea2585701f..b16cc4fa9814 100644 --- a/dev-db/postgresql-base/postgresql-base-9.0.0.ebuild +++ b/dev-db/postgresql-base/postgresql-base-9.0.0.ebuild @@ -1,6 +1,6 @@ # 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.0.ebuild,v 1.2 2010/09/20 08:48:38 patrick Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-db/postgresql-base/postgresql-base-9.0.0.ebuild,v 1.3 2010/10/01 10:35:47 scarabeus Exp $ EAPI="2" @@ -19,35 +19,40 @@ 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}" +LINGUAS="af cs de es fa fr hr hu it ko nb pl pt_BR ro ru sk sl sv tr zh_CN zh_TW" +IUSE="doc kerberos nls pam pg_legacytimestamp readline ssl threads zlib ldap" + +for lingua in ${LINGUAS}; do + IUSE+=" linguas_${lingua}" +done + RESTRICT="test" wanted_languages() { - for u in ${IUSE_LINGUAS} ; do - use $u && echo -n "${u#linguas_} " + local enable_langs + + for lingua in ${LINGUAS} ; do + use linguas_${lingua} && enable_langs+="${lingua} " done + + echo -n ${enable_langs} } -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 +RDEPEND="!!dev-db/postgresql-libs !!dev-db/postgresql-client !!dev-db/libpq !!dev-db/postgresql - ldap? ( net-nds/openldap )" + >=app-admin/eselect-postgresql-0.3 + virtual/libintl + kerberos? ( virtual/krb5 ) + ldap? ( net-nds/openldap ) + pam? ( virtual/pam ) + readline? ( sys-libs/readline ) + ssl? ( >=dev-libs/openssl-0.9.6-r1 ) + zlib? ( sys-libs/zlib )" DEPEND="${RDEPEND} + sys-devel/bison sys-devel/flex - >=sys-devel/bison-1.875 nls? ( sys-devel/gettext )" PDEPEND="doc? ( ~dev-db/postgresql-docs-${PV} )" @@ -55,22 +60,19 @@ src_prepare() { epatch "${FILESDIR}/postgresql-9.0-common.3.patch" \ "${FILESDIR}/postgresql-${SLOT}-base.3.patch" - if use kerberos && has_version "<app-crypt/heimdal-1.3.2-r1" ; then - epatch "${FILESDIR}/postgresql-base-8.4-9.0-heimdal_strlcpy.patch" - fi - # 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/" - cd "${S}" + ln -s "${S}/src/include/libpq/pqsignal.h" "${S}/src/bin/psql/" || die + eautoconf } src_configure() { export LDFLAGS_SL="${LDFLAGS}" - econf --prefix=/usr/$(get_libdir)/postgresql-${SLOT} \ + econf \ + --prefix=/usr/$(get_libdir)/postgresql-${SLOT} \ --datadir=/usr/share/postgresql-${SLOT} \ --docdir=/usr/share/doc/postgresql-${SLOT} \ --sysconfdir=/etc/postgresql-${SLOT} \ @@ -85,12 +87,11 @@ src_configure() { $(use_with kerberos gssapi) \ "$(use_enable nls nls "$(wanted_languages)")" \ $(use_with pam) \ - $(use_enable !pg_legacytimestamp integer-datetimes ) \ + $(use_enable !pg_legacytimestamp integer-datetimes) \ $(use_with ssl openssl) \ $(use_enable threads thread-safety) \ $(use_with zlib) \ - $(use_with ldap) \ - || die "configure failed" + $(use_with ldap) } src_compile() { @@ -103,19 +104,19 @@ src_compile() { 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 + doins "${S}"/src/include/postmaster/*.h || die + + dodir /usr/share/postgresql-${SLOT}/man/man1/ || die + cp "${S}"/doc/src/sgml/man1/* "${D}"/usr/share/postgresql-${SLOT}/man/man1/ || die - rm -r "${D}/usr/share/doc/postgresql-${SLOT}/html" 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} + dodoc README HISTORY doc/{README.*,TODO,bug.template} || die cd "${S}/contrib" emake DESTDIR="${D}" install || die "emake install failed" cd "${S}" - dodir /etc/eselect/postgresql/slots/${SLOT} + dodir /etc/eselect/postgresql/slots/${SLOT} || die IDIR="/usr/include/postgresql-${SLOT}" cat > "${D}/etc/eselect/postgresql/slots/${SLOT}/base" <<-__EOF__ @@ -133,12 +134,12 @@ postgres_symlinks=( __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}" +LDPATH=/usr/$(get_libdir)/postgresql-${SLOT}/$(get_libdir) +MANPATH=/usr/share/postgresql-${SLOT}/man +__EOF__ + doenvd "${T}/50postgresql-94-${SLOT}" || die - keepdir /etc/postgresql-${SLOT} + keepdir /etc/postgresql-${SLOT} || die } pkg_postinst() { |