Version bump, drop old

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

3 files changed, 43 insertions, 37 deletions

diff --git a/media-gfx/gthumb/ChangeLog b/media-gfx/gthumb/ChangeLog
index d94517543fc6..211c25a58618 100644
--- a/media-gfx/gthumb/ChangeLog
+++ b/media-gfx/gthumb/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for media-gfx/gthumb
 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-gfx/gthumb/ChangeLog,v 1.161 2013/04/18 19:59:28 pacho Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/gthumb/ChangeLog,v 1.162 2013/05/13 19:52:48 pacho Exp $
+
+*gthumb-3.2.2 (13 May 2013)
+
+  13 May 2013; Pacho Ramos <pacho@gentoo.org> +gthumb-3.2.2.ebuild,
+  -gthumb-3.2.0.ebuild:
+  Version bump, drop old
 
 *gthumb-3.2.1 (18 Apr 2013)
 
diff --git a/media-gfx/gthumb/Manifest b/media-gfx/gthumb/Manifest
index 24dbeac6ded1..8ec8a712683e 100644
--- a/media-gfx/gthumb/Manifest
+++ b/media-gfx/gthumb/Manifest
@@ -4,18 +4,18 @@ 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
 DIST gthumb-3.2.1.tar.xz 3223876 SHA256 3eacbb9912923fb5da3e7a52be58c6e7470e598b06c1b7b51b76809fc4855b61 SHA512 f55365ff80e5d4d3c8b53c1bbba3020a0fadbf07cc1e23ad240f4ce17190e19c3e2cf2c2328a6e1d042efe78f334cbd444e1a2ef094226e92ce2303df3323241 WHIRLPOOL ad3d5a8974713f857fe32fa9af527e0075bce43597ee75167ba1b82f0864c134aa529ae9afdf726d392e795423bdaedd30c51ed370fa9afb24147ff454b38465
+DIST gthumb-3.2.2.tar.xz 3221804 SHA256 e201b9065d401144a17c2a33e4a85f0dcf457dc5cba6932dbac0197e141cdee8 SHA512 ed4002c48c0ebd2187f980e40375e94bb7136fd4791b87f067a2a306e3b0980c756176d1dfc4aba891e95b287168723b35eeaf5063ace19d87516640722ee1fb WHIRLPOOL 559d0edb8caabbe0739cea206bc085a235e5dff7e486f7839588e670c39d9f2055f66a1f48c6daecdae246af401ea488bc18bc0921a5a7689848f235e25d69e8
 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
-EBUILD gthumb-3.2.0.ebuild 2542 SHA256 640bb519a05c4904ab1fd8a9410c80932ffaf2c5204dbc36babd2ecdb3e94a81 SHA512 edfecad45aec5fb8958651f0f79d8595ba5321a5f2cc8716d1da3657a0a391c7543fefb8169a1750b858e67f3521163468be78bb06a1b56738232dcba279ddf9 WHIRLPOOL e30834edb4f5229ceaaefb44c40df06b728930df2807b37471b85ae6eb6eb7412745cc333031578b126e8b8a96f56d79d8fde2ab3e9367bb8ff6512fdede3872
 EBUILD gthumb-3.2.1.ebuild 2446 SHA256 fd2aa01ddc7164912fe86f8b27369ec68c7765ad190a04342ad6e9a70ada7e2c SHA512 bbfe02a767c84b0dc0ba903be2bd8909f74969ab57f7f773740f8b46d6474ca3a29d24579d981700f405e077dd3f805831c1a8e82934251f7074c94c43029545 WHIRLPOOL fd8cb7f16c0d8bcbe44c79f1b9097bfcc223373f710d6f265fea70cc122d2532cf19e49f73121fd8df57219fd019439a1651d78dc47db72d551b393d76a239f8
-MISC ChangeLog 24678 SHA256 e6e536ec49be46791c5b7b5dcec5099e63066523ea8d44c7ffb8781b1b28a378 SHA512 38237fee265a3e0b1c678ab9ce69abbd9339a5c7c1bcbe33bb55c3018c4bbbe50ebcc9662fe8738c299bb5530374a90e7b32f4f9b368dd013a98025d9776d7b4 WHIRLPOOL fc51b49454150b525d4e4f998a152d65f4ce5f9d147fafc1d0f903a4d74c9dea064b5f13646068aeec791f692f7b683ec4e08203e99725593dbb1779ace79639
+EBUILD gthumb-3.2.2.ebuild 2446 SHA256 1954780311758a6d3b7f365b5354c852ee4351a73f2573d05c70c15a4b197220 SHA512 70aa018c402103134ddf485ecc335d97685afc426173bc43b164fce0c0d3b546817c4728de3ed8a1970215a46522d2d2007717f25001f45516ca53909f505ae1 WHIRLPOOL ae430f7455789c1c5f6e275ec02fe91a6ffbbe53d15096e31dbb2e017fcc5acca8a6be1f45068de2c347bf62e1cb44c9ea2a55691df6fab070b927f7570329b7
+MISC ChangeLog 24825 SHA256 1e120debe995ceaa0fc331b209fd8e0d17fe38d48070bc1d7e1d7d8aa61215c5 SHA512 5e98a2e409c5fda4edba952cccb0213913858fe3cbdcfe846283ef5471e0439979628a6ef09857cde70492e1ca2bec35bbe0330b72e557d9a6d635d4f19ff7e5 WHIRLPOOL 961c86acdd6ab471c8c0cbd83a7e0d9f15bf367660979f1cbb4fdadcdb8dfdbc36b95340df33d86900af0de3674af1d091502c498e3547bc045ec28195be8b57
 MISC metadata.xml 546 SHA256 da820e4bde7a6851acbc78e0d61a9fedd03d184ae4e0905c4d714d768fe372e9 SHA512 d58c9dfd995f1c17a886bbf133772b6ff61ebc7765da1ef2f98e5542677e398a16533206a38963de2d257da6ecc7a2a3969b82ab7185ce53d65e5a5cf0adfec9 WHIRLPOOL ab67a29b9d6aefec57f14f2fb8a3d1276fde8304346a4b3bdbbe557b9b9e5e988f141755f539e4639a6c55e9cfa4821c4efaf5e5e422529bcd1b5183726a4cd5
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.19 (GNU/Linux)
 
-iEYEAREIAAYFAlFwUKEACgkQCaWpQKGI+9SUIQCfWwDOW65AJjvJ33GLhY/r822x
-22IAnRtXsl87Lqj3cVUl2Zu7awON8y+h
-=KMrY
+iEYEAREIAAYFAlGRRJEACgkQCaWpQKGI+9QxiQCeNu8r5xbaPEnYKLgYQpshRwZ8
+I+4AnjMZtbUYn1yHQw6dFyogDWfJPs3u
+=dMT5
 -----END PGP SIGNATURE-----
diff --git a/media-gfx/gthumb/gthumb-3.2.0.ebuild b/media-gfx/gthumb/gthumb-3.2.2.ebuild
index dd8b426100e5..4f44bb496b7d 100644
--- a/media-gfx/gthumb/gthumb-3.2.0.ebuild
+++ b/media-gfx/gthumb/gthumb-3.2.2.ebuild
@@ -1,12 +1,12 @@
 # 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.2 2013/03/31 18:54:29 pacho Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/gthumb/gthumb-3.2.2.ebuild,v 1.1 2013/05/13 19:52:48 pacho Exp $
 
 EAPI="5"
 GCONF_DEBUG="yes"
 GNOME2_LA_PUNT="yes"
 
-inherit autotools eutils gnome2
+inherit gnome2
 
 DESCRIPTION="Image viewer and browser for Gnome"
 HOMEPAGE="https://live.gnome.org/gthumb"
@@ -42,9 +42,11 @@ COMMON_DEPEND="
 	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 )"
+	webp? ( >=media-libs/libwebp-0.2.0 )
+"
 RDEPEND="${COMMON_DEPEND}
-	>=gnome-base/gsettings-desktop-schemas-0.1.4"
+	>=gnome-base/gsettings-desktop-schemas-0.1.4
+"
 DEPEND="${COMMON_DEPEND}
 	app-text/yelp-tools
 	app-text/scrollkeeper
@@ -57,34 +59,32 @@ DEPEND="${COMMON_DEPEND}
 #	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
+	# 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
 }
+
+src_configure() {
+	# Upstream says in configure help that libchamplain support
+	# crashes frequently
+	gnome2_src_configure \
+		--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)
+}