Added a patch by Thomas Anderson to fix the paths to several KDE applications as kindly provided on bug 195525.

Package-Manager: portage-2.1.5_rc6

4 files changed, 100 insertions, 12 deletions

diff --git a/kde-base/kdeutils/ChangeLog b/kde-base/kdeutils/ChangeLog
index 363f443b7bbc..a99da103971e 100644
--- a/kde-base/kdeutils/ChangeLog
+++ b/kde-base/kdeutils/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for kde-base/kdeutils
 # Copyright 2002-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kdeutils/ChangeLog,v 1.228 2008/03/07 00:40:10 dirtyepic Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kdeutils/ChangeLog,v 1.229 2008/04/27 01:30:55 philantrop Exp $
+
+*kdeutils-3.5.9-r1 (27 Apr 2008)
+
+  27 Apr 2008; Wulf C. Krueger <philantrop@gentoo.org>
+  +files/kmilo-3.5.9-fixpaths.patch, +kdeutils-3.5.9-r1.ebuild:
+  Added a patch by Thomas Anderson to fix the paths to several KDE
+  applications as kindly provided on bug 195525.
 
   07 Mar 2008; Ryan Hill <dirtyepic@gentoo.org> kdeutils-3.5.9.ebuild:
   Keyword ~mips.
diff --git a/kde-base/kdeutils/Manifest b/kde-base/kdeutils/Manifest
index 548fa16f4865..975949d038a1 100644
--- a/kde-base/kdeutils/Manifest
+++ b/kde-base/kdeutils/Manifest
@@ -1,21 +1,13 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
 AUX klaptopdaemon-3.5.7-has_acpi_sleep.patch 1138 RMD160 b0962ab67f13688c7bf169b3337b8e34ddfb9c99 SHA1 24d51da049f13bf4ea1927b2d10be6e6a828dd69 SHA256 40df6cc42c49ae615c27f1ea8b8ae7f4d1cd9dcd5e295c1396b00e3daae083b7
 AUX klaptopdaemon-3.5.7-libXss-linking.patch 629 RMD160 49f69d98b3addf18d264aba8f10f7286e8726a20 SHA1 892b9b6178ba8667d771cdfbb12f9a96a5ad2336 SHA256 356c94da4a3e4c94c0097d65db4dc6203d582dacf225b87c4181f554031ad80b
 AUX kmilo-3.5.8-198015_XF86Audio.patch 2781 RMD160 15a54329f39e1e7af316566684d8ca620a9761aa SHA1 00c0147f52f2a387901be7900d0b9641ca0f456d SHA256 0916cbffb011e4589bed8e71e9e76cae5982e0e7d111a9afa3abb061b0667c5e
+AUX kmilo-3.5.9-fixpaths.patch 1293 RMD160 00707847b77bfb8633cce85d90904a621368b47c SHA1 4f6e44a5ee2aba7253790293b94fe3da0e0e1d22 SHA256 993554de64ddff672b2d4c35aa4105a0a1dd2c970d634590574e855d04473233
 AUX superkaramba-3.5.7-network_sensor.patch 672 RMD160 42c974138f30873ed654bb072874a03b7e5424a2 SHA1 47359e471f3c88efd45021a219149edf2f9b2b84 SHA256 ceec6d676826ac82eee2e4a1b79ef7bd70f12369abdf3468149c0a5ab31ecd57
 DIST kdeutils-3.5-patchset-02.tar.bz2 3019 RMD160 b4598488995ed7dc7a86349cd68da426e2238773 SHA1 37542dd16a3e66b69b2f960805d65dc4a04fd266 SHA256 54ddfbec990e3bff3139abf42755be24a450a8969eb77d41a5b0da4dc72580d6
 DIST kdeutils-3.5.8.tar.bz2 3059172 RMD160 94267b9c08339c7310d65106110c9b9ef133d6f8 SHA1 55aac5ecb90ee8a9854603eb2415adb2da6f249c SHA256 7dcbe3361cc53f9dac4c1bf6f45952d3d2518bec56cd8c07b8e07b4c4f12d0ac
 DIST kdeutils-3.5.9.tar.bz2 3060841 RMD160 ac98dce89f31469de8b582328fa2a0f10e835d01 SHA1 143c1284e4e4f3c985af1e156652e415f566ba17 SHA256 65df88b026720b8e11446c9a0a5d8cd942d236097e9c6ca63607fab04884b5ff
 EBUILD kdeutils-3.5.8-r1.ebuild 2093 RMD160 ee516b3909f5f133baa760ea65c10044a1e871ce SHA1 8da9cc7423ec8df16de6a41efdc5b10bab3922ab SHA256 ca9bf7e9d5c439f57739122c8b9a76e9a9c34ea5b9583dc45b9e3a227f5b1eaa
+EBUILD kdeutils-3.5.9-r1.ebuild 2064 RMD160 483cb692ccd8b6ff85388962e8b7612eab6adf27 SHA1 90877198034b575f4befc2e3af67f1f827554ee9 SHA256 6496348363c00fceba4a73fb7b020d7809b357f6f8c5eb93e60674c85b644df6
 EBUILD kdeutils-3.5.9.ebuild 2012 RMD160 d1ccf14c179070a89d5a488c55f66f7a3dd8bee2 SHA1 f5160bb3e2c72d89446bb9e86cd19a153c8f64f0 SHA256 e792c815f2025bf42fa30c827bd9ba5072fa24cf98ab9edc577cb6084437dc5f
-MISC ChangeLog 27852 RMD160 5f9e5ccabe4f01782fd874243526c0899151ab55 SHA1 13e9d8fed9238ad3e988202515ce6a18f3a6843c SHA256 6699e9cf3bddb4e81bfb7ba16c00c34009123621df9cccc43f8fa01968afa97e
+MISC ChangeLog 28123 RMD160 f6e38a9b8cdaf7c19acfde07f34bad843fb01b5c SHA1 8321c023762090d7067dd124c60c5370f01a47f9 SHA256 a24da26da50fa90ba7c2ced56daaba88ec83039b83131b20f88ade995a24ac1d
 MISC metadata.xml 156 RMD160 ecce3b981f150c45ae1e84e2d208e678d6124259 SHA1 b64f7c0b4e5db816d82ad19848f72118af129d35 SHA256 2f4da28506b9d4185f320f67a6191d30c7a921217ed4447ed46ea0bc4aefc79a
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.7 (GNU/Linux)
-
-iD8DBQFH0I7wiqiDRvmkBmIRAjd9AJ4/itN+x75GaAjMaps+PD9g6EwbYgCgs2KB
-s2jW8m9TYbYPE0WDLmyWTQE=
-=VVrQ
------END PGP SIGNATURE-----
diff --git a/kde-base/kdeutils/files/kmilo-3.5.9-fixpaths.patch b/kde-base/kdeutils/files/kmilo-3.5.9-fixpaths.patch
new file mode 100644
index 000000000000..6d8a98182260
--- /dev/null
+++ b/kde-base/kdeutils/files/kmilo-3.5.9-fixpaths.patch
@@ -0,0 +1,20 @@
+diff -Naur kdeutils-3.5.7-orig/kmilo/thinkpad/thinkpad.cpp kdeutils-3.5.7/kmilo/thinkpad/thinkpad.cpp
+--- kdeutils-3.5.7-orig/kmilo/thinkpad/thinkpad.cpp	2008-01-23 20:36:29.000000000 -0500
++++ kdeutils-3.5.7/kmilo/thinkpad/thinkpad.cpp	2008-01-23 20:38:09.000000000 -0500
+@@ -443,11 +443,11 @@
+ 	m_softwareVolume = config->readBoolEntry("softwareVolume", true);
+ 	m_run = config->readBoolEntry("run", false);
+ 	m_volumeStep = config->readNumEntry("volumeStep", defaultVolumeStep);
+-	m_buttonThinkpad = config->readEntry("buttonThinkpad", "/usr/bin/konsole");
+-	m_buttonHome = config->readEntry("buttonHome", "/usr/bin/konqueror");
+-	m_buttonSearch = config->readEntry("buttonSearch", "/usr/bin/kfind");
+-	m_buttonMail = config->readEntry("buttonMail", "/usr/bin/kmail");
+-	m_buttonZoom = config->readEntry("buttonZoom", "/usr/bin/ksnapshot");
++	m_buttonThinkpad = config->readEntry("buttonThinkpad", "/usr/kde/3.5/bin/konsole");
++	m_buttonHome = config->readEntry("buttonHome", "/usr/kde/3.5/bin/konqueror");
++	m_buttonSearch = config->readEntry("buttonSearch", "/usr/kde/3.5/bin/kfind");
++	m_buttonMail = config->readEntry("buttonMail", "/usr/kde/3.5/bin/kmail");
++	m_buttonZoom = config->readEntry("buttonZoom", "/usr/kde/3.5/bin/ksnapshot");
+ }
+ 
+ bool ThinkPadMonitor::retrieveVolume() {
diff --git a/kde-base/kdeutils/kdeutils-3.5.9-r1.ebuild b/kde-base/kdeutils/kdeutils-3.5.9-r1.ebuild
new file mode 100644
index 000000000000..526d13906acb
--- /dev/null
+++ b/kde-base/kdeutils/kdeutils-3.5.9-r1.ebuild
@@ -0,0 +1,69 @@
+# Copyright 1999-2008 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kdeutils/kdeutils-3.5.9-r1.ebuild,v 1.1 2008/04/27 01:30:55 philantrop Exp $
+
+EAPI="1"
+inherit kde-dist eutils
+
+SRC_URI="${SRC_URI}
+	mirror://gentoo/kdeutils-3.5-patchset-02.tar.bz2"
+
+DESCRIPTION="KDE utilities."
+
+KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86"
+IUSE="crypt kdehiddenvisibility pbbuttonsd snmp xscreensaver"
+
+BOTH_DEPEND="~kde-base/kdebase-${PV}
+		snmp? ( net-analyzer/net-snmp )
+		pbbuttonsd? ( app-laptop/pbbuttonsd )
+		dev-lang/python
+		dev-libs/gmp
+		x11-libs/libXtst"
+
+RDEPEND="${BOTH_DEPEND}
+		crypt? ( app-crypt/gnupg
+				app-crypt/pinentry )"
+
+DEPEND="${BOTH_DEPEND}
+		xscreensaver? ( x11-libs/libXScrnSaver )
+		x11-libs/libX11
+		x11-proto/xproto
+		virtual/os-headers"
+
+PATCHES=( "${FILESDIR}/superkaramba-3.5.7-network_sensor.patch"
+			"${FILESDIR}/kmilo-${PV}-fixpaths.patch" )
+EPATCH_EXCLUDE="klaptopdaemon-3.5-suspend2+xsession-errors.diff
+				klaptopdaemon-3.5-lock-and-hibernate.diff"
+
+pkg_setup() {
+	if use crypt && ! built_with_use app-crypt/pinentry gtk && ! built_with_use app-crypt/pinentry qt3 ; then
+		eerror "kgpg needs app-crypt/pinentry built with either the gtk or qt3 USE flag."
+		eerror "Please enable either USE flag and re-install app-crypt/pinentry."
+		die "app-crypt/pinentry needs to be rebuilt with gtk or qt3 support."
+	fi
+
+	kde_pkg_setup
+}
+
+src_unpack() {
+	kde_src_unpack
+
+	# Fix some desktop files
+	sed -i -e "s:Hidden=true:Hidden=false:" "${S}/ksim/ksim.desktop" \
+		|| die "sed (ksim) failed"
+	sed -i -e "s:\(^Type=\)Service:\1Application:" "${S}/kdelirc/irkick/irkick.desktop" \
+		|| die "sed (irkick) failed"
+	sed -i -e "s:\(^Init=.*\):X-\1:" "${S}/klaptopdaemon/applnk/laptop.desktop" \
+		|| die "sed (laptop) failed"
+}
+
+src_compile() {
+	local myconf="$(use_with snmp)
+				$(use_with pbbuttonsd powerbook)
+				$(use_with xscreensaver)
+				--without-xmms"
+
+	use crypt || export DO_NOT_COMPILE="${DO_NOT_COMPILE} kgpg"
+
+	kde_src_compile
+}