gentoo resync : 28.04.2019

4 files changed, 52 insertions, 48 deletions

diff --git a/net-dialup/xl2tpd/Manifest b/net-dialup/xl2tpd/Manifest
index 4f72982bf5b0..8a2a6af33b0a 100644
--- a/net-dialup/xl2tpd/Manifest
+++ b/net-dialup/xl2tpd/Manifest
@@ -5,9 +5,9 @@ AUX xl2tpd.service 232 BLAKE2B 16578777774cd7d378efb37f917e368d39f84267c45184d9b
 DIST xl2tpd-1.3.10.tar.gz 510777 BLAKE2B 15ec09a6186d20facd4eceeca87a33a4676644a6976c2b69a61b288a2534c354bcc9b64eca4305aa7774d3b5fc29c97078478bebec7e81f8071865b29a97809e SHA512 304b8cd098608a866d32c65c55ba98a01e10abb473d8bff488c723fd1f6d4a66cf98c6d3044f7986a334739693767608c48999f873e95a51f0fa6c23cb61ecd4
 DIST xl2tpd-1.3.11.tar.gz 510652 BLAKE2B c120ba0a2bb96a87334743319808e4a1dfb1b95140fc37df51c33e176bdefdac547ad27d38731bab9d94a939b9a3ca93404ef17c8076e16567a3ecc5b568fb47 SHA512 9fd478aa6b7e22867aa977aa0c22ba9d856e3b659aa0ffdcdb17aa0d8358cceab37da565eeb799590d65fc2914720715423e006f6bbe7ca742f09d7cced52cb7
 DIST xl2tpd-1.3.12.tar.gz 513173 BLAKE2B a1f2e4d0e1af4402679eeec6589ca17b0422c664d37beae628511f988f6508ca22160d4657f8ff84bc5e5aac4d3e837c501b4d307964530044a792f2ecc599ab SHA512 e18f15ba038cd358fbad9dd7284c5f3c34273d9291bf8c66494c46d78150acfc1666cbf935fb5a66bd1f0220014f0b49fa0f7f55cb42de125e4123112c6eb00b
-DIST xl2tpd-1.3.6.tar.gz 553981 BLAKE2B 3e79534fe3eaa906cf09da93b7f6be2931e4c7fc8ff43dd9683ae846e1e2351c3bee81ac8853dee6c7e45ad8b60f8727edbd95d6dd30cc508288227b09da351c SHA512 868c65660e6a45fb8dc22b95542e9d6ca0dc8e5033cc9df04171a651ef273bc5d711a85f61d4a971d714089f7a10ee67460d8ab9f3c007fcffe0e11e81ae0bfd
+DIST xl2tpd-1.3.13.tar.gz 513958 BLAKE2B 66c2bcbb54191445f1a519d507b2ec67b48d9e994db09b8c6fc9980b03bf5aab09a2f6187170f0e8639bd8a323b8417bf6e5d0a80fd9e45f8adc310902b256ae SHA512 02e3502a75f41745c001fe1a34dd9900c3a77eea274e08f9361f7145ac24e9a663975efe85ef6aef7c6da1aa9f3369eeb5542ac26e90b9d59753158a17b69ee4
 EBUILD xl2tpd-1.3.10.ebuild 1425 BLAKE2B bc0818635d0bb8afcdd156627b8aa9d17a4f994218f3b99d79b42145267ce41034000bea0d939ec434a69883b18644109d14d8a269278c9990cf237d063c8459 SHA512 1eefffdad13cbd8c20f44d07795ce5fa91992c4b742a4888aff3c91e1ec4bb5c956da7a064b9d7f741b64a4d50b1faa797f235d9f039dc998c59212d29be15f1
 EBUILD xl2tpd-1.3.11.ebuild 1428 BLAKE2B 58651df441e16d91d8581a802392328a15350101f2d866b2c31205054779648fd1372520200140392e9078b2e32d0b1b2f061d5c71b1046369e772220ed6734f SHA512 9cee0c5c5b4d36ef43f65347ddcf1b8f6dc7d317f1f300fea2b6634f23ae656ba535674ba3b186bb725adf73f64bdf251e53a03b7c02b8235e99d87392fdb8ae
 EBUILD xl2tpd-1.3.12.ebuild 1004 BLAKE2B a796ad76184d12a65580ae78f74d7d9b1441218575e9ba0251f12c3a455d3a08a842788d3ab5a1ea8b3bbd0f31f844ef3d5bd9b1d3caf58752102b5dbfb9dc3d SHA512 f71ebce1cbb0c62164433a1a17685d1c38c5b359b49bec046e10c9fbb9d4eff0b2878f2aae0fa1630b9126ddb7bf5888beb5ddf78bfc764b7116f75743239ea4
-EBUILD xl2tpd-1.3.6.ebuild 1344 BLAKE2B 3e7a3a796dab934943f1a3459c3cb92597b4f33063b3f4cb44a6324171e037e5a1ee1fd6aaae8818857dd8c9a2607d8c585107c92b864569217b4c3492613894 SHA512 7f12712ad899f57b32b8533340c0e57cfcb8907f5031715e548c9286b1ae4b77c0486c547355f0beadba267aa945169f9149b078373cbd8f5a82d0547ca1f58b
-MISC metadata.xml 890 BLAKE2B f67510f849125ef7ee64c3caca3c4fa82ed73a7b6e7ea66b10699794811a25ce6a6b3bf6a67f58fccf26db18016b0afcc55f739623925871782bf19d666efe40 SHA512 50133ce8a2cb581602a36995ceac1e80a28216b83998889af3f7f51acee96b0b2183d96637ef7107b76a719a894c29c86654b471cc09c0fe330dd7428f484e05
+EBUILD xl2tpd-1.3.13.ebuild 1085 BLAKE2B 59ac457947ab22c55f14f184e48aca4bf1b3f6c17dbfb40819b6c36e4bcb3084247297fa0f1b6266f0fcedcf884596b5dc6e28253129477e4508ff472108115e SHA512 3929d200e1d714c50bfa712c68544e46270b5e9485ee531fd9c74d1ec2535fe20112ef2dc8379b0781d3fbf2e0054c0029e36ec69246c6e80515e1f53191bb31
+MISC metadata.xml 956 BLAKE2B 6091603a330f7056f8710c185d5bb6f83e60d7d7063d2844125568d81353da7c79a6c56d3652d2fcfd373a3f5c310a7aa64b6231ac9ed39a41485ccf788cb0ec SHA512 22a1d2541c0bd7e46a54a75d4199233d216b2678bc7c60b0c0c29d2cfc1c9f6320afb22611e1f4fd1b1801fb2084d565a79cb3eeaa5092d9e836a8fdf3dcc9cb
diff --git a/net-dialup/xl2tpd/metadata.xml b/net-dialup/xl2tpd/metadata.xml
index 3da1a1ee3824..8066f7a44b9e 100644
--- a/net-dialup/xl2tpd/metadata.xml
+++ b/net-dialup/xl2tpd/metadata.xml
@@ -12,6 +12,7 @@
 	<longdescription>xl2tpd is a fork of l2tpd Layer 2 Tunneling Protocol (L2TP) daemon that can be used to transfer frames of OSI layer 2 protocols through an IP tunnel. While it provides authentication via CHAP or PAP it does not provide encryption itself and should therefore be externally secured (via IPSEC).</longdescription>
 	<use>
 		<flag name="dnsretry">Patch for host lookup retries, activated by redial feature</flag>
+		<flag name="kernel">Enable kernel interface for PPPoL2TP</flag>
 	</use>
 	<upstream>
 		<remote-id type="github">xelerance/xl2tpd</remote-id>
diff --git a/net-dialup/xl2tpd/xl2tpd-1.3.13.ebuild b/net-dialup/xl2tpd/xl2tpd-1.3.13.ebuild
new file mode 100644
index 000000000000..ff05839b9552
--- /dev/null
+++ b/net-dialup/xl2tpd/xl2tpd-1.3.13.ebuild
@@ -0,0 +1,48 @@
+# Copyright 1999-2019 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit systemd toolchain-funcs
+
+DESCRIPTION="A modern version of the Layer 2 Tunneling Protocol (L2TP) daemon"
+HOMEPAGE="https://github.com/xelerance/xl2tpd"
+SRC_URI="https://github.com/xelerance/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="GPL-2+"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~mips ~ppc ~ppc64 ~x86"
+IUSE="+kernel"
+
+DEPEND="
+	net-libs/libpcap
+	>=sys-kernel/linux-headers-2.6"
+
+RDEPEND="
+	${DEPEND}
+	net-dialup/ppp"
+
+DOCS=(CREDITS README.xl2tpd BUGS CHANGES TODO doc/README.patents)
+
+src_compile() {
+	tc-export CC
+	local OSFLAGS="-DLINUX"
+	use kernel && OSFLAGS+=" -DUSE_KERNEL"
+	emake OSFLAGS="$OSFLAGS"
+}
+
+src_install() {
+	emake PREFIX=/usr DESTDIR="${D}" install
+
+	newinitd "${FILESDIR}"/xl2tpd-init-r1 xl2tpd
+
+	systemd_dounit "${FILESDIR}"/xl2tpd.service
+	systemd_dotmpfilesd "${FILESDIR}"/xl2tpd.conf
+
+	einstalldocs
+
+	insinto /etc/xl2tpd
+	newins doc/l2tpd.conf.sample xl2tpd.conf
+	insopts -m 0600
+	newins doc/l2tp-secrets.sample l2tp-secrets
+}
diff --git a/net-dialup/xl2tpd/xl2tpd-1.3.6.ebuild b/net-dialup/xl2tpd/xl2tpd-1.3.6.ebuild
deleted file mode 100644
index d341d3479b51..000000000000
--- a/net-dialup/xl2tpd/xl2tpd-1.3.6.ebuild
+++ /dev/null
@@ -1,45 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="5"
-
-inherit eutils systemd toolchain-funcs
-
-DESCRIPTION="A modern version of the Layer 2 Tunneling Protocol (L2TP) daemon"
-HOMEPAGE="http://www.xelerance.com/services/software/xl2tpd/"
-SRC_URI="https://github.com/xelerance/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~mips ~ppc ppc64 ~x86"
-IUSE="dnsretry"
-
-DEPEND="net-libs/libpcap"
-RDEPEND="${DEPEND}
-	net-dialup/ppp"
-DEPEND+=" >=sys-kernel/linux-headers-2.6.23"
-
-src_prepare() {
-	sed -i Makefile -e 's| -O2||g' || die "sed Makefile"
-	# The below patch is questionable. Why wasn't it submitted upstream? If it
-	# ever breaks, it will just be removed. -darkside 20120914
-	use dnsretry && epatch "${FILESDIR}/${PN}-dnsretry.patch"
-}
-
-src_compile() {
-	tc-export CC
-	export OSFLAGS="-DLINUX"
-	emake
-}
-
-src_install() {
-	emake PREFIX=/usr DESTDIR="${D}" install
-	dodoc CREDITS README.xl2tpd BUGS CHANGES TODO doc/README.patents doc/rfc2661.txt
-	insinto /etc/xl2tpd
-	newins doc/l2tpd.conf.sample xl2tpd.conf
-	newins doc/l2tp-secrets.sample l2tp-secrets
-	fperms 0600 /etc/xl2tpd/l2tp-secrets
-	newinitd "${FILESDIR}"/xl2tpd-init-r1 xl2tpd
-	systemd_dounit "${FILESDIR}"/xl2tpd.service
-	systemd_dotmpfilesd "${FILESDIR}"/xl2tpd.conf
-}