[gentoo-commits] gentoo-x86 commit in app-text/kchmviewer: ChangeLog kchmviewer-3.1_p2.ebuild

[Peter Volkov (pva)]

pva         08/11/22 09:18:20

  Modified:             ChangeLog kchmviewer-3.1_p2.ebuild
  Log:
  Fixed build failure when kde-4 is installed with -kdeprefix, bug #247314, thank Stoian Ivanov for report.
  (Portage version: 2.2_rc14/cvs/Linux 2.6.25-gentoo-r7 x86_64)

Revision  Changes    Path
1.7                  app-text/kchmviewer/ChangeLog

file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/app-text/kchmviewer/ChangeLog?rev=1.7&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/app-text/kchmviewer/ChangeLog?rev=1.7&content-type=text/plain
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/app-text/kchmviewer/ChangeLog?r1=1.6&r2=1.7

Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/app-text/kchmviewer/ChangeLog,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- ChangeLog	10 Nov 2008 23:43:03 -0000	1.6
+++ ChangeLog	22 Nov 2008 09:18:20 -0000	1.7
@@ -1,6 +1,10 @@
 # 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.6 2008/11/10 23:43:03 pva Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-text/kchmviewer/ChangeLog,v 1.7 2008/11/22 09:18:20 pva Exp $
+
+  22 Nov 2008; Peter Volkov <pva@g.o> kchmviewer-3.1_p2.ebuild:
+  Fixed build failure when kde-4 is installed with -kdeprefix, bug #247314,
+  thank Stoian Ivanov for report.
 
 *kchmviewer-4.0_beta3-r1 (10 Nov 2008)
 



1.3                  app-text/kchmviewer/kchmviewer-3.1_p2.ebuild

file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/app-text/kchmviewer/kchmviewer-3.1_p2.ebuild?rev=1.3&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/app-text/kchmviewer/kchmviewer-3.1_p2.ebuild?rev=1.3&content-type=text/plain
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/app-text/kchmviewer/kchmviewer-3.1_p2.ebuild?r1=1.2&r2=1.3

Index: kchmviewer-3.1_p2.ebuild
===================================================================
RCS file: /var/cvsroot/gentoo-x86/app-text/kchmviewer/kchmviewer-3.1_p2.ebuild,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- kchmviewer-3.1_p2.ebuild	17 May 2008 12:31:48 -0000	1.2
+++ kchmviewer-3.1_p2.ebuild	22 Nov 2008 09:18:20 -0000	1.3
@@ -1,11 +1,11 @@
 # 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.2 2008/05/17 12:31:48 pva Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-text/kchmviewer/kchmviewer-3.1_p2.ebuild,v 1.3 2008/11/22 09:18:20 pva Exp $
 
 inherit autotools kde-functions eutils versionator
 
-MY_P="${PN}-$(replace_version_separator 2 '-')"
-MY_P="${MY_P/p}"
+MY_P=${PN}-$(replace_version_separator 2 '-')
+MY_P=${MY_P/p}
 
 DESCRIPTION="KchmViewer is a feature rich chm file viewer, based on Qt."
 HOMEPAGE="http://www.kchmviewer.net/"
@@ -20,7 +20,7 @@
 	dev-libs/chmlib
 	kde? ( =kde-base/kdelibs-3.5* )"
 
-S="${WORKDIR}/${PN}-$(get_version_component_range 1-2)"
+S=${WORKDIR}/${PN}-$(get_version_component_range 1-2)
 
 pkg_setup() {
 	if use kde; then
@@ -46,8 +46,7 @@
 	unpack ${A}
 	cd "${S}"
 
-	# gcc 4.3 compatibility. Fixes bug 218812.
-	epatch "${FILESDIR}/${P}-gcc43.patch"
+	epatch "${FILESDIR}/${P}-gcc43.patch" #218812
 
 	# broken configure script, assure it doesn't fall back to internal libs
 	echo "# We use the external chmlib!" > lib/chmlib/chm_lib.h
@@ -56,7 +55,10 @@
 src_compile() {
 	set-kdedir 3
 
-	econf $(use_with kde) $(use_with arts) || die
+	econf \
+		--includedir=${KDEDIR}/include \
+		$(use_with kde) \
+		$(use_with arts)
 	emake || die
 }