Really prune all .la files (#518334), drop old

Package-Manager: portage-2.2.15/cvs/Linux x86_64
Manifest-Sign-Key: 0xA188FBD4

6 files changed, 15 insertions, 249 deletions

diff --git a/x11-libs/gdk-pixbuf/ChangeLog b/x11-libs/gdk-pixbuf/ChangeLog
index 71d0665d3e22..8d3245f5ebd2 100644
--- a/x11-libs/gdk-pixbuf/ChangeLog
+++ b/x11-libs/gdk-pixbuf/ChangeLog
@@ -1,6 +1,11 @@
 # 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.137 2014/10/11 12:31:39 maekke Exp $
+# Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/gdk-pixbuf/ChangeLog,v 1.138 2015/01/24 10:42:08 pacho Exp $
+
+  24 Jan 2015; Pacho Ramos <pacho@gentoo.org>
+  -files/gdk-pixbuf-2.28.0-string_h.patch, -gdk-pixbuf-2.30.7-r1.ebuild,
+  -gdk-pixbuf-2.30.7.ebuild, gdk-pixbuf-2.30.8.ebuild:
+  Really prune all .la files (#518334), drop old
 
   11 Oct 2014; Markus Meier <maekke@gentoo.org> gdk-pixbuf-2.30.8.ebuild:
   arm stable, bug #512012
diff --git a/x11-libs/gdk-pixbuf/Manifest b/x11-libs/gdk-pixbuf/Manifest
index 693d498de165..1f5e62312023 100644
--- a/x11-libs/gdk-pixbuf/Manifest
+++ b/x11-libs/gdk-pixbuf/Manifest
@@ -1,18 +1,14 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA256
 
-AUX gdk-pixbuf-2.28.0-string_h.patch 748 SHA256 3077d260fe15c0b9888ca31e47461d35ca6d7d33350f7b5721dc06d88a7dc2a6 SHA512 54e7248076cdb1d446b5bb5ee09474461c775a0e51372602f10b0096f5c4779f01c739c75461d2c134565dacc03a38f298486ce814df8318410c8ab77ca5a8a7 WHIRLPOOL be4193a8e83733c031629d3a67e690b740180c9ac20eaac424119a3381a558c2b233524c599536276fe97b541f2d9d824dafa1642099b246a87df5deea497083
-DIST gdk-pixbuf-2.30.7.tar.xz 1329096 SHA256 0aafc365eab1083a53f15e4828333b968219ffcb1a995ac6289c0147c9ffad06 SHA512 648f95ef9bc3bcb0d17a1a0e683cbb9c2842c72f612ee061708c52d963cc694a30689352f2dc371eac695d5a8098033b7486a8b339e0727e6cd845c8144e5520 WHIRLPOOL d25784720d021223aedb0e4087c3422f57f8ae96b59f231be26548b4f0256bed84f4dfaff73b3a963188fea22fd32e4db99286e49e0ec7dcfb421fe0fd157efe
 DIST gdk-pixbuf-2.30.8.tar.xz 1336788 SHA256 4853830616113db4435837992c0aebd94cbb993c44dc55063cee7f72a7bef8be SHA512 2888cf035b70330e8d3ac87af54b69b2c990440fd59922464088d2a685e90022ad39c83d1ce1ccccfac3872b55ce9445ec4a3e9c7ab6371e20b19e20df7f261d WHIRLPOOL e7f69807ed629c5703750a91cc7a95ee2b3aa178a74c9197c20f863648436a023d140cf1274ba38369e8da3d77216bb1fcc66bae5b612ee8ee33ee4b42e11d65
-EBUILD gdk-pixbuf-2.30.7-r1.ebuild 3705 SHA256 79dd8c657d411322a8c3131b7d7b60605edb7db3990f5a22ab1c671ea7f68537 SHA512 35519b9f6ccd0d2bbe1d58144bbafe7eecdfde696e7eb2ba0976dce55ee277790599231c47aaaa6a616e55f1781d335166efd6a7f68d631ed28fa313f99ac69c WHIRLPOOL 1aa3788b23a9968ea37a44c3c096e41bce0c750790360c721e891b6f60918f3c7d52e41ed9b59bccadd189ffc6950dfe77a90f3d769c4b19a169213d2af1161a
-EBUILD gdk-pixbuf-2.30.7.ebuild 3113 SHA256 19f9df95a8b0d6ce84938e1077e103786a0f2fdd449207a32623538575b78e6f SHA512 cd2fc1b0eb2846122c4dbc5775c06953d14ef12f16968815aaa8fb00e6e1649bf21427503374844a1fb25179d808f55c0615e02790ff30589a680124aeb6281b WHIRLPOOL 770ecfac3f45616bab2c471d5dbbc4ca47e1137ce4cae7fda4f41bb820fb6523e2e36b92c07c0e11f1141176613187623f134c5343952edd05af1836392e365c
-EBUILD gdk-pixbuf-2.30.8.ebuild 3632 SHA256 864c29b509f1f996fe2f3bd0c60402159f3f6923616a0c69bf7826903c724a11 SHA512 7002dfd7eaef30d15471295b448b1b3cba98868e61816148ddae8980eeab52ff5d6ca8393736b11e117a567fc57b779521e294616b1c0526310d79a28ba6c83c WHIRLPOOL 403a238afe236bd6773f6a071856647718871c01e414e03e656bde09c7a0260324aee9f609a6dd6f32da2e6d1176327ebf9bcc222b9b39411bf8351f269b8d79
-MISC ChangeLog 19591 SHA256 69c1125dfbd6851c0cb9a5e39aebbab14aa49ab09f555677a228f48d829a1bb9 SHA512 15060e6fbe236d81038f50d324cae9791a7e93ac91084b4d48ee9f203eaa86c131b53851cc63949f800adb610b472e52c6688040fd5d099e32d67fda21a3f2d7 WHIRLPOOL aacd12520f8986e142e1e31fae2d7bdbd55a3d861eeb77302c42a55d049e02c5d7205ec47f9246085a1df026b2d28620b7c8ace72a34a2d301c03ec4430dc050
+EBUILD gdk-pixbuf-2.30.8.ebuild 3652 SHA256 6b22ac5bb1de89f7f280004814ed0e2141ddea9298ce437f67f2ac730ceac8f7 SHA512 3f629c75fb4b77117e11ec89ebc5fa12bdb086c722b6dd015645bcef1072ac8f0360116218cf75590c708ea9269ebc5b0d9ce468c8fcf66265ce99a2d30d63d3 WHIRLPOOL 2c83a31da307bf2a5d5aa41463c59fa189bd06b9061b58a6073140ee03576128ad38656d80504492954555a51e4ca63728cb3299b0c486837bd078da3ebff671
+MISC ChangeLog 19814 SHA256 3e03c7f8f712d7aa88ff5f8c6cf1987437a995dfc51cf42635a5522ce6efacf7 SHA512 250b30302fad25e5ecade7f6f07a0a080b11c7a8b932d0707af4320b07c03380b8a2f306da014c47e430783d226f389a07d479d792ef9134fcc912087ce5a9de WHIRLPOOL 81f3638edc83b71e4a18605c75dc0506f6804ffd63cc61ae3c75571e7bcc61b2f60d0cc953180ea1ca1d5dce1e1c3d67c88969d3887e18450223501d05c90f21
 MISC metadata.xml 160 SHA256 4d793ecb79b17794248102d8409d16bc27b1022c72038bd2d1241e129693d5f2 SHA512 677650c05f31fc27035e12f3f5e4b095715dfe12d2d3483f800bfbc6e986a98dbb1997cd52ad7a177b5c120c9b87fe5a2452a4f0f9852ac9a58262e0c5d576c9 WHIRLPOOL 070602fb27fee6a25035c9e93f5c2422270a5781fd11dac318d3f5c32cf9e49163abf7999729df230d3e181b6a1362982744e1f0ac016bf59a3458ae23abbb83
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2
 
-iEYEAREIAAYFAlQ5IzAACgkQkKaRLQcq0GJaIwCeLodB4FB5yjVhXA9NRmntSSiT
-7uwAnRIHqnXl/0qeCUmG2jVrlmpdm2iv
-=CDVz
+iEYEAREIAAYFAlTDdwEACgkQCaWpQKGI+9SzwQCfXjsJd4Bm9tnATEGfhjuyyOAm
+rHQAn2zeoZ+zKfutRt5DPn4OhtqQuqSS
+=C9z0
 -----END PGP SIGNATURE-----
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 ecb60c512c4d..000000000000
--- 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.30.7-r1.ebuild b/x11-libs/gdk-pixbuf/gdk-pixbuf-2.30.7-r1.ebuild
deleted file mode 100644
index 20f655abea7f..000000000000
--- a/x11-libs/gdk-pixbuf/gdk-pixbuf-2.30.7-r1.ebuild
+++ /dev/null
@@ -1,118 +0,0 @@
-# Copyright 1999-2014 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.30.7-r1.ebuild,v 1.12 2014/06/20 14:45:30 ago Exp $
-
-EAPI="5"
-
-inherit eutils flag-o-matic gnome.org gnome2-utils multilib libtool multilib-minimal
-
-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 ~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.17
-	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
-	abi_x86_32? (
-		!<=app-emulation/emul-linux-x86-gtklibs-20131008-r2
-		!app-emulation/emul-linux-x86-gtklibs[-abi_x86_32(-)]
-	)
-"
-
-MULTILIB_CHOST_TOOLS=(
-	/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
-	default
-	elibtoolize # for Darwin modules, bug #???
-	[[ ${CHOST} == *-solaris* ]] && append-libs intl
-}
-
-multilib_src_configure() {
-	# png always on to display icons
-	ECONF_SOURCE="${S}" \
-	econf \
-		$(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
-}
-
-multilib_src_install() {
-	# Parallel install fails when no gdk-pixbuf is already installed, bug #481372
-	emake -j1 DESTDIR="${D}" install
-}
-
-multilib_src_install_all() {
-	einstalldocs
-	prune_libtool_files --modules
-}
-
-pkg_preinst() {
-	gnome2_gdk_pixbuf_savelist
-
-	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_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
-		rm -f "${EROOT}"usr/lib*/${PN}-2.0/2.10.0/loaders.cache
-	fi
-}
diff --git a/x11-libs/gdk-pixbuf/gdk-pixbuf-2.30.7.ebuild b/x11-libs/gdk-pixbuf/gdk-pixbuf-2.30.7.ebuild
deleted file mode 100644
index 032d4850bf39..000000000000
--- a/x11-libs/gdk-pixbuf/gdk-pixbuf-2.30.7.ebuild
+++ /dev/null
@@ -1,100 +0,0 @@
-# Copyright 1999-2014 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.30.7.ebuild,v 1.10 2014/04/21 10:30:24 ago Exp $
-
-EAPI="5"
-
-inherit gnome.org gnome2-utils multilib libtool
-
-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 ~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
-	>=media-libs/libpng-1.4:0=
-	introspection? ( >=dev-libs/gobject-introspection-0.9.3 )
-	jpeg? ( virtual/jpeg:0= )
-	jpeg2k? ( media-libs/jasper:= )
-	tiff? ( >=media-libs/tiff-3.9.2:0= )
-	X? ( x11-libs/libX11 )
-"
-DEPEND="${COMMON_DEPEND}
-	>=dev-util/gtk-doc-am-1.20
-	>=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
-	!<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
-	# 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
-	default
-	elibtoolize # for Darwin modules, bug #???
-}
-
-src_configure() {
-	# png always on to display icons
-	econf \
-		$(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
-	MAKEOPTS="${MAKEOPTS} -j1" default
-	prune_libtool_files --modules
-}
-
-pkg_preinst() {
-	gnome2_gdk_pixbuf_savelist
-
-	# 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
-}
-
-pkg_postinst() {
-	# causes segfault if set, see bug 375615
-	unset __GL_NO_DSO_FINALIZER
-
-	gnome2_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
-		rm -f "${EROOT}"usr/$(get_libdir)/${PN}-2.0/2.10.0/loaders.cache
-	fi
-}
diff --git a/x11-libs/gdk-pixbuf/gdk-pixbuf-2.30.8.ebuild b/x11-libs/gdk-pixbuf/gdk-pixbuf-2.30.8.ebuild
index 55a753cf9471..4254fd4a72f5 100644
--- a/x11-libs/gdk-pixbuf/gdk-pixbuf-2.30.8.ebuild
+++ b/x11-libs/gdk-pixbuf/gdk-pixbuf-2.30.8.ebuild
@@ -1,9 +1,10 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2015 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.30.8.ebuild,v 1.10 2014/10/11 12:31:39 maekke Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/gdk-pixbuf/gdk-pixbuf-2.30.8.ebuild,v 1.11 2015/01/24 10:42:08 pacho Exp $
 
 EAPI="5"
 GCONF_DEBUG="no"
+GNOME2_LA_PUNT="yes"
 
 inherit eutils flag-o-matic gnome2 multilib libtool multilib-minimal