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

Package-Manager: portage-2.1.3.6

6 files changed, 52 insertions, 84 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/Manifest b/x11-misc/qcomicbook/Manifest
index 69364dbdc4e0..c7270b09ece8 100644
--- a/x11-misc/qcomicbook/Manifest
+++ b/x11-misc/qcomicbook/Manifest
@@ -1,25 +1,21 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
+AUX qcomicbook-0.3.4-asneeded.patch 548 RMD160 559de4c2c8008289e4646acb4305acd17ef64dc1 SHA1 8e27f8178dbf45f70dd6b9645d12627474908fb0 SHA256 be041439c02e8086ca2c35f8909d2b53134965d85c86993059153af017aca5ed
+MD5 22b7af1365fa54fa07e5f5fc3d754b08 files/qcomicbook-0.3.4-asneeded.patch 548
+RMD160 559de4c2c8008289e4646acb4305acd17ef64dc1 files/qcomicbook-0.3.4-asneeded.patch 548
+SHA256 be041439c02e8086ca2c35f8909d2b53134965d85c86993059153af017aca5ed files/qcomicbook-0.3.4-asneeded.patch 548
 DIST qcomicbook-0.2.4.tar.gz 196691 RMD160 ec6f3264520bfc08473ff534cc60a1323cf3da4f SHA1 d2da9fcc70673e559bcd1272e1103646389a4f58 SHA256 a07ea4febca3b2ff6e38d7d56d954adcf3984b4dd93458e48d29422a1faa570e
-DIST qcomicbook-0.3.3.tar.gz 394293 RMD160 7378ed5cb7e68c87e196155387267d0d86962a2c SHA1 d6d63141f566e68ecd34ffb2b5a9efec5799898e SHA256 70ff6742c064bce34dfb5657a4dc7fd5397a9628ba4682a40679e6332fbe3a5a
 DIST qcomicbook-0.3.4.tar.gz 384681 RMD160 86c00ece34847fd9f51555ceb7dc767c2b7f6e50 SHA1 5fac6ef8c1e69da3c6477130681cbf312eefbfb2 SHA256 7accb599b05b5d5a52b66dde1f3cbb41af8eac8d5bdce0d637f06d348cfdb6a9
 EBUILD qcomicbook-0.2.4.ebuild 933 RMD160 81fb226c7a18a48ac51a6c39704714ad0f4a2081 SHA1 ad040e5f9626127ac58088970e8b78ddd604eec2 SHA256 76319495c1734ece85ef32d87ca92930350a55ab37fb1d58fe56626b9d20f0c9
 MD5 c97759c8a06fceebc4dbb375f5b11e06 qcomicbook-0.2.4.ebuild 933
 RMD160 81fb226c7a18a48ac51a6c39704714ad0f4a2081 qcomicbook-0.2.4.ebuild 933
 SHA256 76319495c1734ece85ef32d87ca92930350a55ab37fb1d58fe56626b9d20f0c9 qcomicbook-0.2.4.ebuild 933
-EBUILD qcomicbook-0.3.3.ebuild 953 RMD160 c563eba69d34d62856fc0d5af5ad500964c3862b SHA1 19341ad10998b65a5b8eb09372eec204f5e24da8 SHA256 e1769d6465b9447b1ac3881697287b947feb52b0a911fc9cd53f019e89cbd8e3
-MD5 8562646f0d8613484f3451bc988b06de qcomicbook-0.3.3.ebuild 953
-RMD160 c563eba69d34d62856fc0d5af5ad500964c3862b qcomicbook-0.3.3.ebuild 953
-SHA256 e1769d6465b9447b1ac3881697287b947feb52b0a911fc9cd53f019e89cbd8e3 qcomicbook-0.3.3.ebuild 953
-EBUILD qcomicbook-0.3.4.ebuild 955 RMD160 d6c958552130fcad3fa4de0856e13663ff6a33a9 SHA1 5c92ff6b69fba257541cd61778917035e51060d5 SHA256 9ed15b43a6ba2adf996c28297447d27c3f05f65658cd56a73e6fb68192b95108
-MD5 b880e48650b504fffd886f3c99df3853 qcomicbook-0.3.4.ebuild 955
-RMD160 d6c958552130fcad3fa4de0856e13663ff6a33a9 qcomicbook-0.3.4.ebuild 955
-SHA256 9ed15b43a6ba2adf996c28297447d27c3f05f65658cd56a73e6fb68192b95108 qcomicbook-0.3.4.ebuild 955
-MISC ChangeLog 2293 RMD160 aab6fb5d7241109af91fe893fb084c42cf95b7fe SHA1 ec49da1e3e9474d0bc1f6e15441a792262e06b6e SHA256 01b32eff3c5965c468e304765d181422c7d0623303b15824a7b85099723afdff
-MD5 188d429ee6d8085bf6d124e9335215f7 ChangeLog 2293
-RMD160 aab6fb5d7241109af91fe893fb084c42cf95b7fe ChangeLog 2293
-SHA256 01b32eff3c5965c468e304765d181422c7d0623303b15824a7b85099723afdff ChangeLog 2293
+EBUILD qcomicbook-0.3.4.ebuild 1019 RMD160 8a79b98f6097b901412d5e20ba266954de9709bd SHA1 451fd535140f2067e225be3df9d7cbe8c37fff93 SHA256 f9fef1a6500c424be135f7a3f8e50467b06ec7beacd05ef5d53dc7c53125c289
+MD5 0114dfa2aad1d31b5a75b55bfd439b74 qcomicbook-0.3.4.ebuild 1019
+RMD160 8a79b98f6097b901412d5e20ba266954de9709bd qcomicbook-0.3.4.ebuild 1019
+SHA256 f9fef1a6500c424be135f7a3f8e50467b06ec7beacd05ef5d53dc7c53125c289 qcomicbook-0.3.4.ebuild 1019
+MISC ChangeLog 2530 RMD160 e20324e5a0afbd054947bf6feec527b4f1e18993 SHA1 18f6a208d64bc38dd42e3e9cda8acb475fdca56b SHA256 49496003ec10b2088e676d98a033eeb66e097d748eb45563b9a22558c16ffc7f
+MD5 165b7977e42f59aed004ea362bc34bc7 ChangeLog 2530
+RMD160 e20324e5a0afbd054947bf6feec527b4f1e18993 ChangeLog 2530
+SHA256 49496003ec10b2088e676d98a033eeb66e097d748eb45563b9a22558c16ffc7f ChangeLog 2530
 MISC metadata.xml 231 RMD160 edee523a81eb20b171a5dd298e8507ecd49230f6 SHA1 f78294e25f7fd11c0954f753892ece303fc491b3 SHA256 f9af69429b315694d8f6094781bf242d6235450fc58aba6e9e35e28099cc334a
 MD5 8dad4c602e8fc48cf21cf32d762b9af0 metadata.xml 231
 RMD160 edee523a81eb20b171a5dd298e8507ecd49230f6 metadata.xml 231
@@ -27,16 +23,6 @@ SHA256 f9af69429b315694d8f6094781bf242d6235450fc58aba6e9e35e28099cc334a metadata
 MD5 73fdbe70c4362cda5f2276c14004b70a files/digest-qcomicbook-0.2.4 250
 RMD160 9d45188cb307f59ffe2fa1f728df05ce3a4b8377 files/digest-qcomicbook-0.2.4 250
 SHA256 183032eb454c5010c0256b2e5592dfbc9766d1971c78e42093639ef5dbbfa86b files/digest-qcomicbook-0.2.4 250
-MD5 d4db8abc18e627bd3bfa2d48cd373b6b files/digest-qcomicbook-0.3.3 250
-RMD160 62e08ef608eb92bcea5b248b62a9742765701cbe files/digest-qcomicbook-0.3.3 250
-SHA256 ec58402871dbd71ccd70293befb8fa9cc547d37997b6cac60dbd581f40186515 files/digest-qcomicbook-0.3.3 250
 MD5 1709594c096e65fb7437c9425dddacf9 files/digest-qcomicbook-0.3.4 250
 RMD160 d483711bdde86c2754cf9d21eb2d60caa3ced34e files/digest-qcomicbook-0.3.4 250
 SHA256 08f2204c4ead768b69c50449d756db8af6325bc1231262b41acac48d1070763a files/digest-qcomicbook-0.3.4 250
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.4.6 (GNU/Linux)
-
-iD8DBQFFlZo9exDpKttj3ykRAgNAAJ9ZLInS+HusHj3RPhPW7VlMhOXLOwCZAUdM
-6lwOEudsOS/aOuPRVBKepZE=
-=id1Z
------END PGP SIGNATURE-----
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"
 }