Version bump, bug #281954. For case USE=-kde fixed: missed dependency on qt3support and parallel build issue. Thank Patrick Lauer and Andrew Savchenko for tests and reports.

Package-Manager: portage-2.1.6.13/cvs/Linux x86_64

3 files changed, 104 insertions, 12 deletions

diff --git a/app-text/kchmviewer/ChangeLog b/app-text/kchmviewer/ChangeLog
index 6950638cf819..c4bee48691e5 100644
--- a/app-text/kchmviewer/ChangeLog
+++ b/app-text/kchmviewer/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for app-text/kchmviewer
 # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-text/kchmviewer/ChangeLog,v 1.18 2009/10/05 19:25:11 ayoy Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-text/kchmviewer/ChangeLog,v 1.19 2009/10/10 21:33:24 pva Exp $
+
+*kchmviewer-4.1 (10 Oct 2009)
+
+  10 Oct 2009; Peter Volkov <pva@gentoo.org> +kchmviewer-4.1.ebuild:
+  Version bump, bug #281954. For case USE=-kde fixed: missed dependency on
+  qt3support and parallel build issue. Thank Patrick Lauer and Andrew
+  Savchenko for tests and reports.
 
   05 Oct 2009; Dominik Kapusta <ayoy@gentoo.org> kchmviewer-4.0-r1.ebuild:
   Removed alternative dependency on Qt metapackage
diff --git a/app-text/kchmviewer/Manifest b/app-text/kchmviewer/Manifest
index df576ddd672f..bce4247b360d 100644
--- a/app-text/kchmviewer/Manifest
+++ b/app-text/kchmviewer/Manifest
@@ -1,17 +1,9 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
 AUX kchmviewer-3.1_p2-gcc43.patch 496 RMD160 597af1509a949d6710ac63878a46851d774c4424 SHA1 d1aae7dbc5ac1d87d364ef58de857a9a1f90e0d2 SHA256 6157ab84b0cd46814eb2b667c546d2a15a22cc7df760c7000e6f52c3f4cf86dd
 DIST kchmviewer-3.1-2.tar.gz 945640 RMD160 21a38d0cfcf0d7e32b3de6cf34ad0a9ac8019451 SHA1 b89c0f1e56b820de2419e4890efc5537fefc4b1e SHA256 e73b4ec4b1b6decbd2ab82f670b843a12813d74653ebc6859deffb3b48abf6db
 DIST kchmviewer-4.0.tar.gz 225883 RMD160 b097a320ed2c5e7431d02f1382e1124176a50eef SHA1 313f07307ab7157ca65977b60a8417379941db56 SHA256 09f15bcb42bfca0b6eeed6c52408c5c49e944aae36d15816a32860fdaa7b4a38
+DIST kchmviewer-4.1.tar.gz 257818 RMD160 d07546fda972082d51fccb4c3f98f61dabd30036 SHA1 ffb057fb3d614c8cbaf4a7d178aeb1a33d9b0397 SHA256 98977b167466003af1d2b4bf87aa4b8cfcdad6458712f2c06ecd58d4cf191fd3
 EBUILD kchmviewer-3.1_p2-r1.ebuild 1487 RMD160 5d77e4f0567d96510aa43d1a417093d33f230103 SHA1 9302947e8474412b226416f2b850f69039160336 SHA256 1e508c21b81c9f8872c4a305d6d51066111b0dd4a2761bc11dee7acadab86a72
 EBUILD kchmviewer-4.0-r1.ebuild 2257 RMD160 afc85cccf450041d053b4c844a035c921a4bfd5e SHA1 86eb75f7c78c5800d6d4f40969f9c3f84d645486 SHA256 5bebd4db7f515d1553dae41e1746146a427f4e7e5a9515b6f0cc186983686854
-MISC ChangeLog 8667 RMD160 bbbbe9641be230c4673edfeb4bcba286fa6b638a SHA1 d9192b1a097119ff35935ef6fda9dd4a1731ad91 SHA256 73c5c581267890eb2a55951a68d8eca0a1940b6a02b102f200dd93e535def313
+EBUILD kchmviewer-4.1.ebuild 2186 RMD160 151d58863c27f503ec44d8aabd22396ba8d22c67 SHA1 d9f7e35c504eb5478d192eb2282fb4ce66d075b1 SHA256 335ba9b8922a58b7af18808387c9275606eacb509066deb2e19673e5beac52de
+MISC ChangeLog 8947 RMD160 3e405b82493ccfe5d3128ee1b4b1219c46b25f84 SHA1 bd44d87da4d1a16fbe21bfb83401ac52ede63b06 SHA256 7323c4c9d76df6fa7c51e6624697741f9f975349063ec8c2da1be5199d1c53e8
 MISC metadata.xml 897 RMD160 7d20769aac85be3dbcdeb662a0e71a67c90413a1 SHA1 f023e57c6fc9e15a961f7e73b251ae4882f32b6f SHA256 8bf8c96465c90869082f2ecf1836c160549e26814d5ec38b7a9d7fe5947d9e1b
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.11 (GNU/Linux)
-
-iEYEARECAAYFAkrKSCAACgkQ+CZEqwt+F6ZH6gCfbU6tsLq/fb3D6B+ioWC73+pG
-3nkAnRXljvjqAahpajCnUzrkcGCFORHn
-=O+Y7
------END PGP SIGNATURE-----
diff --git a/app-text/kchmviewer/kchmviewer-4.1.ebuild b/app-text/kchmviewer/kchmviewer-4.1.ebuild
new file mode 100644
index 000000000000..6edad52800ac
--- /dev/null
+++ b/app-text/kchmviewer/kchmviewer-4.1.ebuild
@@ -0,0 +1,93 @@
+# Copyright 1999-2009 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/app-text/kchmviewer/kchmviewer-4.1.ebuild,v 1.1 2009/10/10 21:33:24 pva Exp $
+
+EAPI="2"
+KDE_REQUIRED="never"
+inherit fdo-mime qt4 kde4-base
+
+MY_P="${PN}-${PV/_beta/beta}"
+
+DESCRIPTION="KchmViewer is a feature rich chm file viewer, based on Qt."
+HOMEPAGE="http://www.kchmviewer.net/"
+SRC_URI="mirror://sourceforge/kchmviewer/${MY_P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~x86"
+IUSE="kde"
+
+RDEPEND="dev-libs/chmlib
+	x11-libs/qt-dbus:4
+	x11-libs/qt-webkit:4
+	!kde? ( x11-libs/qt-gui:4
+			x11-libs/qt-qt3support:4 )
+	kde? ( >=kde-base/kdelibs-4.1
+			!kde-base/okular[chm] )"
+DEPEND="${RDEPEND}
+		kde? ( dev-util/cmake )"
+
+S=${WORKDIR}/${MY_P}
+
+pkg_setup() {
+	if use kde; then
+		kde4-base_pkg_setup
+	fi
+}
+
+src_prepare() {
+	sed -e "s:KDE4_SERVICES_INSTALL_DIR:SERVICES_INSTALL_DIR:" \
+			-i lib/kio-msits/CMakeLists.txt
+	sed "s:KDE4_ICON_INSTALL_DIR:ICON_INSTALL_DIR:" -i src/kde/CMakeLists.txt
+	sed -e "s:KDE4_BIN_INSTALL_DIR:BIN_INSTALL_DIR:" \
+		-e "s:KDE4_XDG_APPS_INSTALL_DIR:XDG_APPS_INSTALL_DIR:" \
+			-i src/CMakeLists.txt
+	echo "CONFIG += ordered" >> kchmviewer.pro # parallel build fix #281954
+}
+
+src_configure() {
+	if use kde; then
+		kde4-base_src_configure
+	else
+		eqmake4
+	fi
+}
+
+src_compile() {
+	if use kde; then
+		kde4-base_src_compile
+	else
+		emake || die
+	fi
+}
+
+src_test() {
+	einfo "No tests exist."
+}
+
+src_install() {
+	if use kde; then
+		kde4-base_src_install
+	else
+		dobin bin/kchmviewer || die "dobin kchmviewer failed"
+		newmenu src/kde/kchmviewer.desktop kchmviewer.desktop
+		dodoc ChangeLog README || die
+	fi
+	# install icons in hicolor since it's fallback in kde irrespectively of
+	# ICON_INSTALL_DIR (this is really strange...)
+	for size in 48 64 128; do
+		insinto /usr/share/icons/hicolor/${size}x${size}/apps && \
+			newins src/kde/cr${size}-app-kchmviewer.png kchmviewer.png || die
+	done
+	dodoc "${S}"/{DBUS-bindings,FAQ} || die
+}
+
+pkg_postinst() {
+	use kde && kde4-base_pkg_postinst
+	fdo-mime_desktop_database_update
+}
+
+pkg_postrm() {
+	use kde && kde4-base_pkg_postrm
+	fdo-mime_desktop_database_update
+}