Migrate to wxGTK-2.8.

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

4 files changed, 74 insertions, 7 deletions

diff --git a/media-gfx/comical/ChangeLog b/media-gfx/comical/ChangeLog
index e4f237d883c4..e447f34ef073 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.11 2009/12/16 22:30:42 maekke Exp $
+# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/comical/ChangeLog,v 1.12 2010/09/05 04:27:45 dirtyepic Exp $
+
+*comical-0.8-r2 (05 Sep 2010)
+
+  05 Sep 2010; Ryan Hill <dirtyepic@gentoo.org> +comical-0.8-r2.ebuild,
+  +files/comical-0.8-wxGTK-2.8.patch:
+  Migrate to wxGTK-2.8.
 
   16 Dec 2009; Markus Meier <maekke@gentoo.org> files/comical.desktop:
   fix .desktop as pointed out by ssuominen
diff --git a/media-gfx/comical/Manifest b/media-gfx/comical/Manifest
index 698d777a1030..075e27376389 100644
--- a/media-gfx/comical/Manifest
+++ b/media-gfx/comical/Manifest
@@ -1,16 +1,18 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA1
 
+AUX comical-0.8-wxGTK-2.8.patch 391 RMD160 b57a027c5437921639a7ef5aa23b05e9a0322b43 SHA1 029c30c1532d6d852710e688be3d5abc7d527f6b SHA256 74a38e4e975a3a7f471a73bcf7ce3657761d0397381777b53e4948c0ba755b44
 AUX comical.desktop 220 RMD160 edddb0a3e5c0f26636552c4146464d13ec91fdbe SHA1 fb8c2d8d200720c4bf12c035ecb5887e0f98e18e SHA256 b26edcfbbc7dc1e71bddd3f8c00408c55fbb28b1bc7214480537615cc05429c6
 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-r2.ebuild 1335 RMD160 518288606da130f06fceb3ad0fea1f2ef9a8292f SHA1 5fdfe56dc313c09a033a86ebcedb0d859327802f SHA256 dadd9dbfcbcf47e213afc26017e5f64d18bb951834dc941be823ae04ce610ec7
 EBUILD comical-0.8.ebuild 1146 RMD160 e629dfcdee662142c18154bad8d4cf3b8a8c8378 SHA1 5ed4be5d7028ae952f836f81c7e328f9df5a0ae1 SHA256 d1f0ae4d8f27739f911c16e9505501bdffa7b402676bad9b28623d098702343f
-MISC ChangeLog 1490 RMD160 4f409a91b66af1f8eba31fefd0f4c10801334acf SHA1 2e69be89c061004c9e9ad40a3949e91a6fb64234 SHA256 48d41f6052e73306c31518f9f810cf724b5aac3a0af2c8a04f4bcbe15d47b2a2
+MISC ChangeLog 1659 RMD160 4def068455a10a1a47a51ad794c39bbe47cfc058 SHA1 a618008446056cdfcdcbcfb456100c20ca7e8a35 SHA256 79a594983563984345f0654049b34991d0f0cc6ab3b41f2a449e35dc66418f46
 MISC metadata.xml 257 RMD160 052d84ab0f92699d09e632e812b93caec1d19636 SHA1 1273c0b569d487a086e46c6d97e7274ff219c552 SHA256 dde9fa2a4bd878be33e27e9e44b2828a606872e21871c4677d0439b9d7abc7a3
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.13 (GNU/Linux)
+Version: GnuPG v2.0.16 (GNU/Linux)
 
-iEYEARECAAYFAkspX+gACgkQkKaRLQcq0GKEOQCfab2WqLVxjv3FFfDKmlny086A
-FqEAoLSuBW7sIIXITk0mFYNnqBks9RAF
-=N+mT
+iEYEARECAAYFAkyDHU0ACgkQiqiDRvmkBmKy7QCePNrTztv8fC5sePJWVrIC2Zm4
+POIAn01bPaZmXc/qfL/cbdSrctiXXj94
+=ZzKh
 -----END PGP SIGNATURE-----
diff --git a/media-gfx/comical/comical-0.8-r2.ebuild b/media-gfx/comical/comical-0.8-r2.ebuild
new file mode 100644
index 000000000000..638374f4c6dc
--- /dev/null
+++ b/media-gfx/comical/comical-0.8-r2.ebuild
@@ -0,0 +1,47 @@
+# Copyright 1999-2010 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/comical/comical-0.8-r2.ebuild,v 1.1 2010/09/05 04:27:45 dirtyepic Exp $
+
+EAPI=2
+
+inherit eutils 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.8"
+RDEPEND="${DEPEND}"
+IUSE=""
+
+src_prepare() {
+	export WX_GTK_VER="2.8"
+	need-wxwidgets unicode
+
+	epatch "${FILESDIR}"/${P}-wxGTK-2.8.patch
+
+	# Fix Makefiles
+	# replace wx-config for wx-config-2.8
+	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-0.8-wxGTK-2.8.patch b/media-gfx/comical/files/comical-0.8-wxGTK-2.8.patch
new file mode 100644
index 000000000000..cecd8aae14fc
--- /dev/null
+++ b/media-gfx/comical/files/comical-0.8-wxGTK-2.8.patch
@@ -0,0 +1,12 @@
+http://comical.svn.sourceforge.net/viewvc/comical/trunk/src/ComicalApp.cpp?r1=170&r2=171
+
+--- a/src/ComicalApp.cpp
++++ b/src/ComicalApp.cpp
+@@ -28,6 +28,7 @@
+ #include "ComicalApp.h"
+ #include "ComicalFrame.h"
+ #include <wx/log.h>
++#include <wx/icon.h>
+ 
+ #if !defined(__WXMAC__) && !defined(__WXCOCOA__) && !defined(__WXMSW__) && !defined(__WXPM__)
+ #include "../Comical Icons/comical.xpm"