Add dependency over xinit or x11 for the xdm init.d script. Thanks to Michael Weyershäuser for reporting.

Package-Manager: portage-2.1.1_pre1-r3

7 files changed, 20 insertions, 589 deletions

diff --git a/kde-base/kdebase/Manifest b/kde-base/kdebase/Manifest
index 0d2844ff2824..126a1ab44e52 100644
--- a/kde-base/kdebase/Manifest
+++ b/kde-base/kdebase/Manifest
@@ -149,30 +149,22 @@ EBUILD kdebase-3.4.3-r2.ebuild 4836 RMD160 78c3cd948ec202e87b3493c61628a62c7ab9e
 MD5 d94fe8dddc0080a078a2eba843f1236f kdebase-3.4.3-r2.ebuild 4836
 RMD160 78c3cd948ec202e87b3493c61628a62c7ab9e6e8 kdebase-3.4.3-r2.ebuild 4836
 SHA256 1cd7db0a651c92e7407f2130f679f95486c5fc70d49a997d04d9cea79a2bf455 kdebase-3.4.3-r2.ebuild 4836
-EBUILD kdebase-3.5.2-r1.ebuild 5228 RMD160 e0bed75c70f19ef9bb26bace924ad1315441613d SHA1 d60e3a798030c8480cca97e3ccb91e6a26dacdc5 SHA256 c2f60a37e508ad7bf38a05eb339c7c30698c574e7919835a324848446bb6cc18
-MD5 02dd37d145144633c70f8b9fc3e32489 kdebase-3.5.2-r1.ebuild 5228
-RMD160 e0bed75c70f19ef9bb26bace924ad1315441613d kdebase-3.5.2-r1.ebuild 5228
-SHA256 c2f60a37e508ad7bf38a05eb339c7c30698c574e7919835a324848446bb6cc18 kdebase-3.5.2-r1.ebuild 5228
-EBUILD kdebase-3.5.2-r2.ebuild 5657 RMD160 42c193868a3cd854f7190be55fbd3d292672de1b SHA1 a283d488832aebee440100e69a8f3401145544a8 SHA256 79fd0ddcd6ad78499f59e3465644983ae83f05af9296707309a4aa79fd481c1b
-MD5 bf41c6ab448eb7c09bf01ac4366323b6 kdebase-3.5.2-r2.ebuild 5657
-RMD160 42c193868a3cd854f7190be55fbd3d292672de1b kdebase-3.5.2-r2.ebuild 5657
-SHA256 79fd0ddcd6ad78499f59e3465644983ae83f05af9296707309a4aa79fd481c1b kdebase-3.5.2-r2.ebuild 5657
-EBUILD kdebase-3.5.3-r1.ebuild 5233 RMD160 585aea43080d9f5887a20916dae57e835a7504fe SHA1 8e97fa1a848468019356b7ca7d59850e11a5eef0 SHA256 1357a2ce8870d09a541325f4e5bbd11c8752f99ca2871921ee48d368a71ef578
-MD5 7087bcd6c8effbf29ab1220e43e0480f kdebase-3.5.3-r1.ebuild 5233
-RMD160 585aea43080d9f5887a20916dae57e835a7504fe kdebase-3.5.3-r1.ebuild 5233
-SHA256 1357a2ce8870d09a541325f4e5bbd11c8752f99ca2871921ee48d368a71ef578 kdebase-3.5.3-r1.ebuild 5233
-EBUILD kdebase-3.5.3-r2.ebuild 5682 RMD160 5aa8f5f6f4bf5c67914dd482b18384f21997f68f SHA1 355a8974d556123948892d70d3c8ac5f4e07b28f SHA256 f2d1db685c6e55361120481a072db8cbc32139ad5e0f5dfa033b2cecbac32234
-MD5 784f577f7a6841d8042b8ee3feef22bb kdebase-3.5.3-r2.ebuild 5682
-RMD160 5aa8f5f6f4bf5c67914dd482b18384f21997f68f kdebase-3.5.3-r2.ebuild 5682
-SHA256 f2d1db685c6e55361120481a072db8cbc32139ad5e0f5dfa033b2cecbac32234 kdebase-3.5.3-r2.ebuild 5682
-EBUILD kdebase-3.5.3.ebuild 5133 RMD160 e0a2aa3dd8d8830d49a200daec972be2d3f9f907 SHA1 e89fcd27ee1c35136609208a4c64fe6da008846f SHA256 98964be608142410978e523371a009b4755ab7bf77cc4be3e4c7bbd994e68dc7
-MD5 968bdb01893c00eac99aa022f3238c08 kdebase-3.5.3.ebuild 5133
-RMD160 e0a2aa3dd8d8830d49a200daec972be2d3f9f907 kdebase-3.5.3.ebuild 5133
-SHA256 98964be608142410978e523371a009b4755ab7bf77cc4be3e4c7bbd994e68dc7 kdebase-3.5.3.ebuild 5133
-MISC ChangeLog 50496 RMD160 f409a64124771402715387dd9571560862958744 SHA1 f0e0e095af41ef7f01cbfcdb5f6cd68a3fc19c03 SHA256 5d064d0540fa62c1ac6e11f0547bc1f3b8b5c499b70e9add1be8735b8575ccfa
-MD5 544ede42d2869d1c4328f675ee3b3b95 ChangeLog 50496
-RMD160 f409a64124771402715387dd9571560862958744 ChangeLog 50496
-SHA256 5d064d0540fa62c1ac6e11f0547bc1f3b8b5c499b70e9add1be8735b8575ccfa ChangeLog 50496
+EBUILD kdebase-3.5.2-r2.ebuild 5618 RMD160 9389ea95288bd3a46aaba5bcc2102f2f73419ea1 SHA1 67647e182c3257bbf093dc00eab89491029dd9f0 SHA256 8ad4c57da013d885c2d1ad5e70577c55cd51d9ff3d967e2ea681746c7c5e7188
+MD5 31c31b5c12fd53b436f2e5650c1ca568 kdebase-3.5.2-r2.ebuild 5618
+RMD160 9389ea95288bd3a46aaba5bcc2102f2f73419ea1 kdebase-3.5.2-r2.ebuild 5618
+SHA256 8ad4c57da013d885c2d1ad5e70577c55cd51d9ff3d967e2ea681746c7c5e7188 kdebase-3.5.2-r2.ebuild 5618
+EBUILD kdebase-3.5.3-r2.ebuild 5643 RMD160 8dfb2d3a3f85c3cdce88454cf7ce61eaa99fd00c SHA1 ea8313104b02a33aa4280d44a0a61458d13d31f4 SHA256 bf423768410f046f3177887052e420c51c63c5d4bce79f2668f3967a6ca14132
+MD5 648d1786efec3c6b4931299d35584e4d kdebase-3.5.3-r2.ebuild 5643
+RMD160 8dfb2d3a3f85c3cdce88454cf7ce61eaa99fd00c kdebase-3.5.3-r2.ebuild 5643
+SHA256 bf423768410f046f3177887052e420c51c63c5d4bce79f2668f3967a6ca14132 kdebase-3.5.3-r2.ebuild 5643
+MISC ChangeLog 50790 RMD160 971294b2f3e3efd79adfac834ac8562ee8c38a30 SHA1 66ad81eab7e3ec198c146feaec3715fc2185124d SHA256 07730abecb4a971db8859f5865acff4184f3631f68beb2353f9f7fa1e819d4ad
+MD5 5cedb7131fc82cfa7b42a6dfa9cd65a7 ChangeLog 50790
+RMD160 971294b2f3e3efd79adfac834ac8562ee8c38a30 ChangeLog 50790
+SHA256 07730abecb4a971db8859f5865acff4184f3631f68beb2353f9f7fa1e819d4ad ChangeLog 50790
+MISC kdebase-3.5.2-r2.ebuild.orig 5657 RMD160 42c193868a3cd854f7190be55fbd3d292672de1b SHA1 a283d488832aebee440100e69a8f3401145544a8 SHA256 79fd0ddcd6ad78499f59e3465644983ae83f05af9296707309a4aa79fd481c1b
+MD5 bf41c6ab448eb7c09bf01ac4366323b6 kdebase-3.5.2-r2.ebuild.orig 5657
+RMD160 42c193868a3cd854f7190be55fbd3d292672de1b kdebase-3.5.2-r2.ebuild.orig 5657
+SHA256 79fd0ddcd6ad78499f59e3465644983ae83f05af9296707309a4aa79fd481c1b kdebase-3.5.2-r2.ebuild.orig 5657
 MISC metadata.xml 156 RMD160 ecce3b981f150c45ae1e84e2d208e678d6124259 SHA1 b64f7c0b4e5db816d82ad19848f72118af129d35 SHA256 2f4da28506b9d4185f320f67a6191d30c7a921217ed4447ed46ea0bc4aefc79a
 MD5 acc03a4b12bb0433a57e95bd253b9501 metadata.xml 156
 RMD160 ecce3b981f150c45ae1e84e2d208e678d6124259 metadata.xml 156
@@ -192,25 +184,16 @@ SHA256 bc0f7395f8e3b395abdf83f42fa37ebd33e360fcf0dcc0f9f005c8ff27985ce9 files/di
 MD5 0184373f3e56dc9e5d65ba8365d672f1 files/digest-kdebase-3.4.3-r2 527
 RMD160 669ceee672ec4178631a5005aaba3bef9b49a2e1 files/digest-kdebase-3.4.3-r2 527
 SHA256 bc0f7395f8e3b395abdf83f42fa37ebd33e360fcf0dcc0f9f005c8ff27985ce9 files/digest-kdebase-3.4.3-r2 527
-MD5 9526835ce0df4969357f33b5b41721d0 files/digest-kdebase-3.5.2-r1 783
-RMD160 9b0ae8742c57884753f25b1892622ae8a8c30d73 files/digest-kdebase-3.5.2-r1 783
-SHA256 597ab4944116d710976429afa6318b5eb3243417225fe3db430c63d2568dfcba files/digest-kdebase-3.5.2-r1 783
 MD5 9526835ce0df4969357f33b5b41721d0 files/digest-kdebase-3.5.2-r2 783
 RMD160 9b0ae8742c57884753f25b1892622ae8a8c30d73 files/digest-kdebase-3.5.2-r2 783
 SHA256 597ab4944116d710976429afa6318b5eb3243417225fe3db430c63d2568dfcba files/digest-kdebase-3.5.2-r2 783
-MD5 9ac2db0ffd1dd385ceaba456f341146f files/digest-kdebase-3.5.3 518
-RMD160 c47af94094e7e7f03e4c49271c2f6e5c538d332d files/digest-kdebase-3.5.3 518
-SHA256 3d411f328f154d83705712ff98823e5fac1601a2e982fa88bd6a40f55d47559e files/digest-kdebase-3.5.3 518
-MD5 e5d422ab46b203324d09b8b8f957fa1b files/digest-kdebase-3.5.3-r1 518
-RMD160 b477c2d21c44f0786da3e211bc1f67fc4ea6d3aa files/digest-kdebase-3.5.3-r1 518
-SHA256 05b7d585d8258240534ab25ee3b96612ca23965d341d35a8ba852ee755021074 files/digest-kdebase-3.5.3-r1 518
 MD5 e5d422ab46b203324d09b8b8f957fa1b files/digest-kdebase-3.5.3-r2 518
 RMD160 b477c2d21c44f0786da3e211bc1f67fc4ea6d3aa files/digest-kdebase-3.5.3-r2 518
 SHA256 05b7d585d8258240534ab25ee3b96612ca23965d341d35a8ba852ee755021074 files/digest-kdebase-3.5.3-r2 518
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.4.3 (GNU/Linux)
+Version: GnuPG v1.4.4 (GNU/Linux)
 
-iD8DBQFEmpDgAiZjviIA2XgRAuTpAJ9ksTwxhIS7jwY9IEGltL/fVE41AQCeNUG5
-TDD92LQPB7LwCa78+JBMGQg=
-=H9w5
+iD8DBQFEoeoQAiZjviIA2XgRAgiNAJsFXvrToZmaBtFXa94hbW7S1pNXsgCeOVzE
+43h8ivvtzS5XvsFIDsn2Q5o=
+=EXn+
 -----END PGP SIGNATURE-----
diff --git a/kde-base/kdebase/files/digest-kdebase-3.5.2-r1 b/kde-base/kdebase/files/digest-kdebase-3.5.2-r1
deleted file mode 100644
index 55c56022e98f..000000000000
--- a/kde-base/kdebase/files/digest-kdebase-3.5.2-r1
+++ /dev/null
@@ -1,9 +0,0 @@
-MD5 3e2318954d6f810815147acf0377e1e9 kdebase-3.5-patchset-01.tar.bz2 5552
-RMD160 196f2f57924ccab4109061794d09f579917f4ed1 kdebase-3.5-patchset-01.tar.bz2 5552
-SHA256 10b635594c7936f618abf3a9b41785fb1cb2c2d2a4be5bb889abff518b8e5ee0 kdebase-3.5-patchset-01.tar.bz2 5552
-MD5 9cf154e31d27902925386a9e0b5ef2ea kdebase-3.5.2-patchset.tar.bz2 5578
-RMD160 85656629b35a7aff41e96b1ffa464a38a377c281 kdebase-3.5.2-patchset.tar.bz2 5578
-SHA256 47db65bda783c05d8ede7ba1d598f0fcf92ab365ae2ba44475352eec5c3ba701 kdebase-3.5.2-patchset.tar.bz2 5578
-MD5 c5685e1be34e033286aa1f37002a0552 kdebase-3.5.2.tar.bz2 23590820
-RMD160 216ff59c49bb4fee2aa3b7d976ec40a8cccff107 kdebase-3.5.2.tar.bz2 23590820
-SHA256 21150b7e553e83487e70e70e3d13ce107c6c5d57133b40f413807887a9e431f7 kdebase-3.5.2.tar.bz2 23590820
diff --git a/kde-base/kdebase/files/digest-kdebase-3.5.3 b/kde-base/kdebase/files/digest-kdebase-3.5.3
deleted file mode 100644
index c57a28129d29..000000000000
--- a/kde-base/kdebase/files/digest-kdebase-3.5.3
+++ /dev/null
@@ -1,6 +0,0 @@
-MD5 3e2318954d6f810815147acf0377e1e9 kdebase-3.5-patchset-01.tar.bz2 5552
-RMD160 196f2f57924ccab4109061794d09f579917f4ed1 kdebase-3.5-patchset-01.tar.bz2 5552
-SHA256 10b635594c7936f618abf3a9b41785fb1cb2c2d2a4be5bb889abff518b8e5ee0 kdebase-3.5-patchset-01.tar.bz2 5552
-MD5 9cb6b8291c4f3f986e16f72129e8fcd0 kdebase-3.5.3.tar.bz2 23634194
-RMD160 ef55c72b97577dd86e5c64bf589ff9b2d556ec07 kdebase-3.5.3.tar.bz2 23634194
-SHA256 5a2b9bc5e2682684519dbae89b3bd73fbf5de1f1effd3ca072173a9638dc3ff8 kdebase-3.5.3.tar.bz2 23634194
diff --git a/kde-base/kdebase/files/digest-kdebase-3.5.3-r1 b/kde-base/kdebase/files/digest-kdebase-3.5.3-r1
deleted file mode 100644
index cfd18542a977..000000000000
--- a/kde-base/kdebase/files/digest-kdebase-3.5.3-r1
+++ /dev/null
@@ -1,6 +0,0 @@
-MD5 71b9ee636bc39514d3d445b7034b7aa7 kdebase-3.5-patchset-02.tar.bz2 7118
-RMD160 ea3c7215e68754e8acac03e9fafea8aa9c6d1202 kdebase-3.5-patchset-02.tar.bz2 7118
-SHA256 459e2ce09a7151fd5f52bf77570dccd2447f00a604dab65adf7dfb5da431ac1b kdebase-3.5-patchset-02.tar.bz2 7118
-MD5 9cb6b8291c4f3f986e16f72129e8fcd0 kdebase-3.5.3.tar.bz2 23634194
-RMD160 ef55c72b97577dd86e5c64bf589ff9b2d556ec07 kdebase-3.5.3.tar.bz2 23634194
-SHA256 5a2b9bc5e2682684519dbae89b3bd73fbf5de1f1effd3ca072173a9638dc3ff8 kdebase-3.5.3.tar.bz2 23634194
diff --git a/kde-base/kdebase/kdebase-3.5.2-r1.ebuild b/kde-base/kdebase/kdebase-3.5.2-r1.ebuild
deleted file mode 100644
index 396389c9f537..000000000000
--- a/kde-base/kdebase/kdebase-3.5.2-r1.ebuild
+++ /dev/null
@@ -1,178 +0,0 @@
-# Copyright 1999-2006 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kdebase/kdebase-3.5.2-r1.ebuild,v 1.13 2006/06/11 15:04:35 carlo Exp $
-
-inherit kde-dist eutils flag-o-matic
-
-SRC_URI="${SRC_URI}
-	mirror://gentoo/kdebase-3.5.2-patchset.tar.bz2
-	mirror://gentoo/kdebase-3.5-patchset-01.tar.bz2"
-
-DESCRIPTION="KDE base packages: the desktop, panel, window manager, konqueror..."
-
-KEYWORDS="alpha amd64 hppa ~ia64 ~mips ppc ppc64 sparc x86"
-IUSE="arts cups java ldap ieee1394 hal lm_sensors logitech-mouse openexr opengl
-pam samba ssl zeroconf xcomposite xscreensaver xinerama"
-# hal: enables hal backend for 'media:' ioslave
-
-DEPEND="arts? ( ~kde-base/arts-${PV} )
-	>=media-libs/freetype-2
-	media-libs/fontconfig
-	pam? ( kde-base/kdebase-pam )
-	>=dev-libs/cyrus-sasl-2
-	ldap? ( >=net-nds/openldap-2 )
-	cups? ( net-print/cups )
-	ssl? ( dev-libs/openssl )
-	opengl? ( virtual/opengl )
-	openexr? ( >=media-libs/openexr-1.2 )
-	samba? ( >=net-fs/samba-3.0.4 )
-	lm_sensors? ( sys-apps/lm_sensors )
-	logitech-mouse? ( >=dev-libs/libusb-0.1.10a )
-	ieee1394? ( sys-libs/libraw1394 )
-	hal? ( >=sys-apps/dbus-0.33
-	       =sys-apps/hal-0.5*
-		   sys-apps/pmount )
-	zeroconf? ( net-misc/mDNSResponder )
-	xcomposite? ( || ( (
-			x11-libs/libXcomposite
-			x11-libs/libXdamage
-			) <x11-base/xorg-x11-7 )
-		)
-	|| ( (
-			x11-libs/libX11
-			x11-libs/libXau
-			x11-libs/libXfixes
-			x11-libs/libXrender
-			x11-libs/libXtst
-			x11-libs/libXext
-			xscreensaver? ( x11-libs/libXScrnSaver )
-			xinerama? ( x11-libs/libXinerama )
-		) virtual/x11 )"
-
-RDEPEND="${DEPEND}
-	sys-apps/usbutils
-	java? ( >=virtual/jre-1.4 )
-	virtual/eject
-	|| ( (
-			x11-apps/xmessage
-			x11-apps/xsetroot
-			x11-apps/xset
-			x11-apps/xrandr
-			x11-apps/mkfontdir
-			|| ( x11-misc/xkeyboard-config x11-misc/xkbdata )
-			x11-apps/setxkbmap
-		) virtual/x11 )"
-
-DEPEND="${DEPEND}
-	xcomposite? ( || ( (
-			x11-proto/compositeproto
-			x11-proto/damageproto
-			) <x11-base/xorg-x11-7 )
-		)
-	|| ( (
-			xscreensaver? ( x11-proto/scrnsaverproto )
-			xinerama? ( x11-proto/xineramaproto )
-			x11-apps/bdftopcf
-		) virtual/x11 )
-	dev-util/pkgconfig"
-
-PATCHES="${WORKDIR}/kdebase-3.5.2-patchset.diff"
-
-src_unpack() {
-	kde_src_unpack
-
-	# Avoid using imake (kde bug 114466).
-	epatch "${WORKDIR}/patches/kdebase-3.5.0_beta2-noimake.patch"
-	rm -f ${S}/configure
-}
-
-src_compile() {
-	local myconf="--with-dpms
-	              $(use_with arts) $(use_with ldap)
-	              $(use_with opengl gl) $(use_with ssl)
-	              $(use_with samba) $(use_with openexr)
-	              $(use_with lm_sensors sensors) $(use_with logitech-mouse libusb)
-	              $(use_with ieee1394 libraw1394) $(use_with hal)
-	              $(use_enable zeroconf dnssd)
-				  $(use_with xcomposite composite)
-				  $(use_with xscreensaver)
-				  $(use_with xinerama)
-				  --with-usbids=/usr/share/misc/usb.ids"
-
-	if use pam; then
-		myconf="${myconf} --with-pam=yes"
-	else
-		myconf="${myconf} --with-pam=no --with-shadow"
-	fi
-
-	# the java test is problematic (see kde bug 100729) and
-	# useless. All that's needed for java applets to work is
-	# to have the 'java' executable in PATH.
-	myconf="${myconf} --without-java"
-
-	export BINDNOW_FLAGS="$(bindnow-flags)"
-
-	kde_src_compile
-}
-
-src_install() {
-	kde_src_install
-	cd ${S}/kdm && make DESTDIR=${D} GENKDMCONF_FLAGS="--no-old --no-backup --no-in-notice" install
-
-	# startup and shutdown scripts
-	insinto ${KDEDIR}/env
-	doins ${FILESDIR}/agent-startup.sh
-
-	exeinto ${KDEDIR}/shutdown
-	doexe ${FILESDIR}/agent-shutdown.sh
-
-	# freedesktop environment variables
-	cat <<EOF > ${T}/xdg.sh
-export XDG_DATA_DIRS="${KDEDIR}/share:/usr/share"
-export XDG_CONFIG_DIRS="${KDEDIR}/etc/xdg"
-EOF
-	insinto ${KDEDIR}/env
-	doins ${T}/xdg.sh
-
-	# x11 session script
-	cat <<EOF > ${T}/kde-${SLOT}
-#!/bin/sh
-exec ${KDEDIR}/bin/startkde
-EOF
-	exeinto /etc/X11/Sessions
-	doexe ${T}/kde-${SLOT}
-
-	# freedesktop compliant session script
-	sed -e "s:@KDE_BINDIR@:${KDEDIR}/bin:g;s:Name=KDE:Name=KDE ${SLOT}:" \
-		${S}/kdm/kfrontend/sessions/kde.desktop.in > ${T}/kde-${SLOT}.desktop
-	insinto /usr/share/xsessions
-	doins ${T}/kde-${SLOT}.desktop
-
-	# Customize the kdmrc configuration
-	sed -i -e "s:#SessionsDirs=:SessionsDirs=/usr/share/xsessions\n#SessionsDirs=:" \
-		${D}/${KDEDIR}/share/config/kdm/kdmrc || die
-
-	rmdir ${D}/${KDEDIR}/share/templates/.source/emptydir
-}
-
-pkg_postinst() {
-	# set the default kdm face icon if it's not already set by the system admin
-	if [ ! -e "${ROOT}${KDEDIR}/share/apps/kdm/faces/.default.face.icon" ]; then
-		mkdir -p "${ROOT}${KDEDIR}/share/apps/kdm/faces"
-		cp "${ROOT}${KDEDIR}/share/apps/kdm/pics/users/default1.png" \
-			"${ROOT}${KDEDIR}/share/apps/kdm/faces/.default.face.icon"
-	fi
-	if [ ! -e "${ROOT}${KDEDIR}/share/apps/kdm/faces/root.face.icon" ]; then
-		mkdir -p "${ROOT}${KDEDIR}/share/apps/kdm/faces"
-		cp "${ROOT}${KDEDIR}/share/apps/kdm/pics/users/root1.png" \
-			"${ROOT}${KDEDIR}/share/apps/kdm/faces/root.face.icon"
-	fi
-
-	mkdir -p ${ROOT}${KDEDIR}/share/templates/.source/emptydir
-
-	echo
-	einfo "To enable gpg-agent and/or ssh-agent in KDE sessions,"
-	einfo "edit ${KDEDIR}/env/agent-startup.sh and"
-	einfo "${KDEDIR}/shutdown/agent-shutdown.sh"
-	echo
-}
diff --git a/kde-base/kdebase/kdebase-3.5.3-r1.ebuild b/kde-base/kdebase/kdebase-3.5.3-r1.ebuild
deleted file mode 100644
index 1f04cb106f69..000000000000
--- a/kde-base/kdebase/kdebase-3.5.3-r1.ebuild
+++ /dev/null
@@ -1,178 +0,0 @@
-# Copyright 1999-2006 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kdebase/kdebase-3.5.3-r1.ebuild,v 1.1 2006/06/14 18:40:50 carlo Exp $
-
-inherit kde-dist eutils flag-o-matic
-
-SRC_URI="${SRC_URI}
-	mirror://gentoo/kdebase-3.5-patchset-02.tar.bz2"
-
-DESCRIPTION="KDE base packages: the desktop, panel, window manager, konqueror..."
-
-KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86"
-IUSE="arts cups java ldap ieee1394 hal lm_sensors logitech-mouse openexr opengl
-pam samba ssl zeroconf xcomposite xscreensaver xinerama"
-# hal: enables hal backend for 'media:' ioslave
-
-DEPEND="arts? ( ~kde-base/arts-${PV} )
-	>=media-libs/freetype-2
-	media-libs/fontconfig
-	pam? ( kde-base/kdebase-pam )
-	>=dev-libs/cyrus-sasl-2
-	ldap? ( >=net-nds/openldap-2 )
-	cups? ( net-print/cups )
-	ssl? ( dev-libs/openssl )
-	opengl? ( virtual/opengl )
-	openexr? ( >=media-libs/openexr-1.2 )
-	samba? ( >=net-fs/samba-3.0.4 )
-	lm_sensors? ( sys-apps/lm_sensors )
-	logitech-mouse? ( >=dev-libs/libusb-0.1.10a )
-	ieee1394? ( sys-libs/libraw1394 )
-	hal? ( >=sys-apps/dbus-0.33
-	       =sys-apps/hal-0.5*
-		   sys-apps/pmount )
-	zeroconf? ( net-misc/mDNSResponder )
-	xcomposite? ( || ( (
-			x11-libs/libXcomposite
-			x11-libs/libXdamage
-			) <x11-base/xorg-x11-7 )
-		)
-	|| ( (
-			x11-libs/libX11
-			x11-libs/libXau
-			x11-libs/libXfixes
-			x11-libs/libXrender
-			x11-libs/libXtst
-			x11-libs/libXext
-			xscreensaver? ( x11-libs/libXScrnSaver )
-			xinerama? ( x11-libs/libXinerama )
-		) virtual/x11 )"
-
-RDEPEND="${DEPEND}
-	sys-apps/usbutils
-	java? ( >=virtual/jre-1.4 )
-	virtual/eject
-	|| ( (
-			x11-apps/xmessage
-			x11-apps/xsetroot
-			x11-apps/xset
-			x11-apps/xrandr
-			x11-apps/mkfontdir
-			|| ( x11-misc/xkeyboard-config x11-misc/xkbdata )
-			x11-apps/setxkbmap
-		) virtual/x11 )"
-
-DEPEND="${DEPEND}
-	xcomposite? ( || ( (
-			x11-proto/compositeproto
-			x11-proto/damageproto
-			) <x11-base/xorg-x11-7 )
-		)
-	|| ( (
-			xscreensaver? ( x11-proto/scrnsaverproto )
-			xinerama? ( x11-proto/xineramaproto )
-			x11-apps/bdftopcf
-		) virtual/x11 )
-	dev-util/pkgconfig"
-
-src_unpack() {
-	kde_src_unpack
-
-	# Avoid using imake (kde bug 114466).
-	epatch "${WORKDIR}/patches/kdebase-3.5.0_beta2-noimake.patch"
-	rm -f ${S}/configure
-
-	# Fix KDM symlink vulnerability, bug #136201
-	epatch "${FILESDIR}/post-3.5.0-kdebase-kdm.diff"
-}
-
-src_compile() {
-	local myconf="--with-dpms
-	              $(use_with arts) $(use_with ldap)
-	              $(use_with opengl gl) $(use_with ssl)
-	              $(use_with samba) $(use_with openexr)
-	              $(use_with lm_sensors sensors) $(use_with logitech-mouse libusb)
-	              $(use_with ieee1394 libraw1394) $(use_with hal)
-	              $(use_enable zeroconf dnssd)
-				  $(use_with xcomposite composite)
-				  $(use_with xscreensaver)
-				  $(use_with xinerama)
-				  --with-usbids=/usr/share/misc/usb.ids"
-
-	if use pam; then
-		myconf="${myconf} --with-pam=yes"
-	else
-		myconf="${myconf} --with-pam=no --with-shadow"
-	fi
-
-	# the java test is problematic (see kde bug 100729) and
-	# useless. All that's needed for java applets to work is
-	# to have the 'java' executable in PATH.
-	myconf="${myconf} --without-java"
-
-	export BINDNOW_FLAGS="$(bindnow-flags)"
-
-	kde_src_compile
-}
-
-src_install() {
-	kde_src_install
-	cd ${S}/kdm && make DESTDIR=${D} GENKDMCONF_FLAGS="--no-old --no-backup --no-in-notice" install
-
-	# startup and shutdown scripts
-	insinto ${KDEDIR}/env
-	doins ${FILESDIR}/agent-startup.sh
-
-	exeinto ${KDEDIR}/shutdown
-	doexe ${FILESDIR}/agent-shutdown.sh
-
-	# freedesktop environment variables
-	cat <<EOF > ${T}/xdg.sh
-export XDG_DATA_DIRS="${KDEDIR}/share:/usr/share"
-export XDG_CONFIG_DIRS="${KDEDIR}/etc/xdg"
-EOF
-	insinto ${KDEDIR}/env
-	doins ${T}/xdg.sh
-
-	# x11 session script
-	cat <<EOF > ${T}/kde-${SLOT}
-#!/bin/sh
-exec ${KDEDIR}/bin/startkde
-EOF
-	exeinto /etc/X11/Sessions
-	doexe ${T}/kde-${SLOT}
-
-	# freedesktop compliant session script
-	sed -e "s:@KDE_BINDIR@:${KDEDIR}/bin:g;s:Name=KDE:Name=KDE ${SLOT}:" \
-		${S}/kdm/kfrontend/sessions/kde.desktop.in > ${T}/kde-${SLOT}.desktop
-	insinto /usr/share/xsessions
-	doins ${T}/kde-${SLOT}.desktop
-
-	# Customize the kdmrc configuration
-	sed -i -e "s:#SessionsDirs=:SessionsDirs=/usr/share/xsessions\n#SessionsDirs=:" \
-		${D}/${KDEDIR}/share/config/kdm/kdmrc || die
-
-	rmdir ${D}/${KDEDIR}/share/templates/.source/emptydir
-}
-
-pkg_postinst() {
-	# set the default kdm face icon if it's not already set by the system admin
-	if [ ! -e "${ROOT}${KDEDIR}/share/apps/kdm/faces/.default.face.icon" ]; then
-		mkdir -p "${ROOT}${KDEDIR}/share/apps/kdm/faces"
-		cp "${ROOT}${KDEDIR}/share/apps/kdm/pics/users/default1.png" \
-			"${ROOT}${KDEDIR}/share/apps/kdm/faces/.default.face.icon"
-	fi
-	if [ ! -e "${ROOT}${KDEDIR}/share/apps/kdm/faces/root.face.icon" ]; then
-		mkdir -p "${ROOT}${KDEDIR}/share/apps/kdm/faces"
-		cp "${ROOT}${KDEDIR}/share/apps/kdm/pics/users/root1.png" \
-			"${ROOT}${KDEDIR}/share/apps/kdm/faces/root.face.icon"
-	fi
-
-	mkdir -p ${ROOT}${KDEDIR}/share/templates/.source/emptydir
-
-	echo
-	einfo "To enable gpg-agent and/or ssh-agent in KDE sessions,"
-	einfo "edit ${KDEDIR}/env/agent-startup.sh and"
-	einfo "${KDEDIR}/shutdown/agent-shutdown.sh"
-	echo
-}
diff --git a/kde-base/kdebase/kdebase-3.5.3.ebuild b/kde-base/kdebase/kdebase-3.5.3.ebuild
deleted file mode 100644
index 4fbea81d9171..000000000000
--- a/kde-base/kdebase/kdebase-3.5.3.ebuild
+++ /dev/null
@@ -1,175 +0,0 @@
-# Copyright 1999-2006 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kdebase/kdebase-3.5.3.ebuild,v 1.2 2006/06/11 13:08:04 carlo Exp $
-
-inherit kde-dist eutils flag-o-matic
-
-SRC_URI="${SRC_URI}
-	mirror://gentoo/kdebase-3.5-patchset-01.tar.bz2"
-
-DESCRIPTION="KDE base packages: the desktop, panel, window manager, konqueror..."
-
-KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86"
-IUSE="arts cups java ldap ieee1394 hal lm_sensors logitech-mouse openexr opengl
-pam samba ssl zeroconf xcomposite xscreensaver xinerama"
-# hal: enables hal backend for 'media:' ioslave
-
-DEPEND="arts? ( ~kde-base/arts-${PV} )
-	>=media-libs/freetype-2
-	media-libs/fontconfig
-	pam? ( kde-base/kdebase-pam )
-	>=dev-libs/cyrus-sasl-2
-	ldap? ( >=net-nds/openldap-2 )
-	cups? ( net-print/cups )
-	ssl? ( dev-libs/openssl )
-	opengl? ( virtual/opengl )
-	openexr? ( >=media-libs/openexr-1.2 )
-	samba? ( >=net-fs/samba-3.0.4 )
-	lm_sensors? ( sys-apps/lm_sensors )
-	logitech-mouse? ( >=dev-libs/libusb-0.1.10a )
-	ieee1394? ( sys-libs/libraw1394 )
-	hal? ( >=sys-apps/dbus-0.33
-	       =sys-apps/hal-0.5*
-		   sys-apps/pmount )
-	zeroconf? ( net-misc/mDNSResponder )
-	xcomposite? ( || ( (
-			x11-libs/libXcomposite
-			x11-libs/libXdamage
-			) <x11-base/xorg-x11-7 )
-		)
-	|| ( (
-			x11-libs/libX11
-			x11-libs/libXau
-			x11-libs/libXfixes
-			x11-libs/libXrender
-			x11-libs/libXtst
-			x11-libs/libXext
-			xscreensaver? ( x11-libs/libXScrnSaver )
-			xinerama? ( x11-libs/libXinerama )
-		) virtual/x11 )"
-
-RDEPEND="${DEPEND}
-	sys-apps/usbutils
-	java? ( >=virtual/jre-1.4 )
-	virtual/eject
-	|| ( (
-			x11-apps/xmessage
-			x11-apps/xsetroot
-			x11-apps/xset
-			x11-apps/xrandr
-			x11-apps/mkfontdir
-			|| ( x11-misc/xkeyboard-config x11-misc/xkbdata )
-			x11-apps/setxkbmap
-		) virtual/x11 )"
-
-DEPEND="${DEPEND}
-	xcomposite? ( || ( (
-			x11-proto/compositeproto
-			x11-proto/damageproto
-			) <x11-base/xorg-x11-7 )
-		)
-	|| ( (
-			xscreensaver? ( x11-proto/scrnsaverproto )
-			xinerama? ( x11-proto/xineramaproto )
-			x11-apps/bdftopcf
-		) virtual/x11 )
-	dev-util/pkgconfig"
-
-src_unpack() {
-	kde_src_unpack
-
-	# Avoid using imake (kde bug 114466).
-	epatch "${WORKDIR}/patches/kdebase-3.5.0_beta2-noimake.patch"
-	rm -f ${S}/configure
-}
-
-src_compile() {
-	local myconf="--with-dpms
-	              $(use_with arts) $(use_with ldap)
-	              $(use_with opengl gl) $(use_with ssl)
-	              $(use_with samba) $(use_with openexr)
-	              $(use_with lm_sensors sensors) $(use_with logitech-mouse libusb)
-	              $(use_with ieee1394 libraw1394) $(use_with hal)
-	              $(use_enable zeroconf dnssd)
-				  $(use_with xcomposite composite)
-				  $(use_with xscreensaver)
-				  $(use_with xinerama)
-				  --with-usbids=/usr/share/misc/usb.ids"
-
-	if use pam; then
-		myconf="${myconf} --with-pam=yes"
-	else
-		myconf="${myconf} --with-pam=no --with-shadow"
-	fi
-
-	# the java test is problematic (see kde bug 100729) and
-	# useless. All that's needed for java applets to work is
-	# to have the 'java' executable in PATH.
-	myconf="${myconf} --without-java"
-
-	export BINDNOW_FLAGS="$(bindnow-flags)"
-
-	kde_src_compile
-}
-
-src_install() {
-	kde_src_install
-	cd ${S}/kdm && make DESTDIR=${D} GENKDMCONF_FLAGS="--no-old --no-backup --no-in-notice" install
-
-	# startup and shutdown scripts
-	insinto ${KDEDIR}/env
-	doins ${FILESDIR}/agent-startup.sh
-
-	exeinto ${KDEDIR}/shutdown
-	doexe ${FILESDIR}/agent-shutdown.sh
-
-	# freedesktop environment variables
-	cat <<EOF > ${T}/xdg.sh
-export XDG_DATA_DIRS="${KDEDIR}/share:/usr/share"
-export XDG_CONFIG_DIRS="${KDEDIR}/etc/xdg"
-EOF
-	insinto ${KDEDIR}/env
-	doins ${T}/xdg.sh
-
-	# x11 session script
-	cat <<EOF > ${T}/kde-${SLOT}
-#!/bin/sh
-exec ${KDEDIR}/bin/startkde
-EOF
-	exeinto /etc/X11/Sessions
-	doexe ${T}/kde-${SLOT}
-
-	# freedesktop compliant session script
-	sed -e "s:@KDE_BINDIR@:${KDEDIR}/bin:g;s:Name=KDE:Name=KDE ${SLOT}:" \
-		${S}/kdm/kfrontend/sessions/kde.desktop.in > ${T}/kde-${SLOT}.desktop
-	insinto /usr/share/xsessions
-	doins ${T}/kde-${SLOT}.desktop
-
-	# Customize the kdmrc configuration
-	sed -i -e "s:#SessionsDirs=:SessionsDirs=/usr/share/xsessions\n#SessionsDirs=:" \
-		${D}/${KDEDIR}/share/config/kdm/kdmrc || die
-
-	rmdir ${D}/${KDEDIR}/share/templates/.source/emptydir
-}
-
-pkg_postinst() {
-	# set the default kdm face icon if it's not already set by the system admin
-	if [ ! -e "${ROOT}${KDEDIR}/share/apps/kdm/faces/.default.face.icon" ]; then
-		mkdir -p "${ROOT}${KDEDIR}/share/apps/kdm/faces"
-		cp "${ROOT}${KDEDIR}/share/apps/kdm/pics/users/default1.png" \
-			"${ROOT}${KDEDIR}/share/apps/kdm/faces/.default.face.icon"
-	fi
-	if [ ! -e "${ROOT}${KDEDIR}/share/apps/kdm/faces/root.face.icon" ]; then
-		mkdir -p "${ROOT}${KDEDIR}/share/apps/kdm/faces"
-		cp "${ROOT}${KDEDIR}/share/apps/kdm/pics/users/root1.png" \
-			"${ROOT}${KDEDIR}/share/apps/kdm/faces/root.face.icon"
-	fi
-
-	mkdir -p ${ROOT}${KDEDIR}/share/templates/.source/emptydir
-
-	echo
-	einfo "To enable gpg-agent and/or ssh-agent in KDE sessions,"
-	einfo "edit ${KDEDIR}/env/agent-startup.sh and"
-	einfo "${KDEDIR}/shutdown/agent-shutdown.sh"
-	echo
-}