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

(Portage version: 2.1.2.2)

4 files changed, 81 insertions, 1 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/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
+}