13 files changed, 16 insertions, 275 deletions
diff --git a/app-doc/kchmviewer/ChangeLog b/app-doc/kchmviewer/ChangeLog
index 2d34d49b415a..10cca26313ef 100644
--- a/app-doc/kchmviewer/ChangeLog
+++ b/app-doc/kchmviewer/ChangeLog
@@ -1,6 +1,11 @@
 # 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.22 2007/03/16 09:21:23 pva Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-doc/kchmviewer/ChangeLog,v 1.23 2007/03/16 10:02:04 pva Exp $
+
+  16 Mar 2007; <pva@gentoo.org> -kchmviewer-1.1.ebuild,
+  -kchmviewer-1.2.ebuild, -kchmviewer-1.3.ebuild, -kchmviewer-2.0.ebuild,
+  -kchmviewer-2.0-r1.ebuild, kchmviewer-3.0.ebuild:
+  Cleaning old versions.
 
 *kchmviewer-3.0 (16 Mar 2007)
 
diff --git a/app-doc/kchmviewer/Manifest b/app-doc/kchmviewer/Manifest
index 5b6ea817c45a..cf9f8b7cdfef 100644
--- a/app-doc/kchmviewer/Manifest
+++ b/app-doc/kchmviewer/Manifest
@@ -10,35 +10,11 @@ AUX kchmviewer-3.0-qt-only-path-fix.diff 412 RMD160 58568476cb155485f29b59dfcda6
 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
-DIST kchmviewer-2.0.tar.gz 765276 RMD160 e05ba681eb4a0e40a8b944c7181924bba61a1950 SHA1 66f54c5e5d8853c39614d3f4d31f854ed3252ae9 SHA256 6d351962e03c60451b1df3a54694ef04c76719e2e93f2c36cd9d68da5b33722c
 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
-SHA256 10bdc22e8d6e9a2b9f800a5b23c6ae98559ee2606af4486cea77903b9e3a406c kchmviewer-1.1.ebuild 1116
-EBUILD kchmviewer-1.2.ebuild 1117 RMD160 40a983635b5a12bf85dacb98ee187a1f13cf9363 SHA1 ce82fafbf29ebdccb49fb3b885cee417e032f9fd SHA256 4793e08faab379af4b8c63ab1266f633e6722f7b23a050fd0c108c62a52bdc8f
-MD5 7a62fa28fcd0b9a810e161a8179f56dc kchmviewer-1.2.ebuild 1117
-RMD160 40a983635b5a12bf85dacb98ee187a1f13cf9363 kchmviewer-1.2.ebuild 1117
-SHA256 4793e08faab379af4b8c63ab1266f633e6722f7b23a050fd0c108c62a52bdc8f kchmviewer-1.2.ebuild 1117
-EBUILD kchmviewer-1.3.ebuild 1117 RMD160 c5203a9e97c63ec281072cf9eea83bf851f9a7c2 SHA1 bf93b576ae6fc208f4a16ae75042dec026070454 SHA256 23e40abaed23694860c91c055abb4cd3eff79d83ccb033b5976a4deeca93b8c8
-MD5 e3ac9d0377035c0441a1f7047f97e338 kchmviewer-1.3.ebuild 1117
-RMD160 c5203a9e97c63ec281072cf9eea83bf851f9a7c2 kchmviewer-1.3.ebuild 1117
-SHA256 23e40abaed23694860c91c055abb4cd3eff79d83ccb033b5976a4deeca93b8c8 kchmviewer-1.3.ebuild 1117
-EBUILD kchmviewer-2.0-r1.ebuild 1294 RMD160 c7dd6373031c18e26d41aeca14073dfbd254c1f0 SHA1 a5b8f628f6491b28b76722d04e974dd0772a6747 SHA256 1774fdb4ef251992c124c4aaf6d73d873e69d5e8afba331f12a1e4814599955e
-MD5 f725ea5be7b198b0fa8b1b4bf9f52c36 kchmviewer-2.0-r1.ebuild 1294
-RMD160 c7dd6373031c18e26d41aeca14073dfbd254c1f0 kchmviewer-2.0-r1.ebuild 1294
-SHA256 1774fdb4ef251992c124c4aaf6d73d873e69d5e8afba331f12a1e4814599955e kchmviewer-2.0-r1.ebuild 1294
-EBUILD kchmviewer-2.0.ebuild 1218 RMD160 9660e0489822208234287fec11225914b5d2ed46 SHA1 996b682dd8e87c83f411e6f01e118ea07f8a3527 SHA256 0e150b54d551d2c6c9953b4eb6797804270291c181524ff959cbb5360f9c6469
-MD5 e5c89afeb32fc87f063addaf439e6843 kchmviewer-2.0.ebuild 1218
-RMD160 9660e0489822208234287fec11225914b5d2ed46 kchmviewer-2.0.ebuild 1218
-SHA256 0e150b54d551d2c6c9953b4eb6797804270291c181524ff959cbb5360f9c6469 kchmviewer-2.0.ebuild 1218
 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
@@ -51,33 +27,18 @@ 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
-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
+EBUILD kchmviewer-3.0.ebuild 1613 RMD160 b0ebfc2cda2d659d37b4e2a4d4c59d437e87a448 SHA1 150d1f84b6ac61aa8203f22d0592137142268aaa SHA256 df1fae6a635987211ac22e875cb10661029e9d67bc4bdbc16f49046d5e2d1630
+MD5 8bc1de6ee6d3427b389ef57eb6627f1b kchmviewer-3.0.ebuild 1613
+RMD160 b0ebfc2cda2d659d37b4e2a4d4c59d437e87a448 kchmviewer-3.0.ebuild 1613
+SHA256 df1fae6a635987211ac22e875cb10661029e9d67bc4bdbc16f49046d5e2d1630 kchmviewer-3.0.ebuild 1613
+MISC ChangeLog 3431 RMD160 6f9c95cb864793c406e62b9e6a018ffc82945182 SHA1 4536b66eb9be1fd86c88467f9f3a39a6186aa69b SHA256 b8e2ac35147d29a584acd82c0f451e4afec4464a0ae020acde3285fc348d4d76
+MD5 db1eb99e48a948ab844f13bb800bf7a1 ChangeLog 3431
+RMD160 6f9c95cb864793c406e62b9e6a018ffc82945182 ChangeLog 3431
+SHA256 b8e2ac35147d29a584acd82c0f451e4afec4464a0ae020acde3285fc348d4d76 ChangeLog 3431
 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 9a05a9a42e0cc032971e417a9d0e9ffb files/digest-kchmviewer-1.1 244
-RMD160 e20eff24bd4f5be0e1b0f4274774f211a41ce833 files/digest-kchmviewer-1.1 244
-SHA256 244dbf377080dbfa3dc1f2c2e8c7a88435151d30a3c2c6713cb80da4308416da files/digest-kchmviewer-1.1 244
-MD5 4a83428ea343e3793ce78335a9276ab8 files/digest-kchmviewer-1.2 244
-RMD160 74a347dbb974dd1a4627a17ec81548d5713c5b19 files/digest-kchmviewer-1.2 244
-SHA256 560e8fa4ee5927e3ae3caba46b21aa39ee68c98f5c1e33fb6a0da2b4ca10f59e files/digest-kchmviewer-1.2 244
-MD5 351ff9eeda4906e707909c78e5be6261 files/digest-kchmviewer-1.3 244
-RMD160 8761221edeafa89603370ce255f5535cbe57ade8 files/digest-kchmviewer-1.3 244
-SHA256 396b36f8d30ca7573bc0c634a058c317d4f06467a8fd8a4e437e7c6ca09202ef files/digest-kchmviewer-1.3 244
-MD5 8369a0025ea435acdae1ecf87170f57e files/digest-kchmviewer-2.0 244
-RMD160 548c42fe5abd7dfbdbdc2540d6db6d8629ffdd98 files/digest-kchmviewer-2.0 244
-SHA256 4eece2212611a5f0d045846067b07dda7b9205d057418a0d6aa8ecd40ad608a9 files/digest-kchmviewer-2.0 244
-MD5 8369a0025ea435acdae1ecf87170f57e files/digest-kchmviewer-2.0-r1 244
-RMD160 548c42fe5abd7dfbdbdc2540d6db6d8629ffdd98 files/digest-kchmviewer-2.0-r1 244
-SHA256 4eece2212611a5f0d045846067b07dda7b9205d057418a0d6aa8ecd40ad608a9 files/digest-kchmviewer-2.0-r1 244
 MD5 e0180a65effae97475e489a98ed492cc files/digest-kchmviewer-2.5 244
 RMD160 4e2809115389ca4f78a8c73bf29a41faec9ac7f2 files/digest-kchmviewer-2.5 244
 SHA256 1255c499bcea16aabd3eab7793ed84377ebe2af21250f9e2133011b7c5acde79 files/digest-kchmviewer-2.5 244
diff --git a/app-doc/kchmviewer/files/digest-kchmviewer-1.1 b/app-doc/kchmviewer/files/digest-kchmviewer-1.1
deleted file mode 100644
index c53821de2686..000000000000
--- a/app-doc/kchmviewer/files/digest-kchmviewer-1.1
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 0346b051ed0b3c9c04790bedf889265a kchmviewer-1.1.tar.gz 557796
-RMD160 96eed8e80df576a6a01842f743134debc84e1b82 kchmviewer-1.1.tar.gz 557796
-SHA256 2314aee92bbd221ded2b15e6f7a6121c2e861633c6584a2a484bd192201ba31c kchmviewer-1.1.tar.gz 557796
diff --git a/app-doc/kchmviewer/files/digest-kchmviewer-1.2 b/app-doc/kchmviewer/files/digest-kchmviewer-1.2
deleted file mode 100644
index 805fadddb2cd..000000000000
--- a/app-doc/kchmviewer/files/digest-kchmviewer-1.2
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 891a32f6cf304f407e1bb170ee431eee kchmviewer-1.2.tar.gz 564001
-RMD160 65dda863e38afe05faebab1c2409654153698179 kchmviewer-1.2.tar.gz 564001
-SHA256 42b711686af97e646c836af4a868db9c0b435c0872cf5a114fa91290e878265f kchmviewer-1.2.tar.gz 564001
diff --git a/app-doc/kchmviewer/files/digest-kchmviewer-1.3 b/app-doc/kchmviewer/files/digest-kchmviewer-1.3
deleted file mode 100644
index b77f400fbd1d..000000000000
--- a/app-doc/kchmviewer/files/digest-kchmviewer-1.3
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 0bda19a63dafd5fbb69ea2e3b7f1fa75 kchmviewer-1.3.tar.gz 567704
-RMD160 04606b978072fc6a579640d8357e949c75bec79e kchmviewer-1.3.tar.gz 567704
-SHA256 316e7b0a4b98187efc3421111e6241ca1173f84deab2302161512d9d390f26d6 kchmviewer-1.3.tar.gz 567704
diff --git a/app-doc/kchmviewer/files/digest-kchmviewer-2.0 b/app-doc/kchmviewer/files/digest-kchmviewer-2.0
deleted file mode 100644
index d6436e397643..000000000000
--- a/app-doc/kchmviewer/files/digest-kchmviewer-2.0
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 94203642266aaecffdcc6c6d516f7635 kchmviewer-2.0.tar.gz 765276
-RMD160 e05ba681eb4a0e40a8b944c7181924bba61a1950 kchmviewer-2.0.tar.gz 765276
-SHA256 6d351962e03c60451b1df3a54694ef04c76719e2e93f2c36cd9d68da5b33722c kchmviewer-2.0.tar.gz 765276
diff --git a/app-doc/kchmviewer/files/digest-kchmviewer-2.0-r1 b/app-doc/kchmviewer/files/digest-kchmviewer-2.0-r1
deleted file mode 100644
index d6436e397643..000000000000
--- a/app-doc/kchmviewer/files/digest-kchmviewer-2.0-r1
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 94203642266aaecffdcc6c6d516f7635 kchmviewer-2.0.tar.gz 765276
-RMD160 e05ba681eb4a0e40a8b944c7181924bba61a1950 kchmviewer-2.0.tar.gz 765276
-SHA256 6d351962e03c60451b1df3a54694ef04c76719e2e93f2c36cd9d68da5b33722c kchmviewer-2.0.tar.gz 765276
diff --git a/app-doc/kchmviewer/kchmviewer-1.1.ebuild b/app-doc/kchmviewer/kchmviewer-1.1.ebuild
deleted file mode 100644
index 0ff6d43ff095..000000000000
--- a/app-doc/kchmviewer/kchmviewer-1.1.ebuild
+++ /dev/null
@@ -1,40 +0,0 @@
-# Copyright 1999-2005 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-doc/kchmviewer/kchmviewer-1.1.ebuild,v 1.1 2005/10/30 16:29:05 carlo 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*
-	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_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-1.2.ebuild b/app-doc/kchmviewer/kchmviewer-1.2.ebuild
deleted file mode 100644
index 76021fc4f5b1..000000000000
--- a/app-doc/kchmviewer/kchmviewer-1.2.ebuild
+++ /dev/null
@@ -1,40 +0,0 @@
-# Copyright 1999-2005 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-doc/kchmviewer/kchmviewer-1.2.ebuild,v 1.1 2005/11/25 11:04:45 greg_g 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*
-	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_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-1.3.ebuild b/app-doc/kchmviewer/kchmviewer-1.3.ebuild
deleted file mode 100644
index 586042ed17af..000000000000
--- a/app-doc/kchmviewer/kchmviewer-1.3.ebuild
+++ /dev/null
@@ -1,40 +0,0 @@
-# Copyright 1999-2005 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-doc/kchmviewer/kchmviewer-1.3.ebuild,v 1.1 2005/11/29 16:57:12 greg_g 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*
-	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_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.0-r1.ebuild b/app-doc/kchmviewer/kchmviewer-2.0-r1.ebuild
deleted file mode 100644
index 768bbed67056..000000000000
--- a/app-doc/kchmviewer/kchmviewer-2.0-r1.ebuild
+++ /dev/null
@@ -1,46 +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.0-r1.ebuild,v 1.3 2006/08/15 17:46:38 carlo 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}
-	# 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-2.0.ebuild b/app-doc/kchmviewer/kchmviewer-2.0.ebuild
deleted file mode 100644
index f36efc8eda75..000000000000
--- a/app-doc/kchmviewer/kchmviewer-2.0.ebuild
+++ /dev/null
@@ -1,44 +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.0.ebuild,v 1.1 2006/02/06 15:51:14 flameeyes Exp $
-
-inherit kde-functions eutils
-
-DESCRIPTION="Qt-based feature rich CHM file viewer."
-HOMEPAGE="http://www.kchmviewer.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*
-	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_compile() {
-	set-kdedir 3
-
-	econf $(use_with kde) $(use_with arts) || die
-	emake || die
-}
-
-src_install() {
-	make DESTDIR="${D}" install || die
-	if use kde; then
-		cd ${S}/kio-msits
-		make DESTDIR="${D}" install || die "install kio-msits failed"
-	fi
-	dodoc ChangeLog
-}
diff --git a/app-doc/kchmviewer/kchmviewer-3.0.ebuild b/app-doc/kchmviewer/kchmviewer-3.0.ebuild
index f1950d20fc7c..2104df4d8fe0 100644
--- a/app-doc/kchmviewer/kchmviewer-3.0.ebuild
+++ b/app-doc/kchmviewer/kchmviewer-3.0.ebuild
@@ -1,6 +1,6 @@
 # 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 $
+# $Header: /var/cvsroot/gentoo-x86/app-doc/kchmviewer/kchmviewer-3.0.ebuild,v 1.2 2007/03/16 10:02:04 pva Exp $
 
 inherit autotools kde-functions eutils
 
@@ -36,7 +36,7 @@ src_unpack() {
 	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 
+	if ! use kde ; then
 		rm -rf admin && mv ../admin . && \
 		epatch "${FILESDIR}"/${P}-qt-only-path-fix.diff && make -f admin/Makefile.common
 	fi