Version bump, remove old.
authorPacho Ramos <pacho@gentoo.org>
Sun, 16 Oct 2011 10:17:03 +0000 (10:17 +0000)
committerPacho Ramos <pacho@gentoo.org>
Sun, 16 Oct 2011 10:17:03 +0000 (10:17 +0000)
Package-Manager: portage-2.1.10.27/cvs/Linux x86_64

media-gfx/gthumb/ChangeLog
media-gfx/gthumb/Manifest
media-gfx/gthumb/files/gthumb-2.12.1-new-exiv2.patch [deleted file]
media-gfx/gthumb/gthumb-2.12.4.ebuild [moved from media-gfx/gthumb/gthumb-2.12.2.ebuild with 78% similarity]

index 8e17cbe1cc6d12003366512e81401557a1722380..830694bd01214991dac528c8139a568afea40534 100644 (file)
@@ -1,6 +1,13 @@
 # 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.133 2011/10/05 17:50:18 xarthisius Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/gthumb/ChangeLog,v 1.134 2011/10/16 10:17:03 pacho Exp $
+
+*gthumb-2.12.4 (16 Oct 2011)
+
+  16 Oct 2011; Pacho Ramos <pacho@gentoo.org>
+  -files/gthumb-2.12.1-new-exiv2.patch, -gthumb-2.12.2.ebuild,
+  +gthumb-2.12.4.ebuild:
+  Version bump, remove old.
 
   05 Oct 2011; Kacper Kowalik <xarthisius@gentoo.org> gthumb-2.12.3.ebuild:
   ppc/ppc64 stable wrt #369909
index 5df99c81c9b41acd54d6657eda5b1f034e89988a..a9163a7c8d1a30240a05b53d10b686e60b150e21 100644 (file)
@@ -1,22 +1,19 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 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.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.12.4.tar.xz 5715320 RMD160 9f67e0fbf306e0273f26ba82288b20147b81d9f5 SHA1 2436b972a5648c14bb574c402889305715135abb SHA256 b6e316ed8a7187ee58b388a44b1cef1ec3405b19a734cb07aaec311083761423
 DIST gthumb-2.13.1.tar.bz2 5279642 RMD160 faa702b6ebbec534a30cc4ab0a05a9d6d4cc7c0c SHA1 91b27c845c50e4967354a28421b71d3de0814e49 SHA256 3b124e1b3ae5a3496d9392c11052792e5168535b849756b53cefd9d7b1e8e7b9
-EBUILD gthumb-2.12.2.ebuild 2025 RMD160 1ea85cd313393b2c15b0875a1a3cb6c2caba9921 SHA1 cb224c09577381328d926c5b7b2eded4ae580b29 SHA256 24da344b6a4a40d868cff96e910748f38c9c9f6765dd9b557026b62695afaf4a
 EBUILD gthumb-2.12.3.ebuild 2258 RMD160 ea6e3398faa56e74c3096b4fc2f15cfbddae8bfc SHA1 00d35b7c3fea5a88eabceb91d2ea77d791a21cc0 SHA256 af962cba14ff2269f42894efe64c73b1c4231ba68904c00106eb5c9001b857f2
+EBUILD gthumb-2.12.4.ebuild 2132 RMD160 08bcfdd474754c9f68d75735df5689722c8f1cd8 SHA1 6ee903f49071763fea5b364cadb76479e90196c7 SHA256 4f7b2c98382a2384dc61ba82bf919f12d565f5baa15e4b10e8dc4c6ac6314d90
 EBUILD gthumb-2.13.1.ebuild 2294 RMD160 ba9d0e7a07f0e86ee242319a02a7491f9c99229e SHA1 fc95b7a66d928cb8dbc3407ddf870c52d59929df SHA256 61e1a4d46d208099922b95e30b7c80f67b28be1012329db6467edf2eed905198
-MISC ChangeLog 20272 RMD160 480edea73a086961939474ac4fab7f70ed4696c2 SHA1 9e53613a0fed28313da9988537c060deb94e927f SHA256 bfb956aff3b3db845fb89dd4b35702fa98d68dc8f8515614c5a7feff05b3a296
+MISC ChangeLog 20460 RMD160 a5452c882f05c5c73daa7614a4beb7d40de7d1a4 SHA1 1567369973fcfb317d3675fae000b65f0d98dbbd SHA256 db285fd9c798604d7d586b8184745ffecc0d30dc9fdd18980eb61f0be7b89363
 MISC metadata.xml 323 RMD160 f5435cdb4548f4644c0aa35ac35a89faa85b0ab4 SHA1 98f3eccc18bf8172274882cf07cdf9bca8c5cefd SHA256 0c127222f7e10a8f967627b17946b817e79a78e11988469a041bb50aaeaa3048
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.18 (GNU/Linux)
+Version: GnuPG v2.0.17 (GNU/Linux)
 
-iJwEAQECAAYFAk6MmOAACgkQIiMqcbOVdxTobwP/Tl8BRdBlCcRyQIkNUK9ewE6i
-nTfO4e0vl6K/jpTaFCGCF9+kT+hZWslYqkWoqPUVs1uXRiDqkvH0dEwfGQqXiLv3
-hTFvNbcxC0yCt2kljVWCpTd8Z3MDbs7AlDtaf9nsp7ddxvgQSi7D5siN0ftqwUKw
-k1FVVNddTU+GnhrLiBU=
-=gz6C
+iEYEARECAAYFAk6aryQACgkQCaWpQKGI+9RS2ACdHqADGKQ/H+wgzCw3CCf7iGPh
+lNUAoIhUW+gaUTR67cyBxxowO40IPj6M
+=CZYi
 -----END PGP SIGNATURE-----
diff --git a/media-gfx/gthumb/files/gthumb-2.12.1-new-exiv2.patch b/media-gfx/gthumb/files/gthumb-2.12.1-new-exiv2.patch
deleted file mode 100644 (file)
index e8499b2..0000000
+++ /dev/null
@@ -1,64 +0,0 @@
-From 1834cea61050e476e97e3831538169a40af8a72f Mon Sep 17 00:00:00 2001
-From: Alexandre Rostovtsev <tetromino@gmail.com>
-Date: Mon, 20 Dec 2010 03:19:12 +0000
-Subject: Enable building with exiv2-0.21 (#349150)
-
-Due to API changes in exiv2-0.21 (see
-http://dev.exiv2.org/issues/show/0000721), gthumb with exiv2 support
-enabled fails to compile. This patch updates gthumb to allow compilation
-with both exiv2-0.20 and 0.21. Since ifd IDs are no longer part of the
-public API, the patch uses group names instead (which works with
-exiv2-0.20 as well, modulo the fact that 0.21 has isMakerGroup() instead
-of isMakerIfd() in 0.20).
-In addition, instead of numeric comparison with ids1Id (which wouldn't
-work with exiv2-0.21 in any case), isMakerGroup()/isMakerIfd() are now
-used to determine whether or not a tag is a MakerNote.
-
-Signed-off-by: Alexandre Rostovtsev <tetromino@gmail.com>
----
-diff --git a/extensions/exiv2_tools/exiv2-utils.cpp b/extensions/exiv2_tools/exiv2-utils.cpp
-index 780bf29..f24b50d 100644
---- a/extensions/exiv2_tools/exiv2-utils.cpp
-+++ b/extensions/exiv2_tools/exiv2-utils.cpp
-@@ -497,19 +497,19 @@ set_attributes_from_tagsets (GFileInfo *info)
- static const char *
- get_exif_default_category (const Exiv2::Exifdatum &md)
- {
-+#if EXIV2_TEST_VERSION(0, 21, 0)
-+      if (Exiv2::ExifTags::isMakerGroup(md.groupName()))
-+#else
-       if (Exiv2::ExifTags::isMakerIfd(md.ifdId()))
-+#endif
-               return "Exif::MakerNotes";
--      switch (md.ifdId()) {
--      case Exiv2::ifd1Id:
-+      if (md.groupName().compare("Thumbnail") == 0)
-               return "Exif::Thumbnail";
--      case Exiv2::gpsIfdId:
-+      else if (md.groupName().compare("GPSInfo") == 0)
-               return "Exif::GPS";
--      case Exiv2::iopIfdId:
-+      else if (md.groupName().compare("Iop") == 0)
-               return "Exif::Versions";
--      default:
--              break;
--      }
-       return "Exif::Other";
- }
-@@ -531,7 +531,11 @@ exiv2_read_metadata (Exiv2::Image::AutoPtr  image,
-                       stringstream description;
-                       if (! md->tagLabel().empty())
-                               description << md->tagLabel();
--                      else if (md->ifdId () > Exiv2::ifd1Id)
-+#if EXIV2_TEST_VERSION(0, 21, 0)
-+                      else if (Exiv2::ExifTags::isMakerGroup(md->groupName()))
-+#else
-+                      else if (Exiv2::ExifTags::isMakerIfd(md->ifdId()))
-+#endif
-                               // Must be a MakerNote - include group name
-                               description << md->groupName() << "." << md->tagName();
-                       else
---
-cgit v0.8.3.1
similarity index 78%
rename from media-gfx/gthumb/gthumb-2.12.2.ebuild
rename to media-gfx/gthumb/gthumb-2.12.4.ebuild
index b88e033af8e6df080c0b6a68b0b91771e625d2af..88bb7fa6850d4413cf1b97c4a0542ba41d9744c7 100644 (file)
@@ -1,28 +1,30 @@
 # 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.2.ebuild,v 1.6 2011/03/22 19:36:16 ranger Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/gthumb/gthumb-2.12.4.ebuild,v 1.1 2011/10/16 10:17:03 pacho Exp $
 
-EAPI="3"
+EAPI="4"
 GCONF_DEBUG="yes"
+GNOME2_LA_PUNT="yes"
 
 inherit eutils gnome2
 
 DESCRIPTION="Image viewer and browser for Gnome"
-HOMEPAGE="http://gthumb.sourceforge.net"
+HOMEPAGE="http://live.gnome.org/gthumb"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="amd64 ppc ppc64 x86"
+KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
 IUSE="cdr exif gnome-keyring gstreamer http raw slideshow tiff test"
 
-# TODO: beware, can link to brasero-3
+# 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 )
+       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? (
@@ -67,11 +69,10 @@ src_prepare() {
 
        # Remove unwanted CFLAGS added with USE=debug
        sed 's/CFLAGS="$CFLAGS -g -O0 -DDEBUG"//' -i configure.ac configure || die
-}
 
-src_install() {
-       gnome2_src_install
+       # Avoid linking to libbrasero-burn3
+       epatch "${FILESDIR}/${PN}-no-brasero3.patch"
 
-       # gthumb does not need *.la files
-       find "${ED}" -name "*.la" -delete || die "*.la files removal failed"
+       # GSeal doesn't get disabled with --disable-gseal
+       sed -e 's/-DGSEAL_ENABLE//g' -i configure.ac -i configure || die
 }