Merge gdk-pixbuf-2.30.6-r1 into -r2 ebuild

Unfortunately, although upstream has multilib-utized gdk-pixbuf,
it uses the upstream binary wrapping strategy which is incompatible
with gnome2-multilib_gdk_pixbuf_update.  Until this can be
resolved, we employ both wrapping strategies here :(

6 files changed, 21 insertions, 532 deletions

diff --git a/x11-libs/gdk-pixbuf/ChangeLog b/x11-libs/gdk-pixbuf/ChangeLog
deleted file mode 100644
index 034afbf..0000000
--- a/x11-libs/gdk-pixbuf/ChangeLog
+++ /dev/null
@@ -1,391 +0,0 @@
-# ChangeLog for x11-libs/gdk-pixbuf
-# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-libs/gdk-pixbuf/ChangeLog,v 1.96 2014/01/04 20:46:23 steev Exp $
-
-  04 Jan 2014; Steev Klimaszewski <steev@gentoo.org> gdk-pixbuf-2.26.5.ebuild:
-  Parallel install fails when no gdk-pixbuf is already installed, bug #481372
-
-  (Change approved by pacho2 on irc)
-
-*gdk-pixbuf-2.30.1 (23 Dec 2013)
-
-  23 Dec 2013; Gilles Dartiguelongue <eva@gentoo.org>
-  +gdk-pixbuf-2.30.1.ebuild:
-  Version bump for Gnome 3.10.
-
-  22 Dec 2013; Jeroen Roovers <jer@gentoo.org> gdk-pixbuf-2.28.2.ebuild:
-  Stable for HPPA (bug #478252).
-
-  08 Dec 2013; Pacho Ramos <pacho@gentoo.org> gdk-pixbuf-2.28.2.ebuild:
-  x86 stable, bug #478252
-
-  30 Nov 2013; Pacho Ramos <pacho@gentoo.org> gdk-pixbuf-2.28.2.ebuild:
-  amd64 stable, bug #478252
-
-  14 Nov 2013; Matt Turner <mattst88@gentoo.org> gdk-pixbuf-2.26.5.ebuild:
-  alpha stable, bug 476364.
-
-  06 Nov 2013; Pacho Ramos <pacho@gentoo.org> -gdk-pixbuf-2.28.1.ebuild,
-  gdk-pixbuf-2.28.2.ebuild:
-  Parallel install fails when no gdk-pixbuf is already installed, bug #481372
-
-  24 Oct 2013; Jeroen Roovers <jer@gentoo.org> gdk-pixbuf-2.26.5.ebuild:
-  Stable for HPPA (bug #476364).
-
-  17 Oct 2013; Markus Meier <maekke@gentoo.org> gdk-pixbuf-2.26.5.ebuild:
-  arm stable, bug #476364
-
-  03 Sep 2013; Gilles Dartiguelongue <eva@gentoo.org> gdk-pixbuf-2.26.4.ebuild,
-  gdk-pixbuf-2.26.5.ebuild, gdk-pixbuf-2.28.1.ebuild, gdk-pixbuf-2.28.2.ebuild:
-  Update to use eclass gdk-pixbuf cache handling.
-
-  05 Aug 2013; Samuli Suominen <ssuominen@gentoo.org> gdk-pixbuf-2.26.4.ebuild,
-  gdk-pixbuf-2.26.5.ebuild, gdk-pixbuf-2.28.1.ebuild, gdk-pixbuf-2.28.2.ebuild:
-  Pull in correct SLOT of libjpeg for headers.
-
-*gdk-pixbuf-2.28.2 (09 Jun 2013)
-
-  09 Jun 2013; Pacho Ramos <pacho@gentoo.org> +gdk-pixbuf-2.28.2.ebuild,
-  -files/gdk-pixbuf-2.24.1-xbm-overflow.patch, -gdk-pixbuf-2.24.1-r1.ebuild:
-  Version bump, drop old
-
-*gdk-pixbuf-2.28.1 (21 Apr 2013)
-
-  21 Apr 2013; Mart Raudsepp <leio@gentoo.org> -gdk-pixbuf-2.28.0.ebuild,
-  +gdk-pixbuf-2.28.1.ebuild:
-  Version bump. No changes for us compared to 2.28.0, but the libpng sedding
-  had to be changed, so this revision makes that to not be missed later on as
-  that would cause a libpng versioning handling regressions when unnoticed.
-
-  15 Apr 2013; Samuli Suominen <ssuominen@gentoo.org> gdk-pixbuf-2.28.0.ebuild,
-  +files/gdk-pixbuf-2.28.0-string_h.patch:
-  Fix missing include string.h in gdk-pixbuf/io-png.c for strcmp, strlen and
-  strncmp (revealed by the libpng16 upgrade) wrt #466034
-
-*gdk-pixbuf-2.28.0 (28 Mar 2013)
-
-  28 Mar 2013; Pacho Ramos <pacho@gentoo.org> +gdk-pixbuf-2.28.0.ebuild:
-  Version bump
-
-  03 Mar 2013; Mike Frysinger <vapier@gentoo.org> gdk-pixbuf-2.26.4.ebuild,
-  gdk-pixbuf-2.26.5.ebuild:
-  Add s390 love.
-
-  22 Feb 2013; Zac Medico <zmedico@gentoo.org> gdk-pixbuf-2.26.5.ebuild:
-  Add ~arm-linux keyword.
-
-  16 Dec 2012; Alexandre Rostovtsev <tetromino@gentoo.org>
-  gdk-pixbuf-2.26.5.ebuild:
-  EAPI5 stylistic cleanup
-
-  16 Dec 2012; Alexandre Rostovtsev <tetromino@gentoo.org>
-  gdk-pixbuf-2.26.5.ebuild, metadata.xml:
-  Update to EAPI5. Switch to global introspection USE flag.
-
-*gdk-pixbuf-2.26.5 (10 Nov 2012)
-
-  10 Nov 2012; Alexandre Rostovtsev <tetromino@gentoo.org>
-  -files/gdk-pixbuf-2.21.4-fix-automagic-x11.patch,
-  -gdk-pixbuf-2.24.0-r1.ebuild, -gdk-pixbuf-2.24.1.ebuild,
-  gdk-pixbuf-2.24.1-r1.ebuild, -gdk-pixbuf-2.26.3.ebuild,
-  gdk-pixbuf-2.26.4.ebuild, +gdk-pixbuf-2.26.5.ebuild:
-  Version bump, fixes crashes with >glib-2.35. Drop useless USE=doc, it only
-  regenerated documentation. Update license. Drop old.
-
-  28 Oct 2012; Raúl Porcel <armin76@gentoo.org> gdk-pixbuf-2.26.4.ebuild:
-  ia64/sh/sparc stable wrt #427544
-
-  06 Oct 2012; Anthony G. Basile <blueness@gentoo.org> gdk-pixbuf-2.26.4.ebuild:
-  stable ppc ppc64, bug #427544
-
-  06 Oct 2012; Markus Meier <maekke@gentoo.org> gdk-pixbuf-2.26.4.ebuild:
-  arm stable, bug #427544
-
-  04 Oct 2012; Agostino Sarubbo <ago@gentoo.org> gdk-pixbuf-2.26.4.ebuild:
-  Stable for amd64, wrt bug #427544
-
-  03 Oct 2012; Pawel Hajdan jr <phajdan.jr@gentoo.org>
-  gdk-pixbuf-2.26.4.ebuild:
-  x86 stable wrt bug #427544
-
-  02 Oct 2012; Jeroen Roovers <jer@gentoo.org> gdk-pixbuf-2.26.4.ebuild:
-  Stable for HPPA (bug #427544).
-
-  27 Sep 2012; Matt Turner <mattst88@gentoo.org> gdk-pixbuf-2.26.4.ebuild:
-  Stable on alpha, bug 427544.
-
-*gdk-pixbuf-2.26.4 (18 Sep 2012)
-
-  18 Sep 2012; Alexandre Rostovtsev <tetromino@gentoo.org>
-  gdk-pixbuf-2.24.0-r1.ebuild, gdk-pixbuf-2.24.1.ebuild,
-  gdk-pixbuf-2.24.1-r1.ebuild, -gdk-pixbuf-2.26.1.ebuild,
-  gdk-pixbuf-2.26.3.ebuild, +gdk-pixbuf-2.26.4.ebuild:
-  Version bump with color profile support in jpg files. Drop old. Use a more
-  portable mktemp call, thanks to Mart Raudsepp.
-
-*gdk-pixbuf-2.26.3 (02 Sep 2012)
-
-  02 Sep 2012; Nirbheek Chauhan <nirbheek@gentoo.org> +gdk-pixbuf-2.26.3.ebuild:
-  Bump to 2.26.3
-
-  15 Jul 2012; Raúl Porcel <armin76@gentoo.org> gdk-pixbuf-2.24.1.ebuild:
-  alpha/ia64/sh/sparc stable wrt #410611
-
-  24 May 2012; Samuli Suominen <ssuominen@gentoo.org> gdk-pixbuf-2.24.1.ebuild:
-  ppc stable wrt #410611
-
-  21 May 2012; Alexandre Rostovtsev <tetromino@gentoo.org>
-  gdk-pixbuf-2.24.0-r1.ebuild:
-  Need eutils for epatch.
-
-  13 May 2012; Mark Loeser <halcy0n@gentoo.org> gdk-pixbuf-2.24.1-r1.ebuild:
-  Stable for ppc64; bug #412033
-
-  05 May 2012; Jeff Horelick <jdhore@gentoo.org> gdk-pixbuf-2.24.0-r1.ebuild,
-  gdk-pixbuf-2.24.1.ebuild, gdk-pixbuf-2.24.1-r1.ebuild,
-  gdk-pixbuf-2.26.1.ebuild:
-  dev-util/pkgconfig -> virtual/pkgconfig
-
-  29 Apr 2012; Markus Meier <maekke@gentoo.org> gdk-pixbuf-2.24.1.ebuild:
-  x86 stable, bug #410611
-
-  29 Apr 2012; Fabian Groffen <grobian@gentoo.org> gdk-pixbuf-2.26.1.ebuild:
-  Run elibtoolize to fix gdk-pixbuf-loader not finding its own loaders on Darwin
-
-  28 Apr 2012; Alexis Ballier <aballier@gentoo.org> gdk-pixbuf-2.26.1.ebuild:
-  keyword ~amd64-fbsd
-
-  25 Apr 2012; Markus Meier <maekke@gentoo.org> gdk-pixbuf-2.24.1.ebuild:
-  arm stable, bug #410611
-
-  24 Apr 2012; Alexandre Rostovtsev <tetromino@gentoo.org>
-  gdk-pixbuf-2.24.0-r1.ebuild, gdk-pixbuf-2.24.1.ebuild,
-  gdk-pixbuf-2.24.1-r1.ebuild, gdk-pixbuf-2.26.1.ebuild:
-  Change "mktemp --suffix" to "mktemp -t" and drop coreutils dep to fix
-  building on bsd (bug #413287, thanks to Alexis Ballier).
-
-  21 Apr 2012; Raúl Porcel <armin76@gentoo.org> gdk-pixbuf-2.24.1-r1.ebuild:
-  alpha/ia64/sh/sparc stable wrt #412033
-
-  19 Apr 2012; Brent Baude <ranger@gentoo.org> gdk-pixbuf-2.24.1.ebuild:
-  Marking gdk-pixbuf-2.24.1 ppc64 stable for bug 410611
-
-  18 Apr 2012; Agostino Sarubbo <ago@gentoo.org> gdk-pixbuf-2.24.1.ebuild:
-  Stable for AMD64, wrt bug #410611
-
-  18 Apr 2012; Markus Meier <maekke@gentoo.org> gdk-pixbuf-2.24.1-r1.ebuild:
-  arm stable, bug #412033
-
-  16 Apr 2012; Brent Baude <ranger@gentoo.org> gdk-pixbuf-2.24.1-r1.ebuild:
-  Marking gdk-pixbuf-2.24.1-r1 ppc for bug 412033
-
-  16 Apr 2012; Jeroen Roovers <jer@gentoo.org> gdk-pixbuf-2.24.1-r1.ebuild:
-  Stable for HPPA (bug #412033).
-
-  15 Apr 2012; Jeff Horelick <jdhore@gentoo.org> gdk-pixbuf-2.24.1-r1.ebuild:
-  marked x86 per bug 412033
-
-  15 Apr 2012; Agostino Sarubbo <ago@gentoo.org> gdk-pixbuf-2.24.1-r1.ebuild:
-  Stable for amd64, wrt bug #412033
-
-*gdk-pixbuf-2.26.1 (14 Apr 2012)
-*gdk-pixbuf-2.24.1-r1 (14 Apr 2012)
-
-  14 Apr 2012; Alexandre Rostovtsev <tetromino@gentoo.org>
-  +gdk-pixbuf-2.24.1-r1.ebuild, +files/gdk-pixbuf-2.24.1-xbm-overflow.patch,
-  -gdk-pixbuf-2.26.0.ebuild, +gdk-pixbuf-2.26.1.ebuild:
-  Fix integer overflow in xbm loader (bug #412033).
-
-  12 Apr 2012; Alexandre Rostovtsev <tetromino@gentoo.org>
-  gdk-pixbuf-2.26.0.ebuild:
-  autotools eclass not needed.
-
-  30 Mar 2012; Nirbheek Chauhan <nirbheek@gentoo.org> gdk-pixbuf-2.26.0.ebuild:
-  Avoid eautoreconf
-
-*gdk-pixbuf-2.26.0 (27 Mar 2012)
-
-  27 Mar 2012; Alexandre Rostovtsev <tetromino@gentoo.org>
-  +gdk-pixbuf-2.26.0.ebuild:
-  Version bump with various bugfixes.
-
-  04 Feb 2012; Alexandre Rostovtsev <tetromino@gentoo.org>
-  gdk-pixbuf-2.24.0-r1.ebuild:
-  Drop superfluous elibtoolize call (bug #401983, thanks to Julian W.)
-
-*gdk-pixbuf-2.24.1 (31 Dec 2011)
-
-  31 Dec 2011; Pacho Ramos <pacho@gentoo.org> +gdk-pixbuf-2.24.1.ebuild,
-  -files/gdk-pixbuf-2.22.1-CVE-2011-2485.patch,
-  -files/gdk-pixbuf-2.22.1-fix-libpng15.patch, -gdk-pixbuf-2.22.1-r2.ebuild:
-  Version bump, add missing DEPEND on proper coreutils version (bug #395103 by
-  arnaud), remove old.
-
-  13 Nov 2011; Justin Lecher <jlec@gentoo.org> gdk-pixbuf-2.22.1-r2.ebuild,
-  gdk-pixbuf-2.24.0-r1.ebuild:
-  Corrected Slotting of media-libs/tiff
-
-  30 Oct 2011; Raúl Porcel <armin76@gentoo.org> gdk-pixbuf-2.24.0-r1.ebuild:
-  alpha/ia64/sh/sparc stable wrt #385699
-
-  28 Oct 2011; Markus Meier <maekke@gentoo.org> gdk-pixbuf-2.24.0-r1.ebuild:
-  arm stable, bug #385699
-
-  21 Oct 2011; Pawel Hajdan jr <phajdan.jr@gentoo.org>
-  gdk-pixbuf-2.24.0-r1.ebuild:
-  x86 stable wrt bug #385699
-
-  18 Oct 2011; Jeroen Roovers <jer@gentoo.org> gdk-pixbuf-2.24.0-r1.ebuild:
-  Stable for HPPA (bug #385699).
-
-  16 Oct 2011; Kacper Kowalik <xarthisius@gentoo.org>
-  gdk-pixbuf-2.24.0-r1.ebuild:
-  ppc/ppc64 stable wrt #385699
-
-  14 Oct 2011; Samuli Suominen <ssuominen@gentoo.org>
-  -gdk-pixbuf-2.23.5.ebuild, -gdk-pixbuf-2.24.0.ebuild:
-  old
-
-  14 Oct 2011; Samuli Suominen <ssuominen@gentoo.org>
-  gdk-pixbuf-2.24.0-r1.ebuild:
-  amd64 stable wrt #385699
-
-  09 Oct 2011; Fabio Erculiani <lxnay@gentoo.org> gdk-pixbuf-2.22.1-r2.ebuild,
-  gdk-pixbuf-2.23.5.ebuild, gdk-pixbuf-2.24.0.ebuild,
-  gdk-pixbuf-2.24.0-r1.ebuild:
-  add ewarn in case of gdk-pixbuf-query-loaders failure
-
-  03 Oct 2011; Fabio Erculiani <lxnay@gentoo.org> gdk-pixbuf-2.22.1-r2.ebuild,
-  gdk-pixbuf-2.23.5.ebuild, gdk-pixbuf-2.24.0.ebuild,
-  gdk-pixbuf-2.24.0-r1.ebuild:
-  make gdk-pixbuf-query-loaders more atomic, fix segfault due to
-  __GL_NO_DSO_FINALIZER=1 in environment
-
-*gdk-pixbuf-2.24.0-r1 (15 Sep 2011)
-
-  15 Sep 2011; Samuli Suominen <ssuominen@gentoo.org>
-  +gdk-pixbuf-2.24.0-r1.ebuild:
-  Use libpng.pc instead of versioned pkg-config file to generate
-  Requires.private: libpng instead of versioned one. This will avoid some
-  problems with libpng14 to libpng15 upgrade wrt #383655
-
-*gdk-pixbuf-2.24.0 (28 Aug 2011)
-
-  28 Aug 2011; Pacho Ramos <pacho@gentoo.org> +gdk-pixbuf-2.24.0.ebuild:
-  Version bump: Clean up dependencies in the .pc file, translation updates.
-
-  28 Aug 2011; Fabian Groffen <grobian@gentoo.org> gdk-pixbuf-2.23.5.ebuild:
-  Marked ~x64-macos
-
-*gdk-pixbuf-2.23.5 (16 Aug 2011)
-
-  16 Aug 2011; Nirbheek Chauhan <nirbheek@gentoo.org>
-  -gdk-pixbuf-2.22.1.ebuild, -gdk-pixbuf-2.22.1-r1.ebuild,
-  +gdk-pixbuf-2.23.5.ebuild:
-  Bump to 2.23.5, from gnome overlay for GNOME 3, remove old
-
-  11 Jul 2011; Matt Turner <mattst88@gentoo.org> gdk-pixbuf-2.22.1-r2.ebuild:
-  Added ~mips, bug 364693
-
-  09 Jul 2011; Raúl Porcel <armin76@gentoo.org> gdk-pixbuf-2.22.1-r2.ebuild:
-  alpha/arm/ia64/sh/sparc stable wrt #371320
-
-  09 Jul 2011; Kacper Kowalik <xarthisius@gentoo.org>
-  gdk-pixbuf-2.22.1-r2.ebuild:
-  ppc/ppc64 stable wrt #373999
-
-  06 Jul 2011; Mark Loeser <halcy0n@gentoo.org> gdk-pixbuf-2.22.1-r1.ebuild:
-  Stable for ppc64; bug #371320
-
-  05 Jul 2011; Thomas Kahle <tomka@gentoo.org> gdk-pixbuf-2.22.1-r2.ebuild:
-  x86 stable per bug 373999
-
-  05 Jul 2011; Jeroen Roovers <jer@gentoo.org> gdk-pixbuf-2.22.1-r2.ebuild:
-  Stable for HPPA (bug #373999).
-
-  04 Jul 2011; Pacho Ramos <pacho@gentoo.org> gdk-pixbuf-2.22.1-r2.ebuild:
-  amd64 stable, security bug #373999
-
-*gdk-pixbuf-2.22.1-r2 (04 Jul 2011)
-
-  04 Jul 2011; Pacho Ramos <pacho@gentoo.org> +gdk-pixbuf-2.22.1-r2.ebuild,
-  +files/gdk-pixbuf-2.22.1-CVE-2011-2485.patch:
-  GIF: Don't return a partially initialized pixbuf structure, fix security bug
-  #373999 by Tim Sammut.
-
-  29 Jun 2011; Christoph Mende <angelos@gentoo.org>
-  gdk-pixbuf-2.22.1-r1.ebuild:
-  Stable on amd64 wrt bug #371320
-
-  29 Jun 2011; Jeroen Roovers <jer@gentoo.org> gdk-pixbuf-2.22.1-r1.ebuild:
-  Stable for HPPA (bug #371320).
-
-  28 Jun 2011; Brent Baude <ranger@gentoo.org> gdk-pixbuf-2.22.1-r1.ebuild:
-  Marking gdk-pixbuf-2.22.1-r1 ppc stable for bug 371320
-
-  25 Jun 2011; Pacho Ramos <pacho@gentoo.org> gdk-pixbuf-2.22.1-r1.ebuild:
-  PDEPEND on gnome-base/librsvg conditionally (bug #373001 by Lev Babiev).
-
-  22 Jun 2011; Pawel Hajdan jr <phajdan.jr@gentoo.org>
-  gdk-pixbuf-2.22.1-r1.ebuild:
-  x86 stable wrt security bug #371320
-
-  05 Jun 2011; Pacho Ramos <pacho@gentoo.org> -gdk-pixbuf-2.22.0.ebuild,
-  gdk-pixbuf-2.22.1-r1.ebuild:
-  PDEPEND on gnome-base/librsvg as reported in bug #363715 by Cedric. Remove
-  old.
-
-  29 Apr 2011; Jeroen Roovers <jer@gentoo.org> gdk-pixbuf-2.22.1-r1.ebuild:
-  Marked ~hppa (bug #364693).
-
-*gdk-pixbuf-2.22.1-r1 (24 Apr 2011)
-
-  24 Apr 2011; Nirbheek Chauhan <nirbheek@gentoo.org>
-  +gdk-pixbuf-2.22.1-r1.ebuild:
-  Drop keywords on hppa/mips w.r.t. KEYWORDREQ bug 364693
-
-  15 Apr 2011; Samuli Suominen <ssuominen@gentoo.org> gdk-pixbuf-2.22.1.ebuild:
-  Remove unrequired libtool files.
-
-  04 Apr 2011; Nirbheek Chauhan <nirbheek@gentoo.org>
-  gdk-pixbuf-2.22.1.ebuild, +files/gdk-pixbuf-2.22.1-fix-libpng15.patch:
-  Fix building with libpng-1.5, bug 354557
-
-  22 Mar 2011; Brent Baude <ranger@gentoo.org> gdk-pixbuf-2.22.1.ebuild:
-  Marking gdk-pixbuf-2.22.1 ppc stable for bug 353436
-
-  21 Mar 2011; Kacper Kowalik <xarthisius@gentoo.org> gdk-pixbuf-2.22.1.ebuild:
-  ppc64 stable wrt #353436
-
-  12 Mar 2011; Raúl Porcel <armin76@gentoo.org> gdk-pixbuf-2.22.1.ebuild:
-  alpha/arm/ia64/sh/sparc stable wrt #353436
-
-  07 Mar 2011; Jeroen Roovers <jer@gentoo.org> gdk-pixbuf-2.22.1.ebuild:
-  Stable for HPPA (bug #353436).
-
-  24 Feb 2011; Thomas Kahle <tomka@gentoo.org> gdk-pixbuf-2.22.1.ebuild:
-  x86 stable per bug 353436
-
-  23 Feb 2011; Markos Chandras <hwoarang@gentoo.org> gdk-pixbuf-2.22.1.ebuild:
-  Stable on amd64 wrt bug #353436
-
-*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
-
-  24 Sep 2010; <nirbheek@gentoo.org> gdk-pixbuf-2.22.0.ebuild:
-  Remove .la files too
-
-*gdk-pixbuf-2.22.0 (24 Sep 2010)
-
-  24 Sep 2010; <nirbheek@gentoo.org>
-  +files/gdk-pixbuf-2.21.4-fix-automagic-x11.patch,
-  +gdk-pixbuf-2.22.0.ebuild, +metadata.xml:
-  Add gdk-pixbuf, split off gtk+ so it can be shared b/w gtk+:2 and gtk+:3.
-  Inherits gtk's keywords.
diff --git a/x11-libs/gdk-pixbuf/Manifest b/x11-libs/gdk-pixbuf/Manifest
index a8b3486..dbd22d1 100644
--- a/x11-libs/gdk-pixbuf/Manifest
+++ b/x11-libs/gdk-pixbuf/Manifest
@@ -1,7 +1,2 @@
-AUX gdk-pixbuf-2.28.0-string_h.patch 748 SHA256 3077d260fe15c0b9888ca31e47461d35ca6d7d33350f7b5721dc06d88a7dc2a6 SHA512 54e7248076cdb1d446b5bb5ee09474461c775a0e51372602f10b0096f5c4779f01c739c75461d2c134565dacc03a38f298486ce814df8318410c8ab77ca5a8a7 WHIRLPOOL be4193a8e83733c031629d3a67e690b740180c9ac20eaac424119a3381a558c2b233524c599536276fe97b541f2d9d824dafa1642099b246a87df5deea497083
-DIST gdk-pixbuf-2.28.2.tar.xz 1192936 SHA256 183113c2eb2232963e88864a6a54fd963dbfeb1a3679fb0d3456f9e0b79e4617 SHA512 2082e6f44aa8e986586da8f5797b7e9aae23c60021c5183ed6e1e2e99cef338ec1b20cf2baef19a337ac557eb585399377e92534d2f90222a68943b914d86656 WHIRLPOOL 7060b0b591d47b1eec43b01a29cde5903ee78f458a4623a66d66d6b0d83f32d08ae2c5aa9da9dfc328990168c477a879b501c34d6f24b3d93f38cd7cdb4b8a66
-DIST gdk-pixbuf-2.30.5.tar.xz 1330776 SHA256 43e71d50c4511d7d72fa75b1ac7ad3e8e04bdc97908d003449e78171683bb136 SHA512 b43072bbfe459382e713446aac77fba5b9e40876d866152942ae3d74d432071543e42ad3303c5536101713bd24046bf687298bbc6b6650d8548b593d4f20423c WHIRLPOOL 45332066d9e9320cca060e0a07fd788818487610931e2ce1378532ed603d38b14c0919d5628d96953bceb25efe5125a910cf5982849a3ba739f2efd54f50789b
-EBUILD gdk-pixbuf-2.28.2-r1.ebuild 2808 SHA256 b51b2499e7bd4c40e1d30dd1d70a45bb795c0a8c719402c1a0262fd8b7c8f93f SHA512 e664af27478eee898030ce41daa0f9d3a8d841c749748d6fb52668325f7da2af5026babe1b294c7de21823daac8255cbfd437ad51226c5f11ee41751ecc3d5bb WHIRLPOOL 66c1400dacf36678197a11709d90d8344263383c5d8c359e0043f6452c74945f06cebf001cf3f5710f5ed8808e39686b0702038153f8da7f167aff1dda952313
-EBUILD gdk-pixbuf-2.30.5-r1.ebuild 3152 SHA256 9dee016108ddc3ee6e706c2043b926ba4aa35218adfb41099644bacfb00eae6d SHA512 ba51c065e08a8540bb3ac86c3b6535f1c1693662ce69d38c79c85a094a41f1c3487609f35fc452f69659594fadb28cfe234484aca549acc235527d9fa2ebfde2 WHIRLPOOL 5a62e37c6fd5926992b9b362d4c8d8537dc06bb0a13f431be575902f3b3e28cf368ea57ea6c7bd736e73f696f5f9b3ccac6553db9e324ca49509931f1321e514
-MISC ChangeLog 14620 SHA256 0f3d2aa643f360797efe6f4eac0a88dea906fe301d06fa52a3815b0b9062e23c SHA512 c376198fbcbcd8b8762dcc6876e4325c26d259f81b638c2905cbd3bcfc03a4c37c2f7e76fd93a4b222c2f107c6b235a36ebae978a825782cad7e978f49eae7b5 WHIRLPOOL 6191d4fc3bbf07634530f89b9b810b0ff0651f1758c5269fec099d73c2dff55ef43ac3c873142ec86d638bd6e1f5a934e3fb2862eed1b6b5c184aaba76d8f2ae
-MISC metadata.xml 160 SHA256 4d793ecb79b17794248102d8409d16bc27b1022c72038bd2d1241e129693d5f2 SHA512 677650c05f31fc27035e12f3f5e4b095715dfe12d2d3483f800bfbc6e986a98dbb1997cd52ad7a177b5c120c9b87fe5a2452a4f0f9852ac9a58262e0c5d576c9 WHIRLPOOL 070602fb27fee6a25035c9e93f5c2422270a5781fd11dac318d3f5c32cf9e49163abf7999729df230d3e181b6a1362982744e1f0ac016bf59a3458ae23abbb83
+DIST gdk-pixbuf-2.30.6.tar.xz 1329708 SHA256 43394fa4adfb49fa4d662fdc6f43f7f25a9f914509528f57720b18487b0a7f5a SHA512 fc8d0466b6b488e1e6b659a5c727c2e6bd283881ace3fcd6ed7ae008d05e41a9f15eff0217e70935efd52353f4ac38c25dbb30b648d053286b641636d6b10822 WHIRLPOOL f44459dd8bbe904417d26e7a24e2cc1dae64a9470975b9dff1bfcf661923fc64d787d043b756ff3ed9c055cba5f30cede8fc5b5a584f03b4bc2af24ae06ffe81
+EBUILD gdk-pixbuf-2.30.6-r2.ebuild 3311 SHA256 b9589757a9246956eb5233eb57d8ad4bceef5773a4cfe5a200c7ef88bfd30ad1 SHA512 58ee4f8381e3fd581e2bd80e9cc52d20626cedefa137a69f027cca7c20142e64ac735a98644ccc3c546b7f690aacc03cbc00b922c05f89dd16b0f30f9449c027 WHIRLPOOL dccf49c710312e40da228d34b61fbd23f5b81b829c734e629c7d59b17b089fdeedfd9f1440106553d99f1ce7925d5ba09aae094f70c3589751eb4356398b7e34
diff --git a/x11-libs/gdk-pixbuf/files/gdk-pixbuf-2.28.0-string_h.patch b/x11-libs/gdk-pixbuf/files/gdk-pixbuf-2.28.0-string_h.patch
deleted file mode 100644
index ecb60c5..0000000
--- a/x11-libs/gdk-pixbuf/files/gdk-pixbuf-2.28.0-string_h.patch
+++ /dev/null
@@ -1,18 +0,0 @@
-http://bugs.gentoo.org/466034
-
-851:24: warning: implicit declaration of function 'strncmp' [-Wimplicit-function-declaration]
-853:32: warning: implicit declaration of function 'strlen' [-Wimplicit-function-declaration]
-873:24: warning: implicit declaration of function 'strcmp' [-Wimplicit-function-declaration]
-853:46: warning: incompatible implicit declaration of built-in function 'strlen' [enabled by default]
-944:58: warning: incompatible implicit declaration of built-in function 'strlen' [enabled by default]
-
---- gdk-pixbuf/io-png.c
-+++ gdk-pixbuf/io-png.c
-@@ -26,6 +26,7 @@
- #include "config.h"
- #include <stdio.h>
- #include <stdlib.h>
-+#include <string.h> /* strcmp, strlen, strncmp */
- #include <png.h>
- #include "gdk-pixbuf-private.h"
- 
diff --git a/x11-libs/gdk-pixbuf/gdk-pixbuf-2.28.2-r1.ebuild b/x11-libs/gdk-pixbuf/gdk-pixbuf-2.28.2-r1.ebuild
deleted file mode 100644
index a760a40..0000000
--- a/x11-libs/gdk-pixbuf/gdk-pixbuf-2.28.2-r1.ebuild
+++ /dev/null
@@ -1,94 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: $
-
-EAPI="5"
-inherit gnome.org multilib libtool gnome2-multilib
-
-DESCRIPTION="Image loading library for GTK+"
-HOMEPAGE="http://www.gtk.org/"
-
-LICENSE="LGPL-2+"
-SLOT="2"
-KEYWORDS="~amd64"
-IUSE="+X debug +introspection jpeg jpeg2k tiff test"
-
-COMMON_DEPEND="
-	>=dev-libs/glib-2.34.0:2[${MULTILIB_USEDEP}]
-	>=media-libs/libpng-1.4:0=[${MULTILIB_USEDEP}]
-	introspection? ( >=dev-libs/gobject-introspection-0.9.3[${MULTILIB_USEDEP}] )
-	jpeg? ( virtual/jpeg:0=[${MULTILIB_USEDEP}] )
-	jpeg2k? ( media-libs/jasper:=[${MULTILIB_USEDEP}] )
-	tiff? ( >=media-libs/tiff-3.9.2:0=[${MULTILIB_USEDEP}] )
-	X? ( x11-libs/libX11[${MULTILIB_USEDEP}] )
-"
-DEPEND="${COMMON_DEPEND}
-	>=dev-util/gtk-doc-am-1.11
-	>=sys-devel/gettext-0.17[${MULTILIB_USEDEP}]
-	virtual/pkgconfig
-"
-# librsvg blocker is for the new pixbuf loader API, you lose icons otherwise
-RDEPEND="${COMMON_DEPEND}
-	!<gnome-base/gail-1000
-	!<gnome-base/librsvg-2.31.0
-	!<x11-libs/gtk+-2.21.3:2
-	!<x11-libs/gtk+-2.90.4:3
-"
-
-MULTILIB_WRAPPED_EXECUTABLES=( /usr/bin/gdk-pixbuf-query-loaders )
-
-src_prepare() {
-	# This will avoid polluting the pkg-config file with versioned libpng,
-	# which is causing problems with libpng14 -> libpng15 upgrade
-	# See upstream bug #667068
-	# First check that the pattern is present, to catch upstream changes on bumps,
-	# because sed doesn't return failure code if it doesn't do any replacements
-	grep -q  'l in libpng16' configure || die "libpng check order has changed upstream"
-	sed -e 's:l in libpng16:l in libpng libpng16:' -i configure || die
-	gnome2-multilib_src_prepare
-}
-
-src_configure() {
-	# png always on to display icons
-	gnome2-multilib_src_configure \
-		$(usex debug --enable-debug=yes "") \
-		$(use_with jpeg libjpeg) \
-		$(use_with jpeg2k libjasper) \
-		$(use_with tiff libtiff) \
-		$(use_enable introspection) \
-		$(use_with X x11) \
-		--with-libpng
-}
-
-src_install() {
-	# Parallel install fails when no gdk-pixbuf is already installed, bug #481372
-	GNOME2_LA_PUNT=yes gnome2-multilib_src_install -j1
-}
-
-pkg_preinst() {
-	gnome2_gdk_pixbuf_savelist
-}
-
-pkg_postinst() {
-	# causes segfault if set, see bug 375615
-	unset __GL_NO_DSO_FINALIZER
-
-	gnome2-multilib_gdk_pixbuf_update
-
-	# Migration snippet for when this was handled by gtk+
-	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
-}
-
-pkg_postrm() {
-	if [[ -z ${REPLACED_BY_VERSIONS} ]]; then
-		multilib_foreach_abi abi_postrm
-	fi
-}
-
-abi_postrm() {
-	rm -f "${EROOT}"usr/$(get_libdir)/${PN}-2.0/2.10.0/loaders.cache
-}
diff --git a/x11-libs/gdk-pixbuf/gdk-pixbuf-2.30.5-r1.ebuild b/x11-libs/gdk-pixbuf/gdk-pixbuf-2.30.6-r2.ebuild
index 96d2a5a..700a1dc 100644
--- a/x11-libs/gdk-pixbuf/gdk-pixbuf-2.30.5-r1.ebuild
+++ b/x11-libs/gdk-pixbuf/gdk-pixbuf-2.30.6-r2.ebuild
@@ -4,7 +4,7 @@
 
 EAPI="5"
 
-inherit gtk-doc gnome.org gnome2-multilib libtool
+inherit eutils gtk-doc gnome.org gnome2-multilib libtool
 
 DESCRIPTION="Image loading library for GTK+"
 HOMEPAGE="http://www.gtk.org/"
@@ -25,7 +25,7 @@ COMMON_DEPEND="
 "
 DEPEND="${COMMON_DEPEND}
 	>=dev-util/gtk-doc-am-1.20
-	>=sys-devel/gettext-0.17[${MULTILIB_USEDEP}]
+	>=sys-devel/gettext-0.17
 	virtual/pkgconfig
 "
 # librsvg blocker is for the new pixbuf loader API, you lose icons otherwise
@@ -34,8 +34,14 @@ RDEPEND="${COMMON_DEPEND}
 	!<gnome-base/librsvg-2.31.0
 	!<x11-libs/gtk+-2.21.3:2
 	!<x11-libs/gtk+-2.90.4:3
+	abi_x86_32? (
+		!<=app-emulation/emul-linux-x86-gtklibs-20131008-r4
+		!app-emulation/emul-linux-x86-gtklibs[-abi_x86_32(-)]
+	)
 "
 
+# FIXME: MULTILIB_WRAPPED_EXECUTABLES -> MULTILIB_CHOST_TOOLS
+MULTILIB_CHOST_TOOLS=( /usr/bin/gdk-pixbuf-query-loaders )
 MULTILIB_WRAPPED_EXECUTABLES=( /usr/bin/gdk-pixbuf-query-loaders )
 
 src_prepare() {
@@ -69,18 +75,18 @@ src_install() {
 pkg_preinst() {
 	gnome2_gdk_pixbuf_savelist
 
-	multilib_foreach_abi my_per_abi_pkg_preinst
-}
+	multilib_pkg_preinst() {
+		# Make sure loaders.cache belongs to gdk-pixbuf alone
+		local cache="usr/$(get_libdir)/${PN}-2.0/2.10.0/loaders.cache"
 
-my_per_abi_pkg_preinst() {
-	# Make sure loaders.cache belongs to gdk-pixbuf alone
-	local cache="usr/$(get_libdir)/${PN}-2.0/2.10.0/loaders.cache"
+		if [[ -e ${EROOT}${cache} ]]; then
+			cp "${EROOT}"${cache} "${ED}"/${cache} || die
+		else
+			touch "${ED}"/${cache} || die
+		fi
+	}
 
-	if [[ -e ${EROOT}${cache} ]]; then
-		cp "${EROOT}"${cache} "${ED}"/${cache} || die
-	else
-		touch "${ED}"/${cache} || die
-	fi
+	multilib_foreach_abi multilib_pkg_preinst
 }
 
 pkg_postinst() {
@@ -99,10 +105,6 @@ pkg_postinst() {
 
 pkg_postrm() {
 	if [[ -z ${REPLACED_BY_VERSIONS} ]]; then
-		multilib_foreach_abi my_per_abi_pkg_postrm
+		rm -f "${EROOT}"usr/lib*/${PN}-2.0/2.10.0/loaders.cache
 	fi
 }
-
-my_per_abi_pkg_postrm() {
-	rm -f "${EROOT}"usr/$(get_libdir)/${PN}-2.0/2.10.0/loaders.cache
-}
diff --git a/x11-libs/gdk-pixbuf/metadata.xml b/x11-libs/gdk-pixbuf/metadata.xml
deleted file mode 100644
index 6e0e2ec..0000000
--- a/x11-libs/gdk-pixbuf/metadata.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-  <herd>gnome</herd>
-</pkgmetadata>