Fix sed.

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

4 files changed, 12 insertions, 55 deletions

diff --git a/net-dialup/xl2tpd/ChangeLog b/net-dialup/xl2tpd/ChangeLog
index f85b7d059070..7c3bd4ed7a57 100644
--- a/net-dialup/xl2tpd/ChangeLog
+++ b/net-dialup/xl2tpd/ChangeLog
@@ -1,6 +1,10 @@
 # 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.32 2012/12/25 21:10:05 floppym Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-dialup/xl2tpd/ChangeLog,v 1.33 2012/12/26 00:53:01 floppym Exp $
+
+  26 Dec 2012; Mike Gilbert <floppym@gentoo.org> -xl2tpd-1.3.1.ebuild,
+  xl2tpd-1.3.1-r1.ebuild:
+  Fix sed.
 
   25 Dec 2012; Mike Gilbert <floppym@gentoo.org>
   +files/xl2tpd-1.3.1-CFLAGS.patch, xl2tpd-1.3.1-r1.ebuild:
diff --git a/net-dialup/xl2tpd/Manifest b/net-dialup/xl2tpd/Manifest
index e903d3a15ad9..d0f59bf6cd96 100644
--- a/net-dialup/xl2tpd/Manifest
+++ b/net-dialup/xl2tpd/Manifest
@@ -9,14 +9,13 @@ AUX xl2tpd-init-r1 385 SHA256 7357aaf234b3fca0d4a76b6ed057e0c10c07b3425da472775e
 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 1439 SHA256 5fcb4c6164ade64cb8a366f76933e23bbeb79f16c40e82a7315d4c003db92e06 SHA512 6e7d42d402f54f5b7e181cdf12c5a7df7601363fb17bf77b63c441a3670428513931ea13b64f34dd9d07b7f6d10b7db10910372dc644fe0c299efe4c534e7669 WHIRLPOOL 60a4b80261c1698f6bcbae45be6e39705989165403e1869431cf2939ca19a7a93d974dbd33c63eb6d5cc710487d932407f4ebfbe3485c061e3019bc115e26ce5
-EBUILD xl2tpd-1.3.1.ebuild 1390 SHA256 4edaac56aa754801050fe0339d0c05f6ffc8fb0564e7956c4bd6e4de7b22e86e SHA512 0ed1024fc60aa62fcbfab2617583f1f969bc9a8a013f9a51b046ed9c7d19f7f8b84170e0370cbf6bdac764c67ed329d3b1b5040d0e79a07dbf1f206eda7f4c1d WHIRLPOOL e57172166fa9d920d297203c7ecfe181c5f26bc9d02e8ad9b236aa094ce41c1e706c3091a578ae6121dc08cbb47695e4f860f40554cecdb422a23193ed3de21b
-MISC ChangeLog 5727 SHA256 e4680874d0f1cae1483ce6bf4b42b5dbe3588a2e63065df68ea56692dfaf8bd6 SHA512 294525d408e74470ea73281c190b5edd56786415a4c07a7c5402bbc2d8567d00899e76c37e37f91e8ebcfac45083a6030bcb3c6d82f321bd4216f1afb5910e0c WHIRLPOOL 957f8cd73f4c6e99f217da43c2e7b71bee69e70ddc39e5b05cbed949fa16f26d35adeb777e8e871d4b1cb698467fc4cffda9f1ec8bda86dd02575bf5f1e69036
+EBUILD xl2tpd-1.3.1-r1.ebuild 1438 SHA256 3169daa65fa32dd63e4d01f1b7519e3cb76bfcf7cc8b114d4556961839c956ad SHA512 102e34338e256b7f1e0f1b1f782df572b3011850e1122bdbed30cfc1c4fd898fe993e1bc3413173b4d0a004e2cab3ebc01fc84f7aae0a222316a2e0e402b6fda WHIRLPOOL a047fc625f704b583bcce618bafc50cd599fcf44cbd0f1fb2c9d5faa4b07390227662bb1eb2e264a5294684297ee4f91ec536e4d507744af3a44605401b7dcf6
+MISC ChangeLog 5836 SHA256 05425fb9c5080a3e3f81ac75f9bc8a96975476cd14a8b2caf63198c7592f99bd SHA512 823e011d0af6460b2c2b2c6270db590ff108e0ec974266d4f3ec682f5a496e70703809fae29a17a9879f5c99c0a64980d862be1025a3605253e8848aa6966447 WHIRLPOOL 2e152bfb40ac1d0d00e7b136ed60c98faf220649c1cc734056e7ed2aa302f86a30b6cea9b68d8ab1ad46b14a15e075bc6f0d2fb6284493143b97b318f6619b44
 MISC metadata.xml 386 SHA256 54594868bd121cb99bd6544547e5a86fe62394005354e3af679ba1409a960e7b SHA512 bdadd379b33a7bffd077f2d1353c62d392b5d72249f90f7aaa606640f4ba894dfba7461c7dbec01b7caaebb9a5ae9769d76a5c70a5c4cce2b1db9dad474b4bb6 WHIRLPOOL 855624f39241538b5e4eef19c86d1cdfbd0071ac487f77c20e0b9c696614f3cf193fcc6bce1a0e94f60f8678aa7e93ae499b195f78ea1a0546652a9e0468637a
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.19 (GNU/Linux)
 
-iF4EAREIAAYFAlDaFi4ACgkQC77qH+pIQ6RSEwD+JMu4J/4/x0u0JdtIeQVBq0hx
-yaUvLl6XAwyiof4Kxb4A/jNSvk2CXSC+ingPTQkWd7V9JKUsaXzWxYL7ouKy/l7Z
-=4gIg
+iF4EAREIAAYFAlDaSm4ACgkQC77qH+pIQ6QR0gEAqV05ZQX/kBsjZvCKc+jtd/jk
+fSQs5zDHQ0CxcXG60QkA/1PMo/SSBscy4W9nuzMr2tbxJOOrVX253EJOQQq/Kb7k
+=/lqe
 -----END PGP SIGNATURE-----
diff --git a/net-dialup/xl2tpd/xl2tpd-1.3.1-r1.ebuild b/net-dialup/xl2tpd/xl2tpd-1.3.1-r1.ebuild
index 9369efc1271c..1c8af472cd74 100644
--- a/net-dialup/xl2tpd/xl2tpd-1.3.1-r1.ebuild
+++ b/net-dialup/xl2tpd/xl2tpd-1.3.1-r1.ebuild
@@ -1,6 +1,6 @@
 # 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.2 2012/12/25 21:10:05 floppym Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-dialup/xl2tpd/xl2tpd-1.3.1-r1.ebuild,v 1.3 2012/12/26 00:53:01 floppym Exp $
 
 EAPI="4"
 
@@ -24,7 +24,7 @@ S="${WORKDIR}/xelerance-${PN}-95445fc"
 src_prepare() {
 	epatch "${FILESDIR}/${PN}-1.3.0-LDFLAGS.patch"
 	epatch "${FILESDIR}/${PN}-1.3.1-CFLAGS.patch"
-	sed -i Makefile -e 's| -O2 ||g' || die "sed Makefile"
+	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"
diff --git a/net-dialup/xl2tpd/xl2tpd-1.3.1.ebuild b/net-dialup/xl2tpd/xl2tpd-1.3.1.ebuild
deleted file mode 100644
index d3405dc5a675..000000000000
--- a/net-dialup/xl2tpd/xl2tpd-1.3.1.ebuild
+++ /dev/null
@@ -1,46 +0,0 @@
-# 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.ebuild,v 1.2 2012/09/14 20:34:25 darkside 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
-}