Version bump. Seems that new version is qt-4 only release. Remove old ebuilds.

Package-Manager: portage-2.1.3.10

16 files changed, 63 insertions, 327 deletions

diff --git a/app-doc/kchmviewer/ChangeLog b/app-doc/kchmviewer/ChangeLog
index ce21163aa52c..b837d7698cd6 100644
--- a/app-doc/kchmviewer/ChangeLog
+++ b/app-doc/kchmviewer/ChangeLog
@@ -1,6 +1,16 @@
 # 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.28 2007/07/23 14:19:01 opfer Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-doc/kchmviewer/ChangeLog,v 1.29 2007/09/28 17:10:51 pva Exp $
+
+*kchmviewer-4.0_beta1 (28 Sep 2007)
+
+  28 Sep 2007; <pva@gentoo.org> -files/kchmviewer-2.5-gcc41.patch,
+  -files/kchmviewer-2.6-build-Qt.diff,
+  -files/kchmviewer-3.0-fix-as-needed.diff,
+  -files/kchmviewer-3.0-qt-only-path-fix.diff, -kchmviewer-2.5.ebuild,
+  -kchmviewer-2.6.ebuild, -kchmviewer-2.7.ebuild, -kchmviewer-3.0.ebuild,
+  +kchmviewer-4.0_beta1.ebuild:
+  Version bump. Seems that new version is qt-4 only release. Remove old ebuilds.
 
   23 Jul 2007; Christian Faulhammer <opfer@gentoo.org>
   kchmviewer-3.1_p2.ebuild:
diff --git a/app-doc/kchmviewer/Manifest b/app-doc/kchmviewer/Manifest
index 018066358526..f38772c7d458 100644
--- a/app-doc/kchmviewer/Manifest
+++ b/app-doc/kchmviewer/Manifest
@@ -1,75 +1,24 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
-AUX kchmviewer-2.5-gcc41.patch 510 RMD160 db21d66ed392cbce3cf06993cc098bad3ecaf4e5 SHA1 7e19162f1beac10002d2acb7820e7a92f48d626a SHA256 944d8ffb37f536c3c79b241a4d2da8c57af6faed5f2df6ac76e23a784b9044a7
-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
-AUX kchmviewer-3.0-fix-as-needed.diff 561 RMD160 bf31641c72044e4afc8b37138b36a2c0183d40d0 SHA1 85c69a46c1e17e4796f0edd75086c863fcdaacf1 SHA256 93f3356a1ae588a425a0e1b9534af69e233bb09662d4b1f96388eae5ef74c3e9
-MD5 248b8714d39593093d078ea7bda738ba files/kchmviewer-3.0-fix-as-needed.diff 561
-RMD160 bf31641c72044e4afc8b37138b36a2c0183d40d0 files/kchmviewer-3.0-fix-as-needed.diff 561
-SHA256 93f3356a1ae588a425a0e1b9534af69e233bb09662d4b1f96388eae5ef74c3e9 files/kchmviewer-3.0-fix-as-needed.diff 561
-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-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
 DIST kchmviewer-3.1-2.tar.gz 945640 RMD160 21a38d0cfcf0d7e32b3de6cf34ad0a9ac8019451 SHA1 b89c0f1e56b820de2419e4890efc5537fefc4b1e SHA256 e73b4ec4b1b6decbd2ab82f670b843a12813d74653ebc6859deffb3b48abf6db
-EBUILD kchmviewer-2.5.ebuild 1213 RMD160 bc21a657701594bc0147d5b51d2800dafa5781bb SHA1 bfcfd5c81105096b30b53c72ef62fe3d2b3a1a5e SHA256 6a45261493da39cf1972d79e233e5c2b619bc1ad81589fa81f3afea16e72c7b3
-MD5 b4a3723ce2c87a8e4de43324d9c771af kchmviewer-2.5.ebuild 1213
-RMD160 bc21a657701594bc0147d5b51d2800dafa5781bb kchmviewer-2.5.ebuild 1213
-SHA256 6a45261493da39cf1972d79e233e5c2b619bc1ad81589fa81f3afea16e72c7b3 kchmviewer-2.5.ebuild 1213
-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
-EBUILD kchmviewer-2.7.ebuild 1320 RMD160 d8ab55065a761c54741a02a34aff5e3c8194ca6a SHA1 f60966640fd1a36490faef6499bb435e7d0ad9a4 SHA256 e4163084021d39e6ff9ce0ed2a3571d404f494802caea29ca62837297873658d
-MD5 3c85653278a67a0bee109b4a2b369da8 kchmviewer-2.7.ebuild 1320
-RMD160 d8ab55065a761c54741a02a34aff5e3c8194ca6a kchmviewer-2.7.ebuild 1320
-SHA256 e4163084021d39e6ff9ce0ed2a3571d404f494802caea29ca62837297873658d kchmviewer-2.7.ebuild 1320
-EBUILD kchmviewer-3.0.ebuild 1713 RMD160 ecd9699158c36ab036999adfaf6b58e3f492761f SHA1 6c75888f4f66a8666dc6425b32f929b2470cc6dc SHA256 1da24c3a99b3bdb161541645848f550e447558ca46ebdc784072cf8923305457
-MD5 47f2262508ef103c1db7370b075186a1 kchmviewer-3.0.ebuild 1713
-RMD160 ecd9699158c36ab036999adfaf6b58e3f492761f kchmviewer-3.0.ebuild 1713
-SHA256 1da24c3a99b3bdb161541645848f550e447558ca46ebdc784072cf8923305457 kchmviewer-3.0.ebuild 1713
+DIST kchmviewer-4.0b1.tar.gz 172453 RMD160 bd8dfdedb17a78c036ca54e07486499c57eb27ec SHA1 1c5fc1626c713b9d354f7d6860e90800627398cc SHA256 811dd869ae3838a2eb7a6a01b8ec779dc3a7dbc943005369b3d85478827bd3eb
 EBUILD kchmviewer-3.1_p2.ebuild 1494 RMD160 d367caa37a752e822e0cc0e0fb87e1094be56f80 SHA1 b7a06055a0678bd149a38d1b29496030006bea9f SHA256 89a0ab6fedc61a5f168d9fc3d59564b50dfdd47a2a3231f48f68660a34bab54b
 MD5 afcfe409cd5b4d8d7afcdf68bf53cb43 kchmviewer-3.1_p2.ebuild 1494
 RMD160 d367caa37a752e822e0cc0e0fb87e1094be56f80 kchmviewer-3.1_p2.ebuild 1494
 SHA256 89a0ab6fedc61a5f168d9fc3d59564b50dfdd47a2a3231f48f68660a34bab54b kchmviewer-3.1_p2.ebuild 1494
-MISC ChangeLog 4083 RMD160 918d4a309a82d793f2d4359fb453df7c54a76db2 SHA1 9b2990339c3965d6e200ddb0f89e163116cf360d SHA256 898c69008cd37cb1cebddf225c2b595d3c7e8df8364d32fa5d96c8cf3ad9ccc2
-MD5 c5329c3b1318900fdb1b3deda27338e3 ChangeLog 4083
-RMD160 918d4a309a82d793f2d4359fb453df7c54a76db2 ChangeLog 4083
-SHA256 898c69008cd37cb1cebddf225c2b595d3c7e8df8364d32fa5d96c8cf3ad9ccc2 ChangeLog 4083
+EBUILD kchmviewer-4.0_beta1.ebuild 853 RMD160 82dbaa6ac5d7abc2935dc2188511a1f64dc511fa SHA1 e3890dfa378062e13096ffa1ff60f09f0739b559 SHA256 a8f751e8158632d73b85a6cc55ed44e58065ff2b5bba1f8e80eb5a9e657449c8
+MD5 4f4548f618656a9017ce4dac8874f427 kchmviewer-4.0_beta1.ebuild 853
+RMD160 82dbaa6ac5d7abc2935dc2188511a1f64dc511fa kchmviewer-4.0_beta1.ebuild 853
+SHA256 a8f751e8158632d73b85a6cc55ed44e58065ff2b5bba1f8e80eb5a9e657449c8 kchmviewer-4.0_beta1.ebuild 853
+MISC ChangeLog 4527 RMD160 024a8639a17788b060ce13f51c668cbe790860d1 SHA1 7b4fe4821065a54e7b675ea58a9f3a212397c22a SHA256 3ac77a9ff3c443441616a03ed2e5d7352f7efbfa60edc3aed669cb4e36a05c0f
+MD5 a17841628e37ce865f313a6790332a74 ChangeLog 4527
+RMD160 024a8639a17788b060ce13f51c668cbe790860d1 ChangeLog 4527
+SHA256 3ac77a9ff3c443441616a03ed2e5d7352f7efbfa60edc3aed669cb4e36a05c0f ChangeLog 4527
 MISC metadata.xml 897 RMD160 7d20769aac85be3dbcdeb662a0e71a67c90413a1 SHA1 f023e57c6fc9e15a961f7e73b251ae4882f32b6f SHA256 8bf8c96465c90869082f2ecf1836c160549e26814d5ec38b7a9d7fe5947d9e1b
 MD5 07c8bb5ee028fbbae21335bd33e80318 metadata.xml 897
 RMD160 7d20769aac85be3dbcdeb662a0e71a67c90413a1 metadata.xml 897
 SHA256 8bf8c96465c90869082f2ecf1836c160549e26814d5ec38b7a9d7fe5947d9e1b metadata.xml 897
-MD5 e0180a65effae97475e489a98ed492cc files/digest-kchmviewer-2.5 244
-RMD160 4e2809115389ca4f78a8c73bf29a41faec9ac7f2 files/digest-kchmviewer-2.5 244
-SHA256 1255c499bcea16aabd3eab7793ed84377ebe2af21250f9e2133011b7c5acde79 files/digest-kchmviewer-2.5 244
-MD5 67dc8f2c1b08ccc03283a520dc793a85 files/digest-kchmviewer-2.6 244
-RMD160 e5364dcad34e4fb5a9b87f5190f08cd7caf37a94 files/digest-kchmviewer-2.6 244
-SHA256 cf36399615c6906ce01e2e774cd4a490dab39e880403006e89d4b88164b08ddc files/digest-kchmviewer-2.6 244
-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
 MD5 1ec0cd2e910ce99ee9aae95f9bc12d79 files/digest-kchmviewer-3.1_p2 250
 RMD160 daaddfcae2b8586406830b50b0d0cdf827a0e23f files/digest-kchmviewer-3.1_p2 250
 SHA256 fca7df462299607eca35c62a7cb7c3d86d766bdf0733c9045973f5caf843806c files/digest-kchmviewer-3.1_p2 250
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.4.7 (GNU/Linux)
-
-iD8DBQFGpLjTNQqtfCuFneMRAvbrAJ0fLbjg0MSlZkA8lgbpEPmATGIRQgCePKsk
-Rc/SuleVx3I+ynVoS+ETuSM=
-=o9hi
------END PGP SIGNATURE-----
+MD5 7077ac9178e4b405935fbb319f72d446 files/digest-kchmviewer-4.0_beta1 250
+RMD160 86e92921c33a7c8663ebb12200916651b62b61ae files/digest-kchmviewer-4.0_beta1 250
+SHA256 ad48360d40363cda38a407cb081e4b68c1f18b12b7fb280f2706135a31665155 files/digest-kchmviewer-4.0_beta1 250
diff --git a/app-doc/kchmviewer/files/digest-kchmviewer-2.5 b/app-doc/kchmviewer/files/digest-kchmviewer-2.5
deleted file mode 100644
index b98092bd8c00..000000000000
--- a/app-doc/kchmviewer/files/digest-kchmviewer-2.5
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 31aa10f89b92ec5323fef7c26b1e1eed kchmviewer-2.5.tar.gz 659755
-RMD160 be64def4cfa8e0161826ca2fdc5f1658b1e602f2 kchmviewer-2.5.tar.gz 659755
-SHA256 760dcbbaf426113ff6f0a4c5ea3c5023c597b2ec096d2bde8e15635d58827197 kchmviewer-2.5.tar.gz 659755
diff --git a/app-doc/kchmviewer/files/digest-kchmviewer-2.6 b/app-doc/kchmviewer/files/digest-kchmviewer-2.6
deleted file mode 100644
index 044754572b8a..000000000000
--- a/app-doc/kchmviewer/files/digest-kchmviewer-2.6
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 7898095c413b4262c5aff6bf5fcaf25b kchmviewer-2.6.tar.gz 671666
-RMD160 8a774e37e1e5824a4ff46123d54f246a1389974a kchmviewer-2.6.tar.gz 671666
-SHA256 25201d7ddb685f9c4ee55d134f61b239e786193cabaa263b4951aeba45045266 kchmviewer-2.6.tar.gz 671666
diff --git a/app-doc/kchmviewer/files/digest-kchmviewer-2.7 b/app-doc/kchmviewer/files/digest-kchmviewer-2.7
deleted file mode 100644
index de8f320e4357..000000000000
--- a/app-doc/kchmviewer/files/digest-kchmviewer-2.7
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 f7bb9fb4b10f351f93d32a5ebca5e078 kchmviewer-2.7.tar.gz 685588
-RMD160 6014d7f9ce68fb6793d026c39ce968dd7f953815 kchmviewer-2.7.tar.gz 685588
-SHA256 d6b1fd711e00ff9ed71adcbd1a8e8a052d64867830031ade415534e194f9fe01 kchmviewer-2.7.tar.gz 685588
diff --git a/app-doc/kchmviewer/files/digest-kchmviewer-3.0 b/app-doc/kchmviewer/files/digest-kchmviewer-3.0
deleted file mode 100644
index ea74c224202e..000000000000
--- a/app-doc/kchmviewer/files/digest-kchmviewer-3.0
+++ /dev/null
@@ -1,6 +0,0 @@
-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/digest-kchmviewer-4.0_beta1 b/app-doc/kchmviewer/files/digest-kchmviewer-4.0_beta1
new file mode 100644
index 000000000000..5bb7fe21db9a
--- /dev/null
+++ b/app-doc/kchmviewer/files/digest-kchmviewer-4.0_beta1
@@ -0,0 +1,3 @@
+MD5 e7a00baace31bc47f6db53e018889031 kchmviewer-4.0b1.tar.gz 172453
+RMD160 bd8dfdedb17a78c036ca54e07486499c57eb27ec kchmviewer-4.0b1.tar.gz 172453
+SHA256 811dd869ae3838a2eb7a6a01b8ec779dc3a7dbc943005369b3d85478827bd3eb kchmviewer-4.0b1.tar.gz 172453
diff --git a/app-doc/kchmviewer/files/kchmviewer-2.5-gcc41.patch b/app-doc/kchmviewer/files/kchmviewer-2.5-gcc41.patch
deleted file mode 100644
index f6fd7e656d39..000000000000
--- a/app-doc/kchmviewer/files/kchmviewer-2.5-gcc41.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- ./origin/src/iconstorage.h	2006-04-02 04:09:14.000000000 +0200
-+++ ./kchmviewer-2.5/src/iconstorage.h	2006-04-07 09:41:34.000000000 +0200
-@@ -57,7 +57,7 @@
- 	const QPixmap * getBookIconPixmap (unsigned int id);
- 	const QPixmap * getToolbarPixmap (pixmap_index_t pix);
- 	const QPixmap * getApplicationIcon();
--	const QPixmap * KCHMIconStorage::getCloseWindowIcon();
-+	const QPixmap * getCloseWindowIcon();
- 
- private:
- 	const QPixmap * returnOrLoadImage (unsigned int id, const png_memory_image_t * image);
diff --git a/app-doc/kchmviewer/files/kchmviewer-2.6-build-Qt.diff b/app-doc/kchmviewer/files/kchmviewer-2.6-build-Qt.diff
deleted file mode 100644
index 509a2af930dc..000000000000
--- a/app-doc/kchmviewer/files/kchmviewer-2.6-build-Qt.diff
+++ /dev/null
@@ -1,11 +0,0 @@
---- 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/files/kchmviewer-3.0-fix-as-needed.diff b/app-doc/kchmviewer/files/kchmviewer-3.0-fix-as-needed.diff
deleted file mode 100644
index 9d889c409d8b..000000000000
--- a/app-doc/kchmviewer/files/kchmviewer-3.0-fix-as-needed.diff
+++ /dev/null
@@ -1,13 +0,0 @@
---- ./src/Makefile.am.orig	2007-03-13 07:22:31.000000000 +0300
-+++ ./src/Makefile.am	2007-03-26 12:38:43.000000000 +0400
-@@ -18,8 +18,8 @@
- SUBDIRS = $(LIB_KDEEXTRADIR) . pics
- 
- # the library search path.
--kchmviewer_LDADD = $(top_builddir)/lib/libchmfile/libchmfile.a $(CHM_LIBS) \
--	$(LIB_QT) $(LIB_KDEUI) $(LIB_KHTML) $(LIB_KDEEXTRA)
-+kchmviewer_LDADD = $(top_builddir)/lib/libchmfile/libchmfile.a  $(LIB_KDEEXTRA) \
-+	$(CHM_LIBS) $(LIB_QT) $(LIB_KDEUI) $(LIB_KHTML)
- kchmviewer_LDFLAGS = $(QT_LDFLAGS) $(KDE_LDFLAGS) -L../lib/chmlib/
- 
- METASOURCES = AUTO
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
deleted file mode 100644
index a40baf7f669a..000000000000
--- a/app-doc/kchmviewer/files/kchmviewer-3.0-qt-only-path-fix.diff
+++ /dev/null
@@ -1,12 +0,0 @@
---- ./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-2.5.ebuild b/app-doc/kchmviewer/kchmviewer-2.5.ebuild
deleted file mode 100644
index b34e0f503458..000000000000
--- a/app-doc/kchmviewer/kchmviewer-2.5.ebuild
+++ /dev/null
@@ -1,47 +0,0 @@
-# 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.5.ebuild,v 1.5 2006/10/10 00:23:19 jhuebel Exp $
-
-inherit kde-functions eutils
-
-DESCRIPTION="Qt-based feature rich CHM file viewer."
-HOMEPAGE="http://kchmviewer.sourceforge.net/"
-SRC_URI="mirror://sourceforge/kchmviewer/${P}.tar.gz"
-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}"
-
-	epatch "${FILESDIR}/${P}-gcc41.patch"
-}
-src_compile() {
-	set-kdedir 3
-
-	econf $(use_with kde) $(use_with arts) || die
-	emake || die
-}
-
-src_install() {
-	make DESTDIR="${D}" install || die
-	dodoc ChangeLog
-}
diff --git a/app-doc/kchmviewer/kchmviewer-2.6.ebuild b/app-doc/kchmviewer/kchmviewer-2.6.ebuild
deleted file mode 100644
index cf43349216f0..000000000000
--- a/app-doc/kchmviewer/kchmviewer-2.6.ebuild
+++ /dev/null
@@ -1,49 +0,0 @@
-# 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.2 2006/08/19 15:39:38 carlo Exp $
-
-inherit 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"
-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!" > chmlib/chm_lib.h
-	epatch "${FILESDIR}/kchmviewer-2.6-build-Qt.diff"
-}
-
-src_compile() {
-	set-kdedir 3
-
-	econf $(use_with kde) $(use_with arts) || die
-	emake || die
-}
-
-src_install() {
-	make DESTDIR="${D}" install || die
-	dodoc ChangeLog
-}
diff --git a/app-doc/kchmviewer/kchmviewer-2.7.ebuild b/app-doc/kchmviewer/kchmviewer-2.7.ebuild
deleted file mode 100644
index e34e4f3b52ee..000000000000
--- a/app-doc/kchmviewer/kchmviewer-2.7.ebuild
+++ /dev/null
@@ -1,48 +0,0 @@
-# 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.7.ebuild,v 1.1 2006/12/09 09:17:46 pva Exp $
-
-inherit 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"
-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!" > chmlib/chm_lib.h
-}
-
-src_compile() {
-	set-kdedir 3
-
-	econf $(use_with kde) $(use_with arts) || die
-	emake || die
-}
-
-src_install() {
-	make DESTDIR="${D}" install || die
-	dodoc ChangeLog
-}
diff --git a/app-doc/kchmviewer/kchmviewer-3.0.ebuild b/app-doc/kchmviewer/kchmviewer-3.0.ebuild
deleted file mode 100644
index 0e284ac923d8..000000000000
--- a/app-doc/kchmviewer/kchmviewer-3.0.ebuild
+++ /dev/null
@@ -1,57 +0,0 @@
-# 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.4 2007/03/26 08:53:31 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
-		mirror://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
-
-	rm -rf admin && mv ../admin .
-	sed -i -e \
-	"s:{datadir}/applnk:{datadir}/applications:" admin/acinclude.m4.in
-	# Apply patch for broken paths only when without kde. See bug #129225.
-	epatch "${FILESDIR}"/${P}-qt-only-path-fix.diff
-	epatch "${FILESDIR}"/${P}-fix-as-needed.diff
-	make -f admin/Makefile.common
-}
-
-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
-}
diff --git a/app-doc/kchmviewer/kchmviewer-4.0_beta1.ebuild b/app-doc/kchmviewer/kchmviewer-4.0_beta1.ebuild
new file mode 100644
index 000000000000..cef0bb2c0ab5
--- /dev/null
+++ b/app-doc/kchmviewer/kchmviewer-4.0_beta1.ebuild
@@ -0,0 +1,37 @@
+# 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-4.0_beta1.ebuild,v 1.1 2007/09/28 17:10:51 pva Exp $
+
+inherit qt4 fdo-mime
+
+MY_P="${PN}-${PV/_beta/b}"
+
+DESCRIPTION="KchmViewer is a feature rich chm file viewer, based on Qt."
+HOMEPAGE="http://www.kchmviewer.net/"
+SRC_URI="mirror://sourceforge/kchmviewer/${MY_P}.tar.gz"
+LICENSE="GPL-2"
+
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+DEPEND="$(qt4_min_version 4.2)
+	app-doc/chmlib"
+
+S=${WORKDIR}/${MY_P}
+
+src_compile() {
+	eqmake4
+	emake || die "make failed"
+}
+
+src_install() {
+	dobin bin/kchmviewer || die "dobin kchmviewer failed"
+	insinto /usr/share/applications
+	doins lib/kio-msits/kchmviewer.desktop
+	dodoc ChangeLog README
+}
+
+pkg_postinst() {
+	fdo-mime_desktop_database_update
+}