gentoo resync : 25.08.2018

3 files changed, 23 insertions, 24 deletions

diff --git a/net-dialup/openl2tp/Manifest b/net-dialup/openl2tp/Manifest
index 9f36dc7d0643..e32e325d708e 100644
--- a/net-dialup/openl2tp/Manifest
+++ b/net-dialup/openl2tp/Manifest
@@ -16,7 +16,7 @@ AUX openl2tp-1.8-tirpc.patch 2017 BLAKE2B 981a394dda194b4359e9f39148cc8b210cc3e9
 AUX openl2tp-1.8-unused-var.patch 605 BLAKE2B 886f407aebd5b2479068b26550f7c2377baa6d44a8a7187b153a96ba684f3f05d396fb25cff5371487b63b0fa01c12e63878ce419d2acfa861378323db04d117 SHA512 2ac1f04004a06e6a97224a04395a72cc2699e398efaafbdd74773819dc148d8d314ac3e4865722886db53d70eff1a4f021e4a39fb3e5d18011ef1b473ded9ac9
 AUX openl2tp-1.8-werror.patch 1466 BLAKE2B 44003bec2469c04dfa80ee4a87080723f57bb443832eb09fe5f27b8bf3d7e82d3f33f786773a7fb376a7390dc3a60720fcb4567ccc98f36c2bf6a7261e168be8 SHA512 99967159458f9ee806b72372142a5895793daad46b4aa9a6f0876eafc9c89b2016d72883c6c77adee6cebd4126fb9ba463b2b8bf7119456a4ea72d86374fb10d
 AUX openl2tpd.confd 717 BLAKE2B 7c92d47880c57c39deee6eebe458f0a1367fff616af3377145a0938e073068630f76245299b4c6886b34c06a975d41996adf05c6c145194e6af00abc66a317a0 SHA512 b120c80c352cfb810f808722a5fbbc63519e07b72f16a1b42f4e577da9a4607b24e8ce82bf25ccd90c69ad640ad929be89c7e1e3fb429c61088ce93ddab2ceb4
-AUX openl2tpd.initd 1789 BLAKE2B 1530178a1db38978da868dc7249fc6bea715c2aed82a8294181bacd8def9027be5d84438b96550bae10a3c929c4ef47856e7f0c2bebaec32930b391409ac5cb3 SHA512 a74d527fb905313a86174eaee55b94617f539a2b63e629bf040c1c715b6ffaf46a099a1ba3e927cd1384183adcbccfe8535e8a5e4f879f906d9cbede033b3cb4
+AUX openl2tpd.initd 1788 BLAKE2B cccc7e9f907ccf5abe5dc84d0e3228b8e5a542e6f864325cf5eb7fd2d84e50e0d5cf86ec276a59bef7bf576d52b4b9c00bb34c1ec706dd6ee719030f64ba55e0 SHA512 8f84e847eb9b3f7d6c07bef1d6e8a051a0ded8ec6c4d21be26c55eacdb3d12fce60dce7b4c94d4e9358c4d724c868bf84c2a6262772f8fdfb3e54931cee0ce10
 DIST openl2tp-1.8.tar.gz 491160 BLAKE2B 70c78cd4d7daba600f9a9115025acb38b82adc0a04bbf6e9d46daebf2c7c37cc8fe9df6fa7157a05525e998063f5200a85893bb5b33dbe3e66ca7b6a4d2c7972 SHA512 360f9032b2bb104cfaa41a18fc37005510ab604b31a34a3412563e0de3e8dad946ca61840cd41a19f0202d92d758d812f45479659c9fa4d4e9e13dd226f03fda
-EBUILD openl2tp-1.8.ebuild 3454 BLAKE2B 025f73f55a76c1b46efdd12f67e44b27ebec64d028c5e735c03379842f5d60f17cedac9b65fbf2c6888fc6e81106dece746ecc9909c9712637ec99b5caade7cb SHA512 99c36cb751523d073671d05f38a1fd73c4d7f8e005cbb4ad93df08ec4353b2abcd893e053c66ae6082e9b225576d7a8164c247e0992d5656eb8853acf154b34f
+EBUILD openl2tp-1.8-r1.ebuild 3370 BLAKE2B c9f3cf228938e4a836fd3a0cbd906450cf3070b7d78dfda858c795f714a9bd80bc974944bfb693d51a2e48a73f35a1dcef112a1665400247f4b02b4abb41f247 SHA512 9d708627a2892163c9ecc56182fab61db5cab098b4f5a010dd41d671a14fa6eacd87d55bc91713c8fb67dc31f70d2a652c9a0a39218866f10fa48d32185be0ed
 MISC metadata.xml 669 BLAKE2B 98bd7762042c36ccfc4219807014ec3c6a9c65827820d174ae87eeb16a5ae64212a68fea18ebd46c2ff7ea3b4996aa63b383ab14dbd4009e491b76437b234e67 SHA512 1d4880fea1badcdbbdf6e7259e968907c4d74ece0c309e8bbd556763e377b6bda56d1d2e1de67177c9867de1fcb36e294723d02b2c6ee22c7cdcb99973b6b8e4
diff --git a/net-dialup/openl2tp/files/openl2tpd.initd b/net-dialup/openl2tp/files/openl2tpd.initd
index b1d1511a5642..fda6770fa90f 100644
--- a/net-dialup/openl2tp/files/openl2tpd.initd
+++ b/net-dialup/openl2tp/files/openl2tpd.initd
@@ -61,7 +61,7 @@ stop() {
     rc=$?
 
     if [ ${RC_CMD} = "restart" ]; then
-        einfo "sleepinng for server to finilize connections"
+        einfo "sleeping for server to finalize connections"
         sleep 2
     fi
 
diff --git a/net-dialup/openl2tp/openl2tp-1.8.ebuild b/net-dialup/openl2tp/openl2tp-1.8-r1.ebuild
index 707cccebd5a7..fb5611675f4e 100644
--- a/net-dialup/openl2tp/openl2tp-1.8.ebuild
+++ b/net-dialup/openl2tp/openl2tp-1.8-r1.ebuild
@@ -1,7 +1,7 @@
 # Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=7
 
 inherit linux-info
 
@@ -16,18 +16,18 @@ IUSE="+client debug dmalloc doc +examples rpc server stats"
 
 REQUIRED_USE="|| ( client server )"
 
-CDEPEND="
+BDEPEND="
+	>=net-libs/rpcsvc-proto-1.3.1-r1
+	sys-devel/bison
+	sys-devel/flex
+"
+DEPEND="
 	>=net-dialup/ppp-2.4.5
 	>=net-libs/libtirpc-1.0.3
 	sys-libs/readline:=
 	dmalloc? ( dev-libs/dmalloc )
 "
-DEPEND="${CDEPEND}
-	>=net-libs/rpcsvc-proto-1.3.1-r1
-	sys-devel/bison
-	sys-devel/flex
-"
-RDEPEND="${CDEPEND}
+RDEPEND="${DEPEND}
 	rpc? ( net-nds/rpcbind )
 "
 
@@ -55,32 +55,31 @@ src_prepare() {
 }
 
 src_configure() {
-	declare -a myconf	# not local, should be used at src_compile()
+	myconf=
 
-	use client	|| myconf+=( L2TP_FEATURE_LAC_SUPPORT=n
+	use client	|| myconf+=" L2TP_FEATURE_LAC_SUPPORT=n
 							 L2TP_FEATURE_LAIC_SUPPORT=n
-							 L2TP_FEATURE_LAOC_SUPPORT=n )
+							 L2TP_FEATURE_LAOC_SUPPORT=n "
 
-	use server	|| myconf+=( L2TP_FEATURE_LNS_SUPPORT=n
+	use server	|| myconf+=" L2TP_FEATURE_LNS_SUPPORT=n
 							 L2TP_FEATURE_LNIC_SUPPORT=n
-							 L2TP_FEATURE_LNOC_SUPPORT=n )
+							 L2TP_FEATURE_LNOC_SUPPORT=n "
 
-	use rpc		|| myconf+=( L2TP_FEATURE_RPC_MANAGEMENT=n )
+	use rpc		|| myconf+=" L2TP_FEATURE_RPC_MANAGEMENT=n "
 
-	use stats	&& myconf+=( L2TP_FEATURE_LOCAL_STAT_FILE=y )
-	use debug	&& myconf+=( L2TP_DEBUG=y )
-	use dmalloc	&& myconf+=( USE_DMALLOC=y )
+	use stats	&& myconf+=" L2TP_FEATURE_LOCAL_STAT_FILE=y "
+	use debug	&& myconf+=" L2TP_DEBUG=y "
+	use dmalloc	&& myconf+=" USE_DMALLOC=y "
 
-	# pppd plugin is only needed for pppd < 2.4.5
-	unset PPPD_SUBDIR
+	echo ${myconf} > "${T}/myconf"
 }
 
 src_compile() {
-	emake ${myconf[@]}
+	emake $(cat "${T}/myconf")
 }
 
 src_install() {
-	emake ${myconf[@]} DESTDIR="${D}" install
+	emake $(cat "${T}/myconf") DESTDIR="${D}" install
 
 	if use examples; then
 		docinto event_socket