Flip back to internal libcroco to avoid glib/gettext circular deps #204851 by Robin Johnson. Make sure we control all acl aspects (headers and libs) by forcing autoconf tests until gnulib/acl gets updated upstream #205568 by Robin Johnson.

Package-Manager: portage-2.1.4

3 files changed, 33 insertions, 17 deletions

diff --git a/sys-devel/gettext/ChangeLog b/sys-devel/gettext/ChangeLog
index 339e94f31e63..acd05b51c1eb 100644
--- a/sys-devel/gettext/ChangeLog
+++ b/sys-devel/gettext/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for sys-devel/gettext
 # 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 $
+# $Header: /var/cvsroot/gentoo-x86/sys-devel/gettext/ChangeLog,v 1.163 2008/01/14 04:44:45 vapier Exp $
+
+  14 Jan 2008; Mike Frysinger <vapier@gentoo.org> gettext-0.17.ebuild:
+  Flip back to internal libcroco to avoid glib/gettext circular deps #204851
+  by Robin Johnson. Make sure we control all acl aspects (headers and libs) by
+  forcing autoconf tests until gnulib/acl gets updated upstream #205568 by
+  Robin Johnson.
 
   07 Jan 2008; Mike Frysinger <vapier@gentoo.org> gettext-0.17.ebuild:
   Pull in ncurses/libcroco/libxml2 which we actually use, force glib to
diff --git a/sys-devel/gettext/Manifest b/sys-devel/gettext/Manifest
index 137334fa848a..d30e88d82673 100644
--- a/sys-devel/gettext/Manifest
+++ b/sys-devel/gettext/Manifest
@@ -19,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 3069 RMD160 a793b23e313bae430063924f3a8ecfe6cf413f57 SHA1 c20d5876757f21faf66f6aaab91b4a759477c970 SHA256 986e8a105f75f1bae626992bd4174846e830ae6a7a4c1216401527a0400d0520
-MD5 f3aa579402ba23999f9a7ff65eaf2b37 gettext-0.17.ebuild 3069
-RMD160 a793b23e313bae430063924f3a8ecfe6cf413f57 gettext-0.17.ebuild 3069
-SHA256 986e8a105f75f1bae626992bd4174846e830ae6a7a4c1216401527a0400d0520 gettext-0.17.ebuild 3069
-MISC ChangeLog 20411 RMD160 8c1c3c57ddca2ea7232d62e746a0bcf1431c0c83 SHA1 2b89ceae51bc33fb7d5ba2fe0b42ded7aa2addea SHA256 04edcae7e4e1c64156919281b69fb084f75c27a12ae5d019b3f1d197cbdaaa8b
-MD5 910fc3b8286380133f19e13dc745510d ChangeLog 20411
-RMD160 8c1c3c57ddca2ea7232d62e746a0bcf1431c0c83 ChangeLog 20411
-SHA256 04edcae7e4e1c64156919281b69fb084f75c27a12ae5d019b3f1d197cbdaaa8b ChangeLog 20411
+EBUILD gettext-0.17.ebuild 3546 RMD160 189a222879e65d76554f6e56504b1ef7fd3a7067 SHA1 3c4afe9967de9c33f0bd8af96c1fbf87cef398f5 SHA256 96d0d16d34e044a309bafd4af0d6755cb92b6fe545e86f3f2a4f4b3c168b5269
+MD5 002916b8830901cb561fce3bf3e9a955 gettext-0.17.ebuild 3546
+RMD160 189a222879e65d76554f6e56504b1ef7fd3a7067 gettext-0.17.ebuild 3546
+SHA256 96d0d16d34e044a309bafd4af0d6755cb92b6fe545e86f3f2a4f4b3c168b5269 gettext-0.17.ebuild 3546
+MISC ChangeLog 20731 RMD160 3097d7796e2993023242ce58254404b40e2bc743 SHA1 57dbaad475350ae5816ca222d0315a18a88c191e SHA256 5f6007facdb90bf7afc154a2685e9da93728037c88d5218bd212b283fc7a99b6
+MD5 6cf49ab6f9c8a14098526ff4f7896c98 ChangeLog 20731
+RMD160 3097d7796e2993023242ce58254404b40e2bc743 ChangeLog 20731
+SHA256 5f6007facdb90bf7afc154a2685e9da93728037c88d5218bd212b283fc7a99b6 ChangeLog 20731
 MISC metadata.xml 164 RMD160 f43cbec30b7074319087c9acffdb9354b17b0db3 SHA1 9c213f5803676c56439df3716be07d6692588856 SHA256 f5f2891f2a4791cd31350bb2bb572131ad7235cd0eeb124c9912c187ac10ce92
 MD5 9a09f8d531c582e78977dbfd96edc1f2 metadata.xml 164
 RMD160 f43cbec30b7074319087c9acffdb9354b17b0db3 metadata.xml 164
@@ -38,9 +38,9 @@ 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)
+Version: GnuPG v2.0.7 (GNU/Linux)
 
-iEYEARECAAYFAkeEF88ACgkQj9hvisErhMJxyACfVqYjaXbmdPE+JQQmabLxb7Uf
-gcsAoJHAuSpCFNNU/3PJXHf1db4UyXXp
-=k2Ey
+iD8DBQFHiujDj9hvisErhMIRAi1xAKDYhGgsL3lY32We15yuG2T3a7vlygCgqd+G
+dvpcHE+D26yCCBiygxr1KPE=
+=0Gdt
 -----END PGP SIGNATURE-----
diff --git a/sys-devel/gettext/gettext-0.17.ebuild b/sys-devel/gettext/gettext-0.17.ebuild
index 66d234af13fb..4c987c393462 100644
--- a/sys-devel/gettext/gettext-0.17.ebuild
+++ b/sys-devel/gettext/gettext-0.17.ebuild
@@ -1,6 +1,6 @@
 # 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.10 2008/01/09 00:39:38 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-devel/gettext/gettext-0.17.ebuild,v 1.11 2008/01/14 04:44:45 vapier Exp $
 
 inherit flag-o-matic eutils multilib toolchain-funcs mono libtool
 
@@ -14,7 +14,6 @@ KEYWORDS="alpha amd64 arm hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc ~sparc-fb
 IUSE="acl doc emacs nls nocxx openmp"
 
 DEPEND="virtual/libiconv
-	dev-libs/libcroco
 	dev-libs/libxml2
 	sys-libs/ncurses
 	dev-libs/expat
@@ -37,7 +36,15 @@ src_unpack() {
 		-e '2iexit 77' \
 		autoconf-lib-link/tests/rpath-3*[ef] || die "sed tests"
 
-	use acl || sed -i 's:use_acl=1:use_acl=0:' gettext-tools/configure
+	# until upstream pulls a new gnulib/acl, we have to hack around it
+	if ! use acl ; then
+		eval export ac_cv_func_acl{,delete_def_file,extended_file,free,from_{mode,text},{g,s}et_{fd,file}}=no
+		export ac_cv_header_acl_libacl_h=no
+		export ac_cv_header_sys_acl_h=no
+		export ac_cv_search_acl_get_file=no
+		export gl_cv_func_working_acl_get_file=no
+		sed -i -e 's:use_acl=1:use_acl=0:' gettext-tools/configure
+	fi
 }
 
 src_compile() {
@@ -50,12 +57,15 @@ src_compile() {
 	fi
 	use nocxx && export CXX=$(tc-getCC)
 
-	# Emacs support is now in a separate package, so configure --without-emacs
+	# --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 ... ^^^
 	econf \
 		--docdir="/usr/share/doc/${PF}" \
 		--without-emacs \
 		--disable-java \
 		--with-included-glib \
+		--with-included-libcroco \
 		$(use_enable openmp) \
 		${myconf} \
 		|| die