Added a missing patch file.

Package-Manager: portage-2.2_rc11/cvs/Linux 2.6.26-gentoo-r1 x86_64

5 files changed, 143 insertions, 8 deletions

diff --git a/kde-base/systemsettings/ChangeLog b/kde-base/systemsettings/ChangeLog
index 23389bf72486..c5bddeb0a0cb 100644
--- a/kde-base/systemsettings/ChangeLog
+++ b/kde-base/systemsettings/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for kde-base/systemsettings
 # Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/systemsettings/ChangeLog,v 1.11 2008/06/09 15:32:50 keytoaster Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/systemsettings/ChangeLog,v 1.12 2008/10/02 11:53:22 jmbsvicetto Exp $
+
+*systemsettings-4.1.2 (02 Oct 2008)
+
+  02 Oct 2008; Jorge Manuel B. S. Vicetto <jmbsvicetto@gentoo.org>
+  +files/systemsettings-enable-admin-mode.patch, metadata.xml,
+  +systemsettings-4.1.2.ebuild:
+  Added a missing patch file.
 
   09 Jun 2008; Tobias Heinlein <keytoaster@gentoo.org>
   -systemsettings-4.0.2.ebuild, -systemsettings-4.0.3.ebuild:
diff --git a/kde-base/systemsettings/Manifest b/kde-base/systemsettings/Manifest
index 1155197e7ae1..9e295e2439a3 100644
--- a/kde-base/systemsettings/Manifest
+++ b/kde-base/systemsettings/Manifest
@@ -1,7 +1,10 @@
 AUX systemsettings-4.0.2-opengl.patch 353 RMD160 47836819fdd5947106c16c00ed7e31456102df07 SHA1 1e193087e4d01aeb13f79df837d2141811dcc281 SHA256 d5330a09354d15712a80af9231f0af645286cdc8a6b396d8d2f9a7384ebcf371
-DIST kdebase-workspace-4.0.4.tar.bz2 2338536 RMD160 d35f5318b2c7dc78f5100033bf229013795d1550 SHA1 644a2bf54fa5000a15fa66470e59fb638db57c61 SHA256 2b78d883c8c281f987bc6f2ad6db985ed9c2403937197e0fd807d82708cd24dd
+AUX systemsettings-enable-admin-mode.patch 2282 RMD160 d213394d82d4cbbfe7da8cc8596f526e5e20a407 SHA1 64066963c069e82de3ab782dfd85b8f046d5574c SHA256 a02c0ff5dcf1d6d47268493a4e38500b12dd0c5299617536e7aee458f09f3705
+DIST kdebase-workspace-4.0.4.tar.bz2 29604848 RMD160 df9868f650138dc77d6d7f87666a0f4375dcee73 SHA1 c5a3078e602f78ac6a262761b24ad16f3d01e7a7 SHA256 8e641f7e53474d9b39bde9fe183bb5c1f43c11f72a02d271f16fcead5b74b76c
 DIST kdebase-workspace-4.0.5.tar.bz2 29690232 RMD160 bf234c0633dc3c2ae22d59c0d51234bcb829eb50 SHA1 702236af68f60f43fb07a9289ebee71f1626cc53 SHA256 2c59ed8884d5adf09f84a4f295aecf86cb381d5a3f72bed13ab0c3889f765e3e
+DIST kdebase-workspace-4.1.2.tar.bz2 47500082 RMD160 7491748580f3f40e4646a28af8f64caccc919bdd SHA1 46a2c14edfca05deb271a047bed292f7d71b8c5b SHA256 4d3273c7e1bb767136e9f4e8eb8717489d4d36eaa0fbd7d391515760d28cb804
 EBUILD systemsettings-4.0.4.ebuild 1586 RMD160 e0d2ea5972dbb1ba2e5342cbc2acd65eb5b844dd SHA1 608121342991ddeff3ed9750848848d0615d837d SHA256 e1b0f35e8524b4f7f844ecf63aef9cbdc0bd605d70b3ccb60a7387ad43b3e23f
 EBUILD systemsettings-4.0.5.ebuild 1590 RMD160 9a31b40b244bec7cf243e8078292bf7087b14d42 SHA1 bc036f6911379f9ff2803b547130ebff51092e78 SHA256 4227ddf8d2e08df53681eba31ddb00997bd8adcfef39c886e63db5b07d21754a
-MISC ChangeLog 2324 RMD160 222691978fbc80b3a7f3d92d17fb363c20d834f2 SHA1 f70c539a01e77befc3e70224c425e536e4c78177 SHA256 1bc8bbe13fd69357c307bebf36c83cfb7334f7ce24fc0dcb7793d338ba1a37d2
-MISC metadata.xml 235 RMD160 f8c6cb3e7b4d2479bc1596e50b0d15c268951cb8 SHA1 74006a9017dc0c4b7be51057386db414132b6061 SHA256 4ca0e636aa359061d0aaff72543334d5fae887bff33bb520648c3b9754529b7a
+EBUILD systemsettings-4.1.2.ebuild 1574 RMD160 7a4b570c416bb162d06b624233c6161d5ce0a274 SHA1 b64f8b964c1dc0e590c8a4bc768d10f6286275d4 SHA256 9dbdb2306de96c03897c7a9688b2cce77c8ca58ba45c1d846bad2ca25101d5c4
+MISC ChangeLog 2555 RMD160 a4ddb774f2e592394a2e5d5c7e311358bb196f96 SHA1 957e25b08e47e15594470b860a185b0b786e7817 SHA256 6b26142e5dc49aa82f4b9416a8ffa9ea919dc705ef0a87b629ca3bc8e3ee12ed
+MISC metadata.xml 156 RMD160 ecce3b981f150c45ae1e84e2d208e678d6124259 SHA1 b64f7c0b4e5db816d82ad19848f72118af129d35 SHA256 2f4da28506b9d4185f320f67a6191d30c7a921217ed4447ed46ea0bc4aefc79a
diff --git a/kde-base/systemsettings/files/systemsettings-enable-admin-mode.patch b/kde-base/systemsettings/files/systemsettings-enable-admin-mode.patch
new file mode 100644
index 000000000000..0f41b4dddd6d
--- /dev/null
+++ b/kde-base/systemsettings/files/systemsettings-enable-admin-mode.patch
@@ -0,0 +1,68 @@
+--- systemsettings-4.1.0/systemsettings/mainwindow.cpp.orig	2008-06-10 15:41:03.000000000 +0400
++++ systemsettings-4.1.0/systemsettings/mainwindow.cpp	2008-07-25 15:43:14.000000000 +0400
+@@ -27,6 +27,7 @@
+ 
+ #include <QLayout>
+ #include <QStackedWidget>
++#include <QProcess>
+ 
+ #include <KAction>
+ #include <KActionCollection>
+@@ -42,6 +43,7 @@
+ #include <KStandardAction>
+ #include <KTabWidget>
+ #include <kcategorizedsortfilterproxymodel.h>
++#include <KStandardDirs>
+ #include <kcategorizedview.h>
+ #include <kcategorydrawer.h>
+ #include <kiconloader.h>
+@@ -299,9 +301,13 @@
+         return;
+ 
+     MenuItem * mItem = selected.data( Qt::UserRole ).value<MenuItem*>();
++    bool needsRootPrivs = false;
+     if ( mItem ) {
+         kDebug() << "Selected item: " << mItem->service->name();
+         kDebug() << "Comment:       " << mItem->service->comment();
++
++        needsRootPrivs = mItem->service->property( "X-KDE-RootOnly", QVariant::Bool ).toBool();
++        kDebug() << "Needs root privs:" << needsRootPrivs;
+     } else {
+         kDebug() << ":'( Got dud pointer from " << selected.data( Qt::DisplayRole ).toString();
+         Q_ASSERT(mItem); // Would core dump below. Do it now
+@@ -313,6 +319,35 @@
+     if ( groupWidget )
+         return;
+ 
++    if ( needsRootPrivs )
++    {
++        QString kdesu = KStandardDirs::findExe( "kdesu" );
++        //kDebug() << "kdesu path:" << kdesu;
++
++        QString cmd = mItem->service->exec().trimmed();
++
++        /* Prepare the process to run the kcmshell */
++        if ( cmd.left(5) == "kdesu" )
++        {
++            cmd = cmd.remove(0,5).trimmed();
++
++            /* Remove all kdesu switches */
++            while ( cmd.length() > 1 && cmd[ 0 ] == '-' )
++                cmd = cmd.remove( 0, cmd.indexOf( ' ' ) ).trimmed();
++        }
++
++        if ( cmd.left(9) == "kcmshell4" )
++            cmd = cmd.remove(0,9).trimmed();
++
++        QStringList args;
++        args << "-c" << QString( "%1 %2 --lang %3" ).arg( KStandardDirs::locate("exe", "kcmshell4") ).arg( cmd ).arg( KGlobal::locale()->language() );
++
++        kDebug() << "Starting root module: " << args;
++        QProcess::execute( kdesu, args );
++
++        return;
++    }
++
+     groupWidget = moduleItemToWidgetDict[mItem->service];
+ 
+     if( !groupWidget ) {
diff --git a/kde-base/systemsettings/metadata.xml b/kde-base/systemsettings/metadata.xml
index 43001be7cfe1..8d1e86a9cefb 100644
--- a/kde-base/systemsettings/metadata.xml
+++ b/kde-base/systemsettings/metadata.xml
@@ -1,8 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>kde</herd>
-  <use>
-    <flag name="usb">Configure USB and logitech mice</flag>
-  </use>
+<herd>kde</herd>
 </pkgmetadata>
diff --git a/kde-base/systemsettings/systemsettings-4.1.2.ebuild b/kde-base/systemsettings/systemsettings-4.1.2.ebuild
new file mode 100644
index 000000000000..d7cab85dba58
--- /dev/null
+++ b/kde-base/systemsettings/systemsettings-4.1.2.ebuild
@@ -0,0 +1,60 @@
+# Copyright 1999-2008 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/kde-base/systemsettings/systemsettings-4.1.2.ebuild,v 1.1 2008/10/02 11:53:22 jmbsvicetto Exp $
+
+EAPI="2"
+
+KMNAME=kdebase-workspace
+OPENGL_REQUIRED="optional"
+inherit kde4-meta
+
+DESCRIPTION="System settings utility"
+IUSE="debug htmlhandbook opengl +usb xinerama"
+KEYWORDS="~amd64 ~x86"
+
+COMMONDEPEND="
+	>=app-misc/strigi-0.5.7
+	>=dev-libs/glib-2
+	media-libs/fontconfig
+	>=media-libs/freetype-2
+	>=x11-libs/libxklavier-3.2
+	x11-libs/libXcursor
+	x11-libs/libXext
+	x11-libs/libXfixes
+	x11-libs/libXft
+	>=x11-libs/libXrandr-1.2.1
+	x11-libs/libXtst
+	opengl? ( virtual/opengl )
+	usb? ( >=dev-libs/libusb-0.1.10a )
+	xinerama? ( x11-libs/libXinerama )"
+DEPEND="${COMMONDEPEND}
+	x11-proto/xextproto
+	x11-proto/kbproto
+	xinerama? ( x11-proto/xineramaproto )"
+RDEPEND="${COMMONDEPEND}
+	kde-base/kcontrol:${SLOT}
+	|| ( x11-misc/xkeyboard-config
+		x11-misc/xkbdata )
+	x11-apps/setxkbmap"
+
+KMEXTRA="kcontrol/"
+
+KMEXTRACTONLY="krunner/org.kde.krunner.App.xml
+	krunner/org.kde.screensaver.xml
+	kwin/
+	libs/
+	plasma/"
+
+# FIXME: is have_openglxvisual found without screensaver
+src_configure() {
+	# Old keyboard-detection code is unmaintained,
+	# so we force the new stuff, using libxklavier.
+	mycmakeargs="${mycmakeargs}
+		-DUSE_XKLAVIER=ON -DWITH_LibXKlavier=ON
+		-DWITH_GLIB2=ON -DWITH_GObject=ON
+		$(cmake-utils_use_with opengl OpenGL)
+		$(cmake-utils_use_with usb USB)
+		$(cmake-utils_use_with xinerama X11_Xinerama)"
+
+	kde4-meta_src_configure
+}