diff options
| author |   Mike Frysinger <vapier@gentoo.org> | 2008-01-14 04:44:45 +0000 |
|---|---|---|
| committer | Mike Frysinger <vapier@gentoo.org> | 2008-01-14 04:44:45 +0000 |
| commit | e55305536643634c0ff9097e801c4c87367c39b5 (patch) | |
| tree | 4ed6cd29542b7af4071b7a43a53f4e68ae79b6f9 | |
| parent | Stable on amd64. (diff) | |
| download | gentoo-2-e55305536643634c0ff9097e801c4c87367c39b5.tar.gz gentoo-2-e55305536643634c0ff9097e801c4c87367c39b5.tar.bz2 gentoo-2-e55305536643634c0ff9097e801c4c87367c39b5.zip | |
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.
(Portage version: 2.1.4)
| -rw-r--r-- | sys-devel/gettext/ChangeLog | 8 | ||||
| -rw-r--r-- | sys-devel/gettext/gettext-0.17.ebuild | 18 |
2 files changed, 21 insertions, 5 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/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 |