Fix desktop entry and USE debug handling.

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

4 files changed, 40 insertions, 26 deletions

diff --git a/media-gfx/gimmage/ChangeLog b/media-gfx/gimmage/ChangeLog
index 6b830c2115e9..1fdbbbff4b96 100644
--- a/media-gfx/gimmage/ChangeLog
+++ b/media-gfx/gimmage/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for media-gfx/gimmage
-# Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-gfx/gimmage/ChangeLog,v 1.12 2008/11/30 17:51:59 maekke Exp $
+# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/gimmage/ChangeLog,v 1.13 2010/08/06 17:48:47 ssuominen Exp $
+
+  06 Aug 2010; Samuli Suominen <ssuominen@gentoo.org> gimmage-0.2.3.ebuild,
+  +files/gimmage-0.2.3-desktop-entry.patch:
+  Fix desktop entry and USE debug handling.
 
   30 Nov 2008; Markus Meier <maekke@gentoo.org>
   +files/gimmage-0.2.3-as-needed.patch, gimmage-0.2.3.ebuild:
diff --git a/media-gfx/gimmage/Manifest b/media-gfx/gimmage/Manifest
index d1752b98ce2a..ebe550010c8d 100644
--- a/media-gfx/gimmage/Manifest
+++ b/media-gfx/gimmage/Manifest
@@ -1,16 +1,7 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
 AUX gimmage-0.2.3-as-needed.patch 454 RMD160 f1c63300f82c854dae63d3e3f598861157816974 SHA1 289a418dfc823fa839ec8be8e4374389e7d618b1 SHA256 fe3cfc536cdf8feacad22642f2a12f8389123f50a110a4c5ea06a1da57bdc681
+AUX gimmage-0.2.3-desktop-entry.patch 950 RMD160 c152c18403c1eecc8a43f47f3afb3010600574a4 SHA1 ddcb51f24316cc863cd1a1f16317c8e5b608fa40 SHA256 05df00da5d4e17fbced4b100493047a502ba088b1370a5c3fa5232ddd7e226ad
 AUX gimmage-0.2.3-gcc43.patch 304 RMD160 bacef4e79fd289200b8c4f0714dc5326365cfd3b SHA1 f1751dc5ae54f7abfd86e3353d3459a549a99f1c SHA256 65f9f65c8cdf8d25ac397e752722e2c537c95c025f742c8f9810d867cb7a3e3c
 DIST gimmage-0.2.3.tar.gz 193777 RMD160 d3fd105390e21548cf9c83b199681b53616f3640 SHA1 732dee063553b787b65a0a5bd3d207bdb5d01df1 SHA256 3d5ce3c3fd22efc9fd930e97e33e2c13a755e0a9cf099d12d5f7ecf92cab907b
-EBUILD gimmage-0.2.3.ebuild 869 RMD160 a3281867cc549efed422652699d10d7f0f64df7f SHA1 955e0a0e94899999e3445076bb3333493ce7c170 SHA256 e01a26fdf2acc40ce7f148f29f90262553c65ba5da280690300590be9bc3b42e
-MISC ChangeLog 1745 RMD160 bd49ead067783accac9d68d3063d3e3e61c2c597 SHA1 c2e5fa959cf43b7fc3dab5dde494302a40b2b852 SHA256 6a17ce3129295df2ebc5e4b15a0bb9556339be4f29c15dede793c7a1c995b202
+EBUILD gimmage-0.2.3.ebuild 940 RMD160 03e545e652f5eaed4b59f31454d09a79d3debe29 SHA1 85966c5ddc275cb51a4d928905172ce45ee54ef0 SHA256 556c93f345e9a3dfb21c1194a026c1e4e064c2943f0f3dda578176923b5ac9c3
+MISC ChangeLog 1913 RMD160 8b4de810699e08361648f8ccff3bd4b6b10ad454 SHA1 1bcb3457d540ddc63e56fb3d70969832d519e568 SHA256 a12d664975ff90952e700dd5eacb5ecaf26ce58b0dc4faed104dc2c293f634ed
 MISC metadata.xml 245 RMD160 c9fe33a9ae20f7617aa8a487483da2658de85bb7 SHA1 1c9c5c6d13fed7e85498b05512ab4f5b156b17dd SHA256 5a9749807b4d8cc7acd94cfd2edec77b1f69b83d18a9ea3be922977fc85d525e
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.9 (GNU/Linux)
-
-iEYEARECAAYFAkky0v4ACgkQkKaRLQcq0GLCjACgl1MTRllggDw90oqmpbL35RFg
-LZsAoJ+Ev+jBlcxNaxEKwzifJzcq68KL
-=DuNf
------END PGP SIGNATURE-----
diff --git a/media-gfx/gimmage/files/gimmage-0.2.3-desktop-entry.patch b/media-gfx/gimmage/files/gimmage-0.2.3-desktop-entry.patch
new file mode 100644
index 000000000000..c80b43d0b293
--- /dev/null
+++ b/media-gfx/gimmage/files/gimmage-0.2.3-desktop-entry.patch
@@ -0,0 +1,16 @@
+diff -ur gimmage-0.2.3.orig/gimmage.desktop.in gimmage-0.2.3/gimmage.desktop.in
+--- gimmage-0.2.3.orig/gimmage.desktop.in	2007-06-27 00:22:57.000000000 +0300
++++ gimmage-0.2.3/gimmage.desktop.in	2010-08-06 20:42:55.000000000 +0300
+@@ -1,8 +1,8 @@
+ [Desktop Entry]
+ Name=gimmage
+ Exec=@prefix@/bin/gimmage
+-Icon=gimmage.png
++Icon=gimmage
+ Type=Application
+-Categories=Application;Graphics;
++Categories=Graphics;
+ Comment=A simple image viewer.
+-MimeType=image/bmp;image/gif;image/jpeg;image/jpg;image/png;image/tiff;image/x-bmp;image/x-pcx;image/x-tga;image/x-portable-pixmap;image/x-portable-bitmap;image/x-targa;image/x-portable-greymap;application/pcx;image/svg+xml;image/svg-xml
+\ No newline at end of file
++MimeType=image/bmp;image/gif;image/jpeg;image/jpg;image/png;image/tiff;image/x-bmp;image/x-pcx;image/x-tga;image/x-portable-pixmap;image/x-portable-bitmap;image/x-targa;image/x-portable-greymap;application/pcx;image/svg+xml;image/svg-xml;
diff --git a/media-gfx/gimmage/gimmage-0.2.3.ebuild b/media-gfx/gimmage/gimmage-0.2.3.ebuild
index 5951000ef6b3..11869f91b330 100644
--- a/media-gfx/gimmage/gimmage-0.2.3.ebuild
+++ b/media-gfx/gimmage/gimmage-0.2.3.ebuild
@@ -1,8 +1,9 @@
-# Copyright 1999-2008 Gentoo Foundation
+# Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-gfx/gimmage/gimmage-0.2.3.ebuild,v 1.6 2008/11/30 17:51:59 maekke Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/gimmage/gimmage-0.2.3.ebuild,v 1.7 2010/08/06 17:48:47 ssuominen Exp $
 
-inherit eutils autotools
+EAPI=2
+inherit autotools eutils
 
 DESCRIPTION="A slim GTK-based image browser"
 HOMEPAGE="http://gimmage.berlios.de/"
@@ -21,19 +22,21 @@ DEPEND="${RDEPEND}
 	sys-devel/gettext
 	dev-util/pkgconfig"
 
-src_unpack() {
-	unpack ${A}
-	cd "${S}"
-	epatch "${FILESDIR}"/${P}-gcc43.patch
-	epatch "${FILESDIR}"/${P}-as-needed.patch
+src_prepare() {
+	epatch "${FILESDIR}"/${P}-gcc43.patch \
+		"${FILESDIR}"/${P}-as-needed.patch \
+		"${FILESDIR}"/${P}-desktop-entry.patch
 	eautoreconf
 }
 
-src_compile() {
-	econf $(use_enable debug) || die "econf failed"
-	emake || die "emake failed"
+src_configure() {
+	local myconf
+	use debug && myconf="--enable-debug"
+
+	econf ${myconf}
 }
 
 src_install() {
-	einstall || die "einstall failed"
+	emake DESTDIR="${D}" install || die
+	dodoc AUTHORS ChangeLog NEWS README THANKS TODO
 }