Introduce USE flag openconnect, bug #497628. Remove old.

Package-Manager: portage-2.2.8-r1/cvs/Linux x86_64
Manifest-Sign-Key: 0xF3CFD2BD

6 files changed, 138 insertions, 50 deletions

diff --git a/kde-misc/plasma-nm/ChangeLog b/kde-misc/plasma-nm/ChangeLog
index 8b3d4636de91..2c15ab652cb9 100644
--- a/kde-misc/plasma-nm/ChangeLog
+++ b/kde-misc/plasma-nm/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for kde-misc/plasma-nm
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/kde-misc/plasma-nm/ChangeLog,v 1.4 2014/02/28 00:21:33 mrueg Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-misc/plasma-nm/ChangeLog,v 1.5 2014/03/12 15:11:28 johu Exp $
+
+  12 Mar 2014; Johannes Huber <johu@gentoo.org>
+  +files/plasma-nm-0.9.3.3-openconnect-build.patch, -plasma-nm-0.9.3.2.ebuild,
+  metadata.xml, plasma-nm-0.9.3.3.ebuild:
+  Introduce USE flag openconnect, bug #497628. Remove old.
 
 *plasma-nm-0.9.3.3 (28 Feb 2014)
 
diff --git a/kde-misc/plasma-nm/Manifest b/kde-misc/plasma-nm/Manifest
index 3c4588ddfbba..8bc7ee47f2c7 100644
--- a/kde-misc/plasma-nm/Manifest
+++ b/kde-misc/plasma-nm/Manifest
@@ -1,6 +1,25 @@
-DIST plasma-nm-0.9.3.2.tar.xz 468108 SHA256 b3294602ab0cc61048787d94350f2731be9a6b3720a23249fb003e60c7e68065 SHA512 51b9b4a2d861fd6d3deb1a28f977cb4e817ab5b14f512b4b2dd1f4a6bc43fc6e1d575930cd5c654e540c0d29200b17088f7026b7ab8d33341887e38cd13716aa WHIRLPOOL 1a31d40c850e545ec387dc4aa450b4345d4602c427c6c5735974d1256d397cb416dc80e5a1eca079a0f9caca815638e100dae5f3d8eef346038e426245c8464a
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA256
+
+AUX plasma-nm-0.9.3.3-openconnect-build.patch 4636 SHA256 961d17c8ec0d8561b479d8a3186b39fbbf204db62b9e14ff9820c467a0ec4f39 SHA512 afd245ccf0fefdfbe424178079092bcbf965e3e6db28f3e1ba7181a667bc35b60df20a52d763426693fa55863c930613fa6e86995a51b00d8d4bccdb35471b04 WHIRLPOOL 73029e05bd262024131b1f1d4bf98eb3fc649ea7974daa0e990cc6a09ef4db9c8d77f79e7affd7af0ae0605fbe32283b176da3fd683f4671b5c415a739821b0c
 DIST plasma-nm-0.9.3.3.tar.xz 464516 SHA256 099cbe86eb989c4fda8cdcc0f8721dc3350cc6735c3f50bcdd94661e5930e326 SHA512 03971bf051ffa35bd159a7e113c0ed54925cf087fcbb586c92e481084041d16b39ec65ff4c557c791b06bfaa68f8c72b2428cc75a46923afafcd666e84382181 WHIRLPOOL f2301e1ca6279c94210acd04b46b29a14acc489efe97c2486f7708f4d03b22029387f81c92a83df4efcb3806bc9ed1dc574810f8aec372cba20e5876fe86b14a
-EBUILD plasma-nm-0.9.3.2.ebuild 1147 SHA256 96c2ab1703228361bee1b31413ce65123947f75bf39c5af0b974925089a6d3a2 SHA512 4a2407d89b441191721d5a663617193e242db25106b09e26cdb618f03d53bfe9eaf4e3bd6b6d49f04818fdb8c1b0ced695fde0d619877747f536e136695eb93f WHIRLPOOL 16c53d43dee3443e7e64fe3ab4afe06af7150f0fbbd693e4f804334619f661f558240c384ff927f9bd28026aec59563d6a4411a982f89525ba57197946fbbd4a
-EBUILD plasma-nm-0.9.3.3.ebuild 1148 SHA256 e79f54a392e3e957aa11b63e696fc76731d90a99a5070fec767ef374d94378dd SHA512 83cf2fb724415a196c1465dcfe58287684188229a680a932a3ecc2cca017fb0042329454e5b08f42b8f6eeb0758333fece0b927aa4e9322d35737b8c1241b792 WHIRLPOOL 759101a5e95ffb27c2a043422b1104017ea321cdc9f3ac2f2d0a6c627d914c448b9318645387c92752b4c3a10bad0b0dd08e03cb33f06c4ef98d9234f17efb1b
-MISC ChangeLog 1084 SHA256 ab19efb02073b96ab5e7aa9c72284b02b7b3a2a3d5e9653f141f84f23f6950be SHA512 79d841b158552625bacbd47d3cb72beaf3b7c0a0e783978eec8e860964bdfe566b2e3cb8d1b5fc78a955ee22a168e23eb678e98a9685deaf8249ad14ff5e5eb3 WHIRLPOOL d1c7c4f678c56dd8e1fb082dcf2f5c20ebaf942796d7fc437fd26e2b78ad428c5e2b1145124a1f5daefcbfe92b66c0b9681021b9c10953a39144dd8ef2beb093
-MISC metadata.xml 251 SHA256 7d7875656c10edc58cca61fa5448e1b406a649ef807b2685d0a5f062f46a6bc2 SHA512 a50db5a1dafbf407a8daab12e39958ded6168feb4bea94365a33a0d53b0f450c11dd7e59dab399b5c3b872023609ee2ba71cf02717885ab4a6c53dfe295b73dc WHIRLPOOL 35b454b452be4433d942dd7f2ad26ac9b29086d620966a33399f9bf744b81518a2b895a7633426ea9cdf13d7294d6a0c66a04d34bb8fcb4a5ff573a8bb4ebfef
+EBUILD plasma-nm-0.9.3.3.ebuild 1312 SHA256 4a8b790a10ebcdd020d1e198eb4b4e78965f34320fa209e15bfcbda4baf82bd1 SHA512 542b82cd0b4d4e3fccd5024f07f52318d96d19ca83750bbd5974f03bfb1a4a4c271b961acb97efa047154cec790a13859f28692b7183e6a4f928830b4d8b34ee WHIRLPOOL 2a809d4a1e73fb955d763b4fa2359e586e5c0aa8311798ce7db4bcd845c2ac5f87697448f74199b8d454309191215e650160276cd8e5e7345495b99f6ce72117
+MISC ChangeLog 1312 SHA256 d6be829e90a6fb67cccbe8cc2598f916d20d6ba256ca906485600d35ad0f787c SHA512 860935012ac397b8bbd24ba4758c36dd450b5cc9ff5b5835d6f5ced028df84a9e4a939cec1ac8efa400d6397f8b70ba59a378d35053ccb90b573e30bb96ea123 WHIRLPOOL b09948529a6e6a399260efb4789fbb12e0635a374f8b98f2bd2254c64165db3293295cfe8e7f65d94c62a62268c2d27239b3de8ca5a70270db6c6f541d2c1e18
+MISC metadata.xml 330 SHA256 598d25af1553b160d5b27b576c797590385f39c8a9cc278d8008bb865c964042 SHA512 965cd3a76762cc052b1efa3cb00f0c75467ec29e68f85067987c967a9c709d98bce93f75e256bd7d4ec13dd65c3503cfab95e61bd86e748419da72d1c10765dd WHIRLPOOL 7623305bbd7becf563cd693e9f092c4154d081487b7319eef1e0f140812b78e6ba7f5d35e826cb6b8e10998d728182b5aef1d4bd658b4f7366dda38481b69496
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.22 (GNU/Linux)
+
+iQIcBAEBCAAGBQJTIHkkAAoJEGVpnaTzz9K9qrMP/RHpwMUGW+ZqpwfoCyJgzcr2
+oiv3fpuJdaTebl824+ZpVMgYMXbhm/3g4LCnfxB6J5Nc14Pqt/eddTR53k/e4vD3
+SAowotYKqgW7BnCVHc4In/+ZQ7e+Myzg0l/n5XyjGlZTxc0bimOCPjbQSS/Hb2Ot
++IvlnuwPCP9BuhhjMKy9oNRg05RoKcvR0QVgoWUU3LThGkH3eE/uquEmjyjw6brc
+uv+ql8Df3KpCGVWFJVbmqXYgUqHfyAyp1D2m1PWgGNIbYsSSbDFppjcQgIa44X2k
+ztK+HOf/LsetIRFv2s9FgXQnWAeSnw6CfERo+ADLZky30KM9VCdcV+Qkd7UJXKy9
+KgUCjELDT18b/YtYN3LnLkVBJfHm7/+27enhqSPnnNMxEcXFkydN59Jke23V94gT
+jsO7nMWXEGKT/TyP66U5DN0QTQiwWeJHfPOyNSWCTEuMA4xJgHgAJCl3aOxF/OZy
+63FuBBCG/s9Gg9ub7Zizr721WtZeSFdwGlD1qezndlmJk9YMoqT3eKDKb99wmsMZ
+YSexiWQYDzfoBr7hzq2wTzkB6CAbY2gkTNw7Q/LMpm2GxhM2Ly9b12Svw/HO11YT
+iOFcrse+/YDv+4fNSMRo6Y1agSKpRGw7JhautKsariwIdtfJxU2xgy/bFwTc2pzS
+PlZb33CM7rkJEtd7qTRR
+=rwrF
+-----END PGP SIGNATURE-----
diff --git a/kde-misc/plasma-nm/files/plasma-nm-0.9.3.3-openconnect-build.patch b/kde-misc/plasma-nm/files/plasma-nm-0.9.3.3-openconnect-build.patch
new file mode 100644
index 000000000000..3a1aa106193f
--- /dev/null
+++ b/kde-misc/plasma-nm/files/plasma-nm-0.9.3.3-openconnect-build.patch
@@ -0,0 +1,101 @@
+diff --git a/vpn/openconnect/openconnectauth.cpp b/vpn/openconnect/openconnectauth.cpp

+index 33e8c93..e2eb15a 100644

+--- a/vpn/openconnect/openconnectauth.cpp

++++ b/vpn/openconnect/openconnectauth.cpp

+@@ -414,7 +414,7 @@ void OpenconnectAuthWidget::processAuthForm(struct oc_auth_form *form)

+     int passwordnumber = 0;

+     bool focusSet = false;

+     for (opt = form->opts; opt; opt = opt->next) {

+-        if (opt->type == OC_FORM_OPT_HIDDEN)

++        if (opt->type == OC_FORM_OPT_HIDDEN || IGNORE_OPT(opt))

+             continue;

+         QLabel *text = new QLabel(this);

+         text->setAlignment(Qt::AlignLeading|Qt::AlignLeft|Qt::AlignVCenter);

+@@ -441,9 +441,20 @@ void OpenconnectAuthWidget::processAuthForm(struct oc_auth_form *form)

+             KComboBox *cmb = new KComboBox(this);

+             struct oc_form_opt_select *sopt = reinterpret_cast<oc_form_opt_select *>(opt);

+             for (int i = 0; i < sopt->nr_choices; i++) {

+-                cmb->addItem(QString::fromUtf8(sopt->choices[i].label), QString::fromUtf8(sopt->choices[i].name));

+-                if (value == QString::fromUtf8(sopt->choices[i].name))

++                cmb->addItem(QString::fromUtf8(FORMCHOICE(sopt, i)->label),

++                             QString::fromUtf8(FORMCHOICE(sopt, i)->name));

++                if (value == QString::fromUtf8(FORMCHOICE(sopt, i)->name)) {

+                     cmb->setCurrentIndex(i);

++                    if (sopt == AUTHGROUP_OPT(form) &&

++                        i != AUTHGROUP_SELECTION(form)) {

++                        // XXX: Immediately return OC_FORM_RESULT_NEWGROUP to

++                        //      change group

++                    }

++                }

++            }

++            if (sopt == AUTHGROUP_OPT(form)) {

++                /// XXX: Hook up signal when the KComboBox entry changes, to

++                //       return OC_FORM_RESULT_NEWGROUP

+             }

+             widget = qobject_cast<QWidget*>(cmb);

+         }

+@@ -540,6 +551,7 @@ void OpenconnectAuthWidget::validatePeerCert(const QString &fingerprint,

+ void OpenconnectAuthWidget::formLoginClicked()

+ {

+     Q_D(OpenconnectAuthWidget);

++    /// XXX: This, or something like it, needs to be called when the KComboBox for the auth group changes too.

+     const int lastIndex = d->ui.loginBoxLayout->count() - 1;

+     QLayout *layout = d->ui.loginBoxLayout->itemAt(lastIndex - 2)->layout();

+     struct oc_auth_form *form = (struct oc_auth_form *) d->ui.loginBoxLayout->itemAt(lastIndex)->widget()->property("openconnect_form").value<quintptr>();

+diff --git a/vpn/openconnect/openconnectauthworkerthread.cpp b/vpn/openconnect/openconnectauthworkerthread.cpp

+index 4c16388..194b164 100644

+--- a/vpn/openconnect/openconnectauthworkerthread.cpp

++++ b/vpn/openconnect/openconnectauthworkerthread.cpp

+@@ -59,7 +59,7 @@ public:

+     {

+         if (obj)

+             return static_cast<OpenconnectAuthWorkerThread*>(obj)->processAuthFormP(form);

+-        return -1;

++        return OC_FORM_RESULT_ERR;

+     }

+     static void writeProgress(void *obj, int level, const char *str, ...)

+     {

+@@ -181,9 +181,11 @@ int OpenconnectAuthWorkerThread::processAuthFormP(struct oc_auth_form *form)

+     m_waitForUserInput->wait(m_mutex);

+     m_mutex->unlock();

+     if (*m_userDecidedToQuit)

+-        return -1;

++        return OC_FORM_RESULT_CANCELLED;

+ 

+-    return 0;

++    /// XXX: If group changed, return OC_FORM_RESULT_NEWGROUP

++

++    return OC_FORM_RESULT_OK;

+ }

+ 

+ void OpenconnectAuthWorkerThread::writeProgress(int level, const char *fmt, va_list argPtr)

+diff --git a/vpn/openconnect/openconnectauthworkerthread.h b/vpn/openconnect/openconnectauthworkerthread.h

+index 37c854f..39d68b3 100644

+--- a/vpn/openconnect/openconnectauthworkerthread.h

++++ b/vpn/openconnect/openconnectauthworkerthread.h

+@@ -40,6 +40,25 @@ struct x509_st;

+ #define OPENCONNECT_OPENSSL

+ #endif

+ 

++#if OPENCONNECT_CHECK_VER(3,0)

++#define NEWGROUP_SUPPORTED	1

++#define AUTHGROUP_OPT(form)	(void *)(form)->authgroup_opt

++#define AUTHGROUP_SELECTION(form) (form)->authgroup_selection

++#define FORMCHOICE(sopt, i)	((sopt)->choices[i])

++#define IGNORE_OPT(opt)		((opt)->flags & OC_FORM_OPT_IGNORE)

++#else

++#define NEWGROUP_SUPPORTED	0

++#define AUTHGROUP_OPT(form)	NULL

++#define AUTHGROUP_SELECTION(form) 0

++#define FORMCHOICE(sopt, i)	(&(sopt)->choices[i])

++#define IGNORE_OPT(opt)		0

++

++#define OC_FORM_RESULT_ERR	-1

++#define OC_FORM_RESULT_OK	0

++#define OC_FORM_RESULT_CANCELLED 1

++#define OC_FORM_RESULT_NEWGROUP	2

++#endif

++

+ #include <QThread>

+ 

+ class QMutex;
\ No newline at end of file
diff --git a/kde-misc/plasma-nm/metadata.xml b/kde-misc/plasma-nm/metadata.xml
index c5ae96e2c633..6b5b847f2869 100644
--- a/kde-misc/plasma-nm/metadata.xml
+++ b/kde-misc/plasma-nm/metadata.xml
@@ -4,5 +4,6 @@
 	<herd>kde</herd>
 	<use>
 		<flag name="modemmanager">Enable support for mobile broadband devices</flag>
+		<flag name="openconnect">Build support for the OpenConnect VPN client</flag>
 	</use>
 </pkgmetadata>
diff --git a/kde-misc/plasma-nm/plasma-nm-0.9.3.2.ebuild b/kde-misc/plasma-nm/plasma-nm-0.9.3.2.ebuild
deleted file mode 100644
index b10b525e14f1..000000000000
--- a/kde-misc/plasma-nm/plasma-nm-0.9.3.2.ebuild
+++ /dev/null
@@ -1,42 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-misc/plasma-nm/plasma-nm-0.9.3.2.ebuild,v 1.1 2013/11/22 16:46:20 johu Exp $
-
-EAPI=5
-
-KDE_LINGUAS="ar bs ca ca@valencia cs da de el en_GB eo es et fa fi fr ga gl hr
-hu is it ja km lt lv mai mr ms nb nds nl nn pa pl pt pt_BR ro ru sk sl sr
-sr@ijekavian sr@ijekavianlatin sr@latin sv th tr ug uk zh_CN zh_TW"
-DECLARATIVE_REQUIRED="always"
-inherit kde4-base
-
-if [[ ${KDE_BUILD_TYPE} != live ]]; then
-	KEYWORDS="~amd64 ~x86"
-	SRC_URI="mirror://kde/unstable/${PN}/${P}.tar.xz"
-else
-	KEYWORDS=""
-fi
-
-DESCRIPTION="KDE Plasma applet for NetworkManager"
-HOMEPAGE="https://projects.kde.org/projects/playground/network/plasma-nm"
-
-LICENSE="GPL-2 LGPL-2.1"
-SLOT="4"
-IUSE="debug modemmanager"
-
-DEPEND="
-	>=net-libs/libnm-qt-0.9.8.0[modemmanager?]
-	>=net-misc/networkmanager-0.9.8.0
-	modemmanager? ( >=net-libs/libmm-qt-1.0.0 )
-"
-RDEPEND="${DEPEND}
-	!kde-misc/networkmanagement
-"
-
-src_configure() {
-	local mycmakeargs=(
-		$(cmake-utils_use !modemmanager DISABLE_MODEMMANAGER_SUPPORT)
-	)
-
-	kde4-base_src_configure
-}
diff --git a/kde-misc/plasma-nm/plasma-nm-0.9.3.3.ebuild b/kde-misc/plasma-nm/plasma-nm-0.9.3.3.ebuild
index cf88f5694a9e..a507182ee0ea 100644
--- a/kde-misc/plasma-nm/plasma-nm-0.9.3.3.ebuild
+++ b/kde-misc/plasma-nm/plasma-nm-0.9.3.3.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-misc/plasma-nm/plasma-nm-0.9.3.3.ebuild,v 1.1 2014/02/28 00:21:33 mrueg Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-misc/plasma-nm/plasma-nm-0.9.3.3.ebuild,v 1.2 2014/03/12 15:11:28 johu Exp $
 
 EAPI=5
 
@@ -22,20 +22,24 @@ HOMEPAGE="https://projects.kde.org/projects/playground/network/plasma-nm"
 
 LICENSE="GPL-2 LGPL-2.1"
 SLOT="4"
-IUSE="debug modemmanager"
+IUSE="debug modemmanager openconnect"
 
 DEPEND="
 	>=net-libs/libnm-qt-0.9.8.0[modemmanager?]
 	>=net-misc/networkmanager-0.9.8.0
 	modemmanager? ( >=net-libs/libmm-qt-1.0.0 )
+	openconnect? ( net-misc/openconnect )
 "
 RDEPEND="${DEPEND}
 	!kde-misc/networkmanagement
 "
 
+PATCHES=( "${FILESDIR}/${P}-openconnect-build.patch" )
+
 src_configure() {
 	local mycmakeargs=(
 		$(cmake-utils_use !modemmanager DISABLE_MODEMMANAGER_SUPPORT)
+		$(cmake-utils_use_find_package openconnect OpenConnect)
 	)
 
 	kde4-base_src_configure