Remove stale versions, mark 3.3.0 x86 stable

14 files changed, 11 insertions, 488 deletions

diff --git a/kde-base/arts/Manifest b/kde-base/arts/Manifest
index 9b166cbc9638..fe8a3a31c154 100644
--- a/kde-base/arts/Manifest
+++ b/kde-base/arts/Manifest
@@ -1,22 +1,17 @@
-MD5 496a100e3f20f8c11927a15b84405ef8 arts-1.3.0.ebuild 2969
-MD5 8f0ed4d09472de14acf38152e6bcd90e arts-1.2.1.ebuild 2819
+MD5 a8ea276138de27c96a64a897ce5c3ab8 arts-1.3.0.ebuild 2968
 MD5 7d6ae50bdf1adcd0bb79daccefa6ce94 arts-1.1.5.ebuild 2756
 MD5 a65ad5e0a6b4010617f9ca125fc32dde arts-1.2.3.ebuild 2831
 MD5 9c1e707e6fe4ef2698b71e3ca63b7fdc arts-1.2.0.ebuild 2577
-MD5 924c12de7361268a19d1c9ba9e179db0 ChangeLog 15207
+MD5 0258d0fecade6c242bf489095bf60d27 ChangeLog 15270
 MD5 14889ab75f97d76e58b0c1154e7683a9 metadata.xml 161
-MD5 6f75807e3ca0cb7a01c45acd85f37457 arts-1.3.0_rc2.ebuild 2879
 MD5 6d8f52083c2f7e211ceff377e2d60432 arts-1.2.2.ebuild 2822
 MD5 9ffc978b18c6e1ad49a0c7eec49074f6 files/optional-deps.diff 3154
 MD5 e78db892e7b447f86fab2ea9503a3a3d files/arts-1.2.2-buffer.patch 745
-MD5 e78db892e7b447f86fab2ea9503a3a3d files/arts-1.2.1-buffer.patch 745
 MD5 185a4720c0e94a1546ee383016fc3e3c files/arts-vorbis-fix.dif 1136
 MD5 2d584d662a2b0b0e7a278bde6cd42e8f files/digest-arts-1.1.5 63
 MD5 31e77598f97a91673f69ed4c44bd1f57 files/digest-arts-1.2.0 63
-MD5 4adfa9a4a83af1e64f93a0b430bf7532 files/digest-arts-1.2.1 64
 MD5 1fc0f59ed1b61c1221f4156dac3569b7 files/digest-arts-1.2.2 63
 MD5 ac0526184e3193af65a2a8aa7fd5feab files/digest-arts-1.2.3 63
 MD5 afbe195b431271c6ccfe51cc58aced5c files/digest-arts-1.3.0 63
 MD5 e78db892e7b447f86fab2ea9503a3a3d files/arts-1.2.3-buffer.patch 745
 MD5 68ec6c8e74dfea13c3bb54575b1c51d4 files/1.3.0-jack-configure.in.in.patch 694
-MD5 16914b4ab0ca0d693c0519348bb8e491 files/digest-arts-1.3.0_rc2 67
diff --git a/kde-base/kdebase/Manifest b/kde-base/kdebase/Manifest
index b4407efc7730..f543baac86ae 100644
--- a/kde-base/kdebase/Manifest
+++ b/kde-base/kdebase/Manifest
@@ -1,11 +1,8 @@
-MD5 63ab819291751f1f00af286aa8dcba4b kdebase-3.2.3.ebuild 3286
 MD5 aaabcfdcc4e3968d7cfa579b84cfb928 kdebase-3.2.3-r1.ebuild 3373
-MD5 46513a5bdd0b3a04b9d1016246abe95d kdebase-3.3.0_rc2.ebuild 3282
 MD5 212bf2c2a704a5229147c98aa5fa49eb kdebase-3.2.0.ebuild 3344
 MD5 1346582446d8d61097aaed2115b05adf kdebase-3.2.2.ebuild 3346
-MD5 af1c2ee4a2faa08043a71c9eb9bfb87e kdebase-3.3.0.ebuild 3425
-MD5 a657208cf60c9c0c67eb71ca26ba93f4 kdebase-3.2.1.ebuild 3652
-MD5 48329dca5840ec6e7830682f8d8ed78c ChangeLog 26905
+MD5 1aae4f9f6f19486eaea2229ca4259b1e kdebase-3.3.0.ebuild 3424
+MD5 a523f4231d039e27ea9c9c71874796ca ChangeLog 27043
 MD5 14889ab75f97d76e58b0c1154e7683a9 metadata.xml 161
 MD5 76529aebe0f8884acc70558112902b72 kdebase-3.1.5.ebuild 3622
 MD5 ffad4f0170b80acc01e931ea21d3d4d4 files/utils.h.diff 343
@@ -15,15 +12,12 @@ MD5 160f44a51f4308c9c21052fd21c7d04d files/kdebase-3.2.0-kcontrol.patch 699
 MD5 6eb40b28a36f889d0f1919cdbf160ef7 files/kscreensaver.pam 79
 MD5 daa284d6a1f62c5c73deb8aeda9df57d files/digest-kdebase-3.2.3-r1 68
 MD5 ca0fc4bf60b72dd1b8d42cb7e2be5a75 files/agent-shutdown.sh 204
-MD5 80c60219f104a6931f11f693c707c724 files/digest-kdebase-3.3.0_rc2 72
 MD5 17b088965016d9c796e570741837a2b3 files/detectwidget.cpp.diff 422
 MD5 2b5419b0b173138e22fe03f4157d5660 files/kde-np.pam 379
 MD5 510d05672fcad238e92db44fbfa65f89 files/agent-startup.sh 209
 MD5 78ebd13a55a30a97f9a65da56b015a34 files/digest-kdebase-3.1.5 68
 MD5 c0cb6e59bf4bbd19caa7b9435f253ff3 files/digest-kdebase-3.2.0 68
-MD5 7b4a3c4a318e02c24c0ebacb4264bcdd files/digest-kdebase-3.2.1 68
 MD5 7a15aed698aee6f910a32b6fb7a1e8dd files/digest-kdebase-3.2.2 68
-MD5 daa284d6a1f62c5c73deb8aeda9df57d files/digest-kdebase-3.2.3 68
 MD5 2c1b42d8cf9bd8799c241c21d0ab93ef files/digest-kdebase-3.3.0 68
 MD5 7b19cedba543f3d94c0884ff3d921081 files/3.3.0-sasl-fix.diff 2419
 MD5 2eb15d4b93c483b634ea34475d91e79b files/kdebase-3.2.2-genkdmconf.c.diff 1082
diff --git a/kde-base/kdelibs/ChangeLog b/kde-base/kdelibs/ChangeLog
index 041a20d14930..d64000fdd683 100644
--- a/kde-base/kdelibs/ChangeLog
+++ b/kde-base/kdelibs/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for kde-base/kdelibs
 # Copyright 2002-2004 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kdelibs/ChangeLog,v 1.156 2004/08/30 15:45:01 pvdabeel Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kdelibs/ChangeLog,v 1.157 2004/09/09 15:40:46 caleb Exp $
+
+  09 Sep 2004; Caleb Tennis <caleb@gentoo.org> -kdelibs-3.2.1.ebuild,
+  -kdelibs-3.2.2.ebuild, -kdelibs-3.2.3-r1.ebuild, -kdelibs-3.2.3.ebuild:
+  Remove stale versions, mark 3.3.0 x86 stable
 
   30 Aug 2004; Pieter Van den Abeele <pvdabeel@gentoo.org>
   kdelibs-3.1.5-r1.ebuild, kdelibs-3.2.1.ebuild, kdelibs-3.2.2.ebuild,
diff --git a/kde-base/kdelibs/files/digest-kdelibs-3.2.1 b/kde-base/kdelibs/files/digest-kdelibs-3.2.1
deleted file mode 100644
index 68d1acaca1ef..000000000000
--- a/kde-base/kdelibs/files/digest-kdelibs-3.2.1
+++ /dev/null
@@ -1 +0,0 @@
-MD5 50ae60072c1fc4ae4e41694bc2325dcb kdelibs-3.2.1.tar.bz2 12597050
diff --git a/kde-base/kdelibs/files/digest-kdelibs-3.2.2 b/kde-base/kdelibs/files/digest-kdelibs-3.2.2
deleted file mode 100644
index 9eda8dfa8d5a..000000000000
--- a/kde-base/kdelibs/files/digest-kdelibs-3.2.2
+++ /dev/null
@@ -1 +0,0 @@
-MD5 76c656fb4ec7f1ca073f52fad2b8898b kdelibs-3.2.2.tar.bz2 12716460
diff --git a/kde-base/kdelibs/files/digest-kdelibs-3.2.3 b/kde-base/kdelibs/files/digest-kdelibs-3.2.3
deleted file mode 100644
index ab94bd8ba7fd..000000000000
--- a/kde-base/kdelibs/files/digest-kdelibs-3.2.3
+++ /dev/null
@@ -1 +0,0 @@
-MD5 d9d1c4bd2016a96f156b491ca908dc16 kdelibs-3.2.3.tar.bz2 12737024
diff --git a/kde-base/kdelibs/files/digest-kdelibs-3.2.3-r1 b/kde-base/kdelibs/files/digest-kdelibs-3.2.3-r1
deleted file mode 100644
index ab94bd8ba7fd..000000000000
--- a/kde-base/kdelibs/files/digest-kdelibs-3.2.3-r1
+++ /dev/null
@@ -1 +0,0 @@
-MD5 d9d1c4bd2016a96f156b491ca908dc16 kdelibs-3.2.3.tar.bz2 12737024
diff --git a/kde-base/kdelibs/files/digest-kdelibs-3.3.0_rc2 b/kde-base/kdelibs/files/digest-kdelibs-3.3.0_rc2
deleted file mode 100644
index 1aa3d309ce56..000000000000
--- a/kde-base/kdelibs/files/digest-kdelibs-3.3.0_rc2
+++ /dev/null
@@ -1 +0,0 @@
-MD5 49de25094d36cdaae26af29bdf9055c3 kdelibs-3.3.0-rc2.tar.bz2 15755262
diff --git a/kde-base/kdelibs/kdelibs-3.2.1.ebuild b/kde-base/kdelibs/kdelibs-3.2.1.ebuild
deleted file mode 100644
index 84a7c3523315..000000000000
--- a/kde-base/kdelibs/kdelibs-3.2.1.ebuild
+++ /dev/null
@@ -1,88 +0,0 @@
-# Copyright 1999-2004 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kdelibs/kdelibs-3.2.1.ebuild,v 1.10 2004/08/30 15:45:01 pvdabeel Exp $
-
-inherit kde
-
-need-autoconf 2.5
-set-kdedir ${PV}
-
-DESCRIPTION="KDE libraries needed by all kde programs"
-HOMEPAGE="http//www.kde.org/"
-SRC_URI="mirror://kde/stable/${PV}/src/${PN}-${PV}.tar.bz2"
-
-LICENSE="GPL-2 LGPL-2"
-SLOT="3.2"
-KEYWORDS="x86 ppc sparc hppa amd64 ~alpha ~ia64"
-IUSE="alsa cups ipv6 ssl doc ldap"
-
-# kde.eclass has kdelibs in DEPEND, and we can't have that in here.
-# so we recreate the entire DEPEND from scratch.
-DEPEND=">=sys-devel/autoconf-2.58
-	>=app-arch/bzip2-1.0.2
-	>=dev-libs/libxslt-1.0.31
-	>=dev-libs/libxml2-2.5.8
-	>=dev-libs/libpcre-3.9
-	ssl? ( >=dev-libs/openssl-0.9.6k )
-	alsa? ( media-libs/alsa-lib virtual/alsa )
-	cups? ( >=net-print/cups-1.1.19 )
-	ldap? ( >=net-nds/openldap-2.0.25 )
-	media-libs/tiff
-	>=app-admin/fam-2.6.10
-	virtual/ghostscript
-	media-libs/libart_lgpl
-	sys-devel/gettext
-	~kde-base/arts-1.2.1
-	>=x11-libs/qt-3.2.3"
-RDEPEND="${DEPEND}
-	app-text/sgml-common
-	cups? ( net-print/cups )
-	doc? ( app-doc/doxygen )
-	dev-lang/python"
-
-src_unpack() {
-	kde_src_unpack
-}
-
-src_compile() {
-	kde_src_compile myconf
-
-	myconf="$myconf --with-distribution=Gentoo --enable-libfam --enable-dnotify"
-	myconf="$myconf `use_with alsa` `use_enable cups`"
-
-	use ipv6	|| myconf="$myconf --with-ipv6-lookup=no"
-	use ssl		&& myconf="$myconf --with-ssl-dir=/usr"	|| myconf="$myconf --without-ssl"
-	use alsa	&& myconf="$myconf --with-alsa" || myconf="$myconf --without-alsa"
-	use cups	&& myconf="$myconf --enable-cups" || myconf="$myconf --disable-cups"
-
-	use x86 && myconf="$myconf --enable-fast-malloc=full"
-
-	kde_src_compile configure make
-
-	use doc && make apidox
-}
-
-src_install() {
-	kde_src_install
-	dohtml *.html
-
-	if use doc ; then
-		einfo "Copying API documentation..."
-		dodir ${KDEDIR}/share/doc/HTML/en/kdelibs-apidocs
-		cp -r ${S}/apidocs/* ${D}/$KDEDIR/share/doc/HTML/en/kdelibs-apidocs
-	else
-		rm -r ${D}/$KDEDIR/share/doc/HTML/en/kdelibs-apidocs
-	fi
-
-	# needed to fix lib64 issues on amd64, see bug #45669
-	use amd64 && ln -s ${KDEDIR}/lib ${D}/${KDEDIR}/lib64
-
-}
-
-pkg_postinst() {
-	if use doc ; then
-		rm $KDEDIR/share/doc/HTML/en/kdelibs-apidocs/common
-		ln -sf $KDEDIR/share/doc/HTML/en/common \
-			$KDEDIR/share/doc/HTML/en/kdelibs-apidocs/common
-	fi
-}
diff --git a/kde-base/kdelibs/kdelibs-3.2.2.ebuild b/kde-base/kdelibs/kdelibs-3.2.2.ebuild
deleted file mode 100644
index d2dc72cfbc0f..000000000000
--- a/kde-base/kdelibs/kdelibs-3.2.2.ebuild
+++ /dev/null
@@ -1,90 +0,0 @@
-# Copyright 1999-2004 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kdelibs/kdelibs-3.2.2.ebuild,v 1.9 2004/08/30 15:45:01 pvdabeel Exp $
-
-inherit kde eutils
-
-need-autoconf 2.5
-set-kdedir ${PV}
-
-DESCRIPTION="KDE libraries needed by all kde programs"
-HOMEPAGE="http//www.kde.org/"
-SRC_URI="mirror://kde/stable/${PV}/src/${PN}-${PV}.tar.bz2"
-
-LICENSE="GPL-2 LGPL-2"
-SLOT="3.2"
-KEYWORDS="x86 ppc sparc ~alpha hppa ~amd64 ~ia64 ~mips"
-IUSE="alsa cups ipv6 ssl doc ldap"
-
-# kde.eclass has kdelibs in DEPEND, and we can't have that in here.
-# so we recreate the entire DEPEND from scratch.
-DEPEND=">=sys-devel/autoconf-2.58
-	>=sys-devel/automake-1.8
-	>=app-arch/bzip2-1.0.2
-	>=dev-libs/libxslt-1.0.31
-	>=dev-libs/libxml2-2.5.8
-	>=dev-libs/libpcre-3.9
-	ssl? ( >=dev-libs/openssl-0.9.6k )
-	alsa? ( media-libs/alsa-lib virtual/alsa )
-	cups? ( >=net-print/cups-1.1.19 )
-	ldap? ( >=net-nds/openldap-2.0.25 )
-	media-libs/tiff
-	>=app-admin/fam-2.6.10
-	virtual/ghostscript
-	media-libs/libart_lgpl
-	sys-devel/gettext
-	~kde-base/arts-1.2.2
-	>=x11-libs/qt-3.2.3"
-RDEPEND="${DEPEND}
-	app-text/sgml-common
-	cups? ( net-print/cups )
-	doc? ( app-doc/doxygen )
-	dev-lang/python"
-
-src_unpack() {
-	kde_src_unpack
-	epatch ${FILESDIR}/${P}-su.cpp.diff
-}
-
-src_compile() {
-	kde_src_compile myconf
-
-	myconf="$myconf --with-distribution=Gentoo --enable-libfam --enable-dnotify"
-	myconf="$myconf `use_with alsa` `use_enable cups`"
-
-	use ipv6	|| myconf="$myconf --with-ipv6-lookup=no"
-	use ssl		&& myconf="$myconf --with-ssl-dir=/usr"	|| myconf="$myconf --without-ssl"
-	use alsa	&& myconf="$myconf --with-alsa" || myconf="$myconf --without-alsa"
-	use cups	&& myconf="$myconf --enable-cups" || myconf="$myconf --disable-cups"
-
-	use x86 && myconf="$myconf --enable-fast-malloc=full"
-
-	kde_src_compile configure make
-
-	use doc && make apidox
-}
-
-src_install() {
-	kde_src_install
-	dohtml *.html
-
-	if use doc ; then
-		einfo "Copying API documentation..."
-		dodir ${KDEDIR}/share/doc/HTML/en/kdelibs-apidocs
-		cp -r ${S}/apidocs/* ${D}/$KDEDIR/share/doc/HTML/en/kdelibs-apidocs
-	else
-		rm -r ${D}/$KDEDIR/share/doc/HTML/en/kdelibs-apidocs
-	fi
-
-	# needed to fix lib64 issues on amd64, see bug #45669
-	use amd64 && ln -s ${KDEDIR}/lib ${D}/${KDEDIR}/lib64
-
-}
-
-pkg_postinst() {
-	if use doc ; then
-		rm $KDEDIR/share/doc/HTML/en/kdelibs-apidocs/common
-		ln -sf $KDEDIR/share/doc/HTML/en/common \
-			$KDEDIR/share/doc/HTML/en/kdelibs-apidocs/common
-	fi
-}
diff --git a/kde-base/kdelibs/kdelibs-3.2.3-r1.ebuild b/kde-base/kdelibs/kdelibs-3.2.3-r1.ebuild
deleted file mode 100644
index eb93d9d5fa1e..000000000000
--- a/kde-base/kdelibs/kdelibs-3.2.3-r1.ebuild
+++ /dev/null
@@ -1,94 +0,0 @@
-# Copyright 1999-2004 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kdelibs/kdelibs-3.2.3-r1.ebuild,v 1.4 2004/08/12 19:51:09 pvdabeel Exp $
-
-inherit kde eutils
-
-need-autoconf 2.5
-set-kdedir ${PV}
-
-DESCRIPTION="KDE libraries needed by all kde programs"
-HOMEPAGE="http//www.kde.org/"
-SRC_URI="mirror://kde/stable/${PV}/src/${PN}-${PV}.tar.bz2"
-
-LICENSE="GPL-2 LGPL-2"
-SLOT="3.2"
-KEYWORDS="x86 ppc sparc ~mips ~alpha hppa amd64 ~ia64"
-IUSE="alsa cups ipv6 ssl doc ldap"
-
-# kde.eclass has kdelibs in DEPEND, and we can't have that in here.
-# so we recreate the entire DEPEND from scratch.
-DEPEND=">=sys-devel/autoconf-2.58
-	>=sys-devel/automake-1.8
-	>=app-arch/bzip2-1.0.2
-	>=dev-libs/libxslt-1.0.31
-	>=dev-libs/libxml2-2.5.8
-	>=dev-libs/libpcre-3.9
-	ssl? ( >=dev-libs/openssl-0.9.6k )
-	alsa? ( media-libs/alsa-lib virtual/alsa )
-	cups? ( >=net-print/cups-1.1.19 )
-	ldap? ( >=net-nds/openldap-2.0.25 )
-	media-libs/tiff
-	>=app-admin/fam-2.6.10
-	virtual/ghostscript
-	media-libs/libart_lgpl
-	sys-devel/gettext
-	~kde-base/arts-1.2.3
-	>=x11-libs/qt-3.2.3"
-RDEPEND="${DEPEND}
-	app-text/sgml-common
-	cups? ( net-print/cups )
-	doc? ( app-doc/doxygen )
-	dev-lang/python"
-
-src_unpack() {
-	kde_src_unpack
-	epatch ${FILESDIR}/post-3.2.3-kdelibs-kcookiejar.patch
-	epatch ${FILESDIR}/post-3.2.3-kdelibs-kstandarddirs.patch
-	epatch ${FILESDIR}/post-3.2.3-kdelibs-htmlframes.patch
-	cd ${S}/dcop && patch -p0 < ${FILESDIR}/post-3.2.3-kdelibs-dcopserver.patch
-	cd ${S} && aclocal -I ${S}
-}
-
-src_compile() {
-	kde_src_compile myconf
-
-	myconf="$myconf --with-distribution=Gentoo --enable-libfam --enable-dnotify"
-	myconf="$myconf `use_with alsa` `use_enable cups`"
-
-	use ipv6	|| myconf="$myconf --with-ipv6-lookup=no"
-	use ssl		&& myconf="$myconf --with-ssl-dir=/usr"	|| myconf="$myconf --without-ssl"
-	use alsa	&& myconf="$myconf --with-alsa" || myconf="$myconf --without-alsa"
-	use cups	&& myconf="$myconf --enable-cups" || myconf="$myconf --disable-cups"
-
-	use x86 && myconf="$myconf --enable-fast-malloc=full"
-
-	kde_src_compile configure make
-
-	use doc && make apidox
-}
-
-src_install() {
-	kde_src_install
-	dohtml *.html
-
-	if use doc ; then
-		einfo "Copying API documentation..."
-		dodir ${KDEDIR}/share/doc/HTML/en/kdelibs-apidocs
-		cp -r ${S}/apidocs/* ${D}/$KDEDIR/share/doc/HTML/en/kdelibs-apidocs
-	else
-		rm -r ${D}/$KDEDIR/share/doc/HTML/en/kdelibs-apidocs
-	fi
-
-	# needed to fix lib64 issues on amd64, see bug #45669
-	use amd64 && ln -s ${KDEDIR}/lib ${D}/${KDEDIR}/lib64
-
-}
-
-pkg_postinst() {
-	if use doc ; then
-		rm $KDEDIR/share/doc/HTML/en/kdelibs-apidocs/common
-		ln -sf $KDEDIR/share/doc/HTML/en/common \
-			$KDEDIR/share/doc/HTML/en/kdelibs-apidocs/common
-	fi
-}
diff --git a/kde-base/kdelibs/kdelibs-3.2.3.ebuild b/kde-base/kdelibs/kdelibs-3.2.3.ebuild
deleted file mode 100644
index 532c285b5430..000000000000
--- a/kde-base/kdelibs/kdelibs-3.2.3.ebuild
+++ /dev/null
@@ -1,89 +0,0 @@
-# Copyright 1999-2004 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kdelibs/kdelibs-3.2.3.ebuild,v 1.7 2004/08/30 15:45:01 pvdabeel Exp $
-
-inherit kde eutils
-
-need-autoconf 2.5
-set-kdedir ${PV}
-
-DESCRIPTION="KDE libraries needed by all kde programs"
-HOMEPAGE="http//www.kde.org/"
-SRC_URI="mirror://kde/stable/${PV}/src/${PN}-${PV}.tar.bz2"
-
-LICENSE="GPL-2 LGPL-2"
-SLOT="3.2"
-KEYWORDS="x86 ppc ~sparc ~mips ~alpha hppa amd64 ~ia64"
-IUSE="alsa cups ipv6 ssl doc ldap"
-
-# kde.eclass has kdelibs in DEPEND, and we can't have that in here.
-# so we recreate the entire DEPEND from scratch.
-DEPEND=">=sys-devel/autoconf-2.58
-	>=sys-devel/automake-1.8
-	>=app-arch/bzip2-1.0.2
-	>=dev-libs/libxslt-1.0.31
-	>=dev-libs/libxml2-2.5.8
-	>=dev-libs/libpcre-3.9
-	ssl? ( >=dev-libs/openssl-0.9.6k )
-	alsa? ( media-libs/alsa-lib virtual/alsa )
-	cups? ( >=net-print/cups-1.1.19 )
-	ldap? ( >=net-nds/openldap-2.0.25 )
-	media-libs/tiff
-	>=app-admin/fam-2.6.10
-	virtual/ghostscript
-	media-libs/libart_lgpl
-	sys-devel/gettext
-	~kde-base/arts-1.2.3
-	>=x11-libs/qt-3.2.3"
-RDEPEND="${DEPEND}
-	app-text/sgml-common
-	cups? ( net-print/cups )
-	doc? ( app-doc/doxygen )
-	dev-lang/python"
-
-src_unpack() {
-	kde_src_unpack
-}
-
-src_compile() {
-	kde_src_compile myconf
-
-	myconf="$myconf --with-distribution=Gentoo --enable-libfam --enable-dnotify"
-	myconf="$myconf `use_with alsa` `use_enable cups`"
-
-	use ipv6	|| myconf="$myconf --with-ipv6-lookup=no"
-	use ssl		&& myconf="$myconf --with-ssl-dir=/usr"	|| myconf="$myconf --without-ssl"
-	use alsa	&& myconf="$myconf --with-alsa" || myconf="$myconf --without-alsa"
-	use cups	&& myconf="$myconf --enable-cups" || myconf="$myconf --disable-cups"
-
-	use x86 && myconf="$myconf --enable-fast-malloc=full"
-
-	kde_src_compile configure make
-
-	use doc && make apidox
-}
-
-src_install() {
-	kde_src_install
-	dohtml *.html
-
-	if use doc ; then
-		einfo "Copying API documentation..."
-		dodir ${KDEDIR}/share/doc/HTML/en/kdelibs-apidocs
-		cp -r ${S}/apidocs/* ${D}/$KDEDIR/share/doc/HTML/en/kdelibs-apidocs
-	else
-		rm -r ${D}/$KDEDIR/share/doc/HTML/en/kdelibs-apidocs
-	fi
-
-	# needed to fix lib64 issues on amd64, see bug #45669
-	use amd64 && ln -s ${KDEDIR}/lib ${D}/${KDEDIR}/lib64
-
-}
-
-pkg_postinst() {
-	if use doc ; then
-		rm $KDEDIR/share/doc/HTML/en/kdelibs-apidocs/common
-		ln -sf $KDEDIR/share/doc/HTML/en/common \
-			$KDEDIR/share/doc/HTML/en/kdelibs-apidocs/common
-	fi
-}
diff --git a/kde-base/kdelibs/kdelibs-3.3.0.ebuild b/kde-base/kdelibs/kdelibs-3.3.0.ebuild
index 83dbce58f711..5a20def67abb 100644
--- a/kde-base/kdelibs/kdelibs-3.3.0.ebuild
+++ b/kde-base/kdelibs/kdelibs-3.3.0.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2004 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kdelibs/kdelibs-3.3.0.ebuild,v 1.7 2004/09/09 14:43:53 caleb Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kdelibs/kdelibs-3.3.0.ebuild,v 1.8 2004/09/09 15:40:46 caleb Exp $
 
 inherit kde eutils flag-o-matic
 set-kdedir 3.3
@@ -11,7 +11,7 @@ SRC_URI="mirror://kde/stable/3.3/src/${PN}-${PV}.tar.bz2"
 
 LICENSE="GPL-2 LGPL-2"
 SLOT="3.3"
-KEYWORDS="~x86 ~amd64 ppc64 ~mips ~sparc ppc"
+KEYWORDS="x86 ~amd64 ppc64 ~mips ~sparc ppc"
 IUSE="alsa arts cups doc ipv6 ldap ssl tiff"
 
 # kde.eclass has kdelibs in DEPEND, and we can't have that in here.
diff --git a/kde-base/kdelibs/kdelibs-3.3.0_rc2.ebuild b/kde-base/kdelibs/kdelibs-3.3.0_rc2.ebuild
deleted file mode 100644
index f17895dc7bab..000000000000
--- a/kde-base/kdelibs/kdelibs-3.3.0_rc2.ebuild
+++ /dev/null
@@ -1,104 +0,0 @@
-# Copyright 1999-2004 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kdelibs/kdelibs-3.3.0_rc2.ebuild,v 1.2 2004/08/16 13:58:52 vapier Exp $
-
-inherit kde eutils
-set-kdedir 3.3
-
-MY_PV=3.3.0-rc2
-S=${WORKDIR}/${PN}-${MY_PV/-rc2//}
-
-DESCRIPTION="KDE libraries needed by all kde programs"
-HOMEPAGE="http//www.kde.org/"
-SRC_URI="mirror://kde/unstable/${MY_PV/-rc2/rc2/}/src/${PN}-${MY_PV}.tar.bz2"
-
-LICENSE="GPL-2 LGPL-2"
-SLOT="3.3"
-KEYWORDS="~x86 ~amd64"
-IUSE="alsa arts cups doc ipv6 ldap ssl tiff"
-
-# kde.eclass has kdelibs in DEPEND, and we can't have that in here.
-# so we recreate the entire DEPEND from scratch.
-DEPEND=">=sys-devel/autoconf-2.58
-	>=sys-devel/automake-1.8
-	app-arch/bzip2
-	>=dev-libs/libxslt-1.1.4
-	>=dev-libs/libxml2-2.6.6
-	>=dev-libs/libpcre-4.2
-	ssl? ( >=dev-libs/openssl-0.9.7d )
-	alsa? ( media-libs/alsa-lib virtual/alsa )
-	arts? ( ~kde-base/arts-1.3.0_rc2 )
-	cups? ( >=net-print/cups-1.1.19 )
-	ldap? ( >=net-nds/openldap-2.1.26 )
-	tiff? ( media-libs/tiff )
-	>=app-admin/fam-2.7.0
-	virtual/ghostscript
-	media-libs/libart_lgpl
-	net-dns/libidn
-	sys-devel/gettext
-	>=x11-libs/qt-3.3.2"
-RDEPEND="${DEPEND}
-	app-text/sgml-common
-	cups? ( net-print/cups )
-	doc? ( app-doc/doxygen )"
-
-src_unpack() {
-	kde_src_unpack
-}
-
-src_compile() {
-	kde_src_compile myconf
-
-	myconf="$myconf --with-distribution=Gentoo --enable-libfam --enable-dnotify"
-	myconf="$myconf `use_with alsa` `use_enable cups` `use_with arts`"
-
-	use ipv6	|| myconf="$myconf --with-ipv6-lookup=no"
-	use ssl		&& myconf="$myconf --with-ssl-dir=/usr"	|| myconf="$myconf --without-ssl"
-	use alsa	&& myconf="$myconf --with-alsa" || myconf="$myconf --without-alsa"
-	use cups	&& myconf="$myconf --enable-cups" || myconf="$myconf --disable-cups"
-
-	use x86 && myconf="$myconf --enable-fast-malloc=full"
-
-	kde_src_compile configure make
-
-	use doc && make apidox
-}
-
-src_install() {
-	kde_src_install
-	dohtml *.html
-
-	if use doc ; then
-		einfo "Copying API documentation..."
-		dodir ${KDEDIR}/share/doc/HTML/en/kdelibs-apidocs
-		cp -r ${S}/apidocs/* ${D}/$KDEDIR/share/doc/HTML/en/kdelibs-apidocs
-	else
-		rm -r ${D}/$KDEDIR/share/doc/HTML/en/kdelibs-apidocs
-	fi
-
-	# needed to fix lib64 issues on amd64, see bug #45669
-	use amd64 && ln -s ${KDEDIR}/lib ${D}/${KDEDIR}/lib64
-
-
-	if ! use arts ; then
-
-		dodir /etc/env.d
-
-		echo "PATH=${PREFIX}/bin
-ROOTPATH=${PREFIX}/sbin:${PREFIX}/bin
-LDPATH=${PREFIX}/lib
-CONFIG_PROTECT=${PREFIX}/share/config:${PREFIX}/env:${PREFIX}/shutdown" > ${D}/etc/env.d/47kdepaths-3.3.0 # number goes down with version upgrade
-
-		echo "KDEDIR=$PREFIX" > ${D}/etc/env.d/58kdedir-3.3.0 # number goes up with version upgrade
-
-	fi
-
-}
-
-pkg_postinst() {
-	if use doc ; then
-		rm $KDEDIR/share/doc/HTML/en/kdelibs-apidocs/common
-		ln -sf $KDEDIR/share/doc/HTML/en/common \
-			$KDEDIR/share/doc/HTML/en/kdelibs-apidocs/common
-	fi
-}