From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id 5A0C8138331 for ; Thu, 3 May 2018 12:31:11 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 65F00E0AC5; Thu, 3 May 2018 12:31:10 +0000 (UTC) Received: from smtp.gentoo.org (mail.gentoo.org [IPv6:2001:470:ea4a:1:5054:ff:fec7:86e4]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 21BE5E0AC5 for ; Thu, 3 May 2018 12:31:10 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id A7594335C85 for ; Thu, 3 May 2018 12:31:08 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id BB46B2A for ; Thu, 3 May 2018 12:31:06 +0000 (UTC) From: "Andreas Sturmlechner" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Andreas Sturmlechner" Message-ID: <1525350638.11f2211b6d952e19bef1456deb22ce363b001286.asturm@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: net-vpn/kvpnc/, net-vpn/kvpnc/files/ X-VCS-Repository: repo/gentoo X-VCS-Files: net-vpn/kvpnc/Manifest net-vpn/kvpnc/files/kvpnc-0.9.6a-gcc47.patch net-vpn/kvpnc/files/kvpnc-0.9.6a-gcc6.patch net-vpn/kvpnc/files/kvpnc-0.9.6a-ifconfig.patch net-vpn/kvpnc/files/kvpnc-0.9.6a-kicon.patch net-vpn/kvpnc/files/kvpnc-0.9.6a-scriptsec.patch net-vpn/kvpnc/kvpnc-0.9.6a-r3.ebuild net-vpn/kvpnc/metadata.xml X-VCS-Directories: net-vpn/kvpnc/ net-vpn/kvpnc/files/ X-VCS-Committer: asturm X-VCS-Committer-Name: Andreas Sturmlechner X-VCS-Revision: 11f2211b6d952e19bef1456deb22ce363b001286 X-VCS-Branch: master Date: Thu, 3 May 2018 12:31:06 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Archives-Salt: 1ffe1a2f-056f-4e23-bb5a-9aed65a3f968 X-Archives-Hash: 2d53375f60e2aa55e8cd2ea4c5acc764 commit: 11f2211b6d952e19bef1456deb22ce363b001286 Author: Andreas Sturmlechner gentoo org> AuthorDate: Thu May 3 12:18:36 2018 +0000 Commit: Andreas Sturmlechner gentoo org> CommitDate: Thu May 3 12:30:38 2018 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=11f2211b net-vpn/kvpnc: Remove last-rited package Moved to kde-sunset repository. Closes: https://bugs.gentoo.org/470696 net-vpn/kvpnc/Manifest | 2 - net-vpn/kvpnc/files/kvpnc-0.9.6a-gcc47.patch | 11 ----- net-vpn/kvpnc/files/kvpnc-0.9.6a-gcc6.patch | 53 --------------------- net-vpn/kvpnc/files/kvpnc-0.9.6a-ifconfig.patch | 38 --------------- net-vpn/kvpnc/files/kvpnc-0.9.6a-kicon.patch | 59 ------------------------ net-vpn/kvpnc/files/kvpnc-0.9.6a-scriptsec.patch | 15 ------ net-vpn/kvpnc/kvpnc-0.9.6a-r3.ebuild | 55 ---------------------- net-vpn/kvpnc/metadata.xml | 8 ---- 8 files changed, 241 deletions(-) diff --git a/net-vpn/kvpnc/Manifest b/net-vpn/kvpnc/Manifest deleted file mode 100644 index 12e89c41516..00000000000 --- a/net-vpn/kvpnc/Manifest +++ /dev/null @@ -1,2 +0,0 @@ -DIST kvpnc-0.9.6-kde4-locale.tar.bz2 2020192 BLAKE2B 89d0d95ad04c1dfedcce7b5eb6bb6b17f37f08cdd39822d0aa5679638187c32625b0b8bc95e967f2a9ce938a45d157655bb43071ae9dbd214e40faa5195b9316 SHA512 a2e5c7f465ec77e61f882cb2a45da7da3c868de164e8cdefe2a987d9040e1762ebd6f3e089f008dfcc7f7fad47b9847c059d615c94a995805af0ca3f1fd4d209 -DIST kvpnc-0.9.6a-kde4.tar.bz2 579425 BLAKE2B 1058e06b9a1d4325794a51f1ee34892b6898b6ffb077897a7c9e4617019be2da6e3759da5d2a4bb405424e8f18e7a01cad3bccf2d0f5f438e65d262c560f5484 SHA512 e30e3fcb9729a378c84d636c7efe0e45ce7d15bcfab2f5f6cd4e37951de1db10c343e5e14dc13aafc4d540058ebc2ca0c2ad30c555fd78f0de552107d13d2467 diff --git a/net-vpn/kvpnc/files/kvpnc-0.9.6a-gcc47.patch b/net-vpn/kvpnc/files/kvpnc-0.9.6a-gcc47.patch deleted file mode 100644 index db59b5baaf8..00000000000 --- a/net-vpn/kvpnc/files/kvpnc-0.9.6a-gcc47.patch +++ /dev/null @@ -1,11 +0,0 @@ -diff -ruN kvpnc-0.9.6a-kde4.orig/src/kvpnc.cpp kvpnc-0.9.6a-kde4/src/kvpnc.cpp ---- kvpnc-0.9.6a-kde4.orig/src/kvpnc.cpp 2012-06-25 22:16:25.395420711 +0200 -+++ kvpnc-0.9.6a-kde4/src/kvpnc.cpp 2012-06-25 22:17:41.598424971 +0200 -@@ -75,6 +75,7 @@ - #include - #include - #include -+#include - - #include "ui_mainviewbase4.h" - #include "ciscocertificateenrollment.h" diff --git a/net-vpn/kvpnc/files/kvpnc-0.9.6a-gcc6.patch b/net-vpn/kvpnc/files/kvpnc-0.9.6a-gcc6.patch deleted file mode 100644 index ba086a6337c..00000000000 --- a/net-vpn/kvpnc/files/kvpnc-0.9.6a-gcc6.patch +++ /dev/null @@ -1,53 +0,0 @@ -Author: Pino Toscano -Description: remove extra bool parameter for KConfigGroup::deleteEntry() - unneeded, and it does not match any of the actual signatures of the - function -Bug-Debian: https://bugs.debian.org/811679 -Applied-Upstream: commit:1452683 - ---- a/src/kvpncconfig.cpp -+++ b/src/kvpncconfig.cpp -@@ -4305,7 +4305,7 @@ - appPointer->processEvents(); - - if (useKwallet && KWallet::Wallet::isEnabled()) -- configgroup.deleteEntry("First use of Kwallet", false); -+ configgroup.deleteEntry("First use of Kwallet"); - - - /* = user data = */ -Author: Pino Toscano -Description: do not return bool for QString - GCC 6 cannot convert them -Bug-Debian: https://bugs.debian.org/811679 -Applied-Upstream: commit:1452682 - ---- a/src/utils.cpp -+++ b/src/utils.cpp -@@ -914,7 +914,7 @@ - NameAndPidOfProgramListenProcess->start(proc, args); - if (!NameAndPidOfProgramListenProcess->waitForStarted()) { - kError() << "netstat fails!" << endl; -- return false; -+ return ""; - } else { - NameAndPidOfProgramListenProcess->waitForFinished(); - -@@ -946,7 +946,7 @@ - GetEmailAddressOfCertProcess->start(proc, args); - if (!GetEmailAddressOfCertProcess->waitForStarted()) { - kError() << "GetEmailAddressOfCertProcess" << endl; -- return false; -+ return ""; - } else { - GetEmailAddressOfCertProcess->waitForFinished(); - disconnect(GetEmailAddressOfCertProcess, SIGNAL(readyReadStandardOutput()), this, SLOT(readOutGetEmailAddressOfCert())); -@@ -1159,7 +1159,7 @@ - GetHostnameProcess->start(proc, args); - if (!GetHostnameProcess->waitForStarted()) { - kError() << "Unable to start getHostname process!" << endl; -- return false; -+ return ""; - } else { - GetHostnameProcess->waitForFinished(); - return Hostname; diff --git a/net-vpn/kvpnc/files/kvpnc-0.9.6a-ifconfig.patch b/net-vpn/kvpnc/files/kvpnc-0.9.6a-ifconfig.patch deleted file mode 100644 index 1413bccc97e..00000000000 --- a/net-vpn/kvpnc/files/kvpnc-0.9.6a-ifconfig.patch +++ /dev/null @@ -1,38 +0,0 @@ -diff -ruN kvpnc-0.9.6a-kde4/src/kvpncconfig.cpp kvpnc-0.9.6a-kde4-patched/src/kvpncconfig.cpp ---- kvpnc-0.9.6a-kde4/src/kvpncconfig.cpp 2010-03-08 05:26:33.000000000 -0500 -+++ kvpnc-0.9.6a-kde4-patched/src/kvpncconfig.cpp 2013-05-23 10:36:35.536865224 -0400 -@@ -58,8 +58,8 @@ - pathToPing = ""; - pathToOpenvpn = "/usr/sbin/openvpn"; - pathToIp = "/sbin/ip"; -- pathToIfconfig = "/sbin/ifconfig"; -- pathToRoute = "/sbin/route"; -+ pathToIfconfig = "/bin/ifconfig"; -+ pathToRoute = "/bin/route"; - pathToNetstat = "/bin/netstat"; - pathToL2tpd = "/usr/sbin/l2tpd"; - pathToPkcs11Tool = "/usr/bin/pkcs11-tool"; -@@ -874,8 +874,8 @@ - pathToOpenssl = configgroup.readEntry("Path to openssl", "/usr/bin/openssl"); - pathToIpsec = configgroup.readEntry("Path to freeswan", "/usr/sbin/ipsec"); - pathToIp = configgroup.readEntry("Path to iputility", "/sbin/ip"); -- pathToIfconfig = configgroup.readEntry("Path to ifconfig", "/sbin/ifconfig"); -- pathToRoute = configgroup.readEntry("Path to route", "/sbin/route"); -+ pathToIfconfig = configgroup.readEntry("Path to ifconfig", "/bin/ifconfig"); -+ pathToRoute = configgroup.readEntry("Path to route", "/bin/route"); - pathToNetstat = configgroup.readEntry("Path to netstat", "/bin/netstat"); - pathToPppd = configgroup.readEntry("Path to pppd", "/usr/sbin/pppd"); - pathToPptp = configgroup.readEntry("Path to pptp", "/usr/sbin/pptp"); -@@ -1516,10 +1516,10 @@ - pathToIp = "/sbin/ip"; - - if (pathToIfconfig.isEmpty()) -- pathToIfconfig = "/sbin/ifconfig"; -+ pathToIfconfig = "/bin/ifconfig"; - - if (pathToRoute.isEmpty()) -- pathToRoute = "/sbin/route"; -+ pathToRoute = "/bin/route"; - - if (pathToNetstat.isEmpty()) - pathToNetstat = "/bin/netstat"; diff --git a/net-vpn/kvpnc/files/kvpnc-0.9.6a-kicon.patch b/net-vpn/kvpnc/files/kvpnc-0.9.6a-kicon.patch deleted file mode 100644 index d898dafbaba..00000000000 --- a/net-vpn/kvpnc/files/kvpnc-0.9.6a-kicon.patch +++ /dev/null @@ -1,59 +0,0 @@ -Author: Christoph Feck -Description: Use KIcon to set window icons -Bug: https://bugs.kde.org/show_bug.cgi?id=246016 -Bug-Debian: https://bugs.debian.org/599094 -Applied-Upstream: commit:1180094 - ---- a/src/kvpnc.cpp -+++ b/src/kvpnc.cpp -@@ -320,10 +320,7 @@ KVpnc::~KVpnc() - - void KVpnc::initAction() - { -- disconnectedIcon = KIconLoader::global()->loadIcon("disconnected", KIconLoader::NoGroup); -- connectedIcon = KIconLoader::global()->loadIcon("connected", KIconLoader::NoGroup); -- connectingIcon = KIconLoader::global()->loadIcon("connecting" , KIconLoader::NoGroup); -- setWindowIcon(disconnectedIcon); -+ setWindowIcon(KIcon("disconnected")); - - (void*) KStandardAction::quit(this, SLOT(quitCalled()), actionCollection()); - -@@ -17449,7 +17446,7 @@ void KVpnc::setGuiStatus(int status) - QString ConnectionStatus = i18n("unknown"); - QString Username = ""; - if (status == KVpncEnum::connected) { -- setWindowIcon(connectedIcon); -+ setWindowIcon(KIcon("connected")); - - durationString = (i18n("%1:%2:%3" , QString().sprintf("%02u", hour) , QString().sprintf("%02u", min) , QString().sprintf("%02u", sec))); - QString ConnectMsg = ""; -@@ -17502,7 +17499,7 @@ void KVpnc::setGuiStatus(int status) - - } - else if (status == KVpncEnum::connecting) { -- setWindowIcon(connectingIcon); -+ setWindowIcon(KIcon("connecting")); - mw->buttonConnect->setEnabled(false); - mw->buttonDisconnect->setEnabled(true); - mw->SessionCombo->setEnabled(false); -@@ -17531,7 +17528,7 @@ void KVpnc::setGuiStatus(int status) - connectClicked(); - - } else if (status == KVpncEnum::disconnected) { -- setWindowIcon(disconnectedIcon); -+ setWindowIcon(KIcon("disconnected")); - mw->buttonConnect->setEnabled(true); - mw->buttonDisconnect->setEnabled(false); - DisconnectAction->setEnabled(false); ---- a/src/kvpnc.h -+++ b/src/kvpnc.h -@@ -286,9 +286,6 @@ private: - - int TimeOutProcess; //< for timeout - int ConnectingProcess; //< for killing process -- QPixmap connectedIcon; -- QPixmap disconnectedIcon; -- QPixmap connectingIcon; - QPixmap connectingStatusPixmap; - QPixmap disconnectedStatusPixmap; - QPixmap connectedStatusPixmap; diff --git a/net-vpn/kvpnc/files/kvpnc-0.9.6a-scriptsec.patch b/net-vpn/kvpnc/files/kvpnc-0.9.6a-scriptsec.patch deleted file mode 100644 index 4e8b4d6d92b..00000000000 --- a/net-vpn/kvpnc/files/kvpnc-0.9.6a-scriptsec.patch +++ /dev/null @@ -1,15 +0,0 @@ -diff -ruN kvpnc-0.9.6a-kde4.orig/src/kvpnc.cpp kvpnc-0.9.6a-kde4/src/kvpnc.cpp ---- kvpnc-0.9.6a-kde4.orig/src/kvpnc.cpp 2010-03-08 11:26:33.000000000 +0100 -+++ kvpnc-0.9.6a-kde4/src/kvpnc.cpp 2012-06-25 22:12:51.454408816 +0200 -@@ -6030,7 +6030,10 @@ - } - - -- if (GlobalConfig->OpenvpnNeedSecurityParameter || (OpenvpnMajor == 2 && OpenvpnMinor == 1 && OpenvpnExtraVer > 8 && OpenvpnExtra == "rc")|| ( OpenvpnMajor == 2 && OpenvpnMinor == 1 ) || (OpenvpnMajor > 2 && OpenvpnMinor >= 2)) { -+ if (GlobalConfig->OpenvpnNeedSecurityParameter || -+ (OpenvpnMajor == 2 && OpenvpnMinor == 1 && OpenvpnExtraVer > 8 && OpenvpnExtra == "rc")|| -+ (OpenvpnMajor == 2 && OpenvpnMinor >= 1 ) || -+ (OpenvpnMajor > 2)) { - if (GlobalConfig->KvpncDebugLevel > 3) - GlobalConfig->appendLogEntry(i18n("OpenVPN >= 2.1-rc9 detected, adding script security parameter to config."), KVpncEnum::info); - diff --git a/net-vpn/kvpnc/kvpnc-0.9.6a-r3.ebuild b/net-vpn/kvpnc/kvpnc-0.9.6a-r3.ebuild deleted file mode 100644 index 724d336c326..00000000000 --- a/net-vpn/kvpnc/kvpnc-0.9.6a-r3.ebuild +++ /dev/null @@ -1,55 +0,0 @@ -# Copyright 1999-2017 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 - -QT3SUPPORT_REQUIRED="true" -inherit kde4-base - -DESCRIPTION="KDELibs4-based frontend for various VPN clients" -HOMEPAGE="https://userbase.kde.org/KVpnc" -SRC_URI="http://download.gna.org/kvpnc/${P}-kde4.tar.bz2 - http://download.gna.org/kvpnc/${P/a}-kde4-locale.tar.bz2" - -LICENSE="GPL-2" -SLOT="4" -KEYWORDS="~amd64 ~x86" -IUSE="debug" - -RDEPEND=" - dev-libs/libgcrypt:0 -" -DEPEND="${RDEPEND} - sys-devel/gettext -" - -S=${WORKDIR}/${P}-kde4 - -PATCHES=( - "${FILESDIR}/${P}-scriptsec.patch" - "${FILESDIR}/${P}-gcc47.patch" - "${FILESDIR}/${P}-ifconfig.patch" - "${FILESDIR}/${P}-gcc6.patch" - "${FILESDIR}/${P}-kicon.patch" -) - -src_prepare() { - mv -vf "${WORKDIR}"/${P/a}-kde4-locale/po . || die - - echo "find_package ( Msgfmt REQUIRED )" >> CMakeLists.txt || die - echo "find_package ( Gettext REQUIRED )" >> CMakeLists.txt || die - echo "add_subdirectory ( po )" >> CMakeLists.txt || die - - sed -i \ - -e "s:0.9.2-svn:${PV}:" \ - CMakeLists.txt || die - - kde4-base_src_prepare -} - -src_configure() { - local mycmakeargs=( - -DWITH_libgcrypt=ON - ) - kde4-base_src_configure -} diff --git a/net-vpn/kvpnc/metadata.xml b/net-vpn/kvpnc/metadata.xml deleted file mode 100644 index bddd8b4a205..00000000000 --- a/net-vpn/kvpnc/metadata.xml +++ /dev/null @@ -1,8 +0,0 @@ - - - - - kde@gentoo.org - Gentoo KDE Project - -