8 files changed, 14 insertions, 65 deletions
diff --git a/kde-base/kdeadmin/ChangeLog b/kde-base/kdeadmin/ChangeLog
index 6049a3f57f73..8bd591cd9b59 100644
--- a/kde-base/kdeadmin/ChangeLog
+++ b/kde-base/kdeadmin/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for kde-base/kdeadmin
 # Copyright 2002-2004 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kdeadmin/ChangeLog,v 1.70 2004/03/09 16:02:44 caleb Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kdeadmin/ChangeLog,v 1.71 2004/03/12 20:57:07 caleb Exp $
+
+  12 Mar 2004; Caleb Tennis <caleb@gentoo.org> kdeadmin-3.1.4.ebuild,
+  kdeadmin-3.2.1.ebuild:
+  x86 stable and version cleanup
 
 *kdeadmin-3.2.1 (09 Mar 2004)
 
diff --git a/kde-base/kdeadmin/files/digest-kdeadmin-3.1.4 b/kde-base/kdeadmin/files/digest-kdeadmin-3.1.4
deleted file mode 100644
index 2b067a0dc641..000000000000
--- a/kde-base/kdeadmin/files/digest-kdeadmin-3.1.4
+++ /dev/null
@@ -1 +0,0 @@
-MD5 8e0d2eedc7bd785ffdd428209a6ea9b8 kdeadmin-3.1.4.tar.bz2 1558949
diff --git a/kde-base/kdeadmin/kdeadmin-3.1.4.ebuild b/kde-base/kdeadmin/kdeadmin-3.1.4.ebuild
deleted file mode 100644
index 7cb0d442604a..000000000000
--- a/kde-base/kdeadmin/kdeadmin-3.1.4.ebuild
+++ /dev/null
@@ -1,41 +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/kdeadmin/kdeadmin-3.1.4.ebuild,v 1.9 2004/01/13 16:53:51 agriffis Exp $
-inherit kde-dist
-
-IUSE="pam foreign-package foreign-sysvinit"
-DESCRIPTION="KDE administration tools (user manager, etc.)"
-KEYWORDS="x86 ppc sparc hppa amd64 alpha"
-
-DEPEND="pam? ( >=sys-libs/pam-0.72 )
-	foreign-package? ( >=app-arch/rpm-4.0.4-r1 dev-libs/popt )"
-RDEPEND="$DEPEND"
-
-use pam		&& myconf="$myconf --with-pam"	|| myconf="$myconf --without-pam --with-shadow"
-
-#if [ -n "`use foreign-package`" ]; then
-#    myconf="$myconf --with-rpmlib"
-#else
-	myconf="$myconf --without-rpm"
-	KDE_REMOVE_DIR="$KDE_REMOVE_DIR kpackage"
-#fi
-
-if [ -z "`use foreign-sysvinit`" ]; then
-	KDE_REMOVE_DIR="$KDE_REMOVE_DIR ksysv"
-fi
-
-
-# we only want to compile the lilo config module on x86, but there we want to make sure it's
-# always compiled to ensure consistent behaviour of the package across both lilo and grub systems,
-# because configure when left to its own devices will build lilo-config or not basd on whether
-# lilo is present in the path.
-# so, we make configure build it by removing the configure.in.in file that checks for
-# lilo's presense
-src_unpack() {
-
-	kde_src_unpack
-	use x86 && echo > ${S}/lilo-config/configure.in.in
-
-}
-
-# TODO: add nis support
diff --git a/kde-base/kdeadmin/kdeadmin-3.2.1.ebuild b/kde-base/kdeadmin/kdeadmin-3.2.1.ebuild
index 801348f80c85..566905a68723 100644
--- a/kde-base/kdeadmin/kdeadmin-3.2.1.ebuild
+++ b/kde-base/kdeadmin/kdeadmin-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/kdeadmin/kdeadmin-3.2.1.ebuild,v 1.1 2004/03/09 16:02:44 caleb Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kdeadmin/kdeadmin-3.2.1.ebuild,v 1.2 2004/03/12 20:57:07 caleb Exp $
 
 inherit kde-dist
 
 DESCRIPTION="KDE administration tools (user manager, etc.)"
 
-KEYWORDS="~x86 ~ppc ~sparc ~hppa ~amd64 ~alpha ~ia64"
+KEYWORDS="x86 ~ppc ~sparc ~hppa ~amd64 ~alpha ~ia64"
 IUSE="pam"
 
 DEPEND="~kde-base/kdebase-${PV}
diff --git a/kde-base/kdeartwork/ChangeLog b/kde-base/kdeartwork/ChangeLog
index 9c42f0fe729b..3af3073cf9dc 100644
--- a/kde-base/kdeartwork/ChangeLog
+++ b/kde-base/kdeartwork/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for kde-base/kdeartwork
 # Copyright 2002-2004 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kdeartwork/ChangeLog,v 1.66 2004/03/09 15:57:24 caleb Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kdeartwork/ChangeLog,v 1.67 2004/03/12 20:58:38 caleb Exp $
+
+  12 Mar 2004; Caleb Tennis <caleb@gentoo.org> kdeartwork-3.1.4.ebuild,
+  kdeartwork-3.2.1.ebuild:
+  x86 stable and version cleanups
 
 *kdeartwork-3.2.1 (09 Mar 2004)
 
diff --git a/kde-base/kdeartwork/files/digest-kdeartwork-3.1.4 b/kde-base/kdeartwork/files/digest-kdeartwork-3.1.4
deleted file mode 100644
index a4713e23d319..000000000000
--- a/kde-base/kdeartwork/files/digest-kdeartwork-3.1.4
+++ /dev/null
@@ -1 +0,0 @@
-MD5 042e42ade90a8d137edea88eb7d3e11d kdeartwork-3.1.4.tar.bz2 13850768
diff --git a/kde-base/kdeartwork/kdeartwork-3.1.4.ebuild b/kde-base/kdeartwork/kdeartwork-3.1.4.ebuild
deleted file mode 100644
index 90a85b11f884..000000000000
--- a/kde-base/kdeartwork/kdeartwork-3.1.4.ebuild
+++ /dev/null
@@ -1,16 +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/kdeartwork/kdeartwork-3.1.4.ebuild,v 1.9 2004/01/13 16:53:21 agriffis Exp $
-inherit kde-dist
-
-IUSE="opengl"
-DEPEND="opengl? ( virtual/opengl )
-	~kde-base/kdebase-${PV}"
-RDEPEND="$DEPEND"
-
-DESCRIPTION="KDE artwork package"
-KEYWORDS="x86 ppc sparc hppa amd64 alpha"
-PATCHES="$FILESDIR/xsaver-conflicting-typedefs.diff"
-
-myconf="$myconf --with-dpms"
-use opengl && myconf="$myconf --with-gl" || myconf="$myconf --without-gl"
diff --git a/kde-base/kdeartwork/kdeartwork-3.2.1.ebuild b/kde-base/kdeartwork/kdeartwork-3.2.1.ebuild
index e894663d9e41..d5f499af334f 100644
--- a/kde-base/kdeartwork/kdeartwork-3.2.1.ebuild
+++ b/kde-base/kdeartwork/kdeartwork-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/kdeartwork/kdeartwork-3.2.1.ebuild,v 1.1 2004/03/09 15:57:24 caleb Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kdeartwork/kdeartwork-3.2.1.ebuild,v 1.2 2004/03/12 20:58:38 caleb Exp $
 
 inherit kde-dist
 
 DESCRIPTION="KDE artwork package"
 
-KEYWORDS="~x86 ~ppc ~sparc ~hppa ~amd64 ~alpha ~ia64"
+KEYWORDS="x86 ~ppc ~sparc ~hppa ~amd64 ~alpha ~ia64"
 IUSE="opengl"
 
 DEPEND="opengl? ( virtual/opengl )