summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDiego Elio Pettenò <flameeyes@gentoo.org>2010-07-01 15:57:50 +0000
committerDiego Elio Pettenò <flameeyes@gentoo.org>2010-07-01 15:57:50 +0000
commitb3fedf6997033c35454b064f8a64ab0c8803146b (patch)
tree98e0244e998a5f9aad0aecdccfee704cf65ee3f1 /sys-devel
parentwhitespace (diff)
downloadgentoo-2-b3fedf6997033c35454b064f8a64ab0c8803146b.tar.gz
gentoo-2-b3fedf6997033c35454b064f8a64ab0c8803146b.tar.bz2
gentoo-2-b3fedf6997033c35454b064f8a64ab0c8803146b.zip
Disable automagic dependency over libunistring. Closes bug #326477.
(Portage version: 2.2_rc67/cvs/Linux x86_64)
Diffstat (limited to 'sys-devel')
-rw-r--r--sys-devel/gettext/ChangeLog6
-rw-r--r--sys-devel/gettext/gettext-0.18.1.1.ebuild6
-rw-r--r--sys-devel/gettext/gettext-0.18.1.ebuild6
3 files changed, 15 insertions, 3 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/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)
}