3.3.0 is x86 stable

18 files changed, 19 insertions, 169 deletions

diff --git a/kde-base/kdeaddons/ChangeLog b/kde-base/kdeaddons/ChangeLog
index e224d8a91e42..289e15ea3b70 100644
--- a/kde-base/kdeaddons/ChangeLog
+++ b/kde-base/kdeaddons/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for kde-base/kdeaddons
 # Copyright 2002-2004 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kdeaddons/ChangeLog,v 1.96 2004/09/04 02:43:20 tgall Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kdeaddons/ChangeLog,v 1.97 2004/09/09 17:45:57 caleb Exp $
+
+  09 Sep 2004; Caleb Tennis <caleb@gentoo.org> -kdeaddons-3.2.1.ebuild:
+  3.3.0 is x86 stable
 
   03 Sep 2004; Tom Gall <tgall@gentoo.org> kdeaddons-3.3.0.ebuild:
   added ~ppc64, bug #62775
diff --git a/kde-base/kdeaddons/files/digest-kdeaddons-3.2.1 b/kde-base/kdeaddons/files/digest-kdeaddons-3.2.1
deleted file mode 100644
index 705175ce4032..000000000000
--- a/kde-base/kdeaddons/files/digest-kdeaddons-3.2.1
+++ /dev/null
@@ -1 +0,0 @@
-MD5 c73c1777d3f5c25f46cd782fcca9fc35 kdeaddons-3.2.1.tar.bz2 1371322
diff --git a/kde-base/kdeaddons/files/digest-kdeaddons-3.3.0_rc2 b/kde-base/kdeaddons/files/digest-kdeaddons-3.3.0_rc2
deleted file mode 100644
index 8b2eface16fa..000000000000
--- a/kde-base/kdeaddons/files/digest-kdeaddons-3.3.0_rc2
+++ /dev/null
@@ -1 +0,0 @@
-MD5 279500317749e08e3b53e558b9abf9e8 kdeaddons-3.3.0-rc2.tar.bz2 1556194
diff --git a/kde-base/kdeaddons/kdeaddons-3.2.1.ebuild b/kde-base/kdeaddons/kdeaddons-3.2.1.ebuild
deleted file mode 100644
index 4722f8ab0550..000000000000
--- a/kde-base/kdeaddons/kdeaddons-3.2.1.ebuild
+++ /dev/null
@@ -1,27 +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/kdeaddons/kdeaddons-3.2.1.ebuild,v 1.8 2004/08/30 15:45:00 pvdabeel Exp $
-
-inherit kde-dist flag-o-matic
-
-DESCRIPTION="KDE addon modules: plugins for konqueror, noatun etc"
-
-KEYWORDS="x86 ppc sparc ~alpha hppa amd64 ~ia64"
-IUSE="sdl svga xmms esd"
-
-DEPEND="~kde-base/kdepim-${PV}
-	~kde-base/kdemultimedia-${PV}
-	~kde-base/arts-${PV//3./1.}
-	esd? ( media-sound/esound )
-	sdl? ( >=media-libs/libsdl-1.2 )
-	svga? ( media-libs/svgalib )
-	xmms? ( media-sound/xmms )"
-
-use sdl && myconf="$myconf --with-sdl --with-sdl-prefix=/usr" || myconf="$myconf --without-sdl --disable-sdltest"
-
-use xmms || export ac_cv_have_xmms=no
-
-# Make vimpart use /usr/bin/kvim -- fixes bug 33257.
-# This should continue to apply to upcoming versions since it's
-# Gentoo-specific and won't go upstream.
-PATCHES="$FILESDIR/${PN}-3.2.0-kvim.diff"
diff --git a/kde-base/kdeaddons/kdeaddons-3.3.0.ebuild b/kde-base/kdeaddons/kdeaddons-3.3.0.ebuild
index e34fc6a76877..ca8173e0af8b 100644
--- a/kde-base/kdeaddons/kdeaddons-3.3.0.ebuild
+++ b/kde-base/kdeaddons/kdeaddons-3.3.0.ebuild
@@ -1,12 +1,12 @@
 # Copyright 1999-2004 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kdeaddons/kdeaddons-3.3.0.ebuild,v 1.4 2004/09/04 02:43:20 tgall Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kdeaddons/kdeaddons-3.3.0.ebuild,v 1.5 2004/09/09 17:45:57 caleb Exp $
 
 inherit kde-dist flag-o-matic
 
 DESCRIPTION="KDE addon modules: plugins for konqueror, noatun etc"
 
-KEYWORDS="~x86 ~amd64 ~sparc ppc ~ppc64"
+KEYWORDS="x86 ~amd64 ~sparc ppc ~ppc64"
 IUSE="arts sdl svga xmms esd"
 
 DEPEND="~kde-base/kdepim-${PV}
diff --git a/kde-base/kdeaddons/kdeaddons-3.3.0_rc2.ebuild b/kde-base/kdeaddons/kdeaddons-3.3.0_rc2.ebuild
deleted file mode 100644
index d9ca32e2b296..000000000000
--- a/kde-base/kdeaddons/kdeaddons-3.3.0_rc2.ebuild
+++ /dev/null
@@ -1,27 +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/kdeaddons/kdeaddons-3.3.0_rc2.ebuild,v 1.1 2004/08/10 17:27:51 caleb Exp $
-
-inherit kde-dist flag-o-matic
-
-DESCRIPTION="KDE addon modules: plugins for konqueror, noatun etc"
-
-KEYWORDS="~x86 ~amd64"
-IUSE="arts sdl svga xmms esd"
-
-DEPEND="~kde-base/kdepim-${PV}
-	~kde-base/kdemultimedia-${PV}
-	arts? ( ~kde-base/arts-${PV//3.3/1.3} )
-	esd? ( media-sound/esound )
-	sdl? ( >=media-libs/libsdl-1.2 )
-	svga? ( media-libs/svgalib )
-	xmms? ( media-sound/xmms )"
-
-use sdl && myconf="$myconf --with-sdl --with-sdl-prefix=/usr" || myconf="$myconf --without-sdl --disable-sdltest"
-
-use xmms || export ac_cv_have_xmms=no
-
-# Make vimpart use /usr/bin/kvim -- fixes bug 33257.
-# This should continue to apply to upcoming versions since it's
-# Gentoo-specific and won't go upstream.
-PATCHES="$FILESDIR/${PN}-3.2.0-kvim.diff"
diff --git a/kde-base/kdeadmin/ChangeLog b/kde-base/kdeadmin/ChangeLog
index 17aa9f7d351b..a65834403ffe 100644
--- a/kde-base/kdeadmin/ChangeLog
+++ b/kde-base/kdeadmin/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for kde-base/kdeadmin
 # Copyright 2002-2004 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kdeadmin/ChangeLog,v 1.90 2004/08/30 15:45:00 pvdabeel Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kdeadmin/ChangeLog,v 1.91 2004/09/09 17:43:59 caleb Exp $
+
+  09 Sep 2004; Caleb Tennis <caleb@gentoo.org> -kdeadmin-3.2.1.ebuild:
+  3.3.0 is x86 stable
 
   30 Aug 2004; Pieter Van den Abeele <pvdabeel@gentoo.org>
   kdeadmin-3.1.5.ebuild, kdeadmin-3.2.1.ebuild, kdeadmin-3.3.0.ebuild:
diff --git a/kde-base/kdeadmin/files/digest-kdeadmin-3.2.1 b/kde-base/kdeadmin/files/digest-kdeadmin-3.2.1
deleted file mode 100644
index 3325b62136ca..000000000000
--- a/kde-base/kdeadmin/files/digest-kdeadmin-3.2.1
+++ /dev/null
@@ -1 +0,0 @@
-MD5 1ff46933b955cb4bc71cd533c6f730d1 kdeadmin-3.2.1.tar.bz2 1614958
diff --git a/kde-base/kdeadmin/files/digest-kdeadmin-3.3.0_rc2 b/kde-base/kdeadmin/files/digest-kdeadmin-3.3.0_rc2
deleted file mode 100644
index f0aac55f8315..000000000000
--- a/kde-base/kdeadmin/files/digest-kdeadmin-3.3.0_rc2
+++ /dev/null
@@ -1 +0,0 @@
-MD5 3ea2eb506d78f3feda89b09ad62111a3 kdeadmin-3.3.0-rc2.tar.bz2 1568441
diff --git a/kde-base/kdeadmin/kdeadmin-3.2.1.ebuild b/kde-base/kdeadmin/kdeadmin-3.2.1.ebuild
deleted file mode 100644
index 2414276f4648..000000000000
--- a/kde-base/kdeadmin/kdeadmin-3.2.1.ebuild
+++ /dev/null
@@ -1,29 +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/kdeadmin/kdeadmin-3.2.1.ebuild,v 1.7 2004/08/30 15:45:00 pvdabeel Exp $
-
-inherit kde-dist
-
-DESCRIPTION="KDE administration tools (user manager, etc.)"
-
-KEYWORDS="x86 ppc sparc ~alpha hppa amd64 ~ia64"
-IUSE="pam"
-
-DEPEND="~kde-base/kdebase-${PV}
-	pam? ( >=sys-libs/pam-0.72 )"
-
-myconf="$myconf --without-rpm"
-DO_NOT_COMPILE="$DO_NOT_COMPILE kpackage ksysv"
-
-# 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.3.0.ebuild b/kde-base/kdeadmin/kdeadmin-3.3.0.ebuild
index eb2aa71dbd8e..3fafeff13124 100644
--- a/kde-base/kdeadmin/kdeadmin-3.3.0.ebuild
+++ b/kde-base/kdeadmin/kdeadmin-3.3.0.ebuild
@@ -1,12 +1,12 @@
 # Copyright 1999-2004 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kdeadmin/kdeadmin-3.3.0.ebuild,v 1.4 2004/08/30 15:45:00 pvdabeel Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kdeadmin/kdeadmin-3.3.0.ebuild,v 1.5 2004/09/09 17:43:59 caleb Exp $
 
 inherit kde-dist
 
 DESCRIPTION="KDE administration tools (user manager, etc.)"
 
-KEYWORDS="~x86 ~amd64 ppc64 ~sparc ppc"
+KEYWORDS="x86 ~amd64 ppc64 ~sparc ppc"
 IUSE="pam"
 
 DEPEND="~kde-base/kdebase-${PV}
diff --git a/kde-base/kdeadmin/kdeadmin-3.3.0_rc2.ebuild b/kde-base/kdeadmin/kdeadmin-3.3.0_rc2.ebuild
deleted file mode 100644
index 59976fcc69b3..000000000000
--- a/kde-base/kdeadmin/kdeadmin-3.3.0_rc2.ebuild
+++ /dev/null
@@ -1,29 +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/kdeadmin/kdeadmin-3.3.0_rc2.ebuild,v 1.1 2004/08/10 17:59:01 caleb Exp $
-
-inherit kde-dist
-
-DESCRIPTION="KDE administration tools (user manager, etc.)"
-
-KEYWORDS="~x86 ~amd64"
-IUSE="pam"
-
-DEPEND="~kde-base/kdebase-${PV}
-	pam? ( >=sys-libs/pam-0.72 )"
-
-myconf="$myconf --without-rpm"
-DO_NOT_COMPILE="$DO_NOT_COMPILE kpackage ksysv"
-
-# 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/kdeartwork/ChangeLog b/kde-base/kdeartwork/ChangeLog
index 20db71c92632..e60b0562f914 100644
--- a/kde-base/kdeartwork/ChangeLog
+++ b/kde-base/kdeartwork/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for kde-base/kdeartwork
 # Copyright 2002-2004 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kdeartwork/ChangeLog,v 1.88 2004/09/02 03:39:39 tgall Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kdeartwork/ChangeLog,v 1.89 2004/09/09 17:42:05 caleb Exp $
+
+  09 Sep 2004; Caleb Tennis <caleb@gentoo.org> -kdeartwork-3.2.1.ebuild:
+  3.3.0 is x86 stable
 
   01 Sep 2004; Tom Gall <tgall@gentoo.org> kdeartwork-3.3.0.ebuild:
   stable on ppc64, bug #62166
diff --git a/kde-base/kdeartwork/files/digest-kdeartwork-3.2.1 b/kde-base/kdeartwork/files/digest-kdeartwork-3.2.1
deleted file mode 100644
index efe33f9d886b..000000000000
--- a/kde-base/kdeartwork/files/digest-kdeartwork-3.2.1
+++ /dev/null
@@ -1 +0,0 @@
-MD5 8c539b4ba4550e8355df03992c36cf58 kdeartwork-3.2.1.tar.bz2 17203687
diff --git a/kde-base/kdeartwork/files/digest-kdeartwork-3.3.0_rc2 b/kde-base/kdeartwork/files/digest-kdeartwork-3.3.0_rc2
deleted file mode 100644
index 8caa41d50d6f..000000000000
--- a/kde-base/kdeartwork/files/digest-kdeartwork-3.3.0_rc2
+++ /dev/null
@@ -1 +0,0 @@
-MD5 d18c02d03c2c0adfa26090744fa04bac kdeartwork-3.3.0-rc2.tar.bz2 17817523
diff --git a/kde-base/kdeartwork/kdeartwork-3.2.1.ebuild b/kde-base/kdeartwork/kdeartwork-3.2.1.ebuild
deleted file mode 100644
index e7e40613b8d6..000000000000
--- a/kde-base/kdeartwork/kdeartwork-3.2.1.ebuild
+++ /dev/null
@@ -1,18 +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/kdeartwork/kdeartwork-3.2.1.ebuild,v 1.7 2004/08/30 15:45:01 pvdabeel Exp $
-
-inherit kde-dist
-
-DESCRIPTION="KDE artwork package"
-
-KEYWORDS="x86 ppc sparc ~alpha hppa amd64 ~ia64"
-IUSE="opengl"
-
-DEPEND="opengl? ( virtual/opengl )
-	~kde-base/kdebase-${PV}"
-
-src_compile() {
-	myconf="$myconf --with-dpms `use_with opengl gl`"
-	kde_src_compile
-}
diff --git a/kde-base/kdeartwork/kdeartwork-3.3.0.ebuild b/kde-base/kdeartwork/kdeartwork-3.3.0.ebuild
index 9963e824d3fc..52b76c18cb6a 100644
--- a/kde-base/kdeartwork/kdeartwork-3.3.0.ebuild
+++ b/kde-base/kdeartwork/kdeartwork-3.3.0.ebuild
@@ -1,12 +1,12 @@
 # Copyright 1999-2004 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kdeartwork/kdeartwork-3.3.0.ebuild,v 1.6 2004/09/02 03:39:39 tgall Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kdeartwork/kdeartwork-3.3.0.ebuild,v 1.7 2004/09/09 17:42:05 caleb Exp $
 
 inherit kde-dist eutils
 
 DESCRIPTION="KDE artwork package"
 
-KEYWORDS="~x86 ~amd64 ~sparc ppc ppc64"
+KEYWORDS="x86 ~amd64 ~sparc ppc ppc64"
 IUSE="opengl"
 
 DEPEND="opengl? ( virtual/opengl )
@@ -24,6 +24,6 @@ src_unpack() {
 }
 
 src_compile() {
-	myconf="$myconf --with-dpms `use_with opengl gl`"
+	myconf="$myconf --with-dpms $(use_with opengl gl)"
 	kde_src_compile
 }
diff --git a/kde-base/kdeartwork/kdeartwork-3.3.0_rc2.ebuild b/kde-base/kdeartwork/kdeartwork-3.3.0_rc2.ebuild
deleted file mode 100644
index 55bdd8e5e2e4..000000000000
--- a/kde-base/kdeartwork/kdeartwork-3.3.0_rc2.ebuild
+++ /dev/null
@@ -1,23 +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/kdeartwork/kdeartwork-3.3.0_rc2.ebuild,v 1.2 2004/08/17 19:18:33 carlo Exp $
-
-inherit kde-dist
-
-DESCRIPTION="KDE artwork package"
-
-KEYWORDS="~x86 ~amd64"
-IUSE="opengl"
-
-DEPEND="opengl? ( virtual/opengl )
-	~kde-base/kdebase-${PV}"
-
-src_unpack() {
-	kde_src_unpack
-	sed -ie "s:X11R6/lib\(/X11\)\?:lib:g" kscreensaver/kxsconfig/Makefile.in
-}
-
-src_compile() {
-	myconf="$myconf --with-dpms `use_with opengl gl`"
-	kde_src_compile
-}