Ensure x11-libs/wxGTK has USE="X" enabled wrt #407267 and Use system libminizip and libunrar wrt #407269 by Piotr Szymaniak. Remove redudant Comment= from desktop entry. Use CXX and CXXFLAGS instead of CC and CFLAGS for g++. Stop using LDFLAGS for passing libraries and use LDLIBS instead. Install 128x128 icon to hicolor directory and run icon cache update.

Package-Manager: portage-2.2.0_alpha110/cvs/Linux x86_64

5 files changed, 168 insertions, 9 deletions

diff --git a/media-gfx/comical/ChangeLog b/media-gfx/comical/ChangeLog
index 461221ef722d..53a186b578b9 100644
--- a/media-gfx/comical/ChangeLog
+++ b/media-gfx/comical/ChangeLog
@@ -1,6 +1,16 @@
 # ChangeLog for media-gfx/comical
-# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-gfx/comical/ChangeLog,v 1.15 2010/10/26 16:13:16 dirtyepic Exp $
+# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/comical/ChangeLog,v 1.16 2012/06/16 12:47:31 ssuominen Exp $
+
+*comical-0.8-r3 (16 Jun 2012)
+
+  16 Jun 2012; Samuli Suominen <ssuominen@gentoo.org> +comical-0.8-r3.ebuild,
+  +files/comical-0.8-syslibs.patch, files/comical.desktop:
+  Ensure x11-libs/wxGTK has USE="X" enabled wrt #407267 and Use system
+  libminizip and libunrar wrt #407269 by Piotr Szymaniak. Remove redudant
+  Comment= from desktop entry. Use CXX and CXXFLAGS instead of CC and CFLAGS
+  for g++. Stop using LDFLAGS for passing libraries and use LDLIBS instead.
+  Install 128x128 icon to hicolor directory and run icon cache update.
 
   26 Oct 2010; Ryan Hill <dirtyepic@gentoo.org> -comical-0.8.ebuild,
   -comical-0.8-r1.ebuild:
diff --git a/media-gfx/comical/Manifest b/media-gfx/comical/Manifest
index 5e2205406b11..8f1b8e18eccc 100644
--- a/media-gfx/comical/Manifest
+++ b/media-gfx/comical/Manifest
@@ -1,16 +1,22 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA1
 
+AUX comical-0.8-syslibs.patch 2254 RMD160 c13b684d375e654f672145478c39559948fcf71e SHA1 af8280f57896b6488a1ca47abbf458e27187bf90 SHA256 3de0b4984652d20a849d5e64d78816981c004d0e7f61a5ef4a8fa82227634ce2
 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
+AUX comical.desktop 194 RMD160 37b31e0c3857958bc9000dec1206ac68006eb053 SHA1 63e37e666e40c4850e051f127b14c9cc45f68985 SHA256 db91ae35ceeeb5ee3aca9f4bb1426fc9d12860caccc0fba5158f784de54984bd
 DIST comical-0.8.tar.gz 480270 RMD160 9d5998b0a1b62c3ed1f3049e942b58e261bfbe03 SHA1 97e8b0f4e48f34e1816c8d75b98f26092042012d SHA256 0b6527cc06b25a937041f1eb248d0fd881cf055362097036b939817f785ab85e
 EBUILD comical-0.8-r2.ebuild 1334 RMD160 f45e3fe7bce5980cae36860c6c27fd126184186e SHA1 4156bf46e94466fa850ee842ebb05bfa1720bc92 SHA256 059e3c1eeda3eb7893b10e13a69e1053f3ce0d31b12a064de2b2cac39342ef9b
-MISC ChangeLog 1990 RMD160 7702750d7347b2e76b2544063bbae00e9cb55e89 SHA1 0fc0c1a416f71fd0bb8195491a151d3f5082f7ae SHA256 7a6625cf53573d9922342806656893eb61616c7b3546e91c968a2ffb29d71ba0
+EBUILD comical-0.8-r3.ebuild 1255 RMD160 5dae9da407b1a5476fd0fd44116ef3ae2cb4752d SHA1 e1b82f520b49bdfb096603230a56c2d6bdc776cb SHA256 12e01ea37f8d1d74160b22b4f9694559c71bd3a2e4b462e1a37fc9a127b232e7
+MISC ChangeLog 2528 RMD160 86deb42466f004a6e65720ecda4071559d27f91f SHA1 ff5ebf20a6f6a12fd6fe74bdfd767d6c4d1ddf94 SHA256 9a08862cc54cdf0ff8e0cc06c5c905445df50406095a7de0bb389eebfd9b3a6d
 MISC metadata.xml 257 RMD160 052d84ab0f92699d09e632e812b93caec1d19636 SHA1 1273c0b569d487a086e46c6d97e7274ff219c552 SHA256 dde9fa2a4bd878be33e27e9e44b2828a606872e21871c4677d0439b9d7abc7a3
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.16 (GNU/Linux)
+Version: GnuPG v2.0.19 (GNU/Linux)
 
-iEYEARECAAYFAkzG/z0ACgkQiqiDRvmkBmLbTACghq5AIE6q9QB+aR5hzm03WsFL
-910An2RxHJr2AxaK/bC01QjNC5rdtJ/Q
-=egEs
+iQEcBAEBAgAGBQJP3H9kAAoJEEdUh39IaPFNDxAH/3f2QW8rbh2YJKNss29mh2TT
+nfWp9C5WbTTCO1/mG+FYZaX1PLXdfaEU9z1On9nElEVw8QtXqBurdjj//jJjj/sD
+PFC7YwJnP+JL+dBjv2O1TBtjpDALlaseybmMZdepJM1SA7mox8RYAJMAu9GJ4EN7
+9h2S8RJaarFZdOvxHUSJXMR5XFBkTDZiywyOhNDzM6sKR9B3CAFillxW/GWeT+is
+liRjQsdioobxMfX67u8tzOzxxUtw2wTbNtYtf6YKHUOAAZNjMTn7pYkpR3CPK0wO
+erl2YC2go7SG5pr4CGwPT5XnVtWyrWfZTng4aF4a00VriSF4tSWHOXmQu/+EMxI=
+=DC+n
 -----END PGP SIGNATURE-----
diff --git a/media-gfx/comical/comical-0.8-r3.ebuild b/media-gfx/comical/comical-0.8-r3.ebuild
new file mode 100644
index 000000000000..21784106e909
--- /dev/null
+++ b/media-gfx/comical/comical-0.8-r3.ebuild
@@ -0,0 +1,53 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/comical/comical-0.8-r3.ebuild,v 1.1 2012/06/16 12:47:31 ssuominen Exp $
+
+EAPI=4
+inherit eutils gnome2-utils toolchain-funcs 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"
+SLOT="0"
+KEYWORDS="~amd64 ~x86 ~x86-fbsd"
+IUSE=""
+
+RDEPEND=">=app-arch/unrar-4.1.4-r2
+	sys-libs/zlib[minizip]
+	x11-libs/wxGTK:2.8[X]"
+DEPEND="${RDEPEND}
+	virtual/pkgconfig"
+
+src_prepare() {
+	export WX_GTK_VER=2.8
+	need-wxwidgets unicode
+
+	epatch \
+		"${FILESDIR}"/${P}-wxGTK-2.8.patch \
+		"${FILESDIR}"/${P}-syslibs.patch
+
+	sed -i -e "s:wx-config:${WX_CONFIG}:" {.,src}/Makefile || die
+
+	rm -rf un{rar,zip}
+}
+
+src_compile() {
+	tc-export CXX
+	emake -j1
+}
+
+src_install() {
+	dobin ${PN}
+	dodoc AUTHORS ChangeLog README TODO
+
+	doicon 'Comical Icons'/${PN}.xpm
+	doicon -s 128 'Comical Icons'/${PN}.png
+
+	domenu "${FILESDIR}"/${PN}.desktop
+}
+
+pkg_preinst() {	gnome2_icon_savelist; }
+pkg_postinst() { gnome2_icon_cache_update; }
+pkg_postrm() { gnome2_icon_cache_update; }
diff --git a/media-gfx/comical/files/comical-0.8-syslibs.patch b/media-gfx/comical/files/comical-0.8-syslibs.patch
new file mode 100644
index 000000000000..e831bc82c4a7
--- /dev/null
+++ b/media-gfx/comical/files/comical-0.8-syslibs.patch
@@ -0,0 +1,91 @@
+Use system libminizip (zlib) wrt http://bugs.gentoo.org/407269.
+Use system libunrar. Use CXX and CXXFLAGS instead of CC and CFLAGS for g++.
+Stop using passing libraries from LDFLAGS and use LDLIBS instead.
+
+--- Makefile
++++ Makefile
+@@ -1,5 +1,5 @@
+-CC = `wx-config --cxx`
+-LDFLAGS = `wx-config --libs` -Lunrar -lunrar -Lunzip -lminiunzip
++CXX ?= `wx-config --cxx`
++LDLIBS = `wx-config --libs` -lunrar `pkg-config --libs minizip`
+ INSTALL = install
+ INSTALL_PROGRAM = $(INSTALL)
+ prefix = /usr/local
+@@ -12,18 +12,12 @@
+ 
+ all: comical
+ 
+-comical: $(OBJS) unrar/libunrar.a unzip/libminiunzip.a
+-	$(CC) -o $@ $(OBJS) $(LDFLAGS)
++comical: $(OBJS)
++	$(CXX) $(LDFLAGS) $(CXXFLAGS) -o $@ $(OBJS) $(LDLIBS)
+ 
+ $(OBJS):
+ 	$(MAKE) -C src
+ 
+-unrar/libunrar.a:
+-	$(MAKE) lib -C unrar -f makefile.linux
+-
+-unzip/libminiunzip.a:
+-	$(MAKE) -C unzip
+-
+ install: comical
+ 	$(INSTALL_PROGRAM) comical $(DESTDIR)$(bindir)/comical
+ 
+@@ -39,8 +33,6 @@
+ 
+ distclean:
+ 	$(MAKE) clean
+-	$(MAKE) clean -C unrar -f makefile.linux
+-	$(MAKE) clean -C unzip
+ 	rm -f $(DEPS) bin2h src/bin2h.o
+ 
+ .PHONY : install install-strip uninstall clean distclean
+--- src/ComicBookRAR.h
++++ src/ComicBookRAR.h
+@@ -29,7 +29,7 @@
+ #define _ComicBookRAR_h_
+ 
+ #include "ComicBook.h"
+-#include "dll.hpp"
++#include <dll.hpp>
+  
+ class ComicBookRAR : public ComicBook {
+ 
+--- src/ComicBookZIP.cpp
++++ src/ComicBookZIP.cpp
+@@ -27,7 +27,7 @@
+ 
+ #include "ComicBookZIP.h"
+ #include <wx/mstream.h>
+-#include "unzip.h"
++#include <unzip.h>
+ #include "Exceptions.h"
+ #include <cstring>
+ #include <errno.h>
+--- src/Makefile
++++ src/Makefile
+@@ -1,6 +1,5 @@
+-INCLUDE = -I../unrar -I../unzip
+-CFLAGS = -O2 -Wall -pipe
+-CPPFLAGS = `wx-config --cxxflags` $(CFLAGS) -D_UNIX $(INCLUDE)
++CXXFLAGS += -Wall `wx-config --cxxflags` `pkg-config --cflags minizip` -I/usr/include/libunrar
++CPPFLAGS += -D_UNIX $(CXXFLAGS)
+ 
+ .SUFFIXES: .cpp .png .h .d .o
+ 
+@@ -21,11 +20,11 @@
+ 	@echo -e "};\n\n#endif" >> $@
+ 
+ %.o : %.cpp
+-	$(CC) $(CPPFLAGS) -c -o $*.o $<
++	$(CXX) $(CPPFLAGS) -c -o $*.o $<
+ 
+ %.d : %.cpp
+ 	@set -e; rm -f $@; \
+-	 $(CC) -MM -MG $(CPPFLAGS) -MT '$*.o' $< > $@.$$$$; \
++	 $(CXX) -MM -MG $(CPPFLAGS) -MT '$*.o' $< > $@.$$$$; \
+ 	 sed 's,\($*\)\.o[ :]*,\1.o $@ : ,g' < $@.$$$$ > $@; \
+ 	 rm -f $@.$$$$
+ 
diff --git a/media-gfx/comical/files/comical.desktop b/media-gfx/comical/files/comical.desktop
index ec38b99e27f6..14a3a08e8202 100644
--- a/media-gfx/comical/files/comical.desktop
+++ b/media-gfx/comical/files/comical.desktop
@@ -1,7 +1,6 @@
 [Desktop Entry]
 Name=Comical
 GenericName=Comic Book Reader
-Comment=Comic book reader
 Exec=comical %F
 Icon=comical
 Type=Application