3.3.0 final

9 files changed, 70 insertions, 56 deletions

diff --git a/kde-base/kdebase/ChangeLog b/kde-base/kdebase/ChangeLog
index 6505b85a12f8..88f26b4e6ddf 100644
--- a/kde-base/kdebase/ChangeLog
+++ b/kde-base/kdebase/ChangeLog
@@ -1,6 +1,13 @@
 # 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.141 2004/08/10 14:51:04 caleb Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kdebase/ChangeLog,v 1.142 2004/08/19 14:23:00 caleb Exp $
+
+  19 Aug 2004; Caleb Tennis <caleb@gentoo.org> kdebase-3.3.0_beta2.ebuild,
+  files/3.3.0/Xsetup, files/3.3.0/backgroundrc, files/3.3.0/kdmrc,
+  files/3.3.0/startkde-3.3.0-gentoo.diff, files/3.3.0_beta2/Xsetup,
+  files/3.3.0_beta2/backgroundrc, files/3.3.0_beta2/kdmrc,
+  files/3.3.0_beta2/startkde-3.3.0_beta2-gentoo.diff:
+  3.3.0 final
 
 *kdebase-3.3.0_rc2 (10 Aug 2004)
 
diff --git a/kde-base/kdebase/Manifest b/kde-base/kdebase/Manifest
index bce067d176b8..79bb2828d580 100644
--- a/kde-base/kdebase/Manifest
+++ b/kde-base/kdebase/Manifest
@@ -1,60 +1,62 @@
-MD5 b8c975cc9b2a1c7c0db22775c4e5f480 ChangeLog 25376
-MD5 b48e5f8d54a613ad906d06a21e8349a2 kdebase-3.1.5.ebuild 3623
+MD5 065218d3912f2995ec58f157df8f17a3 kdebase-3.2.3.ebuild 3281
+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 46513a5bdd0b3a04b9d1016246abe95d kdebase-3.3.0.ebuild 3282
 MD5 3a42711432882f7dfe32aeec2f454ed7 kdebase-3.2.1.ebuild 3653
+MD5 b8c975cc9b2a1c7c0db22775c4e5f480 ChangeLog 25376
 MD5 14889ab75f97d76e58b0c1154e7683a9 metadata.xml 161
-MD5 1346582446d8d61097aaed2115b05adf kdebase-3.2.2.ebuild 3346
-MD5 46513a5bdd0b3a04b9d1016246abe95d kdebase-3.3.0_rc2.ebuild 3282
-MD5 065218d3912f2995ec58f157df8f17a3 kdebase-3.2.3.ebuild 3281
 MD5 b3184422a2ab9890a87e73e4e0d7cc91 kdebase-3.3.0_beta2.ebuild 3201
-MD5 c64c277192a1d2b415f4f9dfdd02dd7c kdebase-3.2.3-r1.ebuild 3371
-MD5 daa284d6a1f62c5c73deb8aeda9df57d files/digest-kdebase-3.2.3 68
-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 2b5419b0b173138e22fe03f4157d5660 files/kde-np.pam 379
-MD5 b048371a651391ef2bb4166e40e6adff files/kde.pam 405
+MD5 b48e5f8d54a613ad906d06a21e8349a2 kdebase-3.1.5.ebuild 3623
+MD5 ffad4f0170b80acc01e931ea21d3d4d4 files/utils.h.diff 343
 MD5 9b4df4afee8c5f857c91799f415a4ab2 files/kdebase-3.1.5-amd64-accessviol.patch 836
+MD5 b048371a651391ef2bb4166e40e6adff files/kde.pam 405
 MD5 160f44a51f4308c9c21052fd21c7d04d files/kdebase-3.2.0-kcontrol.patch 699
 MD5 6eb40b28a36f889d0f1919cdbf160ef7 files/kscreensaver.pam 79
-MD5 7a15aed698aee6f910a32b6fb7a1e8dd files/digest-kdebase-3.2.2 68
-MD5 2eb15d4b93c483b634ea34475d91e79b files/kdebase-3.2.2-genkdmconf.c.diff 1082
+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 ffad4f0170b80acc01e931ea21d3d4d4 files/utils.h.diff 343
+MD5 2b5419b0b173138e22fe03f4157d5660 files/kde-np.pam 379
 MD5 93966c9ed1c9c8d61604f5cffb8bf9b8 files/digest-kdebase-3.3.0_beta2 69
-MD5 ca0fc4bf60b72dd1b8d42cb7e2be5a75 files/agent-shutdown.sh 204
 MD5 510d05672fcad238e92db44fbfa65f89 files/agent-startup.sh 209
-MD5 daa284d6a1f62c5c73deb8aeda9df57d files/digest-kdebase-3.2.3-r1 68
+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 2eb15d4b93c483b634ea34475d91e79b files/kdebase-3.2.2-genkdmconf.c.diff 1082
 MD5 a60fd1628607d4abdeb930662d126171 files/post-3.2.3-kdebase-htmlframes.patch 6728
-MD5 2f1f31f38b93136baeb537500c8cfabc files/3.1.5/backgroundrc 342
+MD5 9adecda5cdf6951ea0bcb6515c21a38b files/3.3.0_rc2/kdmrc 18202
+MD5 2f1f31f38b93136baeb537500c8cfabc files/3.3.0_rc2/backgroundrc 342
+MD5 3403677f5c4e44815c5a97c507d4f117 files/3.3.0_rc2/Xsetup 758
+MD5 e0c938e08649001554fc8354fcd0e4e6 files/3.3.0_rc2/startkde-3.3.0_rc2-gentoo.diff 1504
 MD5 7db6d7353b1bfbb47d44e9df63be1410 files/3.1.5/kdmrc 17661
+MD5 2f1f31f38b93136baeb537500c8cfabc files/3.1.5/backgroundrc 342
 MD5 5074351f4d8a0b3870a60751f58aaa06 files/3.1.5/startkde-3.1.5-gentoo.diff 1878
+MD5 9adecda5cdf6951ea0bcb6515c21a38b files/3.2.0/kdmrc 18202
 MD5 2f1f31f38b93136baeb537500c8cfabc files/3.2.0/backgroundrc 342
 MD5 3403677f5c4e44815c5a97c507d4f117 files/3.2.0/Xsetup 758
-MD5 9adecda5cdf6951ea0bcb6515c21a38b files/3.2.0/kdmrc 18202
 MD5 0faaf9eacb170e30dae8818f927b2934 files/3.2.0/startkde-3.2.0-gentoo.diff 1923
+MD5 9adecda5cdf6951ea0bcb6515c21a38b files/3.2.1/kdmrc 18202
 MD5 2f1f31f38b93136baeb537500c8cfabc files/3.2.1/backgroundrc 342
 MD5 3403677f5c4e44815c5a97c507d4f117 files/3.2.1/Xsetup 758
-MD5 9adecda5cdf6951ea0bcb6515c21a38b files/3.2.1/kdmrc 18202
 MD5 0faaf9eacb170e30dae8818f927b2934 files/3.2.1/startkde-3.2.1-gentoo.diff 1923
-MD5 2f1f31f38b93136baeb537500c8cfabc files/3.2.2/backgroundrc 342
-MD5 3403677f5c4e44815c5a97c507d4f117 files/3.2.2/Xsetup 758
 MD5 9adecda5cdf6951ea0bcb6515c21a38b files/3.2.2/kdmrc 18202
 MD5 0faaf9eacb170e30dae8818f927b2934 files/3.2.2/startkde-3.2.2-gentoo.diff 1923
+MD5 2f1f31f38b93136baeb537500c8cfabc files/3.2.2/backgroundrc 342
+MD5 3403677f5c4e44815c5a97c507d4f117 files/3.2.2/Xsetup 758
+MD5 9adecda5cdf6951ea0bcb6515c21a38b files/3.2.3/kdmrc 18202
 MD5 2f1f31f38b93136baeb537500c8cfabc files/3.2.3/backgroundrc 342
 MD5 3403677f5c4e44815c5a97c507d4f117 files/3.2.3/Xsetup 758
-MD5 9adecda5cdf6951ea0bcb6515c21a38b files/3.2.3/kdmrc 18202
 MD5 0faaf9eacb170e30dae8818f927b2934 files/3.2.3/startkde-3.2.3-gentoo.diff 1923
-MD5 2f1f31f38b93136baeb537500c8cfabc files/3.3.0_beta2/backgroundrc 342
-MD5 3403677f5c4e44815c5a97c507d4f117 files/3.3.0_beta2/Xsetup 758
-MD5 9adecda5cdf6951ea0bcb6515c21a38b files/3.3.0_beta2/kdmrc 18202
-MD5 fd94a04c116a96b4fdee387b7921699e files/3.3.0_beta2/startkde-3.3.0_beta2-gentoo.diff 1561
+MD5 9adecda5cdf6951ea0bcb6515c21a38b files/3.3.0/kdmrc 18202
+MD5 2f1f31f38b93136baeb537500c8cfabc files/3.3.0/backgroundrc 342
+MD5 3403677f5c4e44815c5a97c507d4f117 files/3.3.0/Xsetup 758
+MD5 e0c938e08649001554fc8354fcd0e4e6 files/3.3.0/startkde-3.3.0-gentoo.diff 1504
+MD5 0faaf9eacb170e30dae8818f927b2934 files/3.2.3-r1/startkde-3.2.3-r1-gentoo.diff 1923
+MD5 9adecda5cdf6951ea0bcb6515c21a38b files/3.2.3-r1/kdmrc 18202
 MD5 2f1f31f38b93136baeb537500c8cfabc files/3.2.3-r1/backgroundrc 342
 MD5 3403677f5c4e44815c5a97c507d4f117 files/3.2.3-r1/Xsetup 758
-MD5 9adecda5cdf6951ea0bcb6515c21a38b files/3.2.3-r1/kdmrc 18202
-MD5 0faaf9eacb170e30dae8818f927b2934 files/3.2.3-r1/startkde-3.2.3-r1-gentoo.diff 1923
-MD5 2f1f31f38b93136baeb537500c8cfabc files/3.3.0_rc2/backgroundrc 342
-MD5 3403677f5c4e44815c5a97c507d4f117 files/3.3.0_rc2/Xsetup 758
-MD5 9adecda5cdf6951ea0bcb6515c21a38b files/3.3.0_rc2/kdmrc 18202
-MD5 e0c938e08649001554fc8354fcd0e4e6 files/3.3.0_rc2/startkde-3.3.0_rc2-gentoo.diff 1504
diff --git a/kde-base/kdebase/files/3.3.0_beta2/Xsetup b/kde-base/kdebase/files/3.3.0/Xsetup
index 427ed61d709b..427ed61d709b 100644
--- a/kde-base/kdebase/files/3.3.0_beta2/Xsetup
+++ b/kde-base/kdebase/files/3.3.0/Xsetup
diff --git a/kde-base/kdebase/files/3.3.0_beta2/backgroundrc b/kde-base/kdebase/files/3.3.0/backgroundrc
index d00db3a27bff..d00db3a27bff 100644
--- a/kde-base/kdebase/files/3.3.0_beta2/backgroundrc
+++ b/kde-base/kdebase/files/3.3.0/backgroundrc
diff --git a/kde-base/kdebase/files/3.3.0_beta2/kdmrc b/kde-base/kdebase/files/3.3.0/kdmrc
index ba853ca21534..ba853ca21534 100644
--- a/kde-base/kdebase/files/3.3.0_beta2/kdmrc
+++ b/kde-base/kdebase/files/3.3.0/kdmrc
diff --git a/kde-base/kdebase/files/3.3.0_beta2/startkde-3.3.0_beta2-gentoo.diff b/kde-base/kdebase/files/3.3.0/startkde-3.3.0-gentoo.diff
index 4c8234623b36..b14fc53723e1 100644
--- a/kde-base/kdebase/files/3.3.0_beta2/startkde-3.3.0_beta2-gentoo.diff
+++ b/kde-base/kdebase/files/3.3.0/startkde-3.3.0-gentoo.diff
@@ -1,11 +1,11 @@
---- startkde.orig	2004-05-24 19:52:04.536984592 -0500
-+++ startkde	2004-05-24 19:53:32.712579864 -0500
-@@ -1,8 +1,31 @@
+--- startkde.orig	2004-08-06 09:37:38.231823856 -0500
++++ startkde	2004-08-06 09:40:04.372607080 -0500
+@@ -1,8 +1,32 @@
 -#!/bin/sh
 +#!/bin/sh --login
  #
 -#  DEFAULT KDE STARTUP SCRIPT ( KDE-3.3 )
-+#  GENTOO CUSTOMIZED KDE STARTUP SCRIPT ( KDE-3.3 )
++#  GENTOO CUSTOMIZED STARTUP SCRIPT ( KDE-3.3 )
  #
  
 +# Gentoo part:
@@ -20,6 +20,8 @@
 +if [ ! -e .kde3.3 ]; then
 +       if [ -e .kde3.2 ]; then
 +               /bin/cp -r .kde3.2 .kde3.3
++
++               /bin/cp -r .kde3.2 .kde3.3
 +       else
 +               /bin/mkdir .kde3.3
 +       fi
@@ -30,22 +32,21 @@
 +
 +# Gentoo part ends
 +
-+
  # When the X server dies we get a HUP signal from xinit. We must ignore it
  # because we still need to do some cleanup.
  trap 'echo GOT SIGHUP' HUP
-@@ -144,12 +167,12 @@
- # especially necessary on slow machines, where starting KDE takes one or two
- # minutes until anything appears on the screen.
- #
+@@ -14,12 +38,12 @@
+ 	exit 1
+ fi
+ 
 -# Set the background to plain grey.
 +# Set the background to plain cyan.
  # The standard X background is nasty, causing moire effects and exploding
  # people's heads. We use colours from the standard KDE palette for those with
  # palettised displays.
+ if test -z "$XDM_MANAGED" || echo "$XDM_MANAGED" | grep ",auto" > /dev/null; then
+-  xsetroot -solid "#C0C0C0"
++  xsetroot -solid "#5477A0"
+ fi
  
--test "$XDM_MANAGED" || bkg="-solid #C0C0C0"
-+test "$XDM_MANAGED" || bkg="-solid #5477A0"
- xsetroot -cursor_name left_ptr $bkg
- 
- # Get Ghostscript to look into user's KDE fonts dir for additional Fontmap
+ # we have to unset this for Darwin since it will screw up KDE's dynamic-loading
diff --git a/kde-base/kdebase/files/digest-kdebase-3.3.0 b/kde-base/kdebase/files/digest-kdebase-3.3.0
new file mode 100644
index 000000000000..98e0e99fefd9
--- /dev/null
+++ b/kde-base/kdebase/files/digest-kdebase-3.3.0
@@ -0,0 +1 @@
+MD5 e8fc098ffb09fcc0a8fdc4446149a8e3 kdebase-3.3.0.tar.bz2 19849208
diff --git a/kde-base/kdebase/files/digest-kdebase-3.3.0_beta2 b/kde-base/kdebase/files/digest-kdebase-3.3.0_beta2
deleted file mode 100644
index 186522a9c3a1..000000000000
--- a/kde-base/kdebase/files/digest-kdebase-3.3.0_beta2
+++ /dev/null
@@ -1 +0,0 @@
-MD5 550f3e52c733c842f645f0480cedc60e kdebase-3.2.92.tar.bz2 18102640
diff --git a/kde-base/kdebase/kdebase-3.3.0_beta2.ebuild b/kde-base/kdebase/kdebase-3.3.0.ebuild
index b3c9bc584b4e..c1168019722a 100644
--- a/kde-base/kdebase/kdebase-3.3.0_beta2.ebuild
+++ b/kde-base/kdebase/kdebase-3.3.0.ebuild
@@ -1,17 +1,16 @@
 # 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_beta2.ebuild,v 1.2 2004/07/28 13:38:17 caleb Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kdebase/kdebase-3.3.0.ebuild,v 1.1 2004/08/19 14:23:01 caleb Exp $
 
 inherit kde-dist eutils
 
 DESCRIPTION="KDE base packages: the desktop, panel, window manager, konqueror..."
 
 KEYWORDS="~x86 ~amd64"
-IUSE="ldap pam motif cups ssl opengl samba java arts"
+IUSE="ldap pam cups ssl opengl samba java arts"
 
 DEPEND="ldap? ( net-nds/openldap )
 	pam? ( sys-libs/pam )
-	motif? ( x11-libs/openmotif )
 	cups? ( net-print/cups )
 	ssl? ( dev-libs/openssl )
 	opengl? ( virtual/opengl )
@@ -23,12 +22,12 @@ RDEPEND="${DEPEND}
 
 src_unpack() {
 	kde_src_unpack
+	epatch ${FILESDIR}/${PVR}/startkde-${PVR}-gentoo.diff
 }
 
 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 --with-dpms"
+	myconf="$myconf `use_with ldap` `use_with cups`"
 	myconf="$myconf `use_with opengl gl` `use_with ssl`"
 	myconf="$myconf `use_with arts`"
 
@@ -61,12 +60,17 @@ src_install() {
 
 	# 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
 
+	# 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