Add upstream patch to fix type of kcm module (bug 342623)

Package-Manager: portage-2.1.9.26/cvs/Linux i686

4 files changed, 27 insertions, 7 deletions

diff --git a/kde-misc/synaptiks/ChangeLog b/kde-misc/synaptiks/ChangeLog
index 5af0f410238a..04b4edaa1e30 100644
--- a/kde-misc/synaptiks/ChangeLog
+++ b/kde-misc/synaptiks/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for kde-misc/synaptiks
-# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/kde-misc/synaptiks/ChangeLog,v 1.12 2010/07/21 21:29:26 scarabeus Exp $
+# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/kde-misc/synaptiks/ChangeLog,v 1.13 2011/01/03 18:56:57 dilfridge Exp $
+
+*synaptiks-0.4.0-r1 (03 Jan 2011)
+
+  03 Jan 2011; Andreas K. Huettel <dilfridge@gentoo.org>
+  -synaptiks-0.4.0.ebuild, +synaptiks-0.4.0-r1.ebuild,
+  +files/synaptiks-0.4.0-kcmdesktop.patch:
+  Add upstream patch to fix type of kcm module (bug 342623)
 
   21 Jul 2010; Tomáš Chvátal <scarabeus@gentoo.org>
   synaptiks-0.4.0.ebuild:
diff --git a/kde-misc/synaptiks/Manifest b/kde-misc/synaptiks/Manifest
index 9f1a30feb224..3cbc25925bff 100644
--- a/kde-misc/synaptiks/Manifest
+++ b/kde-misc/synaptiks/Manifest
@@ -1,6 +1,7 @@
+AUX synaptiks-0.4.0-kcmdesktop.patch 376 RMD160 939f17233bb095a23d7f1fa4c3f0f9467c6ea1c3 SHA1 b3f44b78e8ca60d6c45ba296324db46d72eb35dc SHA256 70993440c24c0f9b7e554e5da6aae3592c00dedc7c3c190e0a969b82ee4fce60
 DIST synaptiks-0.3.2.tar.bz2 618459 RMD160 48c1ce1c5b5e8461fde884a7283bc4c487a4729a SHA1 f0a89c371d41355a457f7b420b1a8a5151f159a2 SHA256 21b0179b0f2e753b153ad7daff47231e346110d901287b9d4784622c64997392
 DIST synaptiks-0.4.0.tar.bz2 751043 RMD160 e2f66095e39c86d1452d55620b904bed6a57bba9 SHA1 a336409683edf808aab72398c2eb9ac3834fc0ca SHA256 a7068de45c7c34dbea2fcc1d92c62dc5e6ed9d96de3fc900153dcc196139dbf8
 EBUILD synaptiks-0.3.2-r1.ebuild 730 RMD160 d94da0555ed094df5815c598e61b3908718708e5 SHA1 8d0092664a008e66af83995e0f40609903fb3796 SHA256 4d3340e72d2167cd7a8d9b11441854bf01404a9f5a285aa2754c792b6260465a
-EBUILD synaptiks-0.4.0.ebuild 704 RMD160 9962f762d4df1c6113075b37501c83963b572bd3 SHA1 4cf51527a2d94dc92b98856a980c6069f8455516 SHA256 be871822a16935b9bc7369110e819c69dc9cc4509f0e32688689514e75360ca3
-MISC ChangeLog 1902 RMD160 fe2a8a0d3a636039d531358480c5ed8c65b2949e SHA1 9d4f8cfbeb405c7b905eef4af909c4b59af367f1 SHA256 adbce17820b9b1e6ff733eb6bf27567c1a91d357f613309eb47a7d2bf038b39b
+EBUILD synaptiks-0.4.0-r1.ebuild 754 RMD160 c0f3dc0347f3e3910f6346ee0246973315bae888 SHA1 bd9cc6bf013016b3fa5771f562b29365531d22ee SHA256 95370428c4cf4409acc908c7c4029f5271cb390fb1572384c9daecf45fb9cba2
+MISC ChangeLog 2153 RMD160 4b1f018498ee5103dbfda0bd48ef1b668c186637 SHA1 90789b28bc6e30f3a961998728ecfe7403ce122d SHA256 ff82ae14d8e491db62c515873e5a16fbb51be28cc48f2c4ad1432e0db4be99a6
 MISC metadata.xml 156 RMD160 ecce3b981f150c45ae1e84e2d208e678d6124259 SHA1 b64f7c0b4e5db816d82ad19848f72118af129d35 SHA256 2f4da28506b9d4185f320f67a6191d30c7a921217ed4447ed46ea0bc4aefc79a
diff --git a/kde-misc/synaptiks/files/synaptiks-0.4.0-kcmdesktop.patch b/kde-misc/synaptiks/files/synaptiks-0.4.0-kcmdesktop.patch
new file mode 100644
index 000000000000..94eb3e30da1e
--- /dev/null
+++ b/kde-misc/synaptiks/files/synaptiks-0.4.0-kcmdesktop.patch
@@ -0,0 +1,10 @@
+--- trunk/playground/utils/synaptiks/kcmodule/synaptiks.desktop	2010/03/02 09:34:31	1097869
++++ trunk/playground/utils/synaptiks/kcmodule/synaptiks.desktop	2010/05/19 11:54:23	1128478
+@@ -9,6 +9,7 @@
+ X-KDE-ParentApp=kcontrol
+ 
+ X-KDE-System-Settings-Parent-Category=keyboard-and-mouse
++X-KDE-System-Settings-Parent-Category-V2=input-devices
+ X-KDE-Weight=65
+ 
+ Name=Touchpad
diff --git a/kde-misc/synaptiks/synaptiks-0.4.0.ebuild b/kde-misc/synaptiks/synaptiks-0.4.0-r1.ebuild
index b7cacdd2d273..b8359821cd3e 100644
--- a/kde-misc/synaptiks/synaptiks-0.4.0.ebuild
+++ b/kde-misc/synaptiks/synaptiks-0.4.0-r1.ebuild
@@ -1,12 +1,12 @@
-# Copyright 1999-2010 Gentoo Foundation
+# Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-misc/synaptiks/synaptiks-0.4.0.ebuild,v 1.3 2010/07/21 21:29:27 scarabeus Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-misc/synaptiks/synaptiks-0.4.0-r1.ebuild,v 1.1 2011/01/03 18:56:57 dilfridge Exp $
 
 EAPI=2
 KDE_LINGUAS="cs da de es ga lt nds pt pt_BR ru sv uk"
 inherit kde4-base
 
-DESCRIPTION="A simple touchpad management service for KDE"
+DESCRIPTION="Simple touchpad management service for KDE"
 HOMEPAGE="http://synaptiks.lunaryorn.de/"
 SRC_URI="http://bitbucket.org/lunar/${PN}/downloads/${P}.tar.bz2"
 
@@ -17,6 +17,8 @@ IUSE="debug +handbook"
 
 DEPEND="x11-libs/libXi"
 
+PATCHES=( "${FILESDIR}/${P}"-kcmdesktop.patch )
+
 src_configure() {
 	if has_version ">=x11-libs/libXi-1.3"; then
 		mycmakeargs+=( -DHAVE_XINPUT2=ON )