diff options
author | 2008-03-15 23:38:47 +0000 | |
---|---|---|
committer | 2008-03-15 23:38:47 +0000 | |
commit | 559684deb2c3e273092c3a659a1d492f1cb67530 (patch) | |
tree | 85f9a8dbe895f53a193202f603cd775401480722 | |
parent | dev-db/postgresql-server: Removed oid2name since installed by postgresql-base. (diff) | |
download | experimental-559684deb2c3e273092c3a659a1d492f1cb67530.tar.gz experimental-559684deb2c3e273092c3a659a1d492f1cb67530.tar.bz2 experimental-559684deb2c3e273092c3a659a1d492f1cb67530.zip |
dev-db/postgresql-server: Fixed the patch for 7.4 (accidentally removed pgtcl-support even if specified. Removed the 'test' USE flag. Removed stalled gnuconfig inheritance. Added -lpq to the LIBS list for 7.4 since it doesn't build otherwise.
svn path=/experimental/; revision=329
9 files changed, 76 insertions, 72 deletions
diff --git a/dev-db/postgresql-server/ChangeLog b/dev-db/postgresql-server/ChangeLog index 1e947b9..d565786 100644 --- a/dev-db/postgresql-server/ChangeLog +++ b/dev-db/postgresql-server/ChangeLog @@ -2,6 +2,16 @@ # Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2 # $Header: $ + 15 Mar 2008; Tiziano Müller <dev-zero@gentoo.org> + postgresql-server-7.3.21.ebuild, postgresql-server-7.4.19.ebuild, + files/postgresql-7.4-server.patch, postgresql-server-8.0.15.ebuild, + postgresql-server-8.1.11.ebuild, postgresql-server-8.2.6.ebuild, + postgresql-server-8.3.0.ebuild: + Fixed the patch for 7.4 (accidentally removed pgtcl-support even if + specified. Removed the 'test' USE flag. Removed stalled gnuconfig + inheritance. Added -lpq to the LIBS list for 7.4 since it doesn't build + otherwise. + 11 Mar 2008; Tiziano Müller <dev-zero@gentoo.org> postgresql-server-8.0.15.ebuild, files/postgresql-8.3-server.patch: Removed oid2name since installed by postgresql-base. diff --git a/dev-db/postgresql-server/Manifest b/dev-db/postgresql-server/Manifest index e4955ba..2a44ec1 100644 --- a/dev-db/postgresql-server/Manifest +++ b/dev-db/postgresql-server/Manifest @@ -3,7 +3,7 @@ AUX postgresql-7.3-regress.patch 3294 RMD160 babb74fa25f69bdc5b7a31fc590cc9b8c56 AUX postgresql-7.3-server.patch 2392 RMD160 39f3a2705d68fef1c58d615b47af87d17cde9eb9 SHA1 878478c8eac3949a217cce448eec418d93cda5ad SHA256 cd99a66fb34908edf3075a1f2d5afe682bb46fa86889160cd5ab3c249a116821 AUX postgresql-7.3.21-autoconf.patch 2141 RMD160 3bff01abeeeb094f04469960d4725c977657fb1c SHA1 aceb7ebafde14fde0efe6eefc68115fd8b4cb95a SHA256 9444af9ac2908f18fc69ef2db6fe78584384a46d28dd4c8af10740f9138796a8 AUX postgresql-7.4-regress.patch 3337 RMD160 dcd1eef99595c5ae070a6778179a1b4611810ad8 SHA1 b58a22970ff3f6c489e55fa6fc1f2a5ba27f1aec SHA256 0679c01c80b0a789789cc5e4b0317e3d8e1ec4acdbe1bd42b63eab37097fa872 -AUX postgresql-7.4-server.patch 2482 RMD160 8f5f4c5e07b8c2b9616a82dd97992f7e5da372b1 SHA1 24f1b2cd0b831766b2f9cb423707e16d1f75d2e7 SHA256 dafa7ecb1dbf033c484c0f8d0a77ec1bac10f1088c17086e344da4793814fee0 +AUX postgresql-7.4-server.patch 2320 RMD160 199b10f5ad2056d67245fe2d801d81bef04502c0 SHA1 353c3dc07081fb5e7d25065a93aaca0193567fee SHA256 67075f990fc4b9b0b67ed29bce06f1cf0a2197fc253f3678f32ea40d77513e30 AUX postgresql-7.4-vacuum-delay.patch 8918 RMD160 dcd4fc4774277b0bf4a2158584c18bae2dc04232 SHA1 fe701fd6ca6cc9519417ab1053ef61a50ca51281 SHA256 7112ea61b84ce5c6974cd74687039f2ef871e0b4b25a34b4394225c2695fc123 AUX postgresql-7.4.19-autoconf.patch 1870 RMD160 92e49d3bc82ebfce6c798b4d56008da5c8f46d33 SHA1 a42d03a9c4d7b5df7a69a3d23c9e527c6d901eba SHA256 dccd9553b9cfdc88ffe98e445e27d1714426b4f1e6f405af438243ba06b93b6e AUX postgresql-8.0-common.patch 2294 RMD160 4f0028f6b5e95d74328f2c3981aa558420739181 SHA1 be649bf09bd5082e6e2af58c44cc470456e37780 SHA256 eca25d56bd157a3a7883d4c4305e4e0b7d22b8dd0cbca93da88add24da28b681 @@ -32,11 +32,11 @@ DIST postgresql-8.0.15.tar.bz2 11253897 RMD160 6aff5c63dce73eea609f0b6e013cd043a DIST postgresql-8.1.11.tar.bz2 11735420 RMD160 9fb98eadc4f1015205970f26b31b68ea0378bda9 SHA1 73c0f09754fc8e3c7f8d7de49d70244b76927416 SHA256 3e91cdfc1353fa9c6416d9fc8ae9d6ab3171565f00aeb6c882214c2f08a03e2e DIST postgresql-8.2.6.tar.bz2 12559117 RMD160 fa12ce310919cb52be3558d38a7e329bc73bbe33 SHA1 8934dfbd4c1d8c4f2945cb80f02072611681f967 SHA256 ee41327e821f933de2894d6e0c319edc4b63e80cb902e673b490b7eaf4ead114 DIST postgresql-8.3.0.tar.bz2 13923051 RMD160 99f48d26d9b0fb0cfda0de7156ad6a9554017d9e SHA1 b221e9a82fdb10af1a2b527551a4e30b7ccb958d SHA256 85356d6ab577e21bb528eb5d672e4373b21fe98ac046e77a0eed975608066ea6 -EBUILD postgresql-server-7.3.21.ebuild 7852 RMD160 2b720d8755997b38b63fe2cc3f1031516a3f9247 SHA1 501e37a5150afc25ba31cedbcbcfdc0d9e381acd SHA256 a533e66d76167651c8f4cdee99654833b354871da6ba87654f8c24c31c12dbb4 -EBUILD postgresql-server-7.4.19.ebuild 7887 RMD160 4c86bde8a0c3f2a9e13a787bff905cfa51844eee SHA1 0a6f0b0e0c06f4f0874a1ca26aaa9cc30d12a598 SHA256 dfcb50e9f2c242776989fca1ad1a387bfd507b553fdab1ea8caad874ffc6515f -EBUILD postgresql-server-8.0.15.ebuild 7964 RMD160 397145eeb96999e3b12c155ebd5c2a1c8d1d902a SHA1 ff5ac4fcefa8343801a3f6f00bb9276625d44202 SHA256 60bdb1943eb9c087adcecc52ca06d966e6add9e0415833a24d1fadff98b8e23b -EBUILD postgresql-server-8.1.11.ebuild 8085 RMD160 771666b036943fbc53b9b4800d4d9dd90880df3b SHA1 ec961d4181e9cf7b124530fe116eb84b3723294c SHA256 4ff782645578eec0973a2cab43f38d1869ad03eed51bb8bcd1889cb512bbe5a6 -EBUILD postgresql-server-8.2.6.ebuild 8315 RMD160 b5f0e914376dcfd8001444ee27b3db122d6d662c SHA1 b8887bbd883bbd0a61c0895d80f912c39119ffc7 SHA256 fe1e5d006911b1c6d1488ab6722e6f5d645ff4b2064a21d72c7bf50b8fef64e5 -EBUILD postgresql-server-8.3.0.ebuild 8342 RMD160 9ab8df06fe652355c72ce76798344ca884ea1791 SHA1 77b14e5e7abcff65562016ad69e2415673e9cc02 SHA256 b671b01cd2adef914b7c0a69cbb58824db47ef6180bfce306d7832b8a6e93a53 -MISC ChangeLog 2941 RMD160 d916e094f6990050797083e68abf1b655e6cde44 SHA1 3e9a48b15726fa56c31ea5566929d68f1874d367 SHA256 6d36af1dcfddb13794cdd7b55787add1175dbf25195271aa42384fff07d6f7b2 +EBUILD postgresql-server-7.3.21.ebuild 7841 RMD160 5fa170f04a318060f5edce49a794e35159c4b00f SHA1 198f25e6ae53c0adecfb8328708c3ce08b847f7c SHA256 2acc7e0173d4c42d8debdb613f66f351ca58fa6b94f4f13c262a63b211587dc6 +EBUILD postgresql-server-7.4.19.ebuild 7771 RMD160 b9d086687680e477256b39f1480973ee0ac3bff0 SHA1 604a708ec1bcce5763883a8c15bddb43cb56c94a SHA256 3b9a8f1903a1f7e7159348af8272f9922f607d9448d0e906fb3cebe83f35f49e +EBUILD postgresql-server-8.0.15.ebuild 7967 RMD160 98623ab4e26874b90d2befec864f967387e821eb SHA1 d32df8948592b46345efde8d7285f4a3759160b9 SHA256 d941f29028c4f84ea8174bf05aa5b84fa72b46110d4d95f4d8c2c3231d4465c7 +EBUILD postgresql-server-8.1.11.ebuild 8088 RMD160 c81b49aba166f90faf87b5ae278763cd09fe30e6 SHA1 2f2b0d475775ee412cc72703f9c7841b443abc03 SHA256 83172e0cf272926ca9715511a0ca00301e738b643c4d50ea66d6d46c418146e0 +EBUILD postgresql-server-8.2.6.ebuild 8318 RMD160 e130264005bb0c8a0e17d8814e1de510b84908ad SHA1 a1519eebba917ca9b9e2b3e0ebfd2a2e3286f7a7 SHA256 fac930c548d777292622f6c0c663015eb15bcec9715bc31b62f37d9c540ffe5a +EBUILD postgresql-server-8.3.0.ebuild 8345 RMD160 0c31bc3f690c97f9ff44a5dffddf16acf7f73a4f SHA1 dc8bc162c78620c37aad2772f2ce716ad2f3bbe1 SHA256 95e28601a56327579ea50f7de3007d18b84fee9c27e4473b85fdcc1d88ef8cfc +MISC ChangeLog 3459 RMD160 92140056a955bb998d9e22f32dd50e7718e54196 SHA1 be67c7bd3d70554d2681959824b5a241b0c0cd72 SHA256 73ab317005d8d1bbf4b29df4939cfbd4480cb7fc2c194c32274ea169fa037de3 MISC metadata.xml 164 RMD160 becfe652663bd65719dd11fa6ffb588b3d5b4ecc SHA1 f67b7ac1c5e6e65ef5a19a589d4759c84918f86c SHA256 7e8e8126bc8701c4a42c7dfed8bb755ac6040fe3d0e3f994d888f8b2b4fa7d8b diff --git a/dev-db/postgresql-server/files/postgresql-7.4-server.patch b/dev-db/postgresql-server/files/postgresql-7.4-server.patch index 3661c6d..972dce8 100644 --- a/dev-db/postgresql-server/files/postgresql-7.4-server.patch +++ b/dev-db/postgresql-server/files/postgresql-7.4-server.patch @@ -1,8 +1,8 @@ -diff --git a/GNUmakefile.in b/GNUmakefile.in -index 563532a..607dc8a 100644 ---- a/GNUmakefile.in -+++ b/GNUmakefile.in -@@ -23,7 +23,6 @@ installdirs uninstall distprep: +=== GNUmakefile.in +================================================================== +--- GNUmakefile.in (revision 12) ++++ GNUmakefile.in (local) +@@ -23,7 +23,6 @@ $(MAKE) -C src $@ install-all-headers: @@ -10,11 +10,11 @@ index 563532a..607dc8a 100644 # clean, distclean, etc should apply to contrib too, even though # it's not built by default -diff --git a/contrib/Makefile b/contrib/Makefile -index 74310cf..fae6422 100644 ---- a/contrib/Makefile -+++ b/contrib/Makefile -@@ -13,7 +13,6 @@ WANTED_DIRS = \ +=== contrib/Makefile +================================================================== +--- contrib/Makefile (revision 12) ++++ contrib/Makefile (local) +@@ -13,7 +13,6 @@ dbmirror \ dbsize \ earthdistance \ @@ -22,7 +22,7 @@ index 74310cf..fae6422 100644 fulltextindex \ fuzzystrmatch \ intagg \ -@@ -23,11 +22,7 @@ WANTED_DIRS = \ +@@ -23,11 +22,7 @@ ltree \ miscutil \ noupdate \ @@ -34,7 +34,7 @@ index 74310cf..fae6422 100644 pgcrypto \ pgstattuple \ rserv \ -@@ -39,8 +34,7 @@ WANTED_DIRS = \ +@@ -39,8 +34,7 @@ tips \ tsearch \ tsearch2 \ @@ -44,11 +44,11 @@ index 74310cf..fae6422 100644 # Missing: # array \ (removed all but the README) -diff --git a/src/Makefile b/src/Makefile -index cd6e5e6..0b23160 100644 ---- a/src/Makefile -+++ b/src/Makefile -@@ -14,11 +14,8 @@ include Makefile.global +=== src/Makefile +================================================================== +--- src/Makefile (revision 12) ++++ src/Makefile (local) +@@ -14,11 +14,8 @@ all install installdirs uninstall dep depend distprep: @@ -60,11 +60,11 @@ index cd6e5e6..0b23160 100644 $(MAKE) -C bin $@ $(MAKE) -C pl $@ -diff --git a/src/Makefile.global.in b/src/Makefile.global.in -index 19c49d1..c968a2e 100644 ---- a/src/Makefile.global.in -+++ b/src/Makefile.global.in -@@ -291,10 +291,10 @@ libpq_builddir = $(top_builddir)/src/interfaces/libpq +=== src/Makefile.global.in +================================================================== +--- src/Makefile.global.in (revision 12) ++++ src/Makefile.global.in (local) +@@ -291,10 +291,10 @@ libpq = -L$(libpq_builddir) -lpq submake-libpq: @@ -77,23 +77,19 @@ index 19c49d1..c968a2e 100644 .PHONY: submake-libpq submake-libpgport -diff --git a/src/bin/Makefile b/src/bin/Makefile -index 3035f61..6cc968c 100644 ---- a/src/bin/Makefile -+++ b/src/bin/Makefile -@@ -13,13 +13,8 @@ subdir = src/bin +=== src/bin/Makefile +================================================================== +--- src/bin/Makefile (revision 12) ++++ src/bin/Makefile (local) +@@ -13,9 +13,8 @@ top_builddir = ../.. include $(top_builddir)/src/Makefile.global -DIRS := initdb initlocation ipcclean pg_ctl pg_dump pg_id \ - psql scripts pg_config pg_controldata pg_resetxlog \ - pg_encoding -- --ifeq ($(with_tcl), yes) -- DIRS += pgtclsh --endif +DIRS := initdb initlocation ipcclean pg_ctl pg_id \ + pg_controldata pg_resetxlog - all install installdirs uninstall depend distprep: - @for dir in $(DIRS); do $(MAKE) -C $$dir $@ || exit; done + ifeq ($(with_tcl), yes) + DIRS += pgtclsh diff --git a/dev-db/postgresql-server/postgresql-server-7.3.21.ebuild b/dev-db/postgresql-server/postgresql-server-7.3.21.ebuild index e897910..d01056c 100644 --- a/dev-db/postgresql-server/postgresql-server-7.3.21.ebuild +++ b/dev-db/postgresql-server/postgresql-server-7.3.21.ebuild @@ -6,7 +6,7 @@ EAPI="1" WANT_AUTOCONF="latest" WANT_AUTOMAKE="none" -inherit eutils gnuconfig multilib toolchain-funcs versionator autotools +inherit eutils multilib toolchain-funcs versionator autotools KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~sparc-fbsd ~x86 ~x86-fbsd" @@ -19,7 +19,7 @@ IUSE_LINGUAS=" linguas_cs linguas_de linguas_es linguas_fr linguas_hr linguas_hu linguas_pt_BR linguas_ru linguas_sv linguas_tr linguas_zh_CN linguas_zh_TW" -IUSE="doc perl python selinux tcl test xml nls kernel_linux ${IUSE_LINGUAS}" +IUSE="doc perl python selinux tcl xml nls kernel_linux ${IUSE_LINGUAS}" wanted_languages() { for u in ${IUSE_LINGUAS} ; do @@ -62,11 +62,11 @@ src_unpack() { unpack ${A} cd "${S}" - epatch "${FILESDIR}/postgresql-${PV}-autoconf.patch" - epatch "${FILESDIR}/postgresql-${SLOT}-server.patch" - epatch "${FILESDIR}/postgresql-${SLOT}-cubeparse.patch" + epatch "${FILESDIR}/postgresql-${PV}-autoconf.patch" \ + "${FILESDIR}/postgresql-${SLOT}-server.patch" \ + "${FILESDIR}/postgresql-${SLOT}-cubeparse.patch" - if use test ; then + if hasq test ${FEATURES}; then epatch "${FILESDIR}/postgresql-${SLOT}-regress.patch" fi diff --git a/dev-db/postgresql-server/postgresql-server-7.4.19.ebuild b/dev-db/postgresql-server/postgresql-server-7.4.19.ebuild index 985fe62..ed130ba 100644 --- a/dev-db/postgresql-server/postgresql-server-7.4.19.ebuild +++ b/dev-db/postgresql-server/postgresql-server-7.4.19.ebuild @@ -6,7 +6,7 @@ EAPI="1" WANT_AUTOCONF="latest" WANT_AUTOMAKE="none" -inherit eutils gnuconfig multilib toolchain-funcs versionator autotools +inherit eutils multilib toolchain-funcs versionator autotools KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~sparc-fbsd ~x86 ~x86-fbsd" @@ -19,7 +19,7 @@ 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 perl python selinux test tcl xml nls kernel_linux ${IUSE_LINGUAS}" +IUSE="doc perl python selinux tcl xml nls kernel_linux ${IUSE_LINGUAS}" wanted_languages() { for u in ${IUSE_LINGUAS} ; do @@ -62,11 +62,11 @@ src_unpack() { unpack ${A} cd "${S}" - epatch "${FILESDIR}/postgresql-${PV}-autoconf.patch" - epatch "${FILESDIR}/postgresql-${SLOT}-vacuum-delay.patch" - epatch "${FILESDIR}/postgresql-${SLOT}-server.patch" + epatch "${FILESDIR}/postgresql-${PV}-autoconf.patch" \ + "${FILESDIR}/postgresql-${SLOT}-vacuum-delay.patch" \ + "${FILESDIR}/postgresql-${SLOT}-server.patch" - if use test ; then + if hasq test ${FEATURES}; then epatch "${FILESDIR}/postgresql-${SLOT}-regress.patch" fi @@ -74,8 +74,6 @@ src_unpack() { } src_compile() { - # 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)" \ @@ -86,7 +84,7 @@ src_compile() { --with-libs="/usr/$(get_libdir)/postgresql-${SLOT}/$(get_libdir)/" \ "$(built_with_use ~dev-db/postgresql-base-${PV} nls && use_enable nls nls "$(wanted_languages)")" \ "CFLAGS='${CFLAGS} $(use xml && pkg-config --cflags libxml-2.0)'" \ - "LIBS='${LIBS} $(use xml && pkg-config --libs libxml-2.0) -L/usr/$(get_libdir)/postgresql-${SLOT}/$(get_libdir)'" \ + "LIBS='${LIBS} -lpq $(use xml && pkg-config --libs libxml-2.0) -L/usr/$(get_libdir)/postgresql-${SLOT}/$(get_libdir)'" \ || die "configure failed" for bd in . contrib $(use xml && echo contrib/xml) ; do diff --git a/dev-db/postgresql-server/postgresql-server-8.0.15.ebuild b/dev-db/postgresql-server/postgresql-server-8.0.15.ebuild index c734d98..a9c5ad6 100644 --- a/dev-db/postgresql-server/postgresql-server-8.0.15.ebuild +++ b/dev-db/postgresql-server/postgresql-server-8.0.15.ebuild @@ -20,7 +20,7 @@ IUSE_LINGUAS=" 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 perl python selinux tcl test xml nls kernel_linux ${IUSE_LINGUAS}" +IUSE="doc perl python selinux tcl xml nls kernel_linux ${IUSE_LINGUAS}" wanted_languages() { for u in ${IUSE_LINGUAS} ; do @@ -63,10 +63,10 @@ src_unpack() { unpack ${A} cd "${S}" - epatch "${FILESDIR}/postgresql-${SLOT}-common.patch" - epatch "${FILESDIR}/postgresql-${SLOT}-server.patch" + epatch "${FILESDIR}/postgresql-${SLOT}-common.patch" \ + "${FILESDIR}/postgresql-${SLOT}-server.patch" - if use test ; then + if hasq test ${FEATURES}; 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 fi diff --git a/dev-db/postgresql-server/postgresql-server-8.1.11.ebuild b/dev-db/postgresql-server/postgresql-server-8.1.11.ebuild index 87f0172..5dda3ea 100644 --- a/dev-db/postgresql-server/postgresql-server-8.1.11.ebuild +++ b/dev-db/postgresql-server/postgresql-server-8.1.11.ebuild @@ -20,7 +20,7 @@ IUSE_LINGUAS=" 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 perl python selinux tcl test xml nls kernel_linux ${IUSE_LINGUAS}" +IUSE="doc perl python selinux tcl xml nls kernel_linux ${IUSE_LINGUAS}" wanted_languages() { for u in ${IUSE_LINGUAS} ; do @@ -63,10 +63,10 @@ src_unpack() { unpack ${A} cd "${S}" - epatch "${FILESDIR}/postgresql-${SLOT}-common.patch" - epatch "${FILESDIR}/postgresql-${SLOT}-server.patch" + epatch "${FILESDIR}/postgresql-${SLOT}-common.patch" \ + "${FILESDIR}/postgresql-${SLOT}-server.patch" - if use test ; then + if hasq test ${FEATURES}; 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 fi diff --git a/dev-db/postgresql-server/postgresql-server-8.2.6.ebuild b/dev-db/postgresql-server/postgresql-server-8.2.6.ebuild index b58a453..4998e22 100644 --- a/dev-db/postgresql-server/postgresql-server-8.2.6.ebuild +++ b/dev-db/postgresql-server/postgresql-server-8.2.6.ebuild @@ -20,7 +20,7 @@ IUSE_LINGUAS=" 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 perl python selinux tcl test xml nls kernel_linux ${IUSE_LINGUAS}" +IUSE="doc perl python selinux tcl xml nls kernel_linux ${IUSE_LINGUAS}" wanted_languages() { for u in ${IUSE_LINGUAS} ; do @@ -63,10 +63,10 @@ src_unpack() { unpack ${A} cd "${S}" - epatch "${FILESDIR}/postgresql-${SLOT}-common.patch" - epatch "${FILESDIR}/postgresql-${SLOT}-server.patch" + epatch "${FILESDIR}/postgresql-${SLOT}-common.patch" \ + "${FILESDIR}/postgresql-${SLOT}-server.patch" - if use test ; then + if hasq test ${FEATURES}; 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" diff --git a/dev-db/postgresql-server/postgresql-server-8.3.0.ebuild b/dev-db/postgresql-server/postgresql-server-8.3.0.ebuild index 77aa64d..c28af9e 100644 --- a/dev-db/postgresql-server/postgresql-server-8.3.0.ebuild +++ b/dev-db/postgresql-server/postgresql-server-8.3.0.ebuild @@ -20,7 +20,7 @@ IUSE_LINGUAS=" 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 perl python selinux tcl test xml nls kernel_linux ${IUSE_LINGUAS}" +IUSE="doc perl python selinux tcl xml nls kernel_linux ${IUSE_LINGUAS}" wanted_languages() { for u in ${IUSE_LINGUAS} ; do @@ -63,10 +63,10 @@ src_unpack() { unpack ${A} cd "${S}" - epatch "${FILESDIR}/postgresql-${SLOT}-common.patch" - epatch "${FILESDIR}/postgresql-${SLOT}-server.patch" + epatch "${FILESDIR}/postgresql-${SLOT}-common.patch" \ + "${FILESDIR}/postgresql-${SLOT}-server.patch" - if use test ; then + if hasq test ${FEATURES}; 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" |