gentoo resync : 02.04.2018

5 files changed, 33 insertions, 18 deletions

diff --git a/net-dialup/Manifest.gz b/net-dialup/Manifest.gz
index 6ef790eb37cc..b5e790a5c80f 100644
--- a/net-dialup/Manifest.gz
+++ b/net-dialup/Manifest.gz
diff --git a/net-dialup/rp-l2tp/Manifest b/net-dialup/rp-l2tp/Manifest
index c0b640b8956c..1e7fa64f7520 100644
--- a/net-dialup/rp-l2tp/Manifest
+++ b/net-dialup/rp-l2tp/Manifest
@@ -1,7 +1,8 @@
-AUX rp-l2tp-0.4-build.patch 1807 BLAKE2B df9166ac017aa7cd209d2ab37ef618ad540c0c392e03419e70ba75611b00872ba1711a370f0f5543d9c9a0e90e08884d01843fc718cfd5165ef9bac0e07911b8 SHA512 e9f268c50ffccc4808d5c5d49727ec9d33d4179153481bb991bc94def1edb444fae3e5fd1b02f6b5815ab6d2343083bb62b888f16f72a82a9e35661182b08123
+AUX rp-l2tp-0.4-build.patch 1819 BLAKE2B a40645e1504ad91e721fd111625ae92a252273037d33a30a857bec30dabd11cdfe8861030edfcac31ea735790cfcf81ad337e575d05aaadb91ef16334dd7cd5d SHA512 252beb1692378364b1cf5ab0f46f3956084d5017fcf42d6d81513b7c43498cf8b7824d86b64a09d0a1bf9b2ec600c80d8bf86ef6e9a42b3d8f93f872406fbf2c
 AUX rp-l2tp-0.4-flags.patch 1776 BLAKE2B 8e60152ef9955be322e684688fb08138760cd62d1d64df10d54d30326269fb163b428ba97874e2bb636e806a2a1410c6456198974d5ec1f087f60c723c9f8040 SHA512 f8c91791a381139a07941b25901aba1673c3c39df5d6e0f428c7b2a8785e3d11b10263ffd5d708cd45eb4752cb7261858521ac8556c1fdb8194959aa5239a825
 AUX rp-l2tp-0.4-gentoo.patch 9421 BLAKE2B dd1bb7dc0b592cdfface82a9fd0eb15b7d203baf7441a648df0115da5ba6866f5a540af9b42f956c88468a502306dbab88f676ec03a94581031f17d92ff8a1c3 SHA512 fdff7068aa6811391bc37497914f58e9239f78f84e5928e61799c523e8a1c859f036a55d7f2517ea316a55816e76ffa83f8ffce10fc188adb6ab79541d20a601
+AUX rp-l2tp-0.4-parallel-build.patch 359 BLAKE2B 6bfc883859e1f8d0859f7ba53d250a2c2510a730bbf140a433226c901b8a2b5d3088ec9d08540ceba9b9b67d11492969c068fbed91befc984c9a28f28b6ef6a8 SHA512 a5796a5271f62baafd11a16e943ce6478d50e36acf1da5e369e43b7257b3d3700d98116b50742bf90cec44d9882fef942029ce9a350ef496a18762d2558ef8a0
 AUX rp-l2tpd-init 370 BLAKE2B 01a4accc8d66977e75304e71e1ef20e9bc41059432a281c3cfed3d0844986934f74cfd6b66e3d22bc3e83fe3d4b3bf7a995014011b34ad2a5c398a11d71fcab8 SHA512 a0fcf486af04e5fd90903be8fca7d6235a791bc4a406bd4e09a85a3d29964aa20bb6aefa409d992701be9901aefb2fd52b9d7b57b24ea926b3031bf70a05a3f7
 DIST rp-l2tp-0.4.tar.gz 198869 BLAKE2B 2ffe47311b26fcf50eadfec7be5b5e936f8aa047c6a5bd7599bb9903dfa5eff3dce565ebe7bc12cb7320ffedb73b447511d1aceeda95c285da1fb709b5122db5 SHA512 43a1ce8728323ed25f8b92c981731b21db8714f8d157343deb1da49f2c7b25e1833de5012238098ad9d1add7daec228a48f2cb8d6d0b60afbcc1c385ae79d3c9
-EBUILD rp-l2tp-0.4-r4.ebuild 793 BLAKE2B 36d424d88ff4c97325589c22626b66eee8fda5067a1486e5e6c3f0ea30cd5475237c672b23893c1516cffa1ae62a5017b3d7b41dc7ad07e18f1dac6014656fb8 SHA512 c7a9f169223bcd8b0a9e4e69a82e77ac72f618232bfe2bab086cdeec19cfdeaf257e0ab464a3df42bb02a372b61d5b354e5d9e3a33b7d5c4068feff4fc4228dc
+EBUILD rp-l2tp-0.4-r4.ebuild 818 BLAKE2B 5f5a136bc8e65d0d77b6f894379477b0d7e93a9a444b324044eef2ba1c79954edccb54a0d194d32d55b6f90b846e4d8b8946fab798e96e14a39d57ec059ccbaf SHA512 487d79c97df530abeb66f93a21c64c4ae1daa0efadc17db73c7a0f8e9cd250bcb0f9d81e21778f6cef63d02a05bd90c6eeb4705e38793a9734e68afc3024a5a4
 MISC metadata.xml 244 BLAKE2B 260b3622605599c23a57fd153fe12deb9e35236e9dcd50b7de7163203007404ebe04ecb7c0d61002aaa43f270caa3ddb0e152525076a6bbc1ae8956a6150a321 SHA512 c9b38861937a6e1f07e3461eba4a51b97c0d18deb5868b0aa2d2cfd9464549aa0dde6757e941ce0da7e5f860b8836cc747639aa4b16d9676275ecc38bf0a6332
diff --git a/net-dialup/rp-l2tp/files/rp-l2tp-0.4-build.patch b/net-dialup/rp-l2tp/files/rp-l2tp-0.4-build.patch
index 7bb534b67940..6ba8630e43d6 100644
--- a/net-dialup/rp-l2tp/files/rp-l2tp-0.4-build.patch
+++ b/net-dialup/rp-l2tp/files/rp-l2tp-0.4-build.patch
@@ -1,5 +1,5 @@
---- Makefile.in.orig	2014-06-24 15:20:47.028342728 +0400
-+++ Makefile.in	2014-06-24 15:21:07.468320934 +0400
+--- a/Makefile.in.orig	2014-06-24 15:20:47.028342728 +0400
++++ b/Makefile.in	2014-06-24 15:21:07.468320934 +0400
 @@ -39,8 +39,8 @@
  
  libl2tp.a: $(OBJS)
@@ -11,8 +11,8 @@
  
  l2tpd: libl2tp.a libevent/libevent.a
  	$(MAKE) -C handlers
---- libevent/Makefile.in.orig	2002-09-30 23:45:00.000000000 +0400
-+++ libevent/Makefile.in	2014-06-24 15:24:31.535105268 +0400
+--- a/libevent/Makefile.in.orig	2002-09-30 23:45:00.000000000 +0400
++++ b/libevent/Makefile.in	2014-06-24 15:24:31.535105268 +0400
 @@ -18,20 +18,20 @@
  
  libevent.a: $(OBJS)
@@ -39,8 +39,8 @@
  
  clean: FORCE
  	rm -f *.a *.o *~
---- handlers/Makefile.in.orig	2014-06-24 15:31:35.186667624 +0400
-+++ handlers/Makefile.in	2014-06-24 15:32:26.659615281 +0400
+--- a/handlers/Makefile.in.orig	2014-06-24 15:31:35.186667624 +0400
++++ b/handlers/Makefile.in	2014-06-24 15:32:26.659615281 +0400
 @@ -20,19 +20,19 @@
  all: $(HANDLERS) l2tp-control
  
diff --git a/net-dialup/rp-l2tp/files/rp-l2tp-0.4-parallel-build.patch b/net-dialup/rp-l2tp/files/rp-l2tp-0.4-parallel-build.patch
new file mode 100644
index 000000000000..cfbb096bef70
--- /dev/null
+++ b/net-dialup/rp-l2tp/files/rp-l2tp-0.4-parallel-build.patch
@@ -0,0 +1,12 @@
+--- a/Makefile.in~	2018-04-02 11:58:30.000000000 +0200
++++ b/Makefile.in	2018-04-02 12:00:15.173470572 +0200
+@@ -42,8 +42,7 @@
+ 	$(AR) -rc $@ $^
+ 	@RANLIB@ $@ || true
+ 
+-l2tpd: libl2tp.a libevent/libevent.a
+-	$(MAKE) -C handlers
++l2tpd: libl2tp.a libevent/libevent.a handlers
+ 	@CC@ $(LDFLAGS) -o l2tpd -rdynamic $(OBJS) $(EXTRA_LIBS)
+ 
+ libevent/libevent.a:
diff --git a/net-dialup/rp-l2tp/rp-l2tp-0.4-r4.ebuild b/net-dialup/rp-l2tp/rp-l2tp-0.4-r4.ebuild
index cfe036f1c588..7d468429c0ac 100644
--- a/net-dialup/rp-l2tp/rp-l2tp-0.4-r4.ebuild
+++ b/net-dialup/rp-l2tp/rp-l2tp-0.4-r4.ebuild
@@ -1,9 +1,8 @@
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
-
-inherit eutils toolchain-funcs
+EAPI=6
+inherit toolchain-funcs
 
 DESCRIPTION="User-space implementation of L2TP for Linux and other UNIX systems"
 HOMEPAGE="https://sourceforge.net/projects/rp-l2tp/"
@@ -13,19 +12,22 @@ LICENSE="GPL-2"
 KEYWORDS="amd64 ~ppc x86"
 SLOT="0"
 
+PATCHES=(
+	"${FILESDIR}/${P}-gentoo.patch"
+	"${FILESDIR}/${P}-flags.patch"
+	"${FILESDIR}/${P}-build.patch"
+	"${FILESDIR}/${P}-parallel-build.patch"
+)
+
 src_prepare() {
 	tc-export AR CC RANLIB
-	epatch \
-		"${FILESDIR}/${P}-gentoo.patch" \
-		"${FILESDIR}/${P}-flags.patch" \
-		"${FILESDIR}/${P}-build.patch"
-	epatch_user
+	default
 }
 
 src_install() {
 	emake RPM_INSTALL_ROOT="${D}" install
 
-	dodoc README
+	einstalldocs
 	newdoc l2tp.conf rp-l2tpd.conf
 	docinto libevent
 	dodoc libevent/Doc/*