Add kcontrol-3.5.8-r2.ebuild, fixes regression caused by the flash compatibility patch.

(Portage version: 2.1.4_rc14)

3 files changed, 96 insertions, 2 deletions

diff --git a/kde-base/kcontrol/ChangeLog b/kde-base/kcontrol/ChangeLog
index 9affc8c1533b..44a8ce6d5c49 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.97 2007/12/27 17:16:02 carlo Exp $
+# Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kcontrol/ChangeLog,v 1.98 2008/01/11 20:40:20 tgurr Exp $
+
+*kcontrol-3.5.8-r2 (11 Jan 2008)
+
+  11 Jan 2008; Timo Gurr <tgurr@gentoo.org> +kcontrol-3.5.8-r2.ebuild:
+  Add kcontrol-3.5.8-r2.ebuild, fixes regression caused by the flash
+  compatibility patch.
 
   27 Dec 2007; Carsten Lohrke <carlo@gentoo.org> kcontrol-3.5.8-r1.ebuild:
   Raise minimum Freetype version, bug #196450.
diff --git a/kde-base/kcontrol/files/digest-kcontrol-3.5.8-r2 b/kde-base/kcontrol/files/digest-kcontrol-3.5.8-r2
new file mode 100644
index 000000000000..7edc6bf393a5
--- /dev/null
+++ b/kde-base/kcontrol/files/digest-kcontrol-3.5.8-r2
@@ -0,0 +1,6 @@
+MD5 d77baf089133f8f36b6dfe5bb40109bd kdebase-3.5-patchset-10.tar.bz2 38090
+RMD160 b3fdca9c5220a213c1390ef558542640e810834a kdebase-3.5-patchset-10.tar.bz2 38090
+SHA256 73d3541312366a1aedf9ebe5187e565458224682ef188a20b735f7e54718e572 kdebase-3.5-patchset-10.tar.bz2 38090
+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-r2.ebuild b/kde-base/kcontrol/kcontrol-3.5.8-r2.ebuild
new file mode 100644
index 000000000000..c7d9abaa3d3e
--- /dev/null
+++ b/kde-base/kcontrol/kcontrol-3.5.8-r2.ebuild
@@ -0,0 +1,82 @@
+# Copyright 1999-2008 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-r2.ebuild,v 1.1 2008/01/11 20:40:20 tgurr Exp $
+
+KMNAME=kdebase
+MAXKDEVER=$PV
+KM_DEPRANGE="$PV $MAXKDEVER"
+inherit kde-meta eutils
+
+SRC_URI="${SRC_URI}
+	mirror://gentoo/kdebase-3.5-patchset-10.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.3
+	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"
+}