Added a patch to fix ejecting by using HAL (if the necessary tools are installed). Fixes bug 186028. Added a template in agent-startup.sh for starting rxvt-unicode. Fixes bug 189201.

(Portage version: 2.1.5_rc6)

4 files changed, 338 insertions, 1 deletions

diff --git a/kde-base/kdebase/ChangeLog b/kde-base/kdebase/ChangeLog
index 138a8149e753..22eeed1c1387 100644
--- a/kde-base/kdebase/ChangeLog
+++ b/kde-base/kdebase/ChangeLog
@@ -1,6 +1,15 @@
 # ChangeLog for kde-base/kdebase
 # Copyright 2002-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kdebase/ChangeLog,v 1.439 2008/04/15 10:05:10 philantrop Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kdebase/ChangeLog,v 1.440 2008/04/27 01:15:58 philantrop Exp $
+
+*kdebase-3.5.9-r3 (27 Apr 2008)
+
+  27 Apr 2008; Wulf C. Krueger <philantrop@gentoo.org>
+  +files/kdialog-3.5.9-kdeeject-186028.patch, files/agent-startup.sh,
+  +kdebase-3.5.9-r3.ebuild:
+  Added a patch to fix ejecting by using HAL (if the necessary tools are
+  installed). Fixes bug 186028. Added a template in agent-startup.sh for
+  starting rxvt-unicode. Fixes bug 189201.
 
 *kdebase-3.5.9-r2 (15 Apr 2008)
 
diff --git a/kde-base/kdebase/files/agent-startup.sh b/kde-base/kdebase/files/agent-startup.sh
index 768de9b24f39..4b99f6e8b63d 100644
--- a/kde-base/kdebase/files/agent-startup.sh
+++ b/kde-base/kdebase/files/agent-startup.sh
@@ -17,3 +17,13 @@
 #if [ -x /usr/bin/ssh-agent ]; then
 #  eval "$(/usr/bin/ssh-agent -s)"
 #fi
+
+# Uncomment the following lines to start rxvt-unicode which has the ability to
+# run multiple terminals in one single process, thus starting up faster and 
+# saving resources.
+# The --opendisplay ensures that the daemon quits when the X server terminates,
+# therefore we don't need matching lines in agent-shutdown.sh.
+
+#if [ -x /usr/bin/urxvtd ]; then
+#	/usr/bin/urxvtd --opendisplay --fork --quiet
+#fi
diff --git a/kde-base/kdebase/files/kdialog-3.5.9-kdeeject-186028.patch b/kde-base/kdebase/files/kdialog-3.5.9-kdeeject-186028.patch
new file mode 100644
index 000000000000..4607adac3a6d
--- /dev/null
+++ b/kde-base/kdebase/files/kdialog-3.5.9-kdeeject-186028.patch
@@ -0,0 +1,59 @@
+diff -Naur kdialog-3.5.9.orig/kdeeject/kdeeject kdialog-3.5.9/kdeeject/kdeeject
+--- kdialog-3.5.9.orig/kdeeject/kdeeject	2006-10-01 19:31:56.000000000 +0200
++++ kdialog-3.5.9/kdeeject/kdeeject	2008-04-26 19:00:44.000000000 +0200
+@@ -4,6 +4,11 @@
+ #
+ # Copyright GPL v2 by David Faure <david@mandrakesoft.com>
+ #
++error() {
++    kdialog --title "KDE Eject" --error "$1"
++    exit 1
++}
++
+ if test $# -ge 1 -a "$1" != "--help"; then
+   quiet=0
+   if test "$1" = "-q"; then
+@@ -22,10 +27,39 @@
+       cdcontrol -f $dev eject >/dev/null 2>&1
+       ;;
+     *)
+-      # Warning, it has to be either eject 2.0.x or >=2.1.5
+-      # Otherwise it doesn't work as expected (it requires a
+-      # fstab entry for no reason).
+-      eject $1 >/dev/null 2>&1
++      # check if HAL userland tools are installed
++      if test -x `which hal-find-by-property`; then
++	  HAL_major=`hal-find-by-property --version | cut -d " " -f 2 | cut -d. -f1`
++          HAL_minor=`hal-find-by-property --version | cut -d " " -f 2 | cut -d. -f2`
++          # HAL umount and eject method exist only for HAL >= 0.5
++          if test $HAL_major -eq 0 -a  $HAL_minor -ge 5 -o $HAL_major -gt 0;  then
++              # Try to find the UDi from the device name
++              BLOCK_UDI=$(hal-find-by-property --key block.device --string "$1" | head -1)
++              [ -n "$BLOCK_UDI" ] || error "Can't find UDI for URL $1"
++              STORAGE_UDI=$(hal-get-property --udi $BLOCK_UDI --key block.storage_device)
++              [ -n "$STORAGE_UDI" ] || error "Can't find device for volume $BLOCK_UDI"
++	      
++              # Unmount each device volume
++              for VOLUME_UDI in $(hal-find-by-property --key block.storage_device --string $STORAGE_UDI); do
++                  [ $(hal-get-property --udi $VOLUME_UDI --key block.is_volume) = true ] || continue
++                  [ $(hal-get-property --udi $VOLUME_UDI --key volume.is_mounted) = true ] || continue
++                  ERROR=$(dcop kded mediamanager unmount $VOLUME_UDI)
++
++                  if test -n "$ERROR"; then
++                      # try to use directly DBUS method in case mediamanager failed
++                      ERROR=$(dbus-send --system --dest=org.freedesktop.Hal "$VOLUME_UDI" org.freedesktop.Hal.Device.Volume.Unmount array:string:"" >/dev/null 2>&1)
++                      [ -n "$ERROR" ] && error "$ERROR"
++                  fi
++              done
++              dbus-send --system --dest=org.freedesktop.Hal "$BLOCK_UDI" org.freedesktop.Hal.Device.Volume.Eject array:string:"" >/dev/null 2>&1
++          fi
++      else
++          # fallback to the old eject method
++          # Warning, it has to be either eject 2.0.x or >=2.1.5
++          # Otherwise it doesn't work as expected (it requires a
++          # fstab entry for no reason).
++	  eject $1 >/dev/null 2>&1
++      fi
+       ;;
+   esac
+   if test $? -eq 0; then
diff --git a/kde-base/kdebase/kdebase-3.5.9-r3.ebuild b/kde-base/kdebase/kdebase-3.5.9-r3.ebuild
new file mode 100644
index 000000000000..3448c13fa81b
--- /dev/null
+++ b/kde-base/kdebase/kdebase-3.5.9-r3.ebuild
@@ -0,0 +1,259 @@
+# Copyright 1999-2008 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kdebase/kdebase-3.5.9-r3.ebuild,v 1.1 2008/04/27 01:15:58 philantrop Exp $
+
+EAPI="1"
+inherit multilib kde-dist eutils flag-o-matic
+
+SRC_URI="${SRC_URI}
+	mirror://gentoo/kdebase-3.5-patchset-11.tar.bz2
+	mirror://gentoo/kde-3.5.9-seli-xinerama.tar.bz2"
+
+DESCRIPTION="KDE base packages: the desktop, panel, window manager, konqueror..."
+
+KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd"
+IUSE="branding cups java ldap ieee1394 hal joystick lm_sensors logitech-mouse openexr opengl
+pam samba xcomposite xscreensaver xinerama kdehiddenvisibility"
+
+# hal: enables hal backend for 'media:' ioslave
+
+DEPEND=">=media-libs/freetype-2.3
+	media-libs/fontconfig
+	dev-libs/openssl
+	pam? ( kde-base/kdebase-pam )
+	>=dev-libs/cyrus-sasl-2
+	ldap? ( >=net-nds/openldap-2 )
+	cups? ( net-print/cups )
+	opengl? ( virtual/opengl )
+	openexr? ( >=media-libs/openexr-1.2.2-r2 )
+	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? ( dev-libs/dbus-qt3-old =sys-apps/hal-0.5* )
+	xcomposite? ( x11-libs/libXcomposite x11-libs/libXdamage )
+	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 )"
+
+RDEPEND="${DEPEND}
+	sys-apps/usbutils
+	sys-devel/gdb
+	java? ( >=virtual/jre-1.4 )
+	kernel_linux? ( || ( >=sys-apps/eject-2.1.5 sys-block/unieject ) )
+	virtual/ssh
+	www-misc/htdig
+	x11-apps/mkfontdir
+	x11-apps/setxkbmap
+	x11-apps/xinit
+	|| ( x11-misc/xkeyboard-config x11-misc/xkbdata )
+	x11-apps/xmessage
+	x11-apps/xprop
+	x11-apps/xrandr
+	x11-apps/xsetroot
+	x11-apps/xset"
+
+DEPEND="${DEPEND}
+	xcomposite? ( x11-proto/compositeproto x11-proto/damageproto )
+	xscreensaver? ( x11-proto/scrnsaverproto )
+	xinerama? ( x11-proto/xineramaproto )
+	x11-apps/bdftopcf
+	x11-apps/xhost"
+
+need-kde 3.5.9
+
+EPATCH_EXCLUDE="ksmserver-3.5.8-ksmserver_suspend.diff
+				ksmserver-3.5.8-suspend_configure.diff"
+
+PATCHES=( "${FILESDIR}/kdm-${PV}-respect-cflags.patch"
+			"${WORKDIR}/${PN}-seli-xinerama.patch"
+			"${FILESDIR}/kdialog-${PV}-kdeeject-186028.patch" )
+
+pkg_setup() {
+	kde_pkg_setup
+	if use hal && has_version '<sys-apps/dbus-0.90' && ! built_with_use sys-apps/dbus qt3; then
+		eerror "To enable HAL support in this package is required to have"
+		eerror "sys-apps/dbus compiled with Qt 3 support."
+		eerror "Please reemerge sys-apps/dbus with USE=\"qt3\"."
+		die "Please reemerge sys-apps/dbus with USE=\"qt3\"."
+	fi
+}
+
+src_unpack() {
+	kde_src_unpack
+
+	# Avoid using imake (kde bug 114466).
+	#epatch "${WORKDIR}/patches/kdebase-3.5.0_beta2-noimake.patch"
+	# ...included in patch set
+	rm -f "${S}/configure"
+
+	# FIXME - disable broken tests
+	sed -i -e "s:TESTS =.*:TESTS =:" "${S}/kioslave/smtp/Makefile.am" || die "sed failed"
+	sed -i -e "s:TESTS =.*:TESTS =:" "${S}/kioslave/trash/Makefile.am" || die "sed failed"
+	sed -i -e "s:SUBDIRS = viewer test:SUBDIRS = viewer:" "${S}/nsplugins/Makefile.am" || die "sed failed"
+
+	if ! use joystick ; then
+		sed -e 's:$(JOYSTICK_SUBDIR)::' \
+			-e 's:kthememanager \\:kthememanager:' \
+			-i "${S}/kcontrol/Makefile.am" \
+		|| die "sed failed"
+	fi
+	if ! use arts ; then
+		sed -e 's:arts::' \
+			-i "${S}/kcontrol/Makefile.am" \
+		|| die "sed failed"
+	fi
+
+	if ! [[ $(xhost >> /dev/null 2>/dev/null) ]] ; then
+		einfo "User ${USER} has no X access, disabling some tests."
+		for ioslave in media remote home system ; do
+			sed -e "s:check\: test${ioslave}::" -e "s:./test${ioslave}::" \
+				-i kioslave/${ioslave}/Makefile.am || die "sed failed"
+		done
+	fi
+}
+
+src_compile() {
+	# Patch the startkde script to setup the environment for KDE 4.0
+	# Add our KDEDIR
+	sed -i -e "s#@REPLACE_PREFIX@#${PREFIX}#" \
+		"${S}/startkde" || die "Sed for PREFIX failed."
+
+	# List all the multilib libdirs
+	local _libdir _libdirs
+	for _libdir in $(get_all_libdirs); do
+		_libdirs="${_libdirs}:${PREFIX}/${_libdir}"
+	done
+	_libdirs=${_libdirs#:}
+
+	# Complete LDPATH
+	sed -i -e "s#@REPLACE_LIBS@#${_libdirs}#" \
+		"${S}/startkde" || die "Sed for LDPATH failed."
+
+	local myconf="--with-dpms --enable-dnssd --with-sssl
+					--with-usbids=/usr/share/misc/usb.ids
+					$(use_with ieee1394 libraw1394)
+					$(use_with hal)
+					$(use_with ldap)
+					$(use_with lm_sensors sensors)
+					$(use_with logitech-mouse libusb)
+					$(use_with openexr)
+					$(use_with opengl gl)
+					$(use_with pam)
+					$(use_with samba)
+					$(use_with xcomposite composite)
+					$(use_with xinerama)
+					$(use_with xscreensaver)"
+
+	if ! use pam && use elibc_glibc; then
+		myconf="${myconf} --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"
+
+	kde_src_compile
+}
+
+src_install() {
+	kde_src_install
+	cd "${S}/kdm" && make DESTDIR="${D}" GENKDMCONF_FLAGS="--no-old --no-backup --no-in-notice" install
+
+	# Fix an obscure desktop file that only gets generated during the install phase.
+	sed -i -e '$d' "${D}/usr/kde/3.5/share/applications/kde/panel_appearance.desktop"
+	sed -i -e 's:Name=panel_appearance::' "${D}/usr/kde/3.5/share/applications/kde/panel_appearance.desktop"
+
+	# startup and shutdown scripts
+	insinto "${KDEDIR}/env"
+	doins "${WORKDIR}/patches/agent-startup.sh"
+
+	exeinto ${KDEDIR}/shutdown
+	doexe "${WORKDIR}/patches/agent-shutdown.sh"
+
+	# freedesktop environment variables
+	cat <<EOF > "${T}/xdg.sh"
+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"
+
+	if use branding ; then
+		dodir "${PREFIX}"/share/services/searchproviders
+		insinto "${PREFIX}"/share/services/searchproviders
+		doins "${WORKDIR}"/patches/Gentoo_{Bugzilla,Forums}.desktop
+	fi
+}
+
+pkg_preinst() {
+	kde_pkg_preinst
+
+	# We need to symlink here, as kfmclient freaks out completely,
+	# if it does not find konqueror.desktop in the legacy path.
+	dodir "${PREFIX}/share/applications/kde"
+	dosym ../../applnk/konqueror.desktop "${PREFIX}/share/applications/kde/konqueror.desktop"
+}
+
+pkg_postinst() {
+	kde_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
+	elog "To enable gpg-agent and/or ssh-agent in KDE sessions,"
+	elog "edit ${KDEDIR}/env/agent-startup.sh and"
+	elog "${KDEDIR}/shutdown/agent-shutdown.sh"
+	echo
+	if use branding ; then
+		elog "We've added Gentoo-related web shortcuts to Konqueror:"
+		elog "- gb           Gentoo Bugzilla searching"
+		elog "- gf           Gentoo Forums searching"
+#		elog "- gp           Gentoo Package searching"
+		echo
+		elog "You'll have to activate them in 'Configure Konqueror...'."
+		echo
+		elog "If you can't open new konqueror windows and get something like"
+		elog "'WARNING: Outdated database found' when starting konqueror in a console, run"
+		elog "kbuildsycoca as the user you're running KDE under."
+		elog "This is NOT a bug."
+		echo
+	fi
+}