Pull in ncurses/libcroco/libxml2 which we actually use, force glib to bundled version, and add support for USE="acl openmp".

Package-Manager: portage-2.1.4_rc14

3 files changed, 38 insertions, 26 deletions

diff --git a/sys-devel/gettext/ChangeLog b/sys-devel/gettext/ChangeLog
index f454b3c5ece0..339e94f31e63 100644
--- a/sys-devel/gettext/ChangeLog
+++ b/sys-devel/gettext/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for sys-devel/gettext
-# Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-devel/gettext/ChangeLog,v 1.161 2007/12/17 01:24:14 jer Exp $
+# Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/sys-devel/gettext/ChangeLog,v 1.162 2008/01/07 05:17:29 vapier Exp $
+
+  07 Jan 2008; Mike Frysinger <vapier@gentoo.org> gettext-0.17.ebuild:
+  Pull in ncurses/libcroco/libxml2 which we actually use, force glib to
+  bundled version, and add support for USE="acl openmp".
 
   17 Dec 2007; Jeroen Roovers <jer@gentoo.org> gettext-0.17.ebuild:
   Stable for HPPA (bug #202168).
diff --git a/sys-devel/gettext/Manifest b/sys-devel/gettext/Manifest
index 31edcbf43b50..ea10dcdce4db 100644
--- a/sys-devel/gettext/Manifest
+++ b/sys-devel/gettext/Manifest
@@ -1,3 +1,6 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
 AUX gettext-0.14.1-lib-path-tests.patch 707 RMD160 4ec25fa507f8f58a361991237f1b32ad52caff92 SHA1 e70dcbe2a964530ae27bfdc56e995538b8d5e5ad SHA256 c9681e9dc9f04ffb041e5fa6dac886d529231ddb1b73688157d69c3277b96097
 MD5 3077319e6090fcd6262e2d8fd463441f files/gettext-0.14.1-lib-path-tests.patch 707
 RMD160 4ec25fa507f8f58a361991237f1b32ad52caff92 files/gettext-0.14.1-lib-path-tests.patch 707
@@ -16,14 +19,14 @@ EBUILD gettext-0.16.1-r1.ebuild 3223 RMD160 195f67381b0b0ecfa82dd167b7f595983466
 MD5 e11cf7cb33bae82c26a8932cdb838151 gettext-0.16.1-r1.ebuild 3223
 RMD160 195f67381b0b0ecfa82dd167b7f5959834661804 gettext-0.16.1-r1.ebuild 3223
 SHA256 86f6086696d72b8e0d2774383f93647275e45c2af96d018336fa598c82931de8 gettext-0.16.1-r1.ebuild 3223
-EBUILD gettext-0.17.ebuild 3219 RMD160 bd2063f484f3d413a044c80c4059aa219002edf9 SHA1 c2310d5b42156a61fbb88e8e034e484994b668a8 SHA256 90dce1e1f9609f12802cd31bec15b1f808bd58a229ec1c4fc443cb1c512ff746
-MD5 6e041c11648e45c540b8a9794aaa3832 gettext-0.17.ebuild 3219
-RMD160 bd2063f484f3d413a044c80c4059aa219002edf9 gettext-0.17.ebuild 3219
-SHA256 90dce1e1f9609f12802cd31bec15b1f808bd58a229ec1c4fc443cb1c512ff746 gettext-0.17.ebuild 3219
-MISC ChangeLog 20207 RMD160 3edf676a889858b8cd993d3e5b38191f05b16747 SHA1 3980ab04a597ab64dc39d0fe858ab01f20e1dd54 SHA256 9333c06f40726b9b1fe9da3565ab323e8a36d4a443dfdcbb4d297070a89c248a
-MD5 de200b0eafadf32ee28a7c794efc3be6 ChangeLog 20207
-RMD160 3edf676a889858b8cd993d3e5b38191f05b16747 ChangeLog 20207
-SHA256 9333c06f40726b9b1fe9da3565ab323e8a36d4a443dfdcbb4d297070a89c248a ChangeLog 20207
+EBUILD gettext-0.17.ebuild 3054 RMD160 86aac4f6e784ca8d6ebbc763c8c9218ccdfc1cbf SHA1 bfe5999392383bc045cbc92113bb1a74925759ad SHA256 c18f00986d5ff3dd70cffa70f14e25ec06b295bfd77636c7e928ca411487f0cc
+MD5 2a2d812a206c9bf11df22ff2c5345d50 gettext-0.17.ebuild 3054
+RMD160 86aac4f6e784ca8d6ebbc763c8c9218ccdfc1cbf gettext-0.17.ebuild 3054
+SHA256 c18f00986d5ff3dd70cffa70f14e25ec06b295bfd77636c7e928ca411487f0cc gettext-0.17.ebuild 3054
+MISC ChangeLog 20411 RMD160 8c1c3c57ddca2ea7232d62e746a0bcf1431c0c83 SHA1 2b89ceae51bc33fb7d5ba2fe0b42ded7aa2addea SHA256 04edcae7e4e1c64156919281b69fb084f75c27a12ae5d019b3f1d197cbdaaa8b
+MD5 910fc3b8286380133f19e13dc745510d ChangeLog 20411
+RMD160 8c1c3c57ddca2ea7232d62e746a0bcf1431c0c83 ChangeLog 20411
+SHA256 04edcae7e4e1c64156919281b69fb084f75c27a12ae5d019b3f1d197cbdaaa8b ChangeLog 20411
 MISC metadata.xml 164 RMD160 f43cbec30b7074319087c9acffdb9354b17b0db3 SHA1 9c213f5803676c56439df3716be07d6692588856 SHA256 f5f2891f2a4791cd31350bb2bb572131ad7235cd0eeb124c9912c187ac10ce92
 MD5 9a09f8d531c582e78977dbfd96edc1f2 metadata.xml 164
 RMD160 f43cbec30b7074319087c9acffdb9354b17b0db3 metadata.xml 164
@@ -34,3 +37,10 @@ SHA256 fcec1f6a5ae0b5b6204ed6bb505566eec066b83ba20aab9a94740353912a4d1c files/di
 MD5 508542369ed9ee45fde8cb75b7cba403 files/digest-gettext-0.17 244
 RMD160 7357797c1c8433639221bedab8f0fb1773c6711d files/digest-gettext-0.17 244
 SHA256 295f80a4341e2336ec4916e2a283e5e9df51c86d6331cdf49ba3a724ebc6adff files/digest-gettext-0.17 244
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.8 (GNU/Linux)
+
+iEYEARECAAYFAkeBte8ACgkQj9hvisErhMKeEACgxUxCuM+cFBIlBI31LaB0Q8HR
+9PAAn0vppAu9vZ9KzHBPPZiUmYQJNNgz
+=1+qn
+-----END PGP SIGNATURE-----
diff --git a/sys-devel/gettext/gettext-0.17.ebuild b/sys-devel/gettext/gettext-0.17.ebuild
index 9bdaa16be6bd..869c21b2458b 100644
--- a/sys-devel/gettext/gettext-0.17.ebuild
+++ b/sys-devel/gettext/gettext-0.17.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2007 Gentoo Foundation
+# Copyright 1999-2008 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-devel/gettext/gettext-0.17.ebuild,v 1.8 2007/12/17 01:24:14 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-devel/gettext/gettext-0.17.ebuild,v 1.9 2008/01/07 05:17:28 vapier Exp $
 
 inherit flag-o-matic eutils multilib toolchain-funcs mono libtool
 
@@ -10,11 +10,15 @@ SRC_URI="mirror://gnu/${PN}/${P}.tar.gz"
 
 LICENSE="GPL-3 LGPL-2"
 SLOT="0"
-KEYWORDS="alpha amd64 ~arm hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc ~sparc-fbsd x86 ~x86-fbsd"
-IUSE="emacs nls doc nocxx"
+KEYWORDS="alpha amd64 arm hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc ~sparc-fbsd x86 ~x86-fbsd"
+IUSE="acl doc emacs nls nocxx openmp"
 
 DEPEND="virtual/libiconv
-	dev-libs/expat"
+	dev-libs/libcroco
+	dev-libs/libxml2
+	sys-libs/ncurses
+	dev-libs/expat
+	acl? ( sys-apps/acl )"
 PDEPEND="emacs? ( app-emacs/po-mode )"
 
 src_unpack() {
@@ -33,12 +37,7 @@ src_unpack() {
 		-e '2iexit 77' \
 		autoconf-lib-link/tests/rpath-3*[ef] || die "sed tests"
 
-	# sanity check for Bug 105304
-	if [[ -z ${USERLAND} ]] ; then
-		eerror "You just hit Bug 105304, please post your 'emerge info' here:"
-		eerror "http://bugs.gentoo.org/105304"
-		die "Aborting to prevent screwing your system"
-	fi
+	use acl || sed -i 's:use_acl=1:use_acl=0:' configure
 }
 
 src_compile() {
@@ -56,13 +55,15 @@ src_compile() {
 		--docdir="/usr/share/doc/${PF}" \
 		--without-emacs \
 		--disable-java \
+		--with-included-glib \
+		$(use_enable openmp) \
 		${myconf} \
 		|| die
 	emake || die
 }
 
 src_install() {
-	make install DESTDIR="${D}" || die "install failed"
+	emake install DESTDIR="${D}" || die "install failed"
 	use nls || rm -r "${D}"/usr/share/locale
 	dosym msgfmt /usr/bin/gmsgfmt #43435
 	dobin gettext-tools/misc/gettextize || die "gettextize"
@@ -100,8 +101,5 @@ pkg_preinst() {
 }
 
 pkg_postinst() {
-	ewarn "Any package that linked against the previous version"
-	ewarn "of gettext will have to be rebuilt."
-	ewarn "Please 'emerge gentoolkit' and run:"
-	ewarn "revdep-rebuild --library libintl.so.7"
+	preserve_old_lib_notify /{,usr/}$(get_libdir)/libintl$(get_libname 7)
 }