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 | |
| 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')
| -rw-r--r-- | dev-libs/glib/ChangeLog | 6 | ||||
| -rw-r--r-- | dev-libs/glib/Manifest | 12 | ||||
| -rw-r--r-- | dev-libs/glib/glib-2.28.8.ebuild | 14 |
3 files changed, 22 insertions, 10 deletions
diff --git a/dev-libs/glib/ChangeLog b/dev-libs/glib/ChangeLog index 0f1e142f9fe0..160f73653d28 100644 --- a/dev-libs/glib/ChangeLog +++ b/dev-libs/glib/ChangeLog @@ -1,6 +1,10 @@ # 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.477 2011/07/17 20:43:06 maekke Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-libs/glib/ChangeLog,v 1.478 2011/08/10 20:07:52 ssuominen Exp $ + + 10 Aug 2011; Samuli Suominen <ssuominen@gentoo.org> glib-2.28.8.ebuild: + Fix circular depend with USE="test" and dev-util/pkgconfig. Remove libtool + files. 17 Jul 2011; Markus Meier <maekke@gentoo.org> glib-2.28.8.ebuild: arm stable, bug #369909 diff --git a/dev-libs/glib/Manifest b/dev-libs/glib/Manifest index 1507c26ad369..ebab2b52d252 100644 --- a/dev-libs/glib/Manifest +++ b/dev-libs/glib/Manifest @@ -1,5 +1,5 @@ -----BEGIN PGP SIGNED MESSAGE----- -Hash: SHA1 +Hash: SHA256 AUX glib-1.2.10-automake.patch 827 RMD160 3b1485f89a157b60f31f5ae8ffe2333ab842d217 SHA1 cd40e4dc579190a89e09fad9ac7b209f24b231b3 SHA256 db6d22caf4054c09467b50b6d85566eec7479a29169460950e423c083332ef67 AUX glib-1.2.10-configure-LANG.patch 1464 RMD160 91481ba6b3f7a1d6e22a4ab7003fcee17450f3c1 SHA1 d98cc2f4ac6cc4aae55270ad0e5705af4de9b3ad SHA256 32377819896297caf9628f382c7bba09ee0a049bd977e9ea927314c0c2e669b4 @@ -20,13 +20,13 @@ DIST glib-2.28.8.tar.xz 5223564 RMD160 9f665eee95990ace173676a4ad7aeeb0cc17fef9 DIST pkg-config-0.26.tar.gz 396399 RMD160 face3d16ec338b9b1ab41d56d6e4d1a5624b52d0 SHA1 fd71a70b023b9087c8a7bb76a0dc135a61059652 SHA256 94c1936a797c930fb3e4e5a154165b6268caba22b32d24083dd4c492a533c8af EBUILD glib-1.2.10-r5.ebuild 1777 RMD160 eaf01d9d6f1ba55edb93e46f46110b9e9c2fb778 SHA1 dbedf2bc146dcbec47ad308621bf1077c9f735cb SHA256 9d9dd1ea44c25087918148c2ba1203f3b38be09996bd7e48a26f9b4f93405d36 EBUILD glib-2.28.6.ebuild 5649 RMD160 1a57e73c13cae0a708808053ed6bd3e92c1ce29c SHA1 3c607a96e34dad256b32d9b006f2f5a8a333f454 SHA256 4a9d0a6f835a2aced9de540091acf8eaccf74cb054ce6d55576ea2ef34bdb78e -EBUILD glib-2.28.8.ebuild 7082 RMD160 770d0866c831a66c4b116bed6736eb85db6edea0 SHA1 c1394571ffe4d4eef7683559ded981b042872bd5 SHA256 83ac24bf365e937bbb39ff751bc7d8ef07315e5499bbf98ac85a522099e68ca7 -MISC ChangeLog 62470 RMD160 1cc74c1ec2fd5bb1496a12cb077fcb28d01f261d SHA1 539cd0713e88bc72c309ad5b19850ae0efc92ed8 SHA256 73ecb2af71df2c52e0360eef38b1450ca3beb7ab4a1f774e9fe0b265af1be714 +EBUILD glib-2.28.8.ebuild 7365 RMD160 d694e7f337514c0705022e74d8d527975db4f78e SHA1 ce5e2ee862e8a74f1d526c19f75772deade2cc6a SHA256 631122d06543d51cc243b52dac763e41071a072a4f9e042f364b24fbaa2ece9b +MISC ChangeLog 62634 RMD160 98c244bef51f7e3bbcbfc2de9ae70f56c86fa1de SHA1 10c65e59479385ffd1517ff91602dcec2016ec06 SHA256 8b34bb5d83f68e539b24e94111b462f6cdf36310ca6cfe533e98551a0cf92438 MISC metadata.xml 285 RMD160 829826c3a3edd13d82bf87a4e6c1c08719f1549f SHA1 03e8b2cfc1956cfea91e8cedfa2451e68b2bf8e5 SHA256 8400998fc578bc9661b57a27ed3226941e4f75ef5bf7d9f929ed9de2d97ba8b0 -----BEGIN PGP SIGNATURE----- Version: GnuPG v2.0.17 (GNU/Linux) -iEYEARECAAYFAk4yM3QACgkQ/ejvha5XGaO30ACfckSwubIIocqeRjAM4N1/BItU -YT8AniVqga63CP2RgQgOqJJP7s1YUdFB -=Gh53 +iF4EAREIAAYFAk5C5QYACgkQXkR9YqOcLPEx1gD/U2Cdcsz14QrDT9bpsR4B8WAt +pD1dZxJ9Ml01hyyL1pYBAIcxcFYpvGJrtLRjMGnSQQqRihkb4rDCyGr4Tzqj6MKG +=Rojf -----END PGP SIGNATURE----- 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() { |