Fix bug #144315.

Package-Manager: portage-2.1.1_pre5-r2

4 files changed, 32 insertions, 10 deletions

diff --git a/app-doc/kchmviewer/ChangeLog b/app-doc/kchmviewer/ChangeLog
index 3af01d561a08..6ba3ba2f1dbe 100644
--- a/app-doc/kchmviewer/ChangeLog
+++ b/app-doc/kchmviewer/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for app-doc/kchmviewer
 # Copyright 1999-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-doc/kchmviewer/ChangeLog,v 1.16 2006/08/15 17:48:53 carlo Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-doc/kchmviewer/ChangeLog,v 1.17 2006/08/19 15:39:38 carlo Exp $
+
+  19 Aug 2006; Carsten Lohrke <carlo@gentoo.org>
+  +files/kchmviewer-2.6-build-Qt.diff, kchmviewer-2.6.ebuild:
+  Fix bug #144315.
 
 *kchmviewer-2.6 (15 Aug 2006)
 
diff --git a/app-doc/kchmviewer/Manifest b/app-doc/kchmviewer/Manifest
index ce30793979ab..a2c5b38bc659 100644
--- a/app-doc/kchmviewer/Manifest
+++ b/app-doc/kchmviewer/Manifest
@@ -2,6 +2,10 @@ AUX kchmviewer-2.5-gcc41.patch 510 RMD160 db21d66ed392cbce3cf06993cc098bad3ecaf4
 MD5 38c09653219e8b651c80336bfbb054bf files/kchmviewer-2.5-gcc41.patch 510
 RMD160 db21d66ed392cbce3cf06993cc098bad3ecaf4e5 files/kchmviewer-2.5-gcc41.patch 510
 SHA256 944d8ffb37f536c3c79b241a4d2da8c57af6faed5f2df6ac76e23a784b9044a7 files/kchmviewer-2.5-gcc41.patch 510
+AUX kchmviewer-2.6-build-Qt.diff 274 RMD160 e1fe73a8027d62a3ef211925f524a671e8547d67 SHA1 3c52544a6dbe62a25cc3de048167540bfc9c5c0f SHA256 9b4ec1697de6e7d462638333ee9722789f98b5eb066e32d1e1cc5f8378b357ff
+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
 DIST kchmviewer-1.1.tar.gz 557796
 DIST kchmviewer-1.2.tar.gz 564001
 DIST kchmviewer-1.3.tar.gz 567704
@@ -32,14 +36,14 @@ EBUILD kchmviewer-2.5.ebuild 1213 RMD160 cc449442bc66f97ca422118195055370c6ebb61
 MD5 a5321dce5bf8f0d3472fddddb018edba kchmviewer-2.5.ebuild 1213
 RMD160 cc449442bc66f97ca422118195055370c6ebb61e kchmviewer-2.5.ebuild 1213
 SHA256 5e80222386cdb35f2a56b8c7de7bb91d753e2b331dfb8a770e4c8426b0e3495e kchmviewer-2.5.ebuild 1213
-EBUILD kchmviewer-2.6.ebuild 1312 RMD160 1797a86bc71f3e9d28001485dc26f458f541bbb9 SHA1 0adde3aac8b93dc9298f874a79134b6cfe26b550 SHA256 597d268417f25f5fbc8a71f74af1a7334965de9019fb2a1e930e2c20723f1aa5
-MD5 f3aa6fda346f0efabe9fc518f65c4001 kchmviewer-2.6.ebuild 1312
-RMD160 1797a86bc71f3e9d28001485dc26f458f541bbb9 kchmviewer-2.6.ebuild 1312
-SHA256 597d268417f25f5fbc8a71f74af1a7334965de9019fb2a1e930e2c20723f1aa5 kchmviewer-2.6.ebuild 1312
-MISC ChangeLog 2381 RMD160 60c971954fcd536250685198d7b3389466294d66 SHA1 ef656f3e729e85d6eb0d7c6582c9ac6236817756 SHA256 26df158a82f240b017c2f8636ddc01d38380f9290937645b3a7cbed93fa6ff54
-MD5 7dff86ee9b2042cb05021c95d2789283 ChangeLog 2381
-RMD160 60c971954fcd536250685198d7b3389466294d66 ChangeLog 2381
-SHA256 26df158a82f240b017c2f8636ddc01d38380f9290937645b3a7cbed93fa6ff54 ChangeLog 2381
+EBUILD kchmviewer-2.6.ebuild 1373 RMD160 fe8dc15934be28c7f320e9d80fa4d859cf962627 SHA1 4583fbc541e59778bca5098b3f632147365161a4 SHA256 9adcbb2c5c294feeec3996809cab1c366e11687a86381815e9db9a7bb43d31fe
+MD5 b4bc9ae4798be5547a5ccea55a02bad1 kchmviewer-2.6.ebuild 1373
+RMD160 fe8dc15934be28c7f320e9d80fa4d859cf962627 kchmviewer-2.6.ebuild 1373
+SHA256 9adcbb2c5c294feeec3996809cab1c366e11687a86381815e9db9a7bb43d31fe kchmviewer-2.6.ebuild 1373
+MISC ChangeLog 2512 RMD160 2ec4260faa751fc62eef671f1c0f736167abab74 SHA1 a599de7161bc2583d3407a12e1631623a6d54db9 SHA256 899b86527f0b83c7e65d8d4d1c3df324a53ea1ab23f931ece2c24d9f7e81dec9
+MD5 6088c5f2d16ffeacbac443e6ac6cf776 ChangeLog 2512
+RMD160 2ec4260faa751fc62eef671f1c0f736167abab74 ChangeLog 2512
+SHA256 899b86527f0b83c7e65d8d4d1c3df324a53ea1ab23f931ece2c24d9f7e81dec9 ChangeLog 2512
 MISC metadata.xml 157 RMD160 09fb7b798f3f68127626e97c69e5215a0513ecbb SHA1 d5ffebb2f4248fc8f65ab21c3af6e4f5dbf8bf6e SHA256 01f6fa4357ce08e8b0f7900a51fa78c7f060fefc7c7da98acaec1e283dd59892
 MD5 bc5757868e9f06d6048259da3a5918aa metadata.xml 157
 RMD160 09fb7b798f3f68127626e97c69e5215a0513ecbb metadata.xml 157
diff --git a/app-doc/kchmviewer/files/kchmviewer-2.6-build-Qt.diff b/app-doc/kchmviewer/files/kchmviewer-2.6-build-Qt.diff
new file mode 100644
index 000000000000..509a2af930dc
--- /dev/null
+++ b/app-doc/kchmviewer/files/kchmviewer-2.6-build-Qt.diff
@@ -0,0 +1,11 @@
+--- src/kde-qt.h.orig	2006-08-19 17:13:53.000000000 +0200
++++ src/kde-qt.h	2006-08-19 17:15:18.000000000 +0200
+@@ -59,7 +59,7 @@
+ 	#include <qmessagebox.h>
+ 	#include <qprogressdialog.h>
+ 
+-	#define i18n(A)		tr(A)
++	#define i18n(A)		QObject::tr(A)
+ 
+ #endif /* USE_KDE */
+ 
diff --git a/app-doc/kchmviewer/kchmviewer-2.6.ebuild b/app-doc/kchmviewer/kchmviewer-2.6.ebuild
index 1dc9091bc75f..cf43349216f0 100644
--- a/app-doc/kchmviewer/kchmviewer-2.6.ebuild
+++ b/app-doc/kchmviewer/kchmviewer-2.6.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2006 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-doc/kchmviewer/kchmviewer-2.6.ebuild,v 1.1 2006/08/15 17:48:53 carlo Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-doc/kchmviewer/kchmviewer-2.6.ebuild,v 1.2 2006/08/19 15:39:38 carlo Exp $
 
 inherit kde-functions eutils
 
@@ -30,9 +30,12 @@ pkg_setup() {
 
 src_unpack() {
 	unpack ${A}
+	cd ${S}
 	# broken configure script, assure it doesn't fall back to internal libs
 	echo "# We use the external chmlib!" > chmlib/chm_lib.h
+	epatch "${FILESDIR}/kchmviewer-2.6-build-Qt.diff"
 }
+
 src_compile() {
 	set-kdedir 3