Fix validity of .desktop file, bug #271569. Clean up old revisions.

Package-Manager: portage-2.2_rc33/cvs/Linux x86_64

7 files changed, 37 insertions, 129 deletions

diff --git a/media-gfx/gtkam/ChangeLog b/media-gfx/gtkam/ChangeLog
index 2ed08429435d..a0e7327e6d7d 100644
--- a/media-gfx/gtkam/ChangeLog
+++ b/media-gfx/gtkam/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for media-gfx/gtkam
 # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-gfx/gtkam/ChangeLog,v 1.68 2009/06/09 13:24:04 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/gtkam/ChangeLog,v 1.69 2009/07/09 22:12:25 eva Exp $
+
+  09 Jul 2009; Gilles Dartiguelongue <eva@gentoo.org> -gtkam-0.1.14.ebuild,
+  -gtkam-0.1.15.ebuild, gtkam-0.1.16.1.ebuild,
+  +files/gtkam-0.1.16.1-desktop-validation.patch, -files/gtkam.png:
+  Fix validity of .desktop file, bug #271569. Clean up old revisions.
 
   09 Jun 2009; Diego E. Pettenò <flameeyes@gentoo.org> gtkam-0.1.14.ebuild:
   Avoid installing ABOUT-NLS file.
diff --git a/media-gfx/gtkam/Manifest b/media-gfx/gtkam/Manifest
index 2edb444cd3c5..3c26c821b389 100644
--- a/media-gfx/gtkam/Manifest
+++ b/media-gfx/gtkam/Manifest
@@ -2,19 +2,15 @@
 Hash: SHA1
 
 AUX gtkam-0.1.14-as-needed.patch 734 RMD160 d7bd7b5a861b07633c4412df35052043e3ff977e SHA1 30a806715c12259cdd51f12be0fb3e0919da8c63 SHA256 7a16215767eee50244c781c402d00a011d046dd23e177636fd897995edfeeb7e
-AUX gtkam.png 4418 RMD160 57fafbbb197c03fa9aaa204eeb655a102a7248bf SHA1 caa74f564157977c6ff7f95f2c0dd0097209744a SHA256 a9b0dac766916d79b10cf26bc9cf6ef06ee4a7c337d33ea219b18c28359ae678
-DIST gtkam-0.1.14.tar.gz 1301806 RMD160 7cab97cf3da2a87b23d854e615ac9be9d5d47ae6 SHA1 7a46ee2cc9d88ed31d6ee46b15bc51ac296488ba SHA256 58316e0f1c8d179480384cb81098bfdcfb62cc00f21fe6a446c50261fef1c383
-DIST gtkam-0.1.15.tar.gz 1032151 RMD160 54d587b62720bbee5fdaf53ff8b26a93f005fcb8 SHA1 232c132662c5624e22d79c3fe25fbef48649b906 SHA256 8ee5823f63f0810e04add567017995e5a9d3a749766bedf77915ee50784a5528
+AUX gtkam-0.1.16.1-desktop-validation.patch 617 RMD160 e60474000495a1fc0bc4fb2d371bd753d2f69456 SHA1 34080cfa93652029cdcd81de0c269f544d0452bc SHA256 2d5414f8f42f06b2f718f95b665b79003658152bf7af5c037acf2025aa201228
 DIST gtkam-0.1.16.1.tar.gz 1392585 RMD160 8f944086186ed69312ee84de93c2dd21f4166d10 SHA1 dd8b55009373e93de720c0494e4366513e991f60 SHA256 d3220a386faf1d7d03381e85fd5d19b7e9d607af8e5a67e4ee1ce4c0707f490f
-EBUILD gtkam-0.1.14.ebuild 1343 RMD160 56c78eb4c798ecbe995beb8afe363e6cdf796485 SHA1 4e09528b144d75743ca4c4b106332746c01fe766 SHA256 2619e0e7224cd45eb703184d035415e64557f53dd2c52d4ef83fbd255176de17
-EBUILD gtkam-0.1.15.ebuild 1241 RMD160 1496f2c3eb233715293187d8ac35d05876fecf29 SHA1 8dfb4b2167a1b238d557c0a6284a027e5b3e357a SHA256 24b81c981c66bc83e6cd6e8fa7088b6fc6b952d49f6ba40c3d104ee9c30819b6
-EBUILD gtkam-0.1.16.1.ebuild 1330 RMD160 195fb211555b593cd0226228184ee9d240b2746c SHA1 df6b7b083bfd86010fc9f580f83853de9d77ee72 SHA256 35eba63e3bfe607714087f65348b40622cf1dcc0fd89ce84ea2925dd9a9cb046
-MISC ChangeLog 9442 RMD160 07a1a93b7c7ab41e559e280a3fa112f19627f08e SHA1 b9ca336e34418d315530e425c8f38688010bdc60 SHA256 b97ccc40c2545293099a621643a69587438584c08a14afe1cb2879fe357acb28
+EBUILD gtkam-0.1.16.1.ebuild 1439 RMD160 a4f699b2806b5e7663401244f3da432aa62522db SHA1 761b1b7888483485c09c93863dee58d67a18289d SHA256 ace52d928057449326132a37a6d5ac3ca054dc5b816594ce1d3254dd355dfb45
+MISC ChangeLog 9698 RMD160 87c3102e6816428e1237e561ed7d47c7c14c4668 SHA1 ea2e6e555517b104698ef9fe9494df2885bade33 SHA256 da331d228f44e79935b9d423da975f5f535fb04e23eb029b6e6e53c980a48b42
 MISC metadata.xml 180 RMD160 d96ed4f5fb92b0ee31c21e511229ad6964a1a304 SHA1 32a1398914ca5567f35112c01cbe529936ad6eb6 SHA256 666b6a2461df60cd8ed0afce78c3d4aac623567d3c9f51b35972f057ccc97789
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.11 (GNU/Linux)
 
-iEYEARECAAYFAkouYnoACgkQAiZjviIA2XieygCg9ARF4p3uE9jnTy0J9aRqjhfQ
-lUoAoITMOYv/wSg7Y7n/+iFrZGEds/wr
-=DLuS
+iEYEARECAAYFAkpWa04ACgkQ1fmVwcYIWAa/OQCdFjrBPM5bGbPewG3YPPylzdUF
+PZkAn3mOTpQ8p+Pcq9o3lo2Vy8Ux5O9f
+=OFDi
 -----END PGP SIGNATURE-----
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
new file mode 100644
index 000000000000..17942ed04918
--- /dev/null
+++ b/media-gfx/gtkam/files/gtkam-0.1.16.1-desktop-validation.patch
@@ -0,0 +1,19 @@
+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/files/gtkam.png b/media-gfx/gtkam/files/gtkam.png
deleted file mode 100644
index f548481c8701..000000000000
--- a/media-gfx/gtkam/files/gtkam.png
+++ /dev/null
diff --git a/media-gfx/gtkam/gtkam-0.1.14.ebuild b/media-gfx/gtkam/gtkam-0.1.14.ebuild
deleted file mode 100644
index e715a00de71b..000000000000
--- a/media-gfx/gtkam/gtkam-0.1.14.ebuild
+++ /dev/null
@@ -1,59 +0,0 @@
-# Copyright 1999-2009 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-gfx/gtkam/gtkam-0.1.14.ebuild,v 1.12 2009/06/09 13:24:04 flameeyes 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.2.0
-	>=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/pkgconfig
-	app-text/scrollkeeper
-	nls? ( >=sys-devel/gettext-0.14.1 )"
-
-DOCS="AUTHORS NEWS README"
-
-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
-
-	# The icon in the tarball is busted, so overwrite it
-	cp "${FILESDIR}"/${PN}.png "${S}"/${PN}.png
-
-	# Fix --as-needed, bug #169661
-	epatch "${FILESDIR}/${PN}-0.1.14-as-needed.patch"
-
-	AT_M4DIR="m4m" eautomake
-}
-
-src_install() {
-	gnome2_src_install
-
-	rm -rf "${D}"/usr/share/doc/gtkam
-}
diff --git a/media-gfx/gtkam/gtkam-0.1.15.ebuild b/media-gfx/gtkam/gtkam-0.1.15.ebuild
deleted file mode 100644
index b7f4c1659c2d..000000000000
--- a/media-gfx/gtkam/gtkam-0.1.15.ebuild
+++ /dev/null
@@ -1,56 +0,0 @@
-# Copyright 1999-2008 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-gfx/gtkam/gtkam-0.1.15.ebuild,v 1.2 2008/05/17 19:20:24 armin76 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/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"
-
-	eautomake
-}
-
-src_install() {
-	gnome2_src_install
-
-	rm -rf "${D}"/usr/share/doc/gtkam
-}
diff --git a/media-gfx/gtkam/gtkam-0.1.16.1.ebuild b/media-gfx/gtkam/gtkam-0.1.16.1.ebuild
index cd354117c13b..d640c93b7ae0 100644
--- a/media-gfx/gtkam/gtkam-0.1.16.1.ebuild
+++ b/media-gfx/gtkam/gtkam-0.1.16.1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2009 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.7 2009/05/17 17:42:08 nixnut Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/gtkam/gtkam-0.1.16.1.ebuild,v 1.8 2009/07/09 22:12:25 eva Exp $
 
 inherit autotools eutils gnome2
 
@@ -47,12 +47,15 @@ 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"
-	eautomake
+	eautoreconf
 }
 
 src_install() {
 	gnome2_src_install
 
-	rm -rf "${D}"/usr/share/doc/gtkam
+	rm -rf "${D}"/usr/share/doc/gtkam || die "rm failed"
 }