openl2tpd: purge old, stabilize r5

4 files changed, 6 insertions, 121 deletions

diff --git a/net-dialup/openl2tp/ChangeLog b/net-dialup/openl2tp/ChangeLog
index 93e958c..eeb5b59 100644
--- a/net-dialup/openl2tp/ChangeLog
+++ b/net-dialup/openl2tp/ChangeLog
@@ -2,6 +2,10 @@
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
 # $Header: $
 
+  23 Jun 2012; Andrew Savchenko <bircoph@gmail.com> -openl2tp-1.8-r4.ebuild,
+  openl2tp-1.8-r5.ebuild:
+  Purge old. Stabilize r5.
+
 *openl2tp-1.8-r5 (11 Mar 2012)
 
   11 Mar 2012; Andrew Savchenko <bircoph@gmail.com> +openl2tp-1.8-r5.ebuild,
diff --git a/net-dialup/openl2tp/Manifest b/net-dialup/openl2tp/Manifest
index b31d798..f7ff4ad 100644
--- a/net-dialup/openl2tp/Manifest
+++ b/net-dialup/openl2tp/Manifest
@@ -15,7 +15,6 @@ AUX openl2tpd.confd 717 RMD160 b3763053d6f326a4d130b7cbe455a140b94445ae SHA1 d34
 AUX openl2tpd.initd 1688 RMD160 41179b0e7a1640aab545f85cd5d5dfbf2a0ff0b2 SHA1 590d8698344ea540301855a492c272d021257229 SHA256 09b5bfc7a5ade30dd7ebb4b87af09a28e3a7e9c65c09fd066c24528b1d29ba1e
 AUX openl2tpd.initd-2 1730 RMD160 48fc28399d52884c40164b521984221d98ca7e93 SHA1 316ac379f56ef813f346bc912d4e94bc6aa6bfdd SHA256 5de16650fd13aa461b4e5582eb0c8a3dac51ddb17cdac36c917d34c9d18d1558
 DIST openl2tp-1.8.tar.gz 491160 RMD160 29913730809f7ea670c994c175551f31f2ba1e6f SHA1 314a8bb70f9f06bac840200fac0916e80d8d06b3 SHA256 1c97704d4b963a87fbc0e741668d4530933991515ae9ab0dffd11b5444f4860f
-EBUILD openl2tp-1.8-r4.ebuild 3196 RMD160 14e2c63a739b789c5e8254e97caacc8aaa603931 SHA1 b79f6bccf81601a7c5dfdcdc01e410f235c2b5b0 SHA256 5cd4465c47cec2692623c77464e25a1cba5d3469b5051c9284613ffdf5ff4c99
-EBUILD openl2tp-1.8-r5.ebuild 3200 RMD160 81be361effc805954155bf34050486c89be5b848 SHA1 1908d153eaeb311e99ada321d3aa3bd1666ec4ec SHA256 c2c4de79466b0e0b8b43cb4c20f63c815d10a22c2c7806fe888a71af45de5e6e
+EBUILD openl2tp-1.8-r5.ebuild 3198 RMD160 04d3cc7d69d9d49e4a95d9a25beee36cc2b2b69b SHA1 5f6cf7d44a7806d1ae3b3ffd3cef7115ce7180be SHA256 0666c1db8623dfa3a6dcb20825e91b7effa9ac0ef648dbf7b1a72755c5b7f110
 MISC ChangeLog 3715 RMD160 0b7c2d16a74a6ab40969741efb064b86708dcbc6 SHA1 ef157a29a5b16a95e965985c6bef8f6492b43471 SHA256 ab1d716af7561a4a42bc74c5b785ee01fa4e0dc4d998c65ab44c78069170b44f
 MISC metadata.xml 580 RMD160 4576df9844715c2417eea11382f48e148dfa5699 SHA1 baaf4922ac697d10e9db9d194fbd7d8011a72aa8 SHA256 9150137a3e69451900ec238cb08a14907f9dc91abe5b8e32aac2c8f6fb3a42bb
diff --git a/net-dialup/openl2tp/openl2tp-1.8-r4.ebuild b/net-dialup/openl2tp/openl2tp-1.8-r4.ebuild
deleted file mode 100644
index c6229fa..0000000
--- a/net-dialup/openl2tp/openl2tp-1.8-r4.ebuild
+++ /dev/null
@@ -1,118 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: $
-
-EAPI=4
-
-inherit base linux-info
-
-DESCRIPTION="Userspace tools for kernel L2TP implementation."
-HOMEPAGE="http://openl2tp.sourceforge.net"
-SRC_URI="mirror://sourceforge/openl2tp/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE="+client doc +examples rpc server -stats"
-
-REQUIRED_USE="|| ( client server )"
-
-CDEPEND=">=net-dialup/ppp-2.4.5
-	sys-libs/readline
-	"
-DEPEND="${CDEPEND}
-	sys-devel/bison
-	sys-devel/flex
-	"
-RDEPEND="${CDEPEND}
-	rpc? ( || (
-		net-nds/rpcbind
-		net-nds/portmap
-	) )"
-
-CONFIG_CHECK="~PPPOL2TP"
-
-PATCHES=(
-	"${FILESDIR}/${P}-werror.patch"
-	"${FILESDIR}/${P}-ldflags.patch"
-	"${FILESDIR}/${P}-pppd-2.patch"
-	"${FILESDIR}/${P}-man.patch"
-	"${FILESDIR}/${P}-l2tpconfig.patch"
-	"${FILESDIR}/${P}-parallelbuild.patch"
-	"${FILESDIR}/${P}-optionsfile.patch"
-	"${FILESDIR}/${P}-clientip_as_ipparam.patch"
-	"${FILESDIR}/${P}-setkey.patch"
-)
-
-src_configure() {
-	myconf=""	# not local, should be used at src_compile()
-
-	use client || myconf+="L2TP_FEATURE_LAC_SUPPORT=n \
-						   L2TP_FEATURE_LAIC_SUPPORT=n \
-						   L2TP_FEATURE_LAOC_SUPPORT=n "
-
-	use server || myconf+="L2TP_FEATURE_LNS_SUPPORT=n \
-						   L2TP_FEATURE_LNIC_SUPPORT=n \
-						   L2TP_FEATURE_LNOC_SUPPORT=n "
-
-	use rpc || myconf+="L2TP_FEATURE_RPC_MANAGEMENT=n "
-
-	use stats && myconf+="L2TP_FEATURE_LOCAL_STAT_FILE=y "
-
-	# pppd plugin is only needed for pppd < 2.4.5
-	unset PPPD_SUBDIR
-}
-
-src_compile() {
-	# upstream use OPT_CFLAGS for optimizations
-	export OPT_CFLAGS=${CFLAGS}
-	emake ${myconf} || die "emake failed"
-}
-
-src_install() {
-	emake ${myconf} DESTDIR="${D}" install || die "emake install failed"
-	dodoc CHANGES INSTALL README
-
-	if use examples; then
-		docinto event_socket
-		dodoc doc/{event_sock_example.c,README.event_sock}
-		docinto
-		dodoc -r "${FILESDIR}"/examples
-	fi
-
-	if use doc; then
-		dodoc doc/*.txt
-		newdoc plugins/README README.plugins
-		dodoc -r ipsec
-	fi
-
-	newinitd "${FILESDIR}"/openl2tpd.initd openl2tpd
-	# init.d script is quite different for RPC and non-RPC versions.
-	use rpc || sed -i s/userpc=\"yes\"/userpc=\"no\"/ "${D}/etc/init.d/openl2tpd" || die "sed failed"
-	newconfd "${FILESDIR}"/openl2tpd.confd openl2tpd
-}
-
-pkg_postinst() {
-	if use rpc; then
-		ewarn
-		ewarn "RPC control does not provide any auth checks for control connection."
-		ewarn "Unless you need this you should disable it, for reference:"
-		ewarn "http://forums.openl2tp.org/viewtopic.php?f=4&t=41"
-		ewarn
-		ewarn "Therefore DO NOT USE RPC IN INSECURE ENVIRONMENTS!"
-	else
-		ewarn
-		ewarn "Without RPC support you won't be able to use l2tpconfig."
-		ewarn "Please read http://forums.openl2tp.org/viewtopic.php?f=4&t=41"
-		ewarn "for more information about the security risk before enabling."
-		ewarn
-		ewarn "If you are using numerical strings (e.g. login name containing only"
-		ewarn "digits) or special characters in password, please use double quotes"
-		ewarn "to enclose them."
-	fi
-	if use stats; then
-		ewarn
-		ewarn "To enable status files openl2tpd must be started with -S option."
-		ewarn "Upstream warns about runtime overhead with status files enabled."
-	fi
-}
diff --git a/net-dialup/openl2tp/openl2tp-1.8-r5.ebuild b/net-dialup/openl2tp/openl2tp-1.8-r5.ebuild
index a63b770..f4376d4 100644
--- a/net-dialup/openl2tp/openl2tp-1.8-r5.ebuild
+++ b/net-dialup/openl2tp/openl2tp-1.8-r5.ebuild
@@ -12,7 +12,7 @@ SRC_URI="mirror://sourceforge/openl2tp/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 IUSE="+client doc +examples rpc server -stats"
 
 REQUIRED_USE="|| ( client server )"