Fix path in init script.

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

4 files changed, 68 insertions, 7 deletions

diff --git a/net-dialup/xl2tpd/ChangeLog b/net-dialup/xl2tpd/ChangeLog
index dd817e7e9bc0..1779ed03dba1 100644
--- a/net-dialup/xl2tpd/ChangeLog
+++ b/net-dialup/xl2tpd/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for net-dialup/xl2tpd
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-dialup/xl2tpd/ChangeLog,v 1.29 2012/09/14 20:34:25 darkside Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-dialup/xl2tpd/ChangeLog,v 1.30 2012/12/25 17:58:12 floppym Exp $
+
+*xl2tpd-1.3.1-r1 (25 Dec 2012)
+
+  25 Dec 2012; Mike Gilbert <floppym@gentoo.org> +xl2tpd-1.3.1-r1.ebuild,
+  files/xl2tpd-init-r1:
+  Fix path in init script.
 
   14 Sep 2012; Jeremy Olexa <darkside@gentoo.org> -xl2tpd-1.2.4.ebuild,
   -files/xl2tpd-1.2.4-as-needed.patch, -xl2tpd-1.2.6-r1.ebuild,
diff --git a/net-dialup/xl2tpd/Manifest b/net-dialup/xl2tpd/Manifest
index 39cb17555e0c..784a44a83b5e 100644
--- a/net-dialup/xl2tpd/Manifest
+++ b/net-dialup/xl2tpd/Manifest
@@ -1,10 +1,21 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA256
+
 AUX xl2tpd-1.3.0-LDFLAGS.patch 387 SHA256 c240a4e47775f8037c840a8b2ccaefb29ecca610f4c5d65e4effebec9694cd5d SHA512 e388638b623cae4464bd6946b81682ef8a41c50dd3b93d64a9888e94ff34a7e97db1b34b2c950b3e73a783024e5542ce4d18e63c2465787cc25c0a4e8f28f39e WHIRLPOOL 216d7824dac75fc2946ca2ee1c481a33a6932770f54f7adf906fb368c58a5b5289ee6d78bf13ed60d4dfd9b375072edf560cfcaa0269135d891887ee8ac4822c
 AUX xl2tpd-dnsretry.patch 1509 SHA256 ac398be2d5fb67cc7c5e5b7247572d89cde85b2dc988e4e99c470afddfc5860c SHA512 7999c8e990f7bcd620042295e5fc6e12cf4b1e4faf7cd560bdd4ade4103b171e76a06cb11caea0046b8141a4fa9592bd8851f933072c5e7f71d8b1f4b6fb2bbd WHIRLPOOL e584d4b46dc6249d41b8228246f856ca263c9c3b6713bbb953b17d3265653ee4e45a582f1e2c80f3ad33a0369ed59ddfab50e4c1b5bab9e3be22814c3d034880
 AUX xl2tpd-init 727 SHA256 d20d2351ab714843cb5ee10452552e3d5c2eebf6c53b277025d66925fd9904a1 SHA512 c28d919c89fc18b34d5b9018ff8ca7764f78950d66cbac325d7fee4280b929571fea59b3259be247bd9790e967045d699a6e3c72a941ece51a0ed3f250d303f8 WHIRLPOOL 6475677981c6d47641f5010d029fae0aeb95ebf6acd6a6b299d09b8b472bdc43cc4d583215474ef40acb34f1b9bf216492225cb9ad210aa7a65517bd521149d4
-AUX xl2tpd-init-r1 735 SHA256 0a5e734f32b4d646bbe8b1b08eed7652a68ce17187ddc0c05ea333a208588897 SHA512 693336495461bb756c952cbae679bc71b390cca32d99ed64180d85c298f208168b94e7d49e343d365f2fcd319bcabb3aba664e7565cb158df7c60faa72f6b40d WHIRLPOOL b4e6a6a90f7e3967b9f752f3f1eb423405daec6a087b98a90d462feed7d5987b83d80789a022031a97b3261bdb89270325760d34a2d694b25f69a2f37cce363e
+AUX xl2tpd-init-r1 697 SHA256 7e7ee5eeaa9aa708ff7eeaf7ff5db35ed96a5170ace582d3404941eb188e2d37 SHA512 780f15c960c6d959586f886cce264c09ab369b7aa8b2fbadd8401aa6025ccd1ddbb7621ab6281fb266381b23f4778e49c7e0327e77ff660867a9a66dfdd36a15 WHIRLPOOL 60a110815c6d23585d1a842fb7cca8a90bdde460060cf57961fe155f484561657f686d9bfa37cb2f9f82a23372f8cb6f1084bb595e4639507b7f17bd16143cd0
 DIST xl2tpd-1.3.0.tar.gz 550901 SHA256 972b9440d637c7cff3e28ca4cb4131bc33b9394cfcb7d391383202136632c8c0 SHA512 6868060fbce4944919bcc05c603186aaeb04aab52dc9b5276837c1c01dab4739869511c709cb58f6f513e50b7e534cca89edde9ea2ab7d83ee9cc4d4edf30e44 WHIRLPOOL 502317e8433279d24fce4a681b8d0ec7c018c9488950a5a539307d090ad804f3c3a4e1e15eeafbf7d6ba8a82fc6909935438eef099247ce48c11821da4b24836
 DIST xl2tpd-1.3.1.tar.gz 551923 SHA256 147ea96a957628bc31bba6fd5f5ef5522366691f936ce4c0a0988d9876e3ba14 SHA512 2265a19eda1521fd4314ad1b28cc1bb781d2f0edb06ad619afbb364f5896e23db7e444ac10709c1ae9b9ac648e4354aea7af57bb5bc20b706b00e2a131fc29d6 WHIRLPOOL b5465605ae5c3bbf73227f11958a43c66191bb557447ce224de044358e738331cf8e64e783bb5527517683cbcc59d57df9cc17c990f652fe7aed1ab2cfd7f9b2
 EBUILD xl2tpd-1.3.0.ebuild 1156 SHA256 93e9b36c45f104aa9001d4a14319470dcacb6c3bfb760d095446fdc68bfb6d2e SHA512 7e2202396bae2bc7958f4ecc70538c0967fe155ea3fc0bee55547bab8e68349d2846686204e5cb7154c775148f7a9d9a1912f324803701184af2b87637a56597 WHIRLPOOL 40bf4e24473aab5f0adbf97fd2f5754a4860c1e2f97327df8911269fbf5eee2e12bc293b0af1b50393d80acd704d051230a2b6edbe6a4243d9e4bd603bd4af3e
+EBUILD xl2tpd-1.3.1-r1.ebuild 1392 SHA256 4cd8ec20648643ea4c0b94ec6a89c56b1a0bf5a81878f34f0807519095e3a48b SHA512 a2fb89c0a69e342877b9079dfd3888ceb7fef80c731220d2e6dde054441620ea99174348d71c28c37a781f797557c70ec7650f38304aac54ec656768605ba968 WHIRLPOOL d4edfaacad3cec591b4a124c828d06ed4ddf4801bb7e01bfa0bb8f0d180b073d6b643fd2e6debd29218a597da3731d13402e27053487b367f1e61a359513ebda
 EBUILD xl2tpd-1.3.1.ebuild 1390 SHA256 4edaac56aa754801050fe0339d0c05f6ffc8fb0564e7956c4bd6e4de7b22e86e SHA512 0ed1024fc60aa62fcbfab2617583f1f969bc9a8a013f9a51b046ed9c7d19f7f8b84170e0370cbf6bdac764c67ed329d3b1b5040d0e79a07dbf1f206eda7f4c1d WHIRLPOOL e57172166fa9d920d297203c7ecfe181c5f26bc9d02e8ad9b236aa094ce41c1e706c3091a578ae6121dc08cbb47695e4f860f40554cecdb422a23193ed3de21b
-MISC ChangeLog 5338 SHA256 df0523a1681108fc7a4c00099ae57880108c8f74862e0a263f7b6dee3f0fa7b5 SHA512 a77dfb6f5755a33ef0d38ba7c414ed76bf341462a4265dee797edd99741c3cba02e7558739839583f2c17cebcf22465a008de7377633d0af5c80dd3f91e639cb WHIRLPOOL dd9402db2401cca3dffab0e0568a161c0c8921528493a68ed06e0ff873bf3c0e09df907d358de1add44ee4d5558e382bea38ab7f1b12eabcd559c838e35f468d
+MISC ChangeLog 5495 SHA256 c3ea8ae9ca7625a4854915423996c296a5840c2d66be704757a2939f1e07cbe0 SHA512 fb65698a511a0281ad93d0a6490ed240ce4169deadc95f92c056e25768f9d1d18db913a98ab991987e1a499059f91d48282316e476e506e54cad2625d382d581 WHIRLPOOL 5bc70aca2f9b285a781b04b3596ed381650e98cc253c052c5448127629f33a833bf00c8c78c93c957460e5f0415d84a188396a5f7db2097b5e1f2a81492368a1
 MISC metadata.xml 386 SHA256 54594868bd121cb99bd6544547e5a86fe62394005354e3af679ba1409a960e7b SHA512 bdadd379b33a7bffd077f2d1353c62d392b5d72249f90f7aaa606640f4ba894dfba7461c7dbec01b7caaebb9a5ae9769d76a5c70a5c4cce2b1db9dad474b4bb6 WHIRLPOOL 855624f39241538b5e4eef19c86d1cdfbd0071ac487f77c20e0b9c696614f3cf193fcc6bce1a0e94f60f8678aa7e93ae499b195f78ea1a0546652a9e0468637a
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.19 (GNU/Linux)
+
+iF4EAREIAAYFAlDZ6ToACgkQC77qH+pIQ6RBDwD+N33A3ymxdSyEZeHCnw7g4LBP
+2x01bH2E/4qJCZX4gxMA/A2XayjaqWKdWipe8ZwNI1JerJzyK0UcOjwLhlOPnGtJ
+=R8uY
+-----END PGP SIGNATURE-----
diff --git a/net-dialup/xl2tpd/files/xl2tpd-init-r1 b/net-dialup/xl2tpd/files/xl2tpd-init-r1
index 56766e5891c5..af069692f009 100644
--- a/net-dialup/xl2tpd/files/xl2tpd-init-r1
+++ b/net-dialup/xl2tpd/files/xl2tpd-init-r1
@@ -1,7 +1,7 @@
 #!/sbin/runscript
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-dialup/xl2tpd/files/xl2tpd-init-r1,v 1.1 2012/09/10 19:28:12 darkside Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-dialup/xl2tpd/files/xl2tpd-init-r1,v 1.2 2012/12/25 17:58:13 floppym Exp $
 
 depend() {
 	need net
@@ -13,9 +13,7 @@ checkconfig() {
 		return 1
 	fi
 
-	if [ ! -d /var/run/nscd ] ; then
-		checkpath -d -m 755 /var/run/nscd
-	fi
+	checkpath -d -m 755 /var/run/xl2tpd
 
 	return 0
 }
diff --git a/net-dialup/xl2tpd/xl2tpd-1.3.1-r1.ebuild b/net-dialup/xl2tpd/xl2tpd-1.3.1-r1.ebuild
new file mode 100644
index 000000000000..1d334d4b03f6
--- /dev/null
+++ b/net-dialup/xl2tpd/xl2tpd-1.3.1-r1.ebuild
@@ -0,0 +1,46 @@
+# Copyright 1999-2012 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-r1.ebuild,v 1.1 2012/12/25 17:58:12 floppym Exp $
+
+EAPI="4"
+
+inherit eutils 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}/tarball/v${PV} -> ${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~x86"
+IUSE="dnsretry"
+
+DEPEND="net-libs/libpcap"
+RDEPEND="${DEPEND}
+	net-dialup/ppp"
+
+S="${WORKDIR}/xelerance-${PN}-95445fc"
+
+src_prepare() {
+	epatch "${FILESDIR}/${PN}-1.3.0-LDFLAGS.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"
+}
+
+src_compile() {
+	emake CC=$(tc-getCC)
+}
+
+src_install() {
+	emake PREFIX=/usr DESTDIR="${D}" install
+
+	dodoc CREDITS README.xl2tpd BUGS CHANGES TODO doc/README.patents doc/rfc2661.txt
+
+	dodir /etc/xl2tpd
+	cp doc/l2tp-secrets.sample "${ED}/etc/xl2tpd/l2tp-secrets" || die
+	cp doc/l2tpd.conf.sample "${ED}/etc/xl2tpd/xl2tpd.conf" || die
+	fperms 0600 /etc/xl2tpd/l2tp-secrets
+	newinitd "${FILESDIR}"/xl2tpd-init-r1 xl2tpd
+}