kchmviewer-3.1_p2: fixed pkg_setup() to live happy with kdelibs:4 installed, bug #222043, thank Scott Thomson <smoothhound AT gmail.com> for report. kchmviewer-4.0_beta2: fixed broken dependencies for splitted qt-4, bug #221985, thank Dror Levin <spatz AT psybear.com> for report.

Package-Manager: portage-2.1.4.4

4 files changed, 34 insertions, 24 deletions

diff --git a/app-text/kchmviewer/ChangeLog b/app-text/kchmviewer/ChangeLog
index a0975aa013a7..b8dd59d71ac1 100644
--- a/app-text/kchmviewer/ChangeLog
+++ b/app-text/kchmviewer/ChangeLog
@@ -1,6 +1,13 @@
 # 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.2 2008/05/17 10:47:57 swegener Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-text/kchmviewer/ChangeLog,v 1.3 2008/05/17 12:31:48 pva Exp $
+
+  17 May 2008; Peter Volkov <pva@gentoo.org> kchmviewer-3.1_p2.ebuild,
+  kchmviewer-4.0_beta2.ebuild:
+  kchmviewer-3.1_p2: fixed pkg_setup() to live happy with kdelibs:4
+  installed, bug #222043, thank Scott Thomson <smoothhound AT gmail.com> for
+  report. kchmviewer-4.0_beta2: fixed broken dependencies for splitted qt-4,
+  bug #221985, thank Dror Levin <spatz AT psybear.com> for report.
 
   13 May 2008; Peter Volkov <pva@gentoo.org>
   +files/kchmviewer-3.1_p2-gcc43.patch, +metadata.xml,
diff --git a/app-text/kchmviewer/Manifest b/app-text/kchmviewer/Manifest
index e4436b623f1f..48de5f66e666 100644
--- a/app-text/kchmviewer/Manifest
+++ b/app-text/kchmviewer/Manifest
@@ -1,17 +1,7 @@
------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.0beta2.tar.gz 216989 RMD160 ff9970b44a2017babbcbb7e6d869e284535bcb7f SHA1 0653d334a393b4925c869cefaa0609ad3e5ef50c SHA256 5d2502e4e51d11f5dbf05973079ccedf461c90fd6638f437184c694bd3201cda
-EBUILD kchmviewer-3.1_p2.ebuild 1645 RMD160 6980f60d10a455b7ee590a5af7f49d9923729bc3 SHA1 7216139b3e2f215ed9568987d0bd9cbaf24a635f SHA256 04dafcc7ad633955d5c2d8c7ef24fa6a16c48a9f0700ad67ac09f1518df165c7
-EBUILD kchmviewer-4.0_beta2.ebuild 907 RMD160 c1b31ec69b8e5e3b512ab280ff5a92bb66863a1d SHA1 5c3f72ccd76f471bde485ff10d1b415e6fe66d4f SHA256 b900ec4b99dcfa65c02f69c5d5ea6ac267972da3c03134ea66a26fc0a691591a
-MISC ChangeLog 5709 RMD160 74294d44c0e9891800269447ea62b7aecb480650 SHA1 3abe52672b85b26effbbbe055e31c12677e517cf SHA256 b0b580097b7a1a527f4e8db7a3f31c14570354a71a322b7f9faad8a471404ca4
+EBUILD kchmviewer-3.1_p2.ebuild 2247 RMD160 6145f2268c9bc2fe7ab3f2a58f6889105dcb4de0 SHA1 786a375dae7a616c781220533dcaa24ef73d8cbf SHA256 56011dedd7ef55e50ccfbdcb2cb6fe588773492872f8a94e2728bf337db3a460
+EBUILD kchmviewer-4.0_beta2.ebuild 978 RMD160 163489cf09f74c05fe4e886ce48d61f059f40482 SHA1 bf60b5bb7832ae2f806fe5c2768721ca0fb4c311 SHA256 1a58f2c2e5eb9463f8dd32b9b11dfc29447baad802aa89f0f93533d4d9194e6d
+MISC ChangeLog 6096 RMD160 a1e219255c242d5756cec3bca06d1380915c1a43 SHA1 da48434040e690ff5b1fa12fd48ea13c5ca506e7 SHA256 047bce7519f1a44d3ef9b959c34b6cb454087d6f8fdafd1a5d676028f55481c3
 MISC metadata.xml 897 RMD160 7d20769aac85be3dbcdeb662a0e71a67c90413a1 SHA1 f023e57c6fc9e15a961f7e73b251ae4882f32b6f SHA256 8bf8c96465c90869082f2ecf1836c160549e26814d5ec38b7a9d7fe5947d9e1b
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.7 (GNU/Linux)
-
-iD8DBQFILrfjI1lqEGTUzyQRApatAKC7YMHMxp/wHly0KxelQt0ZqWQvwACfWTNY
-KxFBUllyKdSjVKorUfD1pLo=
-=xzp8
------END PGP SIGNATURE-----
diff --git a/app-text/kchmviewer/kchmviewer-3.1_p2.ebuild b/app-text/kchmviewer/kchmviewer-3.1_p2.ebuild
index 5f7271423610..18d7b5b94e04 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
 # 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.1 2008/05/13 10:17:40 pva Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-text/kchmviewer/kchmviewer-3.1_p2.ebuild,v 1.2 2008/05/17 12:31:48 pva Exp $
 
 inherit autotools kde-functions eutils versionator
 
@@ -23,13 +23,22 @@ DEPEND="=x11-libs/qt-3*
 S="${WORKDIR}/${PN}-$(get_version_component_range 1-2)"
 
 pkg_setup() {
-	if use kde && use arts && ! built_with_use kde-base/kdelibs arts ; then
-		eerror "You are trying to compile ${CATEGORY}/${PF} with the \"arts\" USE flag enabled."
-		eerror "However, $(best_version kde-base/kdelibs) was compiled with this flag disabled."
-		eerror
-		eerror "You must either disable this use flag, or recompile"
-		eerror "$(best_version kde-base/kdelibs) with this use flag enabled."
-		die
+	if use kde; then
+		if use arts && ! built_with_use =kde-base/kdelibs-3.5* arts ; then
+			eerror "You are trying to compile ${CATEGORY}/${PF} with the \"arts\" USE flag enabled."
+			eerror "However, $(best_version =kde-base/kdelibs-3.5*) was compiled with this flag disabled."
+			eerror
+			eerror "You must either disable this use flag, or recompile"
+			eerror "$(best_version kde-base/kdelibs) with this use flag enabled."
+			die "Impossible to build kde package with different from kdelibs arts setting"
+		elif ! use arts && built_with_use =kde-base/kdelibs-3.5* arts ; then
+			eerror "You are trying to compile ${CATEGORY}/${PF} with the \"arts\" USE flag disabled."
+			eerror "However, $(best_version =kde-base/kdelibs-3.5*) was compiled with this flag enabled."
+			eerror
+			eerror "You must either enable this use flag, or recompile"
+			eerror "$(best_version =kde-base/kdelibs-3.5*) with this use flag disabled."
+			die "Impossible to build kde package with different from kdelibs arts setting"
+		fi
 	fi
 }
 
diff --git a/app-text/kchmviewer/kchmviewer-4.0_beta2.ebuild b/app-text/kchmviewer/kchmviewer-4.0_beta2.ebuild
index 4b3b80e2e461..07c9f1409261 100644
--- a/app-text/kchmviewer/kchmviewer-4.0_beta2.ebuild
+++ b/app-text/kchmviewer/kchmviewer-4.0_beta2.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_beta2.ebuild,v 1.1 2008/05/13 10:17:40 pva Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-text/kchmviewer/kchmviewer-4.0_beta2.ebuild,v 1.2 2008/05/17 12:31:48 pva Exp $
 
 EAPI="1"
 inherit qt4 fdo-mime
@@ -16,8 +16,12 @@ SLOT="0"
 KEYWORDS="~amd64 ~x86"
 IUSE=""
 
+QT4_BUILT_WITH_USE_CHECK="qt3support"
+
 DEPEND="
-	|| ( x11-libs/qt-gui:4 >=x11-libs/qt-4.2 )
+	|| ( ( x11-libs/qt-gui:4
+			x11-libs/qt-qt3support )
+		>=x11-libs/qt-4.2 )
 	dev-libs/chmlib"
 
 S=${WORKDIR}/${MY_P}