diff options
| author |   Samuli Suominen <ssuominen@gentoo.org> | 2011-08-10 20:07:52 +0000 |
|---|---|---|
| committer | Samuli Suominen <ssuominen@gentoo.org> | 2011-08-10 20:07:52 +0000 |
| commit | 3bc792a30d8dfd7b5364b6bced34f219e519d480 (patch) | |
| tree | 29698b4052e26c5799e5c09d699ea7b707ee9b48 /dev-libs/glib/glib-2.28.8.ebuild | |
| parent | Revision bump, add workaround to bug #332861 (diff) | |
| download | historical-3bc792a30d8dfd7b5364b6bced34f219e519d480.tar.gz historical-3bc792a30d8dfd7b5364b6bced34f219e519d480.tar.bz2 historical-3bc792a30d8dfd7b5364b6bced34f219e519d480.zip | |
Fix circular depend with USE="test" and dev-util/pkgconfig. Remove libtool files.
Package-Manager: portage-2.2.0_alpha50/cvs/Linux x86_64
Diffstat (limited to 'dev-libs/glib/glib-2.28.8.ebuild')
| -rw-r--r-- | dev-libs/glib/glib-2.28.8.ebuild | 14 |
1 files changed, 11 insertions, 3 deletions
diff --git a/dev-libs/glib/glib-2.28.8.ebuild b/dev-libs/glib/glib-2.28.8.ebuild index 644743dc0fc8..630aeaea8942 100644 --- a/dev-libs/glib/glib-2.28.8.ebuild +++ b/dev-libs/glib/glib-2.28.8.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.8.ebuild,v 1.10 2011/07/29 04:13:33 zmedico Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-libs/glib/glib-2.28.8.ebuild,v 1.11 2011/08/10 20:07:52 ssuominen Exp $ EAPI="3" GNOME_TARBALL_SUFFIX="xz" @@ -29,8 +29,7 @@ DEPEND="${RDEPEND} >=dev-libs/libxslt-1.0 >=dev-util/gtk-doc-1.13 ~app-text/docbook-xml-dtd-4.1.2 ) - test? ( dev-util/pkgconfig - >=sys-apps/dbus-1.2.14 ) + test? ( >=sys-apps/dbus-1.2.14 ) !<dev-util/gtk-doc-1.15-r2" PDEPEND="introspection? ( dev-libs/gobject-introspection ) !<gnome-base/gvfs-1.6.4-r990" # Earlier versions do not work with glib @@ -113,6 +112,12 @@ src_prepare() { } src_configure() { + # Avoid circular depend with dev-util/pkgconfig + if ! has_version dev-util/pkgconfig; then + export DBUS1_CFLAGS="-I/usr/include/dbus-1.0 -I/usr/$(get_libdir)/dbus-1.0/include" + export DBUS1_LIBS="-ldbus-1" + fi + local myconf # Building with --disable-debug highly unrecommended. It will build glib in @@ -153,6 +158,9 @@ src_install() { newins "${ED}/etc/bash_completion.d/${f}-bash-completion.sh" ${f} || die done rm -rf "${ED}/etc" + + # Redudant with pkg-config files in place + find "${ED}" -name '*.la' -exec rm -f {} + } src_test() { |