gentoo resync : 30.09.2018

3 files changed, 6 insertions, 54 deletions

diff --git a/net-dialup/pptpclient/Manifest b/net-dialup/pptpclient/Manifest
index 5d0a8fdcc45e..09dac5a15690 100644
--- a/net-dialup/pptpclient/Manifest
+++ b/net-dialup/pptpclient/Manifest
@@ -1,10 +1,9 @@
 AUX pptp_fe.pl 8097 BLAKE2B e479f4f13babd5e467be758b88545653fe3200d5bea4ad0cc008c6afcbfa04c38e8f8fd02dd7f55070004d67e1b9ef5a84b52ae5b3b33a6315b978b3b209f9c9 SHA512 7ea144546b0435a6c94306c831a91edb0915342b31701d87a417f45547353dad9509b5e4dfe1abf117982d3fecdd466af79c0a232f13ee0890bb375f41543342
-AUX pptpclient-1.7.2-process-name.patch 1242 BLAKE2B bf684d8c2bf9f1e81b449ed1864f87ddf60b449203173df6f162cac161f0fde49f2f584f295940bbd35c25a13d500f656b379bd3db224cc07b3c64138ea5685e SHA512 f0157c828783838493ad56a0737fa696ce3422d6db50c76c9f8d6771c57a359a3ebafbd30bba09b4e440a4cad28f935f7bf8992695bccd16b16143cdadf62a25
 AUX pptpclient-1.8.0-process-name.patch 1134 BLAKE2B 18d4f0153925fa9b3b641ac30ecce73257d724e5c2a47ee86cca7e21057d3720ccccd9b81fe5373dcd6f4df4b8c4daf0c75b0145ce86562a57ff078ff6c36167 SHA512 4615438cb457c3fe0e2e7342f0aa234f3b63fccb069d217c9b7340e1b6a73ca7879e85b21742f155bb5a16db5a1bd55da14f9867486760a49479f96bdddbc451
 AUX xpptp_fe.pl 5620 BLAKE2B 682623fe03b8d9e90f4e86837b850dd57a2a1b960e9f0554d65cac4e0e5351718e8f9b4d56ae4c3be81d666a8be1b1cb9bd2ee07d3f48a1fa776665b5e11c62a SHA512 fa6d31c9b9ae319ea3cbbba389664f04c6fff8d2d17a826870ebca236e04df4ca51cb2cd60961a2cd78ee3c99af2738c4bf87edaf49032dd3ec1dbe5d3632833
-DIST pptp-1.7.2.tar.gz 81113 BLAKE2B 86ba6905d8442c09b52af452b6dd865b9f522e502d0da86fe8fd12c9feba62935575f02f5bcbad50240913e0e3d8050a97614d8c36ef36306d37c57a6f06a440 SHA512 8c070bd0e2fac68e54eefcc21a31b567f74080764130cf94bf1e29138c3a43b8f56721836d826343528062fc6afcffee03ad93631678cc9b946bc6a8f4ce3dec
+DIST pptp-1.10.0.tar.gz 87007 BLAKE2B aeb8bff0025c5144678db2ee79ecd80ec3c7261640ed94596a3599c163763cbf17b50c37591fd8b39d0687db5dff9b4c14d1aa303d95b9fcaf4eb53602cf321b SHA512 d2b925fb9cb5dbc4da576dce0cfae62f466576ae5b5ed7d6edeaec9be16ab6e0d17c307df43ebdc06138f1269ef61ba8910462a4629b6262c452e8287cabe41c
 DIST pptp-1.8.0.tar.gz 86778 BLAKE2B 30cf3aadc3be97be83ac298ee366b5f44d7de669b083708194bd1d26c3b3f0d51e3d8b2484b6378f7c383c271732bc5be42c1674f3f71f19b979d4441e5b64a7 SHA512 cabcc2ef29d20859af923c6d96c524e83a80549839d1ad6fccaf9ec0ed5e7a5de7120e0694e6160b374952ea3ecb7b69d9809641000d6bf2585eeedb2d29c073
 DIST pptp-command-20130515.bz2 7269 BLAKE2B dda3f517cf747e025dee1967841d40e58461384415161ef01bcc96c6568c5ccfb1af5254f26276164c43c41b668bf2646e5138985531d54f13ab2fedd410fab2 SHA512 3b0ad28c5f7bf4f674ba8742e8a3be50cb62521f767142a1a1e74263707bc860126b7238a4aea307366a71100a193d18f3ec7599f4c0c52cd259f8b1d6b429bf
-EBUILD pptpclient-1.7.2-r3.ebuild 1220 BLAKE2B bb57b43aea09385139d4626f97280401f3cdd376cc43fa0d4eeaaae4fab90f1b1b605ffba49e13eace7f757b9c9f50bc1dd3a9abbd2dad9fdfc23aa096a75e67 SHA512 ab459c4f20e422ea293902d6e05e7499e665acd71c5cb5e3761286ff4820628fac98322f0c7e06539b68f8f0c9c565382866d0bff2777624944fb580af8ce9f6
+EBUILD pptpclient-1.10.0.ebuild 1145 BLAKE2B ab4f86f78d8ab5ed0f1b5a1ca889f4025615be1ad3c00dd11bedf743c5a68e00e0e25408d7d3eb6efc346bb7d274865fbae04f319c39613e9694e7de63789817 SHA512 59cc47a8df9fb06722c9b36e19e7a47ae237bcabf4d36dd04b9a17c31469b3c429d1dbcdd94ff70e07f88363bdb241cabf57b2492d5dc110d5946eecfc738b8b
 EBUILD pptpclient-1.8.0.ebuild 1227 BLAKE2B 736df14cfeb87a3cb39b58855f608fe0f14eda367a36bd64b3ada1b08cb4d04de3037e7546f6fd181f03d97dcdc6c54db6966c00c14e95e1ca64a1cdff9a553c SHA512 e95fb37a5bb9fa83e8d647e7dfb67ea28773390f77da625937f2e830e99402873ecf76d919bed310c69dc5e5c6f1c6ab3d6393a71a09dcd4a13306816b8c4cf7
 MISC metadata.xml 378 BLAKE2B 224be6ab2aa2334074dce847a6527f713f1c82f797862e58bb5ed972a4c1f464a53b67a28ea10635fd949a5aa927a9419f85163172f26376001c85e4784cb894 SHA512 7a4b7cfeecee2503bcf7171f7a66edc27962a6f461695dfad358421be6c1bfc794e438d9136448278b11a4fd0761df03132d8ee66b7e43f7b407c0a5bad09ea7
diff --git a/net-dialup/pptpclient/files/pptpclient-1.7.2-process-name.patch b/net-dialup/pptpclient/files/pptpclient-1.7.2-process-name.patch
deleted file mode 100644
index b0051f81bde0..000000000000
--- a/net-dialup/pptpclient/files/pptpclient-1.7.2-process-name.patch
+++ /dev/null
@@ -1,42 +0,0 @@
-diff -Nru pptp-1.7.2.orig/pptp.c pptp-1.7.2/pptp.c
---- pptp-1.7.2.orig/pptp.c	2008-05-14 08:33:55.000000000 +0200
-+++ pptp-1.7.2/pptp.c	2009-06-20 10:53:07.000000000 +0200
-@@ -59,11 +59,7 @@
- #include "pptp_callmgr.h"
- #include "pptp_gre.h"
- #include "version.h"
--#if defined(__linux__)
--#include <sys/prctl.h>
--#else
- #include "inststr.h"
--#endif
- #include "util.h"
- #include "pptp_quirks.h"
- #include "pqueue.h"
-@@ -394,12 +390,7 @@
-     char *tty_name = ttyname(tty_fd);
-     snprintf(buf, sizeof(buf), "pptp: GRE-to-PPP gateway on %s",
-               tty_name ? tty_name : "(null)");
--#ifdef PR_SET_NAME
--    rc = prctl(PR_SET_NAME, "pptpgw", 0, 0, 0);
--    if (rc != 0) perror("prctl");
--#else
-     inststr(argc, argv, envp, buf);
--#endif
-     if (sigsetjmp(env, 1)!= 0) goto shutdown;
- 
-     signal(SIGINT,  sighandler);
-@@ -495,13 +486,7 @@
-       char *my_argv[3] = { argv[0], inet_ntoa(inetaddr), phonenr };
-       char buf[128];
-       snprintf(buf, sizeof(buf), "pptp: call manager for %s", my_argv[1]);
--#ifdef PR_SET_NAME
--      int rc;
--      rc = prctl(PR_SET_NAME, "pptpcm", 0, 0, 0);
--      if (rc != 0) perror("prctl");
--#else
-       inststr(argc, argv, envp, buf);
--#endif
-       exit(callmgr_main(3, my_argv, envp));
- }
- 
diff --git a/net-dialup/pptpclient/pptpclient-1.7.2-r3.ebuild b/net-dialup/pptpclient/pptpclient-1.10.0.ebuild
index 56577c7da2bf..bf8d63b77cba 100644
--- a/net-dialup/pptpclient/pptpclient-1.7.2-r3.ebuild
+++ b/net-dialup/pptpclient/pptpclient-1.10.0.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI="5"
+EAPI=7
 
-inherit eutils toolchain-funcs
+inherit toolchain-funcs
 
 MY_P="${P/client}"
 MY_CMD="pptp-command-20130515"
@@ -15,7 +15,7 @@ SRC_URI="mirror://sourceforge/pptpclient/${MY_P}.tar.gz
 
 SLOT="0"
 LICENSE="GPL-2"
-KEYWORDS="alpha amd64 ~arm ppc ppc64 x86"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86"
 IUSE="tk"
 
 DEPEND="net-dialup/ppp
@@ -30,11 +30,6 @@ S="${WORKDIR}/${MY_P}"
 
 DOCS=( AUTHORS ChangeLog DEVELOPERS NEWS README TODO USING )
 
-src_prepare() {
-	epatch "${FILESDIR}"/${P}-process-name.patch
-	epatch_user
-}
-
 src_compile() {
 	emake OPTIMISE= DEBUG= CFLAGS="${CFLAGS}" LDFLAGS="${LDFLAGS}" CC="$(tc-getCC)"
 }