Added warning about kdevelop.

(Portage version: 2.2_rc23/cvs/Linux i686)

3 files changed, 15 insertions, 101 deletions

diff --git a/app-text/kchmviewer/ChangeLog b/app-text/kchmviewer/ChangeLog
index 82dd805f3a0d..6d379fa0039e 100644
--- a/app-text/kchmviewer/ChangeLog
+++ b/app-text/kchmviewer/ChangeLog
@@ -1,6 +1,10 @@
 # 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.10 2009/02/24 19:31:32 josejx Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-text/kchmviewer/ChangeLog,v 1.11 2009/03/16 13:54:33 pva Exp $
+
+  16 Mar 2009; Peter Volkov <pva@gentoo.org> kchmviewer-3.1_p2.ebuild,
+  -kchmviewer-4.0.ebuild:
+  Added warning about kdevelop.
 
   24 Feb 2009; Joseph Jezak <josejx@gentoo.org> kchmviewer-4.0-r1.ebuild:
   Marked ~ppc for bug #244326.
diff --git a/app-text/kchmviewer/kchmviewer-3.1_p2.ebuild b/app-text/kchmviewer/kchmviewer-3.1_p2.ebuild
index 687e6fd7eacd..978e4083e78e 100644
--- a/app-text/kchmviewer/kchmviewer-3.1_p2.ebuild
+++ b/app-text/kchmviewer/kchmviewer-3.1_p2.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2008 Gentoo Foundation
+# 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-3.1_p2.ebuild,v 1.3 2008/11/22 09:18:20 pva Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-text/kchmviewer/kchmviewer-3.1_p2.ebuild,v 1.4 2009/03/16 13:54:33 pva Exp $
 
 inherit autotools kde-functions eutils versionator
 
@@ -66,3 +66,11 @@ src_install() {
 	emake DESTDIR="${D}" install || die "installation failed"
 	dodoc ChangeLog FAQ DCOP-bingings README || die "installing docs failed"
 }
+
+pkg_postinst() {
+	if [[ -f ${ROOT}/usr/share/services/chm.protocol ]]; then
+		ewarn "kchmviewer and kdevelop's kio_chm don't work together, bug #260134."
+		ewarn "Until we find better solution, if you want to read chm files with ${PN}"
+		ewarn "you need to remove ${ROOT}usr/share/services/chm.protocol file manually."
+	fi
+}
diff --git a/app-text/kchmviewer/kchmviewer-4.0.ebuild b/app-text/kchmviewer/kchmviewer-4.0.ebuild
deleted file mode 100644
index 0aeeacea7bb7..000000000000
--- a/app-text/kchmviewer/kchmviewer-4.0.ebuild
+++ /dev/null
@@ -1,98 +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.ebuild,v 1.1 2008/12/02 11:27:47 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="mirror://sourceforge/kchmviewer/${MY_P}.tar.gz"
-LICENSE="GPL-2"
-
-SLOT="0"
-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? ( >=kde-base/kdelibs-4.1[kdeprefix=]
-			!kde-base/okular[chm] )"
-DEPEND="${RDEPEND}
-		kde? ( dev-util/cmake )"
-
-S=${WORKDIR}/${MY_P}
-
-src_unpack() {
-	unpack ${A}
-	cd "${S}"
-	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
-}
-
-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
-		# 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 || die
-	fi
-	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_postinst
-}