gentoo resync : 30.09.2018

7 files changed, 24 insertions, 288 deletions

diff --git a/net-dialup/Manifest.gz b/net-dialup/Manifest.gz
index ad09cfd241c3..9ad3116d9c42 100644
--- a/net-dialup/Manifest.gz
+++ b/net-dialup/Manifest.gz
diff --git a/net-dialup/ppp/Manifest b/net-dialup/ppp/Manifest
index 9be7e29e2914..3cabd29a86c9 100644
--- a/net-dialup/ppp/Manifest
+++ b/net-dialup/ppp/Manifest
@@ -1,11 +1,9 @@
 AUX README.mpls 530 BLAKE2B 21d57668272eb02c994d0ae38a9895f095ad024bab1613995313480f5d314a5772c30bb0edb1032658993d897b58f5d2744abbc43e0416e63d8fe27dfc968819 SHA512 2b617365fce74cceeb14e53f476b454c4420273661050d25e1c524cf5d56a7554318a268f7b9ebb100592b61a01d274efaeed28abb9ca0adaeb71ef981201b36
 AUX modules.ppp 299 BLAKE2B d5c0dcf135dd0a33288f27c95133d4dc980b84dc62bf8eca5b35040f4bfa5d0480cddc48263f390be8df0e0d8de704a62c490172b523612dd945a284e374372f SHA512 58bf5d6d286a08bd6dd595b39ee425efedd5745dddf33a9c90505891546eb46f4cf1306d83911bef61bc4611816aa0f6aef5d3e0f14c2f4ddd0a588780570041
-DIST ppp-2.4.7-patches-4.tar.xz 37308 BLAKE2B a53ab7c230fac7fea38910c5d9bb89b8ecb8728e899ed938292040e788b43ab8566797256329c9326ab1e6d7a02bf231df035a6e7b427f187eab554d600a7822 SHA512 f217f7272a791605101e0f1885350db8ff8b580a647e670461b81fe0026ee9050ce68b9b9635edee89ec1ada7adf000c7e6b3aa5a5dafec875ce715a9dfb84d2
-DIST ppp-2.4.7-patches-5.tar.xz 38680 BLAKE2B 56e4d3a5bc2486144791adf6ffb8a6cf0735f16fa8038a588f551d0fe7a71a15fe0d0630e4b5e3c4e0001ad161e22b660274885342807053277da14105958a69 SHA512 f8cdbb8fd4bf10eb5b4e911f1e8415f24d02297280aa6f5e63617c0533af41525bd54932eb050728320a2697efe5206d869f014bcfb8f8f3723ecefed1976adc
 DIST ppp-2.4.7-patches-6.tar.xz 39420 BLAKE2B 22754af6f266ff43f6b3cc2931ca33e9d0865ce08b8eed6961740a3a06ec69b6406c702a86e7f4a7b2f7dc9e2a751581ae58cd4398cff5e6646e53ee069e08d7 SHA512 16342010515e6d69d446656b52208e3f034c47aad8643a1e2f48fa410343f8a2e0bc8b5223b4bdc381050d9dc49a7b7ac6bc74b37380072eb91214b216d8afa2
+DIST ppp-2.4.7-patches-7.tar.xz 40540 BLAKE2B 353814692aab3012f5d5ccdecc514d69357826ea7abe64a7581c562f333d868f9766f11516721cf0b116b4c1c8b01daee306d98ef7be356af6e8d16e22fc9fac SHA512 9d34c044ded09424a6d80047e88bb21130a9c2414c9ea4f52c7299d9db08b1391543b50cd97c0c8763e6943591fc325d01932b31966a1374dbfe5e977bbf4356
 DIST ppp-2.4.7.tar.gz 688117 BLAKE2B e1c94ce31d98674536929d19e956e4013eb2b02c20c34e6184c0b99b50262ad1cd7fb6f4a1ed302872527a0c164af340e15ad1e2eaf191392c3f6ae2de21f5dd SHA512 e34ce24020af6a73e7a26c83c4f73a9c83fa455b7b363794dba27bf01f70368be06bff779777843949bd77f4bc9385d6ad455ea48bf8fff4e0d73cc8fef16ae2
 DIST ppp-dhcpc.tgz 33497 BLAKE2B ca59130012f007cf45af6bcfa468c112b0d521c8b11f42d42c566dd9de55bd6d6f1b1ceb83cbae18cfe79cb5cb36ba6c6858a4718915acc6987295008aca53da SHA512 aeaf791b14f5a09c0e2079072a157e65132cbff46e608bc0724e6a5827a01da934f5006e2774eb7105f83e607a52cb4987238f4385cf6f5cc86cbe305a556738
-EBUILD ppp-2.4.7-r3.ebuild 6802 BLAKE2B 499a46c7792023bcc00bf4c1fa8a750092765de7738d4875eb350eaed6e9d2ef5c409eb323e60af7603a27dafb089a2f97e9339709caa47d3ce6001cf116283b SHA512 371aac305e679b5297d99971c48ad8c4384a8368b760896d23f3016f4219001cfc618c11a0f9cb876e577ceb1d36488efa06a51d75685982030c26701c066647
-EBUILD ppp-2.4.7-r5.ebuild 6843 BLAKE2B a774f4c699de7661e5b344f3647be23ca16f18e26d95e4d9663b68da978351cfd885251fa47374a0d7ea31e0d799da1fc6ea4e66e8c9274f4c4383e5d0e4971f SHA512 13803f3071272f6b0385e95740fe0b25045cfa88a09efab75634ff9e324b0dcbf7962dd291b6cf7d714769c19bfbc351b1fbd65f7faceaa6a659594657bc2efc
 EBUILD ppp-2.4.7-r6.ebuild 7085 BLAKE2B ad27b9938e956bfae9c3909a16f1206545e9055d2a7de39d23a7bdeba27991c96b22aedca92eb9279cdb2db1c72534f04432b0849bc6856e64c5cd7c1528cd0e SHA512 c8c379211edec2a8172820c5ee2d73d989a9bd69005ab99ea477ae1df4dd90ec4b3be8d99644a16eb2b8adf7b4b530f81d76b52304613ec7a6f1a36694500842
+EBUILD ppp-2.4.7-r7.ebuild 7077 BLAKE2B fab63fa7491264b2e882cdad758233616b3105b91960f950b394e565cbacc6cb27103291010b4b05195da68d31518738dc59341e590625882e1a367dd1ac1b92 SHA512 ca79eb8691dc050ce3ab0ddb60291acfcde02c25daeac8595410ae8ce832399976cf042222a5b798ee32c283001ec681dd1e2ad26934f1a5d02b5f31bf6d03c1
 MISC metadata.xml 1470 BLAKE2B 8e70c742a13d352ff2b16946c6d063cda061e4710e340227d907ca599938b0466f86258d67836eeed6ed189e546ec463703dc0b1e44c1c9a9409c0ef1b74b5ed SHA512 2b00f6c0b4f3079eb885327188e12d151ec3d9682df9a71232b331524d9d3430af5fe342ca4198d926c012059786ec6a7e91fffeec899069a990e032b94b94c4
diff --git a/net-dialup/ppp/ppp-2.4.7-r3.ebuild b/net-dialup/ppp/ppp-2.4.7-r3.ebuild
deleted file mode 100644
index 896162d151bf..000000000000
--- a/net-dialup/ppp/ppp-2.4.7-r3.ebuild
+++ /dev/null
@@ -1,221 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-inherit eutils linux-info multilib pam toolchain-funcs
-
-PATCH_VER="4"
-DESCRIPTION="Point-to-Point Protocol (PPP)"
-HOMEPAGE="https://ppp.samba.org/"
-SRC_URI="https://www.samba.org/ftp/pub/ppp/${P}.tar.gz
-	https://dev.gentoo.org/~polynomial-c/${P}-patches-${PATCH_VER}.tar.xz
-	http://www.netservers.net.uk/gpl/ppp-dhcpc.tgz"
-
-LICENSE="BSD GPL-2"
-SLOT="0/${PV}"
-KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86"
-IUSE="activefilter atm dhcp eap-tls gtk ipv6 libressl pam radius"
-
-DEPEND="activefilter? ( net-libs/libpcap )
-	atm? ( net-dialup/linux-atm )
-	pam? ( virtual/pam )
-	gtk? ( x11-libs/gtk+:2 )
-	eap-tls? (
-		net-misc/curl
-		!libressl? ( dev-libs/openssl:0= )
-		libressl? ( dev-libs/libressl )
-	)"
-RDEPEND="${DEPEND}"
-PDEPEND="net-dialup/ppp-scripts"
-
-src_prepare() {
-	mv "${WORKDIR}/dhcp" "${S}/pppd/plugins" || die
-
-	use eap-tls || EPATCH_EXCLUDE+=" 8?_all_eaptls-*"
-	EPATCH_SUFFIX="patch" \
-	epatch "${WORKDIR}"/patch
-
-	if use atm ; then
-		einfo "Enabling PPPoATM support"
-		sed -i '/^#HAVE_LIBATM=yes/s:#::' \
-			pppd/plugins/pppoatm/Makefile.linux || die
-	fi
-
-	if ! use activefilter ; then
-		einfo "Disabling active filter"
-		sed -i '/^FILTER=y/s:^:#:' pppd/Makefile.linux || die
-	fi
-
-	if use pam ; then
-		einfo "Enabling PAM"
-		sed -i '/^#USE_PAM=y/s:^#::' pppd/Makefile.linux || die
-	fi
-
-	if use ipv6 ; then
-		einfo "Enabling IPv6"
-		sed -i '/#HAVE_INET6/s:#::' pppd/Makefile.linux || die
-	fi
-
-	einfo "Enabling CBCP"
-	sed -i '/^#CBCP=y/s:#::' pppd/Makefile.linux || die
-
-	if use dhcp ; then
-		einfo "Adding ppp-dhcp plugin files"
-		sed -i \
-			-e '/^SUBDIRS :=/s:$: dhcp:' \
-				pppd/plugins/Makefile.linux || die
-	fi
-
-	# Set correct libdir
-	sed -i -e "s:/lib/pppd:/$(get_libdir)/pppd:" \
-		pppd/{pathnames.h,pppd.8} || die
-
-	if use radius ; then
-		#set the right paths in radiusclient.conf
-		sed -i -e "s:/usr/local/etc:/etc:" \
-			-e "s:/usr/local/sbin:/usr/sbin:" \
-				pppd/plugins/radius/etc/radiusclient.conf || die
-		#set config dir to /etc/ppp/radius
-		sed -i -e "s:/etc/radiusclient:/etc/ppp/radius:g" \
-			pppd/plugins/radius/{*.8,*.c,*.h} \
-			pppd/plugins/radius/etc/* || die
-	else
-		einfo "Disabling radius"
-		sed -i -e '/+= radius/s:^:#:' pppd/plugins/Makefile.linux || die
-	fi
-
-	epatch_user # 549588
-}
-
-src_compile() {
-	tc-export AR CC
-	emake COPTS="${CFLAGS} -D_GNU_SOURCE"
-
-	# build pppgetpass
-	cd contrib/pppgetpass || die
-	if use gtk ; then
-		emake -f Makefile.linux
-	else
-		emake pppgetpass.vt
-	fi
-}
-
-src_install() {
-	local i
-	for i in chat pppd pppdump pppstats ; do
-		doman ${i}/${i}.8
-		dosbin ${i}/${i}
-	done
-	fperms u+s-w /usr/sbin/pppd
-
-	# Install pppd header files
-	emake -C pppd INSTROOT="${D}" install-devel
-
-	dosbin pppd/plugins/rp-pppoe/pppoe-discovery
-
-	dodir /etc/ppp/peers
-	insinto /etc/ppp
-	insopts -m0600
-	newins etc.ppp/pap-secrets pap-secrets.example
-	newins etc.ppp/chap-secrets chap-secrets.example
-
-	insopts -m0644
-	doins etc.ppp/options
-
-	pamd_mimic_system ppp auth account session
-
-	local PLUGINS_DIR="/usr/$(get_libdir)/pppd/${PV}"
-	# closing " for syntax coloring
-	insinto "${PLUGINS_DIR}"
-	insopts -m0755
-	doins pppd/plugins/minconn.so
-	doins pppd/plugins/passprompt.so
-	doins pppd/plugins/passwordfd.so
-	doins pppd/plugins/winbind.so
-	doins pppd/plugins/rp-pppoe/rp-pppoe.so
-	doins pppd/plugins/pppol2tp/openl2tp.so
-	doins pppd/plugins/pppol2tp/pppol2tp.so
-	if use atm ; then
-		doins pppd/plugins/pppoatm/pppoatm.so
-	fi
-	if use dhcp ; then
-		doins pppd/plugins/dhcp/dhcpc.so
-	fi
-	if use radius ; then
-		doins pppd/plugins/radius/rad{ius,attr,realms}.so
-
-		#Copy radiusclient configuration files (#92878)
-		insinto /etc/ppp/radius
-		insopts -m0644
-		doins pppd/plugins/radius/etc/{dictionary*,issue,port-id-map,radiusclient.conf,realms,servers}
-
-		doman pppd/plugins/radius/pppd-rad{ius,attr}.8
-	fi
-
-	insinto /etc/modprobe.d
-	insopts -m0644
-	newins "${FILESDIR}/modules.ppp" ppp.conf
-
-	dodoc PLUGINS README* SETUP Changes-2.3 FAQ
-	dodoc "${FILESDIR}/README.mpls"
-
-	dosbin scripts/p{on,off,log}
-	doman scripts/pon.1
-
-	# Adding misc. specialized scripts to doc dir
-	insinto /usr/share/doc/${PF}/scripts/chatchat
-	doins scripts/chatchat/*
-	insinto /usr/share/doc/${PF}/scripts
-	doins scripts/*
-
-	if use gtk ; then
-		dosbin contrib/pppgetpass/{pppgetpass.vt,pppgetpass.gtk}
-		newsbin contrib/pppgetpass/pppgetpass.sh pppgetpass
-	else
-		newsbin contrib/pppgetpass/pppgetpass.vt pppgetpass
-	fi
-	doman contrib/pppgetpass/pppgetpass.8
-}
-
-pkg_postinst() {
-	if linux-info_get_any_version && linux_config_src_exists ; then
-		echo
-		ewarn "If the following test report contains a missing kernel configuration option that you need,"
-		ewarn "you should reconfigure and rebuild your kernel before running pppd."
-		CONFIG_CHECK="~PPP ~PPP_ASYNC ~PPP_SYNC_TTY"
-		local ERROR_PPP="CONFIG_PPP:\t missing PPP support (REQUIRED)"
-		local ERROR_PPP_ASYNC="CONFIG_PPP_ASYNC:\t missing asynchronous serial line discipline (optional, but highly recommended)"
-		local WARNING_PPP_SYNC_TTY="CONFIG_PPP_SYNC_TTY:\t missing synchronous serial line discipline (optional; used by 'sync' pppd option)"
-		if use activefilter ; then
-			CONFIG_CHECK="${CONFIG_CHECK} ~PPP_FILTER"
-			local ERROR_PPP_FILTER="CONFIG_PPP_FILTER:\t missing PPP filtering support (REQUIRED)"
-		fi
-		CONFIG_CHECK="${CONFIG_CHECK} ~PPP_DEFLATE ~PPP_BSDCOMP ~PPP_MPPE"
-		local ERROR_PPP_DEFLATE="CONFIG_PPP_DEFLATE:\t missing Deflate compression (optional, but highly recommended)"
-		local ERROR_PPP_BSDCOMP="CONFIG_PPP_BSDCOMP:\t missing BSD-Compress compression (optional, but highly recommended)"
-		local WARNING_PPP_MPPE="CONFIG_PPP_MPPE:\t missing MPPE encryption (optional, mostly used by PPTP links)"
-		CONFIG_CHECK="${CONFIG_CHECK} ~PPPOE ~PACKET"
-		local WARNING_PPPOE="CONFIG_PPPOE:\t missing PPPoE support (optional, needed by rp-pppoe plugin)"
-		local WARNING_PACKET="CONFIG_PACKET:\t missing AF_PACKET support (optional, used by rp-pppoe and dhcpc plugins)"
-		if use atm ; then
-			CONFIG_CHECK="${CONFIG_CHECK} ~PPPOATM"
-			local WARNING_PPPOATM="CONFIG_PPPOATM:\t missing PPPoA support (optional, needed by pppoatm plugin)"
-		fi
-		check_extra_config
-	fi
-
-	# create *-secrets files if not exists
-	[ -f "${ROOT}/etc/ppp/pap-secrets" ] || \
-		cp -pP "${ROOT}/etc/ppp/pap-secrets.example" "${ROOT}/etc/ppp/pap-secrets"
-	[ -f "${ROOT}/etc/ppp/chap-secrets" ] || \
-		cp -pP "${ROOT}/etc/ppp/chap-secrets.example" "${ROOT}/etc/ppp/chap-secrets"
-
-	# lib name has changed
-	sed -i -e "s:^pppoe.so:rp-pppoe.so:" "${ROOT}/etc/ppp/options" || die
-
-	echo
-	elog "Pon, poff and plog scripts have been supplied for experienced users."
-	elog "Users needing particular scripts (ssh,rsh,etc.) should check out the"
-	elog "/usr/share/doc/${PF}/scripts directory."
-}
diff --git a/net-dialup/ppp/ppp-2.4.7-r5.ebuild b/net-dialup/ppp/ppp-2.4.7-r7.ebuild
index 801baf73853f..b969cca6161b 100644
--- a/net-dialup/ppp/ppp-2.4.7-r5.ebuild
+++ b/net-dialup/ppp/ppp-2.4.7-r7.ebuild
@@ -1,11 +1,11 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
 
 inherit linux-info multilib pam toolchain-funcs
 
-PATCH_VER="5"
+PATCH_VER="7"
 DESCRIPTION="Point-to-Point Protocol (PPP)"
 HOMEPAGE="https://ppp.samba.org/"
 SRC_URI="https://download.samba.org/pub/ppp/${P}.tar.gz
@@ -17,15 +17,14 @@ SLOT="0/${PV}"
 KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
 IUSE="activefilter atm dhcp eap-tls gtk ipv6 libressl pam radius"
 
-DEPEND="activefilter? ( net-libs/libpcap )
+DEPEND="
+	activefilter? ( net-libs/libpcap )
 	atm? ( net-dialup/linux-atm )
 	pam? ( virtual/pam )
 	gtk? ( x11-libs/gtk+:2 )
-	eap-tls? (
-		net-misc/curl
-		!libressl? ( dev-libs/openssl:0= )
-		libressl? ( dev-libs/libressl )
-	)"
+	!libressl? ( dev-libs/openssl:0= )
+	libressl? ( dev-libs/libressl:= )
+"
 RDEPEND="${DEPEND}"
 PDEPEND="net-dialup/ppp-scripts"
 
@@ -87,11 +86,19 @@ src_prepare() {
 		sed -i -e '/+= radius/s:^:#:' pppd/plugins/Makefile.linux || die
 	fi
 
+	# Respect our pkg-config settings.
+	sed -i \
+		-e 's:pkg-config:$(PKG_CONFIG):' \
+		contrib/pppgetpass/Makefile.linux || die
+	sed -i \
+		-e '/^LIBS/{s:-L/usr/local/ssl/lib::;s:-lcrypto:`$(PKG_CONFIG) --libs libcrypto`:}' \
+		pppd/Makefile.linux || die
+
 	eapply_user #549588
 }
 
 src_compile() {
-	tc-export AR CC
+	tc-export AR CC PKG_CONFIG
 	emake COPTS="${CFLAGS} -D_GNU_SOURCE"
 
 	# build pppgetpass
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)"
 }