Disable automagic dependency over libunistring. Closes bug #326477.

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

4 files changed, 22 insertions, 10 deletions

diff --git a/sys-devel/gettext/ChangeLog b/sys-devel/gettext/ChangeLog
index 4b2ac73dc766..1b166c71e74a 100644
--- a/sys-devel/gettext/ChangeLog
+++ b/sys-devel/gettext/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for sys-devel/gettext
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-devel/gettext/ChangeLog,v 1.180 2010/06/19 20:47:54 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-devel/gettext/ChangeLog,v 1.181 2010/07/01 15:57:50 flameeyes Exp $
+
+  01 Jul 2010; Diego E. Pettenò <flameeyes@gentoo.org>
+  gettext-0.18.1.ebuild, gettext-0.18.1.1.ebuild:
+  Disable automagic dependency over libunistring. Closes bug #326477.
 
 *gettext-0.18.1.1 (19 Jun 2010)
 
diff --git a/sys-devel/gettext/Manifest b/sys-devel/gettext/Manifest
index 784d8e0bd551..21ec0cfb418d 100644
--- a/sys-devel/gettext/Manifest
+++ b/sys-devel/gettext/Manifest
@@ -1,5 +1,5 @@
 -----BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA256
+Hash: SHA1
 
 AUX gettext-0.14.1-lib-path-tests.patch 707 RMD160 4ec25fa507f8f58a361991237f1b32ad52caff92 SHA1 e70dcbe2a964530ae27bfdc56e995538b8d5e5ad SHA256 c9681e9dc9f04ffb041e5fa6dac886d529231ddb1b73688157d69c3277b96097
 AUX gettext-0.14.2-fix-race.patch 372 RMD160 133c369283a0cc8ab2a9ab4423703aabcffdd282 SHA1 c8e41675adc04647daae48477c1116a71544d09c SHA256 40495c22d86688d1862742ef11a8c9dc5ffddb4e91070d365e6b9639c105c298
@@ -14,15 +14,15 @@ DIST gettext-0.18.1.tar.gz 15140564 RMD160 44a0e060c1f5d27462ab8d58e01da2fea5a48
 DIST gettext-0.18.tar.gz 12011166 RMD160 7725881dd68cc05d0b782fe64c08acc90eb6146d SHA1 de396ec6877a451427d8597197d18c2d4b8f1a26 SHA256 02342c1de18c03c601f8b91cbd896b70486a4b945bd816f34541e0d7b5a96fe5
 EBUILD gettext-0.16.1-r1.ebuild 3234 RMD160 f6ba27e42e7af4a292a952091fa1e1375f87e497 SHA1 00cf496098244a88085a7361640e1fa854c3da6c SHA256 efb527d6bef72f6c824a5a5356dd2715d37a07b363077815711477402406d3a1
 EBUILD gettext-0.17-r1.ebuild 3712 RMD160 69374518b21fcb93d9b6dc3a78024d6f81637e0a SHA1 13459af8f378ac5dda812e96024a8002191669c8 SHA256 9dce6782dbc8922f28ddaed6240a1c2f713e57b757fd970e34ab5d68a4d59720
-EBUILD gettext-0.18.1.1.ebuild 2706 RMD160 1fa07297c01f93b2273ddef9ec275cade57c4e45 SHA1 bbf3d5ccccc1062a3cf2de82273a7e3fbdd00236 SHA256 a5f54894ae734352ffe430ea2e4fe0ea8ed6cf64588ffe32de4a192c7fe5aed1
-EBUILD gettext-0.18.1.ebuild 2704 RMD160 f6c9f994ab7a160599078016fc15bc5b13b45a1f SHA1 fbaee6069485436dcf450260cdec06d854f37230 SHA256 2fa1733558687c083bfe443ddb72148f53f53a683f3bdc9faddf22aded71d8f4
+EBUILD gettext-0.18.1.1.ebuild 2852 RMD160 90629c3163fd1a2e88e6ecf7442879b671dc20dc SHA1 ca161605bde8a94c821e064f61168e404ceebf15 SHA256 dd0f8683710651d0c64e71ecbb178599d5e47cd067c3655c4abb0d4937abf9e1
+EBUILD gettext-0.18.1.ebuild 2850 RMD160 e909118324dfda069cd37960194a1b8ae094b5ad SHA1 5e51cb758bf5771a382b593ea0cf03b3bd251b47 SHA256 834fc6c9f7a848f74b9603407f07e8bcbc9ef2d9cb38418aaf39b85bf453f526
 EBUILD gettext-0.18.ebuild 2702 RMD160 1c6bd9088c15ed7a54c0b032a1529e1471a9fb55 SHA1 c8a99981f4a2a8ef45539467654646670981d100 SHA256 b010debd27935050014349a61738c91bdcbcd95f012dd61c484dd9174ff103b9
-MISC ChangeLog 23253 RMD160 01b4d70f16899ce1efd190b6dc3bbb0c7b06bd22 SHA1 0648df67d596df5556668773f572dbde616eac13 SHA256 d8448f61609da51d0b227c676bea02d48b6be1375db69cacb1052d5a737136a7
+MISC ChangeLog 23433 RMD160 0bf7dae46dd7b89672768522b77417e9a65a4190 SHA1 16c2be6549272c06441515e2ce087fee89606e79 SHA256 b7c456366a61a980421c0b5c8f0e964404f575c332ac19f3f3634b4dac0e11d3
 MISC metadata.xml 164 RMD160 f43cbec30b7074319087c9acffdb9354b17b0db3 SHA1 9c213f5803676c56439df3716be07d6692588856 SHA256 f5f2891f2a4791cd31350bb2bb572131ad7235cd0eeb124c9912c187ac10ce92
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.15 (GNU/Linux)
 
-iF4EAREIAAYFAkwdLlsACgkQTwhj9JtAlp4HSwD8DHDUo3ps9Br2eO4T7F5V0O1A
-TKY+xAms6wC1ifPwkrkA/i70HwHf5hJJs07z2vsDXWMWn2xLNbo+4RcshJQmO0Ni
-=mvb9
+iEYEARECAAYFAkwsuxUACgkQAiZjviIA2XiIQgCgxztQYSgGDY/zbi0hl6QuAA+B
+WOMAn1NmzoDL/8L2GysvNCrHr1Yh/pUU
+=lR1M
 -----END PGP SIGNATURE-----
diff --git a/sys-devel/gettext/gettext-0.18.1.1.ebuild b/sys-devel/gettext/gettext-0.18.1.1.ebuild
index b13aa0b451a3..3e58cab2417c 100644
--- a/sys-devel/gettext/gettext-0.18.1.1.ebuild
+++ b/sys-devel/gettext/gettext-0.18.1.1.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/sys-devel/gettext/gettext-0.18.1.1.ebuild,v 1.1 2010/06/19 20:47:54 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-devel/gettext/gettext-0.18.1.1.ebuild,v 1.2 2010/07/01 15:57:50 flameeyes Exp $
 
 EAPI="2"
 
@@ -39,12 +39,16 @@ src_configure() {
 	# --without-emacs: Emacs support is now in a separate package
 	# --with-included-glib: glib depends on us so avoid circular deps
 	# --with-included-libcroco: libcroco depends on glib which ... ^^^
+	#
+	# --with-included-libunistring will _disable_ libunistring (since
+	# --it's not bundled), see bug #326477
 	econf \
 		--docdir="/usr/share/doc/${PF}" \
 		--without-emacs \
 		--disable-java \
 		--with-included-glib \
 		--with-included-libcroco \
+		--with-included-libunistring \
 		$(use_enable acl) \
 		$(use_enable openmp)
 }
diff --git a/sys-devel/gettext/gettext-0.18.1.ebuild b/sys-devel/gettext/gettext-0.18.1.ebuild
index 862df3727e0d..1c845d50d71d 100644
--- a/sys-devel/gettext/gettext-0.18.1.ebuild
+++ b/sys-devel/gettext/gettext-0.18.1.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/sys-devel/gettext/gettext-0.18.1.ebuild,v 1.1 2010/06/05 01:55:49 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-devel/gettext/gettext-0.18.1.ebuild,v 1.2 2010/07/01 15:57:50 flameeyes Exp $
 
 EAPI="2"
 
@@ -39,12 +39,16 @@ src_configure() {
 	# --without-emacs: Emacs support is now in a separate package
 	# --with-included-glib: glib depends on us so avoid circular deps
 	# --with-included-libcroco: libcroco depends on glib which ... ^^^
+	#
+	# --with-included-libunistring will _disable_ libunistring (since
+	# --it's not bundled), see bug #326477
 	econf \
 		--docdir="/usr/share/doc/${PF}" \
 		--without-emacs \
 		--disable-java \
 		--with-included-glib \
 		--with-included-libcroco \
+		--with-included-libunistring \
 		$(use_enable acl) \
 		$(use_enable openmp)
 }