add .desktop file by Jared in bug #295611; general ebuild improvements

Package-Manager: portage-2.2_rc59/cvs/Linux i686

4 files changed, 70 insertions, 6 deletions

diff --git a/media-gfx/comical/ChangeLog b/media-gfx/comical/ChangeLog
index 3f4da16d9421..76546ca2448b 100644
--- a/media-gfx/comical/ChangeLog
+++ b/media-gfx/comical/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for media-gfx/comical
 # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-gfx/comical/ChangeLog,v 1.9 2009/11/25 22:16:00 maekke Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/comical/ChangeLog,v 1.10 2009/12/16 22:23:42 maekke Exp $
+
+*comical-0.8-r1 (16 Dec 2009)
+
+  16 Dec 2009; Markus Meier <maekke@gentoo.org> +comical-0.8-r1.ebuild,
+  +files/comical.desktop:
+  add .desktop file by Jared in bug #295611; general ebuild improvements
 
   25 Nov 2009; Markus Meier <maekke@gentoo.org> comical-0.8.ebuild:
   amd64 stable, bug #286321
diff --git a/media-gfx/comical/Manifest b/media-gfx/comical/Manifest
index 664c4eed1ad1..cc4cdecfd556 100644
--- a/media-gfx/comical/Manifest
+++ b/media-gfx/comical/Manifest
@@ -1,14 +1,16 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA1
 
+AUX comical.desktop 251 RMD160 f416de0a2ba04a48243733ad6f944f428d668bab SHA1 1c5cf613208951f2d688e6f7bf794dd3c1805ea4 SHA256 cf2632aec420737eb08d4364d513b7c9731dd8e06460b2d0296487b5aefa0649
 DIST comical-0.8.tar.gz 480270 RMD160 9d5998b0a1b62c3ed1f3049e942b58e261bfbe03 SHA1 97e8b0f4e48f34e1816c8d75b98f26092042012d SHA256 0b6527cc06b25a937041f1eb248d0fd881cf055362097036b939817f785ab85e
+EBUILD comical-0.8-r1.ebuild 1281 RMD160 d7b0b728a0f34048fbc148dba3259b2a1a6d73a0 SHA1 3772a194c3a1c1eba8ecd03ac01274d9d4c63270 SHA256 fc72ece75283476fa2d431ea6cc12981bc819cb49d76d862f930ce5ac078d411
 EBUILD comical-0.8.ebuild 1146 RMD160 e629dfcdee662142c18154bad8d4cf3b8a8c8378 SHA1 5ed4be5d7028ae952f836f81c7e328f9df5a0ae1 SHA256 d1f0ae4d8f27739f911c16e9505501bdffa7b402676bad9b28623d098702343f
-MISC ChangeLog 1171 RMD160 bac82d5998eba38b4eb68e82fa538dc101387017 SHA1 22e83a2dabdd84062661173cbf14ef8abaf72e8e SHA256 f574d0cd2798d25730ab6896ca7439a5e0082db6e721cba95ed5550c9dbff584
+MISC ChangeLog 1375 RMD160 1e00d54aa510994754b6e600ed4206fa472ce69e SHA1 a56614b9fd3025ed2025628bd45824ec2a2248cb SHA256 f97f4bfc33dc17c113230a87e9fd740642db5c09ed1f2bf226f70512319986ef
 MISC metadata.xml 257 RMD160 052d84ab0f92699d09e632e812b93caec1d19636 SHA1 1273c0b569d487a086e46c6d97e7274ff219c552 SHA256 dde9fa2a4bd878be33e27e9e44b2828a606872e21871c4677d0439b9d7abc7a3
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.11 (GNU/Linux)
+Version: GnuPG v2.0.13 (GNU/Linux)
 
-iEYEARECAAYFAksNrLEACgkQkKaRLQcq0GKL/ACfaYAxGADfkzMjFbchHhVv2aAp
-DswAn0rKlEhi6azhRyHCHRAN79NNSr+9
-=S90F
+iEYEARECAAYFAkspXkQACgkQkKaRLQcq0GIrTwCcDmlF7P4LJSESgoE0J/DWJLEw
+slUAnRwSQ15TLQW5PFxcrYgZHAYWO1hw
+=P3lX
 -----END PGP SIGNATURE-----
diff --git a/media-gfx/comical/comical-0.8-r1.ebuild b/media-gfx/comical/comical-0.8-r1.ebuild
new file mode 100644
index 000000000000..2bca49c38cee
--- /dev/null
+++ b/media-gfx/comical/comical-0.8-r1.ebuild
@@ -0,0 +1,45 @@
+# Copyright 1999-2009 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/comical/comical-0.8-r1.ebuild,v 1.1 2009/12/16 22:23:42 maekke Exp $
+
+EAPI=2
+
+inherit wxwidgets
+
+DESCRIPTION="Comical is a sequential image display program, to deal with .cbr and .cbz files"
+HOMEPAGE="http://comical.sourceforge.net/"
+SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
+
+LICENSE="GPL-2 unRAR"
+SLOT="0"
+KEYWORDS="~amd64 ~x86 ~x86-fbsd"
+DEPEND="x11-libs/wxGTK:2.6"
+RDEPEND="${DEPEND}"
+IUSE=""
+
+src_prepare() {
+	export WX_GTK_VER="2.6"
+	need-wxwidgets unicode
+
+	# Fix Makefiles
+	# replace wx-config for wx-config-2.6
+	sed -i -e "s:wx-config:${WX_CONFIG}:" Makefile src/Makefile
+	# CFLAGS
+	sed -i -e "s:CFLAGS = -O2 -Wall -pipe:CFLAGS = ${CFLAGS}:" src/Makefile
+	sed -i -e "s:CXXFLAGS=-O2 -fPIC:CXXFLAGS = ${CXXFLAGS} -fPIC:" unrar/makefile.linux
+	sed -i -e "s:CFLAGS=-Os:CFLAGS = ${CFLAGS}:" unzip/Makefile
+}
+
+src_compile() {
+	# Parallel build doesn't work.
+	emake -j1 || die "emake failed"
+}
+
+src_install() {
+	dobin comical || die
+	dodoc AUTHORS ChangeLog README TODO
+	insinto /usr/share/pixmaps
+	doins "${S}/Comical Icons/${PN}.xpm" || die
+	insinto /usr/share/applications
+	doins "${FILESDIR}/${PN}.desktop" || die
+}
diff --git a/media-gfx/comical/files/comical.desktop b/media-gfx/comical/files/comical.desktop
new file mode 100644
index 000000000000..f3c7fc3f8e11
--- /dev/null
+++ b/media-gfx/comical/files/comical.desktop
@@ -0,0 +1,11 @@
+[Desktop Entry]
+Name=Comical
+GenericName=Comic Book Reader
+Comment=Comic book reader
+Exec=comical %F
+Icon=comical.xpm
+Type=Application
+Terminal=false
+Encoding=UTF-8
+Categories=Application;Graphics;Viewer;
+MimeType=application/x-cbr;application/x-cbz;