Install systemd unit, bug 477800 by nE0sIghT.

(Portage version: 2.2.0_alpha190/cvs/Linux x86_64, signed Manifest commit with key 0BBEEA1FEA4843A4)

4 files changed, 73 insertions, 1 deletions

diff --git a/net-dialup/xl2tpd/ChangeLog b/net-dialup/xl2tpd/ChangeLog
index da9daf5b6219..9b17f7bfca34 100644
--- a/net-dialup/xl2tpd/ChangeLog
+++ b/net-dialup/xl2tpd/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for net-dialup/xl2tpd
 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-dialup/xl2tpd/ChangeLog,v 1.37 2013/02/13 15:19:30 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-dialup/xl2tpd/ChangeLog,v 1.38 2013/07/29 00:01:43 floppym Exp $
+
+*xl2tpd-1.3.1-r3 (29 Jul 2013)
+
+  29 Jul 2013; Mike Gilbert <floppym@gentoo.org> +files/xl2tpd.conf,
+  +files/xl2tpd.service, +xl2tpd-1.3.1-r3.ebuild:
+  Install systemd unit, bug 477800 by nE0sIghT.
 
   13 Feb 2013; Agostino Sarubbo <ago@gentoo.org> xl2tpd-1.3.1-r2.ebuild:
   Stable for x86, wrt to bug #454694
diff --git a/net-dialup/xl2tpd/files/xl2tpd.conf b/net-dialup/xl2tpd/files/xl2tpd.conf
new file mode 100644
index 000000000000..67162b26df06
--- /dev/null
+++ b/net-dialup/xl2tpd/files/xl2tpd.conf
@@ -0,0 +1 @@
+d /var/run/xl2tpd
diff --git a/net-dialup/xl2tpd/files/xl2tpd.service b/net-dialup/xl2tpd/files/xl2tpd.service
new file mode 100644
index 000000000000..37d46cc63493
--- /dev/null
+++ b/net-dialup/xl2tpd/files/xl2tpd.service
@@ -0,0 +1,12 @@
+[Unit]
+Description=Layer 2 Tunneling Protocol Daemon (L2TP)
+After=syslog.target network.target
+After=ipsec.service
+
+[Service]
+ExecStart=/usr/sbin/xl2tpd -D
+KillSignal=SIGINT
+SuccessExitStatus=1
+
+[Install]
+WantedBy=multi-user.target
diff --git a/net-dialup/xl2tpd/xl2tpd-1.3.1-r3.ebuild b/net-dialup/xl2tpd/xl2tpd-1.3.1-r3.ebuild
new file mode 100644
index 000000000000..fd718ba4106e
--- /dev/null
+++ b/net-dialup/xl2tpd/xl2tpd-1.3.1-r3.ebuild
@@ -0,0 +1,53 @@
+# Copyright 1999-2013 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-r3.ebuild,v 1.1 2013/07/29 00:01:43 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 l2tpd.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
+}