media-gfx/gimp: Fix bzip2 use flag support, remove .la files (bug #414525)

(Portage version: 2.1.10.56/cvs/Linux x86_64)

4 files changed, 39 insertions, 3 deletions

diff --git a/media-gfx/gimp/ChangeLog b/media-gfx/gimp/ChangeLog
index aaf1c5704e58..89341b662114 100644
--- a/media-gfx/gimp/ChangeLog
+++ b/media-gfx/gimp/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for media-gfx/gimp
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-gfx/gimp/ChangeLog,v 1.362 2012/05/03 20:22:40 sping Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/gimp/ChangeLog,v 1.363 2012/05/04 21:42:32 sping Exp $
+
+  04 May 2012; Sebastian Pipping <sping@gentoo.org> gimp-2.8.0.ebuild,
+  +files/gimp-2.8.0-bzip2.patch, gimp-9999.ebuild:
+  Fix bzip2 use flag support, remove .la files (bug #414525)
 
 *gimp-2.8.0 (03 May 2012)
 
diff --git a/media-gfx/gimp/files/gimp-2.8.0-bzip2.patch b/media-gfx/gimp/files/gimp-2.8.0-bzip2.patch
new file mode 100644
index 000000000000..b5c4e4023981
--- /dev/null
+++ b/media-gfx/gimp/files/gimp-2.8.0-bzip2.patch
@@ -0,0 +1,25 @@
+From fa9afae051cf2f8512765df8b3d385b360df03e9 Mon Sep 17 00:00:00 2001
+From: Sebastian Pipping <sebastian@pipping.org>
+Date: Fri, 4 May 2012 23:10:30 +0200
+Subject: [PATCH] Fix configure option --with[out]-bzip2
+
+---
+ configure.ac |    2 +-
+ 1 files changed, 1 insertions(+), 1 deletions(-)
+
+diff --git a/configure.ac b/configure.ac
+index 6013f0b..8e50170 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -1154,7 +1154,7 @@ AC_SUBST(Z_LIBS)
+ # Check for libbzip2
+ ####################
+ 
+-AC_ARG_WITH(gs,  [  --without-bzip2         build without bzip2 support])
++AC_ARG_WITH(bzip2,  [  --without-bzip2         build without bzip2 support])
+ 
+ have_libbzip2=no
+ if test "x$with_bzip2" != xno; then
+-- 
+1.7.8.5
+
diff --git a/media-gfx/gimp/gimp-2.8.0.ebuild b/media-gfx/gimp/gimp-2.8.0.ebuild
index 46b58d648f2b..ac72b3d84a2a 100644
--- a/media-gfx/gimp/gimp-2.8.0.ebuild
+++ b/media-gfx/gimp/gimp-2.8.0.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/media-gfx/gimp/gimp-2.8.0.ebuild,v 1.1 2012/05/03 20:22:40 sping Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/gimp/gimp-2.8.0.ebuild,v 1.2 2012/05/04 21:42:32 sping Exp $
 
 EAPI="3"
 PYTHON_DEPEND="python? 2:2.5"
@@ -55,6 +55,7 @@ RDEPEND=">=dev-libs/glib-2.30.2:2
 	gs? ( app-text/ghostscript-gpl )
 	udev? ( sys-fs/udev[gudev] )"
 DEPEND="${RDEPEND}
+	sys-apps/findutils
 	>=dev-util/pkgconfig-0.22
 	>=dev-util/intltool-0.40.1
 	>=sys-devel/gettext-0.17
@@ -106,6 +107,7 @@ pkg_setup() {
 
 src_prepare() {
 	epatch "${FILESDIR}"/${PN}-2.7.4-no-deprecation.patch  # bug 395695, comment 9 and 16
+	epatch "${FILESDIR}"/${PN}-2.8.0-bzip2.patch  # bug 414525
 	eautoreconf  # If you remove this: remove dev-util/gtk-doc-am from DEPEND, too
 
 	echo '#!/bin/sh' > py-compile
@@ -123,6 +125,8 @@ src_install() {
 	# Workaround for bug #321111 to give GIMP the least
 	# precedence on PDF documents by default
 	mv "${D}"/usr/share/applications/{,zzz-}gimp.desktop || die
+
+	find "${D}" -name '*.la' -delete || die
 }
 
 pkg_postinst() {
diff --git a/media-gfx/gimp/gimp-9999.ebuild b/media-gfx/gimp/gimp-9999.ebuild
index 6d72f3cc1f28..bd1fece92e16 100644
--- a/media-gfx/gimp/gimp-9999.ebuild
+++ b/media-gfx/gimp/gimp-9999.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/media-gfx/gimp/gimp-9999.ebuild,v 1.42 2012/04/12 00:33:57 sping Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/gimp/gimp-9999.ebuild,v 1.43 2012/05/04 21:42:32 sping Exp $
 
 EAPI="3"
 PYTHON_DEPEND="python? 2:2.5"
@@ -58,6 +58,7 @@ RDEPEND=">=dev-libs/glib-2.30.2:2
 	gs? ( app-text/ghostscript-gpl )
 	udev? ( sys-fs/udev[gudev] )"
 DEPEND="${RDEPEND}
+	sys-apps/findutils
 	>=dev-util/pkgconfig-0.22
 	>=dev-util/intltool-0.40.1
 	>=sys-devel/gettext-0.17
@@ -133,6 +134,8 @@ src_install() {
 	# Workaround for bug #321111 to give GIMP the least
 	# precedence on PDF documents by default
 	mv "${D}"/usr/share/applications/{,zzz-}gimp.desktop || die
+
+	find "${D}" -name '*.la' -delete || die
 }
 
 pkg_postinst() {