version bump, bug #292925

Package-Manager: portage-2.2_rc49/cvs/Linux x86_64

3 files changed, 102 insertions, 12 deletions

diff --git a/app-text/kchmviewer/ChangeLog b/app-text/kchmviewer/ChangeLog
index 619e6617f8ab..0439c14d8552 100644
--- a/app-text/kchmviewer/ChangeLog
+++ b/app-text/kchmviewer/ChangeLog
@@ -1,6 +1,11 @@
 # 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.20 2009/10/25 12:56:33 scarabeus Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-text/kchmviewer/ChangeLog,v 1.21 2009/11/14 19:30:28 wired Exp $
+
+*kchmviewer-4.2 (14 Nov 2009)
+
+  14 Nov 2009; Alex Alexander <wired@gentoo.org> +kchmviewer-4.2.ebuild:
+  version bump, bug #292925
 
   25 Oct 2009; Tomáš Chvátal <scarabeus@gentoo.org>
   -kchmviewer-4.0-r1.ebuild:
diff --git a/app-text/kchmviewer/Manifest b/app-text/kchmviewer/Manifest
index d6fa41ac6d83..578d8a948e17 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.1.tar.gz 257818 RMD160 d07546fda972082d51fccb4c3f98f61dabd30036 SHA1 ffb057fb3d614c8cbaf4a7d178aeb1a33d9b0397 SHA256 98977b167466003af1d2b4bf87aa4b8cfcdad6458712f2c06ecd58d4cf191fd3
+DIST kchmviewer-4.2.tar.gz 260935 RMD160 30a35419a9886acf64e9bea3dfbf786e54301068 SHA1 1f9e58311c96ce13d936a490a200a59bd2257874 SHA256 d24507ec25c3d5ab865150b194aa29921b370b54820768014747b8b3701715a3
 EBUILD kchmviewer-3.1_p2-r1.ebuild 1487 RMD160 5d77e4f0567d96510aa43d1a417093d33f230103 SHA1 9302947e8474412b226416f2b850f69039160336 SHA256 1e508c21b81c9f8872c4a305d6d51066111b0dd4a2761bc11dee7acadab86a72
 EBUILD kchmviewer-4.1.ebuild 2186 RMD160 151d58863c27f503ec44d8aabd22396ba8d22c67 SHA1 d9f7e35c504eb5478d192eb2282fb4ce66d075b1 SHA256 335ba9b8922a58b7af18808387c9275606eacb509066deb2e19673e5beac52de
-MISC ChangeLog 9110 RMD160 bcd06952ffb1e52d1e36d90d414c050c48f0ee23 SHA1 5d8b102e5f21d965cf9f609ab459b2b99f943a4a SHA256 92925730a993294cb372e1357d9836a8cafe4f797dbcf33c0d05a2cd44ec184c
+EBUILD kchmviewer-4.2.ebuild 2188 RMD160 21c32ac8c8d73d8cbc58b4491dc30b1b882b6758 SHA1 f829c2795b020be3300af994910eff22ad1b12a6 SHA256 9f98e52e901ad563a954a194247848871c01aa0baf2707a5bb58e3226dc714ed
+MISC ChangeLog 9239 RMD160 3aa71998d9c1ddd513dca26932908111cb2cd51e SHA1 1ffc760a393948017b49b1aa12e973900c06fe91 SHA256 13a262d8c6122146e877b0929856fcba5765487b199eea8e4ea3ca6e69a02d37
 MISC metadata.xml 897 RMD160 7d20769aac85be3dbcdeb662a0e71a67c90413a1 SHA1 f023e57c6fc9e15a961f7e73b251ae4882f32b6f SHA256 8bf8c96465c90869082f2ecf1836c160549e26814d5ec38b7a9d7fe5947d9e1b
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.13 (GNU/Linux)
-
-iEYEARECAAYFAkrkSxQACgkQHB6c3gNBRYdWWACePTLvK9xEs9R4eaoXibjXdc+U
-pToAoJcyETwmdzHtBZfldDVBvxQVjl2n
-=qhKZ
------END PGP SIGNATURE-----
diff --git a/app-text/kchmviewer/kchmviewer-4.2.ebuild b/app-text/kchmviewer/kchmviewer-4.2.ebuild
new file mode 100644
index 000000000000..13f1641c28de
--- /dev/null
+++ b/app-text/kchmviewer/kchmviewer-4.2.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.2.ebuild,v 1.1 2009/11/14 19:30:28 wired 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
+}