From: Alexandre Rostovtsev Date: Mon, 28 Nov 2011 08:07:51 +0000 (+0000) Subject: Depend on gdk-pixbuf[introspection?] (bug #392233, thanks to krassboter@googlemail... X-Git-Url: http://git.tremily.us/gitweb.cgi?a=commitdiff_plain;h=1f9412f4b1a9982ce54eba094b54fa1419e2ecb7;p=gentoo.git Depend on gdk-pixbuf[introspection?] (bug #392233, thanks to krassboter@googlemail.com for reporting). Remove obsolete ||-dependency (gtk+-2.20 is long gone from portage). Package-Manager: portage-2.2.0_alpha79/cvs/Linux x86_64 --- diff --git a/gnome-base/librsvg/ChangeLog b/gnome-base/librsvg/ChangeLog index dac1d9883859..6de5b4c339af 100644 --- a/gnome-base/librsvg/ChangeLog +++ b/gnome-base/librsvg/ChangeLog @@ -1,6 +1,12 @@ # ChangeLog for gnome-base/librsvg # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/gnome-base/librsvg/ChangeLog,v 1.261 2011/11/23 23:06:13 tetromino Exp $ +# $Header: /var/cvsroot/gentoo-x86/gnome-base/librsvg/ChangeLog,v 1.262 2011/11/28 08:07:51 tetromino Exp $ + + 28 Nov 2011; Alexandre Rostovtsev + librsvg-2.34.2.ebuild: + Depend on gdk-pixbuf[introspection?] (bug #392233, thanks to + krassboter@googlemail.com for reporting). Remove obsolete ||-dependency + (gtk+-2.20 is long gone from portage). 23 Nov 2011; Alexandre Rostovtsev librsvg-2.34.2.ebuild, +files/librsvg-2.34.2-gir-filename.patch: diff --git a/gnome-base/librsvg/Manifest b/gnome-base/librsvg/Manifest index 1b97ad73e2b5..a93824a887a7 100644 --- a/gnome-base/librsvg/Manifest +++ b/gnome-base/librsvg/Manifest @@ -8,13 +8,13 @@ DIST librsvg-2.34.1.tar.xz 482380 RMD160 612dacdae9665445b982bf70b2c589c801b83f0 DIST librsvg-2.34.2.tar.xz 499108 RMD160 491432c990584da926c0844f68a92e4a3556a05e SHA1 9542af41b30f09f31753262f382c0118fb42891d SHA256 5de701325b84c0a15ab6892f49ffd6471722044bfe0b350725bf420642ee4464 EBUILD librsvg-2.34.1-r1.ebuild 2520 RMD160 4254d5e5e5cc9093493ce0a4e747c56f7efe417c SHA1 eac07b0a4cb469e70a962e5c8f45c4f29c5c55ec SHA256 686f59a313a99185a684bbfd40a6e75ff6373b17ba85d77a1784d121e39809e6 EBUILD librsvg-2.34.1.ebuild 2315 RMD160 9e44445dc087dca91e886c2c4b892f4c5f2fc7b6 SHA1 5e3daf5954b4ac83030c99d3d5850c30646ff1be SHA256 61fe0f672394317f1908fe1ff6ab2120fbc909721719c1e42b936b094d35f3a2 -EBUILD librsvg-2.34.2.ebuild 2946 RMD160 d1c66f53d352774c9a193008e438f7092d903f5f SHA1 a483617bb51d0c15b5b43fa29f3f189f18fee61f SHA256 965c5a8efd2450db3f8f8d361875089ea57fb3c1e008bceb394ad81476984a17 -MISC ChangeLog 33603 RMD160 5f50aeb8745b27bc58e7cea25bed2affe7dd57e3 SHA1 d9ad9b766367bb92569b7b6491437e96df83e104 SHA256 8e6ee1b375b1d33efbdce6327b9b652af19725bda814f21996d74fb16d45873b +EBUILD librsvg-2.34.2.ebuild 2937 RMD160 6ad77d51c6ff0da792e9a4b439bc039e1aa438aa SHA1 ba9a4c6c057bca1881ce080d85adb049e01685d6 SHA256 09575d446e0f44af34b39b4ca3ed3fdc1864df837a496d2a6e9c15539ff25fc4 +MISC ChangeLog 33866 RMD160 980b68b2e346a99cabf05461765b3f3d9171eb51 SHA1 7c400f883d7398308bf31af977efacf84a945546 SHA256 8b303267f59e8090e996fe3d72c17132460125caf19d9d6e330dafad226b0973 MISC metadata.xml 376 RMD160 4ad36c6946d4873955386ad238d995eb6179a441 SHA1 8877f419fd68f51725372ac1f811635d21068f4e SHA256 7c75a35d70b6bbca589e1fb1c23d01f6475a62569751351b5bb1eaf6741f804a -----BEGIN PGP SIGNATURE----- Version: GnuPG v2.0.18 (GNU/Linux) -iF4EAREIAAYFAk7NfGoACgkQdjK8w9WeBnCnzQD/WGYiwEZMqDQ5BKLCImAc6KcY -lJa4eAwj6220IGgpM+AA/3bd8Tku316qmPOp6kl7d8WvMOdpWLx4ygnsM+toHRhy -=zD6D +iF4EAREIAAYFAk7TQVwACgkQdjK8w9WeBnAD2gD+NkbkyV8z9FaJJIWGBeSztEYm +uENIsX4+rkqtHkW+0rQBALqNrSW9PGscheFPLwLOCIMfxr7zflHEVpYXYTwKK2x/ +=NPSi -----END PGP SIGNATURE----- diff --git a/gnome-base/librsvg/librsvg-2.34.2.ebuild b/gnome-base/librsvg/librsvg-2.34.2.ebuild index 512724cc6c5b..fd045cc19d6f 100644 --- a/gnome-base/librsvg/librsvg-2.34.2.ebuild +++ b/gnome-base/librsvg/librsvg-2.34.2.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/gnome-base/librsvg/librsvg-2.34.2.ebuild,v 1.4 2011/11/23 23:06:13 tetromino Exp $ +# $Header: /var/cvsroot/gentoo-x86/gnome-base/librsvg/librsvg-2.34.2.ebuild,v 1.5 2011/11/28 08:07:51 tetromino Exp $ EAPI="4" GNOME2_LA_PUNT="yes" @@ -24,8 +24,7 @@ RDEPEND=">=media-libs/fontconfig-1.0.1 >=x11-libs/pango-1.10 >=dev-libs/libxml2-2.4.7:2 >=dev-libs/libcroco-0.6.1 - || ( x11-libs/gdk-pixbuf:2 - x11-libs/gtk+:2 ) + x11-libs/gdk-pixbuf:2[introspection?] gtk? ( >=x11-libs/gtk+-2.16:2 ) gtk3? ( >=x11-libs/gtk+-2.90.0:3 ) introspection? ( >=dev-libs/gobject-introspection-0.10.8 )"