Version bump with bugfixes and translation updates. Remove old.

Package-Manager: portage-2.1.9.46/cvs/Linux x86_64

5 files changed, 98 insertions, 78 deletions

diff --git a/media-gfx/gthumb/ChangeLog b/media-gfx/gthumb/ChangeLog
index 9aff92814c47..b79d845c06f9 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.129 2011/03/27 05:27:41 nirbheek Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/gthumb/ChangeLog,v 1.130 2011/04/15 16:19:31 pacho Exp $
+
+*gthumb-2.12.3 (15 Apr 2011)
+
+  15 Apr 2011; Pacho Ramos <pacho@gentoo.org> -gthumb-2.10.11.ebuild,
+  +gthumb-2.12.3.ebuild:
+  Version bump with bugfixes and translation updates. Remove old.
 
 *gthumb-2.13.1 (27 Mar 2011)
 
diff --git a/media-gfx/gthumb/Manifest b/media-gfx/gthumb/Manifest
index 9842be9dd338..c9b5bed96def 100644
--- a/media-gfx/gthumb/Manifest
+++ b/media-gfx/gthumb/Manifest
@@ -3,28 +3,18 @@ Hash: SHA1
 
 AUX gthumb-2.12.1-new-exiv2.patch 2317 RMD160 bd9baf2bd9fc1dc9ef7e10c9dc7ae0997dc85ece SHA1 2bbee7528bd6138f9e5fc1238ec483651c4ba750 SHA256 227ec3a133b077d20fbc171300d1df910245de3d6fd389544f66c331be953bda
 AUX gthumb-no-brasero3.patch 842 RMD160 06c0704b5cc858243148aa4dd07d51c3b3462445 SHA1 8ae0f3e614b42679a74aa8fdc3ce46e4e4542837 SHA256 56797239a57366ca2397af1523374019fc99bc0765cb31c3ca3fc1a669004806
-DIST gthumb-2.10.11.tar.bz2 2839510 RMD160 ceaef54c96cc6dbea23fe6c461d26b685b13778a SHA1 a9c133f3a652249329da8b5be8ff08dfec0ded9f SHA256 68ac6835afdbe32cba09504b4d61ad4f5d98a97776bfb58698338add56eb520e
 DIST gthumb-2.12.2.tar.bz2 5190588 RMD160 44935b9abc447b241b9127ed83c45b52bc8d1450 SHA1 0d93f99f61061b2e839e662bad51f77d8525763e SHA256 bce8111e4d699620ae0399963798ff25929df8c8546f4949e2a871b330277091
+DIST gthumb-2.12.3.tar.bz2 5195429 RMD160 49407a23f02046eb9c37b879e199237143e94872 SHA1 d6c81503c5d2866c3a25e3389d5bf93c4da8c748 SHA256 0060c05fd372c2af2048d294ab3f75c8fb02c576d3e2004e08b7d34f49da1e66
 DIST gthumb-2.13.1.tar.bz2 5279642 RMD160 faa702b6ebbec534a30cc4ab0a05a9d6d4cc7c0c SHA1 91b27c845c50e4967354a28421b71d3de0814e49 SHA256 3b124e1b3ae5a3496d9392c11052792e5168535b849756b53cefd9d7b1e8e7b9
-EBUILD gthumb-2.10.11.ebuild 1468 RMD160 bbd7996459d485871af46ab5a5d4cfe5338b22d4 SHA1 988673e4afa3be388aa51663017753cd913344b8 SHA256 1e8727bc626ce6f45a9f89725a982172c566c1ad4c5c03e06f60cb35f7d56cbc
 EBUILD gthumb-2.12.2.ebuild 2025 RMD160 1ea85cd313393b2c15b0875a1a3cb6c2caba9921 SHA1 cb224c09577381328d926c5b7b2eded4ae580b29 SHA256 24da344b6a4a40d868cff96e910748f38c9c9f6765dd9b557026b62695afaf4a
+EBUILD gthumb-2.12.3.ebuild 2257 RMD160 b21bcdf52d55b74818d4cc0ffc6245fb9ca7d0cc SHA1 1f6a2a49581c2ba48ddc086c40e7ff4520b7102d SHA256 3e7d6317d7381a1f1e2cd27e5dede641016e1709f2c131ad7bd58e1c942d085a
 EBUILD gthumb-2.13.1.ebuild 2294 RMD160 ba9d0e7a07f0e86ee242319a02a7491f9c99229e SHA1 fc95b7a66d928cb8dbc3407ddf870c52d59929df SHA256 61e1a4d46d208099922b95e30b7c80f67b28be1012329db6467edf2eed905198
-MISC ChangeLog 19762 RMD160 2cf1ff052d41673b5b09dfa4d5de8b0598835c14 SHA1 cfa0544ed24442c73b028b6e7dc29b8215401868 SHA256 3eba8da08474a4e490af2a07c4867791a89c81b82dd0682048ba122e13032f8c
-MISC metadata.xml 380 RMD160 1db419c6ace42704ec134285fae7a01851af9780 SHA1 a159db2e96a5d77bad064cf61757863076bc598a SHA256 2e10ecfe504ae1d22a813720041534aadf04f25e3f6e18d3027910465b8ba4d8
+MISC ChangeLog 19951 RMD160 094fb2bcca114cf7f77b35c58bbca6752beeecb1 SHA1 f51e007a7579346f7077bd6c6edcd2043295193f SHA256 00cb92a9c03b5f5e4fd8996ab208efd785f6525e7bf1065ddefe0e9944da15bf
+MISC metadata.xml 323 RMD160 f5435cdb4548f4644c0aa35ac35a89faa85b0ab4 SHA1 98f3eccc18bf8172274882cf07cdf9bca8c5cefd SHA256 0c127222f7e10a8f967627b17946b817e79a78e11988469a041bb50aaeaa3048
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.17 (GNU/Linux)
 
-iQIcBAEBAgAGBQJNjsrTAAoJEO/kOhxWD91kIpEQAKeWxG64tUxm8WPRZ6Y0zM9Q
-q5iZY5t6/SQnsIB7fWnxzQ+m+Lox9TayXxHrNuWNfMe2vZvlU4dL8Crh/kOaD00H
-u2DZGnorEOGyRX1YFbfNK6VQUZSQU0nfEL18q0UsMEjYuI82qW5qiQtWC3AMdyG9
-FLQTZ4yfiaGOAlYY9fEaXqEdZikSHqEdrLdJY04u0jYl8cphJtvcfpaZS6gfvUZT
-v1yaAdSgPEFt3fGfbT8e/aGurHlW685wA3yPukv/TMrkvCgJ3/RQ1avd2c6HJ6du
-p4+0mqqTe6EtNuIvAzMPgOMlkm7UctMj2fy0NElhZmLH8dUzbjx72+orlyuUOPjR
-+p28Wg+RjgFPP722s2ViecSMsv/eWPxRkEmyWzQB1BhQwRdC7EobmHCx3C6Noybq
-7rCsrMs9D8qhijYjX1unn9XSXXxTwqJl3yj1vmiBa+t6otwZyjiI6KrIrtqvGbQe
-OzE0baSWaQVgLEhzJIO4l31u/b7wxx83Po4p64kdn+8bHCnO1qykMJAq5uC5220x
-lJQaAoNAoicIoYGg7+ksyY1pgP7OC9/BQgz/c8GMmva4jBMlP3IAo8738SpvsOgu
-jalRQQ+Cs9C962C6ArQYsjkEEZIfGUqpncCnsf282xaCnnJi8TfqXNVQmmGSJeFH
-NGSAewCX/z86pJPMLXZ6
-=Pqii
+iEYEARECAAYFAk2ocBkACgkQCaWpQKGI+9So8QCfdk2jRfWvzyskMh/k/QEyo7ck
+/V4An1sqKUuoO4puR0McG/q5JEr6DFSg
+=USsM
 -----END PGP SIGNATURE-----
diff --git a/media-gfx/gthumb/gthumb-2.10.11.ebuild b/media-gfx/gthumb/gthumb-2.10.11.ebuild
deleted file mode 100644
index 245ccdb2313c..000000000000
--- a/media-gfx/gthumb/gthumb-2.10.11.ebuild
+++ /dev/null
@@ -1,59 +0,0 @@
-# Copyright 1999-2010 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-gfx/gthumb/gthumb-2.10.11.ebuild,v 1.8 2010/11/08 22:27:27 eva Exp $
-
-EAPI=2
-inherit gnome2
-
-DESCRIPTION="Image viewer and browser for Gnome"
-HOMEPAGE="http://gthumb.sourceforge.net"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 ppc ppc64 x86"
-IUSE="+gphoto2 iptc raw tiff test"
-
-RDEPEND=">=dev-libs/glib-2.6:2
-	>=x11-libs/gtk+-2.10:2
-	>=dev-libs/libxml2-2.4
-	>=gnome-base/libgnome-2.6
-	>=gnome-base/libgnomeui-2.6
-	>=gnome-base/libgnomecanvas-2.6
-	>=gnome-base/gnome-vfs-2.6
-	>=gnome-base/libglade-2.4
-	>=media-libs/libexif-0.6.13
-	gphoto2? ( >=media-libs/libgphoto2-2.1.3 )
-	iptc? ( >=media-libs/libiptcdata-0.2.1 )
-	>=gnome-base/libbonobo-2.6
-	>=gnome-base/libbonoboui-2.6
-	>=gnome-base/gconf-2.6
-	virtual/jpeg:0
-	tiff? ( media-libs/tiff )
-	raw? ( media-libs/libopenraw )
-	x11-libs/libXrender
-	x11-libs/libXtst
-	x11-libs/libXext
-	x11-libs/libXxf86vm"
-DEPEND="${RDEPEND}
-	x11-proto/inputproto
-	x11-proto/xextproto
-	dev-util/pkgconfig
-	app-text/scrollkeeper
-	>=dev-util/intltool-0.29
-	app-text/gnome-doc-utils
-	test? ( ~app-text/docbook-xml-dtd-4.1.2 )"
-
-DOCS="AUTHORS ChangeLog NEWS README"
-
-pkg_setup() {
-	G2CONF="${G2CONF}
-		$(use_enable gphoto2)
-		$(use_enable raw libopenraw)
-		$(use_enable iptc iptcdata)
-		$(use_enable tiff)"
-}
-
-src_prepare() {
-	# Fix tests
-	echo "data/gthumb-import.desktop.in" >> po/POTFILES.in
-}
diff --git a/media-gfx/gthumb/gthumb-2.12.3.ebuild b/media-gfx/gthumb/gthumb-2.12.3.ebuild
new file mode 100644
index 000000000000..53f9b3979dd3
--- /dev/null
+++ b/media-gfx/gthumb/gthumb-2.12.3.ebuild
@@ -0,0 +1,84 @@
+# 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.12.3.ebuild,v 1.1 2011/04/15 16:19:31 pacho Exp $
+
+EAPI="3"
+GCONF_DEBUG="yes"
+
+inherit 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
+	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
+
+pkg_setup() {
+	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"
+}
+
+src_prepare() {
+	gnome2_src_prepare
+
+	# Remove unwanted CFLAGS added with USE=debug
+	sed 's/CFLAGS="$CFLAGS -g -O0 -DDEBUG"//' -i configure.ac configure || die
+
+	# Avoid linking to libbrasero-burn3
+	epatch "${FILESDIR}/${PN}-no-brasero3.patch"
+
+	# GSeal doesn't get disabled with --disable-gseal
+	sed -e 's/-DGSEAL_ENABLE//g' -i configure.ac -i configure || die
+}
+
+src_install() {
+	gnome2_src_install
+
+	# gthumb does not need *.la files
+	find "${ED}" -name "*.la" -delete || die "*.la files removal failed"
+}
diff --git a/media-gfx/gthumb/metadata.xml b/media-gfx/gthumb/metadata.xml
index c77f1b14a63b..32759ce0125f 100644
--- a/media-gfx/gthumb/metadata.xml
+++ b/media-gfx/gthumb/metadata.xml
@@ -3,7 +3,6 @@
 <pkgmetadata>
 	<herd>gnome</herd>
 	<use>
-		<flag name='iptc'>Add support for IPTC metadata</flag>
 		<flag name="http">Enable webservice integration through <pkg>net-libs/libsoup</pkg></flag>
 		<flag name="slideshow">Enable slideshow plugin</flag>
 	</use>