summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPacho Ramos <pacho@gentoo.org>2012-01-30 09:45:11 +0000
committerPacho Ramos <pacho@gentoo.org>2012-01-30 09:45:11 +0000
commit75a48f4ee86a555afca5ca03dc85fb5e8d5bca70 (patch)
tree20599f93c3a0cb3b253d1074bbdaf5660278651d /x11-libs
parentAdd more relaxed pax marking to work on hardened. Fixes bug #396371. (diff)
downloadgentoo-2-75a48f4ee86a555afca5ca03dc85fb5e8d5bca70.tar.gz
gentoo-2-75a48f4ee86a555afca5ca03dc85fb5e8d5bca70.tar.bz2
gentoo-2-75a48f4ee86a555afca5ca03dc85fb5e8d5bca70.zip
REQUIRED_USE='doc? ( X )' due upstream bug #643802, move gnome2_src_prepare to proper place.
(Portage version: 2.1.10.44/cvs/Linux x86_64)
Diffstat (limited to 'x11-libs')
-rw-r--r--x11-libs/pango/ChangeLog8
-rw-r--r--x11-libs/pango/pango-1.29.4.ebuild10
2 files changed, 12 insertions, 6 deletions
diff --git a/x11-libs/pango/ChangeLog b/x11-libs/pango/ChangeLog
index cb703f9103cb..99a8ca79ae18 100644
--- a/x11-libs/pango/ChangeLog
+++ b/x11-libs/pango/ChangeLog
@@ -1,6 +1,10 @@
# ChangeLog for x11-libs/pango
-# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-libs/pango/ChangeLog,v 1.329 2011/10/19 01:59:34 tetromino Exp $
+# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/pango/ChangeLog,v 1.330 2012/01/30 09:45:11 pacho Exp $
+
+ 30 Jan 2012; Pacho Ramos <pacho@gentoo.org> pango-1.29.4.ebuild:
+ REQUIRED_USE='doc? ( X )' due upstream bug #643802, move gnome2_src_prepare to
+ proper place.
*pango-1.29.4 (19 Oct 2011)
diff --git a/x11-libs/pango/pango-1.29.4.ebuild b/x11-libs/pango/pango-1.29.4.ebuild
index 2322ecba8b5a..fff617c7ee9e 100644
--- a/x11-libs/pango/pango-1.29.4.ebuild
+++ b/x11-libs/pango/pango-1.29.4.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2011 Gentoo Foundation
+# Copyright 1999-2012 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-libs/pango/pango-1.29.4.ebuild,v 1.1 2011/10/19 01:59:34 tetromino Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/pango/pango-1.29.4.ebuild,v 1.2 2012/01/30 09:45:11 pacho Exp $
EAPI="4"
GCONF_DEBUG="yes"
@@ -17,6 +17,9 @@ KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86
IUSE="X doc +introspection test"
+# Upstream bug #643802
+REQUIRED_USE="doc? ( X )"
+
# Use glib-2.29.5 for g_atomic_int_add
RDEPEND=">=dev-libs/glib-2.29.5:2
>=media-libs/fontconfig-2.5.0:1.0
@@ -56,8 +59,6 @@ pkg_setup() {
}
src_prepare() {
- gnome2_src_prepare
-
# make config file location host specific so that a 32bit and 64bit pango
# wont fight with each other on a multilib system. Fix building for
# emul-linux-x86-gtklibs
@@ -67,6 +68,7 @@ src_prepare() {
fi
elibtoolize # for Darwin bundles
+ gnome2_src_prepare
}
pkg_postinst() {