Version bump. Fixed bug #129225 reported by Mindphaser <mindo83 AT t-online.de> and many others.

Package-Manager: portage-2.1.2.2

5 files changed, 98 insertions, 5 deletions

diff --git a/app-doc/kchmviewer/ChangeLog b/app-doc/kchmviewer/ChangeLog
index 70c97781d11e..2d34d49b415a 100644
--- a/app-doc/kchmviewer/ChangeLog
+++ b/app-doc/kchmviewer/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for app-doc/kchmviewer
 # Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-doc/kchmviewer/ChangeLog,v 1.21 2007/02/21 20:51:10 peper Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-doc/kchmviewer/ChangeLog,v 1.22 2007/03/16 09:21:23 pva Exp $
+
+*kchmviewer-3.0 (16 Mar 2007)
+
+  16 Mar 2007; <pva@gentoo.org> +files/kchmviewer-3.0-qt-only-path-fix.diff,
+  +kchmviewer-3.0.ebuild:
+  Version bump. Fixed bug #129225 reported by Mindphaser <mindo83 AT
+  t-online.de> and many others.
 
   21 Feb 2007; Piotr Jaroszyński <peper@gentoo.org> ChangeLog:
   Transition to Manifest2.
diff --git a/app-doc/kchmviewer/Manifest b/app-doc/kchmviewer/Manifest
index f0e6db53f561..5b6ea817c45a 100644
--- a/app-doc/kchmviewer/Manifest
+++ b/app-doc/kchmviewer/Manifest
@@ -6,6 +6,10 @@ AUX kchmviewer-2.6-build-Qt.diff 274 RMD160 e1fe73a8027d62a3ef211925f524a671e854
 MD5 1575cf4cdf4fbe928db99433f03b0a90 files/kchmviewer-2.6-build-Qt.diff 274
 RMD160 e1fe73a8027d62a3ef211925f524a671e8547d67 files/kchmviewer-2.6-build-Qt.diff 274
 SHA256 9b4ec1697de6e7d462638333ee9722789f98b5eb066e32d1e1cc5f8378b357ff files/kchmviewer-2.6-build-Qt.diff 274
+AUX kchmviewer-3.0-qt-only-path-fix.diff 412 RMD160 58568476cb155485f29b59dfcda63c41cfe86cdf SHA1 a405c2896baa1078e01a530e30f28e4beb85a04d SHA256 a3feafb48032f16ab3e1406377a9196866a5c290c8826a957160bfd6659cc0a6
+MD5 36ef853f7d8574ea59abdb9a9bc84714 files/kchmviewer-3.0-qt-only-path-fix.diff 412
+RMD160 58568476cb155485f29b59dfcda63c41cfe86cdf files/kchmviewer-3.0-qt-only-path-fix.diff 412
+SHA256 a3feafb48032f16ab3e1406377a9196866a5c290c8826a957160bfd6659cc0a6 files/kchmviewer-3.0-qt-only-path-fix.diff 412
 DIST kchmviewer-1.1.tar.gz 557796 RMD160 96eed8e80df576a6a01842f743134debc84e1b82 SHA1 6eb0bdd02d3a9215a4a0a3039e3440a0e48d6b08 SHA256 2314aee92bbd221ded2b15e6f7a6121c2e861633c6584a2a484bd192201ba31c
 DIST kchmviewer-1.2.tar.gz 564001 RMD160 65dda863e38afe05faebab1c2409654153698179 SHA1 487a0148a6d956ba3ed1e20fdc15101d28a85700 SHA256 42b711686af97e646c836af4a868db9c0b435c0872cf5a114fa91290e878265f
 DIST kchmviewer-1.3.tar.gz 567704 RMD160 04606b978072fc6a579640d8357e949c75bec79e SHA1 4bcdf936aaa86f09f8c683eacfa9f97011972edb SHA256 316e7b0a4b98187efc3421111e6241ca1173f84deab2302161512d9d390f26d6
@@ -13,6 +17,8 @@ DIST kchmviewer-2.0.tar.gz 765276 RMD160 e05ba681eb4a0e40a8b944c7181924bba61a195
 DIST kchmviewer-2.5.tar.gz 659755 RMD160 be64def4cfa8e0161826ca2fdc5f1658b1e602f2 SHA1 f77574cbbc2aaf277a030cf4808cf24e4c016a42 SHA256 760dcbbaf426113ff6f0a4c5ea3c5023c597b2ec096d2bde8e15635d58827197
 DIST kchmviewer-2.6.tar.gz 671666 RMD160 8a774e37e1e5824a4ff46123d54f246a1389974a SHA1 e4e05d4d8ddb0201c0a26bee8d86c86811f54b42 SHA256 25201d7ddb685f9c4ee55d134f61b239e786193cabaa263b4951aeba45045266
 DIST kchmviewer-2.7.tar.gz 685588 RMD160 6014d7f9ce68fb6793d026c39ce968dd7f953815 SHA1 4973d36867842eb1dbb05e0292bcf633d67fe281 SHA256 d6b1fd711e00ff9ed71adcbd1a8e8a052d64867830031ade415534e194f9fe01
+DIST kchmviewer-3.0-admin-dir.tar.bz2 187244 RMD160 19ef2e27ed5db9675d98730d6f1c4850bbdafd17 SHA1 320dd7bbb06b723a4eb89f34d9a13e7fafdb744d SHA256 23626c5b3d831508f32535f012c9b642b052058c22c94c97332aa19370e21919
+DIST kchmviewer-3.0.tar.gz 707997 RMD160 7c1b3ecd7d870e4cc06b4f8c1ab669ec7be66194 SHA1 300367920aea79500ee75973d55d0108f29133f3 SHA256 706a74a2ed9e2354decc2796e7e3eebf03d976a1da9eda30b7a57a1d67a6eb34
 EBUILD kchmviewer-1.1.ebuild 1116 RMD160 95a69045b3246424b347eca317c142b1bcc09b7a SHA1 0d2f2d61c327d47611f44126c55f887a0cbddf42 SHA256 10bdc22e8d6e9a2b9f800a5b23c6ae98559ee2606af4486cea77903b9e3a406c
 MD5 b7e29b38474772ed2c00e13106b7f265 kchmviewer-1.1.ebuild 1116
 RMD160 95a69045b3246424b347eca317c142b1bcc09b7a kchmviewer-1.1.ebuild 1116
@@ -45,10 +51,14 @@ EBUILD kchmviewer-2.7.ebuild 1320 RMD160 d8ab55065a761c54741a02a34aff5e3c8194ca6
 MD5 3c85653278a67a0bee109b4a2b369da8 kchmviewer-2.7.ebuild 1320
 RMD160 d8ab55065a761c54741a02a34aff5e3c8194ca6a kchmviewer-2.7.ebuild 1320
 SHA256 e4163084021d39e6ff9ce0ed2a3571d404f494802caea29ca62837297873658d kchmviewer-2.7.ebuild 1320
-MISC ChangeLog 2989 RMD160 6c307e81a46485ca90bbdd84ae2a04094150b574 SHA1 55ece0cbc20389689f23493e768963866a018179 SHA256 bce15037c5091d6a9f52d3ab9aa93127e417c07793379aede1099a046ccdb230
-MD5 89e4dbaacf7a7efc980d6948893de2c5 ChangeLog 2989
-RMD160 6c307e81a46485ca90bbdd84ae2a04094150b574 ChangeLog 2989
-SHA256 bce15037c5091d6a9f52d3ab9aa93127e417c07793379aede1099a046ccdb230 ChangeLog 2989
+EBUILD kchmviewer-3.0.ebuild 1614 RMD160 dcee2685317f5e3728af179d34443e5f124fb7d1 SHA1 7a1ef06640bbd70a4eda9a7bba911fc3588528a6 SHA256 0c0b68fa8a4b31c98a0928f16f9c15035718be8ce19a00b9bbdb47ebd892c6cd
+MD5 e5ac42bb1849d9bd070e94c7f378f859 kchmviewer-3.0.ebuild 1614
+RMD160 dcee2685317f5e3728af179d34443e5f124fb7d1 kchmviewer-3.0.ebuild 1614
+SHA256 0c0b68fa8a4b31c98a0928f16f9c15035718be8ce19a00b9bbdb47ebd892c6cd kchmviewer-3.0.ebuild 1614
+MISC ChangeLog 3223 RMD160 acb06fd646f5a58f3adb9715b25835dc7180e142 SHA1 4b3eeac0a7416f934223cc94494008fff21e8a12 SHA256 f289d6b3d1c6b7103c4329f5ae498fac7679b1a4b6a8c550fc9b04669fd673b4
+MD5 2ddaa9cd233532b85b0997ba3fc7c51b ChangeLog 3223
+RMD160 acb06fd646f5a58f3adb9715b25835dc7180e142 ChangeLog 3223
+SHA256 f289d6b3d1c6b7103c4329f5ae498fac7679b1a4b6a8c550fc9b04669fd673b4 ChangeLog 3223
 MISC metadata.xml 897 RMD160 7d20769aac85be3dbcdeb662a0e71a67c90413a1 SHA1 f023e57c6fc9e15a961f7e73b251ae4882f32b6f SHA256 8bf8c96465c90869082f2ecf1836c160549e26814d5ec38b7a9d7fe5947d9e1b
 MD5 07c8bb5ee028fbbae21335bd33e80318 metadata.xml 897
 RMD160 7d20769aac85be3dbcdeb662a0e71a67c90413a1 metadata.xml 897
@@ -77,3 +87,6 @@ SHA256 cf36399615c6906ce01e2e774cd4a490dab39e880403006e89d4b88164b08ddc files/di
 MD5 99a2e66bdd4e1105a92296d4a10e7c4f files/digest-kchmviewer-2.7 244
 RMD160 e95b642c43da6da5debd29d6e5b8872d100d4393 files/digest-kchmviewer-2.7 244
 SHA256 fbc979bc3a1d346ba4f8b4eaafd1b47f6357c64615c9376b57ebd9dade2a3c9d files/digest-kchmviewer-2.7 244
+MD5 63aa273c3a48691a21f4ecb235e7a4f6 files/digest-kchmviewer-3.0 521
+RMD160 54a09897b0580d8582fea49d007858aa43c385d0 files/digest-kchmviewer-3.0 521
+SHA256 ec47ded6b46609a2bf5d71f7d1af0e764f053207d13aafc570c0514c53f49c00 files/digest-kchmviewer-3.0 521
diff --git a/app-doc/kchmviewer/files/digest-kchmviewer-3.0 b/app-doc/kchmviewer/files/digest-kchmviewer-3.0
new file mode 100644
index 000000000000..ea74c224202e
--- /dev/null
+++ b/app-doc/kchmviewer/files/digest-kchmviewer-3.0
@@ -0,0 +1,6 @@
+MD5 28fd8f76c1ae47d90ec0d8af98391fa2 kchmviewer-3.0-admin-dir.tar.bz2 187244
+RMD160 19ef2e27ed5db9675d98730d6f1c4850bbdafd17 kchmviewer-3.0-admin-dir.tar.bz2 187244
+SHA256 23626c5b3d831508f32535f012c9b642b052058c22c94c97332aa19370e21919 kchmviewer-3.0-admin-dir.tar.bz2 187244
+MD5 f14b7c5be4154dfc688bef7ebd3879ff kchmviewer-3.0.tar.gz 707997
+RMD160 7c1b3ecd7d870e4cc06b4f8c1ab669ec7be66194 kchmviewer-3.0.tar.gz 707997
+SHA256 706a74a2ed9e2354decc2796e7e3eebf03d976a1da9eda30b7a57a1d67a6eb34 kchmviewer-3.0.tar.gz 707997
diff --git a/app-doc/kchmviewer/files/kchmviewer-3.0-qt-only-path-fix.diff b/app-doc/kchmviewer/files/kchmviewer-3.0-qt-only-path-fix.diff
new file mode 100644
index 000000000000..a40baf7f669a
--- /dev/null
+++ b/app-doc/kchmviewer/files/kchmviewer-3.0-qt-only-path-fix.diff
@@ -0,0 +1,12 @@
+--- ./configure.in.in.orig	2007-03-16 12:02:13.000000000 +0300
++++ ./configure.in.in	2007-03-16 12:02:44.000000000 +0300
+@@ -44,7 +44,8 @@
+ if test "x$with_kde" != "xyes"; then
+ 	include_ARTS_FALSE="yes"
+ 	AC_PREFIX_DEFAULT(${prefix:-/usr/local})
+-    kde_icondir="/usr/share/icons"
++	KDE_SET_DEFAULT_PATHS([default])
++	eval "$kde_cv_all_paths"
+ fi
+ 
+ AM_CONDITIONAL([AMC_USE_KDE], [test "x$with_kde" = "xyes"])
diff --git a/app-doc/kchmviewer/kchmviewer-3.0.ebuild b/app-doc/kchmviewer/kchmviewer-3.0.ebuild
new file mode 100644
index 000000000000..f1950d20fc7c
--- /dev/null
+++ b/app-doc/kchmviewer/kchmviewer-3.0.ebuild
@@ -0,0 +1,55 @@
+# 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-3.0.ebuild,v 1.1 2007/03/16 09:21:23 pva Exp $
+
+inherit autotools kde-functions eutils
+
+DESCRIPTION="KchmViewer is a feature rich chm file viewer, based on Qt."
+HOMEPAGE="http://kchmviewer.sourceforge.net/"
+SRC_URI="mirror://sourceforge/kchmviewer/${P}.tar.gz
+		gentoo://${P}-admin-dir.tar.bz2"
+LICENSE="GPL-2"
+
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="arts kde"
+
+DEPEND="=x11-libs/qt-3*
+	app-doc/chmlib
+	kde? ( kde-base/kdelibs )"
+
+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
+	fi
+}
+
+src_unpack() {
+	unpack ${A}
+	cd "${S}"
+	# broken configure script, assure it doesn't fall back to internal libs
+	echo "# We use the external chmlib!" > lib/chmlib/chm_lib.h
+
+	# Apply patch for broken paths only when without kde. See bug #129225.
+	if ! use kde ; then 
+		rm -rf admin && mv ../admin . && \
+		epatch "${FILESDIR}"/${P}-qt-only-path-fix.diff && make -f admin/Makefile.common
+	fi
+}
+
+src_compile() {
+	set-kdedir 3
+
+	econf $(use_with kde) $(use_with arts) || die
+	emake || die
+}
+
+src_install() {
+	make DESTDIR="${D}" install || die
+	dodoc ChangeLog FAQ DCOP-bingings README
+}