Revbump for last change.

Package-Manager: portage-2.2.8/cvs/Linux x86_64
Manifest-Sign-Key: 0x0BBEEA1FEA4843A4

3 files changed, 64 insertions, 5 deletions

diff --git a/net-dialup/xl2tpd/ChangeLog b/net-dialup/xl2tpd/ChangeLog
index fb40f6c33a9e..33c0201ac854 100644
--- a/net-dialup/xl2tpd/ChangeLog
+++ b/net-dialup/xl2tpd/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for net-dialup/xl2tpd
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-dialup/xl2tpd/ChangeLog,v 1.42 2014/01/08 16:49:13 floppym Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-dialup/xl2tpd/ChangeLog,v 1.43 2014/01/08 16:50:12 floppym Exp $
+
+*xl2tpd-1.3.1-r4 (08 Jan 2014)
+
+  08 Jan 2014; Mike Gilbert <floppym@gentoo.org> +xl2tpd-1.3.1-r4.ebuild:
+  Revbump for last change.
 
   08 Jan 2014; Mike Gilbert <floppym@gentoo.org> xl2tpd-1.3.1-r3.ebuild:
   Install sample config file as /etc/xl2tpd/xl2tpd.conf.
diff --git a/net-dialup/xl2tpd/Manifest b/net-dialup/xl2tpd/Manifest
index 70dc22201fa3..7669762c7da7 100644
--- a/net-dialup/xl2tpd/Manifest
+++ b/net-dialup/xl2tpd/Manifest
@@ -13,12 +13,13 @@ AUX xl2tpd.service 232 SHA256 fa82928fbd632a1c3f2897f371b178b055cee4dd1e46248fd6
 DIST xl2tpd-1.3.1.tar.gz 551923 SHA256 147ea96a957628bc31bba6fd5f5ef5522366691f936ce4c0a0988d9876e3ba14 SHA512 2265a19eda1521fd4314ad1b28cc1bb781d2f0edb06ad619afbb364f5896e23db7e444ac10709c1ae9b9ac648e4354aea7af57bb5bc20b706b00e2a131fc29d6 WHIRLPOOL b5465605ae5c3bbf73227f11958a43c66191bb557447ce224de044358e738331cf8e64e783bb5527517683cbcc59d57df9cc17c990f652fe7aed1ab2cfd7f9b2
 EBUILD xl2tpd-1.3.1-r2.ebuild 1697 SHA256 befc60185a23f8cd2aa2b1c5f930690342a54e9fa1544ad36cb944916b167866 SHA512 663ff887c43b67200ff3d9d832659b306bd1f98ce0e841a07a6f156ddc925a1facbc7eac58dafc3b7a1a18a6e1be04986ca45cf6564947b3f5049c1812d7e7e7 WHIRLPOOL 22026b4ff68f16547cee7513c0ba8d84be0014930dcf1dce0eac8427df8b29932a91590792304a7b3056fce2e64dba64f146aaee8e1c29553fc3743187768ea5
 EBUILD xl2tpd-1.3.1-r3.ebuild 1757 SHA256 89e07fc41b05ce562986fe41ad1d22ed0ba0d2d88414d42f71347f7522f7024b SHA512 099e8795665e3fbf4ec1f893fd692cfa1ab36a28624ff0fe4905d2e13e54c4b0ba2c1e7fc874ebefd4051ca82ab7752e6abb342246147ee18aef1a9147fc6a88 WHIRLPOOL 91bf94a6c9430fbff01a90ba1d0408dae2e295cff72c07338524b2b13808e54e3627a3748c36a9cb6d267691f4b658f9ca20ea0461cde360dd6a153df18eaab8
-MISC ChangeLog 7166 SHA256 80424cae4a9e551095e0ae3a94349fbcccb8bd5aba4a7008c2caaf848cb2abcc SHA512 376525e4d4ef0a7fff5d41f2b5bac192ce6b3a46c6d1ea13b6097a630c76afc3e598c7b393395873572b3e571196c04cbc93a461046da8b8a4f150fa2791d62d WHIRLPOOL 7d52ece12edef225cb380c091905005e40c605ece04a8507dcf3d0227415ca2e8ecda9013ffd62f3ff697feef6d9f566ac54bec01acc10fa93a07198b60193f9
+EBUILD xl2tpd-1.3.1-r4.ebuild 1759 SHA256 9339d1118a937223a003e7d053e62dc1cc3c61b01a97fb4fff0801dcee558ec3 SHA512 40127d9800b652139ee48f4f0c14e9da98f0ea45ce94ad31779daf7f7596ee4f496d77ac849cf9b903f017d3a5b08c55b714e50a6bf14e2ce6d245568ecba664 WHIRLPOOL e0c272a33f4ea491305c6ea1d271844438cfdac3172e17fc86ccdcdb392bf67630e14e32606ed43f38a2d0c1b978779a882b97801d2a9a58b41987c9003689d2
+MISC ChangeLog 7300 SHA256 fd484e5373b2fe96a73cd7b9c738e33fd408b099e9103a3b7b5fa9e131cfc87c SHA512 f18298750edef01dd12aa0f9c803dd76adb835ebbc35baf314e6069b7a37d422de5bceb082cec15f9e575e02cdf9748fc9716130f481264b5a6588d2516732ca WHIRLPOOL 7f91064bc3809550a957ea43c3b7ba9b51c0103217c22cb516c6c0d8bc73de3f61152127ea8e60795134f34bc907f8be3773936eca9cd8fe274b47a47315ee48
 MISC metadata.xml 545 SHA256 e53b5282c8bfe7c0ba7b40db85094c632985cde0a5f85cca35461af4f0605381 SHA512 9db75b3c78b63e7acf7a77ae9179e7f2fd074d31da81aaa9ebd837da31a41aa3d26382533c26f13b70c10e0c334f7f74f53b02e9a1eb243f157df729de59722d WHIRLPOOL 740271692bf2f582336958c40208d427b4e6e893a2a758ff9369f95c1db6a49028d26831ef86d418844c5472904dc137dbd3af1a8f3c59b85eb9f5fa8f28dd43
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.22 (GNU/Linux)
 
-iF4EAREIAAYFAlLNgYoACgkQC77qH+pIQ6TYtAD+KAcCmPTKtbj3QijhTLZs3oam
-6Hl5xWVHLGrhkrL/dmgA/jI+C/cd0zLQzrU9mCchvX7RqSBsSR/1opHMsLL4kQvo
-=lkWD
+iF4EAREIAAYFAlLNgcYACgkQC77qH+pIQ6QDUwD+JmJLsIT2o4oVXs6JMtcPirr0
+7SwMtuKmuao0qNvmWloA/RsXCyQqdvHRFXGAB7x6NiIgyFEkDYBDCmwz8KHrKnbg
+=plV2
 -----END PGP SIGNATURE-----
diff --git a/net-dialup/xl2tpd/xl2tpd-1.3.1-r4.ebuild b/net-dialup/xl2tpd/xl2tpd-1.3.1-r4.ebuild
new file mode 100644
index 000000000000..51a60ca96f07
--- /dev/null
+++ b/net-dialup/xl2tpd/xl2tpd-1.3.1-r4.ebuild
@@ -0,0 +1,53 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/net-dialup/xl2tpd/xl2tpd-1.3.1-r4.ebuild,v 1.1 2014/01/08 16:50:12 floppym Exp $
+
+EAPI="5"
+
+inherit eutils systemd toolchain-funcs vcs-snapshot
+
+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}/tarball/v${PV} -> ${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~x86"
+IUSE="dnsretry +kernel"
+
+DEPEND="net-libs/libpcap"
+RDEPEND="${DEPEND}
+	net-dialup/ppp"
+DEPEND+=" kernel? ( >=sys-kernel/linux-headers-2.6.23 )"
+
+src_prepare() {
+	epatch "${FILESDIR}/${PN}-1.3.0-LDFLAGS.patch"
+	epatch "${FILESDIR}/${PN}-1.3.1-CFLAGS.patch"
+	epatch "${FILESDIR}/${PN}-1.3.1-no-type-punning-b119c0da.patch"
+	epatch "${FILESDIR}/${PN}-1.3.1-kernelmode.patch"
+	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"
+	# Remove bundled headers
+	rm -r linux || die
+}
+
+src_compile() {
+	tc-export CC
+	export OSFLAGS="-DLINUX"
+	use kernel && OSFLAGS+=" -DUSE_KERNEL"
+	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
+}