Version bump, drop old.

(Portage version: 2.1.11.17/cvs/Linux x86_64)

5 files changed, 18 insertions, 127 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/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"
 }