Added kde4 support; fixed path to .desktop file, bug #246028, thank Alexandr for the fix. qt3support is not needed any more.

Package-Manager: portage-2.2_rc13/cvs/Linux 2.6.26-openvz.git-35f41f1 i686

3 files changed, 109 insertions, 2 deletions

diff --git a/app-text/kchmviewer/ChangeLog b/app-text/kchmviewer/ChangeLog
index 45dffe882991..5efe3fbcca2d 100644
--- a/app-text/kchmviewer/ChangeLog
+++ b/app-text/kchmviewer/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for app-text/kchmviewer
 # Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-text/kchmviewer/ChangeLog,v 1.5 2008/10/25 15:53:01 pva Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-text/kchmviewer/ChangeLog,v 1.6 2008/11/10 23:43:03 pva Exp $
+
+*kchmviewer-4.0_beta3-r1 (10 Nov 2008)
+
+  10 Nov 2008; Peter Volkov <pva@gentoo.org>
+  +kchmviewer-4.0_beta3-r1.ebuild:
+  Added kde4 support; fixed path to .desktop file, bug #246028, thank
+  Alexandr for the fix. qt3support is not needed any more.
 
 *kchmviewer-4.0_beta3 (25 Oct 2008)
 
diff --git a/app-text/kchmviewer/Manifest b/app-text/kchmviewer/Manifest
index c76e54a9d5c5..49141f546a04 100644
--- a/app-text/kchmviewer/Manifest
+++ b/app-text/kchmviewer/Manifest
@@ -2,6 +2,7 @@ AUX kchmviewer-3.1_p2-gcc43.patch 496 RMD160 597af1509a949d6710ac63878a46851d774
 DIST kchmviewer-3.1-2.tar.gz 945640 RMD160 21a38d0cfcf0d7e32b3de6cf34ad0a9ac8019451 SHA1 b89c0f1e56b820de2419e4890efc5537fefc4b1e SHA256 e73b4ec4b1b6decbd2ab82f670b843a12813d74653ebc6859deffb3b48abf6db
 DIST kchmviewer-4.0beta3.tar.gz 217381 RMD160 f586c962cfbe60ae995a70f437f582a20ccb0ae6 SHA1 4677c40fdf2a2bf00771f33b19f268e8fb01d896 SHA256 1af2d7eb87408a967d9d7522a156d3e1431a7d796b800b2e18b183e5db6f272e
 EBUILD kchmviewer-3.1_p2.ebuild 2247 RMD160 6145f2268c9bc2fe7ab3f2a58f6889105dcb4de0 SHA1 786a375dae7a616c781220533dcaa24ef73d8cbf SHA256 56011dedd7ef55e50ccfbdcb2cb6fe588773492872f8a94e2728bf337db3a460
+EBUILD kchmviewer-4.0_beta3-r1.ebuild 2418 RMD160 83c3a4f6a5d6d0174c85234103844abf2da7834a SHA1 342194b27f62ed3eca1587fadf8ed76c8c23e8b2 SHA256 ab2e78f38e7245580be6b5d77fce72c973543edfd5d6023c4b137f5c3cceb211
 EBUILD kchmviewer-4.0_beta3.ebuild 982 RMD160 eb3188ad341d8241c3aa48753bd0bbc6300e7601 SHA1 0e10b1eee40e25c062ea7b1522d5ac197b1ae0e9 SHA256 d43f4d5389d0b0b9e2322f2f13c1e2970cc45de28b74a4e0392f1e6fab8fcdc8
-MISC ChangeLog 6469 RMD160 6a55fd82939ead9e88097dcd1139e84f41287993 SHA1 cb55dee292abd959760373d530c46c7ce81508dd SHA256 6355e64fa3b39605ad552173db01904b54c91b260f24b26a8fa4a2cd8bafe36a
+MISC ChangeLog 6719 RMD160 731a2506891d1cc874d5b59c2e855f81aa805f4e SHA1 d334ae65344fffda498d19d7fe763e2a8036df1f SHA256 d57460d207dd24465412c4921ee072c5e7a0152ad865bf8683d6212153d6fd63
 MISC metadata.xml 897 RMD160 7d20769aac85be3dbcdeb662a0e71a67c90413a1 SHA1 f023e57c6fc9e15a961f7e73b251ae4882f32b6f SHA256 8bf8c96465c90869082f2ecf1836c160549e26814d5ec38b7a9d7fe5947d9e1b
diff --git a/app-text/kchmviewer/kchmviewer-4.0_beta3-r1.ebuild b/app-text/kchmviewer/kchmviewer-4.0_beta3-r1.ebuild
new file mode 100644
index 000000000000..f8f9e839458b
--- /dev/null
+++ b/app-text/kchmviewer/kchmviewer-4.0_beta3-r1.ebuild
@@ -0,0 +1,99 @@
+# Copyright 1999-2008 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/app-text/kchmviewer/kchmviewer-4.0_beta3-r1.ebuild,v 1.1 2008/11/10 23:43:03 pva Exp $
+
+EAPI="2"
+NEED_KDE="none"
+
+if use kdeprefix; then
+	KDEDIR="/usr/kde/4.1"
+else
+	KDEDIR="/usr"
+fi
+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="http://www.kchmviewer.net/files/${MY_P}.tar.gz"
+LICENSE="GPL-2"
+
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="kde"
+
+RDEPEND="dev-libs/chmlib
+	!kde? ( || ( x11-libs/qt-gui:4
+		=x11-libs/qt-4.3*:4 ) )
+	kde? ( || ( x11-libs/qt-dbus:4
+				=x11-libs/qt-4.3*:4 )
+			!kde-base/okular[chm]
+			>=kde-base/kdelibs-4.1[kdeprefix=] )"
+DEPEND="${RDEPEND}
+		kde? ( dev-util/cmake )"
+
+S=${WORKDIR}/${MY_P}
+
+src_unpack() {
+	unpack ${A}
+	cd "${S}"
+	sed -e "s:KDE4_LIB_INSTALL_DIR:PLUGIN_INSTALL_DIR:" \
+		-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
+	sed -e "/^MimeType=/{s:$:;:}" -i src/kde/kchmviewer.desktop
+}
+
+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
+		dodoc DCOP-bingings FAQ || die
+		# 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
+		kde4-base_src_install
+	else
+		dobin bin/kchmviewer || die "dobin kchmviewer failed"
+		newmenu src/kde/kchmviewer.desktop kchmviewer.desktop
+		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 ChangeLog README FAQ || die
+	fi
+}
+
+pkg_postinst() {
+	use kde && kde4-base_pkg_postinst
+	fdo-mime_desktop_database_update
+}
+
+pkg_postrm() {
+	use kde && kde4-base_pkg_postinst
+}