Version bump for Gnome 3.8

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

5 files changed, 156 insertions, 11 deletions

diff --git a/media-gfx/gthumb/ChangeLog b/media-gfx/gthumb/ChangeLog
index 3fa392d02796..210714ec28d0 100644
--- a/media-gfx/gthumb/ChangeLog
+++ b/media-gfx/gthumb/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for media-gfx/gthumb
-# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-gfx/gthumb/ChangeLog,v 1.158 2012/12/05 22:18:46 tetromino Exp $
+# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/gthumb/ChangeLog,v 1.159 2013/03/29 10:03:01 pacho Exp $
+
+*gthumb-3.2.0 (29 Mar 2013)
+
+  29 Mar 2013; Pacho Ramos <pacho@gentoo.org>
+  +files/gthumb-3.2.0-configure-option.patch, +gthumb-3.2.0.ebuild,
+  metadata.xml:
+  Version bump for Gnome 3.8
 
   05 Dec 2012; Alexandre Rostovtsev <tetromino@gentoo.org>
   -files/gthumb-no-brasero3.patch, gthumb-2.14.4.ebuild, -gthumb-3.0.0.ebuild,
diff --git a/media-gfx/gthumb/Manifest b/media-gfx/gthumb/Manifest
index 0fbdd0cb62c9..9fdd9fa4c5a1 100644
--- a/media-gfx/gthumb/Manifest
+++ b/media-gfx/gthumb/Manifest
@@ -1,20 +1,19 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA256
 
+AUX gthumb-3.2.0-configure-option.patch 1507 SHA256 75bdc47a6e31f641c9845e902eb795bff11075931081ce2650fe22d852a5813d SHA512 8bee09f78e41ede38d63de30b73a3265580002f88bca16b49a8076b92576ae5b3f7daef4e6d473a38bd9c92f098fb644aec7c022b541c84af087b1c0badcfe9b WHIRLPOOL 5f1985a3c46dd7224d14781e9008e9d1db7c16ecbd7d20565c978af585c4e73cbe6ac28313d8b29b343592c30d008ebd07bdbf58a66dc0e737f317f4da51d2fb
 DIST gthumb-2.14.4.tar.xz 5721384 SHA256 1561ca52f9b60fbcd0e8fc976de8b30f0447019c698bfe1051d421935b5a51b5 SHA512 0423b5beb2a317f7e585c1f8bb32d3873accd61e9ff5e7356b3dc968b39d2613d2d97eeb4fdb39220094f67dfccbfb5d30f2fa4d5d5720056de86181453076c9 WHIRLPOOL c2ba8ac2011423305af6ba488fb31688f6f9e32d3f0fc673ce7d0bc9d0d87d79ebd084c1d34a7c82e0930f96a7a4de302bbe2fbe1a3d861df617e0b4451bf3a0
 DIST gthumb-3.0.2.tar.xz 5803480 SHA256 eeccb23103b00e82941ba78023fa784228aab644bcffffc6ccef77dc47aad557 SHA512 00a9ebfcedb8905ed2c05132eed70644ddfe239da9055d377652fd8f9e4fd84e1ffb1f7e33d3fb46b166e31120c128f09f17edd6c02000f96cc9958623c21c43 WHIRLPOOL 48a1e80cf6c03f8e8aed9f0507983ae1ae22e96c003da7382fe7d065ca5108ce9f1daa279e3f6317a27e31f271335f71e97d9f4bb75ea2c7b3d10ff3230dd573
+DIST gthumb-3.2.0.tar.xz 3222004 SHA256 d48db6ab9d3ab052bdeb0e43f17afef90db1329111941d289e7be4b11ec0cbbf SHA512 7089110003d4355f09e82e2dec085d96c9ec6b3a555fcb31b3105d249a6c16e13f5564929fd267d1939d310c770873924586f036c9e45891acf22eafb0729eeb WHIRLPOOL 1eaa179015cc49c4c4da1eb00d5ce2e353e1f1e913ea17b997445590eeb6b9b7a2cf1effca09f78b6836093bb42aa23f286acc0849cd2609ff1f4040b49fe454
 EBUILD gthumb-2.14.4.ebuild 2206 SHA256 54a8a6d2539d18b4b04c0594426182c82064ebe902f1c8c74c4001125623f3b4 SHA512 9ea843f2ee2e12cd735b233dcb60b63e59a99aa30b778476220a062a3d9132406c3e5c7fdfd29bd47bcf6c36ab7e8f018bdb1215f764ddc2a9ab4ddb109166da WHIRLPOOL 3c63ed66fb5edd6f9616f87d8fca678dfacfc080152c23eeebe08d6c3b0d3a37c4b81b737d4cc749cbdc1aeb7683ed3aa316080d8561b7f31798023cbf613f7e
 EBUILD gthumb-3.0.2.ebuild 2227 SHA256 cfa38c5fc0c035e17cdf4e97d59ae2c210df8ee7755a33a638b957f1b193cf9f SHA512 11a7742d7cccfb99dc7a66376c83fa892e9ec224599ee2000d219c20300aeea118df22f0c3153b524479be0727879c71cd30d05b21519774473d12397388fb9a WHIRLPOOL ffd3806e9ad080eeadfd616cb14cea334e19914f9b1807b34ab884060dc3c3a53925323949d452fb009f1b1edda70178de0e8de534fba14e653e33e65858731c
-MISC ChangeLog 24245 SHA256 51ef0e84d1d080f841b8a9de7aebc02684737d23538978c135b059219e8d2f44 SHA512 309dca8d4ef8ec392bbfd95745269f81bf09787718e51c5b3108edabd755cf13d974e65caf0d174de28297207be5f09ac3d796bc07adb418b217b0b4d170b91a WHIRLPOOL 6d86044f9876e5f164cbbdcf7a8820ca7c4c35b75dcc9b9c7db8b648b0630f1e273eeb15a849d728d0ca76392aad697aaedc65558f15263e276a58828632ca5e
-MISC metadata.xml 323 SHA256 0c127222f7e10a8f967627b17946b817e79a78e11988469a041bb50aaeaa3048 SHA512 8e1072d252d792a3fc3e82f9816759776cb67deac21c479236a69a75db45504e91a54f8cf5c1b07a49dd6f04af4e77b4ea560b77596b8bf8cb15be6bf2a83bf3 WHIRLPOOL f15f0816ab7bc6e9e540440b19f4454d3f4b094744fd5ac4e25bbfe6f959cb377bcd0099ccbdea929be007ab67614d791587f762f5bff4fa0cd4d76dac359c37
+EBUILD gthumb-3.2.0.ebuild 2539 SHA256 6830faa9bd44e28b83b3162d04ee3882eeecddb1a367612e1e1d95251748ce7b SHA512 a58f1237efe2465d27b2dc6df2d3a191dc4de5352be6faf672bc01c8f8bb3addd49900ffd3d11912d20216d468431794183a6d2a5fbe45ef3db7c0956f68a4ab WHIRLPOOL fbdf51fdcf24d1001b579b5ae2bfd433c334ef098d953577ee0b35a8d2ba2ac658fcd814a4628d84f665906c503e1cf73556ed5b7f67058b76daee996f175ab6
+MISC ChangeLog 24430 SHA256 3dc2bf2e5781e28b744f04f1e2e177fba5e7b09e3080d6c4054a23a5aad1b446 SHA512 ec6e6ffd2fd9cedb2934248c55420e9854b898c1469ac01eb4fb4ef61502a046f6ec80d6e4661b9f015a41333769ede6747eebe04c898bf181b2685732094c13 WHIRLPOOL c4de64ab1a5dd843b80fbc298bbb16358a1cfe3929b52ff60da3e92d636edf1e3df556203b31c08147f49e9aec89559650790c5272a02007516dcb91c73896a5
+MISC metadata.xml 546 SHA256 da820e4bde7a6851acbc78e0d61a9fedd03d184ae4e0905c4d714d768fe372e9 SHA512 d58c9dfd995f1c17a886bbf133772b6ff61ebc7765da1ef2f98e5542677e398a16533206a38963de2d257da6ecc7a2a3969b82ab7185ce53d65e5a5cf0adfec9 WHIRLPOOL ab67a29b9d6aefec57f14f2fb8a3d1276fde8304346a4b3bdbbe557b9b9e5e988f141755f539e4639a6c55e9cfa4821c4efaf5e5e422529bcd1b5183726a4cd5
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.19 (GNU/Linux)
 
-iQEcBAEBCAAGBQJQv8hIAAoJEJ0WA1zPCt1hQJYH+wXvFlFVyPQNoCb3tJIbxVnC
-dbn4eNQGMx+djFr0Z3iRjJkvLXnelN6vKBJ3lONn7ulXYoJQCW1Fq2kotMTRBRds
-EYUAD26E4J590/UTFNC3VMIwZ8jaUmNPW03/EDuboimh+euICObVev1SqjIwjydA
-5LcXUaUtzUce65aEIl+0/hlV/FTwwPedQyT+T5t7/jwu3lTYnVLiojFH5u3Z+aB8
-hd5+P38gmNKQAC5+TgYGA3PXzLmWMjJN6biFd/Zexu3VKXxn6hR3ShKipi0GVmwG
-XA5NNhci7tCYRoi2Tor8qtb2zScvWqPh/mJFkmkD/+SJlPHftuwGOXRNlUoqXhw=
-=g3TK
+iEYEAREIAAYFAlFVZtYACgkQCaWpQKGI+9R4+wCcC9+oKo/8Lprfss2P+tAWaHd5
+TqkAnRNIr8fyPvZ5PaK0VWBgXcthTpUX
+=aAz6
 -----END PGP SIGNATURE-----
diff --git a/media-gfx/gthumb/files/gthumb-3.2.0-configure-option.patch b/media-gfx/gthumb/files/gthumb-3.2.0-configure-option.patch
new file mode 100644
index 000000000000..07dc1b681f7f
--- /dev/null
+++ b/media-gfx/gthumb/files/gthumb-3.2.0-configure-option.patch
@@ -0,0 +1,44 @@
+From 3a1128457bd229abf51d48a660abc4b4458b518b Mon Sep 17 00:00:00 2001
+From: Paolo Bacchilega <paobac@src.gnome.org>
+Date: Thu, 28 Mar 2013 17:55:21 +0000
+Subject: configure: fixed unrecognized option --disable-libjson-glib
+
+[bug #696783]
+---
+diff --git a/configure.ac b/configure.ac
+index b3e6845..d496b3b 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -518,16 +518,16 @@ AC_SUBST(LIBSOUP_LIBS)
+ 
+ dnl ===========================================================================
+ 
+-AC_ARG_ENABLE([json_glib],
++AC_ARG_ENABLE([libjson_glib],
+ 	      [AS_HELP_STRING([--disable-libjson-glib],[do not compile code that uses the libjson-glib library])],,
+-	      [enable_json_glib=yes])
++	      [enable_libjson_glib=yes])
+ 
+-if test x$enable_json_glib = xyes ; then
++if test x$enable_libjson_glib = xyes ; then
+ 	PKG_CHECK_MODULES(JSON_GLIB,
+ 			  [json-glib-1.0 >= $JSON_GLIB_REQUIRED],
+ 			  [AC_DEFINE(HAVE_JSON_GLIB, 1, [Have libjson-glib])
+-			   enable_json_glib=yes],
+-			  [enable_json_glib=no])
++			   enable_libjson_glib=yes],
++			  [enable_libjson_glib=no])
+ fi
+ AC_SUBST(JSON_GLIB_CFLAGS)
+ AC_SUBST(JSON_GLIB_LIBS)
+@@ -548,7 +548,7 @@ fi
+ AC_SUBST(WEBKIT2_CFLAGS)
+ AC_SUBST(WEBKIT2_LIBS)
+ 
+-if [ test "x$enable_libsoup" = xyes && test "x$enable_json_glib" = xyes && test "x$enable_webkit2" = xyes ] ; then
++if [ test "x$enable_libsoup" = xyes && test "x$enable_libjson_glib" = xyes && test "x$enable_webkit2" = xyes ] ; then
+   enable_web_services=yes
+ else
+   enable_web_services=no
+--
+cgit v0.9.1
diff --git a/media-gfx/gthumb/gthumb-3.2.0.ebuild b/media-gfx/gthumb/gthumb-3.2.0.ebuild
new file mode 100644
index 000000000000..257a80f6b66f
--- /dev/null
+++ b/media-gfx/gthumb/gthumb-3.2.0.ebuild
@@ -0,0 +1,92 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/gthumb/gthumb-3.2.0.ebuild,v 1.1 2013/03/29 10:03:01 pacho Exp $
+
+EAPI="5"
+GCONF_DEBUG="yes"
+GNOME2_LA_PUNT="yes"
+
+inherit autotools eutils gnome2
+
+DESCRIPTION="Image viewer and browser for Gnome"
+HOMEPAGE="https://live.gnome.org/gthumb"
+
+LICENSE="GPL-2+"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux ~x86-solaris"
+IUSE="cdr exif gstreamer http jpeg json libsecret raw slideshow svg tiff test webkit webp"
+
+COMMON_DEPEND="
+	>=dev-libs/glib-2.34.0:2
+	>=x11-libs/gtk+-3.4.0:3
+
+	media-libs/libpng:0=
+	sys-libs/zlib
+	x11-libs/libICE
+	x11-libs/libSM
+
+	cdr? ( >=app-cdr/brasero-3.2 )
+	exif? ( >=media-gfx/exiv2-0.21:= )
+	gstreamer? (
+		media-libs/gstreamer:1.0
+		media-libs/gst-plugins-base:1.0 )
+	http? (
+		>=net-libs/libsoup-2.36:2.4
+		>=net-libs/libsoup-gnome-2.36:2.4 )
+	jpeg? ( virtual/jpeg:0= )
+	json? ( >=dev-libs/json-glib-0.15.0 )
+	libsecret? ( >=app-crypt/libsecret-0.11 )
+	slideshow? (
+		>=media-libs/clutter-1:1.0
+		>=media-libs/clutter-gtk-1:1.0 )
+	svg? ( >=gnome-base/librsvg-2.34 )
+	tiff? ( media-libs/tiff:= )
+	raw? ( >=media-libs/libopenraw-0.0.8:= )
+	!raw? ( media-gfx/dcraw )
+	webkit? ( >=net-libs/webkit-gtk-1.10.0:3 )
+	webp? ( >=media-libs/libwebp-0.2.0 )"
+RDEPEND="${COMMON_DEPEND}
+	>=gnome-base/gsettings-desktop-schemas-0.1.4"
+DEPEND="${COMMON_DEPEND}
+	app-text/yelp-tools
+	app-text/scrollkeeper
+	>=dev-util/intltool-0.35
+	sys-devel/bison
+	sys-devel/flex
+	virtual/pkgconfig
+	test? ( ~app-text/docbook-xml-dtd-4.1.2 )"
+# eautoreconf needs:
+#	gnome-base/gnome-common
+
+src_prepare() {
+	# Upstream says in configure help that libchamplain support
+	# crashes frequently
+	G2CONF="${G2CONF}
+		--disable-static
+		--disable-libchamplain
+		--with-smclient=xsmp
+		$(use_enable cdr libbrasero)
+		$(use_enable exif exiv2)
+		$(use_enable gstreamer)
+		$(use_enable http libsoup)
+		$(use_enable jpeg)
+		$(use_enable json libjson-glib)
+		$(use_enable libsecret)
+		$(use_enable raw libopenraw)
+		$(use_enable slideshow clutter)
+		$(use_enable svg librsvg)
+		$(use_enable test test-suite)
+		$(use_enable tiff)
+		$(use_enable webkit webkit2)
+		$(use_enable webp libwebp)"
+
+	# Remove unwanted CFLAGS added with USE=debug
+	sed -e 's/CFLAGS="$CFLAGS -g -O0 -DDEBUG"//' \
+		-i configure.ac -i configure || die
+
+	# Fixed unrecognized option --disable-libjson-glib, upstream bug #696783
+	epatch "${FILESDIR}/${P}-configure-option.patch"
+
+	eautoreconf
+	gnome2_src_prepare
+}
diff --git a/media-gfx/gthumb/metadata.xml b/media-gfx/gthumb/metadata.xml
index 32759ce0125f..415357c02fb3 100644
--- a/media-gfx/gthumb/metadata.xml
+++ b/media-gfx/gthumb/metadata.xml
@@ -4,6 +4,9 @@
 	<herd>gnome</herd>
 	<use>
 		<flag name="http">Enable webservice integration through <pkg>net-libs/libsoup</pkg></flag>
+		<flag name="json">Compile code that uses the libjson-glib library</flag>
+		<flag name="libsecret">Enable libsecret support to store login credentials</flag>
 		<flag name="slideshow">Enable slideshow plugin</flag>
+		<flag name="webp">Enable support for webp image format</flag>
 	</use>
 </pkgmetadata>