Make joystock control applet installation optional. Don't install soundserver control applet, when building without aRts.

Package-Manager: portage-2.1.3.19

4 files changed, 278 insertions, 5 deletions

diff --git a/kde-base/kdebase/ChangeLog b/kde-base/kdebase/ChangeLog
index 1631e5d17b9c..9b3924932550 100644
--- a/kde-base/kdebase/ChangeLog
+++ b/kde-base/kdebase/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for kde-base/kdebase
 # Copyright 2002-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kdebase/ChangeLog,v 1.407 2007/12/09 22:58:24 philantrop Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kdebase/ChangeLog,v 1.408 2007/12/22 21:21:56 carlo Exp $
+
+*kdebase-3.5.8-r4 (22 Dec 2007)
+
+  22 Dec 2007; Carsten Lohrke <carlo@gentoo.org> +kdebase-3.5.8-r4.ebuild:
+  Make joystock control applet installation optional. Don't install
+  soundserver control applet, when building without aRts.
 
 *kdebase-3.5.8-r3 (09 Dec 2007)
 *kdebase-3.5.7-r6 (09 Dec 2007)
diff --git a/kde-base/kdebase/Manifest b/kde-base/kdebase/Manifest
index c996a41ddab4..3aac8a6b88de 100644
--- a/kde-base/kdebase/Manifest
+++ b/kde-base/kdebase/Manifest
@@ -148,14 +148,18 @@ EBUILD kdebase-3.5.8-r3.ebuild 7636 RMD160 39dd3268d4a9220148dc333ea3ad15989ce41
 MD5 a3e0c4555f888b948a97bf5f59f046ce kdebase-3.5.8-r3.ebuild 7636
 RMD160 39dd3268d4a9220148dc333ea3ad15989ce412d7 kdebase-3.5.8-r3.ebuild 7636
 SHA256 9d784e43a96675944efdaa57a2b96f12c1d039fd00f5707de1705b082d15eddc kdebase-3.5.8-r3.ebuild 7636
+EBUILD kdebase-3.5.8-r4.ebuild 7915 RMD160 e432cca802b6fd36003e00f7e9a192dfd981af48 SHA1 2693c42812a21bf683ff53555544e9c39f63735d SHA256 78d1b4c42c76d8f6b0d926a44db35b3031ae5d2dbc969d7a3db6bfb03daf22f0
+MD5 7900a8089e333eaa8d8fc4f9cd0bf455 kdebase-3.5.8-r4.ebuild 7915
+RMD160 e432cca802b6fd36003e00f7e9a192dfd981af48 kdebase-3.5.8-r4.ebuild 7915
+SHA256 78d1b4c42c76d8f6b0d926a44db35b3031ae5d2dbc969d7a3db6bfb03daf22f0 kdebase-3.5.8-r4.ebuild 7915
 EBUILD kdebase-3.5.8.ebuild 7057 RMD160 5532c9ccf5100febf5e8002fdbec2f5d4dfce8f5 SHA1 e0b98c663b68a5efae0216e6ce773e31dd6eefbf SHA256 fb3f20fdce989e0b09a994858c5265fb6880407be24a8ff78582b78207b933c6
 MD5 37eea3820dbd3438733985f9316abf58 kdebase-3.5.8.ebuild 7057
 RMD160 5532c9ccf5100febf5e8002fdbec2f5d4dfce8f5 kdebase-3.5.8.ebuild 7057
 SHA256 fb3f20fdce989e0b09a994858c5265fb6880407be24a8ff78582b78207b933c6 kdebase-3.5.8.ebuild 7057
-MISC ChangeLog 68551 RMD160 7bcad957eb658e2ad1fa5863ea102791677a5e84 SHA1 d695407fbca14f83ec7e317ba14458c548bbb3f6 SHA256 675ee4fc185177533ebe57801e9d32f13e318463ee1be68e4df76e16e54a519e
-MD5 1d5d9d82d43cefab9f8e350f4acd65a3 ChangeLog 68551
-RMD160 7bcad957eb658e2ad1fa5863ea102791677a5e84 ChangeLog 68551
-SHA256 675ee4fc185177533ebe57801e9d32f13e318463ee1be68e4df76e16e54a519e ChangeLog 68551
+MISC ChangeLog 68781 RMD160 73c6426b652bf916c8152a96f7bfd3f19dcdf0f8 SHA1 3ab52ecd748c6a8e29e026b56b8a05609925d8c3 SHA256 263acbec17d3fdf6b51a7847fc914ed61767b1a022a6503ef1f8d2349e040cde
+MD5 cd40c79e51d0d970d64319242dd3771b ChangeLog 68781
+RMD160 73c6426b652bf916c8152a96f7bfd3f19dcdf0f8 ChangeLog 68781
+SHA256 263acbec17d3fdf6b51a7847fc914ed61767b1a022a6503ef1f8d2349e040cde ChangeLog 68781
 MISC metadata.xml 156 RMD160 ecce3b981f150c45ae1e84e2d208e678d6124259 SHA1 b64f7c0b4e5db816d82ad19848f72118af129d35 SHA256 2f4da28506b9d4185f320f67a6191d30c7a921217ed4447ed46ea0bc4aefc79a
 MD5 acc03a4b12bb0433a57e95bd253b9501 metadata.xml 156
 RMD160 ecce3b981f150c45ae1e84e2d208e678d6124259 metadata.xml 156
@@ -214,3 +218,6 @@ SHA256 e9eb779c6a6a1a3ed40fc91cad12baadc95c34ec483c25806ffb3145db6f09da files/di
 MD5 b420ce10e320b3d5451fb61954698685 files/digest-kdebase-3.5.8-r3 521
 RMD160 62dd57f98dc8270a39b119dade2cbfe695812128 files/digest-kdebase-3.5.8-r3 521
 SHA256 7818ae28b4d508e14ddc0c228871bd8aecc3418dd6b07a86fba272ea0e489c65 files/digest-kdebase-3.5.8-r3 521
+MD5 b420ce10e320b3d5451fb61954698685 files/digest-kdebase-3.5.8-r4 521
+RMD160 62dd57f98dc8270a39b119dade2cbfe695812128 files/digest-kdebase-3.5.8-r4 521
+SHA256 7818ae28b4d508e14ddc0c228871bd8aecc3418dd6b07a86fba272ea0e489c65 files/digest-kdebase-3.5.8-r4 521
diff --git a/kde-base/kdebase/files/digest-kdebase-3.5.8-r4 b/kde-base/kdebase/files/digest-kdebase-3.5.8-r4
new file mode 100644
index 000000000000..ca3879dec39b
--- /dev/null
+++ b/kde-base/kdebase/files/digest-kdebase-3.5.8-r4
@@ -0,0 +1,6 @@
+MD5 797a625808480ab00f699fac88fc43df kdebase-3.5-patchset-08.tar.bz2 23090
+RMD160 c78298981aa5d0a6295b40160860e10e9ade1ff8 kdebase-3.5-patchset-08.tar.bz2 23090
+SHA256 2dc4cd3842f07644769555c821445f945262db62b51f92ba55610146d16c499a kdebase-3.5-patchset-08.tar.bz2 23090
+MD5 9990c669229daaaa8fca4c5e354441fd kdebase-3.5.8.tar.bz2 24200172
+RMD160 6441b5eaead5fff5c42c532fb11c0d37001cb6ea kdebase-3.5.8.tar.bz2 24200172
+SHA256 0f1876d1c68f01ed8fee346c1bae4f53dd2c1dc56db94e309b3d1adfc6138493 kdebase-3.5.8.tar.bz2 24200172
diff --git a/kde-base/kdebase/kdebase-3.5.8-r4.ebuild b/kde-base/kdebase/kdebase-3.5.8-r4.ebuild
new file mode 100644
index 000000000000..c8c574f7549d
--- /dev/null
+++ b/kde-base/kdebase/kdebase-3.5.8-r4.ebuild
@@ -0,0 +1,254 @@
+# Copyright 1999-2007 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kdebase/kdebase-3.5.8-r4.ebuild,v 1.1 2007/12/22 21:21:56 carlo Exp $
+
+inherit multilib kde-dist eutils flag-o-matic
+
+SRC_URI="${SRC_URI}
+	mirror://gentoo/kdebase-3.5-patchset-08.tar.bz2"
+
+DESCRIPTION="KDE base packages: the desktop, panel, window manager, konqueror..."
+
+KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~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
+	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.8
+
+EPATCH_EXCLUDE="ksmserver-3.5.8-ksmserver_suspend.diff
+				ksmserver-3.5.8-suspend_configure.diff"
+
+PATCHES="${FILESDIR}/ksmserver-3.5.8-gdm_interop_197133.patch
+		${FILESDIR}/kdm-3.5.8-login.diff"
+
+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"
+
+	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 "${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/*.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 three 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
+}