Revision bump: add dependency on net-dialup/ppp-scripts to improve pppd_compat integration. Drop old versions

Package-Manager: portage-2.2.18/cvs/Linux x86_64
Manifest-Sign-Key: 0x60C0742D1F357D42

7 files changed, 23 insertions, 255 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/Manifest b/net-dialup/accel-ppp/Manifest
index fabee52736de..bb41e07cb846 100644
--- a/net-dialup/accel-ppp/Manifest
+++ b/net-dialup/accel-ppp/Manifest
@@ -1,22 +1,20 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA256
 
-AUX accel-ppp-remove_obsolete_tbf_shaper.patch 761 SHA256 825a8363ed63fdeebe18cfcc4371770837aa24d4aec4c4fda12c058f72c43ebe SHA512 0df0da603e9ddb8eb39ccf23ba462ae6a72282922eb98faa3bc8a98b7dcc964e6ef57599b21aafc5670b709a5d53fc7672fd4ef5b8dbfa8ce15534231b5c0caf WHIRLPOOL e2f9ae324c7c673c2facced3f7060f89f09a443196cc172460d52402b38653652cab04090684daddacbfb05eec37c146b07a85bf60b057af1ed3f3a511cc7d7c
 AUX accel-ppp.confd 221 SHA256 10deb675f92f071252586f318b09714c85f7b3b77bd3d867e103de0c19775d2c SHA512 b46831ce705b27556da6e8cf7b567af395ca3cc2eefb789fcf8a2be92281559ae1c53b5460f1df9aa72b02fcf40ee5bb4e787ddb511357be6e54f7e71628ba6e WHIRLPOOL 887e5ea427084db0995dc77afd77339c710aae96d26e57875af41be1b30e85120dbf473d2171d5c8a7352077cb7b78adef41acd7470f3de317d7b846b426baae
 AUX accel-ppp.initd 1323 SHA256 91343ed26c05e11a5c54b9a55716160e09bb12e5082295814cd16df792911db0 SHA512 e2604eb54d62ad07894586ccdcd83ab1c4c40df5f1c7400f8d7245f368df0b2dabde94d2320a9c01747e7273479c58fc99a6331ca15c376c9c25e41eba55bcb5 WHIRLPOOL cc9226a7806deabdabe0d33f2c1787defb676a6bd08a7635c96cb093e8eedd4cc0ef2603b854f8b8e8d3f217a14c5394c30b1c330cfb1cc07a81ea9f539a54ee
-DIST accel-ppp-1.7.3.tar.bz2 1489289 SHA256 bc6eb6e94603b8584976369d9c40a5b430614b54b57368e8656374145ad94059 SHA512 d15e1adc8cecab92a6259901d960e6e23bb7be0be257609b2e2bdeb69e3a0ea925d33c161afff1557fb0955928501c64eb0d5db4d4f744364979eef650b6fe56 WHIRLPOOL 5b75674c735adbe02dd66568c603c657513b773d30dda5a8e5cc9219fe89472b05fdf0d923c019ce6478cdc86c5f39317fcc930c0e288853f86e42e8bbcaab36
-DIST accel-ppp-1.7.4.tar.bz2 1496145 SHA256 981b36ed8a6ae1a50dde2e8f70de9a31888b479757930fb98a811b9f410425d3 SHA512 b503d6ca6a24bb93254a978477f43fea966aacd27b73cfa9c8f2bdab5e945549ee76fb385d337c60711d6a10c6d2f72b1a0f3d3d2c30a4ea3259b90a3dabff89 WHIRLPOOL 4b46f55ae783b283be72f1f0daa9d7061e4105e447a17be83b936e7bef9f90dede956bcd649541a2548de6e6b6f82fa677b55c08dc6375c49e054d6325ad2dab
 DIST accel-ppp-1.8.0.tar.bz2 1566401 SHA256 a90becf1d8a579b55a95d927a35f6f83ce9a3ee1f6a6d67128a29b2fa4fd71b7 SHA512 d78c0ed4a3c51ae5f07c580b813694376fc42484a907d65164bb14409392365e2d8a876b16b15e55a7a7178cf9e573d42e578e6739f1fe9d62887e7316c816c0 WHIRLPOOL cfeb6807e2b8734a263ad3450dce07859e12783015d6f315e09d6868c06dc8680da55df8e06a4b5ddb3c014f8423ca0b08b877f465a2649167955b7c4790f648
-EBUILD accel-ppp-1.7.3.ebuild 1909 SHA256 e1d26849d1351dffa99f3b9377ac66d009cae644d6dd4a239a18380fad67f89c SHA512 f8ad2eb8bab78a07c686b011876c7d019d82421648837a8183eeb6582475938433bd3df4909bd5b133ca12ed42234318058b11eb30696f8974c8eac0731163e5 WHIRLPOOL d2dfff2d8274c452b62aba484604f7a318f247614c3a6b11a3099417b27eca08a84434aa0fbce15242a1a0848464e3ac41f1597a8f24ac9de79f428bf908a474
-EBUILD accel-ppp-1.7.4.ebuild 1913 SHA256 6951fe11b8ea6d8efa1670fff2faa70425d5e3025f45fee27e7517277a68912c SHA512 ade4c34d259cf539bc6b2af89f4548cebb6d83a0efbde6d5c8507efe2614a278f1df51a9f3055969add02df6ef9a8b3726b8d16830f247dedcce00efb5132b88 WHIRLPOOL 4bdfe382c9d4a3ad804bfa196a03b52aa6c867481b9fd097248ba2efa3a4d4dc26c3921f3e6fe752aad3c6eee34e52d2a857aee22b9c22ddc13e7977a364be68
-EBUILD accel-ppp-1.7.9999.ebuild 1971 SHA256 53e9885bf8ef162eeb04cbd5728914a42d07c886892fa73033a0c7d58bac24e3 SHA512 97c300e61490ce15b1c9a62ff96b527b883b04e56c8648fca3cb0fd015a85721e313040804c26456a651e2a1424f1ae098c2296952ab4e8177ebbc67ca9b5c35 WHIRLPOOL 36689f70123fbaad103fe2e4c18d9d1f4f693c43aa0c51642f87bd34bf274eaea678a84ae2fddb68581c0b58e640a48a67a499c5fbf787eafdfd0bfe17627d97
-EBUILD accel-ppp-1.8.0.ebuild 1794 SHA256 b486b2e7f844cd3c4de68c64a8ee85b0f0fb146b4ef9685346eadc7da9dec6d9 SHA512 79deaa67df14142ce93a412a3def02da4980e812b8642baf2ed3f73f4d631cd50b557a8838922e914a56f66319f4e527c8dab047729cfd5b2738f61a30407295 WHIRLPOOL 15eac32ffbde228bfab37da11663f468065e4fba051918e4b63cbaad9b694f8ce1a0778d4c545b56ca9c8bda33743367b0277908ccd2c8d110d0840c22b8da84
-MISC ChangeLog 2074 SHA256 b84881f17b5f3a9225247ffda59e3cb2e18ab7d095fa693b0df211fa257e66f3 SHA512 c35a0041ce0e63ea073404d62632c6891b0c4844d952296a5f4e797621f7d636bf95be23000367155e205e2992db6a421dde7fdb23807500c21c2d61bd04e48a WHIRLPOOL 8be827b7232011fabaffbcaa824aeee283c290dc5f5528b7c7ea1134fd959a569f7c1967e0188f4dcb01467e0344c8805e9daa213dc669212a87eb1f867612c8
+EBUILD accel-ppp-1.8.0-r1.ebuild 1828 SHA256 9a21b7f73ded0e59ddbbbac1591ddec563d73a496fd5789900acf35fff3c3da5 SHA512 2a8e7ddba14ecd8d43db2d67114c80ecdcd8e9f544e63748062521ff6ccde89aa2542691f70d10e24d754ee74e23821d1f9ebcc9566561c832e0ae0efce79f55 WHIRLPOOL 2ca76f1c8865d4645db3ca205e6ceafe1cd578d44e1f2e93a22a1864987403a622734e14a21a62e63f96f1e1743d99ca19415542929c0e2cbbe8a0d343d05ceb
+MISC ChangeLog 2460 SHA256 0ed7d8b9b44ad4eff4f8559c1503f7696357a03734505ba2c6815750c3ffce8c SHA512 b6b391342750eaccaa3b3908604751e072acb72d4137fdbcb15b9251bce03511f6e0e6c33dcafe6aa053e80fc63791b3a134ff0f037aa89b7a496e7712619d10 WHIRLPOOL 811ba3b0d75710f68908ebd282db36cf5751e89d501de0de8f841da3d1b6f1dbf254514eec94fd3ff845fbacd089a0903010f38337ebc8f1a9682def990dd1b5
 MISC metadata.xml 387 SHA256 c07e1a86e24c4bf8e1a04448c27e69ebd45a382ee581b438faa913fb09b22d33 SHA512 2b01ec6fe938919e5882b917dd7ac26f445d1d37c423b45545b84550874ba31351688c63dd8e5607a10f02c175f82c48f36f22a37ce18b169e812aa29f6acba9 WHIRLPOOL c8b3089d874878ad5e967afab27fa74504ec117ce5c36b1027b230ceeaefa530465f6a58a934bb7063e567f508badf9b14904cb0808abeec216095d982a31f94
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2
 
-iF4EAREIAAYFAlSgLCgACgkQVxOqA9G7/aBceQD/V7A3uuDhQbPww8axj22haxUC
-yAm35vAR8ZFg2cIdrnMA/jlsuRY86iIUZlgKBvz23HEjvRgSGbeJJylaT77EU+dp
-=AqbC
+iQEcBAEBCAAGBQJVVHecAAoJECo/aRed9267mv8H/R6X4uiwWY0vLPS+C3qt4yT/
+HvVt9ZK6IIv6yUGNKoZL7GiEp6/EsvQ1RSOtwz6IVGRzBVqvge0lSoOPgzR8zUvw
+r3WthCPyM1rNhDx5Qd9ILVBqUs5oDGHuVCwh/6e7ZeiM7PM91D/YI/+oMvVCkthJ
+eQA4sl5jv665USULdWxoDqPWeMShuww/nR7QXk3fu9fZZTmP1xjLUcgnpPappeJR
+NpXXUf4NhFlE13GxGFYsMG8GZ3gAxNufs4QWNpbxEz9itBuYQFdfiwSBMSY2G+tJ
+oDxfyTVs7s9ge2N45+ra881hcz3lirb6ttkG6kOeEG8iSBtWb5WX/C1vsOJ4wfQ=
+=d4Uy
 -----END PGP SIGNATURE-----
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)