Version bump, fixes crashes with >glib-2.35. Drop useless USE=doc, it only regenerated documentation. Update license. Drop old.

(Portage version: 2.2.0_alpha142/cvs/Linux x86_64, signed Manifest commit with key CF0ADD61)

7 files changed, 29 insertions, 239 deletions

diff --git a/x11-libs/gdk-pixbuf/ChangeLog b/x11-libs/gdk-pixbuf/ChangeLog
index 010f79f160c2..edad1c877b4b 100644
--- a/x11-libs/gdk-pixbuf/ChangeLog
+++ b/x11-libs/gdk-pixbuf/ChangeLog
@@ -1,6 +1,16 @@
 # ChangeLog for x11-libs/gdk-pixbuf
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-libs/gdk-pixbuf/ChangeLog,v 1.76 2012/10/28 15:30:44 armin76 Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/gdk-pixbuf/ChangeLog,v 1.77 2012/11/10 05:54:13 tetromino Exp $
+
+*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
diff --git a/x11-libs/gdk-pixbuf/files/gdk-pixbuf-2.21.4-fix-automagic-x11.patch b/x11-libs/gdk-pixbuf/files/gdk-pixbuf-2.21.4-fix-automagic-x11.patch
deleted file mode 100644
index ae7ec2c905a6..000000000000
--- a/x11-libs/gdk-pixbuf/files/gdk-pixbuf-2.21.4-fix-automagic-x11.patch
+++ /dev/null
@@ -1,24 +0,0 @@
-Adds a new configure option to remove the automagic dependency on libX11.
-
---- configure.ac
-+++ configure.ac
-@@ -929,7 +929,18 @@ GDK_PIXBUF_XLIB_PACKAGES=
- GDK_PIXBUF_XLIB_EXTRA_CFLAGS=
- GDK_PIXBUF_XLIB_EXTRA_LIBS=
- 
--if $PKG_CONFIG --exists x11; then
-+AC_ARG_WITH(x11,
-+            AC_HELP_STRING([--with-x11=@<:@no/auto/yes@:>@],
-+                           [build X11 support @<:@default=auto@:>@]),,
-+            [
-+              if $PKG_CONFIG --exists x11; then
-+                with_x11=yes
-+              else
-+                with_x11=no
-+              fi
-+            ])
-+
-+if test x$with_x11 = xyes; then
-   AM_CONDITIONAL(USE_X11, true)
-   PKG_CHECK_MODULES(GDK_PIXBUF_XLIB_DEP, x11 gobject-2.0)
- else
diff --git a/x11-libs/gdk-pixbuf/gdk-pixbuf-2.24.0-r1.ebuild b/x11-libs/gdk-pixbuf/gdk-pixbuf-2.24.0-r1.ebuild
deleted file mode 100644
index b1e3a8c3ec2a..000000000000
--- a/x11-libs/gdk-pixbuf/gdk-pixbuf-2.24.0-r1.ebuild
+++ /dev/null
@@ -1,93 +0,0 @@
-# Copyright 1999-2012 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-r1.ebuild,v 1.15 2012/09/18 09:44:29 tetromino Exp $
-
-EAPI="4"
-
-inherit eutils 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.4:0
-	introspection? ( >=dev-libs/gobject-introspection-0.9.3 )
-	jpeg? ( virtual/jpeg )
-	jpeg2k? ( media-libs/jasper )
-	tiff? ( >=media-libs/tiff-3.9.2:0 )
-	X? ( x11-libs/libX11 )"
-DEPEND="${COMMON_DEPEND}
-	virtual/pkgconfig
-	>=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
-
-	# This will avoid polluting the pkg-config file with versioned libpng,
-	# which is causing problems with libpng14 -> libpng15 upgrade
-	sed -i -e 's:libpng15:libpng libpng15:' configure.ac || die
-	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 -t tmp_gdk_pixbuf_ebuild.XXXXXXXXXX)
-	# 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.1-r1.ebuild b/x11-libs/gdk-pixbuf/gdk-pixbuf-2.24.1-r1.ebuild
index 8f39c7af531a..1f786837e68d 100644
--- a/x11-libs/gdk-pixbuf/gdk-pixbuf-2.24.1-r1.ebuild
+++ b/x11-libs/gdk-pixbuf/gdk-pixbuf-2.24.1-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2012 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.1-r1.ebuild,v 1.11 2012/09/18 09:44:29 tetromino Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/gdk-pixbuf/gdk-pixbuf-2.24.1-r1.ebuild,v 1.12 2012/11/10 05:54:13 tetromino Exp $
 
 EAPI="4"
 
@@ -9,10 +9,10 @@ inherit eutils gnome.org multilib libtool autotools
 DESCRIPTION="Image loading library for GTK+"
 HOMEPAGE="http://www.gtk.org/"
 
-LICENSE="LGPL-2"
+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"
+IUSE="+X debug +introspection jpeg jpeg2k tiff test"
 
 COMMON_DEPEND="
 	>=dev-libs/glib-2.27.2:2
@@ -23,12 +23,9 @@ COMMON_DEPEND="
 	tiff? ( >=media-libs/tiff-3.9.2:0 )
 	X? ( x11-libs/libX11 )"
 DEPEND="${COMMON_DEPEND}
-	virtual/pkgconfig
-	>=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 )"
+	>=sys-devel/gettext-0.17
+	virtual/pkgconfig"
 # librsvg blocker is for the new pixbuf loader API, you lose icons otherwise
 RDEPEND="${COMMON_DEPEND}
 	!<gnome-base/gail-1000
@@ -49,7 +46,6 @@ src_prepare() {
 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)
diff --git a/x11-libs/gdk-pixbuf/gdk-pixbuf-2.24.1.ebuild b/x11-libs/gdk-pixbuf/gdk-pixbuf-2.24.1.ebuild
deleted file mode 100644
index 97042c7dc442..000000000000
--- a/x11-libs/gdk-pixbuf/gdk-pixbuf-2.24.1.ebuild
+++ /dev/null
@@ -1,91 +0,0 @@
-# Copyright 1999-2012 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.1.ebuild,v 1.10 2012/09/18 09:44:29 tetromino 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.4:0
-	introspection? ( >=dev-libs/gobject-introspection-0.9.3 )
-	jpeg? ( virtual/jpeg )
-	jpeg2k? ( media-libs/jasper )
-	tiff? ( >=media-libs/tiff-3.9.2:0 )
-	X? ( x11-libs/libX11 )"
-DEPEND="${COMMON_DEPEND}
-	virtual/pkgconfig
-	>=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() {
-	# This will avoid polluting the pkg-config file with versioned libpng,
-	# which is causing problems with libpng14 -> libpng15 upgrade
-	# See upstream bug #667068
-	sed -i -e 's:libpng15:libpng libpng15:' configure.ac || die
-	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 -t tmp_gdk_pixbuf_ebuild.XXXXXXXXXX)
-	# 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.26.4.ebuild b/x11-libs/gdk-pixbuf/gdk-pixbuf-2.26.4.ebuild
index b9a9bdfb3bb1..70351c369438 100644
--- a/x11-libs/gdk-pixbuf/gdk-pixbuf-2.26.4.ebuild
+++ b/x11-libs/gdk-pixbuf/gdk-pixbuf-2.26.4.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2012 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.26.4.ebuild,v 1.8 2012/10/28 15:30:44 armin76 Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/gdk-pixbuf/gdk-pixbuf-2.26.4.ebuild,v 1.9 2012/11/10 05:54:13 tetromino Exp $
 
 EAPI="4"
 
@@ -9,10 +9,10 @@ inherit gnome.org multilib libtool
 DESCRIPTION="Image loading library for GTK+"
 HOMEPAGE="http://www.gtk.org/"
 
-LICENSE="LGPL-2"
+LICENSE="LGPL-2+"
 SLOT="2"
 KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 sh sparc x86 ~amd64-fbsd ~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"
+IUSE="+X debug +introspection jpeg jpeg2k tiff test"
 
 COMMON_DEPEND="
 	>=dev-libs/glib-2.31.0:2
@@ -23,12 +23,9 @@ COMMON_DEPEND="
 	tiff? ( >=media-libs/tiff-3.9.2:0 )
 	X? ( x11-libs/libX11 )"
 DEPEND="${COMMON_DEPEND}
-	>=sys-devel/gettext-0.17
-	virtual/pkgconfig
 	>=dev-util/gtk-doc-am-1.11
-	doc? (
-		>=dev-util/gtk-doc-1.11
-		~app-text/docbook-xml-dtd-4.1.2 )"
+	>=sys-devel/gettext-0.17
+	virtual/pkgconfig"
 # librsvg blocker is for the new pixbuf loader API, you lose icons otherwise
 RDEPEND="${COMMON_DEPEND}
 	!<gnome-base/gail-1000
@@ -49,7 +46,6 @@ src_prepare() {
 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)
diff --git a/x11-libs/gdk-pixbuf/gdk-pixbuf-2.26.3.ebuild b/x11-libs/gdk-pixbuf/gdk-pixbuf-2.26.5.ebuild
index 72d1d62554de..b248b2ca0c98 100644
--- a/x11-libs/gdk-pixbuf/gdk-pixbuf-2.26.3.ebuild
+++ b/x11-libs/gdk-pixbuf/gdk-pixbuf-2.26.5.ebuild
@@ -1,21 +1,21 @@
 # Copyright 1999-2012 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.26.3.ebuild,v 1.2 2012/09/18 09:44:29 tetromino Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/gdk-pixbuf/gdk-pixbuf-2.26.5.ebuild,v 1.1 2012/11/10 05:54:13 tetromino Exp $
 
 EAPI="4"
 
-inherit gnome.org multilib libtool
+inherit eutils gnome.org multilib libtool
 
 DESCRIPTION="Image loading library for GTK+"
 HOMEPAGE="http://www.gtk.org/"
 
-LICENSE="LGPL-2"
+LICENSE="LGPL-2+"
 SLOT="2"
 KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86 ~amd64-fbsd ~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"
+IUSE="+X debug +introspection jpeg jpeg2k tiff test"
 
 COMMON_DEPEND="
-	>=dev-libs/glib-2.31.0:2
+	>=dev-libs/glib-2.34.0:2
 	>=media-libs/libpng-1.4:0
 	introspection? ( >=dev-libs/gobject-introspection-0.9.3 )
 	jpeg? ( virtual/jpeg )
@@ -23,12 +23,9 @@ COMMON_DEPEND="
 	tiff? ( >=media-libs/tiff-3.9.2:0 )
 	X? ( x11-libs/libX11 )"
 DEPEND="${COMMON_DEPEND}
-	virtual/pkgconfig
-	>=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 )"
+	>=sys-devel/gettext-0.17
+	virtual/pkgconfig"
 # librsvg blocker is for the new pixbuf loader API, you lose icons otherwise
 RDEPEND="${COMMON_DEPEND}
 	!<gnome-base/gail-1000
@@ -49,7 +46,6 @@ src_prepare() {
 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)
@@ -68,7 +64,7 @@ src_install() {
 	dodoc AUTHORS NEWS* README*
 
 	# New library, remove .la files
-	find "${D}" -name '*.la' -exec rm -f '{}' + || die
+	prune_libtool_files --modules
 }
 
 pkg_postinst() {