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, 106 insertions, 5 deletions

diff --git a/kde-base/kcontrol/ChangeLog b/kde-base/kcontrol/ChangeLog
index 25b3ae5eb5d9..e0e354e23d7e 100644
--- a/kde-base/kcontrol/ChangeLog
+++ b/kde-base/kcontrol/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for kde-base/kcontrol
 # Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kcontrol/ChangeLog,v 1.95 2007/10/19 22:04:09 philantrop Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kcontrol/ChangeLog,v 1.96 2007/12/22 21:16:05 carlo Exp $
+
+*kcontrol-3.5.8-r1 (22 Dec 2007)
+
+  22 Dec 2007; Carsten Lohrke <carlo@gentoo.org> +kcontrol-3.5.8-r1.ebuild:
+  Make joystock control applet installation optional. Don't install
+  soundserver control applet, when building without aRts.
 
 *kcontrol-3.5.8 (19 Oct 2007)
 
diff --git a/kde-base/kcontrol/Manifest b/kde-base/kcontrol/Manifest
index 2bc7c4b4edef..10cdd095c4cb 100644
--- a/kde-base/kcontrol/Manifest
+++ b/kde-base/kcontrol/Manifest
@@ -29,14 +29,18 @@ EBUILD kcontrol-3.5.7.ebuild 1830 RMD160 dd31877041ab64a9fb509195a509e251b69f77d
 MD5 410943c97ccf8b7dace54c6c6d4c043a kcontrol-3.5.7.ebuild 1830
 RMD160 dd31877041ab64a9fb509195a509e251b69f77d3 kcontrol-3.5.7.ebuild 1830
 SHA256 3b01a07c12d03ea75d3a018007da300c0b1e902a17106ddc47cfdd80eb22d946 kcontrol-3.5.7.ebuild 1830
+EBUILD kcontrol-3.5.8-r1.ebuild 2462 RMD160 6ad2cb3689bfe8c256f7485a4e3ede38356abd1f SHA1 349d83e104c0257a18c837b2aff219ed91c6ddb1 SHA256 ef1136a7672d430744d02574decc3457a922c6dba67f98ef382a0fc8f22e7088
+MD5 20e0d8f64146ec1b16b64f3fe0af773c kcontrol-3.5.8-r1.ebuild 2462
+RMD160 6ad2cb3689bfe8c256f7485a4e3ede38356abd1f kcontrol-3.5.8-r1.ebuild 2462
+SHA256 ef1136a7672d430744d02574decc3457a922c6dba67f98ef382a0fc8f22e7088 kcontrol-3.5.8-r1.ebuild 2462
 EBUILD kcontrol-3.5.8.ebuild 2102 RMD160 1ad20cb311055cdf9c101b019bd67e853ea62697 SHA1 dbd96744f561108fcb6f5813ac7cd21575cc2989 SHA256 39c9054bc95a5c0b7cb9f92f430502f4587b5818677244f1234ea5bbafca7c60
 MD5 e8e0e0d8199cd904dc22c1e1c37d9b3d kcontrol-3.5.8.ebuild 2102
 RMD160 1ad20cb311055cdf9c101b019bd67e853ea62697 kcontrol-3.5.8.ebuild 2102
 SHA256 39c9054bc95a5c0b7cb9f92f430502f4587b5818677244f1234ea5bbafca7c60 kcontrol-3.5.8.ebuild 2102
-MISC ChangeLog 12306 RMD160 9915e0b9ff314633b23e3ed0f849dd69505f4082 SHA1 13db174378aa586d492ee7f324ade30634f3bb9d SHA256 1f9756f7a3b96d2c0ce8bde1e37fee4e22104d6d552c4f42c2777fbcfaa104bb
-MD5 621853d25c8adee8b9ac77fd429f5d06 ChangeLog 12306
-RMD160 9915e0b9ff314633b23e3ed0f849dd69505f4082 ChangeLog 12306
-SHA256 1f9756f7a3b96d2c0ce8bde1e37fee4e22104d6d552c4f42c2777fbcfaa104bb ChangeLog 12306
+MISC ChangeLog 12538 RMD160 0181660fa509b4918e3d839c12da216ad1d167b0 SHA1 3b9c0e6511282bf59a737a9dfdb92374bcb294b4 SHA256 e6e9bec9a6eab57fe2710d5348cc96ec56e5a6fba1e18fcb049ed108b59e55c3
+MD5 96db7c4dbebbdde6e0809cc95650a760 ChangeLog 12538
+RMD160 0181660fa509b4918e3d839c12da216ad1d167b0 ChangeLog 12538
+SHA256 e6e9bec9a6eab57fe2710d5348cc96ec56e5a6fba1e18fcb049ed108b59e55c3 ChangeLog 12538
 MISC metadata.xml 156 RMD160 ecce3b981f150c45ae1e84e2d208e678d6124259 SHA1 b64f7c0b4e5db816d82ad19848f72118af129d35 SHA256 2f4da28506b9d4185f320f67a6191d30c7a921217ed4447ed46ea0bc4aefc79a
 MD5 acc03a4b12bb0433a57e95bd253b9501 metadata.xml 156
 RMD160 ecce3b981f150c45ae1e84e2d208e678d6124259 metadata.xml 156
@@ -59,3 +63,6 @@ SHA256 b2ab263435b90f12fd375094bcf566dd243d79fac6262318859828f5dcdcd01c files/di
 MD5 9669581961b2fe1520058a783951f69c files/digest-kcontrol-3.5.8 521
 RMD160 a80088909157d08c0ba9adeaa181dd90cc4eb6fb files/digest-kcontrol-3.5.8 521
 SHA256 bbf9dbb04b512033e84c4029034c7f0eee8e7ffa1aa71f9cc0904d4cb7949edd files/digest-kcontrol-3.5.8 521
+MD5 9669581961b2fe1520058a783951f69c files/digest-kcontrol-3.5.8-r1 521
+RMD160 a80088909157d08c0ba9adeaa181dd90cc4eb6fb files/digest-kcontrol-3.5.8-r1 521
+SHA256 bbf9dbb04b512033e84c4029034c7f0eee8e7ffa1aa71f9cc0904d4cb7949edd files/digest-kcontrol-3.5.8-r1 521
diff --git a/kde-base/kcontrol/files/digest-kcontrol-3.5.8-r1 b/kde-base/kcontrol/files/digest-kcontrol-3.5.8-r1
new file mode 100644
index 000000000000..f001f0d62458
--- /dev/null
+++ b/kde-base/kcontrol/files/digest-kcontrol-3.5.8-r1
@@ -0,0 +1,6 @@
+MD5 f6f2574fc332dd1123144bb6a00e5e26 kdebase-3.5-patchset-06.tar.bz2 19825
+RMD160 ab7358b635e912ed9912cb95e48e3187064abae7 kdebase-3.5-patchset-06.tar.bz2 19825
+SHA256 c9ab23f648f84ebc66054f4db48685cbed3d99e9c87fa3df2c0d8a282b9a2394 kdebase-3.5-patchset-06.tar.bz2 19825
+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/kcontrol/kcontrol-3.5.8-r1.ebuild b/kde-base/kcontrol/kcontrol-3.5.8-r1.ebuild
new file mode 100644
index 000000000000..67f1faa3aa6b
--- /dev/null
+++ b/kde-base/kcontrol/kcontrol-3.5.8-r1.ebuild
@@ -0,0 +1,82 @@
+# Copyright 1999-2007 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kcontrol/kcontrol-3.5.8-r1.ebuild,v 1.1 2007/12/22 21:16:05 carlo Exp $
+
+KMNAME=kdebase
+MAXKDEVER=$PV
+KM_DEPRANGE="$PV $MAXKDEVER"
+inherit kde-meta eutils
+
+SRC_URI="${SRC_URI}
+	mirror://gentoo/kdebase-3.5-patchset-06.tar.bz2"
+
+DESCRIPTION="The KDE Control Center"
+KEYWORDS="~alpha ~amd64 ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd"
+IUSE="arts ieee1394 joystick logitech-mouse opengl kdehiddenvisibility"
+
+DEPEND=">=media-libs/freetype-2
+	media-libs/fontconfig
+	dev-libs/openssl
+	arts? ( $(deprange 3.5.5 $MAXKDEVER kde-base/arts) )
+	opengl? ( virtual/opengl )
+	ieee1394? ( sys-libs/libraw1394 )
+	logitech-mouse? ( >=dev-libs/libusb-0.1.10a )"
+
+RDEPEND="${DEPEND}
+	sys-apps/usbutils
+	$(deprange 3.5.6 $MAXKDEVER kde-base/kcminit)
+	$(deprange $PV $MAXKDEVER kde-base/kdebase-data)
+	$(deprange 3.5.7-r1 $MAXKDEVER kde-base/kdesu)
+	$(deprange $PV $MAXKDEVER kde-base/khelpcenter)
+	$(deprange $PV $MAXKDEVER kde-base/khotkeys)
+	$(deprange $PV $MAXKDEVER kde-base/libkonq)
+	$(deprange $PV $MAXKDEVER kde-base/kicker)"
+
+KMEXTRACTONLY="kwin/kwinbindings.cpp
+		kicker/kicker/core/kickerbindings.cpp
+		kicker/taskbar/taskbarbindings.cpp
+		kdesktop/kdesktopbindings.cpp
+		klipper/klipperbindings.cpp
+		kxkb/kxkbbindings.cpp
+		kicker/taskmanager"
+
+KMEXTRA="doc/kinfocenter"
+KMCOMPILEONLY="kicker/libkicker
+	kicker/taskbar"
+KMCOPYLIB="libkonq libkonq
+	libkicker kicker/libkicker
+	libtaskbar kicker/taskbar
+	libtaskmanager kicker/taskmanager"
+
+src_unpack() {
+	kde-meta_src_unpack unpack
+
+	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
+
+	kde-meta_src_unpack makefiles
+}
+
+src_compile() {
+	myconf="$myconf --with-ssl $(use_with arts) $(use_with opengl gl)
+			$(use_with ieee1394 libraw1394) $(use_with logitech-mouse libusb)
+			--with-usbids=/usr/share/misc/usb.ids"
+	kde-meta_src_compile
+}
+
+src_install() {
+	kde-meta_src_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"
+}