Spring cleaning.

Package-Manager: portage-2.1.4.4
RepoMan-Options: --force

17 files changed, 15 insertions, 3063 deletions

diff --git a/kde-base/kdelibs/ChangeLog b/kde-base/kdelibs/ChangeLog
index efd65560dbf4..6388b9652543 100644
--- a/kde-base/kdelibs/ChangeLog
+++ b/kde-base/kdelibs/ChangeLog
@@ -1,6 +1,16 @@
 # ChangeLog for kde-base/kdelibs
 # Copyright 2002-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kdelibs/ChangeLog,v 1.509 2008/02/15 23:49:33 zlin Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kdelibs/ChangeLog,v 1.510 2008/02/18 13:15:01 ingmar Exp $
+
+  18 Feb 2008; Ingmar Vanhassel <ingmar@gentoo.org>
+  -kdelibs-3.5.5-r10.ebuild, -kdelibs-3.5.6-r7.ebuild,
+  -kdelibs-3.5.6-r8.ebuild, -kdelibs-3.5.6-r9.ebuild,
+  -kdelibs-3.5.6-r10.ebuild, -kdelibs-3.5.7.ebuild,
+  -kdelibs-3.5.7-r1.ebuild, -kdelibs-3.5.7-r2.ebuild,
+  -kdelibs-3.5.7-r3.ebuild, -kdelibs-3.5.8.ebuild, -kdelibs-3.5.8-r1.ebuild,
+  -kdelibs-3.5.8-r2.ebuild, -kdelibs-4.0.0.ebuild, -kdelibs-4.0.0-r1.ebuild,
+  -kdelibs-4.0.1.ebuild:
+  Spring cleaning.
 
 *kdelibs-4.0.1-r1 (15 Feb 2008)
 
diff --git a/kde-base/kdelibs/Manifest b/kde-base/kdelibs/Manifest
index 420056c38dbb..7cefb23b8970 100644
--- a/kde-base/kdelibs/Manifest
+++ b/kde-base/kdelibs/Manifest
@@ -22,46 +22,18 @@ AUX kdelibs-4.0.0-flac-1.1.3.patch 1465 RMD160 45c12cbce55bca381929611396449cd78
 AUX kdelibs-4.0.1-X11-optional.patch 6103 RMD160 ff7c315d65204253cc3ed2fa90e45b5dbef709d8 SHA1 2093a73b17246d39b0518a8ccb1162caed263aee SHA256 398bde6b24e7fb3bf7325ef1f4409f02839baee52ac20bb041f623acd1900b5e
 AUX kdelibs-4.0.1-alsa-optional.patch 1742 RMD160 ea660d1148488fdac27970587535ec29acd3878f SHA1 53a3d7658ca700a7e8b642e7f66b69b8d25774c8 SHA256 b9107dd43916c015a9392ada81bdfebeff91d2c136eeaa01fb1c89ddd89fd914
 AUX konqueror-3.5.7-185603-spoofing.diff 1099 RMD160 4c870aa06611163ebcd57a1a0857f9decbbe5620 SHA1 de60f5f62aceb5faf522e22c5fa160bf08e80fe3 SHA256 bc74315716148b4b088de127ff3586680698ced775c3fe5792597f09e8f732d6
-DIST kdelibs-3.5-patchset-05.tar.bz2 36423 RMD160 684bb235f3b5b3cb900632e11aa912670f641b96 SHA1 138232cf05ab131a51f3b3febfdd8a3cbc42d45f SHA256 f237ccd3a35c629740355fbcf69b0d706690acac832a4d35db5c0d3a30235e0a
-DIST kdelibs-3.5-patchset-08.tar.bz2 19973 RMD160 ea2edb4973cca353baabc89559f11c3db76c9ab2 SHA1 4c17a0b5577e98e28444f5e038ed06e3b2382c12 SHA256 24461470100d91c1374f5257be5e73767389df9ce8fb9e26af8b6b2030c3963a
-DIST kdelibs-3.5-patchset-09.tar.bz2 19635 RMD160 c4b60c466ba1625c61259b075fd2b7815b5c1b06 SHA1 7bb4d04c5256d2ca2dc5acc8ea12d4b35a1c347c SHA256 d48a856f2fefe79d3b2064b506ba24cf37b5071cdbbb4eea3cdd78c65a38a94b
-DIST kdelibs-3.5-patchset-10.tar.bz2 19407 RMD160 ae0617dbff497751b51859d55ae45a756e69b0c0 SHA1 0289be2b16631b3dec61d738d208a189e175a592 SHA256 6fca1c1718bb628c5980da797858eeef003e57ae0f1ba89ffbd1afe20d9df975
-DIST kdelibs-3.5-patchset-11.tar.bz2 20053 RMD160 bb22719ee4aaf26a23057d2f459f738ad652c918 SHA1 759cfc225a29ef03ff6fec6e6ca1adba51f76e7d SHA256 c80843023f010b4971de0308105f47d08491794ff640d3c08b34d8bbdb6434a8
-DIST kdelibs-3.5-patchset-12.tar.bz2 21970 RMD160 9559e44e5d2205c2d5e0de8459eac898c3193933 SHA1 92452f667ed54d6a15f94d601f1544c8ad30de81 SHA256 0f936758437896ea6ee4332c64bd78ce0d03fd4924d53e29fad6a0de3cf63946
-DIST kdelibs-3.5-patchset-13.tar.bz2 23234 RMD160 d0c3eb1438cfe03111b41039f1fd53745c8d46a6 SHA1 a0d242a210da0fe35242d95fbcf61e859a202208 SHA256 6f277b6fa01490e1efdb9849e43d373d05c600384162eb9d42ba14f2df43bdc5
 DIST kdelibs-3.5-patchset-14.tar.bz2 23248 RMD160 223ad8aa6d3dab3a6e23a89e00eaf2e90bab399e SHA1 5d50fff6b6a26d8abffa4dda7360b42e0fc29eac SHA256 50d1517fbb3b70890b1858533a77fb0e6e1e72612e155ebe5350e8fea7405273
-DIST kdelibs-3.5.5-seli-xinerama.patch.bz2 5470 RMD160 46ed378f1ff2f7e2fa113aa0bf51eae1758264f9 SHA1 1f1e7a02e0dfc35fd2d27d8983a16e53e42397c0 SHA256 8d002a55954aabdb91a534a1b1f1f37c706faebbae0398fb5a2ff29eeb66954c
-DIST kdelibs-3.5.5.tar.bz2 15486690 RMD160 8e389869f9a53445754c76a0f7535ef2fffc6d03 SHA1 7961818e41e22cce7c58219c4eb63ed5fbb94307 SHA256 e487cdd56aa14eec3e100501a5e14658c6329fac30ea0ce812c860e3564c31e3
-DIST kdelibs-3.5.6.tar.bz2 15509460 RMD160 ce8c088e13f0e59238719600da9c768eac58b57d SHA1 2cc15499bd2191bd9333cfd1892b5ecf1199fbfd SHA256 06766202c6ae21277b7879f363ed88fde8016586ec8c94deb59be260f2231b5c
-DIST kdelibs-3.5.7-seli-xinerama.patch.bz2 5226 RMD160 9eab19cc60cb71d66c0e074242b691c5e8c0c391 SHA1 ffd91a55dba7b66a92bfb4c281ce3d76870d7550 SHA256 6f710ca8d0b3c4789751a1e4630442d04830a8f5aef163d9fd6823bbd6e4e202
-DIST kdelibs-3.5.7.tar.bz2 15576038 RMD160 006c57ef85956ed3903749cace254bdfdf2f347e SHA1 45f278311f20d2eb317f2175259f861c0bcf17a9 SHA256 05bc5d0d18b787d964f7c45cc078b047d450d3ddc28b1bde839a26a2eda2c5d9
 DIST kdelibs-3.5.8-seli-xinerama.patch.bz2 5230 RMD160 26efc6620d176414b3b771145a7c00db11c3df6b SHA1 4f4daaa60fbf0c3c582400f33833b9d73c26af4a SHA256 389a31d7e3f44eca5984842d66fa19a8a9f6f11fd6dac134cfd1e4d24e7fb174
 DIST kdelibs-3.5.8.tar.bz2 15557343 RMD160 e3524ca8613fca338a0530213e921fbfae56e866 SHA1 b524a5d9969e7319bb5ffb926a39fd6afb39b2ed SHA256 779f563fdf0385b973f2238f04d82b5729aefe1c949e4d29482b6bb170aa3fe6
-DIST kdelibs-4.0.0.tar.bz2 9047472 RMD160 9261a9138069d2ad85a47d9b86ba528a6fb58f77 SHA1 a740cb2e18b4dcbc0454efcae018b9b24db1e0d4 SHA256 ea6700bd200725bca504214f5e186487ad62894879e534cf6955d049c6cacc2d
 DIST kdelibs-4.0.1.tar.bz2 9061224 RMD160 d447a38d60de9dc1229c3be27274f35c389ec06c SHA1 261bb69a8e1168c4890a4e7bf9f909c5bab1a039 SHA256 fae816d9e23932ff036f1c7c7b35e8fa90ae99c2e0836f670b6d28778e099a30
-EBUILD kdelibs-3.5.5-r10.ebuild 6466 RMD160 9f8614e25835648132eaf4d80b9635b502a5ee32 SHA1 83e68a74a431b661ad056b26a61a6bdbac402ea7 SHA256 e774caf21c5f7d0dee157f2ac5929933b63f3623004029f10579411a8a8fa10f
-EBUILD kdelibs-3.5.6-r10.ebuild 5970 RMD160 104b94245e7bd8817c8b67f894b6feef96b2280d SHA1 a5ba0a632a540675630152965f13791edbf5d03c SHA256 c137170556923651f01fcbf04a2f1383dae7701695e7dcd20d7b201cc74d7f06
-EBUILD kdelibs-3.5.6-r7.ebuild 6250 RMD160 c5e971205a632c1cef640b7f70504a8fcf03ee7e SHA1 a98cc863fde0167e26fe91c6e584a64b089ffe41 SHA256 3affcc8c7191b4c2db1d6a9c544039624ca9b15ac6dd6b8f52be9eeae50f2ab5
-EBUILD kdelibs-3.5.6-r8.ebuild 5968 RMD160 01b3904f2f8aa9841d21cc5ef5613cd3448af022 SHA1 ada73581ce2be82e7186be2dc4da880bd481adbb SHA256 664923cbb0e94818cfa92946e78a7872c73605c9037e2477094e6079f2d8dd93
-EBUILD kdelibs-3.5.6-r9.ebuild 5969 RMD160 ae2d8a297aa1ffd0d415a3ad6e208c0b76dd8af0 SHA1 aae3a158fa32a9ff6907fc75c1f38ead326dcfc4 SHA256 2ac496a9005da42f31fae96231282f25705fdcd034fb9e20f0f24ee86de040ea
-EBUILD kdelibs-3.5.7-r1.ebuild 5980 RMD160 1673334736bb6614a898c258b7cf6fa26f52f4cf SHA1 e48266a2af3d20ab9419e7ba2dc212b8316379c4 SHA256 7dca1e34f8c60a58aaf129488139477b9391465f4f5708e48a756b5a669ecf27
-EBUILD kdelibs-3.5.7-r2.ebuild 5984 RMD160 fa5e281e5293d486de7ab15050cdbd111f4a45f4 SHA1 408ae66af1bd6d5f994b8ed22800d7092628da50 SHA256 941db1e66422eaf481f27af94e76dd861cd0b5fb145e04d7871343f431c48512
-EBUILD kdelibs-3.5.7-r3.ebuild 6163 RMD160 d3b4983153674538ef5b5febd0b651b69afc3a3f SHA1 8e048861515dfc6f582c070fafd0b74655c95c5e SHA256 255a8b058c1bd701c6345b83dbe436897f77240a8f2fb99aeb2a29961748c038
-EBUILD kdelibs-3.5.7.ebuild 6010 RMD160 7c16918e0bfacb4b293bdb5c729ec1c4c2e69ff6 SHA1 fe2cd018d634674f793aa38ebdc13d8dec6708a7 SHA256 8c13c4ed11eeee80b3d98470f9cd18e1f8591dcc0e6a5ec70ab0a707264debd9
-EBUILD kdelibs-3.5.8-r1.ebuild 6064 RMD160 6f772b2a8bcb2c578bb5200f2d0f27fc65b94a78 SHA1 f7b4bd67a93217af9c17ffada4b8efce04bf2e0d SHA256 bb7dd3ecd48e5a6bf6d5da3b7dd0e47acd8663386345847e09ef6de4b497886f
-EBUILD kdelibs-3.5.8-r2.ebuild 6059 RMD160 3285052f107b87d189f7aa9e43e816806c422c8a SHA1 b29d9601a73e3c11d6c749c73e51c2d4ed7098bb SHA256 6c68727df4d217956ad0df1308d3db098a32c31bd010827c8c1564bef1da9948
 EBUILD kdelibs-3.5.8-r3.ebuild 6052 RMD160 cdd77b3ae267290423d98fa6e6affb2d9e14da2d SHA1 75edc05c64b85f0c585d852ddb457bba1ec0f050 SHA256 451c6782208a301b12611077d31a762d638bb113ea5aee52c7fcb5b03fad9518
-EBUILD kdelibs-3.5.8.ebuild 5971 RMD160 550508c36f061d6826f0e5c2ab2891c83a56e8fc SHA1 ce4c0049ab32e4bfc17ea9939c067f3c060aa3f2 SHA256 3202468c475c995413d4ce172effa49cc49b5e822b16536f2adbe77919fc65c7
-EBUILD kdelibs-4.0.0-r1.ebuild 5914 RMD160 54b86eb23bbc0d0eba5b2d3ab7278916bc2d229b SHA1 ae7caadf47898cbf40560dc9d058f9011fb3f8f5 SHA256 5e86d8fece80ef0d720dc2cd9720da6be4b19ecac59caf278164732718d885b4
-EBUILD kdelibs-4.0.0.ebuild 5879 RMD160 a43827cc1699ca0d43095485752722bc55d28f3d SHA1 87fb1dad83dcf493d74ee8de6c32bed1052400d6 SHA256 9235cd2a84e9292ad30d773cd80b7d95b41350521cff0463bd2e64a2ce68ec06
 EBUILD kdelibs-4.0.1-r1.ebuild 6089 RMD160 8ca142125e560192f62f96b2fe270dd8f6308b66 SHA1 bc940d6df17c4844d6307d1b3814ca8e726c6bf1 SHA256 db51acc85988791d234272e0bec338966ab3173cd9a93fc2ed5609a4d57d185a
-EBUILD kdelibs-4.0.1.ebuild 5831 RMD160 a3e1d75b9c1b356a49cf303a01ec12347e37ff29 SHA1 b8b95876317982f0e5d4d4ea0d54fb2be20d85a6 SHA256 75abd8d4035f42150e98818f9c8aa0671e7947fa19060d146aad37ab9826c14c
-MISC ChangeLog 82667 RMD160 cc5649de850299cc602a43dbd5e45c1599aeb1da SHA1 b451badeb1acd34334d322cf8f12bb73895632af SHA256 f58a3a6d284d6f6573d789b1d0cd8ae36a139d8381eda2db4db5263562e96528
+MISC ChangeLog 83135 RMD160 6c1ebb521cc388bf1b33fc58672c0c0046306f58 SHA1 537e12efaac13427be931067e9431ac5797465ef SHA256 1a0ff515803486635e29d1609a0163874ce6ef4f7137688a2f6724f6f1d991b8
 MISC metadata.xml 156 RMD160 ecce3b981f150c45ae1e84e2d208e678d6124259 SHA1 b64f7c0b4e5db816d82ad19848f72118af129d35 SHA256 2f4da28506b9d4185f320f67a6191d30c7a921217ed4447ed46ea0bc4aefc79a
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.7 (GNU/Linux)
 
-iD8DBQFHtiTnfxJ68Jl1NeERAue6AJ471XpZumrbKxT0H8mrPZ+xm+n+hQCgwjL9
-kS7301Gb8I5GslDCPyyVzSE=
-=P08j
+iD8DBQFHuYSmB18eXLOpYdkRAr0YAJ9M9az4StgmuIT6kOE0rLYXPiynpgCfZOeK
+fo1HGUAu6LCWd1L5t3IIFC8=
+=RG/h
 -----END PGP SIGNATURE-----
diff --git a/kde-base/kdelibs/kdelibs-3.5.5-r10.ebuild b/kde-base/kdelibs/kdelibs-3.5.5-r10.ebuild
deleted file mode 100644
index 968484051865..000000000000
--- a/kde-base/kdelibs/kdelibs-3.5.5-r10.ebuild
+++ /dev/null
@@ -1,211 +0,0 @@
-# Copyright 1999-2007 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kdelibs/kdelibs-3.5.5-r10.ebuild,v 1.16 2007/08/30 22:22:46 philantrop Exp $
-
-inherit kde flag-o-matic eutils multilib
-set-kdedir 3.5
-
-DESCRIPTION="KDE libraries needed by all KDE programs."
-HOMEPAGE="http://www.kde.org/"
-SRC_URI="mirror://kde/stable/${PV}/src/${P}.tar.bz2
-	mirror://gentoo/kdelibs-3.5-patchset-05.tar.bz2
-	mirror://gentoo/${P}-seli-xinerama.patch.bz2"
-
-LICENSE="GPL-2 LGPL-2"
-SLOT="3.5"
-KEYWORDS="alpha amd64 hppa ia64 mips ppc ppc64 sparc x86 ~x86-fbsd"
-IUSE="acl alsa arts cups doc jpeg2k kerberos legacyssl utempter openexr spell ssl tiff
-zeroconf avahi kernel_linux fam lua linguas_he kdehiddenvisibility"
-
-# kde.eclass has kdelibs in DEPEND, and we can't have that in here.
-# so we recreate the entire DEPEND from scratch.
-
-# Added aspell-en as dependency to work around bug 131512.
-RDEPEND="$(qt_min_version 3.3.3)
-	arts? ( ~kde-base/arts-${PV} )
-	app-arch/bzip2
-	>=media-libs/freetype-2
-	media-libs/fontconfig
-	>=dev-libs/libxslt-1.1.16
-	>=dev-libs/libxml2-2.6.6
-	>=dev-libs/libpcre-4.2
-	media-libs/libart_lgpl
-	net-dns/libidn
-	acl? ( kernel_linux? ( sys-apps/acl ) )
-	ssl? ( >=dev-libs/openssl-0.9.7d )
-	alsa? ( media-libs/alsa-lib )
-	cups? ( >=net-print/cups-1.1.19 )
-	tiff? ( media-libs/tiff )
-	kerberos? ( virtual/krb5 )
-	jpeg2k? ( media-libs/jasper )
-	openexr? ( >=media-libs/openexr-1.2.2-r2 )
-	zeroconf? (	!avahi? ( net-misc/mDNSResponder !kde-misc/kdnssd-avahi ) )
-	fam? ( virtual/fam )
-	virtual/ghostscript
-	utempter? ( sys-libs/libutempter )
-	!kde-base/kde-env
-	lua? ( dev-lang/lua )
-	spell? ( app-text/aspell app-dicts/aspell-en )"
-
-DEPEND="${RDEPEND}
-	doc? ( app-doc/doxygen )
-	sys-devel/gettext"
-
-RDEPEND="${RDEPEND}
-	x11-apps/rgb
-	x11-apps/iceauth"
-
-PDEPEND="zeroconf? ( avahi? ( kde-misc/kdnssd-avahi ) )"
-
-# Testing code is rather broken and merely for developer purposes, so disable it.
-RESTRICT="test"
-
-pkg_setup() {
-	if use legacyssl ; then
-		echo ""
-		elog "You have the legacyssl use flag enabled, which fixes issues with some broken"
-		elog "sites, but breaks others instead. It is strongly discouraged to use it."
-		elog "For more information, see bug #128922."
-		echo ""
-	fi
-	if ! use utempter ; then
-		echo ""
-		elog "On some setups that relies on the correct update of utmp records, not using"
-		elog "utempter might not update them correctly. If you experience unexpected"
-		elog "behaviour, try to rebuild kde-base/kdelibs with utempter use-flag enabled."
-		echo ""
-	fi
-
-	if use alsa && ! built_with_use --missing true media-libs/alsa-lib midi; then
-		eerror "The alsa USE flag in this package enables ALSA support"
-		eerror "for libkmid, KDE midi library."
-		eerror "For this reason, you have to merge media-libs/alsa-lib"
-		eerror "with the midi USE flag enabled, or disable alsa USE flag"
-		eerror "for this package."
-		die "Missing midi USE flag on media-libs/alsa-lib"
-	fi
-}
-
-src_unpack() {
-	kde_src_unpack
-	if use legacyssl ; then
-		# This patch won't be included upstream, see bug #128922
-		epatch "${WORKDIR}/patches/kdelibs_3.5.4-kssl-3des.patch" || die "Patch did not apply."
-	fi
-
-	# Apply the following patch on the next revision of kdelibs-3.5.5 (fixes kde
-	# bug #135409), which corrects a nasty regression in the cstyle indenter.
-	epatch "${FILESDIR}/${P}-kate-cstyle-indenter-fix.diff"
-
-	# Fix kdeprint timeout when trying to connect to cupsd. Bug #151261.
-	epatch "${FILESDIR}/${P}-kdeprint-cupsd-timeout-fix.patch"
-
-	# Fix rendering (see upstream bug #135639).
-	epatch "${FILESDIR}/${P}-khtml.patch"
-
-	# Allow notification with arts disabled
-	epatch "${FILESDIR}/${P}-noarts.patch"
-	epatch "${FILESDIR}/${P}-noarts-2.patch"
-
-	# xinerama patch from Lubos Lunak
-	# http://ktown.kde.org/~seli/xinerama/
-	epatch "${DISTDIR}/${P}-seli-xinerama.patch.bz2"
-
-	epatch "${FILESDIR}/${P}-CVE-2007-0537.patch"
-
-	epatch "${FILESDIR}/CVE-2007-1564-kdelibs-3.5.6.diff"
-
-	epatch "${FILESDIR}/kdelibs-3.5.6-kjs-xss.diff"
-}
-
-src_compile() {
-	rm -f "${S}/configure"
-
-	myconf="--with-distribution=Gentoo --disable-fast-malloc
-			$(use_enable fam libfam) $(use_enable kernel_linux dnotify)
-			--with-libart --with-libidn
-			$(use_with acl) $(use_with ssl)
-			$(use_with alsa) $(use_with arts)
-			$(use_with kerberos gssapi) $(use_with tiff)
-			$(use_with jpeg2k jasper) $(use_with openexr)
-			$(use_enable cups)
-			$(use_with utempter) $(use_with lua)
-			$(use_enable kernel_linux sendfile) --enable-mitshm
-			$(use_with spell aspell)"
-
-	if use zeroconf && ! use avahi; then
-		myconf="${myconf} --enable-dnssd"
-	else
-		myconf="${myconf} --disable-dnssd"
-	fi
-
-	myconf="${myconf} --without-hspell"
-
-	if has_version x11-apps/rgb; then
-		myconf="${myconf} --with-rgbfile=/usr/share/X11/rgb.txt"
-	fi
-
-	# fix bug 58179, bug 85593
-	# kdelibs-3.4.0 needed -fno-gcse; 3.4.1 needs -mminimal-toc; this needs a
-	# closer look... - corsair
-	use ppc64 && append-flags "-mminimal-toc"
-
-	# work around bug #120858, gcc 3.4.x -Os miscompilation
-	use x86 && replace-flags "-Os" "-O2" # see bug #120858
-
-	replace-flags "-O3" "-O2" # see bug #148180
-
-	export BINDNOW_FLAGS="$(bindnow-flags)"
-
-	kde_src_compile
-
-	if use doc; then
-		make apidox || die
-	fi
-}
-
-src_install() {
-	kde_src_install
-
-	if use doc; then
-		make DESTDIR="${D}" install-apidox || die
-	fi
-
-	# Needed to create lib -> lib64 symlink for amd64 2005.0 profile
-	if [ "${SYMLINK_LIB}" = "yes" ]; then
-		dosym $(get_abi_LIBDIR ${DEFAULT_ABI}) ${KDEDIR}/lib
-	fi
-
-	# Get rid of the disabled version of the kdnsd libraries
-	if use zeroconf && use avahi; then
-		rm -rf "${D}/${PREFIX}"/$(get_libdir)/libkdnssd.*
-	fi
-
-	dodir /etc/env.d
-
-	# List all the multilib libdirs
-	local libdirs
-	for libdir in $(get_all_libdirs); do
-		libdirs="${libdirs}:${PREFIX}/${libdir}"
-	done
-
-	cat <<EOF > "${D}"/etc/env.d/45kdepaths-${SLOT} # number goes down with version upgrade
-PATH=${PREFIX}/bin
-ROOTPATH=${PREFIX}/sbin:${PREFIX}/bin
-LDPATH=${libdirs:1}
-CONFIG_PROTECT="${PREFIX}/share/config ${PREFIX}/env ${PREFIX}/shutdown /usr/share/config"
-KDEDIRS="${PREFIX}:/usr:/usr/local"
-#KDE_IS_PRELINKED=1
-EOF
-}
-
-pkg_postinst() {
-	if use zeroconf; then
-		echo
-		elog "To make zeroconf support available in KDE make sure that the 'mdnsd' daemon"
-		elog "is running. Make sure also that multicast dns lookups are enabled by editing"
-		elog "the 'hosts:' line in /etc/nsswitch.conf to include 'mdns', e.g.:"
-		elog "	hosts: files mdns dns"
-		echo
-	fi
-}
diff --git a/kde-base/kdelibs/kdelibs-3.5.6-r10.ebuild b/kde-base/kdelibs/kdelibs-3.5.6-r10.ebuild
deleted file mode 100644
index 93c3276e1982..000000000000
--- a/kde-base/kdelibs/kdelibs-3.5.6-r10.ebuild
+++ /dev/null
@@ -1,200 +0,0 @@
-# Copyright 1999-2007 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kdelibs/kdelibs-3.5.6-r10.ebuild,v 1.1 2007/07/26 12:40:44 carlo Exp $
-
-inherit kde flag-o-matic eutils multilib
-set-kdedir 3.5
-
-DESCRIPTION="KDE libraries needed by all KDE programs."
-HOMEPAGE="http://www.kde.org/"
-SRC_URI="mirror://kde/stable/${PV}/src/${P}.tar.bz2
-	mirror://gentoo/kdelibs-3.5-patchset-10.tar.bz2
-	mirror://gentoo/${PN}-3.5.5-seli-xinerama.patch.bz2"
-
-LICENSE="GPL-2 LGPL-2"
-SLOT="3.5"
-KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd"
-IUSE="acl alsa arts branding cups doc jpeg2k kerberos legacyssl utempter openexr spell tiff
-avahi kernel_linux fam lua kdehiddenvisibility"
-
-# Added aspell-en as dependency to work around bug 131512.
-# Made openssl and zeroconf mandatory dependencies, see bug #172972 and #175984
-RDEPEND="$(qt_min_version 3.3.3)
-	arts? ( >=kde-base/arts-3.5.5 )
-	app-arch/bzip2
-	>=media-libs/freetype-2
-	media-libs/fontconfig
-	>=dev-libs/libxslt-1.1.16
-	>=dev-libs/libxml2-2.6.6
-	>=dev-libs/libpcre-4.2
-	media-libs/libart_lgpl
-	net-dns/libidn
-	>=dev-libs/openssl-0.9.7d
-	acl? ( kernel_linux? ( sys-apps/acl ) )
-	alsa? ( media-libs/alsa-lib )
-	cups? ( >=net-print/cups-1.1.19 )
-	tiff? ( media-libs/tiff )
-	kerberos? ( virtual/krb5 )
-	jpeg2k? ( media-libs/jasper )
-	openexr? ( >=media-libs/openexr-1.2.2-r2 )
-	!avahi? ( net-misc/mDNSResponder !kde-misc/kdnssd-avahi )
-	fam? ( virtual/fam )
-	virtual/ghostscript
-	utempter? ( sys-libs/libutempter )
-	!kde-base/kde-env
-	lua? ( dev-lang/lua )
-	spell? ( >=app-text/aspell-0.60.5 >=app-dicts/aspell-en-6.0.0 )
-	>=sys-apps/portage-2.1.2.6"
-
-DEPEND="${RDEPEND}
-	doc? ( app-doc/doxygen )
-	sys-devel/gettext"
-
-RDEPEND="${RDEPEND}
-	x11-apps/rgb
-	x11-apps/iceauth"
-
-PDEPEND="avahi? ( kde-misc/kdnssd-avahi )"
-
-# Testing code is rather broken and merely for developer purposes, so disable it.
-RESTRICT="test"
-
-pkg_setup() {
-	if use legacyssl ; then
-		echo ""
-		elog "You have the legacyssl use flag enabled, which fixes issues with some broken"
-		elog "sites, but breaks others instead. It is strongly discouraged to use it."
-		elog "For more information, see bug #128922."
-		echo ""
-	fi
-
-	if ! use utempter ; then
-		echo ""
-		elog "On some setups, which rely on the correct update of utmp records, not using"
-		elog "utempter might not update them correctly. If you experience unexpected"
-		elog "behaviour, try to rebuild kde-base/kdelibs with utempter use-flag enabled."
-		echo ""
-	fi
-
-	if use alsa && ! built_with_use --missing true media-libs/alsa-lib midi; then
-		eerror "The alsa USE flag in this package enables ALSA support"
-		eerror "for libkmid, KDE midi library."
-		eerror "For this reason, you have to merge media-libs/alsa-lib"
-		eerror "with the midi USE flag enabled, or disable alsa USE flag"
-		eerror "for this package."
-		die "Missing midi USE flag on media-libs/alsa-lib"
-	fi
-}
-
-src_unpack() {
-	kde_src_unpack
-
-	if use legacyssl ; then
-		# This patch won't be included upstream, see bug #128922.
-		epatch "${WORKDIR}/patches/kdelibs_3.5.4-kssl-3des.patch"
-	fi
-
-	if use utempter ; then
-		# Bug #135818 is the eternal reference.
-		epatch "${WORKDIR}/patches/kdelibs-3.5_libutempter.patch"
-	fi
-
-	if use branding ; then
-		# Add "(Gentoo)" to khtml user agent.
-		epatch "${WORKDIR}/patches/kdelibs_3.5-cattlebrand.diff"
-	fi
-
-	# Xinerama patch from Lubos Lunak.
-	# http://ktown.kde.org/~seli/xinerama/
-	epatch "${DISTDIR}/${PN}-3.5.5-seli-xinerama.patch.bz2"
-}
-
-src_compile() {
-	rm -f "${S}/configure"
-
-	myconf="--with-distribution=Gentoo --disable-fast-malloc
-			--with-libart --with-libidn --with-ssl
-			--without-hspell
-			$(use_enable fam libfam) $(use_enable kernel_linux dnotify)
-			$(use_with acl) $(use_with alsa)
-			$(use_with arts) $(use_enable cups)
-			$(use_with kerberos gssapi) $(use_with tiff)
-			$(use_with jpeg2k jasper) $(use_with openexr)
-			$(use_with utempter) $(use_with lua)
-			$(use_enable kernel_linux sendfile) --enable-mitshm
-			$(use_with spell aspell)"
-
-	if ! use avahi; then
-		myconf="${myconf} --enable-dnssd"
-	else
-		myconf="${myconf} --disable-dnssd"
-	fi
-
-	if has_version x11-apps/rgb; then
-		myconf="${myconf} --with-rgbfile=/usr/share/X11/rgb.txt"
-	fi
-
-	# fix bug 58179, bug 85593
-	# kdelibs-3.4.0 needed -fno-gcse; 3.4.1 needs -mminimal-toc; this needs a
-	# closer look... - corsair
-	use ppc64 && append-flags "-mminimal-toc"
-
-	# work around bug #120858, gcc 3.4.x -Os miscompilation
-	use x86 && replace-flags "-Os" "-O2" # see bug #120858
-
-	replace-flags "-O3" "-O2" # see bug #148180
-
-	export BINDNOW_FLAGS="$(bindnow-flags)"
-
-	kde_src_compile
-
-	if use doc; then
-		make apidox || die
-	fi
-}
-
-src_install() {
-	kde_src_install
-
-	if use doc; then
-		make DESTDIR="${D}" install-apidox || die
-	fi
-
-	# Needed to create lib -> lib64 symlink for amd64 2005.0 profile
-	if [ "${SYMLINK_LIB}" = "yes" ]; then
-		dosym $(get_abi_LIBDIR ${DEFAULT_ABI}) ${KDEDIR}/lib
-	fi
-
-	# Get rid of the disabled version of the kdnsd libraries
-	if use avahi; then
-		rm -rf "${D}/${PREFIX}"/$(get_libdir)/libkdnssd.*
-	fi
-
-	dodir /etc/env.d
-
-	# List all the multilib libdirs
-	local libdirs
-	for libdir in $(get_all_libdirs); do
-		libdirs="${libdirs}:${PREFIX}/${libdir}"
-	done
-
-	# Please note that the KDE install path has to be the last value in KDEDIRS.
-	cat <<EOF > "${D}"/etc/env.d/45kdepaths-${SLOT} # number goes down with version upgrade
-PATH=${PREFIX}/bin
-ROOTPATH=${PREFIX}/sbin:${PREFIX}/bin
-LDPATH=${libdirs:1}
-MANPATH=${PREFIX}/share/man
-CONFIG_PROTECT="${PREFIX}/share/config ${PREFIX}/env ${PREFIX}/shutdown /usr/share/config"
-KDEDIRS="/usr:/usr/local:${PREFIX}"
-#KDE_IS_PRELINKED=1
-XDG_DATA_DIRS="/usr/share:${PREFIX}/share:/usr/local/share"
-COLON_SEPARATED="XDG_DATA_DIRS"
-EOF
-
-	# Make sure the target for the revdep-rebuild stuff exists. Fixes bug 184441.
-	dodir /etc/revdep-rebuild
-
-cat <<EOF > "${D}"/etc/revdep-rebuild/50-kde3
-SEARCH_DIRS="${PREFIX}/bin ${PREFIX}/lib*"
-EOF
-}
diff --git a/kde-base/kdelibs/kdelibs-3.5.6-r7.ebuild b/kde-base/kdelibs/kdelibs-3.5.6-r7.ebuild
deleted file mode 100644
index 37810e471733..000000000000
--- a/kde-base/kdelibs/kdelibs-3.5.6-r7.ebuild
+++ /dev/null
@@ -1,208 +0,0 @@
-# Copyright 1999-2007 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kdelibs/kdelibs-3.5.6-r7.ebuild,v 1.5 2007/07/07 13:40:09 philantrop Exp $
-
-inherit kde flag-o-matic eutils multilib
-set-kdedir 3.5
-
-DESCRIPTION="KDE libraries needed by all KDE programs."
-HOMEPAGE="http://www.kde.org/"
-SRC_URI="mirror://kde/stable/${PV}/src/${P}.tar.bz2
-	mirror://gentoo/kdelibs-3.5-patchset-08.tar.bz2
-	mirror://gentoo/${PN}-3.5.5-seli-xinerama.patch.bz2"
-
-LICENSE="GPL-2 LGPL-2"
-SLOT="3.5"
-KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd"
-IUSE="acl alsa arts branding cups doc jpeg2k kerberos legacyssl utempter openexr spell tiff
-avahi kernel_linux fam lua kdehiddenvisibility"
-
-# Added aspell-en as dependency to work around bug 131512.
-# Made openssl and zeroconf mandatory dependencies, see bug #172972 and #175984
-RDEPEND="$(qt_min_version 3.3.3)
-	arts? ( >=kde-base/arts-3.5.5 )
-	app-arch/bzip2
-	>=media-libs/freetype-2
-	media-libs/fontconfig
-	>=dev-libs/libxslt-1.1.16
-	>=dev-libs/libxml2-2.6.6
-	>=dev-libs/libpcre-4.2
-	media-libs/libart_lgpl
-	net-dns/libidn
-	>=dev-libs/openssl-0.9.7d
-	acl? ( kernel_linux? ( sys-apps/acl ) )
-	alsa? ( media-libs/alsa-lib )
-	cups? ( >=net-print/cups-1.1.19 )
-	tiff? ( media-libs/tiff )
-	kerberos? ( virtual/krb5 )
-	jpeg2k? ( media-libs/jasper )
-	openexr? ( >=media-libs/openexr-1.2.2-r2 )
-	!avahi? ( net-misc/mDNSResponder !kde-misc/kdnssd-avahi )
-	fam? ( virtual/fam )
-	virtual/ghostscript
-	utempter? ( sys-libs/libutempter )
-	!kde-base/kde-env
-	lua? ( dev-lang/lua )
-	spell? ( app-text/aspell app-dicts/aspell-en )"
-
-DEPEND="${RDEPEND}
-	doc? ( app-doc/doxygen )
-	sys-devel/gettext"
-
-RDEPEND="${RDEPEND}
-	x11-apps/rgb
-	x11-apps/iceauth"
-
-PDEPEND="avahi? ( kde-misc/kdnssd-avahi )"
-
-# Testing code is rather broken and merely for developer purposes, so disable it.
-RESTRICT="test"
-
-pkg_setup() {
-	if use legacyssl ; then
-		echo ""
-		elog "You have the legacyssl use flag enabled, which fixes issues with some broken"
-		elog "sites, but breaks others instead. It is strongly discouraged to use it."
-		elog "For more information, see bug #128922."
-		echo ""
-	fi
-
-	if ! use utempter ; then
-		echo ""
-		elog "On some setups, which rely on the correct update of utmp records, not using"
-		elog "utempter might not update them correctly. If you experience unexpected"
-		elog "behaviour, try to rebuild kde-base/kdelibs with utempter use-flag enabled."
-		echo ""
-	fi
-
-	if use alsa && ! built_with_use --missing true media-libs/alsa-lib midi; then
-		eerror "The alsa USE flag in this package enables ALSA support"
-		eerror "for libkmid, KDE midi library."
-		eerror "For this reason, you have to merge media-libs/alsa-lib"
-		eerror "with the midi USE flag enabled, or disable alsa USE flag"
-		eerror "for this package."
-		die "Missing midi USE flag on media-libs/alsa-lib"
-	fi
-}
-
-src_unpack() {
-	kde_src_unpack
-
-	if use legacyssl ; then
-		# This patch won't be included upstream, see bug #128922.
-		epatch "${WORKDIR}/patches/kdelibs_3.5.4-kssl-3des.patch"
-	fi
-
-	if use utempter ; then
-		# Bug #135818 is the eternal reference.
-		epatch "${WORKDIR}/patches/kdelibs-3.5_libutempter.patch"
-	fi
-
-	if use branding ; then
-		# Add "(Gentoo)" to khtml user agent.
-		epatch "${WORKDIR}/patches/kdelibs_3.5-cattlebrand.diff"
-	fi
-
-	# Xinerama patch from Lubos Lunak.
-	# http://ktown.kde.org/~seli/xinerama/
-	epatch "${DISTDIR}/${PN}-3.5.5-seli-xinerama.patch.bz2"
-}
-
-src_compile() {
-	rm -f "${S}/configure"
-
-	myconf="--with-distribution=Gentoo --disable-fast-malloc
-			--with-libart --with-libidn --with-ssl
-			--without-hspell
-			$(use_enable fam libfam) $(use_enable kernel_linux dnotify)
-			$(use_with acl) $(use_with alsa)
-			$(use_with arts) $(use_enable cups)
-			$(use_with kerberos gssapi) $(use_with tiff)
-			$(use_with jpeg2k jasper) $(use_with openexr)
-			$(use_with utempter) $(use_with lua)
-			$(use_enable kernel_linux sendfile) --enable-mitshm
-			$(use_with spell aspell)"
-
-	if ! use avahi; then
-		myconf="${myconf} --enable-dnssd"
-	else
-		myconf="${myconf} --disable-dnssd"
-	fi
-
-	if has_version x11-apps/rgb; then
-		myconf="${myconf} --with-rgbfile=/usr/share/X11/rgb.txt"
-	fi
-
-	# fix bug 58179, bug 85593
-	# kdelibs-3.4.0 needed -fno-gcse; 3.4.1 needs -mminimal-toc; this needs a
-	# closer look... - corsair
-	use ppc64 && append-flags "-mminimal-toc"
-
-	# work around bug #120858, gcc 3.4.x -Os miscompilation
-	use x86 && replace-flags "-Os" "-O2" # see bug #120858
-
-	replace-flags "-O3" "-O2" # see bug #148180
-
-	export BINDNOW_FLAGS="$(bindnow-flags)"
-
-	kde_src_compile
-
-	if use doc; then
-		make apidox || die
-	fi
-}
-
-src_install() {
-	kde_src_install
-
-	if use doc; then
-		make DESTDIR="${D}" install-apidox || die
-	fi
-
-	# Needed to create lib -> lib64 symlink for amd64 2005.0 profile
-	if [ "${SYMLINK_LIB}" = "yes" ]; then
-		dosym $(get_abi_LIBDIR ${DEFAULT_ABI}) ${KDEDIR}/lib
-	fi
-
-	# Get rid of the disabled version of the kdnsd libraries
-	if use zeroconf && use avahi; then
-		rm -rf "${D}/${PREFIX}"/$(get_libdir)/libkdnssd.*
-	fi
-
-	dodir /etc/env.d
-
-	# List all the multilib libdirs
-	local libdirs
-	for libdir in $(get_all_libdirs); do
-		libdirs="${libdirs}:${PREFIX}/${libdir}"
-	done
-
-	# Please note that the KDE install path has to be the last value in KDEDIRS.
-	cat <<EOF > "${D}"/etc/env.d/45kdepaths-${SLOT} # number goes down with version upgrade
-PATH=${PREFIX}/bin
-ROOTPATH=${PREFIX}/sbin:${PREFIX}/bin
-LDPATH=${libdirs:1}
-MANPATH=${PREFIX}/share/man
-CONFIG_PROTECT="${PREFIX}/share/config ${PREFIX}/env ${PREFIX}/shutdown /usr/share/config"
-KDEDIRS="/usr:/usr/local:${PREFIX}"
-#KDE_IS_PRELINKED=1
-XDG_DATA_DIRS="/usr/share:${PREFIX}/share:/usr/local/share"
-COLON_SEPARATED="XDG_DATA_DIRS"
-EOF
-
-	# Make sure the target for the revdep-rebuild stuff exists. Fixes bug 184441.
-	dodir /etc/revdep-rebuild
-
-cat <<EOF > "${D}"/etc/revdep-rebuild/50-kde3
-SEARCH_DIRS="${PREFIX}/bin ${PREFIX}/lib*"
-EOF
-}
-
-pkg_postinst() {
-		echo
-		elog "To make zeroconf support available in KDE make sure that the 'mdnsd' daemon"
-		elog "is running. Make sure also that multicast dns lookups are enabled by editing"
-		elog "the 'hosts:' line in /etc/nsswitch.conf to include 'mdns', e.g.:"
-		elog "	hosts: files mdns dns"
-		echo
-}
diff --git a/kde-base/kdelibs/kdelibs-3.5.6-r8.ebuild b/kde-base/kdelibs/kdelibs-3.5.6-r8.ebuild
deleted file mode 100644
index fd6fa16acc15..000000000000
--- a/kde-base/kdelibs/kdelibs-3.5.6-r8.ebuild
+++ /dev/null
@@ -1,200 +0,0 @@
-# Copyright 1999-2007 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kdelibs/kdelibs-3.5.6-r8.ebuild,v 1.6 2007/07/07 13:40:09 philantrop Exp $
-
-inherit kde flag-o-matic eutils multilib
-set-kdedir 3.5
-
-DESCRIPTION="KDE libraries needed by all KDE programs."
-HOMEPAGE="http://www.kde.org/"
-SRC_URI="mirror://kde/stable/${PV}/src/${P}.tar.bz2
-	mirror://gentoo/kdelibs-3.5-patchset-08.tar.bz2
-	mirror://gentoo/${PN}-3.5.5-seli-xinerama.patch.bz2"
-
-LICENSE="GPL-2 LGPL-2"
-SLOT="3.5"
-KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd"
-IUSE="acl alsa arts branding cups doc jpeg2k kerberos legacyssl utempter openexr spell tiff
-avahi kernel_linux fam lua kdehiddenvisibility"
-
-# Added aspell-en as dependency to work around bug 131512.
-# Made openssl and zeroconf mandatory dependencies, see bug #172972 and #175984
-RDEPEND="$(qt_min_version 3.3.3)
-	arts? ( >=kde-base/arts-3.5.5 )
-	app-arch/bzip2
-	>=media-libs/freetype-2
-	media-libs/fontconfig
-	>=dev-libs/libxslt-1.1.16
-	>=dev-libs/libxml2-2.6.6
-	>=dev-libs/libpcre-4.2
-	media-libs/libart_lgpl
-	net-dns/libidn
-	>=dev-libs/openssl-0.9.7d
-	acl? ( kernel_linux? ( sys-apps/acl ) )
-	alsa? ( media-libs/alsa-lib )
-	cups? ( >=net-print/cups-1.1.19 )
-	tiff? ( media-libs/tiff )
-	kerberos? ( virtual/krb5 )
-	jpeg2k? ( media-libs/jasper )
-	openexr? ( >=media-libs/openexr-1.2.2-r2 )
-	!avahi? ( net-misc/mDNSResponder !kde-misc/kdnssd-avahi )
-	fam? ( virtual/fam )
-	virtual/ghostscript
-	utempter? ( sys-libs/libutempter )
-	!kde-base/kde-env
-	lua? ( dev-lang/lua )
-	spell? ( >=app-text/aspell-0.60.5 >=app-dicts/aspell-en-6.0.0 )
-	>=sys-apps/portage-2.1.2.6"
-
-DEPEND="${RDEPEND}
-	doc? ( app-doc/doxygen )
-	sys-devel/gettext"
-
-RDEPEND="${RDEPEND}
-	x11-apps/rgb
-	x11-apps/iceauth"
-
-PDEPEND="avahi? ( kde-misc/kdnssd-avahi )"
-
-# Testing code is rather broken and merely for developer purposes, so disable it.
-RESTRICT="test"
-
-pkg_setup() {
-	if use legacyssl ; then
-		echo ""
-		elog "You have the legacyssl use flag enabled, which fixes issues with some broken"
-		elog "sites, but breaks others instead. It is strongly discouraged to use it."
-		elog "For more information, see bug #128922."
-		echo ""
-	fi
-
-	if ! use utempter ; then
-		echo ""
-		elog "On some setups, which rely on the correct update of utmp records, not using"
-		elog "utempter might not update them correctly. If you experience unexpected"
-		elog "behaviour, try to rebuild kde-base/kdelibs with utempter use-flag enabled."
-		echo ""
-	fi
-
-	if use alsa && ! built_with_use --missing true media-libs/alsa-lib midi; then
-		eerror "The alsa USE flag in this package enables ALSA support"
-		eerror "for libkmid, KDE midi library."
-		eerror "For this reason, you have to merge media-libs/alsa-lib"
-		eerror "with the midi USE flag enabled, or disable alsa USE flag"
-		eerror "for this package."
-		die "Missing midi USE flag on media-libs/alsa-lib"
-	fi
-}
-
-src_unpack() {
-	kde_src_unpack
-
-	if use legacyssl ; then
-		# This patch won't be included upstream, see bug #128922.
-		epatch "${WORKDIR}/patches/kdelibs_3.5.4-kssl-3des.patch"
-	fi
-
-	if use utempter ; then
-		# Bug #135818 is the eternal reference.
-		epatch "${WORKDIR}/patches/kdelibs-3.5_libutempter.patch"
-	fi
-
-	if use branding ; then
-		# Add "(Gentoo)" to khtml user agent.
-		epatch "${WORKDIR}/patches/kdelibs_3.5-cattlebrand.diff"
-	fi
-
-	# Xinerama patch from Lubos Lunak.
-	# http://ktown.kde.org/~seli/xinerama/
-	epatch "${DISTDIR}/${PN}-3.5.5-seli-xinerama.patch.bz2"
-}
-
-src_compile() {
-	rm -f "${S}/configure"
-
-	myconf="--with-distribution=Gentoo --disable-fast-malloc
-			--with-libart --with-libidn --with-ssl
-			--without-hspell
-			$(use_enable fam libfam) $(use_enable kernel_linux dnotify)
-			$(use_with acl) $(use_with alsa)
-			$(use_with arts) $(use_enable cups)
-			$(use_with kerberos gssapi) $(use_with tiff)
-			$(use_with jpeg2k jasper) $(use_with openexr)
-			$(use_with utempter) $(use_with lua)
-			$(use_enable kernel_linux sendfile) --enable-mitshm
-			$(use_with spell aspell)"
-
-	if ! use avahi; then
-		myconf="${myconf} --enable-dnssd"
-	else
-		myconf="${myconf} --disable-dnssd"
-	fi
-
-	if has_version x11-apps/rgb; then
-		myconf="${myconf} --with-rgbfile=/usr/share/X11/rgb.txt"
-	fi
-
-	# fix bug 58179, bug 85593
-	# kdelibs-3.4.0 needed -fno-gcse; 3.4.1 needs -mminimal-toc; this needs a
-	# closer look... - corsair
-	use ppc64 && append-flags "-mminimal-toc"
-
-	# work around bug #120858, gcc 3.4.x -Os miscompilation
-	use x86 && replace-flags "-Os" "-O2" # see bug #120858
-
-	replace-flags "-O3" "-O2" # see bug #148180
-
-	export BINDNOW_FLAGS="$(bindnow-flags)"
-
-	kde_src_compile
-
-	if use doc; then
-		make apidox || die
-	fi
-}
-
-src_install() {
-	kde_src_install
-
-	if use doc; then
-		make DESTDIR="${D}" install-apidox || die
-	fi
-
-	# Needed to create lib -> lib64 symlink for amd64 2005.0 profile
-	if [ "${SYMLINK_LIB}" = "yes" ]; then
-		dosym $(get_abi_LIBDIR ${DEFAULT_ABI}) ${KDEDIR}/lib
-	fi
-
-	# Get rid of the disabled version of the kdnsd libraries
-	if use avahi; then
-		rm -rf "${D}/${PREFIX}"/$(get_libdir)/libkdnssd.*
-	fi
-
-	dodir /etc/env.d
-
-	# List all the multilib libdirs
-	local libdirs
-	for libdir in $(get_all_libdirs); do
-		libdirs="${libdirs}:${PREFIX}/${libdir}"
-	done
-
-	# Please note that the KDE install path has to be the last value in KDEDIRS.
-	cat <<EOF > "${D}"/etc/env.d/45kdepaths-${SLOT} # number goes down with version upgrade
-PATH=${PREFIX}/bin
-ROOTPATH=${PREFIX}/sbin:${PREFIX}/bin
-LDPATH=${libdirs:1}
-MANPATH=${PREFIX}/share/man
-CONFIG_PROTECT="${PREFIX}/share/config ${PREFIX}/env ${PREFIX}/shutdown /usr/share/config"
-KDEDIRS="/usr:/usr/local:${PREFIX}"
-#KDE_IS_PRELINKED=1
-XDG_DATA_DIRS="/usr/share:${PREFIX}/share:/usr/local/share"
-COLON_SEPARATED="XDG_DATA_DIRS"
-EOF
-
-	# Make sure the target for the revdep-rebuild stuff exists. Fixes bug 184441.
-	dodir /etc/revdep-rebuild
-
-cat <<EOF > "${D}"/etc/revdep-rebuild/50-kde3
-SEARCH_DIRS="${PREFIX}/bin ${PREFIX}/lib*"
-EOF
-}
diff --git a/kde-base/kdelibs/kdelibs-3.5.6-r9.ebuild b/kde-base/kdelibs/kdelibs-3.5.6-r9.ebuild
deleted file mode 100644
index 9c079919b8b4..000000000000
--- a/kde-base/kdelibs/kdelibs-3.5.6-r9.ebuild
+++ /dev/null
@@ -1,200 +0,0 @@
-# Copyright 1999-2007 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kdelibs/kdelibs-3.5.6-r9.ebuild,v 1.5 2007/07/25 17:13:02 carlo Exp $
-
-inherit kde flag-o-matic eutils multilib
-set-kdedir 3.5
-
-DESCRIPTION="KDE libraries needed by all KDE programs."
-HOMEPAGE="http://www.kde.org/"
-SRC_URI="mirror://kde/stable/${PV}/src/${P}.tar.bz2
-	mirror://gentoo/kdelibs-3.5-patchset-09.tar.bz2
-	mirror://gentoo/${PN}-3.5.5-seli-xinerama.patch.bz2"
-
-LICENSE="GPL-2 LGPL-2"
-SLOT="3.5"
-KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd"
-IUSE="acl alsa arts branding cups doc jpeg2k kerberos legacyssl utempter openexr spell tiff
-avahi kernel_linux fam lua kdehiddenvisibility"
-
-# Added aspell-en as dependency to work around bug 131512.
-# Made openssl and zeroconf mandatory dependencies, see bug #172972 and #175984
-RDEPEND="$(qt_min_version 3.3.3)
-	arts? ( >=kde-base/arts-3.5.5 )
-	app-arch/bzip2
-	>=media-libs/freetype-2
-	media-libs/fontconfig
-	>=dev-libs/libxslt-1.1.16
-	>=dev-libs/libxml2-2.6.6
-	>=dev-libs/libpcre-4.2
-	media-libs/libart_lgpl
-	net-dns/libidn
-	>=dev-libs/openssl-0.9.7d
-	acl? ( kernel_linux? ( sys-apps/acl ) )
-	alsa? ( media-libs/alsa-lib )
-	cups? ( >=net-print/cups-1.1.19 )
-	tiff? ( media-libs/tiff )
-	kerberos? ( virtual/krb5 )
-	jpeg2k? ( media-libs/jasper )
-	openexr? ( >=media-libs/openexr-1.2.2-r2 )
-	!avahi? ( net-misc/mDNSResponder !kde-misc/kdnssd-avahi )
-	fam? ( virtual/fam )
-	virtual/ghostscript
-	utempter? ( sys-libs/libutempter )
-	!kde-base/kde-env
-	lua? ( dev-lang/lua )
-	spell? ( >=app-text/aspell-0.60.5 >=app-dicts/aspell-en-6.0.0 )
-	>=sys-apps/portage-2.1.2.6"
-
-DEPEND="${RDEPEND}
-	doc? ( app-doc/doxygen )
-	sys-devel/gettext"
-
-RDEPEND="${RDEPEND}
-	x11-apps/rgb
-	x11-apps/iceauth"
-
-PDEPEND="avahi? ( kde-misc/kdnssd-avahi )"
-
-# Testing code is rather broken and merely for developer purposes, so disable it.
-RESTRICT="test"
-
-pkg_setup() {
-	if use legacyssl ; then
-		echo ""
-		elog "You have the legacyssl use flag enabled, which fixes issues with some broken"
-		elog "sites, but breaks others instead. It is strongly discouraged to use it."
-		elog "For more information, see bug #128922."
-		echo ""
-	fi
-
-	if ! use utempter ; then
-		echo ""
-		elog "On some setups, which rely on the correct update of utmp records, not using"
-		elog "utempter might not update them correctly. If you experience unexpected"
-		elog "behaviour, try to rebuild kde-base/kdelibs with utempter use-flag enabled."
-		echo ""
-	fi
-
-	if use alsa && ! built_with_use --missing true media-libs/alsa-lib midi; then
-		eerror "The alsa USE flag in this package enables ALSA support"
-		eerror "for libkmid, KDE midi library."
-		eerror "For this reason, you have to merge media-libs/alsa-lib"
-		eerror "with the midi USE flag enabled, or disable alsa USE flag"
-		eerror "for this package."
-		die "Missing midi USE flag on media-libs/alsa-lib"
-	fi
-}
-
-src_unpack() {
-	kde_src_unpack
-
-	if use legacyssl ; then
-		# This patch won't be included upstream, see bug #128922.
-		epatch "${WORKDIR}/patches/kdelibs_3.5.4-kssl-3des.patch"
-	fi
-
-	if use utempter ; then
-		# Bug #135818 is the eternal reference.
-		epatch "${WORKDIR}/patches/kdelibs-3.5_libutempter.patch"
-	fi
-
-	if use branding ; then
-		# Add "(Gentoo)" to khtml user agent.
-		epatch "${WORKDIR}/patches/kdelibs_3.5-cattlebrand.diff"
-	fi
-
-	# Xinerama patch from Lubos Lunak.
-	# http://ktown.kde.org/~seli/xinerama/
-	epatch "${DISTDIR}/${PN}-3.5.5-seli-xinerama.patch.bz2"
-}
-
-src_compile() {
-	rm -f "${S}/configure"
-
-	myconf="--with-distribution=Gentoo --disable-fast-malloc
-			--with-libart --with-libidn --with-ssl
-			--without-hspell
-			$(use_enable fam libfam) $(use_enable kernel_linux dnotify)
-			$(use_with acl) $(use_with alsa)
-			$(use_with arts) $(use_enable cups)
-			$(use_with kerberos gssapi) $(use_with tiff)
-			$(use_with jpeg2k jasper) $(use_with openexr)
-			$(use_with utempter) $(use_with lua)
-			$(use_enable kernel_linux sendfile) --enable-mitshm
-			$(use_with spell aspell)"
-
-	if ! use avahi; then
-		myconf="${myconf} --enable-dnssd"
-	else
-		myconf="${myconf} --disable-dnssd"
-	fi
-
-	if has_version x11-apps/rgb; then
-		myconf="${myconf} --with-rgbfile=/usr/share/X11/rgb.txt"
-	fi
-
-	# fix bug 58179, bug 85593
-	# kdelibs-3.4.0 needed -fno-gcse; 3.4.1 needs -mminimal-toc; this needs a
-	# closer look... - corsair
-	use ppc64 && append-flags "-mminimal-toc"
-
-	# work around bug #120858, gcc 3.4.x -Os miscompilation
-	use x86 && replace-flags "-Os" "-O2" # see bug #120858
-
-	replace-flags "-O3" "-O2" # see bug #148180
-
-	export BINDNOW_FLAGS="$(bindnow-flags)"
-
-	kde_src_compile
-
-	if use doc; then
-		make apidox || die
-	fi
-}
-
-src_install() {
-	kde_src_install
-
-	if use doc; then
-		make DESTDIR="${D}" install-apidox || die
-	fi
-
-	# Needed to create lib -> lib64 symlink for amd64 2005.0 profile
-	if [ "${SYMLINK_LIB}" = "yes" ]; then
-		dosym $(get_abi_LIBDIR ${DEFAULT_ABI}) ${KDEDIR}/lib
-	fi
-
-	# Get rid of the disabled version of the kdnsd libraries
-	if use avahi; then
-		rm -rf "${D}/${PREFIX}"/$(get_libdir)/libkdnssd.*
-	fi
-
-	dodir /etc/env.d
-
-	# List all the multilib libdirs
-	local libdirs
-	for libdir in $(get_all_libdirs); do
-		libdirs="${libdirs}:${PREFIX}/${libdir}"
-	done
-
-	# Please note that the KDE install path has to be the last value in KDEDIRS.
-	cat <<EOF > "${D}"/etc/env.d/45kdepaths-${SLOT} # number goes down with version upgrade
-PATH=${PREFIX}/bin
-ROOTPATH=${PREFIX}/sbin:${PREFIX}/bin
-LDPATH=${libdirs:1}
-MANPATH=${PREFIX}/share/man
-CONFIG_PROTECT="${PREFIX}/share/config ${PREFIX}/env ${PREFIX}/shutdown /usr/share/config"
-KDEDIRS="/usr:/usr/local:${PREFIX}"
-#KDE_IS_PRELINKED=1
-XDG_DATA_DIRS="/usr/share:${PREFIX}/share:/usr/local/share"
-COLON_SEPARATED="XDG_DATA_DIRS"
-EOF
-
-	# Make sure the target for the revdep-rebuild stuff exists. Fixes bug 184441.
-	dodir /etc/revdep-rebuild
-
-cat <<EOF > "${D}"/etc/revdep-rebuild/50-kde3
-SEARCH_DIRS="${PREFIX}/bin ${PREFIX}/lib*"
-EOF
-}
diff --git a/kde-base/kdelibs/kdelibs-3.5.7-r1.ebuild b/kde-base/kdelibs/kdelibs-3.5.7-r1.ebuild
deleted file mode 100644
index 337b4e5f076f..000000000000
--- a/kde-base/kdelibs/kdelibs-3.5.7-r1.ebuild
+++ /dev/null
@@ -1,201 +0,0 @@
-# Copyright 1999-2007 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kdelibs/kdelibs-3.5.7-r1.ebuild,v 1.1 2007/07/25 17:09:36 carlo Exp $
-
-inherit kde flag-o-matic eutils multilib
-set-kdedir 3.5
-
-DESCRIPTION="KDE libraries needed by all KDE programs."
-HOMEPAGE="http://www.kde.org/"
-SRC_URI="mirror://kde/stable/${PV}/src/${P}.tar.bz2
-	mirror://gentoo/kdelibs-3.5-patchset-09.tar.bz2
-	mirror://gentoo/${PN}-3.5.7-seli-xinerama.patch.bz2"
-
-LICENSE="GPL-2 LGPL-2"
-SLOT="3.5"
-KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd"
-IUSE="acl alsa arts branding cups doc jpeg2k kerberos legacyssl utempter openexr spell tiff
-avahi kernel_linux fam lua kdehiddenvisibility"
-
-# Added aspell-en as dependency to work around bug 131512.
-# Made openssl and zeroconf mandatory dependencies, see bug #172972 and #175984
-RDEPEND="$(qt_min_version 3.3.3)
-	arts? ( >=kde-base/arts-3.5.5 )
-	app-arch/bzip2
-	>=media-libs/freetype-2
-	media-libs/fontconfig
-	>=dev-libs/libxslt-1.1.16
-	>=dev-libs/libxml2-2.6.6
-	>=dev-libs/libpcre-6.6
-	media-libs/libart_lgpl
-	net-dns/libidn
-	>=dev-libs/openssl-0.9.7d
-	acl? ( kernel_linux? ( sys-apps/acl ) )
-	alsa? ( media-libs/alsa-lib )
-	cups? ( >=net-print/cups-1.1.19 )
-	tiff? ( media-libs/tiff )
-	kerberos? ( virtual/krb5 )
-	jpeg2k? ( media-libs/jasper )
-	openexr? ( >=media-libs/openexr-1.2.2-r2 )
-	!avahi? ( net-misc/mDNSResponder !kde-misc/kdnssd-avahi )
-	fam? ( virtual/fam )
-	virtual/ghostscript
-	utempter? ( sys-libs/libutempter )
-	!kde-base/kde-env
-	lua? ( dev-lang/lua )
-	spell? ( >=app-text/aspell-0.60.5 >=app-dicts/aspell-en-6.0.0 )
-	>=sys-apps/portage-2.1.2.6
-	!kde-base/ksync"
-
-DEPEND="${RDEPEND}
-	doc? ( app-doc/doxygen )
-	sys-devel/gettext"
-
-RDEPEND="${RDEPEND}
-	x11-apps/rgb
-	x11-apps/iceauth"
-
-PDEPEND="avahi? ( kde-misc/kdnssd-avahi )"
-
-# Testing code is rather broken and merely for developer purposes, so disable it.
-RESTRICT="test"
-
-pkg_setup() {
-	if use legacyssl ; then
-		echo ""
-		elog "You have the legacyssl use flag enabled, which fixes issues with some broken"
-		elog "sites, but breaks others instead. It is strongly discouraged to use it."
-		elog "For more information, see bug #128922."
-		echo ""
-	fi
-
-	if ! use utempter ; then
-		echo ""
-		elog "On some setups, which rely on the correct update of utmp records, not using"
-		elog "utempter might not update them correctly. If you experience unexpected"
-		elog "behaviour, try to rebuild kde-base/kdelibs with utempter use-flag enabled."
-		echo ""
-	fi
-
-	if use alsa && ! built_with_use --missing true media-libs/alsa-lib midi; then
-		eerror "The alsa USE flag in this package enables ALSA support"
-		eerror "for libkmid, KDE midi library."
-		eerror "For this reason, you have to merge media-libs/alsa-lib"
-		eerror "with the midi USE flag enabled, or disable alsa USE flag"
-		eerror "for this package."
-		die "Missing midi USE flag on media-libs/alsa-lib"
-	fi
-}
-
-src_unpack() {
-	kde_src_unpack
-
-	if use legacyssl ; then
-		# This patch won't be included upstream, see bug #128922.
-		epatch "${WORKDIR}/patches/kdelibs_3.5.4-kssl-3des.patch"
-	fi
-
-	if use utempter ; then
-		# Bug #135818 is the eternal reference.
-		epatch "${WORKDIR}/patches/kdelibs-3.5_libutempter.patch"
-	fi
-
-	if use branding ; then
-		# Add "(Gentoo)" to khtml user agent.
-		epatch "${WORKDIR}/patches/kdelibs_3.5-cattlebrand.diff"
-	fi
-
-	# Xinerama patch from Lubos Lunak.
-	# http://ktown.kde.org/~seli/xinerama/
-	epatch "${DISTDIR}/${PN}-3.5.7-seli-xinerama.patch.bz2"
-}
-
-src_compile() {
-	rm -f "${S}/configure"
-
-	myconf="--with-distribution=Gentoo --disable-fast-malloc
-			--with-libart --with-libidn --with-ssl
-			--without-hspell
-			$(use_enable fam libfam) $(use_enable kernel_linux dnotify)
-			$(use_with acl) $(use_with alsa)
-			$(use_with arts) $(use_enable cups)
-			$(use_with kerberos gssapi) $(use_with tiff)
-			$(use_with jpeg2k jasper) $(use_with openexr)
-			$(use_with utempter) $(use_with lua)
-			$(use_enable kernel_linux sendfile) --enable-mitshm
-			$(use_with spell aspell)"
-
-	if ! use avahi; then
-		myconf="${myconf} --enable-dnssd"
-	else
-		myconf="${myconf} --disable-dnssd"
-	fi
-
-	if has_version x11-apps/rgb; then
-		myconf="${myconf} --with-rgbfile=/usr/share/X11/rgb.txt"
-	fi
-
-	# fix bug 58179, bug 85593
-	# kdelibs-3.4.0 needed -fno-gcse; 3.4.1 needs -mminimal-toc; this needs a
-	# closer look... - corsair
-	use ppc64 && append-flags "-mminimal-toc"
-
-	# work around bug #120858, gcc 3.4.x -Os miscompilation
-	use x86 && replace-flags "-Os" "-O2" # see bug #120858
-
-	replace-flags "-O3" "-O2" # see bug #148180
-
-	export BINDNOW_FLAGS="$(bindnow-flags)"
-
-	kde_src_compile
-
-	if use doc; then
-		make apidox || die
-	fi
-}
-
-src_install() {
-	kde_src_install
-
-	if use doc; then
-		make DESTDIR="${D}" install-apidox || die
-	fi
-
-	# Needed to create lib -> lib64 symlink for amd64 2005.0 profile
-	if [ "${SYMLINK_LIB}" = "yes" ]; then
-		dosym $(get_abi_LIBDIR ${DEFAULT_ABI}) ${KDEDIR}/lib
-	fi
-
-	# Get rid of the disabled version of the kdnsd libraries
-	if use avahi; then
-		rm -rf "${D}/${PREFIX}"/$(get_libdir)/libkdnssd.*
-	fi
-
-	dodir /etc/env.d
-
-	# List all the multilib libdirs
-	local libdirs
-	for libdir in $(get_all_libdirs); do
-		libdirs="${libdirs}:${PREFIX}/${libdir}"
-	done
-
-	# Please note that the KDE install path has to be the last value in KDEDIRS.
-	cat <<EOF > "${D}"/etc/env.d/45kdepaths-${SLOT} # number goes down with version upgrade
-PATH=${PREFIX}/bin
-ROOTPATH=${PREFIX}/sbin:${PREFIX}/bin
-LDPATH=${libdirs:1}
-MANPATH=${PREFIX}/share/man
-CONFIG_PROTECT="${PREFIX}/share/config ${PREFIX}/env ${PREFIX}/shutdown /usr/share/config"
-KDEDIRS="/usr:/usr/local:${PREFIX}"
-#KDE_IS_PRELINKED=1
-XDG_DATA_DIRS="/usr/share:${PREFIX}/share:/usr/local/share"
-COLON_SEPARATED="XDG_DATA_DIRS"
-EOF
-
-	# Make sure the target for the revdep-rebuild stuff exists. Fixes bug 184441.
-	dodir /etc/revdep-rebuild
-
-cat <<EOF > "${D}"/etc/revdep-rebuild/50-kde3
-SEARCH_DIRS="${PREFIX}/bin ${PREFIX}/lib*"
-EOF
-}
diff --git a/kde-base/kdelibs/kdelibs-3.5.7-r2.ebuild b/kde-base/kdelibs/kdelibs-3.5.7-r2.ebuild
deleted file mode 100644
index 027224e14248..000000000000
--- a/kde-base/kdelibs/kdelibs-3.5.7-r2.ebuild
+++ /dev/null
@@ -1,201 +0,0 @@
-# Copyright 1999-2007 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kdelibs/kdelibs-3.5.7-r2.ebuild,v 1.10 2007/09/23 11:18:05 redhatter Exp $
-
-inherit kde flag-o-matic eutils multilib
-set-kdedir 3.5
-
-DESCRIPTION="KDE libraries needed by all KDE programs."
-HOMEPAGE="http://www.kde.org/"
-SRC_URI="mirror://kde/stable/${PV}/src/${P}.tar.bz2
-	mirror://gentoo/kdelibs-3.5-patchset-10.tar.bz2
-	mirror://gentoo/${PN}-3.5.7-seli-xinerama.patch.bz2"
-
-LICENSE="GPL-2 LGPL-2"
-SLOT="3.5"
-KEYWORDS="alpha amd64 hppa ia64 ~mips ppc ppc64 sparc x86 ~x86-fbsd"
-IUSE="acl alsa arts branding cups doc jpeg2k kerberos legacyssl utempter openexr spell tiff
-avahi kernel_linux fam lua kdehiddenvisibility"
-
-# Added aspell-en as dependency to work around bug 131512.
-# Made openssl and zeroconf mandatory dependencies, see bug #172972 and #175984
-RDEPEND="$(qt_min_version 3.3.3)
-	arts? ( >=kde-base/arts-3.5.5 )
-	app-arch/bzip2
-	>=media-libs/freetype-2
-	media-libs/fontconfig
-	>=dev-libs/libxslt-1.1.16
-	>=dev-libs/libxml2-2.6.6
-	>=dev-libs/libpcre-6.6
-	media-libs/libart_lgpl
-	net-dns/libidn
-	>=dev-libs/openssl-0.9.7d
-	acl? ( kernel_linux? ( sys-apps/acl ) )
-	alsa? ( media-libs/alsa-lib )
-	cups? ( >=net-print/cups-1.1.19 )
-	tiff? ( media-libs/tiff )
-	kerberos? ( virtual/krb5 )
-	jpeg2k? ( media-libs/jasper )
-	openexr? ( >=media-libs/openexr-1.2.2-r2 )
-	!avahi? ( net-misc/mDNSResponder !kde-misc/kdnssd-avahi )
-	fam? ( virtual/fam )
-	virtual/ghostscript
-	utempter? ( sys-libs/libutempter )
-	!kde-base/kde-env
-	lua? ( dev-lang/lua )
-	spell? ( >=app-text/aspell-0.60.5 >=app-dicts/aspell-en-6.0.0 )
-	>=sys-apps/portage-2.1.2.11
-	!kde-base/ksync"
-
-DEPEND="${RDEPEND}
-	doc? ( app-doc/doxygen )
-	sys-devel/gettext"
-
-RDEPEND="${RDEPEND}
-	x11-apps/rgb
-	x11-apps/iceauth"
-
-PDEPEND="avahi? ( kde-misc/kdnssd-avahi )"
-
-# Testing code is rather broken and merely for developer purposes, so disable it.
-RESTRICT="test"
-
-pkg_setup() {
-	if use legacyssl ; then
-		echo ""
-		elog "You have the legacyssl use flag enabled, which fixes issues with some broken"
-		elog "sites, but breaks others instead. It is strongly discouraged to use it."
-		elog "For more information, see bug #128922."
-		echo ""
-	fi
-
-	if ! use utempter ; then
-		echo ""
-		elog "On some setups, which rely on the correct update of utmp records, not using"
-		elog "utempter might not update them correctly. If you experience unexpected"
-		elog "behaviour, try to rebuild kde-base/kdelibs with utempter use-flag enabled."
-		echo ""
-	fi
-
-	if use alsa && ! built_with_use --missing true media-libs/alsa-lib midi; then
-		eerror "The alsa USE flag in this package enables ALSA support"
-		eerror "for libkmid, KDE midi library."
-		eerror "For this reason, you have to merge media-libs/alsa-lib"
-		eerror "with the midi USE flag enabled, or disable alsa USE flag"
-		eerror "for this package."
-		die "Missing midi USE flag on media-libs/alsa-lib"
-	fi
-}
-
-src_unpack() {
-	kde_src_unpack
-
-	if use legacyssl ; then
-		# This patch won't be included upstream, see bug #128922.
-		epatch "${WORKDIR}/patches/kdelibs_3.5.4-kssl-3des.patch"
-	fi
-
-	if use utempter ; then
-		# Bug #135818 is the eternal reference.
-		epatch "${WORKDIR}/patches/kdelibs-3.5_libutempter.patch"
-	fi
-
-	if use branding ; then
-		# Add "(Gentoo)" to khtml user agent.
-		epatch "${WORKDIR}/patches/kdelibs_3.5-cattlebrand.diff"
-	fi
-
-	# Xinerama patch from Lubos Lunak.
-	# http://ktown.kde.org/~seli/xinerama/
-	epatch "${DISTDIR}/${PN}-3.5.7-seli-xinerama.patch.bz2"
-}
-
-src_compile() {
-	rm -f "${S}/configure"
-
-	myconf="--with-distribution=Gentoo --disable-fast-malloc
-			--with-libart --with-libidn --with-ssl
-			--without-hspell
-			$(use_enable fam libfam) $(use_enable kernel_linux dnotify)
-			$(use_with acl) $(use_with alsa)
-			$(use_with arts) $(use_enable cups)
-			$(use_with kerberos gssapi) $(use_with tiff)
-			$(use_with jpeg2k jasper) $(use_with openexr)
-			$(use_with utempter) $(use_with lua)
-			$(use_enable kernel_linux sendfile) --enable-mitshm
-			$(use_with spell aspell)"
-
-	if ! use avahi; then
-		myconf="${myconf} --enable-dnssd"
-	else
-		myconf="${myconf} --disable-dnssd"
-	fi
-
-	if has_version x11-apps/rgb; then
-		myconf="${myconf} --with-rgbfile=/usr/share/X11/rgb.txt"
-	fi
-
-	# fix bug 58179, bug 85593
-	# kdelibs-3.4.0 needed -fno-gcse; 3.4.1 needs -mminimal-toc; this needs a
-	# closer look... - corsair
-	use ppc64 && append-flags "-mminimal-toc"
-
-	# work around bug #120858, gcc 3.4.x -Os miscompilation
-	use x86 && replace-flags "-Os" "-O2" # see bug #120858
-
-	replace-flags "-O3" "-O2" # see bug #148180
-
-	export BINDNOW_FLAGS="$(bindnow-flags)"
-
-	kde_src_compile
-
-	if use doc; then
-		make apidox || die
-	fi
-}
-
-src_install() {
-	kde_src_install
-
-	if use doc; then
-		make DESTDIR="${D}" install-apidox || die
-	fi
-
-	# Needed to create lib -> lib64 symlink for amd64 2005.0 profile
-	if [ "${SYMLINK_LIB}" = "yes" ]; then
-		dosym $(get_abi_LIBDIR ${DEFAULT_ABI}) ${KDEDIR}/lib
-	fi
-
-	# Get rid of the disabled version of the kdnsd libraries
-	if use avahi; then
-		rm -rf "${D}/${PREFIX}"/$(get_libdir)/libkdnssd.*
-	fi
-
-	dodir /etc/env.d
-
-	# List all the multilib libdirs
-	local libdirs
-	for libdir in $(get_all_libdirs); do
-		libdirs="${libdirs}:${PREFIX}/${libdir}"
-	done
-
-	# Please note that the KDE install path has to be the last value in KDEDIRS.
-	cat <<EOF > "${D}"/etc/env.d/45kdepaths-${SLOT} # number goes down with version upgrade
-PATH=${PREFIX}/bin
-ROOTPATH=${PREFIX}/sbin:${PREFIX}/bin
-LDPATH=${libdirs:1}
-MANPATH=${PREFIX}/share/man
-CONFIG_PROTECT="${PREFIX}/share/config ${PREFIX}/env ${PREFIX}/shutdown /usr/share/config"
-KDEDIRS="/usr:/usr/local:${PREFIX}"
-#KDE_IS_PRELINKED=1
-XDG_DATA_DIRS="/usr/share:${PREFIX}/share:/usr/local/share"
-COLON_SEPARATED="XDG_DATA_DIRS"
-EOF
-
-	# Make sure the target for the revdep-rebuild stuff exists. Fixes bug 184441.
-	dodir /etc/revdep-rebuild
-
-cat <<EOF > "${D}"/etc/revdep-rebuild/50-kde3
-SEARCH_DIRS="${PREFIX}/bin ${PREFIX}/lib*"
-EOF
-}
diff --git a/kde-base/kdelibs/kdelibs-3.5.7-r3.ebuild b/kde-base/kdelibs/kdelibs-3.5.7-r3.ebuild
deleted file mode 100644
index b7acc05c8860..000000000000
--- a/kde-base/kdelibs/kdelibs-3.5.7-r3.ebuild
+++ /dev/null
@@ -1,205 +0,0 @@
-# Copyright 1999-2007 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kdelibs/kdelibs-3.5.7-r3.ebuild,v 1.8 2007/11/11 17:52:52 philantrop Exp $
-
-inherit kde flag-o-matic eutils multilib
-set-kdedir 3.5
-
-DESCRIPTION="KDE libraries needed by all KDE programs."
-HOMEPAGE="http://www.kde.org/"
-SRC_URI="mirror://kde/stable/${PV}/src/${P}.tar.bz2
-	mirror://gentoo/kdelibs-3.5-patchset-10.tar.bz2
-	mirror://gentoo/${PN}-3.5.7-seli-xinerama.patch.bz2"
-
-LICENSE="GPL-2 LGPL-2"
-SLOT="3.5"
-KEYWORDS="alpha amd64 hppa ia64 ppc ppc64 sparc x86 ~x86-fbsd"
-IUSE="acl alsa arts bindist branding cups doc jpeg2k kerberos legacyssl utempter openexr spell tiff
-	avahi kernel_linux fam lua kdehiddenvisibility"
-
-# Added aspell-en as dependency to work around bug 131512.
-# Made openssl and zeroconf mandatory dependencies, see bug #172972 and #175984
-RDEPEND="$(qt_min_version 3.3.3)
-	arts? ( >=kde-base/arts-3.5.5 )
-	app-arch/bzip2
-	>=media-libs/freetype-2
-	media-libs/fontconfig
-	>=dev-libs/libxslt-1.1.16
-	>=dev-libs/libxml2-2.6.6
-	>=dev-libs/libpcre-6.6
-	media-libs/libart_lgpl
-	net-dns/libidn
-	>=dev-libs/openssl-0.9.7d
-	acl? ( kernel_linux? ( sys-apps/acl ) )
-	alsa? ( media-libs/alsa-lib )
-	cups? ( >=net-print/cups-1.1.19 )
-	tiff? ( media-libs/tiff )
-	kerberos? ( virtual/krb5 )
-	jpeg2k? ( media-libs/jasper )
-	openexr? ( >=media-libs/openexr-1.2.2-r2 )
-	!avahi? ( !bindist? ( net-misc/mDNSResponder !kde-misc/kdnssd-avahi ) )
-	fam? ( virtual/fam )
-	virtual/ghostscript
-	utempter? ( sys-libs/libutempter )
-	!kde-base/kde-env
-	lua? ( dev-lang/lua )
-	spell? ( >=app-text/aspell-0.60.5 >=app-dicts/aspell-en-6.0.0 )
-	>=sys-apps/portage-2.1.2.11
-	!kde-base/ksync"
-
-DEPEND="${RDEPEND}
-	doc? ( app-doc/doxygen )
-	sys-devel/gettext"
-
-RDEPEND="${RDEPEND}
-	x11-apps/rgb
-	x11-apps/iceauth"
-
-PDEPEND="avahi? ( kde-misc/kdnssd-avahi )
-		bindist? ( kde-misc/kdnssd-avahi )"
-
-# Testing code is rather broken and merely for developer purposes, so disable it.
-RESTRICT="test"
-
-PATCHES="${FILESDIR}/konqueror-3.5.7-185603-spoofing.diff
-		${FILESDIR}/${P}-kcookiejar.diff"
-
-pkg_setup() {
-	if use legacyssl ; then
-		echo ""
-		elog "You have the legacyssl use flag enabled, which fixes issues with some broken"
-		elog "sites, but breaks others instead. It is strongly discouraged to use it."
-		elog "For more information, see bug #128922."
-		echo ""
-	fi
-
-	if ! use utempter ; then
-		echo ""
-		elog "On some setups, which rely on the correct update of utmp records, not using"
-		elog "utempter might not update them correctly. If you experience unexpected"
-		elog "behaviour, try to rebuild kde-base/kdelibs with utempter use-flag enabled."
-		echo ""
-	fi
-
-	if use alsa && ! built_with_use --missing true media-libs/alsa-lib midi; then
-		eerror "The alsa USE flag in this package enables ALSA support"
-		eerror "for libkmid, KDE midi library."
-		eerror "For this reason, you have to merge media-libs/alsa-lib"
-		eerror "with the midi USE flag enabled, or disable alsa USE flag"
-		eerror "for this package."
-		die "Missing midi USE flag on media-libs/alsa-lib"
-	fi
-}
-
-src_unpack() {
-	kde_src_unpack
-
-	if use legacyssl ; then
-		# This patch won't be included upstream, see bug #128922.
-		epatch "${WORKDIR}/patches/kdelibs_3.5.4-kssl-3des.patch"
-	fi
-
-	if use utempter ; then
-		# Bug #135818 is the eternal reference.
-		epatch "${WORKDIR}/patches/kdelibs-3.5_libutempter.patch"
-	fi
-
-	if use branding ; then
-		# Add "(Gentoo)" to khtml user agent.
-		epatch "${WORKDIR}/patches/kdelibs_3.5-cattlebrand.diff"
-	fi
-
-	# Xinerama patch from Lubos Lunak.
-	# http://ktown.kde.org/~seli/xinerama/
-	epatch "${DISTDIR}/${PN}-3.5.7-seli-xinerama.patch.bz2"
-}
-
-src_compile() {
-	rm -f "${S}/configure"
-
-	myconf="--with-distribution=Gentoo --disable-fast-malloc
-			--with-libart --with-libidn --with-ssl
-			--without-hspell
-			$(use_enable fam libfam) $(use_enable kernel_linux dnotify)
-			$(use_with acl) $(use_with alsa)
-			$(use_with arts) $(use_enable cups)
-			$(use_with kerberos gssapi) $(use_with tiff)
-			$(use_with jpeg2k jasper) $(use_with openexr)
-			$(use_with utempter) $(use_with lua)
-			$(use_enable kernel_linux sendfile) --enable-mitshm
-			$(use_with spell aspell)"
-
-	if use avahi || use bindist ; then
-		myconf="${myconf} --disable-dnssd"
-	else
-		myconf="${myconf} --enable-dnssd"
-	fi
-
-	if has_version x11-apps/rgb; then
-		myconf="${myconf} --with-rgbfile=/usr/share/X11/rgb.txt"
-	fi
-
-	# fix bug 58179, bug 85593
-	# kdelibs-3.4.0 needed -fno-gcse; 3.4.1 needs -mminimal-toc; this needs a
-	# closer look... - corsair
-	use ppc64 && append-flags "-mminimal-toc"
-
-	# work around bug #120858, gcc 3.4.x -Os miscompilation
-	use x86 && replace-flags "-Os" "-O2" # see bug #120858
-
-	replace-flags "-O3" "-O2" # see bug #148180
-
-	export BINDNOW_FLAGS="$(bindnow-flags)"
-
-	kde_src_compile
-
-	if use doc; then
-		make apidox || die
-	fi
-}
-
-src_install() {
-	kde_src_install
-
-	if use doc; then
-		make DESTDIR="${D}" install-apidox || die
-	fi
-
-	# Needed to create lib -> lib64 symlink for amd64 2005.0 profile
-	if [ "${SYMLINK_LIB}" = "yes" ]; then
-		dosym $(get_abi_LIBDIR ${DEFAULT_ABI}) ${KDEDIR}/lib
-	fi
-
-	# Get rid of the disabled version of the kdnsd libraries
-	if use avahi || use bindist ; then
-		rm -rf "${D}/${PREFIX}"/$(get_libdir)/libkdnssd.*
-	fi
-
-	dodir /etc/env.d
-
-	# List all the multilib libdirs
-	local libdirs
-	for libdir in $(get_all_libdirs); do
-		libdirs="${libdirs}:${PREFIX}/${libdir}"
-	done
-
-	# Please note that the KDE install path has to be the last value in KDEDIRS.
-	cat <<EOF > "${D}"/etc/env.d/45kdepaths-${SLOT} # number goes down with version upgrade
-PATH=${PREFIX}/bin
-ROOTPATH=${PREFIX}/sbin:${PREFIX}/bin
-LDPATH=${libdirs:1}
-MANPATH=${PREFIX}/share/man
-CONFIG_PROTECT="${PREFIX}/share/config ${PREFIX}/env ${PREFIX}/shutdown /usr/share/config"
-KDEDIRS="/usr:/usr/local:${PREFIX}"
-#KDE_IS_PRELINKED=1
-XDG_DATA_DIRS="/usr/share:${PREFIX}/share:/usr/local/share"
-COLON_SEPARATED="XDG_DATA_DIRS"
-EOF
-
-	# Make sure the target for the revdep-rebuild stuff exists. Fixes bug 184441.
-	dodir /etc/revdep-rebuild
-
-cat <<EOF > "${D}"/etc/revdep-rebuild/50-kde3
-SEARCH_DIRS="${PREFIX}/bin ${PREFIX}/lib*"
-EOF
-}
diff --git a/kde-base/kdelibs/kdelibs-3.5.7.ebuild b/kde-base/kdelibs/kdelibs-3.5.7.ebuild
deleted file mode 100644
index 4a2856840418..000000000000
--- a/kde-base/kdelibs/kdelibs-3.5.7.ebuild
+++ /dev/null
@@ -1,202 +0,0 @@
-# Copyright 1999-2007 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kdelibs/kdelibs-3.5.7.ebuild,v 1.5 2007/07/07 13:40:09 philantrop Exp $
-
-inherit kde flag-o-matic eutils multilib
-set-kdedir 3.5
-
-DESCRIPTION="KDE libraries needed by all KDE programs."
-HOMEPAGE="http://www.kde.org/"
-SRC_URI="mirror://kde/stable/${PV}/src/${P}.tar.bz2
-	mirror://gentoo/kdelibs-3.5-patchset-08.tar.bz2
-	mirror://gentoo/${PN}-3.5.7-seli-xinerama.patch.bz2"
-
-LICENSE="GPL-2 LGPL-2"
-SLOT="3.5"
-KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd"
-IUSE="acl alsa arts branding cups doc jpeg2k kerberos legacyssl utempter openexr spell tiff
-avahi kernel_linux fam lua kdehiddenvisibility"
-
-# Added aspell-en as dependency to work around bug 131512.
-# Made openssl and zeroconf mandatory dependencies, see bug #172972 and #175984
-RDEPEND="$(qt_min_version 3.3.3)
-	arts? ( >=kde-base/arts-3.5.5 )
-	app-arch/bzip2
-	>=media-libs/freetype-2
-	media-libs/fontconfig
-	>=dev-libs/libxslt-1.1.16
-	>=dev-libs/libxml2-2.6.6
-	>=dev-libs/libpcre-6.6
-	media-libs/libart_lgpl
-	net-dns/libidn
-	>=dev-libs/openssl-0.9.7d
-	acl? ( kernel_linux? ( sys-apps/acl ) )
-	alsa? ( media-libs/alsa-lib )
-	cups? ( >=net-print/cups-1.1.19 )
-	tiff? ( media-libs/tiff )
-	kerberos? ( virtual/krb5 )
-	jpeg2k? ( media-libs/jasper )
-	openexr? ( >=media-libs/openexr-1.2.2-r2 )
-	!avahi? ( net-misc/mDNSResponder !kde-misc/kdnssd-avahi )
-	fam? ( virtual/fam )
-	virtual/ghostscript
-	utempter? ( sys-libs/libutempter )
-	!kde-base/kde-env
-	lua? ( dev-lang/lua )
-	spell? ( >=app-text/aspell-0.60.5 >=app-dicts/aspell-en-6.0.0 )
-	>=sys-apps/portage-2.1.2.6"
-
-DEPEND="${RDEPEND}
-	doc? ( app-doc/doxygen )
-	sys-devel/gettext"
-
-RDEPEND="${RDEPEND}
-	x11-apps/rgb
-	x11-apps/iceauth"
-
-PDEPEND="avahi? ( kde-misc/kdnssd-avahi )"
-
-# Testing code is rather broken and merely for developer purposes, so disable it.
-RESTRICT="test"
-
-PATCHES="${FILESDIR}/${P}-html-style.patch"
-
-pkg_setup() {
-	if use legacyssl ; then
-		echo ""
-		elog "You have the legacyssl use flag enabled, which fixes issues with some broken"
-		elog "sites, but breaks others instead. It is strongly discouraged to use it."
-		elog "For more information, see bug #128922."
-		echo ""
-	fi
-
-	if ! use utempter ; then
-		echo ""
-		elog "On some setups, which rely on the correct update of utmp records, not using"
-		elog "utempter might not update them correctly. If you experience unexpected"
-		elog "behaviour, try to rebuild kde-base/kdelibs with utempter use-flag enabled."
-		echo ""
-	fi
-
-	if use alsa && ! built_with_use --missing true media-libs/alsa-lib midi; then
-		eerror "The alsa USE flag in this package enables ALSA support"
-		eerror "for libkmid, KDE midi library."
-		eerror "For this reason, you have to merge media-libs/alsa-lib"
-		eerror "with the midi USE flag enabled, or disable alsa USE flag"
-		eerror "for this package."
-		die "Missing midi USE flag on media-libs/alsa-lib"
-	fi
-}
-
-src_unpack() {
-	kde_src_unpack
-
-	if use legacyssl ; then
-		# This patch won't be included upstream, see bug #128922.
-		epatch "${WORKDIR}/patches/kdelibs_3.5.4-kssl-3des.patch"
-	fi
-
-	if use utempter ; then
-		# Bug #135818 is the eternal reference.
-		epatch "${WORKDIR}/patches/kdelibs-3.5_libutempter.patch"
-	fi
-
-	if use branding ; then
-		# Add "(Gentoo)" to khtml user agent.
-		epatch "${WORKDIR}/patches/kdelibs_3.5-cattlebrand.diff"
-	fi
-
-	# Xinerama patch from Lubos Lunak.
-	# http://ktown.kde.org/~seli/xinerama/
-	epatch "${DISTDIR}/${PN}-3.5.7-seli-xinerama.patch.bz2"
-}
-
-src_compile() {
-	rm -f "${S}/configure"
-
-	myconf="--with-distribution=Gentoo --disable-fast-malloc
-			--with-libart --with-libidn --with-ssl
-			--without-hspell
-			$(use_enable fam libfam) $(use_enable kernel_linux dnotify)
-			$(use_with acl) $(use_with alsa)
-			$(use_with arts) $(use_enable cups)
-			$(use_with kerberos gssapi) $(use_with tiff)
-			$(use_with jpeg2k jasper) $(use_with openexr)
-			$(use_with utempter) $(use_with lua)
-			$(use_enable kernel_linux sendfile) --enable-mitshm
-			$(use_with spell aspell)"
-
-	if ! use avahi; then
-		myconf="${myconf} --enable-dnssd"
-	else
-		myconf="${myconf} --disable-dnssd"
-	fi
-
-	if has_version x11-apps/rgb; then
-		myconf="${myconf} --with-rgbfile=/usr/share/X11/rgb.txt"
-	fi
-
-	# fix bug 58179, bug 85593
-	# kdelibs-3.4.0 needed -fno-gcse; 3.4.1 needs -mminimal-toc; this needs a
-	# closer look... - corsair
-	use ppc64 && append-flags "-mminimal-toc"
-
-	# work around bug #120858, gcc 3.4.x -Os miscompilation
-	use x86 && replace-flags "-Os" "-O2" # see bug #120858
-
-	replace-flags "-O3" "-O2" # see bug #148180
-
-	export BINDNOW_FLAGS="$(bindnow-flags)"
-
-	kde_src_compile
-
-	if use doc; then
-		make apidox || die
-	fi
-}
-
-src_install() {
-	kde_src_install
-
-	if use doc; then
-		make DESTDIR="${D}" install-apidox || die
-	fi
-
-	# Needed to create lib -> lib64 symlink for amd64 2005.0 profile
-	if [ "${SYMLINK_LIB}" = "yes" ]; then
-		dosym $(get_abi_LIBDIR ${DEFAULT_ABI}) ${KDEDIR}/lib
-	fi
-
-	# Get rid of the disabled version of the kdnsd libraries
-	if use avahi; then
-		rm -rf "${D}/${PREFIX}"/$(get_libdir)/libkdnssd.*
-	fi
-
-	dodir /etc/env.d
-
-	# List all the multilib libdirs
-	local libdirs
-	for libdir in $(get_all_libdirs); do
-		libdirs="${libdirs}:${PREFIX}/${libdir}"
-	done
-
-	# Please note that the KDE install path has to be the last value in KDEDIRS.
-	cat <<EOF > "${D}"/etc/env.d/45kdepaths-${SLOT} # number goes down with version upgrade
-PATH=${PREFIX}/bin
-ROOTPATH=${PREFIX}/sbin:${PREFIX}/bin
-LDPATH=${libdirs:1}
-MANPATH=${PREFIX}/share/man
-CONFIG_PROTECT="${PREFIX}/share/config ${PREFIX}/env ${PREFIX}/shutdown /usr/share/config"
-KDEDIRS="/usr:/usr/local:${PREFIX}"
-#KDE_IS_PRELINKED=1
-XDG_DATA_DIRS="/usr/share:${PREFIX}/share:/usr/local/share"
-COLON_SEPARATED="XDG_DATA_DIRS"
-EOF
-
-	# Make sure the target for the revdep-rebuild stuff exists. Fixes bug 184441.
-	dodir /etc/revdep-rebuild
-
-cat <<EOF > "${D}"/etc/revdep-rebuild/50-kde3
-SEARCH_DIRS="${PREFIX}/bin ${PREFIX}/lib*"
-EOF
-}
diff --git a/kde-base/kdelibs/kdelibs-3.5.8-r1.ebuild b/kde-base/kdelibs/kdelibs-3.5.8-r1.ebuild
deleted file mode 100644
index ab862122278a..000000000000
--- a/kde-base/kdelibs/kdelibs-3.5.8-r1.ebuild
+++ /dev/null
@@ -1,202 +0,0 @@
-# Copyright 1999-2007 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kdelibs/kdelibs-3.5.8-r1.ebuild,v 1.2 2007/11/11 17:52:52 philantrop Exp $
-
-inherit kde flag-o-matic eutils multilib
-set-kdedir 3.5
-
-DESCRIPTION="KDE libraries needed by all KDE programs."
-HOMEPAGE="http://www.kde.org/"
-SRC_URI="mirror://kde/stable/${PV}/src/${P}.tar.bz2
-	mirror://gentoo/kdelibs-3.5-patchset-12.tar.bz2
-	mirror://gentoo/${P}-seli-xinerama.patch.bz2"
-
-LICENSE="GPL-2 LGPL-2"
-SLOT="3.5"
-KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd"
-IUSE="acl alsa arts bindist branding cups doc jpeg2k kerberos legacyssl utempter openexr spell tiff
-	avahi kernel_linux fam lua kdehiddenvisibility"
-
-# Added aspell-en as dependency to work around bug 131512.
-# Made openssl and zeroconf mandatory dependencies, see bug #172972 and #175984
-RDEPEND="$(qt_min_version 3.3.3)
-	arts? ( >=kde-base/arts-3.5.5 )
-	app-arch/bzip2
-	>=media-libs/freetype-2
-	media-libs/fontconfig
-	>=dev-libs/libxslt-1.1.16
-	>=dev-libs/libxml2-2.6.6
-	>=dev-libs/libpcre-6.6
-	media-libs/libart_lgpl
-	net-dns/libidn
-	>=dev-libs/openssl-0.9.7d
-	acl? ( kernel_linux? ( sys-apps/acl ) )
-	alsa? ( media-libs/alsa-lib )
-	cups? ( >=net-print/cups-1.1.19 )
-	tiff? ( media-libs/tiff )
-	kerberos? ( virtual/krb5 )
-	jpeg2k? ( media-libs/jasper )
-	openexr? ( >=media-libs/openexr-1.2.2-r2 )
-	!avahi? ( !bindist? ( net-misc/mDNSResponder !kde-misc/kdnssd-avahi ) )
-	fam? ( virtual/fam )
-	virtual/ghostscript
-	utempter? ( sys-libs/libutempter )
-	!kde-base/kde-env
-	lua? ( dev-lang/lua )
-	spell? ( >=app-text/aspell-0.60.5 >=app-dicts/aspell-en-6.0.0 )
-	>=sys-apps/portage-2.1.2.11
-	!kde-base/ksync"
-
-DEPEND="${RDEPEND}
-	doc? ( app-doc/doxygen )
-	sys-devel/gettext"
-
-RDEPEND="${RDEPEND}
-	x11-apps/rgb
-	x11-apps/iceauth"
-
-PDEPEND="avahi? ( kde-misc/kdnssd-avahi )
-		bindist? ( kde-misc/kdnssd-avahi )"
-
-# Testing code is rather broken and merely for developer purposes, so disable it.
-RESTRICT="test"
-
-pkg_setup() {
-	if use legacyssl ; then
-		echo ""
-		elog "You have the legacyssl use flag enabled, which fixes issues with some broken"
-		elog "sites, but breaks others instead. It is strongly discouraged to use it."
-		elog "For more information, see bug #128922."
-		echo ""
-	fi
-
-	if ! use utempter ; then
-		echo ""
-		elog "On some setups, which rely on the correct update of utmp records, not using"
-		elog "utempter might not update them correctly. If you experience unexpected"
-		elog "behaviour, try to rebuild kde-base/kdelibs with utempter use-flag enabled."
-		echo ""
-	fi
-
-	if use alsa && ! built_with_use --missing true media-libs/alsa-lib midi; then
-		eerror "The alsa USE flag in this package enables ALSA support"
-		eerror "for libkmid, KDE midi library."
-		eerror "For this reason, you have to merge media-libs/alsa-lib"
-		eerror "with the midi USE flag enabled, or disable alsa USE flag"
-		eerror "for this package."
-		die "Missing midi USE flag on media-libs/alsa-lib"
-	fi
-}
-
-src_unpack() {
-	kde_src_unpack
-
-	if use legacyssl ; then
-		# This patch won't be included upstream, see bug #128922.
-		epatch "${WORKDIR}/patches/kdelibs_3.5.4-kssl-3des.patch"
-	fi
-
-	if use utempter ; then
-		# Bug #135818 is the eternal reference.
-		epatch "${WORKDIR}/patches/kdelibs-3.5_libutempter.patch"
-	fi
-
-	if use branding ; then
-		# Add "(Gentoo)" to khtml user agent.
-		epatch "${WORKDIR}/patches/kdelibs_3.5-cattlebrand.diff"
-	fi
-
-	# Xinerama patch from Lubos Lunak.
-	# http://ktown.kde.org/~seli/xinerama/
-	epatch "${WORKDIR}/${P}-seli-xinerama.patch"
-}
-
-src_compile() {
-	rm -f "${S}/configure"
-
-	myconf="--with-distribution=Gentoo --disable-fast-malloc
-			--with-libart --with-libidn --with-ssl
-			--without-hspell
-			$(use_enable fam libfam) $(use_enable kernel_linux dnotify)
-			$(use_with acl) $(use_with alsa)
-			$(use_with arts) $(use_enable cups)
-			$(use_with kerberos gssapi) $(use_with tiff)
-			$(use_with jpeg2k jasper) $(use_with openexr)
-			$(use_with utempter) $(use_with lua)
-			$(use_enable kernel_linux sendfile) --enable-mitshm
-			$(use_with spell aspell)"
-
-	if use avahi || use bindist ; then
-		myconf="${myconf} --disable-dnssd"
-	else
-		myconf="${myconf} --enable-dnssd"
-	fi
-
-	if has_version x11-apps/rgb; then
-		myconf="${myconf} --with-rgbfile=/usr/share/X11/rgb.txt"
-	fi
-
-	# fix bug 58179, bug 85593
-	# kdelibs-3.4.0 needed -fno-gcse; 3.4.1 needs -mminimal-toc; this needs a
-	# closer look... - corsair
-	use ppc64 && append-flags "-mminimal-toc"
-
-	# work around bug #120858, gcc 3.4.x -Os miscompilation
-	use x86 && replace-flags "-Os" "-O2" # see bug #120858
-
-	replace-flags "-O3" "-O2" # see bug #148180
-
-	export BINDNOW_FLAGS="$(bindnow-flags)"
-
-	kde_src_compile
-
-	if use doc; then
-		make apidox || die
-	fi
-}
-
-src_install() {
-	kde_src_install
-
-	if use doc; then
-		make DESTDIR="${D}" install-apidox || die
-	fi
-
-	# Needed to create lib -> lib64 symlink for amd64 2005.0 profile
-	if [ "${SYMLINK_LIB}" = "yes" ]; then
-		dosym $(get_abi_LIBDIR ${DEFAULT_ABI}) ${KDEDIR}/lib
-	fi
-
-	# Get rid of the disabled version of the kdnsd libraries
-	if use avahi || use bindist ; then
-		rm -rf "${D}/${PREFIX}"/$(get_libdir)/libkdnssd.*
-	fi
-
-	dodir /etc/env.d
-
-	# List all the multilib libdirs
-	local libdirs
-	for libdir in $(get_all_libdirs); do
-		libdirs="${libdirs}:${PREFIX}/${libdir}"
-	done
-
-	# Please note that the KDE install path has to be the last value in KDEDIRS.
-	cat <<EOF > "${D}"/etc/env.d/45kdepaths-${SLOT} # number goes down with version upgrade
-PATH=${PREFIX}/bin
-ROOTPATH=${PREFIX}/sbin:${PREFIX}/bin
-LDPATH=${libdirs:1}
-MANPATH=${PREFIX}/share/man
-CONFIG_PROTECT="${PREFIX}/share/config ${PREFIX}/env ${PREFIX}/shutdown /usr/share/config"
-KDEDIRS="/usr:/usr/local:${PREFIX}"
-#KDE_IS_PRELINKED=1
-XDG_DATA_DIRS="/usr/share:${PREFIX}/share:/usr/local/share"
-COLON_SEPARATED="XDG_DATA_DIRS"
-EOF
-
-	# Make sure the target for the revdep-rebuild stuff exists. Fixes bug 184441.
-	dodir /etc/revdep-rebuild
-
-cat <<EOF > "${D}"/etc/revdep-rebuild/50-kde3
-SEARCH_DIRS="${PREFIX}/bin ${PREFIX}/lib*"
-EOF
-}
diff --git a/kde-base/kdelibs/kdelibs-3.5.8-r2.ebuild b/kde-base/kdelibs/kdelibs-3.5.8-r2.ebuild
deleted file mode 100644
index 8e779962ab85..000000000000
--- a/kde-base/kdelibs/kdelibs-3.5.8-r2.ebuild
+++ /dev/null
@@ -1,202 +0,0 @@
-# Copyright 1999-2007 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kdelibs/kdelibs-3.5.8-r2.ebuild,v 1.1 2007/12/29 17:29:14 tgurr Exp $
-
-inherit kde flag-o-matic eutils multilib
-set-kdedir 3.5
-
-DESCRIPTION="KDE libraries needed by all KDE programs."
-HOMEPAGE="http://www.kde.org/"
-SRC_URI="mirror://kde/stable/${PV}/src/${P}.tar.bz2
-	mirror://gentoo/kdelibs-3.5-patchset-13.tar.bz2
-	mirror://gentoo/${P}-seli-xinerama.patch.bz2"
-
-LICENSE="GPL-2 LGPL-2"
-SLOT="3.5"
-KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd"
-IUSE="acl alsa arts bindist branding cups doc jpeg2k kerberos legacyssl utempter openexr spell tiff
-	avahi kernel_linux fam lua kdehiddenvisibility"
-
-# Added aspell-en as dependency to work around bug 131512.
-# Made openssl and zeroconf mandatory dependencies, see bug #172972 and #175984
-RDEPEND="$(qt_min_version 3.3.3)
-	arts? ( >=kde-base/arts-3.5.5 )
-	app-arch/bzip2
-	>=media-libs/freetype-2
-	media-libs/fontconfig
-	>=dev-libs/libxslt-1.1.16
-	>=dev-libs/libxml2-2.6.6
-	>=dev-libs/libpcre-6.6
-	media-libs/libart_lgpl
-	net-dns/libidn
-	>=dev-libs/openssl-0.9.7d
-	acl? ( kernel_linux? ( sys-apps/acl ) )
-	alsa? ( media-libs/alsa-lib )
-	cups? ( >=net-print/cups-1.1.19 )
-	tiff? ( media-libs/tiff )
-	kerberos? ( virtual/krb5 )
-	jpeg2k? ( media-libs/jasper )
-	openexr? ( >=media-libs/openexr-1.2.2-r2 )
-	!avahi? ( !bindist? ( net-misc/mDNSResponder !kde-misc/kdnssd-avahi ) )
-	fam? ( virtual/fam )
-	virtual/ghostscript
-	utempter? ( sys-libs/libutempter )
-	!kde-base/kde-env
-	lua? ( dev-lang/lua )
-	spell? ( >=app-text/aspell-0.60.5 >=app-dicts/aspell-en-6.0.0 )
-	>=sys-apps/portage-2.1.2.11
-	!kde-base/ksync"
-
-DEPEND="${RDEPEND}
-	doc? ( app-doc/doxygen )
-	sys-devel/gettext"
-
-RDEPEND="${RDEPEND}
-	x11-apps/rgb
-	x11-apps/iceauth"
-
-PDEPEND="avahi? ( kde-misc/kdnssd-avahi )
-		bindist? ( kde-misc/kdnssd-avahi )"
-
-# Testing code is rather broken and merely for developer purposes, so disable it.
-RESTRICT="test"
-
-pkg_setup() {
-	if use legacyssl ; then
-		echo ""
-		elog "You have the legacyssl use flag enabled, which fixes issues with some broken"
-		elog "sites, but breaks others instead. It is strongly discouraged to use it."
-		elog "For more information, see bug #128922."
-		echo ""
-	fi
-
-	if ! use utempter ; then
-		echo ""
-		elog "On some setups, which rely on the correct update of utmp records, not using"
-		elog "utempter might not update them correctly. If you experience unexpected"
-		elog "behaviour, try to rebuild kde-base/kdelibs with utempter use-flag enabled."
-		echo ""
-	fi
-
-	if use alsa && ! built_with_use --missing true media-libs/alsa-lib midi; then
-		eerror "The alsa USE flag in this package enables ALSA support"
-		eerror "for libkmid, KDE midi library."
-		eerror "For this reason, you have to merge media-libs/alsa-lib"
-		eerror "with the midi USE flag enabled, or disable alsa USE flag"
-		eerror "for this package."
-		die "Missing midi USE flag on media-libs/alsa-lib"
-	fi
-}
-
-src_unpack() {
-	kde_src_unpack
-
-	if use legacyssl ; then
-		# This patch won't be included upstream, see bug #128922.
-		epatch "${WORKDIR}/patches/kdelibs_3.5.4-kssl-3des.patch"
-	fi
-
-	if use utempter ; then
-		# Bug #135818 is the eternal reference.
-		epatch "${WORKDIR}/patches/kdelibs-3.5_libutempter.patch"
-	fi
-
-	if use branding ; then
-		# Add "(Gentoo)" to khtml user agent.
-		epatch "${WORKDIR}/patches/kdelibs_3.5-cattlebrand.diff"
-	fi
-
-	# Xinerama patch from Lubos Lunak.
-	# http://ktown.kde.org/~seli/xinerama/
-	epatch "${WORKDIR}/${P}-seli-xinerama.patch"
-}
-
-src_compile() {
-	rm -f "${S}/configure"
-
-	myconf="--with-distribution=Gentoo --disable-fast-malloc
-			--with-libart --with-libidn --with-ssl
-			--without-hspell
-			$(use_enable fam libfam) $(use_enable kernel_linux dnotify)
-			$(use_with acl) $(use_with alsa)
-			$(use_with arts) $(use_enable cups)
-			$(use_with kerberos gssapi) $(use_with tiff)
-			$(use_with jpeg2k jasper) $(use_with openexr)
-			$(use_with utempter) $(use_with lua)
-			$(use_enable kernel_linux sendfile) --enable-mitshm
-			$(use_with spell aspell)"
-
-	if use avahi || use bindist ; then
-		myconf="${myconf} --disable-dnssd"
-	else
-		myconf="${myconf} --enable-dnssd"
-	fi
-
-	if has_version x11-apps/rgb; then
-		myconf="${myconf} --with-rgbfile=/usr/share/X11/rgb.txt"
-	fi
-
-	# fix bug 58179, bug 85593
-	# kdelibs-3.4.0 needed -fno-gcse; 3.4.1 needs -mminimal-toc; this needs a
-	# closer look... - corsair
-	use ppc64 && append-flags "-mminimal-toc"
-
-	# work around bug #120858, gcc 3.4.x -Os miscompilation
-	use x86 && replace-flags "-Os" "-O2" # see bug #120858
-
-	replace-flags "-O3" "-O2" # see bug #148180
-
-	export BINDNOW_FLAGS="$(bindnow-flags)"
-
-	kde_src_compile
-
-	if use doc; then
-		make apidox || die
-	fi
-}
-
-src_install() {
-	kde_src_install
-
-	if use doc; then
-		make DESTDIR="${D}" install-apidox || die
-	fi
-
-	# Needed to create lib -> lib64 symlink for amd64 2005.0 profile
-	if [ "${SYMLINK_LIB}" = "yes" ]; then
-		dosym $(get_abi_LIBDIR ${DEFAULT_ABI}) ${KDEDIR}/lib
-	fi
-
-	# Get rid of the disabled version of the kdnsd libraries
-	if use avahi || use bindist ; then
-		rm -rf "${D}/${PREFIX}"/$(get_libdir)/libkdnssd.*
-	fi
-
-	dodir /etc/env.d
-
-	# List all the multilib libdirs
-	local libdirs
-	for libdir in $(get_all_libdirs); do
-		libdirs="${libdirs}:${PREFIX}/${libdir}"
-	done
-
-	# Please note that the KDE install path has to be the last value in KDEDIRS.
-	cat <<EOF > "${D}"/etc/env.d/45kdepaths-${SLOT} # number goes down with version upgrade
-PATH=${PREFIX}/bin
-ROOTPATH=${PREFIX}/sbin:${PREFIX}/bin
-LDPATH=${libdirs:1}
-MANPATH=${PREFIX}/share/man
-CONFIG_PROTECT="${PREFIX}/share/config ${PREFIX}/env ${PREFIX}/shutdown /usr/share/config"
-KDEDIRS="/usr:/usr/local:${PREFIX}"
-#KDE_IS_PRELINKED=1
-XDG_DATA_DIRS="/usr/share:${PREFIX}/share:/usr/local/share"
-COLON_SEPARATED="XDG_DATA_DIRS"
-EOF
-
-	# Make sure the target for the revdep-rebuild stuff exists. Fixes bug 184441.
-	dodir /etc/revdep-rebuild
-
-cat <<EOF > "${D}"/etc/revdep-rebuild/50-kde3
-SEARCH_DIRS="${PREFIX}/bin ${PREFIX}/lib*"
-EOF
-}
diff --git a/kde-base/kdelibs/kdelibs-3.5.8.ebuild b/kde-base/kdelibs/kdelibs-3.5.8.ebuild
deleted file mode 100644
index 5e3cf7170a2a..000000000000
--- a/kde-base/kdelibs/kdelibs-3.5.8.ebuild
+++ /dev/null
@@ -1,201 +0,0 @@
-# Copyright 1999-2007 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kdelibs/kdelibs-3.5.8.ebuild,v 1.1 2007/10/19 22:27:24 philantrop Exp $
-
-inherit kde flag-o-matic eutils multilib
-set-kdedir 3.5
-
-DESCRIPTION="KDE libraries needed by all KDE programs."
-HOMEPAGE="http://www.kde.org/"
-SRC_URI="mirror://kde/stable/${PV}/src/${P}.tar.bz2
-	mirror://gentoo/kdelibs-3.5-patchset-11.tar.bz2
-	mirror://gentoo/${P}-seli-xinerama.patch.bz2"
-
-LICENSE="GPL-2 LGPL-2"
-SLOT="3.5"
-KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd"
-IUSE="acl alsa arts branding cups doc jpeg2k kerberos legacyssl utempter openexr spell tiff
-avahi kernel_linux fam lua kdehiddenvisibility"
-
-# Added aspell-en as dependency to work around bug 131512.
-# Made openssl and zeroconf mandatory dependencies, see bug #172972 and #175984
-RDEPEND="$(qt_min_version 3.3.3)
-	arts? ( >=kde-base/arts-3.5.5 )
-	app-arch/bzip2
-	>=media-libs/freetype-2
-	media-libs/fontconfig
-	>=dev-libs/libxslt-1.1.16
-	>=dev-libs/libxml2-2.6.6
-	>=dev-libs/libpcre-6.6
-	media-libs/libart_lgpl
-	net-dns/libidn
-	>=dev-libs/openssl-0.9.7d
-	acl? ( kernel_linux? ( sys-apps/acl ) )
-	alsa? ( media-libs/alsa-lib )
-	cups? ( >=net-print/cups-1.1.19 )
-	tiff? ( media-libs/tiff )
-	kerberos? ( virtual/krb5 )
-	jpeg2k? ( media-libs/jasper )
-	openexr? ( >=media-libs/openexr-1.2.2-r2 )
-	!avahi? ( net-misc/mDNSResponder !kde-misc/kdnssd-avahi )
-	fam? ( virtual/fam )
-	virtual/ghostscript
-	utempter? ( sys-libs/libutempter )
-	!kde-base/kde-env
-	lua? ( dev-lang/lua )
-	spell? ( >=app-text/aspell-0.60.5 >=app-dicts/aspell-en-6.0.0 )
-	>=sys-apps/portage-2.1.2.11
-	!kde-base/ksync"
-
-DEPEND="${RDEPEND}
-	doc? ( app-doc/doxygen )
-	sys-devel/gettext"
-
-RDEPEND="${RDEPEND}
-	x11-apps/rgb
-	x11-apps/iceauth"
-
-PDEPEND="avahi? ( kde-misc/kdnssd-avahi )"
-
-# Testing code is rather broken and merely for developer purposes, so disable it.
-RESTRICT="test"
-
-pkg_setup() {
-	if use legacyssl ; then
-		echo ""
-		elog "You have the legacyssl use flag enabled, which fixes issues with some broken"
-		elog "sites, but breaks others instead. It is strongly discouraged to use it."
-		elog "For more information, see bug #128922."
-		echo ""
-	fi
-
-	if ! use utempter ; then
-		echo ""
-		elog "On some setups, which rely on the correct update of utmp records, not using"
-		elog "utempter might not update them correctly. If you experience unexpected"
-		elog "behaviour, try to rebuild kde-base/kdelibs with utempter use-flag enabled."
-		echo ""
-	fi
-
-	if use alsa && ! built_with_use --missing true media-libs/alsa-lib midi; then
-		eerror "The alsa USE flag in this package enables ALSA support"
-		eerror "for libkmid, KDE midi library."
-		eerror "For this reason, you have to merge media-libs/alsa-lib"
-		eerror "with the midi USE flag enabled, or disable alsa USE flag"
-		eerror "for this package."
-		die "Missing midi USE flag on media-libs/alsa-lib"
-	fi
-}
-
-src_unpack() {
-	kde_src_unpack
-
-	if use legacyssl ; then
-		# This patch won't be included upstream, see bug #128922.
-		epatch "${WORKDIR}/patches/kdelibs_3.5.4-kssl-3des.patch"
-	fi
-
-	if use utempter ; then
-		# Bug #135818 is the eternal reference.
-		epatch "${WORKDIR}/patches/kdelibs-3.5_libutempter.patch"
-	fi
-
-	if use branding ; then
-		# Add "(Gentoo)" to khtml user agent.
-		epatch "${WORKDIR}/patches/kdelibs_3.5-cattlebrand.diff"
-	fi
-
-	# Xinerama patch from Lubos Lunak.
-	# http://ktown.kde.org/~seli/xinerama/
-	epatch "${WORKDIR}/${P}-seli-xinerama.patch"
-}
-
-src_compile() {
-	rm -f "${S}/configure"
-
-	myconf="--with-distribution=Gentoo --disable-fast-malloc
-			--with-libart --with-libidn --with-ssl
-			--without-hspell
-			$(use_enable fam libfam) $(use_enable kernel_linux dnotify)
-			$(use_with acl) $(use_with alsa)
-			$(use_with arts) $(use_enable cups)
-			$(use_with kerberos gssapi) $(use_with tiff)
-			$(use_with jpeg2k jasper) $(use_with openexr)
-			$(use_with utempter) $(use_with lua)
-			$(use_enable kernel_linux sendfile) --enable-mitshm
-			$(use_with spell aspell)"
-
-	if ! use avahi; then
-		myconf="${myconf} --enable-dnssd"
-	else
-		myconf="${myconf} --disable-dnssd"
-	fi
-
-	if has_version x11-apps/rgb; then
-		myconf="${myconf} --with-rgbfile=/usr/share/X11/rgb.txt"
-	fi
-
-	# fix bug 58179, bug 85593
-	# kdelibs-3.4.0 needed -fno-gcse; 3.4.1 needs -mminimal-toc; this needs a
-	# closer look... - corsair
-	use ppc64 && append-flags "-mminimal-toc"
-
-	# work around bug #120858, gcc 3.4.x -Os miscompilation
-	use x86 && replace-flags "-Os" "-O2" # see bug #120858
-
-	replace-flags "-O3" "-O2" # see bug #148180
-
-	export BINDNOW_FLAGS="$(bindnow-flags)"
-
-	kde_src_compile
-
-	if use doc; then
-		make apidox || die
-	fi
-}
-
-src_install() {
-	kde_src_install
-
-	if use doc; then
-		make DESTDIR="${D}" install-apidox || die
-	fi
-
-	# Needed to create lib -> lib64 symlink for amd64 2005.0 profile
-	if [ "${SYMLINK_LIB}" = "yes" ]; then
-		dosym $(get_abi_LIBDIR ${DEFAULT_ABI}) ${KDEDIR}/lib
-	fi
-
-	# Get rid of the disabled version of the kdnsd libraries
-	if use avahi; then
-		rm -rf "${D}/${PREFIX}"/$(get_libdir)/libkdnssd.*
-	fi
-
-	dodir /etc/env.d
-
-	# List all the multilib libdirs
-	local libdirs
-	for libdir in $(get_all_libdirs); do
-		libdirs="${libdirs}:${PREFIX}/${libdir}"
-	done
-
-	# Please note that the KDE install path has to be the last value in KDEDIRS.
-	cat <<EOF > "${D}"/etc/env.d/45kdepaths-${SLOT} # number goes down with version upgrade
-PATH=${PREFIX}/bin
-ROOTPATH=${PREFIX}/sbin:${PREFIX}/bin
-LDPATH=${libdirs:1}
-MANPATH=${PREFIX}/share/man
-CONFIG_PROTECT="${PREFIX}/share/config ${PREFIX}/env ${PREFIX}/shutdown /usr/share/config"
-KDEDIRS="/usr:/usr/local:${PREFIX}"
-#KDE_IS_PRELINKED=1
-XDG_DATA_DIRS="/usr/share:${PREFIX}/share:/usr/local/share"
-COLON_SEPARATED="XDG_DATA_DIRS"
-EOF
-
-	# Make sure the target for the revdep-rebuild stuff exists. Fixes bug 184441.
-	dodir /etc/revdep-rebuild
-
-cat <<EOF > "${D}"/etc/revdep-rebuild/50-kde3
-SEARCH_DIRS="${PREFIX}/bin ${PREFIX}/lib*"
-EOF
-}
diff --git a/kde-base/kdelibs/kdelibs-4.0.0-r1.ebuild b/kde-base/kdelibs/kdelibs-4.0.0-r1.ebuild
deleted file mode 100644
index f5555a913a0a..000000000000
--- a/kde-base/kdelibs/kdelibs-4.0.0-r1.ebuild
+++ /dev/null
@@ -1,200 +0,0 @@
-# Copyright 1999-2008 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kdelibs/kdelibs-4.0.0-r1.ebuild,v 1.1 2008/01/28 00:34:34 zlin Exp $
-
-EAPI="1"
-
-inherit kde4-base
-
-DESCRIPTION="KDE libraries needed by all KDE programs."
-HOMEPAGE="http://www.kde.org/"
-
-KEYWORDS="~amd64 ~x86"
-IUSE="3dnow acl alsa altivec bindist +bzip2 debug doc fam htmlhandbook jpeg2k
-kerberos mmx nls openexr opengl +pcre +semantic-desktop spell sse sse2 ssl test zeroconf"
-LICENSE="GPL-2 LGPL-2"
-RESTRICT="test"
-
-COMMONDEPEND="
-	!<kde-base/kdebase-3.5.7-r6
-	!<kde-base/kdebase-startkde-3.5.7-r1
-	!=kde-base/kdebase-3.5.8
-	!=kde-base/kdebase-3.5.8-r1
-	!=kde-base/kdebase-3.5.8-r2
-	!=kde-base/kdebase-startkde-3.5.8
-	>=app-misc/strigi-0.5.7
-	>=dev-libs/libxml2-2.6.6
-	>=dev-libs/libxslt-1.1.17
-	media-libs/fontconfig
-	>=media-libs/freetype-2
-	media-libs/giflib
-	media-libs/jpeg
-	media-libs/libpng
-	>=sys-apps/dbus-0.91
-	x11-libs/libICE
-	x11-libs/libSM
-	x11-libs/libX11
-	x11-libs/libXau
-	x11-libs/libXcursor
-	x11-libs/libXdmcp
-	x11-libs/libXext
-	x11-libs/libXfixes
-	x11-libs/libXft
-	x11-libs/libXpm
-	x11-libs/libXrender
-	x11-libs/libXtst
-	>=x11-misc/shared-mime-info-0.18
-	acl? ( kernel_linux? ( sys-apps/acl ) )
-	alsa? ( >=media-libs/alsa-lib-1.0.14a )
-	fam? ( virtual/fam )
-	jpeg2k? ( media-libs/jasper )
-	kerberos? ( virtual/krb5 )
-	nls? ( virtual/libintl )
-	openexr? ( >=media-libs/openexr-1.2.2-r2 media-libs/ilmbase )
-	opengl? ( virtual/opengl )
-	pcre? ( >=dev-libs/libpcre-4.2 )
-	semantic-desktop? ( >=dev-libs/soprano-2.0.0 )
-	spell? ( app-text/aspell app-dicts/aspell-en app-text/enchant )
-	ssl? ( >=dev-libs/openssl-0.9.7d )
-	zeroconf? ( || ( net-dns/avahi
-		!bindist? ( net-misc/mDNSResponder ) ) )
-"
-
-DEPEND="${COMMONDEPEND}
-	doc? ( app-doc/doxygen )
-	sys-devel/gettext"
-
-RDEPEND="${COMMONDEPEND}
-	x11-apps/rgb
-	x11-apps/iceauth"
-
-# Patch to respect the sandbox when cmake tries to create symlinks,
-# or executes an external program that tries to write files.
-PATCHES="${FILESDIR}/e-tempdir.patch
-${FILESDIR}/${P}-X11-optional.patch
-${FILESDIR}/${P}-alsa-optional.patch
-${FILESDIR}/${P}-flac-1.1.3.patch"
-# Create CMake switches to make Xcomposite, Xinerama & Xscreensaver optional.
-
-pkg_setup() {
-	KDE4_BUILT_WITH_USE_CHECK="--missing true sys-apps/dbus X"
-	use alsa && KDE4_BUILT_WITH_USE_CHECK="${KDE4_BUILT_WITH_USE_CHECK}
-		--missing true media-libs/alsa-lib midi"
-	if use zeroconf && has_version net-dns/avahi; then
-		KDE4_BUILT_WITH_USE_CHECK="${KDE4_BUILT_WITH_USE_CHECK}
-			net-dns/avahi mdnsresponder-compat"
-	fi
-
-	kde4-base_pkg_setup
-}
-
-src_compile() {
-	if use zeroconf; then
-		if has_version net-dns/avahi; then
-			mycmakeargs="${mycmakeargs} -DWITH_Avahi=ON -DWITH_DNSSD=OFF"
-		elif has_version net-misc/mDNSResponder; then
-			mycmakeargs="${mycmakeargs} -DWITH_Avahi=OFF -DWITH_DNSSD=ON"
-		else
-			die "USE=\"zeroconf\" enabled but neither net-dns/avahi nor net-misc/mDNSResponder were found."
-		fi
-	fi
-
-	mycmakeargs="${mycmakeargs}
-		-DWITH_HSPELL=OFF
-		$(cmake-utils_has 3dnow X86_3DNOW)
-		$(cmake-utils_has altivec PPC_ALTIVEC)
-		$(cmake-utils_has mmx X86_MMX)
-		$(cmake-utils_has sse X86_SSE)
-		$(cmake-utils_has sse2 X86_SSE2)
-		$(cmake-utils_use_with acl ACL)
-		$(cmake-utils_use_with alsa Alsa)
-		$(cmake-utils_use_with bzip2 BZip2)
-		$(cmake-utils_use_with fam FAM)
-		$(cmake-utils_use_with jpeg2k Jasper)
-		$(cmake-utils_use_with kerberos GSSAPI)
-		$(cmake-utils_use_with nls Libintl)
-		$(cmake-utils_use_with openexr OpenEXR)
-		$(cmake-utils_use_with opengl OpenGL)
-		$(cmake-utils_use_with pcre PCRE)
-		$(cmake-utils_use_with semantic-desktop Soprano)
-		$(cmake-utils_use_with spell ASPELL)
-		$(cmake-utils_use_with spell ENCHANT)
-		$(cmake-utils_use_with ssl OpenSSL)
-	"
-
-	kde4-base_src_compile
-
-	# The building of apidox is not managed anymore by the build system
-	if use doc; then
-		einfo "Building API documentation"
-		cd "${S}"/doc/api/
-		./doxygen.sh "${S}" || die "APIDOX generation failed"
-	fi
-}
-
-src_install() {
-	kde4-base_src_install
-
-	if use doc; then
-		einfo "Installing API documentation. This could take a bit of time."
-		cd "${S}"/doc/api/
-		docinto /HTML/en/kdelibs-apidox
-		dohtml -r ${P}-apidocs/* || die "Install phase of KDE4 API Documentation failed"
-	fi
-
-	dodir /etc/env.d
-	dodir /etc/revdep-rebuild
-
-	# List all the multilib libdirs
-	local _libdir _libdirs
-	for _libdir in $(get_all_libdirs); do
-		_libdirs="${_libdirs}:${PREFIX}/${_libdir}"
-	done
-	_libdirs=${_libdirs#:}
-
-	cat <<-EOF > "${T}"/44kdepaths-${SLOT} # number goes down with version bump
-	PATH="${PREFIX}/bin"
-	ROOTPATH="${PREFIX}/sbin:${PREFIX}/bin"
-	LDPATH="${_libdirs}"
-	MANPATH="${PREFIX}/share/man"
-	CONFIG_PROTECT="${PREFIX}/share/config ${PREFIX}/env ${PREFIX}/shutdown /usr/share/config"
-	KDEDIRS="/usr:/usr/local:${PREFIX}"
-	#KDE_IS_PRELINKED=1
-	XDG_DATA_DIRS="/usr/share:${PREFIX}/share:/usr/local/share"
-	COLON_SEPARATED="XDG_DATA_DIRS"
-	EOF
-	doenvd "${T}"/44kdepaths-${SLOT}
-
-	# make sure 'source /etc/profile' doesn't hose the PATH
-	dodir /etc/profile.d
-	cat <<-'EOF' > "${D}"/etc/profile.d/44kdereorderpaths-${SLOT}.sh
-	if [ -n "${KDEDIR}" ]; then
-		export PATH=${KDEDIR}/bin:$(echo ${PATH} | sed "s#${KDEDIR}/s\?bin:##g")
-		export ROOTPATH=${KDEDIR}/sbin:${KDEDIR}/bin:$(echo ${PATH} | sed "s#${KDEDIR}/s\?bin:##g")
-	fi
-	EOF
-
-	cat <<-EOF > "${D}/etc/revdep-rebuild/50-kde-${SLOT}"
-	SEARCH_DIRS="${PREFIX}/bin ${PREFIX}/lib*"
-	EOF
-}
-
-src_test() {
-	# FIXME: Disable kate tests
-	mycmakeargs="${mycmakeargs}
-		-DKHTML_BUILD_TESTREGRESSION=ON"
-	kde4-base_src_test
-}
-
-pkg_postinst() {
-	if use zeroconf; then
-		echo
-		elog "To make zeroconf support available in KDE make sure that the 'mdnsd' daemon"
-		elog "is running. Make sure also that multicast dns lookups are enabled by editing"
-		elog "the 'hosts:' line in /etc/nsswitch.conf to include 'mdns', e.g.:"
-		elog "	hosts: files mdns dns"
-		echo
-	fi
-
-	kde4-base_pkg_postinst
-}
diff --git a/kde-base/kdelibs/kdelibs-4.0.0.ebuild b/kde-base/kdelibs/kdelibs-4.0.0.ebuild
deleted file mode 100644
index 8f1ed5377071..000000000000
--- a/kde-base/kdelibs/kdelibs-4.0.0.ebuild
+++ /dev/null
@@ -1,199 +0,0 @@
-# Copyright 1999-2008 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kdelibs/kdelibs-4.0.0.ebuild,v 1.4 2008/01/18 22:11:23 ingmar Exp $
-
-EAPI="1"
-
-inherit kde4-base
-
-DESCRIPTION="KDE libraries needed by all KDE programs."
-HOMEPAGE="http://www.kde.org/"
-
-KEYWORDS="~amd64 ~x86"
-IUSE="3dnow acl alsa altivec bindist +bzip2 debug doc fam htmlhandbook jpeg2k
-kerberos mmx nls openexr opengl +pcre +semantic-desktop spell sse sse2 ssl test zeroconf"
-LICENSE="GPL-2 LGPL-2"
-RESTRICT="test"
-
-COMMONDEPEND="
-	!<kde-base/kdebase-3.5.7-r6
-	!<kde-base/kdebase-startkde-3.5.7-r1
-	!=kde-base/kdebase-3.5.8
-	!=kde-base/kdebase-3.5.8-r1
-	!=kde-base/kdebase-3.5.8-r2
-	!=kde-base/kdebase-startkde-3.5.8
-	>=app-misc/strigi-0.5.7
-	>=dev-libs/libxml2-2.6.6
-	>=dev-libs/libxslt-1.1.17
-	media-libs/fontconfig
-	>=media-libs/freetype-2
-	media-libs/giflib
-	media-libs/jpeg
-	media-libs/libpng
-	>=sys-apps/dbus-0.91
-	x11-libs/libICE
-	x11-libs/libSM
-	x11-libs/libX11
-	x11-libs/libXau
-	x11-libs/libXcursor
-	x11-libs/libXdmcp
-	x11-libs/libXext
-	x11-libs/libXfixes
-	x11-libs/libXft
-	x11-libs/libXpm
-	x11-libs/libXrender
-	x11-libs/libXtst
-	>=x11-misc/shared-mime-info-0.18
-	acl? ( kernel_linux? ( sys-apps/acl ) )
-	alsa? ( >=media-libs/alsa-lib-1.0.14a )
-	fam? ( virtual/fam )
-	jpeg2k? ( media-libs/jasper )
-	kerberos? ( virtual/krb5 )
-	nls? ( virtual/libintl )
-	openexr? ( >=media-libs/openexr-1.2.2-r2 media-libs/ilmbase )
-	opengl? ( virtual/opengl )
-	pcre? ( >=dev-libs/libpcre-4.2 )
-	semantic-desktop? ( >=dev-libs/soprano-2.0.0 )
-	spell? ( app-text/aspell app-dicts/aspell-en app-text/enchant )
-	ssl? ( >=dev-libs/openssl-0.9.7d )
-	zeroconf? ( || ( net-dns/avahi
-		!bindist? ( net-misc/mDNSResponder ) ) )
-"
-
-DEPEND="${COMMONDEPEND}
-	doc? ( app-doc/doxygen )
-	sys-devel/gettext"
-
-RDEPEND="${COMMONDEPEND}
-	x11-apps/rgb
-	x11-apps/iceauth"
-
-# Patch to respect the sandbox when cmake tries to create symlinks,
-# or executes an external program that tries to write files.
-PATCHES="${FILESDIR}/e-tempdir.patch
-${FILESDIR}/${P}-X11-optional.patch
-${FILESDIR}/${P}-alsa-optional.patch"
-# Create CMake switches to make Xcomposite, Xinerama & Xscreensaver optional.
-
-pkg_setup() {
-	KDE4_BUILT_WITH_USE_CHECK="--missing true sys-apps/dbus X"
-	use alsa && KDE4_BUILT_WITH_USE_CHECK="${KDE4_BUILT_WITH_USE_CHECK}
-		--missing true media-libs/alsa-lib midi"
-	if use zeroconf && has_version net-dns/avahi; then
-		KDE4_BUILT_WITH_USE_CHECK="${KDE4_BUILT_WITH_USE_CHECK}
-			net-dns/avahi mdnsresponder-compat"
-	fi
-
-	kde4-base_pkg_setup
-}
-
-src_compile() {
-	if use zeroconf; then
-		if has_version net-dns/avahi; then
-			mycmakeargs="${mycmakeargs} -DWITH_Avahi=ON -DWITH_DNSSD=OFF"
-		elif has_version net-misc/mDNSResponder; then
-			mycmakeargs="${mycmakeargs} -DWITH_Avahi=OFF -DWITH_DNSSD=ON"
-		else
-			die "USE=\"zeroconf\" enabled but neither net-dns/avahi nor net-misc/mDNSResponder were found."
-		fi
-	fi
-
-	mycmakeargs="${mycmakeargs}
-		-DWITH_HSPELL=OFF
-		$(cmake-utils_has 3dnow X86_3DNOW)
-		$(cmake-utils_has altivec PPC_ALTIVEC)
-		$(cmake-utils_has mmx X86_MMX)
-		$(cmake-utils_has sse X86_SSE)
-		$(cmake-utils_has sse2 X86_SSE2)
-		$(cmake-utils_use_with acl ACL)
-		$(cmake-utils_use_with alsa Alsa)
-		$(cmake-utils_use_with bzip2 BZip2)
-		$(cmake-utils_use_with fam FAM)
-		$(cmake-utils_use_with jpeg2k Jasper)
-		$(cmake-utils_use_with kerberos GSSAPI)
-		$(cmake-utils_use_with nls Libintl)
-		$(cmake-utils_use_with openexr OpenEXR)
-		$(cmake-utils_use_with opengl OpenGL)
-		$(cmake-utils_use_with pcre PCRE)
-		$(cmake-utils_use_with semantic-desktop Soprano)
-		$(cmake-utils_use_with spell ASPELL)
-		$(cmake-utils_use_with spell ENCHANT)
-		$(cmake-utils_use_with ssl OpenSSL)
-	"
-
-	kde4-base_src_compile
-
-	# The building of apidox is not managed anymore by the build system
-	if use doc; then
-		einfo "Building API documentation"
-		cd "${S}"/doc/api/
-		./doxygen.sh "${S}" || die "APIDOX generation failed"
-	fi
-}
-
-src_install() {
-	kde4-base_src_install
-
-	if use doc; then
-		einfo "Installing API documentation. This could take a bit of time."
-		cd "${S}"/doc/api/
-		docinto /HTML/en/kdelibs-apidox
-		dohtml -r ${P}-apidocs/* || die "Install phase of KDE4 API Documentation failed"
-	fi
-
-	dodir /etc/env.d
-	dodir /etc/revdep-rebuild
-
-	# List all the multilib libdirs
-	local _libdir _libdirs
-	for _libdir in $(get_all_libdirs); do
-		_libdirs="${_libdirs}:${PREFIX}/${_libdir}"
-	done
-	_libdirs=${_libdirs#:}
-
-	cat <<-EOF > "${T}"/44kdepaths-${SLOT} # number goes down with version bump
-	PATH="${PREFIX}/bin"
-	ROOTPATH="${PREFIX}/sbin:${PREFIX}/bin"
-	LDPATH="${_libdirs}"
-	MANPATH="${PREFIX}/share/man"
-	CONFIG_PROTECT="${PREFIX}/share/config ${PREFIX}/env ${PREFIX}/shutdown /usr/share/config"
-	KDEDIRS="/usr:/usr/local:${PREFIX}"
-	#KDE_IS_PRELINKED=1
-	XDG_DATA_DIRS="/usr/share:${PREFIX}/share:/usr/local/share"
-	COLON_SEPARATED="XDG_DATA_DIRS"
-	EOF
-	doenvd "${T}"/44kdepaths-${SLOT}
-
-	# make sure 'source /etc/profile' doesn't hose the PATH
-	dodir /etc/profile.d
-	cat <<-'EOF' > "${D}"/etc/profile.d/44kdereorderpaths-${SLOT}.sh
-	if [ -n "${KDEDIR}" ]; then
-		export PATH=${KDEDIR}/bin:$(echo ${PATH} | sed "s#${KDEDIR}/s\?bin:##g")
-		export ROOTPATH=${KDEDIR}/sbin:${KDEDIR}/bin:$(echo ${PATH} | sed "s#${KDEDIR}/s\?bin:##g")
-	fi
-	EOF
-
-	cat <<-EOF > "${D}/etc/revdep-rebuild/50-kde-${SLOT}"
-	SEARCH_DIRS="${PREFIX}/bin ${PREFIX}/lib*"
-	EOF
-}
-
-src_test() {
-	# FIXME: Disable kate tests
-	mycmakeargs="${mycmakeargs}
-		-DKHTML_BUILD_TESTREGRESSION=ON"
-	kde4-base_src_test
-}
-
-pkg_postinst() {
-	if use zeroconf; then
-		echo
-		elog "To make zeroconf support available in KDE make sure that the 'mdnsd' daemon"
-		elog "is running. Make sure also that multicast dns lookups are enabled by editing"
-		elog "the 'hosts:' line in /etc/nsswitch.conf to include 'mdns', e.g.:"
-		elog "	hosts: files mdns dns"
-		echo
-	fi
-
-	kde4-base_pkg_postinst
-}
diff --git a/kde-base/kdelibs/kdelibs-4.0.1.ebuild b/kde-base/kdelibs/kdelibs-4.0.1.ebuild
deleted file mode 100644
index 08c481f46222..000000000000
--- a/kde-base/kdelibs/kdelibs-4.0.1.ebuild
+++ /dev/null
@@ -1,198 +0,0 @@
-# Copyright 1999-2008 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kdelibs/kdelibs-4.0.1.ebuild,v 1.1 2008/02/07 00:12:41 philantrop Exp $
-
-EAPI="1"
-
-inherit kde4-base
-
-DESCRIPTION="KDE libraries needed by all KDE programs."
-HOMEPAGE="http://www.kde.org/"
-
-KEYWORDS="~amd64 ~x86"
-IUSE="3dnow acl alsa altivec bindist +bzip2 debug doc fam htmlhandbook jpeg2k
-kerberos mmx nls openexr opengl +semantic-desktop spell sse sse2 ssl test zeroconf"
-LICENSE="GPL-2 LGPL-2"
-RESTRICT="test"
-
-COMMONDEPEND="
-	!<kde-base/kdebase-3.5.7-r6
-	!<kde-base/kdebase-startkde-3.5.7-r1
-	!=kde-base/kdebase-3.5.8
-	!=kde-base/kdebase-3.5.8-r1
-	!=kde-base/kdebase-3.5.8-r2
-	!=kde-base/kdebase-startkde-3.5.8
-	>=app-misc/strigi-0.5.7
-	>=dev-libs/libxml2-2.6.6
-	>=dev-libs/libxslt-1.1.17
-	media-libs/fontconfig
-	>=media-libs/freetype-2
-	media-libs/giflib
-	media-libs/jpeg
-	media-libs/libpng
-	>=sys-apps/dbus-0.91
-	x11-libs/libICE
-	x11-libs/libSM
-	x11-libs/libX11
-	x11-libs/libXau
-	x11-libs/libXcursor
-	x11-libs/libXdmcp
-	x11-libs/libXext
-	x11-libs/libXfixes
-	x11-libs/libXft
-	x11-libs/libXpm
-	x11-libs/libXrender
-	x11-libs/libXtst
-	>=x11-misc/shared-mime-info-0.20
-	acl? ( kernel_linux? ( sys-apps/acl ) )
-	alsa? ( >=media-libs/alsa-lib-1.0.14a )
-	fam? ( virtual/fam )
-	jpeg2k? ( media-libs/jasper )
-	kerberos? ( virtual/krb5 )
-	nls? ( virtual/libintl )
-	openexr? ( >=media-libs/openexr-1.2.2-r2 media-libs/ilmbase )
-	opengl? ( virtual/opengl )
-	>=dev-libs/libpcre-4.5
-	semantic-desktop? ( >=dev-libs/soprano-2.0.0 )
-	spell? ( app-text/aspell app-dicts/aspell-en app-text/enchant )
-	ssl? ( >=dev-libs/openssl-0.9.7d )
-	zeroconf? ( || ( net-dns/avahi
-		!bindist? ( net-misc/mDNSResponder ) ) )
-"
-
-DEPEND="${COMMONDEPEND}
-	doc? ( app-doc/doxygen )
-	sys-devel/gettext"
-
-RDEPEND="${COMMONDEPEND}
-	x11-apps/rgb
-	x11-apps/iceauth"
-
-# Patch to respect the sandbox when cmake tries to create symlinks,
-# or executes an external program that tries to write files.
-PATCHES="${FILESDIR}/e-tempdir.patch
-${FILESDIR}/${P}-X11-optional.patch
-${FILESDIR}/${P}-alsa-optional.patch"
-# Create CMake switches to make Xcomposite, Xinerama & Xscreensaver optional.
-
-pkg_setup() {
-	KDE4_BUILT_WITH_USE_CHECK="--missing true sys-apps/dbus X"
-	use alsa && KDE4_BUILT_WITH_USE_CHECK="${KDE4_BUILT_WITH_USE_CHECK}
-		--missing true media-libs/alsa-lib midi"
-	if use zeroconf && has_version net-dns/avahi; then
-		KDE4_BUILT_WITH_USE_CHECK="${KDE4_BUILT_WITH_USE_CHECK}
-			net-dns/avahi mdnsresponder-compat"
-	fi
-
-	kde4-base_pkg_setup
-}
-
-src_compile() {
-	if use zeroconf; then
-		if has_version net-dns/avahi; then
-			mycmakeargs="${mycmakeargs} -DWITH_Avahi=ON -DWITH_DNSSD=OFF"
-		elif has_version net-misc/mDNSResponder; then
-			mycmakeargs="${mycmakeargs} -DWITH_Avahi=OFF -DWITH_DNSSD=ON"
-		else
-			die "USE=\"zeroconf\" enabled but neither net-dns/avahi nor net-misc/mDNSResponder were found."
-		fi
-	fi
-
-	mycmakeargs="${mycmakeargs}
-		-DWITH_HSPELL=OFF
-		$(cmake-utils_has 3dnow X86_3DNOW)
-		$(cmake-utils_has altivec PPC_ALTIVEC)
-		$(cmake-utils_has mmx X86_MMX)
-		$(cmake-utils_has sse X86_SSE)
-		$(cmake-utils_has sse2 X86_SSE2)
-		$(cmake-utils_use_with acl ACL)
-		$(cmake-utils_use_with alsa Alsa)
-		$(cmake-utils_use_with bzip2 BZip2)
-		$(cmake-utils_use_with fam FAM)
-		$(cmake-utils_use_with jpeg2k Jasper)
-		$(cmake-utils_use_with kerberos GSSAPI)
-		$(cmake-utils_use_with nls Libintl)
-		$(cmake-utils_use_with openexr OpenEXR)
-		$(cmake-utils_use_with opengl OpenGL)
-		$(cmake-utils_use_with semantic-desktop Soprano)
-		$(cmake-utils_use_with spell ASPELL)
-		$(cmake-utils_use_with spell ENCHANT)
-		$(cmake-utils_use_with ssl OpenSSL)
-	"
-
-	kde4-base_src_compile
-
-	# The building of apidox is not managed anymore by the build system
-	if use doc; then
-		einfo "Building API documentation"
-		cd "${S}"/doc/api/
-		./doxygen.sh "${S}" || die "APIDOX generation failed"
-	fi
-}
-
-src_install() {
-	kde4-base_src_install
-
-	if use doc; then
-		einfo "Installing API documentation. This could take a bit of time."
-		cd "${S}"/doc/api/
-		docinto /HTML/en/kdelibs-apidox
-		dohtml -r ${P}-apidocs/* || die "Install phase of KDE4 API Documentation failed"
-	fi
-
-	dodir /etc/env.d
-	dodir /etc/revdep-rebuild
-
-	# List all the multilib libdirs
-	local _libdir _libdirs
-	for _libdir in $(get_all_libdirs); do
-		_libdirs="${_libdirs}:${PREFIX}/${_libdir}"
-	done
-	_libdirs=${_libdirs#:}
-
-	cat <<-EOF > "${T}"/44kdepaths-${SLOT} # number goes down with version bump
-	PATH="${PREFIX}/bin"
-	ROOTPATH="${PREFIX}/sbin:${PREFIX}/bin"
-	LDPATH="${_libdirs}"
-	MANPATH="${PREFIX}/share/man"
-	CONFIG_PROTECT="${PREFIX}/share/config ${PREFIX}/env ${PREFIX}/shutdown /usr/share/config"
-	KDEDIRS="/usr:/usr/local:${PREFIX}"
-	#KDE_IS_PRELINKED=1
-	XDG_DATA_DIRS="/usr/share:${PREFIX}/share:/usr/local/share"
-	COLON_SEPARATED="XDG_DATA_DIRS"
-	EOF
-	doenvd "${T}"/44kdepaths-${SLOT}
-
-	# make sure 'source /etc/profile' doesn't hose the PATH
-	dodir /etc/profile.d
-	cat <<-'EOF' > "${D}"/etc/profile.d/44kdereorderpaths-${SLOT}.sh
-	if [ -n "${KDEDIR}" ]; then
-		export PATH=${KDEDIR}/bin:$(echo ${PATH} | sed "s#${KDEDIR}/s\?bin:##g")
-		export ROOTPATH=${KDEDIR}/sbin:${KDEDIR}/bin:$(echo ${PATH} | sed "s#${KDEDIR}/s\?bin:##g")
-	fi
-	EOF
-
-	cat <<-EOF > "${D}/etc/revdep-rebuild/50-kde-${SLOT}"
-	SEARCH_DIRS="${PREFIX}/bin ${PREFIX}/lib*"
-	EOF
-}
-
-src_test() {
-	# FIXME: Disable kate tests
-	mycmakeargs="${mycmakeargs}
-		-DKHTML_BUILD_TESTREGRESSION=ON"
-	kde4-base_src_test
-}
-
-pkg_postinst() {
-	if use zeroconf; then
-		echo
-		elog "To make zeroconf support available in KDE make sure that the 'mdnsd' daemon"
-		elog "is running. Make sure also that multicast dns lookups are enabled by editing"
-		elog "the 'hosts:' line in /etc/nsswitch.conf to include 'mdns', e.g.:"
-		elog "	hosts: files mdns dns"
-		echo
-	fi
-
-	kde4-base_pkg_postinst
-}