[gentoo-commits] proj/kde:master commit in: Documentation/package.unmask/, Documentation/package.keywords/.kde-live/, ...

[Johannes Huber]

commit:     272adba7c496bb9bb818b1ef9fc5bb1dc96a4575
Author:     Johannes Huber <johu <AT> gentoo <DOT> org>
AuthorDate: Wed Dec 21 14:29:00 2011 +0000
Commit:     Johannes Huber <johu <AT> gentoo <DOT> org>
CommitDate: Wed Dec 21 14:29:54 2011 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/kde.git;a=commit;h=272adba7

[kde-base/ksecrets] New package

(Portage version: 2.2.0_alpha81/git/Linux x86_64, unsigned Manifest commit)

---
 .../package.keywords/.kde-live/kdeutils-live       |    1 +
 Documentation/package.keywords/kde-live.keywords   |    1 +
 Documentation/package.unmask/kde-live              |    1 +
 .../ksecrets/files/ksecrets-9999-fix-build.patch   |  207 ++++++++++++++++++++
 kde-base/ksecrets/ksecrets-9999.ebuild             |   23 +++
 kde-base/ksecrets/metadata.xml                     |    5 +
 sets/kdeutils-live                                 |    1 +
 7 files changed, 239 insertions(+), 0 deletions(-)

diff --git a/Documentation/package.keywords/.kde-live/kdeutils-live b/Documentation/package.keywords/.kde-live/kdeutils-live
index c52fd7b..2316ca0 100644
--- a/Documentation/package.keywords/.kde-live/kdeutils-live
+++ b/Documentation/package.keywords/.kde-live/kdeutils-live
@@ -7,6 +7,7 @@
 ~kde-base/kgpg-9999 **
 ~kde-base/kremotecontrol-9999 **
 ~kde-base/ktimer-9999 **
+~kde-base/ksecrets-9999 **
 ~kde-base/kwallet-9999 **
 ~kde-base/printer-applet-9999 **
 ~kde-base/superkaramba-9999 **

diff --git a/Documentation/package.keywords/kde-live.keywords b/Documentation/package.keywords/kde-live.keywords
index a72d9bd..aa2200b 100644
--- a/Documentation/package.keywords/kde-live.keywords
+++ b/Documentation/package.keywords/kde-live.keywords
@@ -299,6 +299,7 @@
 ~kde-base/kgpg-9999 **
 ~kde-base/kremotecontrol-9999 **
 ~kde-base/ktimer-9999 **
+~kde-base/ksecrets-9999 **
 ~kde-base/kwallet-9999 **
 ~kde-base/printer-applet-9999 **
 ~kde-base/superkaramba-9999 **

diff --git a/Documentation/package.unmask/kde-live b/Documentation/package.unmask/kde-live
index 559e280..b688760 100644
--- a/Documentation/package.unmask/kde-live
+++ b/Documentation/package.unmask/kde-live
@@ -299,6 +299,7 @@
 ~kde-base/kgpg-9999
 ~kde-base/kremotecontrol-9999
 ~kde-base/ktimer-9999
+~kde-base/ksecrets-9999
 ~kde-base/kwallet-9999
 ~kde-base/printer-applet-9999
 ~kde-base/superkaramba-9999

diff --git a/kde-base/ksecrets/files/ksecrets-9999-fix-build.patch b/kde-base/ksecrets/files/ksecrets-9999-fix-build.patch
new file mode 100644
index 0000000..a4cc4aa
--- /dev/null
+++ b/kde-base/ksecrets/files/ksecrets-9999-fix-build.patch
@@ -0,0 +1,207 @@
+From eae0ceaaea0b5b63a7213172b4e82e5f0e067c34 Mon Sep 17 00:00:00 2001
+From: Johannes Huber <johu@g.o>
+Date: Wed, 21 Dec 2011 15:01:13 +0100
+Subject: [PATCH] Fix build, use correct include for QtCrypto
+
+---
+ ksecretsserviced/backend/backendcollection.h       |    2 +-
+ ksecretsserviced/backend/backenditem.h             |    2 +-
+ ksecretsserviced/backend/securebuffer.h            |    2 +-
+ ksecretsserviced/backend/tests/securebuffertest.h  |    2 +-
+ .../frontend/secret/adaptors/daemonsecret.h        |    2 +-
+ ksecretsserviced/frontend/secret/session.h         |    2 +-
+ ksecretsserviced/frontend/tests/servicetest.cpp    |    2 +-
+ ksecretsserviced/jobinfostructs.h                  |    2 +-
+ ksecretsserviced/main.cpp                          |    2 +-
+ ksecretsserviced/ui/abstractuijobs.h               |    2 +-
+ .../ui/tests/dialogaskaclprefstest.cpp             |    2 +-
+ ksecretsserviced/ui/tests/dialoguimanagertest.cpp  |    2 +-
+ ksecretsserviced/ui/tests/nouimanagertest.cpp      |    2 +-
+ secretsync/main.cpp                                |    2 +-
+ 14 files changed, 14 insertions(+), 14 deletions(-)
+
+diff --git a/ksecretsserviced/backend/backendcollection.h b/ksecretsserviced/backend/backendcollection.h
+index 7ddb4dd..fb3d390 100644
+--- a/ksecretsserviced/backend/backendcollection.h
++++ b/ksecretsserviced/backend/backendcollection.h
+@@ -32,7 +32,7 @@
+ #include <QtCore/QDateTime>
+ #include <QtCore/QList>
+ #include <QtCore/QMap>
+-#include <QtCrypto/QtCrypto>
++#include <QtCrypto>
+ 
+ class BackendCollectionManager;
+ class BackendItem;
+diff --git a/ksecretsserviced/backend/backenditem.h b/ksecretsserviced/backend/backenditem.h
+index d3f3857..b66517e 100644
+--- a/ksecretsserviced/backend/backenditem.h
++++ b/ksecretsserviced/backend/backenditem.h
+@@ -28,7 +28,7 @@
+ 
+ #include <QtCore/QMap>
+ #include <QtCore/QDateTime>
+-#include <QtCrypto/QtCrypto>
++#include <QtCrypto>
+ 
+ class BackendCollection;
+ 
+diff --git a/ksecretsserviced/backend/securebuffer.h b/ksecretsserviced/backend/securebuffer.h
+index 2a9cb46..ea5aa18 100644
+--- a/ksecretsserviced/backend/securebuffer.h
++++ b/ksecretsserviced/backend/securebuffer.h
+@@ -27,7 +27,7 @@
+ #define SECUREBUFFER_H
+ 
+ #include <QtCore/QIODevice>
+-#include <QtCrypto/QtCrypto>
++#include <QtCrypto>
+ 
+ class SecureBufferPrivate;
+ 
+diff --git a/ksecretsserviced/backend/tests/securebuffertest.h b/ksecretsserviced/backend/tests/securebuffertest.h
+index 27c7f97..3fb3d80 100644
+--- a/ksecretsserviced/backend/tests/securebuffertest.h
++++ b/ksecretsserviced/backend/tests/securebuffertest.h
+@@ -28,7 +28,7 @@
+ 
+ #include <QtCore/QObject>
+ #include <QtCore/QMetaType>
+-#include <QtCrypto/QtCrypto>
++#include <QtCrypto>
+ 
+ Q_DECLARE_METATYPE(QCA::SecureArray)
+ 
+diff --git a/ksecretsserviced/frontend/secret/adaptors/daemonsecret.h b/ksecretsserviced/frontend/secret/adaptors/daemonsecret.h
+index 4e8976e..ebd8580 100644
+--- a/ksecretsserviced/frontend/secret/adaptors/daemonsecret.h
++++ b/ksecretsserviced/frontend/secret/adaptors/daemonsecret.h
+@@ -27,7 +27,7 @@
+ #include <QtCore/QByteArray>
+ #include <QtDBus/QDBusObjectPath>
+ #include <QtDBus/QDBusArgument>
+-#include <QtCrypto/QtCrypto>
++#include <QtCrypto>
+ 
+ /**
+  * This class represents secret (possibly encrypted) for transfer on the
+diff --git a/ksecretsserviced/frontend/secret/session.h b/ksecretsserviced/frontend/secret/session.h
+index c42e0f0..c3c3bd7 100644
+--- a/ksecretsserviced/frontend/secret/session.h
++++ b/ksecretsserviced/frontend/secret/session.h
+@@ -26,7 +26,7 @@
+ #include <peer.h>
+ 
+ #include <QtCore/QObject>
+-#include <QtCrypto/QtCrypto>
++#include <QtCrypto>
+ 
+ #include "ksecretobject.h"
+ #include <ksecretsservicecodec.h>
+diff --git a/ksecretsserviced/frontend/tests/servicetest.cpp b/ksecretsserviced/frontend/tests/servicetest.cpp
+index d84e7b6..548ede1 100644
+--- a/ksecretsserviced/frontend/tests/servicetest.cpp
++++ b/ksecretsserviced/frontend/tests/servicetest.cpp
+@@ -35,7 +35,7 @@
+ #include <QtDBus/QDBusMessage>
+ #include <QtDBus/QDBusReply>
+ #include <QtDBus/QDBusConnectionInterface>
+-#include <QtCrypto/QtCrypto>
++#include <QtCrypto>
+ 
+ #include <QtCore/QDebug>
+ #include "../secret/adaptors/dbustypes.h"
+diff --git a/ksecretsserviced/jobinfostructs.h b/ksecretsserviced/jobinfostructs.h
+index 49cdb40..83cd939 100644
+--- a/ksecretsserviced/jobinfostructs.h
++++ b/ksecretsserviced/jobinfostructs.h
+@@ -40,7 +40,7 @@
+ 
+ #include <QtCore/QString>
+ #include <QtCore/QMap>
+-#include <QtCrypto/QtCrypto>
++#include <QtCrypto>
+ 
+ #include "peer.h"
+ 
+diff --git a/ksecretsserviced/main.cpp b/ksecretsserviced/main.cpp
+index f13a798..2a9bbb8 100644
+--- a/ksecretsserviced/main.cpp
++++ b/ksecretsserviced/main.cpp
+@@ -24,7 +24,7 @@
+ #include <kcmdlineargs.h>
+ #include <kdebug.h>
+ #include <QtDBus/QDBusConnection>
+-#include <QtCrypto/QtCrypto>
++#include <QtCrypto>
+ #include <iostream>
+ 
+ #include "backend/backendmaster.h"
+diff --git a/ksecretsserviced/ui/abstractuijobs.h b/ksecretsserviced/ui/abstractuijobs.h
+index 796676b..ab9d425 100644
+--- a/ksecretsserviced/ui/abstractuijobs.h
++++ b/ksecretsserviced/ui/abstractuijobs.h
+@@ -22,7 +22,7 @@
+ #define ABSTRACTUIJOBS_H
+ 
+ #include <QtCore/QQueue>
+-#include <QtCrypto/QtCrypto>
++#include <QtCrypto>
+ #include <kglobal.h>
+ #include <kjob.h>
+ #include <kcompositejob.h>
+diff --git a/ksecretsserviced/ui/tests/dialogaskaclprefstest.cpp b/ksecretsserviced/ui/tests/dialogaskaclprefstest.cpp
+index 072ffa0..4fe8523 100644
+--- a/ksecretsserviced/ui/tests/dialogaskaclprefstest.cpp
++++ b/ksecretsserviced/ui/tests/dialogaskaclprefstest.cpp
+@@ -21,7 +21,7 @@
+ #include "dialogaskaclprefstest.h"
+ #include "../dialoguimanager.h"
+ 
+-#include <QtCrypto/QtCrypto>
++#include <QtCrypto>
+ #include <qtest_kde.h>
+ 
+ void DialogAskAclPrefsTest::initTestCase()
+diff --git a/ksecretsserviced/ui/tests/dialoguimanagertest.cpp b/ksecretsserviced/ui/tests/dialoguimanagertest.cpp
+index d187ce9..0530c7e 100644
+--- a/ksecretsserviced/ui/tests/dialoguimanagertest.cpp
++++ b/ksecretsserviced/ui/tests/dialoguimanagertest.cpp
+@@ -20,7 +20,7 @@
+ 
+ #include "dialoguimanagertest.h"
+ 
+-#include <QtCrypto/QtCrypto>
++#include <QtCrypto>
+ #include <qtest_kde.h>
+ 
+ #include "../dialoguimanager.h"
+diff --git a/ksecretsserviced/ui/tests/nouimanagertest.cpp b/ksecretsserviced/ui/tests/nouimanagertest.cpp
+index 5fa90ef..72f48d9 100644
+--- a/ksecretsserviced/ui/tests/nouimanagertest.cpp
++++ b/ksecretsserviced/ui/tests/nouimanagertest.cpp
+@@ -20,7 +20,7 @@
+ 
+ #include "nouimanagertest.h"
+ 
+-#include <QtCrypto/QtCrypto>
++#include <QtCrypto>
+ #include <QtTest/QTestEventLoop>
+ #include <qtest_kde.h>
+ 
+diff --git a/secretsync/main.cpp b/secretsync/main.cpp
+index c2f8a53..35dba06 100644
+--- a/secretsync/main.cpp
++++ b/secretsync/main.cpp
+@@ -26,7 +26,7 @@
+ #include <QtDBus/QDBusConnection>
+ #include <klocalizedstring.h>
+ #include <kstandarddirs.h>
+-#include <QtCrypto/QtCrypto>
++#include <QtCrypto>
+ 
+ #include "ksecretsyncwindow.h"
+ 
+-- 
+1.7.8
+

diff --git a/kde-base/ksecrets/ksecrets-9999.ebuild b/kde-base/ksecrets/ksecrets-9999.ebuild
new file mode 100644
index 0000000..38ec352
--- /dev/null
+++ b/kde-base/ksecrets/ksecrets-9999.ebuild
@@ -0,0 +1,23 @@
+# Copyright 1999-2011 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: $
+
+EAPI=4
+
+KDE_SCM="git"
+inherit kde4-base
+
+DESCRIPTION="KDE secrets service"
+KEYWORDS=""
+IUSE="debug"
+
+# >=x11-libs/qt-core-${QT_MINIMAL}:4[ssl]
+DEPEND="
+	app-crypt/qca:2
+	net-libs/libssh2
+"
+RDEPEND="${DEPEND}"
+
+PATCHES=(
+	"${FILESDIR}/${P}-fix-build.patch"
+)

diff --git a/kde-base/ksecrets/metadata.xml b/kde-base/ksecrets/metadata.xml
new file mode 100644
index 0000000..8d1e86a
--- /dev/null
+++ b/kde-base/ksecrets/metadata.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<herd>kde</herd>
+</pkgmetadata>

diff --git a/sets/kdeutils-live b/sets/kdeutils-live
index 3ed88bf..f2e3acd 100644
--- a/sets/kdeutils-live
+++ b/sets/kdeutils-live
@@ -7,6 +7,7 @@
 ~kde-base/kgpg-9999
 ~kde-base/kremotecontrol-9999
 ~kde-base/ktimer-9999
+~kde-base/ksecrets-9999
 ~kde-base/kwallet-9999
 ~kde-base/printer-applet-9999
 ~kde-base/superkaramba-9999