[gentoo-commits] proj/gnome:master commit in: x11-libs/gdk-pixbuf/

[Gilles Dartiguelongue]

commit:     2a7be77d73a548cb8cee0c7076c9b93fb50d7029
Author:     Gilles Dartiguelongue <eva <AT> gentoo <DOT> org>
AuthorDate: Sat Sep  2 14:55:11 2017 +0000
Commit:     Gilles Dartiguelongue <eva <AT> gentoo <DOT> org>
CommitDate: Sat Sep  2 14:55:11 2017 +0000
URL:        https://gitweb.gentoo.org/proj/gnome.git/commit/?id=2a7be77d

x11-libs/gdk-pixbuf: sync with gentoo repository

Package-Manager: Portage-2.3.8, Repoman-2.3.3
Manifest-Sign-Key: 0x5A56C8CD0C13248A

 x11-libs/gdk-pixbuf/gdk-pixbuf-2.34.0.ebuild | 121 ---------------------------
 x11-libs/gdk-pixbuf/gdk-pixbuf-9999.ebuild   |  16 ++--
 x11-libs/gdk-pixbuf/metadata.xml             |   3 +
 3 files changed, 10 insertions(+), 130 deletions(-)

diff --git a/x11-libs/gdk-pixbuf/gdk-pixbuf-2.34.0.ebuild b/x11-libs/gdk-pixbuf/gdk-pixbuf-2.34.0.ebuild
deleted file mode 100644
index d674ae1f..00000000
--- a/x11-libs/gdk-pixbuf/gdk-pixbuf-2.34.0.ebuild
+++ /dev/null
@@ -1,121 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI="5"
-GCONF_DEBUG="no"
-GNOME2_LA_PUNT="yes"
-
-inherit eutils flag-o-matic gnome2 multilib libtool 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 ~x86-freebsd ~x86-interix ~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.37.6: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
-)
-
-src_prepare() {
-	# See https://bugzilla.gnome.org/show_bug.cgi?id=756590
-	epatch "${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-9999.ebuild b/x11-libs/gdk-pixbuf/gdk-pixbuf-9999.ebuild
index faa412ea..09f42ea4 100644
--- a/x11-libs/gdk-pixbuf/gdk-pixbuf-9999.ebuild
+++ b/x11-libs/gdk-pixbuf/gdk-pixbuf-9999.ebuild
@@ -1,12 +1,10 @@
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Id$
 
-EAPI="5"
-GCONF_DEBUG="no"
+EAPI=6
 GNOME2_LA_PUNT="yes"
 
-inherit eutils flag-o-matic gnome2 multilib libtool multilib-minimal
+inherit flag-o-matic gnome2 multilib multilib-minimal
 if [[ ${PV} = 9999 ]]; then
 	inherit gnome2-live
 fi
@@ -19,12 +17,12 @@ SLOT="2"
 if [[ ${PV} = 9999 ]]; then
 	KEYWORDS=""
 else
-	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~x86-freebsd ~x86-interix ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+	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"
 fi
 IUSE="X debug +introspection jpeg jpeg2k tiff test"
 
 COMMON_DEPEND="
-	>=dev-libs/glib-2.37.6:2[${MULTILIB_USEDEP}]
+	>=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}] )
@@ -46,12 +44,12 @@ RDEPEND="${COMMON_DEPEND}
 "
 
 MULTILIB_CHOST_TOOLS=(
-	/usr/bin/gdk-pixbuf-query-loaders
+	/usr/bin/gdk-pixbuf-query-loaders$(get_exeext)
 )
 
 src_prepare() {
 	# See https://bugzilla.gnome.org/show_bug.cgi?id=756590
-	epatch "${FILESDIR}"/${PN}-2.32.3-fix-lowmem-uclibc.patch
+	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

diff --git a/x11-libs/gdk-pixbuf/metadata.xml b/x11-libs/gdk-pixbuf/metadata.xml
index 39980802..6c6d2ea4 100644
--- a/x11-libs/gdk-pixbuf/metadata.xml
+++ b/x11-libs/gdk-pixbuf/metadata.xml
@@ -5,4 +5,7 @@
 	<email>gnome@g.o</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>