Make dependencies compatible with split Qt:4. Remove obsolete versions.

(Portage version: 2.1.5_rc2)

3 files changed, 9 insertions, 40 deletions

diff --git a/app-doc/kchmviewer/ChangeLog b/app-doc/kchmviewer/ChangeLog
index 1625070fe3b9..1f842e8f53a2 100644
--- a/app-doc/kchmviewer/ChangeLog
+++ b/app-doc/kchmviewer/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for app-doc/kchmviewer
 # Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-doc/kchmviewer/ChangeLog,v 1.32 2008/03/14 18:24:33 ingmar Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-doc/kchmviewer/ChangeLog,v 1.33 2008/04/09 17:21:08 ingmar Exp $
+
+  09 Apr 2008; Ingmar Vanhassel <ingmar@gentoo.org>
+  -kchmviewer-4.0_beta1.ebuild, kchmviewer-4.0_beta2.ebuild:
+  Make dependencies compatible with split Qt:4. Remove obsolete versions.
 
   14 Mar 2008; Ingmar Vanhassel <ingmar@gentoo.org>
   kchmviewer-3.1_p2.ebuild:
diff --git a/app-doc/kchmviewer/kchmviewer-4.0_beta1.ebuild b/app-doc/kchmviewer/kchmviewer-4.0_beta1.ebuild
deleted file mode 100644
index cef0bb2c0ab5..000000000000
--- a/app-doc/kchmviewer/kchmviewer-4.0_beta1.ebuild
+++ /dev/null
@@ -1,37 +0,0 @@
-# Copyright 1999-2007 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-doc/kchmviewer/kchmviewer-4.0_beta1.ebuild,v 1.1 2007/09/28 17:10:51 pva Exp $
-
-inherit qt4 fdo-mime
-
-MY_P="${PN}-${PV/_beta/b}"
-
-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=""
-
-DEPEND="$(qt4_min_version 4.2)
-	app-doc/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
-}
-
-pkg_postinst() {
-	fdo-mime_desktop_database_update
-}
diff --git a/app-doc/kchmviewer/kchmviewer-4.0_beta2.ebuild b/app-doc/kchmviewer/kchmviewer-4.0_beta2.ebuild
index fbffe67a9810..c94ad543137e 100644
--- a/app-doc/kchmviewer/kchmviewer-4.0_beta2.ebuild
+++ b/app-doc/kchmviewer/kchmviewer-4.0_beta2.ebuild
@@ -1,7 +1,8 @@
 # Copyright 1999-2008 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-doc/kchmviewer/kchmviewer-4.0_beta2.ebuild,v 1.1 2008/02/13 16:15:57 pva Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-doc/kchmviewer/kchmviewer-4.0_beta2.ebuild,v 1.2 2008/04/09 17:21:08 ingmar Exp $
 
+EAPI="1"
 inherit qt4 fdo-mime
 
 MY_P="${PN}-${PV/_beta/beta}"
@@ -15,7 +16,8 @@ SLOT="0"
 KEYWORDS="~amd64 ~x86"
 IUSE=""
 
-DEPEND="$(qt4_min_version 4.2)
+DEPEND="
+	|| ( x11-libs/qt-gui:4 >=x11-libs/qt-4.2 )
 	app-doc/chmlib"
 
 S=${WORKDIR}/${MY_P}