Version bump, drop old.

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

6 files changed, 26 insertions, 139 deletions

diff --git a/media-gfx/gtkam/ChangeLog b/media-gfx/gtkam/ChangeLog
index e56a9f649ea8..cc6ef2c0d001 100644
--- a/media-gfx/gtkam/ChangeLog
+++ b/media-gfx/gtkam/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for media-gfx/gtkam
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-gfx/gtkam/ChangeLog,v 1.82 2012/07/15 18:00:26 armin76 Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/gtkam/ChangeLog,v 1.83 2012/09/15 11:48:29 pacho Exp $
+
+*gtkam-0.2.0 (15 Sep 2012)
+
+  15 Sep 2012; Pacho Ramos <pacho@gentoo.org> +gtkam-0.2.0.ebuild,
+  -files/gtkam-0.1.14-as-needed.patch,
+  -files/gtkam-0.1.16.1-desktop-validation.patch, -gtkam-0.1.16.1.ebuild,
+  -gtkam-0.1.17.ebuild:
+  Version bump, drop old.
 
   15 Jul 2012; Raúl Porcel <armin76@gentoo.org> gtkam-0.1.18.ebuild:
   alpha/sparc stable wrt #410611
diff --git a/media-gfx/gtkam/Manifest b/media-gfx/gtkam/Manifest
index fd1bded5d19a..23810a59f7d2 100644
--- a/media-gfx/gtkam/Manifest
+++ b/media-gfx/gtkam/Manifest
@@ -1,21 +1,17 @@
 -----BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
+Hash: SHA256
 
-AUX gtkam-0.1.14-as-needed.patch 734 SHA256 7a16215767eee50244c781c402d00a011d046dd23e177636fd897995edfeeb7e SHA512 0018c0d860751755ddd90e7c7dab1d07ce947645f1d61c5cbf44b9288cd98ed32ccb98f3f67bb7031f839c8f1a14c5096b0b6989979af7a590c8aa41c70676fe WHIRLPOOL 34466017668b819edaeb2819b14ec06df7690b0703033e270ae6ab15eebd110ec409df917ede5f0cad3820d781e2fc47eaead7e3c63bacdcc879118413a773a5
-AUX gtkam-0.1.16.1-desktop-validation.patch 617 SHA256 2d5414f8f42f06b2f718f95b665b79003658152bf7af5c037acf2025aa201228 SHA512 f90efdfa5eb4b00d97d9bc2b337bcbde424178734a8c2e8259cef000694ad44a1e282a007e47d216a9581feb3681ac1e79aaf5b1ca18f0e3105c66a4bd157327 WHIRLPOOL 09913fb5d255fa08c2bbeff3cea7cbb075446366c8989055ce7090c2c74f58897e48e2fbe159d074a8e4a40b824ec80b71b70ebfe79778bbdd33b08644d02834
 AUX gtkam-0.1.18-desktop-validation.patch 532 SHA256 9a1256bcde483b8f5c7490ac96ab92c71a7f288a985ec1c3ba172d659ab4d4e3 SHA512 4003ab1f50aaabe3aa1163f7f4b7d4779f7e39333fd2eacf0731128b8922fc20d4412fff1fe37d32626e761211c430bc74b0b7a5b1c2cb2ee5b8b54a546c87f0 WHIRLPOOL 7beab0d04c24dfab0058bdb91a95cacd67db82a3b3d135afacd3e653441e66b79208ecaeaa2e024514292f4e71b11355dfb3ac1d9b3a9ea7f5ba75afcdb71d71
-DIST gtkam-0.1.16.1.tar.gz 1392585 SHA256 d3220a386faf1d7d03381e85fd5d19b7e9d607af8e5a67e4ee1ce4c0707f490f
-DIST gtkam-0.1.17.tar.gz 1330286 SHA256 e860bf2a544a7244a31f702c218b1a1627d2e7a2967011f2f59d91178adf73d2
 DIST gtkam-0.1.18.tar.bz2 1136454 SHA256 01aa8afa9e96195355ad39083806708a097a04c885dbc26b3ca881767edabc0c
-EBUILD gtkam-0.1.16.1.ebuild 1441 SHA256 44da60b4ff7560c6b942c892c76da738922408c0bb29cb60dd9f75a37c652388 SHA512 7b93b08960c608a6e70fe9522585821af96ab28f72d2b25ae3eaf5804b9991e27830ed713cf41b18e1936efddb76b94284aa5f22cdc012114cbf80fe917c7d07 WHIRLPOOL 9a02126db2c28b3d1e556fe4a690d1adcc431c56ec5d3fed5521525de3841407b979b1823b44114c34393e30e90e17d7c982f4470f210a800824ece646ab9aa3
-EBUILD gtkam-0.1.17.ebuild 1389 SHA256 4d121572eaedc705c092f9329d187a26bb7a900558a97682f095d70c2b5b09bb SHA512 11645f53548f2fbf58b9991645ae075b24211a33b12b6361fd18ec03a0cc988d5cec8a6b4667262aba1eb8215dbaa82e22938125135d23e8dcaed829d7dd0b2f WHIRLPOOL 8cbaef1521f3f48fc4b67794d6f402d0933a28a036539c1f91dc98a3919753108199e54828eb703bfc3a8594331bb02fd9c5a5ee39e74a2938404d9595ab21ba
+DIST gtkam-0.2.0.tar.bz2 1137547 SHA256 527b1318ed8f49fbf8c13b80a4d2859e41bb34ab6bb5cc728c8816aa6ecf97c2 SHA512 648a8f4d85ec802ee3bc391d4c20517eefe2da253db964e3fb578bd2b98abe79bc6ae6e7de2b91e03ae73b5ebfd5f963fb453c44f5347d3c700c1881f79c2c4d WHIRLPOOL b7d7c0af01c70e34f62a2b0cd7a6beb0115cba20771f9e6d5dbc1cdf866689bf29a95a97e8de70c95d80a7e3801ab0648d0951b06fe9bded2a40cad4bca333fe
 EBUILD gtkam-0.1.18.ebuild 1298 SHA256 f12bf1461bc613510824ec02e2980356f587894323d812ab8305f67542a961bf SHA512 9fbcab6199b7c97623df69f02b5faa821945052fb2f25bcc65968097559410be8b34d583f24cb73c16feaa2b82ee434497976c24f9148b20d25d258e802bdd9d WHIRLPOOL f83f1e8bbe8b51cd11e9745b391f5ac5279ceb06fdd4cf6e3f46c01b0b5faa1dd38cd5cce928530373651ce187a48551851375f7a664921b25a562746e9e08bc
-MISC ChangeLog 11285 SHA256 26ac6a0e17821d9c6571dd5b4c45d0188010d3da2a94c432843072be008d8bc3 SHA512 d1d7fa7c2aaf6fa3e8f1b8775afda4aec9587c539310c60e730fd7baf8a0eae9bf7318dabea8642f88e7c8bfa904c284b4fcac2cc10aeaf86d4ccb801f671711 WHIRLPOOL 69c1efab05c22d35437aa14cc8c961f06e652447688a9e7197f391bc0ba22d0e36069469409a6ea932cbcd87286f371a1e7e1df65f41ee680bfeadf6d43311dc
+EBUILD gtkam-0.2.0.ebuild 1303 SHA256 ba1926da4b8f9080b8c7509bef17e2ee8b94877857e40669b50d9102c1ce37c0 SHA512 55aa80b3642e3668c59ed6bdff7bb3930c321b2a0dcbafb3e2e512544a34c39c8985fbc1b3762bf7fdca002bd0e5aae9c9744b3585785cb453f6fccdc0ce7173 WHIRLPOOL 540d9daf90d8c933da0733b1ef68acabb28be2922ca77f234152d8c253c8bfe4f40995544fff3dc2a2db213d3420003be6753a76e28134063620f269f39d2b8a
+MISC ChangeLog 11542 SHA256 d9eb68d92c6163204bab5dbfb00fef32ea71e5b27a9683bdb2d9988bd86d91f9 SHA512 1cd016eaa3ed831b14e6c64089d127cf43f2b1cab6a5e94c105ce2520cbf356597b9526ff63d289b494f074386c3eef8281a39c9b572e613f84cb396284cbde9 WHIRLPOOL dbbebd2e746c8cb42b1ba8837660bf332f282defb49ebaca519221c30c66e9b52208ba97ebe85d9833ce042bd76344c3fb8a45e5aae56e67e614ba7002143277
 MISC metadata.xml 265 SHA256 409da4cd9ea936a1d138f217d49c58dd402c489a9874345f6bfde4405438ed1e SHA512 5417b9803a2ee7c877bf4369852759302ae78de708bfc80f78cd139c525bde90ef84e3bf5ec565412af7baf0ce41a8f7d349f39b802d159fcaa96dcebfc64afc WHIRLPOOL 3b11e93ca846d4d8a871c69ccbca5e26d327d3730970cfb89a39b46ec08fdac28aff0a29a2ff5cb60093eaae69034d1d806a9979dc3ebf492d594c6599622e14
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.17 (GNU/Linux)
+Version: GnuPG v2.0.19 (GNU/Linux)
 
-iEYEARECAAYFAlADBUEACgkQuQc30/atMkClfACglcQNWtzC1NVhi5JwBMWLtQKB
-cVQAn0jKwA21MgRSTUTxezW1NwlmBnS4
-=9lZ9
+iEYEAREIAAYFAlBUaxIACgkQCaWpQKGI+9TsvwCePeO/Y7EQ3HTwsx5kLrvpFc+4
+xKkAniPMcE+sBt2u1DDmgoRly1nl3yiu
+=4ELm
 -----END PGP SIGNATURE-----
diff --git a/media-gfx/gtkam/files/gtkam-0.1.14-as-needed.patch b/media-gfx/gtkam/files/gtkam-0.1.14-as-needed.patch
deleted file mode 100644
index 43420001efb7..000000000000
--- a/media-gfx/gtkam/files/gtkam-0.1.14-as-needed.patch
+++ /dev/null
@@ -1,33 +0,0 @@
---- test/Makefile.am
-+++ test/Makefile.am
-@@ -9,12 +9,12 @@ MY_CPPFLAGS =				\
- 	$(GTKAM_GIMP_CFLAGS)
- 
- MY_LIBS = \
-+	$(top_builddir)/src/libgtkam.a	\
- 	$(LIBEXIF_LIBS)			\
- 	$(LIBEXIF_GTK_LIBS)		\
- 	$(LIBGPHOTO2_LIBS)	\
- 	$(GTK_LIBS)			\
- 	$(BONOBO_LIBS)			\
--	$(top_builddir)/src/libgtkam.a	\
- 	$(INTLLIBS)
- 
- noinst_PROGRAMS = test-fsel test-cancel
---- src/Makefile.am	2008-05-16 17:31:29.000000000 +0200
-+++ src/Makefile.am	2008-05-16 17:32:17.000000000 +0200
-@@ -64,12 +64,12 @@
- 	$(MY_CPPFLAGS)		\
- 	$(GIMP_CFLAGS)
- gtkam_gimp_LDADD = \
-+	libgtkam.a	\
- 	$(GIMP_LIBS)	\
- 	$(LIBEXIF_LIBS)		\
- 	$(LIBEXIF_GTK_LIBS) \
- 	$(LIBGPHOTO2_LIBS)	\
- 	$(BONOBO_LIBS)		\
- 	$(GNOME_LIBS)		\
--	$(INTLLIBS)		\
--	libgtkam.a
-+	$(INTLLIBS)
- endif
diff --git a/media-gfx/gtkam/files/gtkam-0.1.16.1-desktop-validation.patch b/media-gfx/gtkam/files/gtkam-0.1.16.1-desktop-validation.patch
deleted file mode 100644
index 17942ed04918..000000000000
--- a/media-gfx/gtkam/files/gtkam-0.1.16.1-desktop-validation.patch
+++ /dev/null
@@ -1,19 +0,0 @@
-Fix .desktop file to validate.
-
-Gentoo: https://bugs.gentoo.org/show_bug.cgi?id=271569
-
---- a/gtkam.desktop.in	2009-04-22 15:00:06.000000000 -0700
-+++ b/gtkam.desktop.in	2009-06-23 23:30:46.000000000 -0700
-@@ -1,9 +1,8 @@
- [Desktop Entry]
--Encoding=UTF-8
--_Name=Gtkam Digital Camera Browser
--_Comment=Browse and download images from an attached digital camera
-+Name=Gtkam Digital Camera Browser
-+Comment=Browse and download images from an attached digital camera
- Exec=gtkam
--Icon=gtkam-camera.png
-+Icon=gtkam-camera
- Terminal=false
- Type=Application
- Categories=GNOME;GTK;Photography;Graphics;RasterGraphics;Viewer;
diff --git a/media-gfx/gtkam/gtkam-0.1.16.1.ebuild b/media-gfx/gtkam/gtkam-0.1.16.1.ebuild
deleted file mode 100644
index dd0b606a9e19..000000000000
--- a/media-gfx/gtkam/gtkam-0.1.16.1.ebuild
+++ /dev/null
@@ -1,61 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-gfx/gtkam/gtkam-0.1.16.1.ebuild,v 1.9 2012/05/05 07:00:23 jdhore Exp $
-
-inherit autotools eutils gnome2
-
-DESCRIPTION="A frontend for gPhoto 2"
-HOMEPAGE="http://gphoto.org/proj/gtkam"
-SRC_URI="mirror://sourceforge/gphoto/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="alpha amd64 ppc sparc x86"
-IUSE="gimp gnome nls"
-
-# FIXME: why is exif not optional ?
-
-RDEPEND=">=x11-libs/gtk+-2.0
-	>media-libs/libgphoto2-2.4
-	>=media-libs/libexif-0.3.2
-	media-libs/libexif-gtk
-	gimp? ( >=media-gfx/gimp-2 )
-	gnome? (
-		>=gnome-base/libbonobo-2
-		>=gnome-base/libgnomeui-2 )"
-DEPEND="${RDEPEND}
-	>=dev-util/intltool-0.40
-	virtual/pkgconfig
-	app-text/scrollkeeper
-	nls? ( >=sys-devel/gettext-0.14.1 )"
-
-DOCS="AUTHORS CHANGES NEWS README TODO"
-
-pkg_setup() {
-	G2CONF="${G2CONF}
-		$(use_with gimp)
-		$(use_with gnome)
-		$(use_with gnome bonobo)
-		$(use_enable nls)
-		--disable-scrollkeeper
-		--with-rpmbuild=/bin/false"
-}
-
-src_unpack() {
-	gnome2_src_unpack
-
-	# Fix --as-needed, bug #169661
-	epatch "${FILESDIR}/${PN}-0.1.14-as-needed.patch"
-
-	# Fix .desktop validity, bug #271569
-	epatch "${FILESDIR}/${P}-desktop-validation.patch"
-
-	intltoolize --automake --force --copy || die "intltoolize failed"
-	eautoreconf
-}
-
-src_install() {
-	gnome2_src_install
-
-	rm -rf "${D}"/usr/share/doc/gtkam || die "rm failed"
-}
diff --git a/media-gfx/gtkam/gtkam-0.1.17.ebuild b/media-gfx/gtkam/gtkam-0.2.0.ebuild
index 6e5b3da66697..8a1764ad0a61 100644
--- a/media-gfx/gtkam/gtkam-0.1.17.ebuild
+++ b/media-gfx/gtkam/gtkam-0.2.0.ebuild
@@ -1,24 +1,24 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-gfx/gtkam/gtkam-0.1.17.ebuild,v 1.8 2012/05/05 07:00:23 jdhore Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/gtkam/gtkam-0.2.0.ebuild,v 1.1 2012/09/15 11:48:29 pacho Exp $
 
 EAPI="4"
 GCONF_DEBUG="yes"
 
-inherit autotools eutils gnome2
+inherit eutils gnome2
 
 DESCRIPTION="A frontend for gPhoto 2"
 HOMEPAGE="http://gphoto.org/proj/gtkam"
-SRC_URI="mirror://sourceforge/gphoto/${P}.tar.gz"
+SRC_URI="mirror://sourceforge/gphoto/${P}.tar.bz2"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="alpha amd64 ppc sparc x86"
+KEYWORDS="~alpha ~amd64 ~ppc ~sparc ~x86"
 IUSE="gimp gnome nls"
 
 # FIXME: why is exif not optional ?
 RDEPEND="x11-libs/gtk+:2
-	>media-libs/libgphoto2-2.4
+	>=media-libs/libgphoto2-2.5.0
 	>=media-libs/libexif-0.3.2
 	media-libs/libexif-gtk
 	gimp? ( >=media-gfx/gimp-2 )
@@ -43,16 +43,12 @@ pkg_setup() {
 }
 
 src_prepare() {
-	# Fix .desktop validity, bug #271569
-	epatch "${FILESDIR}/${PN}-0.1.16.1-desktop-validation.patch"
-
-	intltoolize --automake --force --copy || die "intltoolize failed"
-	eautoreconf
 	gnome2_src_prepare
-}
 
+	# Fix .desktop validity, bug #271569
+	epatch "${FILESDIR}/${PN}-0.1.18-desktop-validation.patch"
+}
 src_install() {
 	gnome2_src_install
-
-	rm -rf "${D}"/usr/share/doc/gtkam || die "rm failed"
+	rm -rf "${ED}"/usr/share/doc/gtkam || die "rm failed"
 }