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

Package-Manager: portage-2.1.5_rc2

4 files changed, 15 insertions, 48 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/Manifest b/app-doc/kchmviewer/Manifest
index 53c67217e466..b397afc3ed26 100644
--- a/app-doc/kchmviewer/Manifest
+++ b/app-doc/kchmviewer/Manifest
@@ -2,17 +2,15 @@
 Hash: SHA1
 
 DIST kchmviewer-3.1-2.tar.gz 945640 RMD160 21a38d0cfcf0d7e32b3de6cf34ad0a9ac8019451 SHA1 b89c0f1e56b820de2419e4890efc5537fefc4b1e SHA256 e73b4ec4b1b6decbd2ab82f670b843a12813d74653ebc6859deffb3b48abf6db
-DIST kchmviewer-4.0b1.tar.gz 172453 RMD160 bd8dfdedb17a78c036ca54e07486499c57eb27ec SHA1 1c5fc1626c713b9d354f7d6860e90800627398cc SHA256 811dd869ae3838a2eb7a6a01b8ec779dc3a7dbc943005369b3d85478827bd3eb
 DIST kchmviewer-4.0beta2.tar.gz 216989 RMD160 ff9970b44a2017babbcbb7e6d869e284535bcb7f SHA1 0653d334a393b4925c869cefaa0609ad3e5ef50c SHA256 5d2502e4e51d11f5dbf05973079ccedf461c90fd6638f437184c694bd3201cda
 EBUILD kchmviewer-3.1_p2.ebuild 1506 RMD160 b1317dfc207eb12e42a9fc4d84cf4c885ad4b5ee SHA1 d69d1a623812240ccf62b326363fce853638fd7c SHA256 aae2c3e48d35a92f27881f4c5aa2a995c30cb7007c98d6dcd7c0f45939f5a57d
-EBUILD kchmviewer-4.0_beta1.ebuild 853 RMD160 82dbaa6ac5d7abc2935dc2188511a1f64dc511fa SHA1 e3890dfa378062e13096ffa1ff60f09f0739b559 SHA256 a8f751e8158632d73b85a6cc55ed44e58065ff2b5bba1f8e80eb5a9e657449c8
-EBUILD kchmviewer-4.0_beta2.ebuild 874 RMD160 d6a5a365c44f001505358e259982b895edd3d99f SHA1 ab75f4328af11b6dfff5e35ca8a8058a08092f0f SHA256 b6832b02b79ec37ce54c6289086ffb824b3d34a15f84561363e6ac0f17d89a02
-MISC ChangeLog 4889 RMD160 390be7ba533b402a9d0a88a7ce8d4252c6300d41 SHA1 54b4beb2a9a03b4d271db487dbe4cddf2fc286c0 SHA256 3b90cc3d7ae5bca7dfb2b753356d6d5e8a423d601f5dbf0971eb96e06daff719
+EBUILD kchmviewer-4.0_beta2.ebuild 908 RMD160 fecea78623297e59fd46a42168e64740d7a914b3 SHA1 00d80df41619561a3a2458fab07c9f27ee8368f7 SHA256 0c43a3161b70b72b2f8d7dac681ea9e02d59940a56a29cb5f29656141cb44046
+MISC ChangeLog 5077 RMD160 9eff7e427483ec762961e963e8b569c645a586a8 SHA1 f93cf82b2ff5044dea214650fc9077b6d55b27bd SHA256 136d1c670567beaeb37ca535b07c6e4392acdccdc39047db95837f9402871c56
 MISC metadata.xml 897 RMD160 7d20769aac85be3dbcdeb662a0e71a67c90413a1 SHA1 f023e57c6fc9e15a961f7e73b251ae4882f32b6f SHA256 8bf8c96465c90869082f2ecf1836c160549e26814d5ec38b7a9d7fe5947d9e1b
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.7 (GNU/Linux)
+Version: GnuPG v2.0.9 (GNU/Linux)
 
-iD8DBQFH2sK2B18eXLOpYdkRApjlAJ9wbLg9Q1DwcfY63GukEnYUxQ8CoQCeLYXR
-eu4z+g1jH2ez23sEEg0Ohi4=
-=GMLt
+iEYEARECAAYFAkf8+vAACgkQB18eXLOpYdmckgCcCvNCgcHsSvv+pbrevxZCiio5
+Gh4AoJWGzBkKMnfSV2ixOIHse5SCeUth
+=CDzp
 -----END PGP SIGNATURE-----
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}