Tiny update for linguas and nls handling.

Package-Manager: portage-2.2_rc88/cvs/Linux x86_64

3 files changed, 24 insertions, 19 deletions

diff --git a/dev-db/postgresql-server/ChangeLog b/dev-db/postgresql-server/ChangeLog
index 9f134e73dc95..266ef7dd616f 100644
--- a/dev-db/postgresql-server/ChangeLog
+++ b/dev-db/postgresql-server/ChangeLog
@@ -1,6 +1,10 @@
 # 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.83 2010/09/21 16:17:55 patrick Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-db/postgresql-server/ChangeLog,v 1.84 2010/10/05 13:56:41 scarabeus Exp $
+
+  05 Oct 2010; Tomáš Chvátal <scarabeus@gentoo.org>
+  postgresql-server-9.0.0.ebuild:
+  Tiny update for linguas and nls handling.
 
   21 Sep 2010; Patrick Lauer <patrick@gentoo.org>
   -postgresql-server-9.0_beta4.ebuild, -postgresql-server-9.0_rc1.ebuild:
diff --git a/dev-db/postgresql-server/Manifest b/dev-db/postgresql-server/Manifest
index cdfd4b7f9432..ab256ff29963 100644
--- a/dev-db/postgresql-server/Manifest
+++ b/dev-db/postgresql-server/Manifest
@@ -42,6 +42,6 @@ EBUILD postgresql-server-8.1.21-r1.ebuild 9848 RMD160 5ae49ff97f816c9c3b73a02e44
 EBUILD postgresql-server-8.2.17-r1.ebuild 10148 RMD160 a6c3722265d8522301fa3644af0eab8cffefc381 SHA1 2295e1d45a3d23fe41aa36c6de2fcbffcd1f780a SHA256 c03315c8c87bdaf9a922bc3f2407aa3de67bf4b917831f972f3ba50fac262596
 EBUILD postgresql-server-8.3.11-r1.ebuild 10276 RMD160 569445d948fdae24183179b7cf2e988f19e80392 SHA1 d9bd1296621252c3205afbd5778af448be2b5f3e SHA256 c897ff603c1715d9d1d52da9d4a14c973030a948a8cfdc5e6905fb20c456d8fc
 EBUILD postgresql-server-8.4.4-r1.ebuild 10344 RMD160 775ecf6ac627f76dee759c9b2f1db8c845b2d2b9 SHA1 23f014ea34308b0fb322dec85951a426a18535d8 SHA256 516c8074f7d71a0acb30695d15bf3b6a3f94f381ca5d150d39c11882150db279
-EBUILD postgresql-server-9.0.0.ebuild 10406 RMD160 c46d8c49f842e33bde5840273dbc20d36438dfee SHA1 0dde9212975a601595e6f182b20a9d3f90b563bb SHA256 5193f45050d3dfda45442f441c00dd01ba655247d11510078f24fd9a3f6d63ff
-MISC ChangeLog 30769 RMD160 d4c705148e98e68353a3b548be9a0683539cc30c SHA1 a803580cbfba2e25e1ec5dedc97744c798811e2e SHA256 77677474bc350251828961382d898a22bbc91e57d7072c7b06967d85a4df38ba
+EBUILD postgresql-server-9.0.0.ebuild 10185 RMD160 4d637632e5b82f9bab5e50d779a97788ad45edef SHA1 436cd85f5047d57bc1404425efe5259a1a22da68 SHA256 be066743bbe1b99b72ee75e241fe2955f59fee24d2f4c04aa78bed90ca57d7e2
+MISC ChangeLog 30905 RMD160 28f7a22c07a3cbf8a3900317af8076737986752a SHA1 d8ec8b8dd612632c6e67170b0e23bf6151c2b159 SHA256 81229f55cf09433396322494709ba8502d639f92ee466956f9fffd6e6a93b2f7
 MISC metadata.xml 420 RMD160 789f5a0ce45d05125098fd7e74a816cf08f4c39b SHA1 d308d7434a37f12cd320f74ed85e1d3ca7dabc75 SHA256 ac37a5084450a782d02510149d030bd0d4a63164f2ffb7bdda3ddf344606ca62
diff --git a/dev-db/postgresql-server/postgresql-server-9.0.0.ebuild b/dev-db/postgresql-server/postgresql-server-9.0.0.ebuild
index ad4fb2e156a8..b841a4609624 100644
--- a/dev-db/postgresql-server/postgresql-server-9.0.0.ebuild
+++ b/dev-db/postgresql-server/postgresql-server-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-server/postgresql-server-9.0.0.ebuild,v 1.2 2010/09/20 08:49:11 patrick Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-db/postgresql-server/postgresql-server-9.0.0.ebuild,v 1.3 2010/10/05 13:56:41 scarabeus Exp $
 
 EAPI="2"
 PYTHON_DEPEND="python? 2"
@@ -22,20 +22,24 @@ 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}"
+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 kernel_linux nls perl pg_legacytimestamp python selinux tcl uuid xml"
+
+for lingua in ${LINGUAS}; do
+	IUSE+=" linguas_${lingua}"
+done
 
 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="~dev-db/postgresql-base-${PV}:${SLOT}[pg_legacytimestamp=]
+RDEPEND="~dev-db/postgresql-base-${PV}:${SLOT}[pg_legacytimestamp=,nls=]
 	perl? ( >=dev-lang/perl-5.6.1-r2 )
 	python? ( dev-python/egenix-mx-base )
 	selinux? ( sec-policy/selinux-postgresql )
@@ -70,9 +74,6 @@ src_prepare() {
 }
 
 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 \
@@ -85,12 +86,12 @@ src_configure() {
 		--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)")"
+		"$(use_enable nls nls "$(wanted_languages)")"
 }
 
 src_compile() {
 	local bd
-	for bd in .  contrib $(use xml && echo contrib/xml2); do
+	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
@@ -114,7 +115,7 @@ src_install() {
 	dodoc README HISTORY doc/{README.*,TODO,bug.template}
 
 	dodir /etc/eselect/postgresql/slots/${SLOT}
-	cat >"${D}/etc/eselect/postgresql/slots/${SLOT}/service" <<-__EOF__
+	cat > "${D}/etc/eselect/postgresql/slots/${SLOT}/service" <<-__EOF__
 		postgres_ebuilds="\${postgres_ebuilds} ${PF}"
 		postgres_service="postgresql-${SLOT}"
 	__EOF__