Version bump, remove old.

(Portage version: 2.1.10.31/cvs/Linux x86_64)

2 files changed, 24 insertions, 22 deletions

diff --git a/media-gfx/gthumb/ChangeLog b/media-gfx/gthumb/ChangeLog
index 830694bd0121..6f84a7eb2e87 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.134 2011/10/16 10:17:03 pacho Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/gthumb/ChangeLog,v 1.135 2011/10/26 23:08:21 pacho Exp $
+
+*gthumb-2.14.0 (26 Oct 2011)
+
+  26 Oct 2011; Pacho Ramos <pacho@gentoo.org> -gthumb-2.13.1.ebuild,
+  +gthumb-2.14.0.ebuild:
+  Version bump, remove old.
 
 *gthumb-2.12.4 (16 Oct 2011)
 
diff --git a/media-gfx/gthumb/gthumb-2.13.1.ebuild b/media-gfx/gthumb/gthumb-2.14.0.ebuild
index e8895ceb3b6b..3770a490e04c 100644
--- a/media-gfx/gthumb/gthumb-2.13.1.ebuild
+++ b/media-gfx/gthumb/gthumb-2.14.0.ebuild
@@ -1,14 +1,15 @@
 # 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 $
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/gthumb/gthumb-2.14.0.ebuild,v 1.1 2011/10/26 23:08:21 pacho Exp $
 
-EAPI="3"
+EAPI="4"
 GCONF_DEBUG="yes"
+GNOME2_LA_PUNT="yes"
 
-inherit autotools eutils gnome2
+inherit gnome2
 
 DESCRIPTION="Image viewer and browser for Gnome"
-HOMEPAGE="http://gthumb.sourceforge.net"
+HOMEPAGE="https://live.gnome.org/gthumb"
 
 LICENSE="GPL-2"
 SLOT="0"
@@ -16,8 +17,8 @@ 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
+RDEPEND=">=dev-libs/glib-2.28.0:2
+	>=x11-libs/gtk+-2.24.0:2
 	>=gnome-base/gconf-2.6
 	>=dev-libs/libunique-1.1.2:1
 
@@ -50,12 +51,14 @@ DEPEND="${RDEPEND}
 # eautoreconf needs:
 #	gnome-base/gnome-common
 
-src_prepare() {
-	gnome2_src_prepare
-
+pkg_setup() {
+# Upstream says in configure help that libchamplain support crashes
+# frequently
 	G2CONF="${G2CONF}
 		--disable-static
-		--disable-maintainer-mode
+		--disable-libchamplain
+		--enable-unique
+		--disable-gnome-3
 		$(use_enable cdr libbrasero)
 		$(use_enable exif exiv2)
 		$(use_enable gstreamer)
@@ -66,21 +69,14 @@ src_prepare() {
 		$(use_enable test test-suite)
 		$(use_enable tiff)"
 	DOCS="AUTHORS ChangeLog NEWS README"
+}
 
-	# Avoid linking to libbrasero-burn3
-	epatch "${FILESDIR}/${PN}-no-brasero3.patch"
+src_prepare() {
+	gnome2_src_prepare
 
 	# 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"
 }