Version bump. Finally first stable release.

Package-Manager: portage-2.2_rc16/cvs/Linux 2.6.26-openvz.git-89451f9 i686

4 files changed, 20 insertions, 59 deletions

diff --git a/app-text/kchmviewer/ChangeLog b/app-text/kchmviewer/ChangeLog
index 4d1cf78f965b..1545776fb724 100644
--- a/app-text/kchmviewer/ChangeLog
+++ b/app-text/kchmviewer/ChangeLog
@@ -1,6 +1,12 @@
 # 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.7 2008/11/22 09:18:20 pva Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-text/kchmviewer/ChangeLog,v 1.8 2008/12/02 11:27:47 pva Exp $
+
+*kchmviewer-4.0 (02 Dec 2008)
+
+  02 Dec 2008; Peter Volkov <pva@gentoo.org> -kchmviewer-4.0_beta3.ebuild,
+  -kchmviewer-4.0_beta3-r1.ebuild, +kchmviewer-4.0.ebuild:
+  Version bump. Finally first stable release.
 
   22 Nov 2008; Peter Volkov <pva@gentoo.org> kchmviewer-3.1_p2.ebuild:
   Fixed build failure when kde-4 is installed with -kdeprefix, bug #247314,
diff --git a/app-text/kchmviewer/Manifest b/app-text/kchmviewer/Manifest
index 747e13253083..e0b3be1bec47 100644
--- a/app-text/kchmviewer/Manifest
+++ b/app-text/kchmviewer/Manifest
@@ -1,8 +1,7 @@
 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.0beta3.tar.gz 217381 RMD160 f586c962cfbe60ae995a70f437f582a20ccb0ae6 SHA1 4677c40fdf2a2bf00771f33b19f268e8fb01d896 SHA256 1af2d7eb87408a967d9d7522a156d3e1431a7d796b800b2e18b183e5db6f272e
+DIST kchmviewer-4.0.tar.gz 225883 RMD160 b097a320ed2c5e7431d02f1382e1124176a50eef SHA1 313f07307ab7157ca65977b60a8417379941db56 SHA256 09f15bcb42bfca0b6eeed6c52408c5c49e944aae36d15816a32860fdaa7b4a38
 EBUILD kchmviewer-3.1_p2.ebuild 2241 RMD160 800eeeb1630cb7b23a81aa98f22aef2d841e65d7 SHA1 7b60d6c655d5055ef095182bda7d6008cf497933 SHA256 305f5e9fd2f9203c1b6c423b746011e65247eb38b02b6492680be54f0a0f666d
-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 6901 RMD160 5dcbd6e4a1116a099554cc57e329bc488f7e9228 SHA1 792d4f8f07c8b06b027f2d2e4626340a4a88a80c SHA256 9bf8e953f6b81580cb8607048202b629f8cf872b76a31bac2a8c5ceabd444d05
+EBUILD kchmviewer-4.0.ebuild 2323 RMD160 cba2fd32e9b348532a37245ef4409efcb83e0951 SHA1 fd5716b757e767861ad1a61a717898197baf4567 SHA256 70f9e8befaf4ec23c20f0254039a1ba073b7f8734dc8ece9e93a4bcba4df870c
+MISC ChangeLog 7113 RMD160 22777e1dc26165192be64961a6bdd8a75ce8ca0d SHA1 03bd72752bf3f55951707b8fe33b6ac42b0fe9ce SHA256 df1b5ba76d461f50f53a3173e103dd00c6c8f224ad7af1a2bbf747c48295f5a2
 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.ebuild
index f8f9e839458b..0aeeacea7bb7 100644
--- a/app-text/kchmviewer/kchmviewer-4.0_beta3-r1.ebuild
+++ b/app-text/kchmviewer/kchmviewer-4.0.ebuild
@@ -1,6 +1,6 @@
 # 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 $
+# $Header: /var/cvsroot/gentoo-x86/app-text/kchmviewer/kchmviewer-4.0.ebuild,v 1.1 2008/12/02 11:27:47 pva Exp $
 
 EAPI="2"
 NEED_KDE="none"
@@ -16,7 +16,7 @@ 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"
+SRC_URI="mirror://sourceforge/kchmviewer/${MY_P}.tar.gz"
 LICENSE="GPL-2"
 
 SLOT="0"
@@ -24,12 +24,13 @@ KEYWORDS="~amd64 ~x86"
 IUSE="kde"
 
 RDEPEND="dev-libs/chmlib
+	|| ( ( x11-libs/qt-dbus:4
+		x11-libs/qt-webkit:4 )
+		=x11-libs/qt-4.3*:4 )
 	!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=] )"
+	kde? ( >=kde-base/kdelibs-4.1[kdeprefix=]
+			!kde-base/okular[chm] )"
 DEPEND="${RDEPEND}
 		kde? ( dev-util/cmake )"
 
@@ -38,14 +39,12 @@ 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:" \
+	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
-	sed -e "/^MimeType=/{s:$:;:}" -i src/kde/kchmviewer.desktop
 }
 
 src_configure() {
@@ -70,7 +69,6 @@ src_test() {
 
 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
@@ -85,8 +83,9 @@ src_install() {
 			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
+		dodoc ChangeLog README || die
 	fi
+	dodoc "${S}"/{DBUS-bindings,FAQ} || die
 }
 
 pkg_postinst() {
diff --git a/app-text/kchmviewer/kchmviewer-4.0_beta3.ebuild b/app-text/kchmviewer/kchmviewer-4.0_beta3.ebuild
deleted file mode 100644
index 28cfa5ceafb6..000000000000
--- a/app-text/kchmviewer/kchmviewer-4.0_beta3.ebuild
+++ /dev/null
@@ -1,43 +0,0 @@
-# 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.ebuild,v 1.1 2008/10/25 15:53:01 pva Exp $
-
-EAPI="1"
-inherit qt4 fdo-mime
-
-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=""
-
-QT4_BUILT_WITH_USE_CHECK="qt3support"
-
-DEPEND="
-	|| ( ( x11-libs/qt-gui:4
-			x11-libs/qt-qt3support:4 )
-		=x11-libs/qt-4.3*:4 )
-	dev-libs/chmlib"
-
-S=${WORKDIR}/${MY_P}
-
-src_compile() {
-	eqmake4
-	emake || die "make failed"
-}
-
-src_install() {
-	dobin bin/kchmviewer || die "dobin kchmviewer failed"
-	insinto /usr/share/applications
-	doins lib/kio-msits/kchmviewer.desktop
-	dodoc ChangeLog README DCOP-bingings FAQ
-}
-
-pkg_postinst() {
-	fdo-mime_desktop_database_update
-}