diff options
| author |   Samuli Suominen <ssuominen@gentoo.org> | 2011-05-20 08:00:53 +0000 |
|---|---|---|
| committer | Samuli Suominen <ssuominen@gentoo.org> | 2011-05-20 08:00:53 +0000 |
| commit | 6a238dbd1d9960335d9cd240925545f5e3ce4a73 (patch) | |
| tree | 6ed898e103e3c6620cf28771004fde421069b925 /dev-libs/glib | |
| parent | x86 stable per bug 335657 (diff) | |
| download | gentoo-2-6a238dbd1d9960335d9cd240925545f5e3ce4a73.tar.gz gentoo-2-6a238dbd1d9960335d9cd240925545f5e3ce4a73.tar.bz2 gentoo-2-6a238dbd1d9960335d9cd240925545f5e3ce4a73.zip | |
pkg-config is still needed for USE=test, and USE=test will trigger circular dep, but not really anything new
(Portage version: 2.2.0_alpha33/cvs/Linux x86_64)
Diffstat (limited to 'dev-libs/glib')
| -rw-r--r-- | dev-libs/glib/ChangeLog | 9 | ||||
| -rw-r--r-- | dev-libs/glib/glib-2.28.6.ebuild | 5 |
2 files changed, 8 insertions, 6 deletions
diff --git a/dev-libs/glib/ChangeLog b/dev-libs/glib/ChangeLog index 34245e47de64..5868d98eeddd 100644 --- a/dev-libs/glib/ChangeLog +++ b/dev-libs/glib/ChangeLog @@ -1,11 +1,12 @@ # ChangeLog for dev-libs/glib # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/dev-libs/glib/ChangeLog,v 1.463 2011/05/20 07:47:59 ssuominen Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-libs/glib/ChangeLog,v 1.464 2011/05/20 08:00:53 ssuominen Exp $ 20 May 2011; Samuli Suominen <ssuominen@gentoo.org> glib-2.28.6.ebuild: - Remove dev-util/pkgconfig DEPEND to avoid circular dependency because it's - now using system copy of dev-libs/glib:2. Download pkg.m4 in SRC_URI for - eautoreconf instead. + Move dev-util/pkgconfig DEPEND behind USE="test" because it's only required + for checking sys-apps/dbus. This way we don't get circular dependencies now + that dev-util/pkgconfig is using system copy of dev-libs/glib:2. + Download pkg.m4 in SRC_URI for eautoreconf. 30 Apr 2011; Raúl Porcel <armin76@gentoo.org> glib-2.28.6.ebuild: alpha/arm/ia64/m68k/s390/sh/sparc stable wrt #364973 diff --git a/dev-libs/glib/glib-2.28.6.ebuild b/dev-libs/glib/glib-2.28.6.ebuild index 8f4960ab417d..5c9070ad252d 100644 --- a/dev-libs/glib/glib-2.28.6.ebuild +++ b/dev-libs/glib/glib-2.28.6.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2011 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/dev-libs/glib/glib-2.28.6.ebuild,v 1.8 2011/05/20 07:47:59 ssuominen Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-libs/glib/glib-2.28.6.ebuild,v 1.9 2011/05/20 08:00:53 ssuominen Exp $ EAPI="3" PYTHON_DEPEND="2" @@ -28,7 +28,8 @@ DEPEND="${RDEPEND} >=dev-libs/libxslt-1.0 >=dev-util/gtk-doc-1.13 ~app-text/docbook-xml-dtd-4.1.2 ) - test? ( >=sys-apps/dbus-1.2.14 )" + test? ( dev-util/pkgconfig + >=sys-apps/dbus-1.2.14 )" PDEPEND="introspection? ( dev-libs/gobject-introspection ) !<gnome-base/gvfs-1.6.4-r990" # Earlier versions do not work with glib |