4 files changed, 13 insertions, 195 deletions
diff --git a/x11-libs/gdk-pixbuf/ChangeLog b/x11-libs/gdk-pixbuf/ChangeLog
index 7b544c8d7a26..73c02809d1ff 100644
--- a/x11-libs/gdk-pixbuf/ChangeLog
+++ b/x11-libs/gdk-pixbuf/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for x11-libs/gdk-pixbuf
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-libs/gdk-pixbuf/ChangeLog,v 1.36 2011/10/14 21:43:56 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/gdk-pixbuf/ChangeLog,v 1.37 2011/10/14 21:44:44 ssuominen Exp $
+
+  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:
diff --git a/x11-libs/gdk-pixbuf/Manifest b/x11-libs/gdk-pixbuf/Manifest
index 3946ca13db37..b7e9b91956b4 100644
--- a/x11-libs/gdk-pixbuf/Manifest
+++ b/x11-libs/gdk-pixbuf/Manifest
@@ -5,22 +5,19 @@ AUX gdk-pixbuf-2.21.4-fix-automagic-x11.patch 715 RMD160 efeaa25e97e7620018ae3ca
 AUX gdk-pixbuf-2.22.1-CVE-2011-2485.patch 2230 RMD160 5250b2c5404691d988edd586514566edcba67744 SHA1 5147710cd7d6670c47d6bf785f85de1a6c62ce87 SHA256 10f7e6ef2c4ab8a3dd744ad2711963202b2a7e63fe3baea3d9c3401b84644c47
 AUX gdk-pixbuf-2.22.1-fix-libpng15.patch 2000 RMD160 807024ae02a5c4a4f1df588a9a93b482f255f243 SHA1 4e8235e2cd36364f1fadaba49b6fb4ba02472de2 SHA256 57010dd154e31f669651f8916521c1b251920aec84c7da0d328a70cc8105fb07
 DIST gdk-pixbuf-2.22.1.tar.bz2 1543273 RMD160 d05d6642e147281b7dc1dd21657595333f13f6f1 SHA1 b452208963ddd84f7280865695b50255fcafaa2e SHA256 6ce87eda24af9362307b2593c154d0b660f4e26d0abf2e71d46d0ddd55fd953d
-DIST gdk-pixbuf-2.23.5.tar.xz 1171372 RMD160 d873ee2c547f883368b8589a066e916d713e46c3 SHA1 8fca3db7165bce01f0f14b85367736d4cc8d00e8 SHA256 7a6c3550426f38f6b0eeeb49295654d9e706ce8f1786a4d0932f9d2c0d0bc500
 DIST gdk-pixbuf-2.24.0.tar.xz 1176324 RMD160 38e9896dd9a1ed6bf207509cd635828cebe674b8 SHA1 6a78751630a54fdef9a6a3928322c98e6c1ef60c SHA256 67c11d3aa40441c1cea42c365bf2d6a9a9dd52fae2d359a707ad5e8abb4d28a7
 EBUILD gdk-pixbuf-2.22.1-r2.ebuild 2941 RMD160 277c2bbeafc31e2b94d8cce6e5baea8ee7861d5f SHA1 9957f05eccd75b9d8ac720adb9b1bcbcd40cbace SHA256 c88d9caeb8ca3e69fe5e52f7b4f1ce64672b7eb9949bb4877c47515b6bfca549
-EBUILD gdk-pixbuf-2.23.5.ebuild 2775 RMD160 e2641926aff8e515194d1da97d7407efd2a931f8 SHA1 398d075da9dd6009f91f77f195b5ec19d7d8112d SHA256 86582ea723eba9680082f09f8bef1e265efede27b9425d735db481edd71af582
 EBUILD gdk-pixbuf-2.24.0-r1.ebuild 2944 RMD160 4c420bb0d8903ef4cfdbde1c028263752ce3c23d SHA1 bb5d4fc1a09d46a2bc58742c25e9014d13ed8401 SHA256 197feb801e5100bcad437855beae97892f3c6187c534025686cc44b7e497c9c4
-EBUILD gdk-pixbuf-2.24.0.ebuild 2747 RMD160 3d954f470492a58c2de1522cd341f427cb35df2f SHA1 ee9c9899a607f0b8e8d9bf96cc296ec1a955f46c SHA256 4cc6c36e932e5ab9573d90ffd75f76c065d7ef4d0baf149a58760cdec12172b7
-MISC ChangeLog 5493 RMD160 6d851d94b0615a879a05585ff653cbd10ff7b4ff SHA1 9b52910c0b977337b430e4a5b8805b94337040b9 SHA256 abdd844a4b4351e22578816bc096d78d2e0bd84164da9bf5044b05057e69b62c
+MISC ChangeLog 5610 RMD160 8e7506423ebf26a28ac9d9d675f61f84754c9ed3 SHA1 3fde25b2b38caa2833f2c6cc6df9dc66418a073e SHA256 ab36b704d0b806f18be50db94c8b7ffd6a312448610b30a4b8de262e4eb0e7d1
 MISC metadata.xml 285 RMD160 829826c3a3edd13d82bf87a4e6c1c08719f1549f SHA1 03e8b2cfc1956cfea91e8cedfa2451e68b2bf8e5 SHA256 8400998fc578bc9661b57a27ed3226941e4f75ef5bf7d9f929ed9de2d97ba8b0
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.18 (GNU/Linux)
 
-iQEcBAEBAgAGBQJOmK0aAAoJEEdUh39IaPFN3A4H/2T2i/Nc/PA4gUR/LVne988j
-A+tvYqVtwjq9c3RxyKGlHML1CFpsgzmqoydCUldOwaobknQICfbSlpkKOgFXFutA
-itV4VpNxL1/pzJ7ZCp89lwkn7hM6Tf4s32fYfbkvSsk+EB9ZGm6c5rhfpOwvB/DY
-pqdLyRjajQ/2JGAFDXIE5Sll+4IEjWYLScdVZt00eEVmYfHR05qj4LYrZjQmkc8y
-EAQ7dBJgLV42WibPOR5EhIxBtCS+AkJjo1tmBE7LLYonWPukHvFia2Mi2zV1YlGX
-WNNyQFEL17Lp4w5vfMep1yg8JhYusr+vjBld2C2skxh3iNOEd09VNK2BoHwqMRA=
-=I7Y/
+iQEcBAEBAgAGBQJOmK1KAAoJEEdUh39IaPFNuPMH/03eRpVJ+vxSSNHoQdklu9rb
+qrAwZE5T8DG5IRI/8LS2koIIdkgwhW44es+7U94RdFqLeXi4s06mNKzbZbFCw9Vz
+6U5Wbwv9Ddk7LcF4JJGGWijRBj7wE56/XvU3/sc8EHXCzREo/iwgodVtadCCR2b5
+btAx3ZKqLTvXgbQHof0I8qoTbEFCfcN2OYyDFeGti9bX+64gEyKqU7V/EX/W5bh8
+QBXct7wvo05guCQyjQ/uf9mi+RSO+uTyBHfpV8Xsu2JDlRHov5WFETkMUrucDiLR
+FqXyaf33f41Q/QErds0nk4YgHhSxaLV7Sa+5rIZadKGXwLDhTYfc7It+50SxSHY=
+=Gt4R
 -----END PGP SIGNATURE-----
diff --git a/x11-libs/gdk-pixbuf/gdk-pixbuf-2.23.5.ebuild b/x11-libs/gdk-pixbuf/gdk-pixbuf-2.23.5.ebuild
deleted file mode 100644
index f43f1bab1c12..000000000000
--- a/x11-libs/gdk-pixbuf/gdk-pixbuf-2.23.5.ebuild
+++ /dev/null
@@ -1,92 +0,0 @@
-# Copyright 1999-2011 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.23.5.ebuild,v 1.4 2011/10/09 09:43:33 lxnay Exp $
-
-EAPI="4"
-
-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 ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-IUSE="+X debug doc +introspection jpeg jpeg2k tiff test"
-
-COMMON_DEPEND="
-	>=dev-libs/glib-2.27.2
-	>=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 )"
-DEPEND="${COMMON_DEPEND}
-	>=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 )"
-# 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"
-
-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
-	find "${D}" -name '*.la' -exec rm -f '{}' + || die
-}
-
-pkg_postinst() {
-	# causes segfault if set, see bug 375615
-	unset __GL_NO_DSO_FINALIZER
-
-	tmp_file=$(mktemp --suffix=gdk_pixbuf_ebuild)
-	# be atomic!
-	gdk-pixbuf-query-loaders > "${tmp_file}"
-	if [ "${?}" = "0" ]; then
-		cat "${tmp_file}" > "${EROOT}usr/$(get_libdir)/gdk-pixbuf-2.0/2.10.0/loaders.cache"
-	else
-		ewarn "Cannot update loaders.cache, gdk-pixbuf-query-loaders failed to run"
-	fi
-	rm "${tmp_file}"
-
-	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
-}
diff --git a/x11-libs/gdk-pixbuf/gdk-pixbuf-2.24.0.ebuild b/x11-libs/gdk-pixbuf/gdk-pixbuf-2.24.0.ebuild
deleted file mode 100644
index ad64bd9f66ae..000000000000
--- a/x11-libs/gdk-pixbuf/gdk-pixbuf-2.24.0.ebuild
+++ /dev/null
@@ -1,91 +0,0 @@
-# Copyright 1999-2011 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.24.0.ebuild,v 1.3 2011/10/09 09:43:33 lxnay Exp $
-
-EAPI="4"
-
-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 ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-IUSE="+X debug doc +introspection jpeg jpeg2k tiff test"
-
-COMMON_DEPEND="
-	>=dev-libs/glib-2.27.2:2
-	>=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 )"
-DEPEND="${COMMON_DEPEND}
-	>=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 )"
-# 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"
-
-src_prepare() {
-	# Only build against libX11 if the user wants to do so, upstream bug #657569
-	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
-	dodoc AUTHORS NEWS* README*
-
-	# New library, remove .la files
-	find "${D}" -name '*.la' -exec rm -f '{}' + || die
-}
-
-pkg_postinst() {
-	# causes segfault if set, see bug 375615
-	unset __GL_NO_DSO_FINALIZER
-
-	tmp_file=$(mktemp --suffix=gdk_pixbuf_ebuild)
-	# be atomic!
-	gdk-pixbuf-query-loaders > "${tmp_file}"
-	if [ "${?}" = "0" ]; then
-		cat "${tmp_file}" > "${EROOT}usr/$(get_libdir)/gdk-pixbuf-2.0/2.10.0/loaders.cache"
-	else
-		ewarn "Cannot update loaders.cache, gdk-pixbuf-query-loaders failed to run"
-	fi
-	rm "${tmp_file}"
-
-	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
-}