6 files changed, 14 insertions, 244 deletions
diff --git a/net-dialup/accel-ppp/ChangeLog b/net-dialup/accel-ppp/ChangeLog
index 52484ed12e2f..aef90c9c65af 100644
--- a/net-dialup/accel-ppp/ChangeLog
+++ b/net-dialup/accel-ppp/ChangeLog
@@ -1,6 +1,15 @@
 # ChangeLog for net-dialup/accel-ppp
-# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-dialup/accel-ppp/ChangeLog,v 1.10 2014/12/28 16:13:25 titanofold Exp $
+# Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/net-dialup/accel-ppp/ChangeLog,v 1.11 2015/05/14 10:23:24 pinkbyte Exp $
+
+*accel-ppp-1.8.0-r1 (14 May 2015)
+
+  14 May 2015; Sergey Popov <pinkbyte@gentoo.org> -accel-ppp-1.7.3.ebuild,
+  -accel-ppp-1.7.4.ebuild, -accel-ppp-1.7.9999.ebuild, -accel-ppp-1.8.0.ebuild,
+  +accel-ppp-1.8.0-r1.ebuild,
+  -files/accel-ppp-remove_obsolete_tbf_shaper.patch:
+  Revision bump: add dependency on net-dialup/ppp-scripts to improve
+  pppd_compat integration. Drop old versions
 
   28 Dec 2014; Aaron W. Swenson <titanofold@gentoo.org> accel-ppp-1.7.3.ebuild,
   accel-ppp-1.7.4.ebuild, accel-ppp-1.7.9999.ebuild, accel-ppp-1.8.0.ebuild:
diff --git a/net-dialup/accel-ppp/accel-ppp-1.7.3.ebuild b/net-dialup/accel-ppp/accel-ppp-1.7.3.ebuild
deleted file mode 100644
index ec5aacc30e85..000000000000
--- a/net-dialup/accel-ppp/accel-ppp-1.7.3.ebuild
+++ /dev/null
@@ -1,73 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-dialup/accel-ppp/accel-ppp-1.7.3.ebuild,v 1.4 2014/12/28 16:13:25 titanofold Exp $
-
-EAPI=5
-
-inherit cmake-utils linux-info
-
-DESCRIPTION="High performance PPTP, PPPoE and L2TP server"
-HOMEPAGE="http://accel-ppp.sourceforge.net/"
-SRC_URI="mirror://sourceforge/${PN}/${P}.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="debug doc postgres radius shaper snmp valgrind"
-
-RDEPEND="postgres? ( dev-db/postgresql )
-	snmp? ( net-analyzer/net-snmp )
-	dev-libs/libpcre
-	dev-libs/openssl:0"
-DEPEND="${RDEPEND}
-	valgrind? ( dev-util/valgrind )"
-
-DOCS=( README )
-CONFIG_CHECK="~L2TP ~PPPOE ~PPTP"
-
-src_prepare() {
-	sed -i  -e "/mkdir/d" \
-		-e "/echo/d" \
-		-e "s: RENAME accel-ppp.conf.dist::" accel-pppd/CMakeLists.txt || die 'sed on accel-pppd/CMakeLists.txt failed'
-	# TBF shaper is obsolete by upstream, so it's disabled
-	epatch "${FILESDIR}/${PN}-remove_obsolete_tbf_shaper.patch"
-
-	# Respect lib64
-	for i in $(find . -name CMakeLists.txt) ; do
-		sed -i -e "s:\(DESTINATION lib\):\1\${LIB_SUFFIX}:" "$i" || die 'sed failed'
-	done
-
-	epatch_user
-}
-
-src_configure() {
-	# There must be also dev-libs/tomcrypt (TOMCRYPT) as crypto alternative to OpenSSL
-	local mycmakeargs=(
-		-DBUILD_DRIVER=FALSE
-		-DCRYPTO=OPENSSL
-		$(cmake-utils_use debug MEMDEBUG)
-		$(cmake-utils_use postgres LOG_PGSQL)
-		$(cmake-utils_use radius RADIUS)
-		$(cmake-utils_use shaper SHAPER)
-		$(cmake-utils_use snmp NETSNMP)
-		$(cmake-utils_use valgrind VALGRIND)
-	)
-
-	cmake-utils_src_configure
-}
-
-src_install() {
-	cmake-utils_src_install
-
-	use doc && dodoc -r rfc
-
-	if use snmp; then
-		insinto /usr/share/snmp/mibs
-		doins accel-pppd/extra/net-snmp/ACCEL-PPP-MIB.txt
-	fi
-
-	newinitd "${FILESDIR}"/${PN}.initd ${PN}d
-	newconfd "${FILESDIR}"/${PN}.confd ${PN}d
-
-	dodir /var/log/accel-ppp
-}
diff --git a/net-dialup/accel-ppp/accel-ppp-1.7.4.ebuild b/net-dialup/accel-ppp/accel-ppp-1.7.4.ebuild
deleted file mode 100644
index b293c133c441..000000000000
--- a/net-dialup/accel-ppp/accel-ppp-1.7.4.ebuild
+++ /dev/null
@@ -1,72 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-dialup/accel-ppp/accel-ppp-1.7.4.ebuild,v 1.4 2014/12/28 16:13:25 titanofold Exp $
-
-EAPI=5
-
-inherit cmake-utils linux-info multilib
-
-DESCRIPTION="High performance PPTP, PPPoE and L2TP server"
-HOMEPAGE="http://accel-ppp.sourceforge.net/"
-SRC_URI="mirror://sourceforge/${PN}/${P}.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="debug doc postgres radius shaper snmp valgrind"
-
-RDEPEND="postgres? ( dev-db/postgresql )
-	snmp? ( net-analyzer/net-snmp )
-	dev-libs/libpcre
-	dev-libs/openssl:0"
-DEPEND="${RDEPEND}
-	valgrind? ( dev-util/valgrind )"
-
-DOCS=( README )
-CONFIG_CHECK="~L2TP ~PPPOE ~PPTP"
-
-src_prepare() {
-	sed -i  -e "/mkdir/d" \
-		-e "/echo/d" \
-		-e "s: RENAME accel-ppp.conf.dist::" accel-pppd/CMakeLists.txt || die 'sed on accel-pppd/CMakeLists.txt failed'
-
-	# TBF shaper is obsolete by upstream, so it's disabled
-	sed -i -e '/IF (SHAPER)/s/SHAPER/SHAPER_TBF/' \
-		accel-pppd/extra/CMakeLists.txt || die 'sed on accel-pppd/extra/CMakeLists.txt failed'
-
-	epatch_user
-}
-
-src_configure() {
-	local libdir="$(get_libdir)"
-	# There must be also dev-libs/tomcrypt (TOMCRYPT) as crypto alternative to OpenSSL
-	local mycmakeargs=(
-		-DLIB_PATH_SUFFIX="${libdir#lib}"
-		-DBUILD_DRIVER=FALSE
-		-DCRYPTO=OPENSSL
-		$(cmake-utils_use debug MEMDEBUG)
-		$(cmake-utils_use postgres LOG_PGSQL)
-		$(cmake-utils_use radius RADIUS)
-		$(cmake-utils_use shaper SHAPER)
-		$(cmake-utils_use snmp NETSNMP)
-		$(cmake-utils_use valgrind VALGRIND)
-	)
-
-	cmake-utils_src_configure
-}
-
-src_install() {
-	cmake-utils_src_install
-
-	use doc && dodoc -r rfc
-
-	if use snmp; then
-		insinto /usr/share/snmp/mibs
-		doins accel-pppd/extra/net-snmp/ACCEL-PPP-MIB.txt
-	fi
-
-	newinitd "${FILESDIR}"/${PN}.initd ${PN}d
-	newconfd "${FILESDIR}"/${PN}.confd ${PN}d
-
-	dodir /var/log/accel-ppp
-}
diff --git a/net-dialup/accel-ppp/accel-ppp-1.7.9999.ebuild b/net-dialup/accel-ppp/accel-ppp-1.7.9999.ebuild
deleted file mode 100644
index 064944ee5e3b..000000000000
--- a/net-dialup/accel-ppp/accel-ppp-1.7.9999.ebuild
+++ /dev/null
@@ -1,74 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-dialup/accel-ppp/accel-ppp-1.7.9999.ebuild,v 1.7 2014/12/28 16:13:25 titanofold Exp $
-
-EAPI=5
-
-EGIT_REPO_URI="git://accel-ppp.git.sourceforge.net/gitroot/accel-ppp/accel-ppp"
-EGIT_BRANCH="1.7"
-inherit cmake-utils git-r3 linux-info multilib
-
-DESCRIPTION="High performance PPTP, PPPoE and L2TP server"
-HOMEPAGE="http://accel-ppp.sourceforge.net/"
-SRC_URI=""
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS=""
-IUSE="debug doc postgres radius shaper snmp valgrind"
-
-RDEPEND="postgres? ( dev-db/postgresql )
-	snmp? ( net-analyzer/net-snmp )
-	dev-libs/libpcre
-	dev-libs/openssl:0"
-DEPEND="${RDEPEND}
-	valgrind? ( dev-util/valgrind )"
-
-DOCS=( README )
-CONFIG_CHECK="~L2TP ~PPPOE ~PPTP"
-
-src_prepare() {
-	sed -i  -e "/mkdir/d" \
-		-e "/echo/d" \
-		-e "s: RENAME accel-ppp.conf.dist::" accel-pppd/CMakeLists.txt || die 'sed on accel-pppd/CMakeLists.txt failed'
-
-	# TBF shaper is obsolete by upstream, so it's disabled
-	sed -i -e '/IF (SHAPER)/s/SHAPER/SHAPER_TBF/' \
-		accel-pppd/extra/CMakeLists.txt || die 'sed on accel-pppd/extra/CMakeLists.txt failed'
-
-	epatch_user
-}
-
-src_configure() {
-	local libdir="$(get_libdir)"
-	# There must be also dev-libs/tomcrypt (TOMCRYPT) as crypto alternative to OpenSSL
-	local mycmakeargs=(
-		-DLIB_PATH_SUFFIX="${libdir#lib}"
-		-DBUILD_DRIVER=FALSE
-		-DCRYPTO=OPENSSL
-		$(cmake-utils_use debug MEMDEBUG)
-		$(cmake-utils_use postgres LOG_PGSQL)
-		$(cmake-utils_use radius RADIUS)
-		$(cmake-utils_use shaper SHAPER)
-		$(cmake-utils_use snmp NETSNMP)
-		$(cmake-utils_use valgrind VALGRIND)
-	)
-
-	cmake-utils_src_configure
-}
-
-src_install() {
-	cmake-utils_src_install
-
-	use doc && dodoc -r rfc
-
-	if use snmp; then
-		insinto /usr/share/snmp/mibs
-		doins accel-pppd/extra/net-snmp/ACCEL-PPP-MIB.txt
-	fi
-
-	newinitd "${FILESDIR}"/${PN}.initd ${PN}d
-	newconfd "${FILESDIR}"/${PN}.confd ${PN}d
-
-	dodir /var/log/accel-ppp
-}
diff --git a/net-dialup/accel-ppp/accel-ppp-1.8.0.ebuild b/net-dialup/accel-ppp/accel-ppp-1.8.0-r1.ebuild
index 7fe515bfb36b..f94dc54b9bac 100644
--- a/net-dialup/accel-ppp/accel-ppp-1.8.0.ebuild
+++ b/net-dialup/accel-ppp/accel-ppp-1.8.0-r1.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-dialup/accel-ppp/accel-ppp-1.8.0.ebuild,v 1.3 2014/12/28 16:13:25 titanofold Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-dialup/accel-ppp/accel-ppp-1.8.0-r1.ebuild,v 1.1 2015/05/14 10:23:24 pinkbyte Exp $
 
 EAPI=5
 
@@ -21,6 +21,7 @@ RDEPEND="postgres? ( dev-db/postgresql )
 	dev-libs/openssl:0"
 DEPEND="${RDEPEND}
 	valgrind? ( dev-util/valgrind )"
+PDEPEND="net-dialup/ppp-scripts"
 
 DOCS=( README )
 CONFIG_CHECK="~L2TP ~PPPOE ~PPTP"
diff --git a/net-dialup/accel-ppp/files/accel-ppp-remove_obsolete_tbf_shaper.patch b/net-dialup/accel-ppp/files/accel-ppp-remove_obsolete_tbf_shaper.patch
deleted file mode 100644
index 67fc4d43f999..000000000000
--- a/net-dialup/accel-ppp/files/accel-ppp-remove_obsolete_tbf_shaper.patch
+++ /dev/null
@@ -1,21 +0,0 @@
-diff --git a/accel-pppd/extra/CMakeLists.txt b/accel-pppd/extra/CMakeLists.txt
-index 43ba367..2b69d1b 100644
---- a/accel-pppd/extra/CMakeLists.txt
-+++ b/accel-pppd/extra/CMakeLists.txt
-@@ -13,16 +13,6 @@ INSTALL(TARGETS pppd_compat ippool ipv6pool sigchld chap-secrets logwtmp connlim
- 	LIBRARY DESTINATION lib/accel-ppp
- )
- 
--IF (SHAPER)
--	ADD_LIBRARY(shaper_tbf SHARED shaper_tbf.c)
--	IF (LIBNL_PREFIX)
--		SET_PROPERTY(TARGET shaper_tbf PROPERTY COMPILE_FLAGS "-I${LIBNL_PREFIX}/include")
--		SET_PROPERTY(TARGET shaper_tbf PROPERTY LINK_FLAGS "-L${LIBNL_PREFIX}/lib")
--	ENDIF (LIBNL_PREFIX)
--	TARGET_LINK_LIBRARIES(shaper_tbf nl m)
--	INSTALL(TARGETS shaper_tbf LIBRARY DESTINATION lib/accel-ppp)
--ENDIF (SHAPER)
--
- 
- IF (NETSNMP)
- 	ADD_SUBDIRECTORY(net-snmp)