Version bump. Implement GIcon interface, fix loader.cache detection on windows, translation updates.

Package-Manager: portage-2.2.0_alpha3/cvs/Linux x86_64

3 files changed, 101 insertions, 2 deletions

diff --git a/x11-libs/gdk-pixbuf/ChangeLog b/x11-libs/gdk-pixbuf/ChangeLog
index 3ed8b7e2f37d..d64cdd4d825b 100644
--- a/x11-libs/gdk-pixbuf/ChangeLog
+++ b/x11-libs/gdk-pixbuf/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for x11-libs/gdk-pixbuf
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-libs/gdk-pixbuf/ChangeLog,v 1.3 2010/11/07 19:11:27 anarchy Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/gdk-pixbuf/ChangeLog,v 1.4 2010/11/08 23:22:59 eva Exp $
+
+*gdk-pixbuf-2.22.1 (09 Nov 2010)
+
+  09 Nov 2010; Gilles Dartiguelongue <eva@gentoo.org>
+  +gdk-pixbuf-2.22.1.ebuild:
+  Version bump. Implement GIcon interface, fix loader.cache detection on
+  windows, translation updates.
 
   07 Nov 2010; Jory A. Pratt <anarchy@gentoo.org> gdk-pixbuf-2.22.0.ebuild:
   Convert media-libs/jpeg to virtual/jpeg
diff --git a/x11-libs/gdk-pixbuf/Manifest b/x11-libs/gdk-pixbuf/Manifest
index 120e3e682438..4a7dc4e95df1 100644
--- a/x11-libs/gdk-pixbuf/Manifest
+++ b/x11-libs/gdk-pixbuf/Manifest
@@ -1,5 +1,17 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
 AUX gdk-pixbuf-2.21.4-fix-automagic-x11.patch 715 RMD160 efeaa25e97e7620018ae3ca5b62d74ff6e0fd0d1 SHA1 d67d28548ce340034f5afb0ca07b699fd1a0619e SHA256 e977da6d4731a0164b7346a790dfabb95a951f9986fa623abd171bce79f63bcb
 DIST gdk-pixbuf-2.22.0.tar.bz2 1538400 RMD160 6089a4f48588d8252ff8ea06db7f395d1d3a43f0 SHA1 80c25eaa08b22ebab24b98e88883ff615240d7cf SHA256 b8ff6a308f037af6b501246ad8779a951ca92af975efc2e97c354ea6702667cf
+DIST gdk-pixbuf-2.22.1.tar.bz2 1543273 RMD160 d05d6642e147281b7dc1dd21657595333f13f6f1 SHA1 b452208963ddd84f7280865695b50255fcafaa2e SHA256 6ce87eda24af9362307b2593c154d0b660f4e26d0abf2e71d46d0ddd55fd953d
 EBUILD gdk-pixbuf-2.22.0.ebuild 2427 RMD160 12f041036235d4b620c03f4259b1651a464837c1 SHA1 5e3d46ef6f24da64df56dfd3f22c10f7a6fa4feb SHA256 d8010de3b205c10c2c4617cd049722dfdcb650033f93f543da798ae193a6769f
-MISC ChangeLog 689 RMD160 6798c296a4ddf9564efbe1900ef3f8ecbd297c93 SHA1 bafa3fba2f8dbbfb1d54df0582a215fa4e3f2e6d SHA256 0e024d065c986824ee5dc0c316363b61a1b37b51764f88a54c70939cb662ab9f
+EBUILD gdk-pixbuf-2.22.1.ebuild 2424 RMD160 5246e609045801271270ae39d67bc754ce4fa499 SHA1 0d792b3c96a76a20c5c5280a11f6280d54a0bb95 SHA256 ce08e7c64a0383d5fae2b18ac7d4c2d903eff6bc81884b072d03579d5f43f794
+MISC ChangeLog 908 RMD160 7c805a21c244b578e57cdad003f3098ff79a1aba SHA1 1e83fb7b3f352ee55a417dd268adcd4802c63aa4 SHA256 483885345c37496b4d8560641e2a4e812fd3ace8de4520972b530670304f61ea
 MISC metadata.xml 285 RMD160 829826c3a3edd13d82bf87a4e6c1c08719f1549f SHA1 03e8b2cfc1956cfea91e8cedfa2451e68b2bf8e5 SHA256 8400998fc578bc9661b57a27ed3226941e4f75ef5bf7d9f929ed9de2d97ba8b0
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.16 (GNU/Linux)
+
+iEYEARECAAYFAkzYlHAACgkQ1fmVwcYIWAa2FwCgoj4YrZX4rBEz9fFY2RTAVrSi
+njEAoJLtHP/NkIXrw8CJrMxJ9pa79htI
+=I76u
+-----END PGP SIGNATURE-----
diff --git a/x11-libs/gdk-pixbuf/gdk-pixbuf-2.22.1.ebuild b/x11-libs/gdk-pixbuf/gdk-pixbuf-2.22.1.ebuild
new file mode 100644
index 000000000000..b9214c6049fc
--- /dev/null
+++ b/x11-libs/gdk-pixbuf/gdk-pixbuf-2.22.1.ebuild
@@ -0,0 +1,80 @@
+# Copyright 1999-2010 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/gdk-pixbuf/gdk-pixbuf-2.22.1.ebuild,v 1.1 2010/11/08 23:22:59 eva Exp $
+
+EAPI="3"
+
+inherit gnome.org multilib libtool autotools
+
+DESCRIPTION="Image loading library for GTK+"
+HOMEPAGE="http://www.gtk.org/"
+
+LICENSE="LGPL-2"
+SLOT="2"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86 ~x86-fbsd ~x86-freebsd ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+IUSE="+X debug doc +introspection jpeg jpeg2k tiff test"
+
+# librsvg blocker is for the new pixbuf loader API, you lose icons otherwise
+RDEPEND="
+	>=dev-libs/glib-2.25.15
+	>=media-libs/libpng-1.2.43-r2:0
+	introspection? ( >=dev-libs/gobject-introspection-0.9.3 )
+	jpeg? ( virtual/jpeg )
+	jpeg2k? ( media-libs/jasper )
+	tiff? ( >=media-libs/tiff-3.9.2 )
+	X? ( x11-libs/libX11 )
+	!<gnome-base/gail-1000
+	!<gnome-base/librsvg-2.31.0
+	!<x11-libs/gtk+-2.21.3:2
+	!<x11-libs/gtk+-2.90.4:3"
+DEPEND="${RDEPEND}
+	>=dev-util/pkgconfig-0.9
+	>=sys-devel/gettext-0.17
+	>=dev-util/gtk-doc-am-1.11
+	doc? (
+		>=dev-util/gtk-doc-1.11
+		~app-text/docbook-xml-dtd-4.1.2 )"
+
+src_prepare() {
+	# Only build against libX11 if the user wants to do so
+	epatch "${FILESDIR}"/${PN}-2.21.4-fix-automagic-x11.patch
+
+	elibtoolize
+	eautoreconf
+}
+
+src_configure() {
+	# png always on to display icons (foser)
+	local myconf="
+		$(use_enable doc gtk-doc)
+		$(use_with jpeg libjpeg)
+		$(use_with jpeg2k libjasper)
+		$(use_with tiff libtiff)
+		$(use_enable introspection)
+		$(use_with X x11)
+		--with-libpng"
+
+	# Passing --disable-debug is not recommended for production use
+	use debug && myconf="${myconf} --enable-debug=yes"
+
+	econf ${myconf}
+}
+
+src_install() {
+	emake DESTDIR="${D}" install || die "Installation failed"
+
+	dodoc AUTHORS NEWS* README* || die "dodoc failed"
+
+	# New library, remove .la files
+	rm -vf "${D}"/usr/lib*/gdk-pixbuf-2.0/*/loaders/*.la
+}
+
+pkg_postinst() {
+	gdk-pixbuf-query-loaders > "${EROOT}usr/$(get_libdir)/gdk-pixbuf-2.0/2.10.0/loaders.cache"
+
+	if [ -e "${EROOT}"usr/lib/gtk-2.0/2.*/loaders ]; then
+		elog "You need to rebuild ebuilds that installed into" "${EROOT}"usr/lib/gtk-2.0/2.*/loaders
+		elog "to do that you can use qfile from portage-utils:"
+		elog "emerge -va1 \$(qfile -qC ${EPREFIX}/usr/lib/gtk-2.0/2.*/loaders)"
+	fi
+}