Remove old files, mark 3.3.0 x86 stable

8 files changed, 7 insertions, 364 deletions

diff --git a/kde-base/kdebase/ChangeLog b/kde-base/kdebase/ChangeLog
index 7700107297c3..ca10ea3560b9 100644
--- a/kde-base/kdebase/ChangeLog
+++ b/kde-base/kdebase/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for kde-base/kdebase
 # Copyright 2002-2004 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kdebase/ChangeLog,v 1.148 2004/09/07 14:19:14 carlo Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kdebase/ChangeLog,v 1.149 2004/09/09 15:44:30 caleb Exp $
+
+  09 Sep 2004; Caleb Tennis <caleb@gentoo.org> -kdebase-3.2.1.ebuild,
+  -kdebase-3.2.3.ebuild:
+  Remove old files, mark 3.3.0 x86 stable
 
   07 Sep 2004; Carsten Lohrke <carlo@gentoo.org> +files/3.3.0-sasl-fix.diff,
   kdebase-3.3.0.ebuild:
diff --git a/kde-base/kdebase/files/digest-kdebase-3.2.1 b/kde-base/kdebase/files/digest-kdebase-3.2.1
deleted file mode 100644
index a78280403b26..000000000000
--- a/kde-base/kdebase/files/digest-kdebase-3.2.1
+++ /dev/null
@@ -1 +0,0 @@
-MD5 3a3d89b0b49dbb1eaa9e71c83019bbef kdebase-3.2.1.tar.bz2 17131336
diff --git a/kde-base/kdebase/files/digest-kdebase-3.2.3 b/kde-base/kdebase/files/digest-kdebase-3.2.3
deleted file mode 100644
index dbb0c552ab33..000000000000
--- a/kde-base/kdebase/files/digest-kdebase-3.2.3
+++ /dev/null
@@ -1 +0,0 @@
-MD5 fd05a338d155610856b06988d8dff117 kdebase-3.2.3.tar.bz2 17330422
diff --git a/kde-base/kdebase/files/digest-kdebase-3.3.0_rc2 b/kde-base/kdebase/files/digest-kdebase-3.3.0_rc2
deleted file mode 100644
index 7df5b678d4c8..000000000000
--- a/kde-base/kdebase/files/digest-kdebase-3.3.0_rc2
+++ /dev/null
@@ -1 +0,0 @@
-MD5 49340c1ab3548c6c864e3ddcc847b810 kdebase-3.3.0-rc2.tar.bz2 19888685
diff --git a/kde-base/kdebase/kdebase-3.2.1.ebuild b/kde-base/kdebase/kdebase-3.2.1.ebuild
deleted file mode 100644
index 1697b73f06b5..000000000000
--- a/kde-base/kdebase/kdebase-3.2.1.ebuild
+++ /dev/null
@@ -1,124 +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/kdebase/kdebase-3.2.1.ebuild,v 1.12 2004/08/30 15:45:01 pvdabeel Exp $
-
-inherit kde-dist eutils
-
-DESCRIPTION="KDE base packages: the desktop, panel, window manager, konqueror..."
-
-KEYWORDS="x86 ppc sparc ~alpha hppa amd64 ~ia64"
-IUSE="ldap pam motif encode cups ssl opengl samba java"
-
-DEPEND="media-sound/cdparanoia
-	ldap? ( net-nds/openldap )
-	pam? ( sys-libs/pam )
-	motif? ( x11-libs/openmotif )
-	encode? ( media-sound/lame )
-	cups? ( net-print/cups )
-	ssl? ( dev-libs/openssl )
-	opengl? ( virtual/opengl )
-	samba? ( net-fs/samba )
-	java? ( || ( virtual/jdk virtual/jre ) )
-	>=media-libs/freetype-2"
-RDEPEND="${DEPEND}
-	sys-apps/eject"
-
-src_unpack() {
-	if [ `has sandbox ${FEATURES}` -a ${PORTAGE_TMPDIR} != "/var/tmp" ]; then
-		eerror "Due to a portage bug, kdebase cannot currently emerge properly"
-		eerror "in sandbox mode if your PORTAGE_TMPDIR has been changed."
-		eerror "Please change your PORTAGE_TMPDIR back to /var/tmp or turn"
-		eerror "off the sandbox for this compilation."
-		die
-	fi
-
-	kde_src_unpack
-	cd ${S} && aclocal
-}
-
-src_compile() {
-	myconf="$myconf --with-dpms --with-cdparanoia"
-	myconf="$myconf `use_with ldap` `use_with motif`"
-	myconf="$myconf `use_with encode lame` `use_with cups`"
-	myconf="$myconf `use_with opengl gl` `use_with ssl`"
-
-	use pam \
-		&& myconf="$myconf --with-pam=yes" \
-		|| myconf="$myconf --with-pam=no --with-shadow"
-	if use java; then
-		if [[ `has_version virtual/jdk` ]]; then
-			myconf="$myconf --with-java=$(java-config --jdk-home)"
-		else
-			myconf="$myconf --with-java=$(java-config --jre-home)"
-		fi
-	else
-		myconf="$myconf --without-java"
-	fi
-
-	kde_src_compile myconf configure
-	kde_remove_flag kdm/kfrontend -fomit-frame-pointer
-	kde_src_compile make
-}
-
-src_install() {
-	kde_src_install
-	cd ${S}/kdm && make DESTDIR=${D} GENKDMCONF_FLAGS="--no-old --no-backup" install
-
-	insinto /etc/pam.d
-	newins ${FILESDIR}/kde.pam kde
-	# kde-np is new requirement for 3.2 autologins - #33690
-	newins ${FILESDIR}/kde-np.pam kde-np
-
-	# startkde script
-	cd ${D}/${KDEDIR}/bin
-	epatch ${FILESDIR}/${PVR}/startkde-${PVR}-gentoo.diff
-	mv startkde startkde.orig
-	sed -e "s:_KDEDIR_:${KDEDIR}:" startkde.orig > startkde
-	rm startkde.orig
-	chmod a+x startkde
-
-	# kcontrol modules
-	cd ${D}/${KDEDIR}/etc/xdg/menus
-	ln -s default_kde-settings.menu kde-settings.menu
-	ln -s default_kde-information.menu kde-information.menu
-	ln -s default_kde-screensavers.menu kde-screensavers.menu
-
-	# x11 session script
-	cd ${T}
-	echo "#!/bin/sh
-${KDEDIR}/bin/startkde" > kde-${PV}
-	chmod a+x kde-${PV}
-	exeinto /etc/X11/Sessions
-	doexe kde-${PV}
-
-	cd ${D}/${KDEDIR}/share/config/kdm || die
-	dodir ${KDEDIR}/share/config/kdm/sessions
-	sed -e "s:_PREFIX_:${PREFIX}:g" \
-	    -e "s:_RANDOM_:${RANDOM}${RANDOM}:g" \
-	${FILESDIR}/${PVR}/kdmrc > kdmrc
-	sed -e "s:_PREFIX_:${PREFIX}:g" ${FILESDIR}/${PVR}/Xsetup > Xsetup
-
-	cp ${FILESDIR}/${PVR}/backgroundrc .
-
-	#backup splashscreen images, so they can be put back when unmerging
-	#mosfet or so.
-	if [ ! -d ${KDEDIR}/share/apps/ksplash.default ]
-	then
-		cd ${D}/${KDEDIR}/share/apps
-		cp -rf ksplash/ ksplash.default
-	fi
-
-	# Show gnome icons when choosing new icon for desktop shortcut
-	dodir /usr/share/pixmaps
-	mv ${D}/${KDEDIR}/share/apps/kdesktop/pics/* ${D}/usr/share/pixmaps/
-	rm -rf ${D}/${KDEDIR}/share/apps/kdesktop/pics/
-	cd ${D}/${KDEDIR}/share/apps/kdesktop/
-	ln -sf /usr/share/pixmaps/ pics
-
-	rmdir ${D}/${KDEDIR}/share/templates/.source/emptydir
-
-}
-
-pkg_postinst() {
-	mkdir -p ${KDEDIR}/share/templates/.source/emptydir
-}
diff --git a/kde-base/kdebase/kdebase-3.2.3.ebuild b/kde-base/kdebase/kdebase-3.2.3.ebuild
deleted file mode 100644
index 532875391d39..000000000000
--- a/kde-base/kdebase/kdebase-3.2.3.ebuild
+++ /dev/null
@@ -1,116 +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/kdebase/kdebase-3.2.3.ebuild,v 1.6 2004/08/30 15:45:01 pvdabeel Exp $
-
-inherit kde-dist eutils
-
-DESCRIPTION="KDE base packages: the desktop, panel, window manager, konqueror..."
-
-KEYWORDS="x86 ppc ~sparc ~mips ~alpha hppa amd64 ~ia64"
-IUSE="ldap pam motif encode cups ssl opengl samba java"
-
-DEPEND="media-sound/cdparanoia
-	ldap? ( net-nds/openldap )
-	pam? ( sys-libs/pam )
-	motif? ( x11-libs/openmotif )
-	encode? ( media-sound/lame )
-	cups? ( net-print/cups )
-	ssl? ( dev-libs/openssl )
-	opengl? ( virtual/opengl )
-	samba? ( net-fs/samba )
-	java? ( || ( virtual/jdk virtual/jre ) )
-	>=media-libs/freetype-2"
-RDEPEND="${DEPEND}
-	sys-apps/eject"
-
-src_unpack() {
-	kde_src_unpack
-}
-
-src_compile() {
-	myconf="$myconf --with-dpms --with-cdparanoia"
-	myconf="$myconf `use_with ldap` `use_with motif`"
-	myconf="$myconf `use_with encode lame` `use_with cups`"
-	myconf="$myconf `use_with opengl gl` `use_with ssl`"
-
-	use pam \
-		&& myconf="$myconf --with-pam=yes" \
-		|| myconf="$myconf --with-pam=no --with-shadow"
-
-	if use java ; then
-		if has_version virtual/jdk ; then
-			myconf="$myconf --with-java=$(java-config --jdk-home)"
-		else
-			myconf="$myconf --with-java=$(java-config --jre-home)"
-		fi
-	else
-		myconf="$myconf --without-java"
-	fi
-
-	kde_src_compile myconf configure
-	kde_remove_flag kdm/kfrontend -fomit-frame-pointer
-	kde_src_compile make
-}
-
-src_install() {
-	kde_src_install
-	cd ${S}/kdm && make DESTDIR=${D} GENKDMCONF_FLAGS="--no-old --no-backup" install
-
-	insinto /etc/pam.d
-	newins ${FILESDIR}/kde.pam kde
-	# kde-np is new requirement for 3.2 autologins - #33690
-	newins ${FILESDIR}/kde-np.pam kde-np
-
-	# startkde script
-	cd ${D}/${KDEDIR}/bin
-	epatch ${FILESDIR}/${PVR}/startkde-${PVR}-gentoo.diff
-	mv startkde startkde.orig
-	sed -e "s:_KDEDIR_:${KDEDIR}:" startkde.orig > startkde
-	rm startkde.orig
-	chmod a+x startkde
-
-	# kcontrol modules
-	cd ${D}/${KDEDIR}/etc/xdg/menus
-	ln -s default_kde-settings.menu kde-settings.menu
-	ln -s default_kde-information.menu kde-information.menu
-	ln -s default_kde-screensavers.menu kde-screensavers.menu
-
-	# x11 session script
-	cd ${T}
-	echo "#!/bin/sh
-${KDEDIR}/bin/startkde" > kde-${PV}
-	chmod a+x kde-${PV}
-	exeinto /etc/X11/Sessions
-	doexe kde-${PV}
-
-	cd ${D}/${KDEDIR}/share/config/kdm || die
-	dodir ${KDEDIR}/share/config/kdm/sessions
-	sed -e "s:_PREFIX_:${PREFIX}:g" \
-	    -e "s:_RANDOM_:${RANDOM}${RANDOM}:g" \
-	${FILESDIR}/${PVR}/kdmrc > kdmrc
-	sed -e "s:_PREFIX_:${PREFIX}:g" ${FILESDIR}/${PVR}/Xsetup > Xsetup
-
-	cp ${FILESDIR}/${PVR}/backgroundrc .
-
-	#backup splashscreen images, so they can be put back when unmerging
-	#mosfet or so.
-	if [ ! -d ${KDEDIR}/share/apps/ksplash.default ]
-	then
-		cd ${D}/${KDEDIR}/share/apps
-		cp -rf ksplash/ ksplash.default
-	fi
-
-	# Show gnome icons when choosing new icon for desktop shortcut
-	dodir /usr/share/pixmaps
-	mv ${D}/${KDEDIR}/share/apps/kdesktop/pics/* ${D}/usr/share/pixmaps/
-	rm -rf ${D}/${KDEDIR}/share/apps/kdesktop/pics/
-	cd ${D}/${KDEDIR}/share/apps/kdesktop/
-	ln -sf /usr/share/pixmaps/ pics
-
-	rmdir ${D}/${KDEDIR}/share/templates/.source/emptydir
-
-}
-
-pkg_postinst() {
-	mkdir -p ${KDEDIR}/share/templates/.source/emptydir
-}
diff --git a/kde-base/kdebase/kdebase-3.3.0.ebuild b/kde-base/kdebase/kdebase-3.3.0.ebuild
index dd3463e4d7c7..ff8cc5f97e75 100644
--- a/kde-base/kdebase/kdebase-3.3.0.ebuild
+++ b/kde-base/kdebase/kdebase-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/kdebase/kdebase-3.3.0.ebuild,v 1.8 2004/09/07 14:19:14 carlo Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kdebase/kdebase-3.3.0.ebuild,v 1.9 2004/09/09 15:44:30 caleb Exp $
 
 inherit kde-dist eutils
 
 DESCRIPTION="KDE base packages: the desktop, panel, window manager, konqueror..."
 
-KEYWORDS="~x86 ~amd64 ppc64 ~mips ~sparc ppc"
+KEYWORDS="x86 ~amd64 ppc64 ~mips ~sparc ppc"
 IUSE="ldap pam cups ssl opengl samba java arts"
 
 DEPEND="ldap? ( net-nds/openldap )
diff --git a/kde-base/kdebase/kdebase-3.3.0_rc2.ebuild b/kde-base/kdebase/kdebase-3.3.0_rc2.ebuild
deleted file mode 100644
index 9472754dea59..000000000000
--- a/kde-base/kdebase/kdebase-3.3.0_rc2.ebuild
+++ /dev/null
@@ -1,118 +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/kdebase/kdebase-3.3.0_rc2.ebuild,v 1.1 2004/08/10 14:51:04 caleb Exp $
-
-inherit kde-dist eutils
-
-DESCRIPTION="KDE base packages: the desktop, panel, window manager, konqueror..."
-
-KEYWORDS="~x86 ~amd64"
-IUSE="ldap pam cups ssl opengl samba java arts"
-
-DEPEND="ldap? ( net-nds/openldap )
-	pam? ( sys-libs/pam )
-	cups? ( net-print/cups )
-	ssl? ( dev-libs/openssl )
-	opengl? ( virtual/opengl )
-	samba? ( >=net-fs/samba-3.0.1 )
-	java? ( || ( virtual/jdk virtual/jre ) )
-	arts? ( ~kde-base/arts-${PV//3.3/1.3} )"
-RDEPEND="${DEPEND}
-	sys-apps/eject"
-
-src_unpack() {
-	kde_src_unpack
-	epatch ${FILESDIR}/${PVR}/startkde-${PVR}-gentoo.diff
-}
-
-src_compile() {
-	myconf="$myconf --with-dpms"
-	myconf="$myconf `use_with ldap` `use_with cups`"
-	myconf="$myconf `use_with opengl gl` `use_with ssl`"
-	myconf="$myconf `use_with arts`"
-
-	use pam \
-		&& myconf="$myconf --with-pam=yes" \
-		|| myconf="$myconf --with-pam=no --with-shadow"
-
-	if use java ; then
-		if has_version virtual/jdk ; then
-			myconf="$myconf --with-java=$(java-config --jdk-home)"
-		else
-			myconf="$myconf --with-java=$(java-config --jre-home)"
-		fi
-	else
-		myconf="$myconf --without-java"
-	fi
-
-	kde_src_compile myconf configure
-	kde_remove_flag kdm/kfrontend -fomit-frame-pointer
-	kde_src_compile make
-}
-
-src_install() {
-	kde_src_install
-	cd ${S}/kdm && make DESTDIR=${D} GENKDMCONF_FLAGS="--no-old --no-backup" install
-
-	insinto /etc/pam.d
-	newins ${FILESDIR}/kde.pam kde
-	newins ${FILESDIR}/kde-np.pam kde-np
-
-	# startkde script
-	cd ${D}/${KDEDIR}/bin
-	mv startkde startkde.orig
-	sed -e "s:_KDEDIR_:${KDEDIR}:" startkde.orig > startkde
-	rm startkde.orig
-	chmod a+x startkde
-
-	# startup and shutdown scripts
-	dodir ${KDEDIR}/env
-	dodir ${KDEDIR}/shutdown
-	cp -a ${FILESDIR}/agent-startup.sh ${D}/${KDEDIR}/env
-	cp -a ${FILESDIR}/agent-shutdown.sh ${D}/${KDEDIR}/shutdown
-
-	# kcontrol modules
-	cd ${D}/${KDEDIR}/etc/xdg/menus
-	ln -s default_kde-settings.menu kde-settings.menu
-	ln -s default_kde-information.menu kde-information.menu
-	ln -s default_kde-screensavers.menu kde-screensavers.menu
-
-	# x11 session script
-	cd ${T}
-	echo "#!/bin/sh
-${KDEDIR}/bin/startkde" > kde-${PV}
-	chmod a+x kde-${PV}
-	exeinto /etc/X11/Sessions
-	doexe kde-${PV}
-
-	cd ${D}/${KDEDIR}/share/config/kdm || die
-	dodir ${KDEDIR}/share/config/kdm/sessions
-	sed -e "s:_PREFIX_:${PREFIX}:g" \
-	    -e "s:_RANDOM_:${RANDOM}${RANDOM}:g" \
-	${FILESDIR}/${PVR}/kdmrc > kdmrc
-	sed -e "s:_PREFIX_:${PREFIX}:g" ${FILESDIR}/${PVR}/Xsetup > Xsetup
-
-	cp ${FILESDIR}/${PVR}/backgroundrc .
-
-	#backup splashscreen images, so they can be put back when unmerging
-	#mosfet or so.
-	if [ ! -d ${KDEDIR}/share/apps/ksplash.default ]
-	then
-		cd ${D}/${KDEDIR}/share/apps
-		cp -rf ksplash/ ksplash.default
-	fi
-
-	# Show gnome icons when choosing new icon for desktop shortcut
-	dodir /usr/share/pixmaps
-	mv ${D}/${KDEDIR}/share/apps/kdesktop/pics/* ${D}/usr/share/pixmaps/
-	rm -rf ${D}/${KDEDIR}/share/apps/kdesktop/pics/
-	cd ${D}/${KDEDIR}/share/apps/kdesktop/
-	ln -sf /usr/share/pixmaps/ pics
-
-	rmdir ${D}/${KDEDIR}/share/templates/.source/emptydir
-
-}
-
-pkg_postinst() {
-	mkdir -p ${KDEDIR}/share/templates/.source/emptydir
-}