x86 stable and version cleanups

32 files changed, 60 insertions, 269 deletions

diff --git a/kde-base/kde-i18n/ChangeLog b/kde-base/kde-i18n/ChangeLog
index 573a6bf1ae4e..1c7496201a3c 100644
--- a/kde-base/kde-i18n/ChangeLog
+++ b/kde-base/kde-i18n/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for kde-base/kde-i18n
 # Copyright 2000-2004 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kde-i18n/ChangeLog,v 1.17 2004/03/09 15:06:16 caleb Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kde-i18n/ChangeLog,v 1.18 2004/03/12 21:12:46 caleb Exp $
+
+  12 Mar 2004; Caleb Tennis <caleb@gentoo.org> kde-i18n-3.1.4.ebuild,
+  kde-i18n-3.2.1.ebuild:
+  x86 stable and version cleanups
 
 *kde-i18n-3.2.1 (09 Mar 2004)
 
diff --git a/kde-base/kde-i18n/files/digest-kde-i18n-3.1.4 b/kde-base/kde-i18n/files/digest-kde-i18n-3.1.4
deleted file mode 100644
index 4f4ae074d9b1..000000000000
--- a/kde-base/kde-i18n/files/digest-kde-i18n-3.1.4
+++ /dev/null
@@ -1,52 +0,0 @@
-MD5 fe6fe3d722a12760522b688b749beca6 kde-i18n-3.1.4.tar.bz2 143916008
-MD5 79623c1e31b2d7431d928ec30a0cc30f kde-i18n-af-3.1.4.tar.bz2 2140129
-MD5 bcbc85fe96ab972378609064acaa497b kde-i18n-ar-3.1.4.tar.bz2 2199424
-MD5 b7cbfa326ceb4d47182358c5b9be1c11 kde-i18n-bg-3.1.4.tar.bz2 2290651
-MD5 50f5500e13294183ae0fae283e5cafa7 kde-i18n-bs-3.1.4.tar.bz2 2257036
-MD5 72e390acee5471b50cd7070bd6a67eb4 kde-i18n-ca-3.1.4.tar.bz2 4263926
-MD5 8d9a2577e082f326a573782b57f408f4 kde-i18n-cs-3.1.4.tar.bz2 3287310
-MD5 9d0fdfa8baf7647c1d410a549ba3e3a2 kde-i18n-da-3.1.4.tar.bz2 10385188
-MD5 26df2afa9cd763419ae871ac349c2f7a kde-i18n-de-3.1.4.tar.bz2 15088633
-MD5 ee5a9de959c08c1461cf227d4e694877 kde-i18n-el-3.1.4.tar.bz2 1542299
-MD5 4111003adf1037800f62bf128a144a74 kde-i18n-en_GB-3.1.4.tar.bz2 3423210
-MD5 e2cc70517a0fd9bf70cf2d4f3a2e2a26 kde-i18n-eo-3.1.4.tar.bz2 2248245
-MD5 d4881bcf974ed0df4b4d446310336d81 kde-i18n-es-3.1.4.tar.bz2 10782266
-MD5 61fc3035a75edb9db2562fc39e32edda kde-i18n-et-3.1.4.tar.bz2 7718716
-MD5 c1e782bcd79cc74c94d4ff1d032e0bf1 kde-i18n-eu-3.1.4.tar.bz2 1524910
-MD5 971aad60a190231b9fe3c4e0b6e4d36b kde-i18n-fa-3.1.4.tar.bz2 984910
-MD5 06d6d7a94c25a20616b228a75bfffb3a kde-i18n-fi-3.1.4.tar.bz2 3316678
-MD5 dbfc91eb4447a85c0d48be3298f7a0ee kde-i18n-fr-3.1.4.tar.bz2 15230482
-MD5 6497b72ca8678d802222d8c539712b1d kde-i18n-he-3.1.4.tar.bz2 2406794
-MD5 7d051959a18f2e634a65c2de3caa5a14 kde-i18n-hr-3.1.4.tar.bz2 1790498
-MD5 8fdda01fae69af975a24dcecdeca610c kde-i18n-hu-3.1.4.tar.bz2 4414342
-MD5 1dcb746ad76c247b0bbe13e1ea694c6c kde-i18n-is-3.1.4.tar.bz2 2120546
-MD5 0745f3e5c981fa1a03b5cf9ffd64341e kde-i18n-it-3.1.4.tar.bz2 10138527
-MD5 afc69ba787e9021d9b908cb20f3a249f kde-i18n-ja-3.1.4.tar.bz2 3630387
-MD5 ae4ba0f230fd41252978177fe8bfba17 kde-i18n-lt-3.1.4.tar.bz2 2302868
-MD5 4c6fd8e99073e3f6f5c7d5f377571db6 kde-i18n-mk-3.1.4.tar.bz2 1714847
-MD5 b1c8225ca5dfa1e102e06ad402118550 kde-i18n-mt-3.1.4.tar.bz2 1850143
-MD5 7b46b01ac54b2272faa4db1e257f5ac6 kde-i18n-nb-3.1.4.tar.bz2 3276506
-MD5 230dcda1ed8f735c81dd90d82f591522 kde-i18n-nl-3.1.4.tar.bz2 5418065
-MD5 f75d30410cbe208a60355398b6fc2ae4 kde-i18n-nn-3.1.4.tar.bz2 2747025
-MD5 3ee8fa64c4c4b6dc0c99c90d3ccb9c50 kde-i18n-nso-3.1.4.tar.bz2 1926031
-MD5 ed356efb1df997baf66064273ecf0cb1 kde-i18n-pl-3.1.4.tar.bz2 2551764
-MD5 ca65264fa635215bd9d432e23292a4b0 kde-i18n-pt-3.1.4.tar.bz2 4363823
-MD5 ad4c4ce71477e3929b54892698abb9c5 kde-i18n-pt_BR-3.1.4.tar.bz2 4230261
-MD5 73fb98f6e7d6bb8ee9cbd2b9d984c4f4 kde-i18n-ro-3.1.4.tar.bz2 2270183
-MD5 2c170cf7aeb7e3349a7893777b7837e6 kde-i18n-ru-3.1.4.tar.bz2 4237128
-MD5 60623ede1e21a73346ab52537b711bd5 kde-i18n-se-3.1.4.tar.bz2 941106
-MD5 012a2c8609928256c45cf7040ca1077f kde-i18n-sk-3.1.4.tar.bz2 6293801
-MD5 9ccba8b1b0d815d6c91b3939f95f0404 kde-i18n-sl-3.1.4.tar.bz2 5846970
-MD5 9d2838925e6ad1145e095b7e3968dff7 kde-i18n-sr-3.1.4.tar.bz2 1723390
-MD5 634e458f284b2042e1dcc7e7877f1911 kde-i18n-ss-3.1.4.tar.bz2 944277
-MD5 fde33efc6d2dbd9f65a14b4a34b84e7c kde-i18n-sv-3.1.4.tar.bz2 14051625
-MD5 cf911bdfd47bfb85b45c1accac06ddd9 kde-i18n-ta-3.1.4.tar.bz2 1817429
-MD5 52a4323a877a2a44c487ecc994926fd7 kde-i18n-th-3.1.4.tar.bz2 1989676
-MD5 5897907b5b5aae663bb668ff0ba6a1b1 kde-i18n-tr-3.1.4.tar.bz2 2688536
-MD5 b40710a33ef1cc2b0a2494d6dbb7c8d3 kde-i18n-uk-3.1.4.tar.bz2 2414420
-MD5 a4692844dae42bb7707e5281196b5695 kde-i18n-ven-3.1.4.tar.bz2 2397220
-MD5 1402ed340eb175b56857d886514cd90f kde-i18n-vi-3.1.4.tar.bz2 1696744
-MD5 ad871d0c79f76cf923e4102e69ed54a9 kde-i18n-xh-3.1.4.tar.bz2 4586159
-MD5 af95aa30c652dfec46361c1702d6aef9 kde-i18n-zh_CN-3.1.4.tar.bz2 2450924
-MD5 9c6168307a2520a92d82f0b7eb004707 kde-i18n-zh_TW-3.1.4.tar.bz2 2068110
-MD5 2d8ee6c84691774ce018c910f0061af0 kde-i18n-zu-3.1.4.tar.bz2 2569177
diff --git a/kde-base/kde-i18n/kde-i18n-3.1.4.ebuild b/kde-base/kde-i18n/kde-i18n-3.1.4.ebuild
deleted file mode 100644
index 38776b3db05a..000000000000
--- a/kde-base/kde-i18n/kde-i18n-3.1.4.ebuild
+++ /dev/null
@@ -1,67 +0,0 @@
-# Copyright 1999-2004 Gentoo Technologies, Inc.
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kde-i18n/kde-i18n-3.1.4.ebuild,v 1.12 2004/01/19 04:06:47 caleb Exp $
-
-inherit kde
-need-kde ${PV}
-
-DESCRIPTION="KDE ${PV} - i18n: ${PN}"
-HOMEPAGE="http://www.kde.org/"
-LICENSE="GPL-2"
-KEYWORDS="x86 ppc"
-SLOT="$KDEMAJORVER.$KDEMINORVER"
-RESTRICT="nomirror"
-
-newdepend="$newdepend >=sys-apps/portage-2.0.49-r8"
-
-LANGS="af ar bg bs ca cs da de el es en_GB eo es et eu fa fi fr he hr hu is it
-ja lt mk mt nb nl nn nso pl pt pt_BR ro ru se sk sl sr ss sv ta th tr uk ven vi xh
-zh_CN zh_TW zu"
-
-#
-# Define the LINGUAS environment variable to contain which language(s) you would
-# like for this ebuild to download and install.
-#
-
-BASEDIR="mirror://kde/stable/${PV}/src/kde-i18n"
-
-for pkg in $LANGS
-do
-	SRC_URI="$SRC_URI linguas_${pkg}? ( $BASEDIR/kde-i18n-${pkg}-${PV}.tar.bz2 )"
-done
-
-
-src_unpack() {
-
-	if [ -z ${LINGUAS} ]; then
-		ewarn
-		ewarn "You must define a LINGUAS environment variable that contains a list"
-		ewarn "of the country codes for which languages you would like to install."
-		ewarn
-		die
-	fi
-
-	base_src_unpack unpack
-}
-
-src_compile() {
-	local _S=${S}
-	for dir in `ls ${WORKDIR}`; do
-		S=${WORKDIR}/$dir
-		kde_src_compile myconf
-		myconf="$myconf --prefix=$KDEDIR -C"
-		kde_src_compile configure
-		kde_src_compile make
-	done
-	S=${_S}
-}
-
-src_install() {
-	local _S=${S}
-	for dir in `ls ${WORKDIR}`; do
-		cd ${WORKDIR}/$dir
-		make install DESTDIR=${D} destdir=${D}
-	done
-	S=${_S}
-}
-
diff --git a/kde-base/kde-i18n/kde-i18n-3.2.1.ebuild b/kde-base/kde-i18n/kde-i18n-3.2.1.ebuild
index 93945c49fcbb..018673957bfe 100644
--- a/kde-base/kde-i18n/kde-i18n-3.2.1.ebuild
+++ b/kde-base/kde-i18n/kde-i18n-3.2.1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2004 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kde-i18n/kde-i18n-3.2.1.ebuild,v 1.1 2004/03/09 15:06:17 caleb Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kde-i18n/kde-i18n-3.2.1.ebuild,v 1.2 2004/03/12 21:12:46 caleb Exp $
 
 inherit kde
 need-kde ${PV}
@@ -10,7 +10,7 @@ IUSE=""
 DESCRIPTION="KDE ${PV} - i18n: ${PN}"
 HOMEPAGE="http://www.kde.org/"
 LICENSE="GPL-2"
-KEYWORDS="~x86 ~sparc ~amd64 ~ppc ~alpha ~ia64"
+KEYWORDS="x86 ~sparc ~amd64 ~ppc ~alpha ~ia64"
 SLOT="$KDEMAJORVER.$KDEMINORVER"
 RESTRICT="nomirror"
 DEPEND="~kde-base/kdebase-${PV}
diff --git a/kde-base/kde/ChangeLog b/kde-base/kde/ChangeLog
index f14db6ba77f8..5d6ea54063d1 100644
--- a/kde-base/kde/ChangeLog
+++ b/kde-base/kde/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for kde-base/kde
 # Copyright 2002-2004 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kde/ChangeLog,v 1.60 2004/03/09 17:50:31 caleb Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kde/ChangeLog,v 1.61 2004/03/12 21:11:36 caleb Exp $
+
+  12 Mar 2004; Caleb Tennis <caleb@gentoo.org> kde-3.1.4.ebuild,
+  kde-3.2.1.ebuild:
+  x86 stable and version cleanups
 
 *kde-3.2.1 (09 Mar 2004)
 
diff --git a/kde-base/kde/files/digest-kde-3.1.4 b/kde-base/kde/files/digest-kde-3.1.4
deleted file mode 100644
index e69de29bb2d1..000000000000
--- a/kde-base/kde/files/digest-kde-3.1.4
+++ /dev/null
diff --git a/kde-base/kde/kde-3.1.4.ebuild b/kde-base/kde/kde-3.1.4.ebuild
deleted file mode 100644
index ae81695a0e94..000000000000
--- a/kde-base/kde/kde-3.1.4.ebuild
+++ /dev/null
@@ -1,14 +0,0 @@
-# Copyright 1999-2004 Gentoo Technologies, Inc.
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kde/kde-3.1.4.ebuild,v 1.8 2004/01/13 16:54:54 agriffis Exp $
-
-IUSE=""
-KEYWORDS="x86 ppc sparc hppa amd64 alpha"
-DESCRIPTION="KDE 3.1 - merge this to pull in all non-developer kde-base/* packages"
-HOMEPAGE="http://www.kde.org/"
-# removed: kdebindings, kdesdk, kdoc since these are developer-only packages
-RDEPEND="`echo ~kde-base/kde{libs,base,addons,admin,artwork,edu,games,graphics,multimedia,network,pim,toys,utils}-${PV}`"
-
-LICENSE="GPL-2"
-
-SLOT="3.1"
diff --git a/kde-base/kde/kde-3.2.1.ebuild b/kde-base/kde/kde-3.2.1.ebuild
index b7ab9b2280b9..82163c3db055 100644
--- a/kde-base/kde/kde-3.2.1.ebuild
+++ b/kde-base/kde/kde-3.2.1.ebuild
@@ -1,13 +1,13 @@
 # Copyright 1999-2004 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kde/kde-3.2.1.ebuild,v 1.1 2004/03/09 17:50:31 caleb Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kde/kde-3.2.1.ebuild,v 1.2 2004/03/12 21:11:36 caleb Exp $
 
 DESCRIPTION="KDE 3.2 - merge this to pull in all non-developer kde-base/* packages"
 HOMEPAGE="http://www.kde.org/"
 
 LICENSE="GPL-2"
 SLOT="3.2"
-KEYWORDS="~x86 ~ppc ~hppa ~sparc ~amd64 ~alpha ~ia64"
+KEYWORDS="x86 ~ppc ~hppa ~sparc ~amd64 ~alpha ~ia64"
 
 # removed: kdebindings, kdesdk, kdoc since these are developer-only packages
 RDEPEND="`echo ~kde-base/kde{libs,base,addons,admin,artwork,edu,games,graphics,multimedia,network,pim,toys,utils,accessibility}-${PV}`"
diff --git a/kde-base/kdeedu/ChangeLog b/kde-base/kdeedu/ChangeLog
index d019e6e32013..91ecd7e4e243 100644
--- a/kde-base/kdeedu/ChangeLog
+++ b/kde-base/kdeedu/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for kde-base/kdeedu
 # Copyright 2002-2004 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kdeedu/ChangeLog,v 1.64 2004/03/09 17:44:29 caleb Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kdeedu/ChangeLog,v 1.65 2004/03/12 21:01:53 caleb Exp $
+
+  12 Mar 2004; Caleb Tennis <caleb@gentoo.org> kdeedu-3.1.4.ebuild,
+  kdeedu-3.2.1.ebuild:
+  x86 stable and version cleanups
 
 *kdeedu-3.2.1 (09 Mar 2004)
 
diff --git a/kde-base/kdeedu/files/digest-kdeedu-3.1.4 b/kde-base/kdeedu/files/digest-kdeedu-3.1.4
deleted file mode 100644
index c62be2d60b30..000000000000
--- a/kde-base/kdeedu/files/digest-kdeedu-3.1.4
+++ /dev/null
@@ -1 +0,0 @@
-MD5 e710e5840b2f33e9c96b9b49d3914d5b kdeedu-3.1.4.tar.bz2 20039920
diff --git a/kde-base/kdeedu/kdeedu-3.1.4.ebuild b/kde-base/kdeedu/kdeedu-3.1.4.ebuild
deleted file mode 100644
index 9b45d482a6d3..000000000000
--- a/kde-base/kdeedu/kdeedu-3.1.4.ebuild
+++ /dev/null
@@ -1,12 +0,0 @@
-# Copyright 1999-2004 Gentoo Technologies, Inc.
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kdeedu/kdeedu-3.1.4.ebuild,v 1.8 2004/01/13 16:52:13 agriffis Exp $
-inherit kde-dist flag-o-matic
-
-IUSE=""
-DESCRIPTION="KDE educational apps"
-KEYWORDS="x86 ppc sparc hppa amd64 alpha"
-
-if [ "`gcc -dumpversion`" == "2.95.3" ]; then
-	filter-flags "-fomit-frame-pointer"
-fi
diff --git a/kde-base/kdeedu/kdeedu-3.2.1.ebuild b/kde-base/kdeedu/kdeedu-3.2.1.ebuild
index 5398fb34bce9..041682f509c7 100644
--- a/kde-base/kdeedu/kdeedu-3.2.1.ebuild
+++ b/kde-base/kdeedu/kdeedu-3.2.1.ebuild
@@ -1,9 +1,9 @@
 # Copyright 1999-2004 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kdeedu/kdeedu-3.2.1.ebuild,v 1.1 2004/03/09 17:44:29 caleb Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kdeedu/kdeedu-3.2.1.ebuild,v 1.2 2004/03/12 21:01:53 caleb Exp $
 
 inherit kde-dist
 
 DESCRIPTION="KDE educational apps"
 
-KEYWORDS="~x86 ~ppc ~sparc ~hppa ~amd64 ~alpha ~ia64"
+KEYWORDS="x86 ~ppc ~sparc ~hppa ~amd64 ~alpha ~ia64"
diff --git a/kde-base/kdegames/ChangeLog b/kde-base/kdegames/ChangeLog
index 880809a70a3e..38d5d11814c1 100644
--- a/kde-base/kdegames/ChangeLog
+++ b/kde-base/kdegames/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for kde-base/kdegames
 # Copyright 2002-2004 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kdegames/ChangeLog,v 1.68 2004/03/09 15:12:40 caleb Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kdegames/ChangeLog,v 1.69 2004/03/12 21:02:58 caleb Exp $
+
+  12 Mar 2004; Caleb Tennis <caleb@gentoo.org> kdegames-3.1.4.ebuild,
+  kdegames-3.2.1.ebuild:
+  x86 stable and version cleanups
 
 *kdegames-3.2.1 (09 Mar 2004)
 
diff --git a/kde-base/kdegames/files/digest-kdegames-3.1.4 b/kde-base/kdegames/files/digest-kdegames-3.1.4
deleted file mode 100644
index 69097847cc43..000000000000
--- a/kde-base/kdegames/files/digest-kdegames-3.1.4
+++ /dev/null
@@ -1 +0,0 @@
-MD5 be604fb91e24f990659f5cab2ac8decf kdegames-3.1.4.tar.bz2 8535641
diff --git a/kde-base/kdegames/kdegames-3.1.4.ebuild b/kde-base/kdegames/kdegames-3.1.4.ebuild
deleted file mode 100644
index 69c3bf787b40..000000000000
--- a/kde-base/kdegames/kdegames-3.1.4.ebuild
+++ /dev/null
@@ -1,33 +0,0 @@
-# Copyright 1999-2004 Gentoo Technologies, Inc.
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kdegames/kdegames-3.1.4.ebuild,v 1.8 2004/01/13 16:51:45 agriffis Exp $
-inherit kde-dist eutils
-
-DESCRIPTION="KDE games (solitaire :-)"
-IUSE=""
-KEYWORDS="x86 ppc sparc hppa amd64 alpha"
-
-#13 Jul 2003: drobbins: building kdegames-3.1.2 fails on dual Xeon; disabling parallel mode :/
-MAKEOPTS="$MAKEOPTS -j1"
-
-src_unpack() {
-	kde_src_unpack
-	#epatch ${FILESDIR}/${P}-gcc33.diff
-}
-
-src_compile() {
-	if [ ${ARCH} == "alpha" ] ; then
-		export DO_NOT_COMPILE="kmines" # still b0rken on alpha
-	fi
-	kde_src_compile myconf configure
-	if [ ${ARCH} == "alpha" ] ; then
-		# ksirtet dies without kmines' libkdehighscores, so we have to build it
-		# manually if we want ksirtet. Which we do. Everyone loves tetris!
-		# First, we build libkdegames, since libkdehighscores depends on it.
-		cd ${S}/libkdegames
-		emake || die "died trying to build libkdegames"
-		cd ../kmines/generic
-		emake || die "died trying to build kmines/generic/libkdehighscores.la"
-	fi
-	kde_src_compile make
-}
diff --git a/kde-base/kdegames/kdegames-3.2.1.ebuild b/kde-base/kdegames/kdegames-3.2.1.ebuild
index 1dc8e0fb3a88..4f1e90c92963 100644
--- a/kde-base/kdegames/kdegames-3.2.1.ebuild
+++ b/kde-base/kdegames/kdegames-3.2.1.ebuild
@@ -1,9 +1,9 @@
 # Copyright 1999-2004 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kdegames/kdegames-3.2.1.ebuild,v 1.2 2004/03/12 14:56:01 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kdegames/kdegames-3.2.1.ebuild,v 1.3 2004/03/12 21:02:58 caleb Exp $
 
 inherit kde-dist eutils
 
 DESCRIPTION="KDE games (solitaire :-)"
 
-KEYWORDS="~x86 ~ppc ~sparc ~alpha hppa ~amd64 ~ia64"
+KEYWORDS="x86 ~ppc ~sparc ~alpha hppa ~amd64 ~ia64"
diff --git a/kde-base/kdegraphics/ChangeLog b/kde-base/kdegraphics/ChangeLog
index 3578f17c9cac..ced3cc65058b 100644
--- a/kde-base/kdegraphics/ChangeLog
+++ b/kde-base/kdegraphics/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for kde-base/kdegraphics
 # Copyright 2002-2004 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kdegraphics/ChangeLog,v 1.80 2004/03/09 12:37:58 caleb Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kdegraphics/ChangeLog,v 1.81 2004/03/12 21:03:52 caleb Exp $
+
+*kdegraphics-3.2.1 (12 Mar 2004)
+
+  12 Mar 2004; Caleb Tennis <caleb@gentoo.org> kdegraphics-3.1.4.ebuild,
+  kdegraphics-3.2.1.ebuild:
+  x86 stable and version cleanups
 
   09 Mar 2004; Caleb Tennis <caleb@gentoo.org> :
   Version bump
diff --git a/kde-base/kdegraphics/files/digest-kdegraphics-3.1.4 b/kde-base/kdegraphics/files/digest-kdegraphics-3.1.4
deleted file mode 100644
index 3b904908a473..000000000000
--- a/kde-base/kdegraphics/files/digest-kdegraphics-3.1.4
+++ /dev/null
@@ -1 +0,0 @@
-MD5 c695c8574efca207c445dcef0bb4ae43 kdegraphics-3.1.4.tar.bz2 4594882
diff --git a/kde-base/kdegraphics/kdegraphics-3.1.4.ebuild b/kde-base/kdegraphics/kdegraphics-3.1.4.ebuild
deleted file mode 100644
index 3b9bb9446064..000000000000
--- a/kde-base/kdegraphics/kdegraphics-3.1.4.ebuild
+++ /dev/null
@@ -1,33 +0,0 @@
-# Copyright 1999-2004 Gentoo Technologies, Inc.
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kdegraphics/kdegraphics-3.1.4.ebuild,v 1.11 2004/01/13 16:50:57 agriffis Exp $
-inherit kde-dist
-
-IUSE="gphoto2 tetex scanner"
-DESCRIPTION="KDE graphics-related apps"
-
-KEYWORDS="x86 ppc sparc hppa amd64 alpha"
-
-DEPEND="gphoto2? ( >=media-gfx/gphoto2-2.0_beta1 )
-	scanner? ( media-gfx/sane-backends )
-	tetex? ( virtual/tetex )
-	media-libs/imlib
-	virtual/ghostscript
-	virtual/glut virtual/opengl
-	media-libs/tiff
-	!media-gfx/kpovmodeler
-	x86? ( scanner? sys-libs/libieee1284 )"
-
-RDEPEND="$DEPEND app-text/xpdf"
-
-use gphoto2	&& myconf="$myconf --with-kamera \
-			   --with-gphoto2-includes=/usr/include/gphoto2 \
-			   --with-gphoto2-libraries=/usr/lib/gphoto2" || \
-		myconf="$myconf --without-kamera"
-
-use tetex 	&& myconf="$myconf --with-system-kpathsea --with-tex-datadir=/usr/share"
-
-use scanner	|| KDE_REMOVE_DIR="kooka libkscan"
-
-myconf="$myconf --with-imlib --with-imlib-config=/usr/bin"
-
diff --git a/kde-base/kdegraphics/kdegraphics-3.2.1.ebuild b/kde-base/kdegraphics/kdegraphics-3.2.1.ebuild
index 1d3789368113..1a5fee8ae2a7 100644
--- a/kde-base/kdegraphics/kdegraphics-3.2.1.ebuild
+++ b/kde-base/kdegraphics/kdegraphics-3.2.1.ebuild
@@ -1,12 +1,12 @@
 # Copyright 1999-2004 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kdegraphics/kdegraphics-3.2.1.ebuild,v 1.2 2004/03/12 14:55:40 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kdegraphics/kdegraphics-3.2.1.ebuild,v 1.3 2004/03/12 21:03:52 caleb Exp $
 
 inherit kde-dist
 
 DESCRIPTION="KDE graphics-related apps"
 
-KEYWORDS="~x86 ~ppc ~sparc ~alpha hppa ~amd64 ~ia64"
+KEYWORDS="x86 ~ppc ~sparc ~alpha hppa ~amd64 ~ia64"
 IUSE="gphoto2 tetex scanner opengl"
 
 DEPEND="~kde-base/kdebase-${PV}
diff --git a/kde-base/kdesdk/ChangeLog b/kde-base/kdesdk/ChangeLog
index 20fa8eba79a2..5e4ef52ed125 100644
--- a/kde-base/kdesdk/ChangeLog
+++ b/kde-base/kdesdk/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for kde-base/kdesdk
 # Copyright 2002-2004 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kdesdk/ChangeLog,v 1.47 2004/03/09 12:24:07 caleb Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kdesdk/ChangeLog,v 1.48 2004/03/12 21:05:41 caleb Exp $
+
+  12 Mar 2004; Caleb Tennis <caleb@gentoo.org> kdesdk-3.1.4.ebuild,
+  kdesdk-3.2.1.ebuild:
+  x86 stable and version cleanups
 
 *kdesdk-3.2.1 (09 Mar 2004)
 
diff --git a/kde-base/kdesdk/files/digest-kdesdk-3.1.4 b/kde-base/kdesdk/files/digest-kdesdk-3.1.4
deleted file mode 100644
index 54c9345a5f49..000000000000
--- a/kde-base/kdesdk/files/digest-kdesdk-3.1.4
+++ /dev/null
@@ -1 +0,0 @@
-MD5 ed343cedeab6c6dc814fa8b4e164e4ec kdesdk-3.1.4.tar.bz2 2160791
diff --git a/kde-base/kdesdk/kdesdk-3.1.4.ebuild b/kde-base/kdesdk/kdesdk-3.1.4.ebuild
deleted file mode 100644
index d9e0c2376f5b..000000000000
--- a/kde-base/kdesdk/kdesdk-3.1.4.ebuild
+++ /dev/null
@@ -1,8 +0,0 @@
-# Copyright 1999-2004 Gentoo Technologies, Inc.
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kdesdk/kdesdk-3.1.4.ebuild,v 1.6 2004/01/19 03:23:22 caleb Exp $
-inherit kde-dist
-
-IUSE=""
-DESCRIPTION="KDE SDK: kbabel, ..."
-KEYWORDS="x86 sparc ppc amd64"
diff --git a/kde-base/kdesdk/kdesdk-3.2.1.ebuild b/kde-base/kdesdk/kdesdk-3.2.1.ebuild
index a66665f6fb4a..231d5fb92866 100644
--- a/kde-base/kdesdk/kdesdk-3.2.1.ebuild
+++ b/kde-base/kdesdk/kdesdk-3.2.1.ebuild
@@ -1,11 +1,11 @@
 # Copyright 1999-2004 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kdesdk/kdesdk-3.2.1.ebuild,v 1.1 2004/03/09 12:24:07 caleb Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kdesdk/kdesdk-3.2.1.ebuild,v 1.2 2004/03/12 21:05:41 caleb Exp $
 inherit kde-dist
 
 IUSE=""
 DESCRIPTION="KDE SDK: kbabel, ..."
-KEYWORDS="~x86 ~sparc ~amd64 ~ppc"
+KEYWORDS="x86 ~sparc ~amd64 ~ppc"
 
 DEPEND="!dev-util/umbrello
 	!dev-util/kcachegrind
diff --git a/kde-base/kdetoys/ChangeLog b/kde-base/kdetoys/ChangeLog
index 72219eda89b2..41e166706f30 100644
--- a/kde-base/kdetoys/ChangeLog
+++ b/kde-base/kdetoys/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for kde-base/kdetoys
 # Copyright 2002-2004 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kdetoys/ChangeLog,v 1.58 2004/03/09 14:53:31 caleb Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kdetoys/ChangeLog,v 1.59 2004/03/12 21:07:10 caleb Exp $
+
+  12 Mar 2004; Caleb Tennis <caleb@gentoo.org> kdetoys-3.1.4.ebuild,
+  kdetoys-3.2.1.ebuild:
+  x86 stable and version cleanups
 
 *kdetoys-3.2.1 (09 Mar 2004)
 
diff --git a/kde-base/kdetoys/files/digest-kdetoys-3.1.4 b/kde-base/kdetoys/files/digest-kdetoys-3.1.4
deleted file mode 100644
index 7bf61a312d7b..000000000000
--- a/kde-base/kdetoys/files/digest-kdetoys-3.1.4
+++ /dev/null
@@ -1 +0,0 @@
-MD5 58c9a31f31564513414fbaf09fc13b29 kdetoys-3.1.4.tar.bz2 1844523
diff --git a/kde-base/kdetoys/kdetoys-3.1.4.ebuild b/kde-base/kdetoys/kdetoys-3.1.4.ebuild
deleted file mode 100644
index 9e6995a3dc1c..000000000000
--- a/kde-base/kdetoys/kdetoys-3.1.4.ebuild
+++ /dev/null
@@ -1,9 +0,0 @@
-# Copyright 1999-2004 Gentoo Technologies, Inc.
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kdetoys/kdetoys-3.1.4.ebuild,v 1.8 2004/01/13 16:40:46 agriffis Exp $
-inherit kde-dist
-
-IUSE=""
-DESCRIPTION="KDE toys"
-KEYWORDS="x86 ppc sparc hppa amd64 alpha"
-
diff --git a/kde-base/kdetoys/kdetoys-3.2.1.ebuild b/kde-base/kdetoys/kdetoys-3.2.1.ebuild
index b93abf66deab..03b9b8349cfe 100644
--- a/kde-base/kdetoys/kdetoys-3.2.1.ebuild
+++ b/kde-base/kdetoys/kdetoys-3.2.1.ebuild
@@ -1,9 +1,9 @@
 # Copyright 1999-2004 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kdetoys/kdetoys-3.2.1.ebuild,v 1.1 2004/03/09 14:53:32 caleb Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kdetoys/kdetoys-3.2.1.ebuild,v 1.2 2004/03/12 21:07:10 caleb Exp $
 
 inherit kde-dist
 
 DESCRIPTION="KDE toys"
 
-KEYWORDS="~x86 ~ppc ~sparc ~hppa ~amd64 ~alpha ~ia64"
+KEYWORDS="x86 ~ppc ~sparc ~hppa ~amd64 ~alpha ~ia64"
diff --git a/kde-base/kdeutils/ChangeLog b/kde-base/kdeutils/ChangeLog
index 1df176cd2262..7fb75cc3a6ce 100644
--- a/kde-base/kdeutils/ChangeLog
+++ b/kde-base/kdeutils/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for kde-base/kdeutils
 # Copyright 2002-2004 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kdeutils/ChangeLog,v 1.61 2004/03/09 14:48:17 caleb Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kdeutils/ChangeLog,v 1.62 2004/03/12 21:10:01 caleb Exp $
+
+*kdeutils-3.2.1 (12 Mar 2004)
+
+  12 Mar 2004; Caleb Tennis <caleb@gentoo.org> kdeutils-3.1.4.ebuild,
+  kdeutils-3.2.1.ebuild:
+  x86 stable and version cleanups
 
   09 Mar 2004; Caleb Tennis <caleb@gentoo.org> :
   Version bump
diff --git a/kde-base/kdeutils/files/digest-kdeutils-3.1.4 b/kde-base/kdeutils/files/digest-kdeutils-3.1.4
deleted file mode 100644
index d39b8759d9cd..000000000000
--- a/kde-base/kdeutils/files/digest-kdeutils-3.1.4
+++ /dev/null
@@ -1 +0,0 @@
-MD5 98da1b32714e38208a3cc21efc77f627 kdeutils-3.1.4.tar.bz2 1382821
diff --git a/kde-base/kdeutils/kdeutils-3.1.4.ebuild b/kde-base/kdeutils/kdeutils-3.1.4.ebuild
deleted file mode 100644
index adf7cceaf153..000000000000
--- a/kde-base/kdeutils/kdeutils-3.1.4.ebuild
+++ /dev/null
@@ -1,11 +0,0 @@
-# Copyright 1999-2004 Gentoo Technologies, Inc.
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kdeutils/kdeutils-3.1.4.ebuild,v 1.8 2004/01/13 16:38:55 agriffis Exp $
-inherit kde-dist
-
-IUSE=""
-DESCRIPTION="KDE utilities"
-
-#RDEPEND="$RDEPEND app-admin/dosfstools" # for kfloppy
-KEYWORDS="x86 ppc sparc hppa amd64 alpha"
-
diff --git a/kde-base/kdeutils/kdeutils-3.2.1.ebuild b/kde-base/kdeutils/kdeutils-3.2.1.ebuild
index eddaba75cc34..961d00a4559c 100644
--- a/kde-base/kdeutils/kdeutils-3.2.1.ebuild
+++ b/kde-base/kdeutils/kdeutils-3.2.1.ebuild
@@ -1,12 +1,12 @@
 # Copyright 1999-2004 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kdeutils/kdeutils-3.2.1.ebuild,v 1.2 2004/03/12 18:52:31 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kdeutils/kdeutils-3.2.1.ebuild,v 1.3 2004/03/12 21:10:01 caleb Exp $
 
 inherit kde-dist
 
 DESCRIPTION="KDE utilities"
 
-KEYWORDS="~x86 ~ppc ~sparc ~alpha hppa ~amd64 ~ia64"
+KEYWORDS="x86 ~ppc ~sparc ~alpha hppa ~amd64 ~ia64"
 
 DEPEND="~kde-base/kdebase-${PV}
 	app-crypt/gnupg