Bump to 2.13.1, fix building with gtk+-2.24 and brasero-3

(Portage version: 2.1.9.44/cvs/Linux x86_64)

3 files changed, 116 insertions, 1 deletions

diff --git a/media-gfx/gthumb/ChangeLog b/media-gfx/gthumb/ChangeLog
index 486dc0771db7..9aff92814c47 100644
--- a/media-gfx/gthumb/ChangeLog
+++ b/media-gfx/gthumb/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for media-gfx/gthumb
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-gfx/gthumb/ChangeLog,v 1.128 2011/03/22 19:36:16 ranger Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/gthumb/ChangeLog,v 1.129 2011/03/27 05:27:41 nirbheek Exp $
+
+*gthumb-2.13.1 (27 Mar 2011)
+
+  27 Mar 2011; Nirbheek Chauhan <nirbheek@gentoo.org>
+  +files/gthumb-no-brasero3.patch, +gthumb-2.13.1.ebuild:
+  Bump to 2.13.1, fix building with gtk+-2.24 and brasero-3
 
   22 Mar 2011; Brent Baude <ranger@gentoo.org> gthumb-2.12.2.ebuild:
   Marking gthumb-2.12.2 ppc stable for bug 353436
diff --git a/media-gfx/gthumb/files/gthumb-no-brasero3.patch b/media-gfx/gthumb/files/gthumb-no-brasero3.patch
new file mode 100644
index 000000000000..d11502cb015d
--- /dev/null
+++ b/media-gfx/gthumb/files/gthumb-no-brasero3.patch
@@ -0,0 +1,23 @@
+diff --git a/configure.ac b/configure.ac
+index ed6037f..61ffbf4 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -423,14 +423,10 @@ AC_ARG_ENABLE([libbrasero],
+ 
+ if test x$enable_libbrasero = xyes ; then
+ 	PKG_CHECK_MODULES(LIBBRASERO,
+-			  [libbrasero-burn3 >= $LIBBRASERO_REQUIRED],
+-			  [AC_DEFINE(HAVE_LIBBRASERO, 1, [Have libbrasero])
+-			   enable_libbrasero=yes],
+-			  [PKG_CHECK_MODULES(LIBBRASERO,
+-				   	     [libbrasero-burn >= $LIBBRASERO_REQUIRED],
+-			  		     [AC_DEFINE(HAVE_LIBBRASERO, 1, [Have libbrasero])
+-			   		      enable_libbrasero=yes],
+-			  		     [enable_libbrasero=no])])
++			  [libbrasero-burn >= $LIBBRASERO_REQUIRED],
++			    [AC_DEFINE(HAVE_LIBBRASERO, 1, [Have libbrasero])
++			      enable_libbrasero=yes],
++			     [enable_libbrasero=no])
+ fi
+ AC_SUBST(LIBBRASERO_CFLAGS)
+ AC_SUBST(LIBBRASERO_LIBS)
diff --git a/media-gfx/gthumb/gthumb-2.13.1.ebuild b/media-gfx/gthumb/gthumb-2.13.1.ebuild
new file mode 100644
index 000000000000..e8895ceb3b6b
--- /dev/null
+++ b/media-gfx/gthumb/gthumb-2.13.1.ebuild
@@ -0,0 +1,86 @@
+# Copyright 1999-2011 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/gthumb/gthumb-2.13.1.ebuild,v 1.1 2011/03/27 05:27:41 nirbheek Exp $
+
+EAPI="3"
+GCONF_DEBUG="yes"
+
+inherit autotools eutils gnome2
+
+DESCRIPTION="Image viewer and browser for Gnome"
+HOMEPAGE="http://gthumb.sourceforge.net"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
+IUSE="cdr exif gnome-keyring gstreamer http raw slideshow tiff test"
+
+# We can't link against libbrasero-burn3
+RDEPEND=">=dev-libs/glib-2.16:2
+	>=x11-libs/gtk+-2.20:2
+	>=gnome-base/gconf-2.6
+	>=dev-libs/libunique-1.1.2:1
+
+	media-libs/libpng:0
+	virtual/jpeg:0
+	x11-libs/libSM
+
+	cdr? ( >=app-cdr/brasero-2.28
+		   <app-cdr/brasero-2.90 )
+	exif? ( >=media-gfx/exiv2-0.18 )
+	gnome-keyring? ( >=gnome-base/gnome-keyring-2.28 )
+	gstreamer? (
+		>=media-libs/gstreamer-0.10
+		>=media-libs/gst-plugins-base-0.10 )
+	http? (
+		>=net-libs/libsoup-2.26:2.4
+		>=net-libs/libsoup-gnome-2.26:2.4 )
+	slideshow? (
+		>=media-libs/clutter-1:1.0
+		>=media-libs/clutter-gtk-0.10:0.10 )
+	tiff? ( media-libs/tiff )
+	raw? ( >=media-libs/libopenraw-0.0.8 )
+	!raw? ( media-gfx/dcraw )"
+DEPEND="${RDEPEND}
+	dev-util/pkgconfig
+	app-text/scrollkeeper
+	>=dev-util/intltool-0.35
+	app-text/gnome-doc-utils
+	test? ( ~app-text/docbook-xml-dtd-4.1.2 )"
+# eautoreconf needs:
+#	gnome-base/gnome-common
+
+src_prepare() {
+	gnome2_src_prepare
+
+	G2CONF="${G2CONF}
+		--disable-static
+		--disable-maintainer-mode
+		$(use_enable cdr libbrasero)
+		$(use_enable exif exiv2)
+		$(use_enable gstreamer)
+		$(use_enable gnome-keyring)
+		$(use_enable http libsoup)
+		$(use_enable raw libopenraw)
+		$(use_enable slideshow clutter)
+		$(use_enable test test-suite)
+		$(use_enable tiff)"
+	DOCS="AUTHORS ChangeLog NEWS README"
+
+	# Avoid linking to libbrasero-burn3
+	epatch "${FILESDIR}/${PN}-no-brasero3.patch"
+
+	# Remove unwanted CFLAGS added with USE=debug
+	sed -e 's/CFLAGS="$CFLAGS -g -O0 -DDEBUG"//' -i configure.ac -i configure || die
+	# GSeal doesn't get disabled with --disable-gseal
+	sed -e 's/-DGSEAL_ENABLE//g' -i configure.ac -i configure || die
+
+	eautoreconf
+}
+
+src_install() {
+	gnome2_src_install
+
+	# gthumb does not need *.la files
+	find "${ED}" -name "*.la" -delete || die "*.la files removal failed"
+}