reinit the tree, so we can have metadata

7 files changed, 483 insertions, 0 deletions

diff --git a/x11-libs/gdk-pixbuf/Manifest b/x11-libs/gdk-pixbuf/Manifest
new file mode 100644
index 000000000000..828793f58228
--- /dev/null
+++ b/x11-libs/gdk-pixbuf/Manifest
@@ -0,0 +1,10 @@
+AUX 2.36.10-fix-tiff-loader.patch 2300 SHA256 2fc0318b0d4375d09ad1b9cd619ab2a6a0d45dd6eb001e19b851c8c0eeb65541 SHA512 e1c04c53b74cc62c63f144b3f9b1ac4246709c809d92ac29dda973ce17232c87fdde6dbceb1295b87d1dad93eb1b2dcf55038c6072bdaac021d96cef3129bd59 WHIRLPOOL e15594e52accd0a994097c2872832baab4ce6e8191b9bd9de64e5e8b6676ae5f3421d380b765b5443b1c1828cf3dd4e9ee26fb7887f9c278bbfb1835e6e3ad4a
+AUX gdk-pixbuf-2.32.3-fix-lowmem-uclibc.patch 1075 SHA256 3914db89c10f60bda2d5a3f7d94ddc36a29b67d6f34a18a724d4b4164df2affd SHA512 0a3e51c52f947d6231b472525b11e13fdc752b8eaa34c95ec3c76cfb0faf33ef3109c8381189261e8ebae76a4070af24e58c373bebc69bbb6b69399bf833395d WHIRLPOOL 52f5e28307571cb846e471997cea491c709adc41607788be2af3826782558659c8431f4c379ba43add271cda25baecb13e33fea99ec8d007b7bc5a44bbd6a0f1
+DIST gdk-pixbuf-2.36.10.tar.xz 5772196 SHA256 f8f6fa896b89475c73b6e9e8d2a2b062fc359c4b4ccb8e96470d6ab5da949ace SHA512 d080d20baa20efe58cc5e5d043532f57e7950c0f7a3661998f924ae2a819f6bf1113e1da7785ac2063dfa582576d418eea5b3c80ea3db16057de43cc3f911d35 WHIRLPOOL 3b2328f9bf47ce26f810a9d7629044c3e9c4ac0519afb0d3c4986dc6d2820301f60ad9e1218fc23bc2ac32e35eca78ed468e6356a208244cdcff7d95ab83be27
+DIST gdk-pixbuf-2.36.9.tar.xz 5769124 SHA256 8013b271ff1a691514b5bbc9b99f6ed456422d4da4a721a9db0b783abe8e740a SHA512 ab8f2cda4490012936b094a1321e64b85e1fa1f8d070fae135a514f87f695201b845f4192e4a02954e2767d44314c0a95d727118853528182952d15890130261 WHIRLPOOL 13422ecffde49445e4c81e4d7e244a2511811fa85d55261420f8ac4e2a373eab08e7adab64c6ea5b2997ed4e6a888630e03a378d04a0c6b2a652fc34d2996a87
+EBUILD gdk-pixbuf-2.36.10-r2.ebuild 3804 SHA256 866fc97ff9b1e0ca0045be3650780733ea2179979a3468d2c5ab200eca6b4556 SHA512 ef4f6ea4c684c09fa4387b40e10f0070227e8ef37b5246fda34cf4a05ec9a6be681daf1d504d514a33f41d52263bd1ae5685c6ca38d9a22611d8dff8df5a3f70 WHIRLPOOL 372c1b14ac96699364fcbabc1b07b00d9196f39cdae1f33c9ea538f8a12761b149a9a4164320c03f1ccc3bd72acadebdfc2aaf0e9ab4193e08a1029359862dc8
+EBUILD gdk-pixbuf-2.36.10.ebuild 3671 SHA256 e013ddb16399d82676232cb5ed3f7e4842189bbec50d5be31b04f23ece801d60 SHA512 8a2b3fa2f1f7dc063e7939ba745b3d10b497da1d5d13ff336e9fe487d2cc31125b428278178dd187c57302409fddfa175f5bbbd6b5f796d6abf77f34f5b3655e WHIRLPOOL f1f852248a2dd2526d02b67f33e6a334bde42fa56c54270d9154295f3ee332cc5d3fc144ddb94dd022fa4349c663277928b719bd5ed3bed332872fa27c40cecb
+EBUILD gdk-pixbuf-2.36.9.ebuild 3662 SHA256 2b05840d0f37b5cd4e71978cac95821e6ea108b52c582d0e4bf4b86d2549bb56 SHA512 5622f0a3df9ba6972958d63d08ee0bd6b73c933bca2c05dd2e65a89e3f44076c5d042cec3f519523a8bb778d98a2051d6a5adaffab04238a3f6415741be67694 WHIRLPOOL 017a0b9ba465bbbe6af051b9738df34c7a616114e711f63bdfa7b6abfad8204af694c168ab64c13f016655677003818a420e520ec0ee5e0e25a4d5847e1086fc
+MISC ChangeLog 12972 SHA256 5957820711d0f8756c395ec32bfc37486d2010f6d6549a392bc3306f4c19649e SHA512 2076c689ab9680d0c030772d0a1662fb486cf999e62dea4961b9cc846cafd2f47e0e3b93dfb505b8723584fcf82e1f6c67157018448a08e0faac1e0db4dd4ddf WHIRLPOOL b05bca635bfc0ee26e1d80c97575146e579047109abd21d57f30d6cbcf245e024468a124e787609e0001237d8ea2afaadd9fe80e3bfa928e41320890e02cc9f0
+MISC ChangeLog-2015 20964 SHA256 c817885b0c0581948133df12c0334907a270597dbdcefef9a38764035d9f3c1d SHA512 3ca7e987ff65de43ed767ceb2fabc2ef3bbe22bae6283487780216ff4e4ab276c69c676675b47de713e17673d1f3ca6b67d77b4539fdae66ecad0934f657cb09 WHIRLPOOL e1678696aa9217e0f7dcd917ee632ef9b5a266813dee6bf47d784e5fd23451ecebb1200c0c20c0ba87d1d8f61b7a6a648fdda1f42f9f00c0ac60d4d5f603b0ed
+MISC metadata.xml 342 SHA256 832f68eb31a663c4c19d3515f2cc35a97868e2930d54df956688f2a253694e8a SHA512 c889bb461ef578170d304b124dbf7ffb9ae35fd4b7530caa4ec15b815c4cda2c297971e6023faf4c4ca81460ab4971c6369093a99b2891f3c1837cb80caa8a7a WHIRLPOOL 0a1e5f7feadaca7e4b9e763311dd7601a5d1bfe914356ec8a65401f93669426d7eed495364494c3be9a819938d1e2a953766d41039a8ddf3e0085ed0a7c88c43
diff --git a/x11-libs/gdk-pixbuf/files/2.36.10-fix-tiff-loader.patch b/x11-libs/gdk-pixbuf/files/2.36.10-fix-tiff-loader.patch
new file mode 100644
index 000000000000..80ed32f83f3c
--- /dev/null
+++ b/x11-libs/gdk-pixbuf/files/2.36.10-fix-tiff-loader.patch
@@ -0,0 +1,66 @@
+From 66537d1ecf7e857a0a443c1ebf72baf6f19dd3e4 Mon Sep 17 00:00:00 2001
+From: Bastien Nocera <hadess@hadess.net>
+Date: Mon, 11 Sep 2017 19:11:50 +0200
+Subject: build: Fix TIFF loader compilation with autotools
+
+https://bugzilla.gnome.org/show_bug.cgi?id=786342
+---
+ configure.ac           | 7 +++----
+ gdk-pixbuf/Makefile.am | 2 +-
+ 2 files changed, 4 insertions(+), 5 deletions(-)
+
+diff --git a/configure.ac b/configure.ac
+index 0abe5ce..c07bd6f 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -564,7 +564,6 @@ dnl Test for libjasper
+ *** --without-libjasper to configure])
+   fi
+ 
+-AC_SUBST(LIBTIFF)
+ AC_SUBST(LIBJPEG)
+ AC_SUBST(LIBPNG)
+ AC_SUBST(LIBJASPER)
+@@ -676,7 +675,7 @@ if test x$gio_can_sniff = x; then
+   AC_DEFINE(GDK_PIXBUF_USE_GIO_MIME, 1, [Define if gio can sniff image data])
+ fi
+ 
+-AM_CONDITIONAL(HAVE_TIFF, test "x$LIBTIFF" != x)
++AM_CONDITIONAL(HAVE_TIFF, test "x$libtiff_found" != xno)
+ AM_CONDITIONAL(HAVE_PNG, test "x$LIBPNG" != x)
+ AM_CONDITIONAL(HAVE_JPEG, test "x$LIBJPEG" != x)
+ AM_CONDITIONAL(HAVE_JASPER, test "x$LIBJASPER" != x)
+@@ -684,7 +683,7 @@ AM_CONDITIONAL(HAVE_JASPER, test "x$LIBJASPER" != x)
+ if $dynworks ; then
+   STATIC_LIB_DEPS=
+   if echo "$included_loaders" | egrep '(^|,)tiff($|,)' > /dev/null; then
+-    STATIC_LIB_DEPS="$STATIC_LIB_DEPS $LIBTIFF"
++    STATIC_LIB_DEPS="$STATIC_LIB_DEPS $TIFF_LIBS"
+   fi
+   if echo "$included_loaders" | egrep '(^|,)jpeg($|,)' > /dev/null; then
+     STATIC_LIB_DEPS="$STATIC_LIB_DEPS $LIBJPEG"
+@@ -698,7 +697,7 @@ if $dynworks ; then
+     STATIC_LIB_DEPS="$STATIC_LIB_DEPS $LIBJASPER"
+   fi
+ else
+-  STATIC_LIB_DEPS="$LIBTIFF $LIBJPEG $LIBPNG $LIBJASPER"
++  STATIC_LIB_DEPS="$TIFF_LIBS $LIBJPEG $LIBPNG $LIBJASPER"
+ fi
+ 
+ # Checks to see whether we should include mediaLib
+diff --git a/gdk-pixbuf/Makefile.am b/gdk-pixbuf/Makefile.am
+index 01b693c..720a058 100644
+--- a/gdk-pixbuf/Makefile.am
++++ b/gdk-pixbuf/Makefile.am
+@@ -88,7 +88,7 @@ libpixbufloader_pnm_la_LIBADD = $(module_libs)
+ libstatic_pixbufloader_tiff_la_SOURCES = io-tiff.c
+ libpixbufloader_tiff_la_SOURCES = io-tiff.c
+ libpixbufloader_tiff_la_LDFLAGS = -avoid-version -module $(no_undefined)
+-libpixbufloader_tiff_la_LIBADD = $(LIBTIFF) $(module_libs)
++libpixbufloader_tiff_la_LIBADD = $(TIFF_LIBS) $(module_libs)
+ 
+ #
+ # The XPM loader
+-- 
+cgit v0.12
+
diff --git a/x11-libs/gdk-pixbuf/files/gdk-pixbuf-2.32.3-fix-lowmem-uclibc.patch b/x11-libs/gdk-pixbuf/files/gdk-pixbuf-2.32.3-fix-lowmem-uclibc.patch
new file mode 100644
index 000000000000..77ea7e75521e
--- /dev/null
+++ b/x11-libs/gdk-pixbuf/files/gdk-pixbuf-2.32.3-fix-lowmem-uclibc.patch
@@ -0,0 +1,34 @@
+From 21b8eb73d9272e06707ad6d0357f3034b8d9a46f Mon Sep 17 00:00:00 2001
+From: "Anthony G. Basile" <blueness@gentoo.org>
+Date: Wed, 14 Oct 2015 16:18:19 -0400
+Subject: [PATCH] tests/pixbuf-lowmem.c: Do not run pixbuf-lowmem test on
+ uClibc
+
+pixbuf-lowmem.c depends on GNU libc internals and does not build
+on musl or uClibc.  Commit e1fd25a fixes this issue for musl by
+testing if __GLIBC__ is set.  However, uClibc sets __GLIBC__ and
+so this check is insufficient there.  We expand the check so that
+we run pixbuf-lowmem on glibc, while avoiding it on both musl and
+uClibc.
+
+Signed-off-by: Anthony G. Basile <blueness@gentoo.org>
+---
+ tests/pixbuf-lowmem.c | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/tests/pixbuf-lowmem.c b/tests/pixbuf-lowmem.c
+index 9e9571f..ec7504f 100644
+--- a/tests/pixbuf-lowmem.c
++++ b/tests/pixbuf-lowmem.c
+@@ -24,7 +24,7 @@
+ #include <time.h>
+ #include <string.h>
+ 
+-#ifdef __GLIBC__
++#if defined(__GLIBC__) && !defined(__UCLIBC__)
+ #define PRETEND_MEM_SIZE (16 * 1024 * 1024)
+ #define REMAINING_MEM_SIZE 100000
+ 
+-- 
+2.4.9
+
diff --git a/x11-libs/gdk-pixbuf/gdk-pixbuf-2.36.10-r2.ebuild b/x11-libs/gdk-pixbuf/gdk-pixbuf-2.36.10-r2.ebuild
new file mode 100644
index 000000000000..b56eb7ce2666
--- /dev/null
+++ b/x11-libs/gdk-pixbuf/gdk-pixbuf-2.36.10-r2.ebuild
@@ -0,0 +1,124 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+GNOME2_LA_PUNT="yes"
+GNOME2_EAUTORECONF="yes"
+
+inherit flag-o-matic gnome2 multilib multilib-minimal
+
+DESCRIPTION="Image loading library for GTK+"
+HOMEPAGE="https://git.gnome.org/browse/gdk-pixbuf"
+
+LICENSE="LGPL-2+"
+SLOT="2"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+IUSE="X debug +introspection jpeg jpeg2k tiff test"
+
+COMMON_DEPEND="
+	>=dev-libs/glib-2.48.0:2[${MULTILIB_USEDEP}]
+	>=media-libs/libpng-1.4:0=[${MULTILIB_USEDEP}]
+	introspection? ( >=dev-libs/gobject-introspection-0.9.3:= )
+	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.20
+	>=sys-devel/gettext-0.19
+	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_CHOST_TOOLS=(
+	/usr/bin/gdk-pixbuf-query-loaders$(get_exeext)
+)
+
+PATCHES=(
+	# See https://bugzilla.gnome.org/show_bug.cgi?id=756590
+	"${FILESDIR}"/${PN}-2.32.3-fix-lowmem-uclibc.patch
+	# Fix TIFF loader compilation, bug #629716 (from master)
+	"${FILESDIR}"/2.36.10-fix-tiff-loader.patch
+)
+
+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
+	[[ ${CHOST} == *-solaris* ]] && append-libs intl
+
+	gnome2_src_prepare
+}
+
+multilib_src_configure() {
+	# png always on to display icons
+	ECONF_SOURCE="${S}" \
+	gnome2_src_configure \
+		$(usex debug --enable-debug=yes "") \
+		$(use_with jpeg libjpeg) \
+		$(use_with jpeg2k libjasper) \
+		$(use_with tiff libtiff) \
+		$(multilib_native_use_enable introspection) \
+		$(use_with X x11) \
+		--with-libpng
+
+	# work-around gtk-doc out-of-source brokedness
+	if multilib_is_native_abi; then
+		ln -s "${S}"/docs/reference/${PN}/html docs/reference/${PN}/html || die
+	fi
+}
+
+multilib_src_install() {
+	# Parallel install fails when no gdk-pixbuf is already installed, bug #481372
+	MAKEOPTS="${MAKEOPTS} -j1" gnome2_src_install
+}
+
+pkg_preinst() {
+	gnome2_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"
+
+		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() {
+	# causes segfault if set, see bug 375615
+	unset __GL_NO_DSO_FINALIZER
+
+	multilib_foreach_abi gnome2_pkg_postinst
+
+	# 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() {
+	gnome2_pkg_postrm
+
+	if [[ -z ${REPLACED_BY_VERSION} ]]; then
+		rm -f "${EROOT}"usr/lib*/${PN}-2.0/2.10.0/loaders.cache
+	fi
+}
diff --git a/x11-libs/gdk-pixbuf/gdk-pixbuf-2.36.10.ebuild b/x11-libs/gdk-pixbuf/gdk-pixbuf-2.36.10.ebuild
new file mode 100644
index 000000000000..a0c235ef3cb6
--- /dev/null
+++ b/x11-libs/gdk-pixbuf/gdk-pixbuf-2.36.10.ebuild
@@ -0,0 +1,119 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+GNOME2_LA_PUNT="yes"
+
+inherit flag-o-matic gnome2 multilib multilib-minimal
+
+DESCRIPTION="Image loading library for GTK+"
+HOMEPAGE="https://git.gnome.org/browse/gdk-pixbuf"
+
+LICENSE="LGPL-2+"
+SLOT="2"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+IUSE="X debug +introspection jpeg jpeg2k tiff test"
+
+COMMON_DEPEND="
+	>=dev-libs/glib-2.48.0:2[${MULTILIB_USEDEP}]
+	>=media-libs/libpng-1.4:0=[${MULTILIB_USEDEP}]
+	introspection? ( >=dev-libs/gobject-introspection-0.9.3:= )
+	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.20
+	>=sys-devel/gettext-0.19
+	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_CHOST_TOOLS=(
+	/usr/bin/gdk-pixbuf-query-loaders$(get_exeext)
+)
+
+src_prepare() {
+	# See https://bugzilla.gnome.org/show_bug.cgi?id=756590
+	eapply "${FILESDIR}"/${PN}-2.32.3-fix-lowmem-uclibc.patch
+
+	# 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
+	[[ ${CHOST} == *-solaris* ]] && append-libs intl
+
+	gnome2_src_prepare
+}
+
+multilib_src_configure() {
+	# png always on to display icons
+	ECONF_SOURCE="${S}" \
+	gnome2_src_configure \
+		$(usex debug --enable-debug=yes "") \
+		$(use_with jpeg libjpeg) \
+		$(use_with jpeg2k libjasper) \
+		$(use_with tiff libtiff) \
+		$(multilib_native_use_enable introspection) \
+		$(use_with X x11) \
+		--with-libpng
+
+	# work-around gtk-doc out-of-source brokedness
+	if multilib_is_native_abi; then
+		ln -s "${S}"/docs/reference/${PN}/html docs/reference/${PN}/html || die
+	fi
+}
+
+multilib_src_install() {
+	# Parallel install fails when no gdk-pixbuf is already installed, bug #481372
+	MAKEOPTS="${MAKEOPTS} -j1" gnome2_src_install
+}
+
+pkg_preinst() {
+	gnome2_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"
+
+		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() {
+	# causes segfault if set, see bug 375615
+	unset __GL_NO_DSO_FINALIZER
+
+	multilib_foreach_abi gnome2_pkg_postinst
+
+	# 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() {
+	gnome2_pkg_postrm
+
+	if [[ -z ${REPLACED_BY_VERSION} ]]; then
+		rm -f "${EROOT}"usr/lib*/${PN}-2.0/2.10.0/loaders.cache
+	fi
+}
diff --git a/x11-libs/gdk-pixbuf/gdk-pixbuf-2.36.9.ebuild b/x11-libs/gdk-pixbuf/gdk-pixbuf-2.36.9.ebuild
new file mode 100644
index 000000000000..8a32dc232fb3
--- /dev/null
+++ b/x11-libs/gdk-pixbuf/gdk-pixbuf-2.36.9.ebuild
@@ -0,0 +1,119 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+GNOME2_LA_PUNT="yes"
+
+inherit flag-o-matic gnome2 multilib multilib-minimal
+
+DESCRIPTION="Image loading library for GTK+"
+HOMEPAGE="https://git.gnome.org/browse/gdk-pixbuf"
+
+LICENSE="LGPL-2+"
+SLOT="2"
+KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+IUSE="X debug +introspection jpeg jpeg2k tiff test"
+
+COMMON_DEPEND="
+	>=dev-libs/glib-2.48.0:2[${MULTILIB_USEDEP}]
+	>=media-libs/libpng-1.4:0=[${MULTILIB_USEDEP}]
+	introspection? ( >=dev-libs/gobject-introspection-0.9.3:= )
+	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.20
+	>=sys-devel/gettext-0.19
+	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_CHOST_TOOLS=(
+	/usr/bin/gdk-pixbuf-query-loaders$(get_exeext)
+)
+
+src_prepare() {
+	# See https://bugzilla.gnome.org/show_bug.cgi?id=756590
+	eapply "${FILESDIR}"/${PN}-2.32.3-fix-lowmem-uclibc.patch
+
+	# 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
+	[[ ${CHOST} == *-solaris* ]] && append-libs intl
+
+	gnome2_src_prepare
+}
+
+multilib_src_configure() {
+	# png always on to display icons
+	ECONF_SOURCE="${S}" \
+	gnome2_src_configure \
+		$(usex debug --enable-debug=yes "") \
+		$(use_with jpeg libjpeg) \
+		$(use_with jpeg2k libjasper) \
+		$(use_with tiff libtiff) \
+		$(multilib_native_use_enable introspection) \
+		$(use_with X x11) \
+		--with-libpng
+
+	# work-around gtk-doc out-of-source brokedness
+	if multilib_is_native_abi; then
+		ln -s "${S}"/docs/reference/${PN}/html docs/reference/${PN}/html || die
+	fi
+}
+
+multilib_src_install() {
+	# Parallel install fails when no gdk-pixbuf is already installed, bug #481372
+	MAKEOPTS="${MAKEOPTS} -j1" gnome2_src_install
+}
+
+pkg_preinst() {
+	gnome2_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"
+
+		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() {
+	# causes segfault if set, see bug 375615
+	unset __GL_NO_DSO_FINALIZER
+
+	multilib_foreach_abi gnome2_pkg_postinst
+
+	# 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() {
+	gnome2_pkg_postrm
+
+	if [[ -z ${REPLACED_BY_VERSION} ]]; then
+		rm -f "${EROOT}"usr/lib*/${PN}-2.0/2.10.0/loaders.cache
+	fi
+}
diff --git a/x11-libs/gdk-pixbuf/metadata.xml b/x11-libs/gdk-pixbuf/metadata.xml
new file mode 100644
index 000000000000..6c6d2ea40eb5
--- /dev/null
+++ b/x11-libs/gdk-pixbuf/metadata.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<maintainer type="project">
+	<email>gnome@gentoo.org</email>
+	<name>Gentoo GNOME Desktop</name>
+</maintainer>
+<use>
+	<flag name="X">Build and install the legacy gdk_pixbuf_xlib-2.0 library</flag>
+</use>
+</pkgmetadata>