Fix building with --as-needed for bug 187697, thanks to Christian Lemke for reporting. Fix .desktop file Categories.

(Portage version: 2.1.3.6)

5 files changed, 40 insertions, 58 deletions

diff --git a/x11-misc/qcomicbook/ChangeLog b/x11-misc/qcomicbook/ChangeLog
index 30372a587e44..88cdebf1d0b8 100644
--- a/x11-misc/qcomicbook/ChangeLog
+++ b/x11-misc/qcomicbook/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for x11-misc/qcomicbook
-# Copyright 1999-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-misc/qcomicbook/ChangeLog,v 1.14 2006/12/29 22:47:11 troll Exp $
+# Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/x11-misc/qcomicbook/ChangeLog,v 1.15 2007/08/21 18:50:13 drac Exp $
+
+  21 Aug 2007; Samuli Suominen <drac@gentoo.org>
+  +files/qcomicbook-0.3.4-asneeded.patch, qcomicbook-0.3.4.ebuild:
+  Fix building with --as-needed for bug 187697, thanks to Christian Lemke for
+  reporting. Fix .desktop file Categories.
 
 *qcomicbook-0.3.4 (29 Dec 2006)
 
diff --git a/x11-misc/qcomicbook/files/digest-qcomicbook-0.3.3 b/x11-misc/qcomicbook/files/digest-qcomicbook-0.3.3
deleted file mode 100644
index 6761023a403d..000000000000
--- a/x11-misc/qcomicbook/files/digest-qcomicbook-0.3.3
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 a52b768ccca632a820094739e6aaec36 qcomicbook-0.3.3.tar.gz 394293
-RMD160 7378ed5cb7e68c87e196155387267d0d86962a2c qcomicbook-0.3.3.tar.gz 394293
-SHA256 70ff6742c064bce34dfb5657a4dc7fd5397a9628ba4682a40679e6332fbe3a5a qcomicbook-0.3.3.tar.gz 394293
diff --git a/x11-misc/qcomicbook/files/qcomicbook-0.3.4-asneeded.patch b/x11-misc/qcomicbook/files/qcomicbook-0.3.4-asneeded.patch
new file mode 100644
index 000000000000..afaf4c1e7d89
--- /dev/null
+++ b/x11-misc/qcomicbook/files/qcomicbook-0.3.4-asneeded.patch
@@ -0,0 +1,12 @@
+diff -ur qcomicbook-0.3.4.orig/src/Makefile.am qcomicbook-0.3.4/src/Makefile.am
+--- qcomicbook-0.3.4.orig/src/Makefile.am	2006-08-15 15:34:04.000000000 +0300
++++ qcomicbook-0.3.4/src/Makefile.am	2007-08-21 21:31:59.000000000 +0300
+@@ -71,7 +71,7 @@
+ 		 
+ MOSTLYCLEANFILES =+ $(BUILT_SOURCES)
+ 
+-qcomicbook_LDFLAGS = $(QT_LIBS) $(Imlib2_LIBS)
++qcomicbook_LDADD = $(QT_LIBS) $(Imlib2_LIBS)
+ qcomicbook_CPPFLAGS = -DDATADIR=\"$(datadir)/qcomicbook/\" -DQT_THREAD_SUPPORT $(QT_CXXFLAGS) $(Imlib2_CFLAGS)
+ qcomicbook_CXXFLAGS = $(qcomicbook_CPPFLAGS)
+ 
diff --git a/x11-misc/qcomicbook/qcomicbook-0.3.3.ebuild b/x11-misc/qcomicbook/qcomicbook-0.3.3.ebuild
deleted file mode 100644
index 8a0e99c3f5fc..000000000000
--- a/x11-misc/qcomicbook/qcomicbook-0.3.3.ebuild
+++ /dev/null
@@ -1,36 +0,0 @@
-# Copyright 1999-2006 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-misc/qcomicbook/qcomicbook-0.3.3.ebuild,v 1.2 2006/10/22 22:08:50 omp Exp $
-
-inherit eutils qt3
-
-DESCRIPTION="A viewer for comic book archives containing jpeg/png images."
-HOMEPAGE="http://linux.bydg.org/~yogin/"
-SRC_URI="http://linux.bydg.org/~yogin/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~ppc ~x86"
-IUSE=""
-
-DEPEND="$(qt_min_version 3.3)
-	media-libs/imlib2"
-RDEPEND="${DEPEND}
-	|| ( app-arch/unrar app-arch/rar )
-	app-arch/zip"
-
-src_compile() {
-	econf --with-Qt-dir="${QTDIR}" || die "econf failed"
-	emake || die "emake failed"
-}
-
-src_install() {
-	make DESTDIR="${D}" install || die "make install failed"
-
-	# makes a pretty desktop icon and such
-	dodir /usr/share/pixmaps
-	cp icons/${PN}.png "${D}/usr/share/pixmaps"
-	make_desktop_entry qcomicbook
-
-	dodoc README TODO ChangeLog AUTHORS
-}
diff --git a/x11-misc/qcomicbook/qcomicbook-0.3.4.ebuild b/x11-misc/qcomicbook/qcomicbook-0.3.4.ebuild
index 651e89dc5a77..dc6bb8c03184 100644
--- a/x11-misc/qcomicbook/qcomicbook-0.3.4.ebuild
+++ b/x11-misc/qcomicbook/qcomicbook-0.3.4.ebuild
@@ -1,11 +1,11 @@
-# Copyright 1999-2006 Gentoo Foundation
+# Copyright 1999-2007 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-misc/qcomicbook/qcomicbook-0.3.4.ebuild,v 1.1 2006/12/29 22:47:11 troll Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-misc/qcomicbook/qcomicbook-0.3.4.ebuild,v 1.2 2007/08/21 18:50:13 drac Exp $
 
-inherit eutils qt3
+inherit autotools eutils qt3
 
 DESCRIPTION="A viewer for comic book archives containing jpeg/png images."
-HOMEPAGE="http://linux.bydg.org/~yogin/"
+HOMEPAGE="http://linux.bydg.org/~yogin"
 SRC_URI="http://linux.bydg.org/~yogin/${P}.tar.gz"
 
 LICENSE="GPL-2"
@@ -13,24 +13,28 @@ SLOT="0"
 KEYWORDS="~amd64 ~ppc ~x86"
 IUSE=""
 
-DEPEND="$(qt_min_version 3.3)
-	media-libs/imlib2"
-RDEPEND="${DEPEND}
+RDEPEND="$(qt_min_version 3.3)
+	media-libs/imlib2
 	|| ( app-arch/unrar app-arch/rar )
 	app-arch/zip"
+DEPEND="${RDEPEND}"
+
+src_unpack() {
+	unpack ${A}
+	cd "${S}"
+	epatch "${FILESDIR}"/${P}-asneeded.patch
+	eautoreconf
+}
 
 src_compile() {
-	econf --with-Qt-dir="${QTDIR}" || die "econf failed"
-	emake || die "emake failed"
+	econf --with-Qt-dir="${QTDIR}"
+	emake || die "emake failed."
 }
 
 src_install() {
-	make DESTDIR="${D}" install || die "make install failed"
-
-	# makes a pretty desktop icon and such
-	dodir /usr/share/pixmaps
-	cp icons/${PN}.png "${D}/usr/share/pixmaps"
-	make_desktop_entry qcomicbook
-
-	dodoc README TODO ChangeLog AUTHORS
+	emake DESTDIR="${D}" install || die "emake install failed."
+	dodoc AUTHORS ChangeLog NEWS README THANKS TODO
+	doicon icons/${PN}.png
+	make_desktop_entry ${PN} "QComicBook" \
+		${PN}.png "Graphics;Viewer;Amusement;Qt"
 }