Drop old, version bump: upstream fixes, add a jpeg USE flag and have a revision for gnome3 (bug #387917 by Torsten Stets.

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

4 files changed, 119 insertions, 21 deletions

diff --git a/media-gfx/gthumb/ChangeLog b/media-gfx/gthumb/ChangeLog
index 980a00fcacae..906641fa4cee 100644
--- a/media-gfx/gthumb/ChangeLog
+++ b/media-gfx/gthumb/ChangeLog
@@ -1,6 +1,14 @@
 # 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.139 2012/01/14 17:14:24 maekke Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/gthumb/ChangeLog,v 1.140 2012/01/25 10:52:05 pacho Exp $
+
+*gthumb-2.14.2-r300 (25 Jan 2012)
+*gthumb-2.14.2 (25 Jan 2012)
+
+  25 Jan 2012; Pacho Ramos <pacho@gentoo.org> +gthumb-2.14.2-r300.ebuild,
+  +gthumb-2.14.2.ebuild, -gthumb-2.12.4.ebuild:
+  Drop old, version bump: upstream fixes, add a jpeg USE flag and have a
+  revision for gnome3 (bug #387917 by Torsten Stets.
 
   14 Jan 2012; Markus Meier <maekke@gentoo.org> gthumb-2.14.0.ebuild:
   x86 stable, bug #393007
diff --git a/media-gfx/gthumb/Manifest b/media-gfx/gthumb/Manifest
index db4f13cc0f57..d1dd9391d5d7 100644
--- a/media-gfx/gthumb/Manifest
+++ b/media-gfx/gthumb/Manifest
@@ -3,19 +3,20 @@ Hash: SHA1
 
 AUX gthumb-no-brasero3.patch 842 RMD160 06c0704b5cc858243148aa4dd07d51c3b3462445 SHA1 8ae0f3e614b42679a74aa8fdc3ce46e4e4542837 SHA256 56797239a57366ca2397af1523374019fc99bc0765cb31c3ca3fc1a669004806
 DIST gthumb-2.12.3.tar.bz2 5195429 RMD160 49407a23f02046eb9c37b879e199237143e94872 SHA1 d6c81503c5d2866c3a25e3389d5bf93c4da8c748 SHA256 0060c05fd372c2af2048d294ab3f75c8fb02c576d3e2004e08b7d34f49da1e66
-DIST gthumb-2.12.4.tar.xz 5715320 RMD160 9f67e0fbf306e0273f26ba82288b20147b81d9f5 SHA1 2436b972a5648c14bb574c402889305715135abb SHA256 b6e316ed8a7187ee58b388a44b1cef1ec3405b19a734cb07aaec311083761423
 DIST gthumb-2.14.0.tar.xz 5797712 RMD160 27cc368c85100f560f8d90e6ee1a031ee7b974b4 SHA1 f143ef133a3bf3d0dfc80b16c48845e4f47f8ade SHA256 9db3e4f714d62b91185e4f8edbee2c98a85bd76f0d4b82a7d7868a9b86ae10a2
 DIST gthumb-2.14.1.tar.xz 5800780 RMD160 b1fbd3844a42c1232954053d2ec87fd166febe1a SHA1 15a0672e5a94a8e828516b3c065a3a07ebffa461 SHA256 002a6611112273189348871ff7c717fb3c776f5570656389e3d6c5b26bffa11f
+DIST gthumb-2.14.2.tar.xz 5714744 RMD160 3a6970420d79379590ec8fd847616731cc08c01b SHA1 197e79ee38ad5652ca4b28c21c6856f096a6ea1f SHA256 5386e50e934c7f276584a6c47d0208f4756cf72e0dc6cff19eaf9d8a3ab53d7c
 EBUILD gthumb-2.12.3.ebuild 2290 RMD160 c6b2f4060f8ba7b4935025ea3ef27a3a16629e42 SHA1 05051df1781e83897a6b6c5f72c52647f5cceb5b SHA256 b79254456dcbcd5e24a8d49abb2db5e725b7c19afa30960262daa043b2186933
-EBUILD gthumb-2.12.4.ebuild 2169 RMD160 fb1d2172eb67bfed05af55b42e78df931f631c30 SHA1 cee6ece1a5ecf2706066b0ba361da9d3b57d26d6 SHA256 ff530d57c4be53394ad34c6cc72be39a0c6012d421f70d8c41edf16d1d4bcb73
 EBUILD gthumb-2.14.0.ebuild 2221 RMD160 58b89a5f6d3733bdd0a5892c149531991f796e75 SHA1 a111c1df2c662b36ce0af9fea04197bda61a16f5 SHA256 9d64627860bdf7218ed35ff7195da6710d0988d5dc27404cfb73ddc63aef6493
 EBUILD gthumb-2.14.1.ebuild 2220 RMD160 bdd58c0bb74200dea09a1849b0067c8853eadeb1 SHA1 12071935f46dd1f4842427898d83cc50a6a20f54 SHA256 4a649b230a73de6bb03488b06b7bdb343e78b0674a305120d8affe3c7cdd0762
-MISC ChangeLog 21170 RMD160 59f119f6e71e05eab46f00d25bba65552aaa616b SHA1 304cdde5f9c1cd04ba605fb5899bbf5f1c5104a2 SHA256 4e7707725919896e95153d630cedef05b02cf95dbae58f74ebecd83ab4d92833
+EBUILD gthumb-2.14.2-r300.ebuild 2243 RMD160 c45d6c5c2bc51607ee4a2579a1e2f2aaa815e05b SHA1 c37ccab0cb63be7199cdc71a8790fd94cec1e1a8 SHA256 121440652ce41ce5a9fa49534b7227ae68f0b66f6366d77693fa2972eca0ffd6
+EBUILD gthumb-2.14.2.ebuild 2258 RMD160 f9510c0bbdb01ba8cb60f6531a452176e10eb8bd SHA1 c365826404a379104679d7fd27df60c2c93558c2 SHA256 a1f504eb480188dfa4b523cd3632c857c0264b1b2303ffa68485e31114d64869
+MISC ChangeLog 21482 RMD160 7cb0bc2b02424ec883e350965dd5796ff8a2c060 SHA1 0efa4c9c99ddf71c3e647c71c083b139f4e981db SHA256 677ec9a3a9060bc2185587a6f859aa32aa55d5bcecb974b7b5b5cce9a9530557
 MISC metadata.xml 323 RMD160 f5435cdb4548f4644c0aa35ac35a89faa85b0ab4 SHA1 98f3eccc18bf8172274882cf07cdf9bca8c5cefd SHA256 0c127222f7e10a8f967627b17946b817e79a78e11988469a041bb50aaeaa3048
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.17 (GNU/Linux)
 
-iEYEARECAAYFAk8RuHEACgkQkKaRLQcq0GLVlgCgpPMuNxDp6+XRw4YR01VyDIm4
-MnMAoKEQ6xkEezOoc+UYygLfzSpwvPxC
-=7/j1
+iEYEARECAAYFAk8f3t4ACgkQCaWpQKGI+9TvPwCfYaY+MVXNaue2oiqHJRFC+SR1
+n5QAn1w/LwZnlzbxUR2eIDsiGR5iHWNu
+=If8I
 -----END PGP SIGNATURE-----
diff --git a/media-gfx/gthumb/gthumb-2.12.4.ebuild b/media-gfx/gthumb/gthumb-2.14.2-r300.ebuild
index 3f4ea4a0c4d2..85488b34ff49 100644
--- a/media-gfx/gthumb/gthumb-2.12.4.ebuild
+++ b/media-gfx/gthumb/gthumb-2.14.2-r300.ebuild
@@ -1,30 +1,32 @@
-# Copyright 1999-2011 Gentoo Foundation
+# Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-gfx/gthumb/gthumb-2.12.4.ebuild,v 1.2 2011/10/27 16:28:05 tetromino Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/gthumb/gthumb-2.14.2-r300.ebuild,v 1.1 2012/01/25 10:52:05 pacho Exp $
 
 EAPI="4"
 GCONF_DEBUG="yes"
 GNOME2_LA_PUNT="yes"
 
-inherit eutils gnome2
+inherit gnome2
 
 DESCRIPTION="Image viewer and browser for Gnome"
-HOMEPAGE="http://live.gnome.org/gthumb"
+HOMEPAGE="https://live.gnome.org/gthumb"
 
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
-IUSE="cdr exif gnome-keyring gstreamer http raw slideshow tiff test"
+IUSE="cdr exif gnome-keyring gstreamer http jpeg 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
+
 	media-libs/libpng:0
-	virtual/jpeg:0
+	x11-libs/libSM
+
 	cdr? ( >=app-cdr/brasero-2.28
-		<app-cdr/brasero-2.90 )
+		   <app-cdr/brasero-2.90 )
 	exif? ( >=media-gfx/exiv2-0.18 )
 	gnome-keyring? ( >=gnome-base/gnome-keyring-2.28 )
 	gstreamer? (
@@ -33,6 +35,7 @@ RDEPEND=">=dev-libs/glib-2.16:2
 	http? (
 		>=net-libs/libsoup-2.26:2.4
 		>=net-libs/libsoup-gnome-2.26:2.4 )
+	jpeg? ( virtual/jpeg:0 )
 	slideshow? (
 		>=media-libs/clutter-1:1.0
 		>=media-libs/clutter-gtk-0.10:0.10 )
@@ -51,14 +54,18 @@ DEPEND="${RDEPEND}
 #	gnome-base/gnome-common
 
 pkg_setup() {
+# Upstream says in configure help that libchamplain support crashes
+# frequently
 	G2CONF="${G2CONF}
 		--disable-static
-		--disable-maintainer-mode
+		--disable-libchamplain
+		--enable-unique
 		$(use_enable cdr libbrasero)
 		$(use_enable exif exiv2)
 		$(use_enable gstreamer)
 		$(use_enable gnome-keyring)
 		$(use_enable http libsoup)
+		$(use_enable jpeg)
 		$(use_enable raw libopenraw)
 		$(use_enable slideshow clutter)
 		$(use_enable test test-suite)
@@ -70,10 +77,7 @@ 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"
+	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
diff --git a/media-gfx/gthumb/gthumb-2.14.2.ebuild b/media-gfx/gthumb/gthumb-2.14.2.ebuild
new file mode 100644
index 000000000000..48aa8f45116a
--- /dev/null
+++ b/media-gfx/gthumb/gthumb-2.14.2.ebuild
@@ -0,0 +1,85 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/gthumb/gthumb-2.14.2.ebuild,v 1.1 2012/01/25 10:52:05 pacho Exp $
+
+EAPI="4"
+GCONF_DEBUG="yes"
+GNOME2_LA_PUNT="yes"
+
+inherit gnome2
+
+DESCRIPTION="Image viewer and browser for Gnome"
+HOMEPAGE="https://live.gnome.org/gthumb"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
+IUSE="cdr exif gnome-keyring gstreamer http jpeg raw slideshow tiff test"
+
+# We can't link against libbrasero-burn3
+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
+
+	media-libs/libpng: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 )
+	jpeg? ( virtual/jpeg:0 )
+	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
+	sys-devel/bison
+	sys-devel/flex
+	test? ( ~app-text/docbook-xml-dtd-4.1.2 )"
+# eautoreconf needs:
+#	gnome-base/gnome-common
+
+pkg_setup() {
+# Upstream says in configure help that libchamplain support crashes
+# frequently
+	G2CONF="${G2CONF}
+		--disable-static
+		--disable-libchamplain
+		--enable-unique
+		--disable-gnome-3
+		$(use_enable cdr libbrasero)
+		$(use_enable exif exiv2)
+		$(use_enable gstreamer)
+		$(use_enable gnome-keyring)
+		$(use_enable http libsoup)
+		$(use_enable jpeg)
+		$(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 -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
+}