Version bump (bug #501530). Removed old

Package-Manager: portage-2.2.8-r1/cvs/Linux x86_64
Manifest-Sign-Key: 0x981CA6FC

5 files changed, 249 insertions, 587 deletions

diff --git a/net-dialup/ppp/ChangeLog b/net-dialup/ppp/ChangeLog
index 078060cf0129..5765f4e9fe83 100644
--- a/net-dialup/ppp/ChangeLog
+++ b/net-dialup/ppp/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for net-dialup/ppp
-# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-dialup/ppp/ChangeLog,v 1.289 2013/06/09 22:59:56 vapier Exp $
+# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/net-dialup/ppp/ChangeLog,v 1.290 2014/02/19 09:56:32 polynomial-c Exp $
+
+*ppp-2.4.6 (19 Feb 2014)
+
+  19 Feb 2014; Lars Wendler <polynomial-c@gentoo.org> -ppp-2.4.5-r1.ebuild,
+  -ppp-2.4.5-r2.ebuild, +ppp-2.4.6.ebuild:
+  Version bump (bug #501530). Removed old.
 
   09 Jun 2013; Mike Frysinger <vapier@gentoo.org> metadata.xml:
   Add upstream CPE tag (security info) from ChromiumOS.
diff --git a/net-dialup/ppp/Manifest b/net-dialup/ppp/Manifest
index 67f862b769a5..99edd4140e91 100644
--- a/net-dialup/ppp/Manifest
+++ b/net-dialup/ppp/Manifest
@@ -5,31 +5,30 @@ AUX README.mpls 530 SHA256 5ef99aba902533fe9d17b7dfaf91e72b638cc70b9f811d1e51882
 AUX modules.ppp 299 SHA256 8947dd48d3d0c128166edc9bb0917b9af88502296fad791d6d90bf165ca50db3 SHA512 58bf5d6d286a08bd6dd595b39ee425efedd5745dddf33a9c90505891546eb46f4cf1306d83911bef61bc4611816aa0f6aef5d3e0f14c2f4ddd0a588780570041 WHIRLPOOL dfc2d6fb1a36b74b0dd998739bb1c5977234c2d88100f686fb6faae2826795b0ca217937a7775660421f5ebc356e5e1378849ac6e56fef018eceab6f90bb26e3
 DIST ppp-2.4.4-gentoo-20091116.tar.gz 54932 SHA256 52f174b3df36110d14c522869c507f64aef4d2d01db2dec2936cc9917c9fa716 SHA512 6669294cac124f78f197558f28872adaf08cb6ba3344093946c02d3581e70efea6992b30b0be726637a4122d8354bb1e25e73af71f1e7da8bdbf63db5aa0eeb6 WHIRLPOOL ff633a5e740f38bc665bec435613eb423de0f8370d119fc3cf36dee100cb02e5ec78eb88f2b530498bd49c76a792d97c76dd188b7ce02c8eb4efe85d9af67938
 DIST ppp-2.4.4.tar.gz 688763 SHA256 58af45fc07e5f326eea2408df770ea40e4626d1a15e7d564dd054d74880e91ea SHA512 70bde7121a0a2e150a7eec85731ca1055a2741da7886a8b8734c075637703d223bb579c3d14ad32a009488e07deaa62e7948e2d3e73077e6fb3db076841f7270 WHIRLPOOL 12aa49200253afd3958c7fc078ac7333080c6d0ca96c541e39e70b05d6b8c8e90fe98553d4cbef7804cf66c74b2798e1839b44db9e0cc0e6093d87b53bf24b6f
-DIST ppp-2.4.5-gentoo-20101127.tar.gz 41562 SHA256 d49f51dd10dfc97f25bb5dbc4acc61c708d890da231295467ac3710751d2bcdd SHA512 f24d9bdb8ee1cea7effcb314d88337672a4423a74249153da34999117f056e118981956c49cb8b3801054a38a52c4fcc3cd048fac9b339ad77f0f8b0ea9c99c6 WHIRLPOOL 421c2c78266eeda12ead02711a4d6c38f6cc7fe32c0f128a9a66e402a5c99b5ad6af9f109132ad437588e807846fb3945144126660414d7775a95335ada6bd8e
-DIST ppp-2.4.5-gentoo-20111111.tar.gz 41883 SHA256 950e06cb9e9c844e88cb99c3fc1dbb7515814d75f7f6e87a81fbb245e48ba4ed SHA512 ff9ac176e532ece8f0b13adf75c6999bd81a6f8a75a9edb490219c160cc7a2f055ace7a6ff73bc84965fafa2eb8a689a7106a349923be8c73464e2c00ab16ab6 WHIRLPOOL fb2d7a408ceebae22c83246d441fa5955ed013e9eeadb6247f06fe41512eb47860578768b3fe2f9a0683844e7c40e271e4b22b9f401a87dec376c17fcc9825e9
 DIST ppp-2.4.5-patches-3.tar.xz 37000 SHA256 9e251b0339f665054c24692396115b1f9afb7fdb8593242b1a5bc369dce642bf SHA512 e0d0d077050e97ea88d08fd15a7597393ff7842a1bf3129e2fd7eb182d4fc49a625635cf24fc1798efde2250d4c2ae013b3ae143ef245fe87f764fcf752e5c27 WHIRLPOOL 11e2d4529dd0ddfca11574bbc64459f553674b3b78f63e265dcb1247b611732ee1d6e2dc43e33d0e8371e1fcb7f9282930be1a05c147e2f141f7806dd32e4269
 DIST ppp-2.4.5.tar.gz 684342 SHA256 43317afec9299f9920b96f840414c977f0385410202d48e56d2fdb8230003505 SHA512 3688720a0f9ee47802e72dc6aa3d47c7312c195007f37a6ceb087fdb6f1f77ad75e922a568cffed6d1a857f06d79460d6d38b56e179310e493a0380a0c5a4f6e WHIRLPOOL 210dbcfc754256e5317cffa0b6f51e7ae9e45d88815e4952e893ab85d024daef8131747624e355b97225f0b365e677fa4bd82ee2a7890810bc25c5521324b83f
+DIST ppp-2.4.6-patches-1.tar.xz 36284 SHA256 0536971bbdef0c65cde1ccad85a454bf2ad491d851c7b09d639e8fec8bf1c97d SHA512 7bc2188486749fceb9dac7c1e4dc339946ab3acc9a388ae3158f723bf3a5e61e2dcd315235e68692a0cbd3ad5b08c2d7167f179660c9491d835c3439d46f4a71 WHIRLPOOL 48f1dfe2103351bbf63982efe59cdd5b2382e359c822c92c83ad1cc467cbf2f7283ee1c2887660245bd36a0e45833dc9c737953b82b9582bb8070c97b4ded382
+DIST ppp-2.4.6.tar.gz 687744 SHA256 1b33181a03962c8a092c055fb9980e9722728a8d98a4bb7ec7acda17c1b1b49d SHA512 65d6967ba43cd8b4d3f63f52ff69f6fed964f748fc780dff982629668213c2cd1891671f6f4a0c1c22118a382e282fabdd2328e60a120d9b984d3c17f9355cc6 WHIRLPOOL 1f83ca8383486d76779c28ba0b107887584b2991c7d6fd4e86d6fecb7988e0422ec1f7e35d092f410b462a97f006cc11121c1a7cc00f7e35d856dd3861cdd828
 DIST ppp-dhcpc.tgz 33497 SHA256 977fd980bb1d285963d8e27a87b7601ea84317faadfdb40989b258d1853db644 SHA512 aeaf791b14f5a09c0e2079072a157e65132cbff46e608bc0724e6a5827a01da934f5006e2774eb7105f83e607a52cb4987238f4385cf6f5cc86cbe305a556738 WHIRLPOOL 74e5e0d7f9bc52d1b9cfeff83fe74c2b38cc10c60636cd9c0f5d67d61dc7da56dbf2bcc84afa29444546792876cb36afbc853a6515ce9b3d83d6de98eacedd1e
 EBUILD ppp-2.4.4-r25.ebuild 10959 SHA256 1d06adc4cf4ac0b6d857e03186c8d3ec45e77965a8f382f295e1cfbaca245373 SHA512 884f0fef8fca451b18746ad04639788a3fb6bcae4211f36ffa695b9ce7eb9d590a7d394bc390c406f81eddbc2a8f55fdff1376ba14495ee9906e3c1f9ab2ee37 WHIRLPOOL 7f9f60e0cf5743e8d3759268253338009f3069b283eeefeca95ad50b5b11458824ae07c5afe69983bd398b157bab0dcc67fdd9c080d617dd9b8959f04cf6ea27
-EBUILD ppp-2.4.5-r1.ebuild 10047 SHA256 a2591d0d4a9fff20c460983e388d3095cb284778cdae8e6a7b7d8140f40e0016 SHA512 3a9546138f54f33827a95d5cf13beb92319d419a25d496cff55b7f89ea4cb5cc3dc89880cec0b4ffd4ca8c0bffc102b51551d32c0219a7d06c9c8f1ea3cc00c1 WHIRLPOOL a11b3a285f513b0a30017a1c45768db2b4bdfbdb4585033db8a4b261e14ff2c52227cfa8f2687343395e7856d57e960ad1dd3051765c938b0d9bcd1c9e8c210e
-EBUILD ppp-2.4.5-r2.ebuild 10108 SHA256 88800148e714e3e614078e0a5c8b601f9ed6ca43832bd7ce60020067eb4f3ab5 SHA512 dbbab510d62d11e1a4f5eff267dee2b825e4dd99a7ed72c1729dd0bdb82ebcb338eb2a5a95f9591760309a27ab420881ba9260dd70c603654fbde20f8111d746 WHIRLPOOL 8215e78fb67e504002cc2811ac5847550a2f00e0e57c9ef4d1ed050ec1262c0685393c24c0c0e737b7173d228b205f2ca8c55dfbe82e6eaefec7c1edc6323d2e
 EBUILD ppp-2.4.5-r3.ebuild 7045 SHA256 9680200ffc73f68571a5ee3cfa2ec0703853679f1ad0c3b16c768786880fb19e SHA512 9913d1ce1690dda37c3991cd94c50116bc8f55cbc76ed5f422d3b2aebcf9c30f55c10eb6eb909884436fefeb97926d9f6888fd978bf1e251c22b829edc6090c1 WHIRLPOOL 0beeee3601f24e914067ca80733373cc601549d05bb9fb469cc6f85420b78e0cc4c26cbe55e2c99c74beb21e88f64b5e814cbb3ed35e2fa337f7ab91c8716635
-MISC ChangeLog 45957 SHA256 38ef80222d956ba380e1739a73b5c0e7c37257744fdde5219c045896b5f63f44 SHA512 d583e57dbb028cc94622bf2329fee4102a7bde7cdfadbea1d4822f441dda8d578220ad8657e0914ba4127c6f096a60bbf7ae508c77b80f7f23bb5c38f5337975 WHIRLPOOL f2ad226935985a6b5ddfea5602823cf74ad276c94ef3aa9e730fc092e32e1040a4b2b5bb1cd608dc6e452267851bca642c901906bd9fd9d5fdddb39b8785cbb0
+EBUILD ppp-2.4.6.ebuild 7000 SHA256 a0912678e8d331d940ed88918f60b35e9e73b0c03ba6dd23e700ed20f19fd135 SHA512 635f4ecf0193a2f3ec0d4fe5dfc73fbd8c2e96959a1594692c85264a0738e6992a8a223e4675d807c3eb181a7c624f73c592d02e4ae28b9f6058eb7c625f1881 WHIRLPOOL fbb9638e2ea7d7e20a39cd1009f0438327b627e5f300f0382f91ca800911fe3a8d7beaa6d5a3dad44202a08a3a5c6de87dd892f183bcc3e29157bb70f85dfb53
+MISC ChangeLog 46152 SHA256 ae40136544171c9a8fbeb554635046eb9e2fe89a1c746c0e3af066d7e92313c1 SHA512 a5a4bb9bcdf045f7cea76eeac721439652cf01a6370b10da0204a8bef7a628bb50c23159523051b534a2a2583b7f66d033a3a0f5563f438d2c328dbd16cab101 WHIRLPOOL 5d00a11366c124e1b17353c2443f2ac70faf4289f29fc73c32ed0c2e0739096908844b22a8e615a1d78f8d2c5737704abf062a37282e9f662026dac807ea29ff
 MISC metadata.xml 1437 SHA256 ead1d034656325de6aebce34890880e837b002baebcc9064218913b0b1796216 SHA512 1113d280079f4ba1ae4d12106ffeb6bda6c4fa72a8514df2522b7f3db556b4931f4960d4567ac093558cd266de0eb3cdfd1c955047b7ab12bd9a8b7588f2f143 WHIRLPOOL 02f4409c8e891ada907f775a6c68f65ab5a0d5eaae6bf20d4323cf592cd91cadcb5124f08c030327f77df079f9e57e5a695f59d19b8226f7453553de6db9c9fd
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.19 (GNU/Linux)
+Version: GnuPG v2.0.22 (GNU/Linux)
 
-iQIcBAEBCAAGBQJRtQjyAAoJELEHsLL7fEFWnQ8P/jS7AAe6J7BRDTZPRpfbce4q
-UegnD2+ZWQy0jghaMArEt76yTEAl0PA1Fikv7cbquTNm1d49wtM7UGcpg2OTIdCi
-pvWK/1JTDSc+QUxzA2u3YecxDr247lP7RiUts4Ljkztjjd/TF5LoQcCji9BLpGz2
-fAj3njVVWcQlYUPR7pWtcefo3t0pamhtLFMYLp9RdR93eQdkXWlyllP4edlBwTrg
-TGAuQ5Z8k97VLtsZPMUUqX330tNf+jui/9dC6Uh8h07CDeK8ctj70bpyhvdqKz3M
-pR2Muuo5JLe52EnGZdvTLDbDEZJcx8q2cNdKbYO/T9/WTRIHwTzkAALQ5Udoyshs
-BtAwXM8+aWbB7W8g5T2iD+zc/pokl7GN5olUUmAj7Mg56ZMrNYkGvN4YctpzeFYO
-aaGEAN5BZ6ttU0x9oCBZYcKgJv3TnWP5gJK4K0kmBRy2fJDcdOZobQ2ikzx/3Lhm
-e+YtkW/8TGGFMEpvRnCm+OGOogJuCCcSvIxK4J+Vdg10fZTvYQyp7xst3HzdIScy
-yOhu/106iBMIKWbeESgJySULSQBgTkt0eiRra4focEcVuCeC7GwDw0k07kaf8YsL
-Peh97/CBOcqm/vLtG/WXFypbnI5RBcjCp27E/eJ/ab9FqHh/d/UoRtXS09t38w3e
-Q0aS63PcCCqhAZfLHmJs
-=fIOM
+iQIcBAEBCAAGBQJTBH/RAAoJEPiazRVxLXTFnqMP/21bfyC3FaE/WQd1zsIXuoVO
+dWvbzgKM0WRbcgA/mSfYdIMrrKheP7q1D2s7liIBrUd+8tTMMkqsyNcilj1nD3Y+
+x3QWIczEYrmDGVdOl1+gPi0JF9+XDxJhbkRztUcgy7K7K8ppZ3w/RQqWl5ZqH3UM
+ioEROHn//HNlGm788bfRYTo1TyspeqmvlbzU9H/qhSqwswjC6JJbNT1eRzk6YWlZ
+Gg6aSOqaP7YbNQ4D594DSVBx3higLcuaJVqpX3wJCot2yWkrH9gVJ32GIPN5IBgt
+CdKNKzjEVos4raf/TbgtA9IF5Ytnjtf+qdDJvuE5LnWpoY3KDyBCDA8CTxfjTfn0
+3OidoCggM2o42IX7sjPa1JTwM7kjc7bQafmVRKNDi4uI8ZX9N9gsmSdEZw3DDfXU
+XtMfdeUsiVuGOFM++9wTyrUJyyzAyG5JRaK3z5HezQRFxsvPZl6Zv392ORTNP3OL
+gKWTJkC1b4rBgZxQ0XAfktR9mtae+K+FdD13mG29qvGZ6OfgQXyx71FYCjMVvixg
+eWpk60Ubnd22Zx2VWxQJVFbDMxm4eaSeNON95lrHivHBa56B4vvdPwfNVxt/gZmO
+ypZ92jhrL3/yMvUEv4I3FmZ2ryyaSIJuiGnOnslqa+b0jpmQ+FbVA623iiSg203c
+Bs6Sou8nWmIpDapqJsfp
+=38Ny
 -----END PGP SIGNATURE-----
diff --git a/net-dialup/ppp/ppp-2.4.5-r1.ebuild b/net-dialup/ppp/ppp-2.4.5-r1.ebuild
deleted file mode 100644
index 5e862cc4efcb..000000000000
--- a/net-dialup/ppp/ppp-2.4.5-r1.ebuild
+++ /dev/null
@@ -1,282 +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/ppp/ppp-2.4.5-r1.ebuild,v 1.8 2012/06/14 01:48:45 zmedico Exp $
-
-EAPI="2"
-
-inherit eutils multilib toolchain-funcs linux-info pam
-
-DESCRIPTION="Point-to-Point Protocol (PPP)"
-HOMEPAGE="http://www.samba.org/ppp"
-SRC_URI="ftp://ftp.samba.org/pub/ppp/${P}.tar.gz
-	mirror://gentoo/${P}-gentoo-20101127.tar.gz
-	dhcp? ( http://www.netservers.co.uk/gpl/ppp-dhcpc.tgz )"
-
-LICENSE="BSD GPL-2"
-SLOT="0"
-KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 s390 sh sparc x86"
-IUSE="activefilter atm dhcp eap-tls gtk ipv6 pam radius"
-
-DEPEND="activefilter? ( net-libs/libpcap )
-	atm? ( net-dialup/linux-atm )
-	pam? ( virtual/pam )
-	gtk? ( x11-libs/gtk+:2 )
-	eap-tls? ( net-misc/curl dev-libs/openssl )"
-RDEPEND="${DEPEND}"
-
-src_prepare() {
-	epatch "${WORKDIR}/patch/make-vars.patch"
-	epatch "${WORKDIR}/patch/mpls.patch"
-	epatch "${WORKDIR}/patch/killaddr-smarter.patch"
-	epatch "${WORKDIR}/patch/wait-children.patch"
-	epatch "${WORKDIR}/patch/defaultgateway.patch"
-	epatch "${WORKDIR}/patch/linkpidfile.patch"
-	epatch "${WORKDIR}/patch/qa-fixes.patch"
-	epatch "${WORKDIR}/patch/auth-fail.patch"
-	epatch "${WORKDIR}/patch/defaultmetric.patch"
-	epatch "${WORKDIR}/patch/dev-ppp.patch"
-	epatch "${WORKDIR}/patch/gtk2.patch"
-	epatch "${WORKDIR}/patch/passwordfd-read-early.patch"
-	epatch "${WORKDIR}/patch/pppd-usepeerwins.patch"
-	epatch "${WORKDIR}/patch/connect-errors.patch"
-	epatch "${WORKDIR}/patch/Makefile.patch"
-	epatch "${WORKDIR}/patch/pppol2tpv3-2.6.35.patch"
-	epatch "${WORKDIR}/patch/pado-timeout.patch"
-	epatch "${WORKDIR}/patch/lcp-echo-adaptive.patch"
-
-	use eap-tls && {
-		# see http://www.nikhef.nl/~janjust/ppp for more info
-		einfo "Enabling EAP-TLS support"
-		epatch "${WORKDIR}/patch/eaptls-mppe-0.98-gentoo.patch"
-	}
-
-	use atm && {
-		einfo "Enabling PPPoATM support"
-		sed -i "s/^#HAVE_LIBATM=yes/HAVE_LIBATM=yes/" pppd/plugins/pppoatm/Makefile.linux
-	}
-
-	use activefilter || {
-		einfo "Disabling active filter"
-		sed -i "s/^FILTER=y/#FILTER=y/" pppd/Makefile.linux
-	}
-
-	use pam && {
-		einfo "Enabling PAM"
-		sed -i "s/^#USE_PAM=y/USE_PAM=y/" pppd/Makefile.linux
-	}
-
-	use ipv6 && {
-		einfo "Enabling IPv6"
-		sed -i "s/#HAVE_INET6/HAVE_INET6/" pppd/Makefile.linux
-	}
-
-	einfo "Enabling CBCP"
-	sed -i "s/^#CBCP=y/CBCP=y/" pppd/Makefile.linux
-
-	use dhcp && {
-		# copy the ppp-dhcp plugin files
-		einfo "Adding ppp-dhcp plugin files..."
-		mv "${WORKDIR}/dhcp" "${S}/pppd/plugins" \
-			&& sed -i -e 's/\(SUBDIRS := .*rp-pppoe.*\)$/\1 dhcp/' pppd/plugins/Makefile.linux \
-			|| die "ppp-dhcp plugin addition failed"
-		epatch "${WORKDIR}/patch/dhcp-make-vars.patch"
-		epatch "${WORKDIR}/patch/dhcp-sys_error_to_strerror.patch"
-	}
-
-	# Set correct libdir
-	sed -i -e "s:/lib/pppd:/$(get_libdir)/pppd:" \
-		pppd/{pathnames.h,pppd.8}
-
-	if use radius; then
-		#set the right paths in radiusclient.conf
-		sed -i -e "s:/usr/local/etc:/etc:" \
-			-e "s:/usr/local/sbin:/usr/sbin:" pppd/plugins/radius/etc/radiusclient.conf
-		#set config dir to /etc/ppp/radius
-		sed -i -e "s:/etc/radiusclient:/etc/ppp/radius:g" \
-			pppd/plugins/radius/{*.8,*.c,*.h} \
-			pppd/plugins/radius/etc/*
-	else
-		einfo "Disabling radius"
-		sed -i -e '/+= radius/s:^:#:' pppd/plugins/Makefile.linux
-	fi
-}
-
-src_configure() {
-	export CC="$(tc-getCC)"
-	export AR="$(tc-getAR)"
-	econf || die "econf failed"
-}
-
-src_compile() {
-	emake COPTS="${CFLAGS} -D_GNU_SOURCE" || die "compile failed"
-
-	#build pppgetpass
-	cd contrib/pppgetpass
-	if use gtk; then
-		emake -f Makefile.linux || die "failed to build pppgetpass"
-	else
-		emake pppgetpass.vt || die "failed to build pppgetpass"
-	fi
-}
-
-src_install() {
-	local i
-	for i in chat pppd pppdump pppstats ; do
-		doman ${i}/${i}.8 || die "man page for ${i} not build"
-		dosbin ${i}/${i} || die "${i} not build"
-	done
-	fperms u+s-w /usr/sbin/pppd
-
-	# Install pppd header files
-	pushd pppd >/dev/null
-	emake INSTROOT="${D}" install-devel || die "emake install-devel failed"
-	popd >/dev/null
-
-	dosbin pppd/plugins/rp-pppoe/pppoe-discovery || die "pppoe-discovery not build"
-
-	dodir /etc/ppp/peers
-	insinto /etc/ppp
-	insopts -m0600
-	newins etc.ppp/pap-secrets pap-secrets.example || die "pap-secrets.example not found"
-	newins etc.ppp/chap-secrets chap-secrets.example || die "chap-secrets.example not found"
-
-	insopts -m0644
-	doins etc.ppp/options
-
-	exeinto /etc/ppp
-	for i in ip-up ip-down ; do
-		doexe "${WORKDIR}/scripts/${i}" || die "failed to install ${i} script"
-		insinto /etc/ppp/${i}.d
-		use ipv6 && dosym ${i} /etc/ppp/${i/ip/ipv6}
-		doins "${WORKDIR}/scripts/${i}.d"/* || die "failed to install ${i}.d scripts"
-	done
-
-	pamd_mimic_system ppp auth account session
-
-	local PLUGINS_DIR=/usr/$(get_libdir)/pppd/$(awk -F '"' '/VERSION/ {print $2}' pppd/patchlevel.h)
-	#closing " for syntax coloring
-	insinto "${PLUGINS_DIR}"
-	insopts -m0755
-	doins pppd/plugins/minconn.so || die "minconn.so not build"
-	doins pppd/plugins/passprompt.so || die "passprompt.so not build"
-	doins pppd/plugins/passwordfd.so || die "passwordfd.so not build"
-	doins pppd/plugins/winbind.so || die "winbind.so not build"
-	doins pppd/plugins/rp-pppoe/rp-pppoe.so || die "rp-pppoe.so not build"
-	doins pppd/plugins/pppol2tp/openl2tp.so || die "openl2tp.so not build"
-	doins pppd/plugins/pppol2tp/pppol2tp.so || die "pppol2tp.so not build"
-	if use atm; then
-		doins pppd/plugins/pppoatm/pppoatm.so || die "pppoatm.so not build"
-	fi
-	if use dhcp; then
-		doins pppd/plugins/dhcp/dhcpc.so || die "dhcpc.so not build"
-	fi
-	if use radius; then
-		doins pppd/plugins/radius/radius.so || die "radius.so not build"
-		doins pppd/plugins/radius/radattr.so || die "radattr.so not build"
-		doins pppd/plugins/radius/radrealms.so || die "radrealms.so not build"
-
-		#Copy radiusclient configuration files (#92878)
-		insinto /etc/ppp/radius
-		insopts -m0644
-		doins pppd/plugins/radius/etc/{dictionary*,issue,port-id-map,radiusclient.conf,realms,servers}
-
-		doman pppd/plugins/radius/pppd-radius.8
-		doman pppd/plugins/radius/pppd-radattr.8
-	fi
-
-	insinto /etc/modprobe.d
-	insopts -m0644
-	newins "${FILESDIR}/modules.ppp" ppp.conf
-
-	dodoc PLUGINS README* SETUP Changes-2.3 FAQ
-	dodoc "${FILESDIR}/README.mpls"
-
-	dosbin scripts/pon && \
-	    dosbin scripts/poff && \
-	    dosbin scripts/plog && \
-	    doman scripts/pon.1 || die "failed to install pon&poff scripts"
-
-	# Adding misc. specialized scripts to doc dir
-	insinto /usr/share/doc/${PF}/scripts/chatchat
-	doins scripts/chatchat/* || die "failed to install chat scripts in doc dir"
-	insinto /usr/share/doc/${PF}/scripts
-	doins scripts/* || die "failed to install scripts in doc dir"
-
-	if use gtk; then
-		dosbin contrib/pppgetpass/{pppgetpass.vt,pppgetpass.gtk}
-		newsbin contrib/pppgetpass/pppgetpass.sh pppgetpass
-	else
-		newsbin contrib/pppgetpass/pppgetpass.vt pppgetpass
-	fi
-	doman contrib/pppgetpass/pppgetpass.8
-}
-
-pkg_postinst() {
-	if linux-info_get_any_version && linux_config_src_exists; then
-		echo
-		ewarn "If the following test report contains a missing kernel configuration option that you need,"
-		ewarn "you should reconfigure and rebuild your kernel before running pppd."
-		CONFIG_CHECK="~PPP ~PPP_ASYNC ~PPP_SYNC_TTY"
-		local ERROR_PPP="CONFIG_PPP:\t missing PPP support (REQUIRED)"
-		local ERROR_PPP_ASYNC="CONFIG_PPP_ASYNC:\t missing asynchronous serial line discipline (optional, but highly recommended)"
-		local WARNING_PPP_SYNC_TTY="CONFIG_PPP_SYNC_TTY:\t missing synchronous serial line discipline (optional; used by 'sync' pppd option)"
-		if use activefilter ; then
-			CONFIG_CHECK="${CONFIG_CHECK} ~PPP_FILTER"
-			local ERROR_PPP_FILTER="CONFIG_PPP_FILTER:\t missing PPP filtering support (REQUIRED)"
-		fi
-		CONFIG_CHECK="${CONFIG_CHECK} ~PPP_DEFLATE ~PPP_BSDCOMP ~PPP_MPPE"
-		local ERROR_PPP_DEFLATE="CONFIG_PPP_DEFLATE:\t missing Deflate compression (optional, but highly recommended)"
-		local ERROR_PPP_BSDCOMP="CONFIG_PPP_BSDCOMP:\t missing BSD-Compress compression (optional, but highly recommended)"
-		local WARNING_PPP_MPPE="CONFIG_PPP_MPPE:\t missing MPPE encryption (optional, mostly used by PPTP links)"
-		CONFIG_CHECK="${CONFIG_CHECK} ~PPPOE ~PACKET"
-		local WARNING_PPPOE="CONFIG_PPPOE:\t missing PPPoE support (optional, needed by rp-pppoe plugin)"
-		local WARNING_PACKET="CONFIG_PACKET:\t missing AF_PACKET support (optional, used by rp-pppoe and dhcpc plugins)"
-		if use atm ; then
-			CONFIG_CHECK="${CONFIG_CHECK} ~PPPOATM"
-			local WARNING_PPPOATM="CONFIG_PPPOATM:\t missing PPPoA support (optional, needed by pppoatm plugin)"
-		fi
-		check_extra_config
-	fi
-
-	if [ ! -e "${ROOT}/dev/.devfsd" ] && [ ! -e "${ROOT}/dev/.udev" ] && [ ! -e "${ROOT}/dev/ppp" ]; then
-		mknod "${ROOT}/dev/ppp" c 108 0
-	fi
-	if [ "$ROOT" = "/" ]; then
-		if [ -x /sbin/update-modules ]; then
-			/sbin/update-modules
-		else
-			/sbin/modules-update
-		fi
-	fi
-
-	# create *-secrets files if not exists
-	[ -f "${ROOT}/etc/ppp/pap-secrets" ] || \
-		cp -pP "${ROOT}/etc/ppp/pap-secrets.example" "${ROOT}/etc/ppp/pap-secrets"
-	[ -f "${ROOT}/etc/ppp/chap-secrets" ] || \
-		cp -pP "${ROOT}/etc/ppp/chap-secrets.example" "${ROOT}/etc/ppp/chap-secrets"
-
-	# lib name has changed
-	sed -i -e "s:^pppoe.so:rp-pppoe.so:" "${ROOT}/etc/ppp/options"
-
-	if use radius && [[ $previous_less_than_2_4_3_r5 = 0 ]] ; then
-		echo
-		ewarn "As of ${PN}-2.4.3-r5, the RADIUS configuration files have moved from"
-		ewarn "   /etc/radiusclient to /etc/ppp/radius."
-		einfo "For your convenience, radiusclient directory was copied to the new location."
-	fi
-
-	echo
-	elog "Pon, poff and plog scripts have been supplied for experienced users."
-	elog "Users needing particular scripts (ssh,rsh,etc.) should check out the"
-	elog "/usr/share/doc/${PF}/scripts directory."
-
-	# move the old user-defined files into ip-{up,down}.d directories
-	# TO BE REMOVED AFTER SEPT 2008
-	local i
-	for i in ip-up ip-down; do
-		if [ -f "${ROOT}"/etc/ppp/${i}.local ]; then
-			mv /etc/ppp/${i}.local /etc/ppp/${i}.d/90-local.sh && \
-				ewarn "/etc/ppp/${i}.local has been moved to /etc/ppp/${i}.d/90-local.sh"
-		fi
-	done
-}
diff --git a/net-dialup/ppp/ppp-2.4.5-r2.ebuild b/net-dialup/ppp/ppp-2.4.5-r2.ebuild
deleted file mode 100644
index a2619426dc17..000000000000
--- a/net-dialup/ppp/ppp-2.4.5-r2.ebuild
+++ /dev/null
@@ -1,284 +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/ppp/ppp-2.4.5-r2.ebuild,v 1.4 2012/08/07 15:05:23 vapier Exp $
-
-EAPI="2"
-
-inherit eutils multilib toolchain-funcs linux-info pam
-
-DESCRIPTION="Point-to-Point Protocol (PPP)"
-HOMEPAGE="http://www.samba.org/ppp"
-SRC_URI="ftp://ftp.samba.org/pub/ppp/${P}.tar.gz
-	http://dev.gentoo.org/~flameeyes/qa-copies/${P}-gentoo-20111111.tar.gz
-	dhcp? ( http://www.netservers.co.uk/gpl/ppp-dhcpc.tgz )"
-
-LICENSE="BSD GPL-2"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
-IUSE="activefilter atm dhcp eap-tls gtk ipv6 pam radius"
-
-DEPEND="activefilter? ( net-libs/libpcap )
-	atm? ( net-dialup/linux-atm )
-	pam? ( virtual/pam )
-	gtk? ( x11-libs/gtk+:2 )
-	eap-tls? ( net-misc/curl dev-libs/openssl )"
-RDEPEND="${DEPEND}"
-
-src_prepare() {
-	# Use the headers from the kernel #427684
-	rm include/linux/if_pppol2tp.h || die
-
-	epatch "${WORKDIR}/patch/make-vars.patch"
-	epatch "${WORKDIR}/patch/mpls.patch"
-	epatch "${WORKDIR}/patch/killaddr-smarter.patch"
-	epatch "${WORKDIR}/patch/wait-children.patch"
-	epatch "${WORKDIR}/patch/defaultgateway.patch"
-	epatch "${WORKDIR}/patch/linkpidfile.patch"
-	epatch "${WORKDIR}/patch/qa-fixes.patch"
-	epatch "${WORKDIR}/patch/auth-fail.patch"
-	epatch "${WORKDIR}/patch/defaultmetric.patch"
-	epatch "${WORKDIR}/patch/dev-ppp.patch"
-	epatch "${WORKDIR}/patch/gtk2.patch"
-	epatch "${WORKDIR}/patch/passwordfd-read-early.patch"
-	epatch "${WORKDIR}/patch/pppd-usepeerwins.patch"
-	epatch "${WORKDIR}/patch/connect-errors.patch"
-	epatch "${WORKDIR}/patch/Makefile.patch"
-	epatch "${WORKDIR}/patch/pado-timeout.patch"
-	epatch "${WORKDIR}/patch/lcp-echo-adaptive.patch"
-
-	use eap-tls && {
-		# see http://www.nikhef.nl/~janjust/ppp for more info
-		einfo "Enabling EAP-TLS support"
-		epatch "${WORKDIR}/patch/eaptls-mppe-0.991-gentoo.patch"
-	}
-
-	use atm && {
-		einfo "Enabling PPPoATM support"
-		sed -i "s/^#HAVE_LIBATM=yes/HAVE_LIBATM=yes/" pppd/plugins/pppoatm/Makefile.linux
-	}
-
-	use activefilter || {
-		einfo "Disabling active filter"
-		sed -i "s/^FILTER=y/#FILTER=y/" pppd/Makefile.linux
-	}
-
-	use pam && {
-		einfo "Enabling PAM"
-		sed -i "s/^#USE_PAM=y/USE_PAM=y/" pppd/Makefile.linux
-	}
-
-	use ipv6 && {
-		einfo "Enabling IPv6"
-		sed -i "s/#HAVE_INET6/HAVE_INET6/" pppd/Makefile.linux
-	}
-
-	einfo "Enabling CBCP"
-	sed -i "s/^#CBCP=y/CBCP=y/" pppd/Makefile.linux
-
-	use dhcp && {
-		# copy the ppp-dhcp plugin files
-		einfo "Adding ppp-dhcp plugin files..."
-		mv "${WORKDIR}/dhcp" "${S}/pppd/plugins" \
-			&& sed -i -e 's/\(SUBDIRS := .*rp-pppoe.*\)$/\1 dhcp/' pppd/plugins/Makefile.linux \
-			|| die "ppp-dhcp plugin addition failed"
-		epatch "${WORKDIR}/patch/dhcp-make-vars.patch"
-		epatch "${WORKDIR}/patch/dhcp-sys_error_to_strerror.patch"
-	}
-
-	# Set correct libdir
-	sed -i -e "s:/lib/pppd:/$(get_libdir)/pppd:" \
-		pppd/{pathnames.h,pppd.8}
-
-	if use radius; then
-		#set the right paths in radiusclient.conf
-		sed -i -e "s:/usr/local/etc:/etc:" \
-			-e "s:/usr/local/sbin:/usr/sbin:" pppd/plugins/radius/etc/radiusclient.conf
-		#set config dir to /etc/ppp/radius
-		sed -i -e "s:/etc/radiusclient:/etc/ppp/radius:g" \
-			pppd/plugins/radius/{*.8,*.c,*.h} \
-			pppd/plugins/radius/etc/*
-	else
-		einfo "Disabling radius"
-		sed -i -e '/+= radius/s:^:#:' pppd/plugins/Makefile.linux
-	fi
-}
-
-src_configure() {
-	export CC="$(tc-getCC)"
-	export AR="$(tc-getAR)"
-	econf || die "econf failed"
-}
-
-src_compile() {
-	emake COPTS="${CFLAGS} -D_GNU_SOURCE" || die "compile failed"
-
-	#build pppgetpass
-	cd contrib/pppgetpass
-	if use gtk; then
-		emake -f Makefile.linux || die "failed to build pppgetpass"
-	else
-		emake pppgetpass.vt || die "failed to build pppgetpass"
-	fi
-}
-
-src_install() {
-	local i
-	for i in chat pppd pppdump pppstats ; do
-		doman ${i}/${i}.8 || die "man page for ${i} not build"
-		dosbin ${i}/${i} || die "${i} not build"
-	done
-	fperms u+s-w /usr/sbin/pppd
-
-	# Install pppd header files
-	pushd pppd >/dev/null
-	emake INSTROOT="${D}" install-devel || die "emake install-devel failed"
-	popd >/dev/null
-
-	dosbin pppd/plugins/rp-pppoe/pppoe-discovery || die "pppoe-discovery not build"
-
-	dodir /etc/ppp/peers
-	insinto /etc/ppp
-	insopts -m0600
-	newins etc.ppp/pap-secrets pap-secrets.example || die "pap-secrets.example not found"
-	newins etc.ppp/chap-secrets chap-secrets.example || die "chap-secrets.example not found"
-
-	insopts -m0644
-	doins etc.ppp/options
-
-	exeinto /etc/ppp
-	for i in ip-up ip-down ; do
-		doexe "${WORKDIR}/scripts/${i}" || die "failed to install ${i} script"
-		insinto /etc/ppp/${i}.d
-		use ipv6 && dosym ${i} /etc/ppp/${i/ip/ipv6}
-		doins "${WORKDIR}/scripts/${i}.d"/* || die "failed to install ${i}.d scripts"
-	done
-
-	pamd_mimic_system ppp auth account session
-
-	local PLUGINS_DIR=/usr/$(get_libdir)/pppd/$(awk -F '"' '/VERSION/ {print $2}' pppd/patchlevel.h)
-	#closing " for syntax coloring
-	insinto "${PLUGINS_DIR}"
-	insopts -m0755
-	doins pppd/plugins/minconn.so || die "minconn.so not build"
-	doins pppd/plugins/passprompt.so || die "passprompt.so not build"
-	doins pppd/plugins/passwordfd.so || die "passwordfd.so not build"
-	doins pppd/plugins/winbind.so || die "winbind.so not build"
-	doins pppd/plugins/rp-pppoe/rp-pppoe.so || die "rp-pppoe.so not build"
-	doins pppd/plugins/pppol2tp/openl2tp.so || die "openl2tp.so not build"
-	doins pppd/plugins/pppol2tp/pppol2tp.so || die "pppol2tp.so not build"
-	if use atm; then
-		doins pppd/plugins/pppoatm/pppoatm.so || die "pppoatm.so not build"
-	fi
-	if use dhcp; then
-		doins pppd/plugins/dhcp/dhcpc.so || die "dhcpc.so not build"
-	fi
-	if use radius; then
-		doins pppd/plugins/radius/radius.so || die "radius.so not build"
-		doins pppd/plugins/radius/radattr.so || die "radattr.so not build"
-		doins pppd/plugins/radius/radrealms.so || die "radrealms.so not build"
-
-		#Copy radiusclient configuration files (#92878)
-		insinto /etc/ppp/radius
-		insopts -m0644
-		doins pppd/plugins/radius/etc/{dictionary*,issue,port-id-map,radiusclient.conf,realms,servers}
-
-		doman pppd/plugins/radius/pppd-radius.8
-		doman pppd/plugins/radius/pppd-radattr.8
-	fi
-
-	insinto /etc/modprobe.d
-	insopts -m0644
-	newins "${FILESDIR}/modules.ppp" ppp.conf
-
-	dodoc PLUGINS README* SETUP Changes-2.3 FAQ
-	dodoc "${FILESDIR}/README.mpls"
-
-	dosbin scripts/pon && \
-		dosbin scripts/poff && \
-		dosbin scripts/plog && \
-		doman scripts/pon.1 || die "failed to install pon&poff scripts"
-
-	# Adding misc. specialized scripts to doc dir
-	insinto /usr/share/doc/${PF}/scripts/chatchat
-	doins scripts/chatchat/* || die "failed to install chat scripts in doc dir"
-	insinto /usr/share/doc/${PF}/scripts
-	doins scripts/* || die "failed to install scripts in doc dir"
-
-	if use gtk; then
-		dosbin contrib/pppgetpass/{pppgetpass.vt,pppgetpass.gtk}
-		newsbin contrib/pppgetpass/pppgetpass.sh pppgetpass
-	else
-		newsbin contrib/pppgetpass/pppgetpass.vt pppgetpass
-	fi
-	doman contrib/pppgetpass/pppgetpass.8
-}
-
-pkg_postinst() {
-	if linux-info_get_any_version && linux_config_src_exists; then
-		echo
-		ewarn "If the following test report contains a missing kernel configuration option that you need,"
-		ewarn "you should reconfigure and rebuild your kernel before running pppd."
-		CONFIG_CHECK="~PPP ~PPP_ASYNC ~PPP_SYNC_TTY"
-		local ERROR_PPP="CONFIG_PPP:\t missing PPP support (REQUIRED)"
-		local ERROR_PPP_ASYNC="CONFIG_PPP_ASYNC:\t missing asynchronous serial line discipline (optional, but highly recommended)"
-		local WARNING_PPP_SYNC_TTY="CONFIG_PPP_SYNC_TTY:\t missing synchronous serial line discipline (optional; used by 'sync' pppd option)"
-		if use activefilter ; then
-			CONFIG_CHECK="${CONFIG_CHECK} ~PPP_FILTER"
-			local ERROR_PPP_FILTER="CONFIG_PPP_FILTER:\t missing PPP filtering support (REQUIRED)"
-		fi
-		CONFIG_CHECK="${CONFIG_CHECK} ~PPP_DEFLATE ~PPP_BSDCOMP ~PPP_MPPE"
-		local ERROR_PPP_DEFLATE="CONFIG_PPP_DEFLATE:\t missing Deflate compression (optional, but highly recommended)"
-		local ERROR_PPP_BSDCOMP="CONFIG_PPP_BSDCOMP:\t missing BSD-Compress compression (optional, but highly recommended)"
-		local WARNING_PPP_MPPE="CONFIG_PPP_MPPE:\t missing MPPE encryption (optional, mostly used by PPTP links)"
-		CONFIG_CHECK="${CONFIG_CHECK} ~PPPOE ~PACKET"
-		local WARNING_PPPOE="CONFIG_PPPOE:\t missing PPPoE support (optional, needed by rp-pppoe plugin)"
-		local WARNING_PACKET="CONFIG_PACKET:\t missing AF_PACKET support (optional, used by rp-pppoe and dhcpc plugins)"
-		if use atm ; then
-			CONFIG_CHECK="${CONFIG_CHECK} ~PPPOATM"
-			local WARNING_PPPOATM="CONFIG_PPPOATM:\t missing PPPoA support (optional, needed by pppoatm plugin)"
-		fi
-		check_extra_config
-	fi
-
-	if [ ! -e "${ROOT}/dev/.devfsd" ] && [ ! -e "${ROOT}/dev/.udev" ] && [ ! -e "${ROOT}/dev/ppp" ]; then
-		mknod "${ROOT}/dev/ppp" c 108 0
-	fi
-	if [ "$ROOT" = "/" ]; then
-		if [ -x /sbin/update-modules ]; then
-			/sbin/update-modules
-		else
-			/sbin/modules-update
-		fi
-	fi
-
-	# create *-secrets files if not exists
-	[ -f "${ROOT}/etc/ppp/pap-secrets" ] || \
-		cp -pP "${ROOT}/etc/ppp/pap-secrets.example" "${ROOT}/etc/ppp/pap-secrets"
-	[ -f "${ROOT}/etc/ppp/chap-secrets" ] || \
-		cp -pP "${ROOT}/etc/ppp/chap-secrets.example" "${ROOT}/etc/ppp/chap-secrets"
-
-	# lib name has changed
-	sed -i -e "s:^pppoe.so:rp-pppoe.so:" "${ROOT}/etc/ppp/options"
-
-	if use radius && [[ $previous_less_than_2_4_3_r5 = 0 ]] ; then
-		echo
-		ewarn "As of ${PN}-2.4.3-r5, the RADIUS configuration files have moved from"
-		ewarn "   /etc/radiusclient to /etc/ppp/radius."
-		einfo "For your convenience, radiusclient directory was copied to the new location."
-	fi
-
-	echo
-	elog "Pon, poff and plog scripts have been supplied for experienced users."
-	elog "Users needing particular scripts (ssh,rsh,etc.) should check out the"
-	elog "/usr/share/doc/${PF}/scripts directory."
-
-	# move the old user-defined files into ip-{up,down}.d directories
-	# TO BE REMOVED AFTER SEPT 2008
-	local i
-	for i in ip-up ip-down; do
-		if [ -f "${ROOT}"/etc/ppp/${i}.local ]; then
-			mv /etc/ppp/${i}.local /etc/ppp/${i}.d/90-local.sh && \
-				ewarn "/etc/ppp/${i}.local has been moved to /etc/ppp/${i}.d/90-local.sh"
-		fi
-	done
-}
diff --git a/net-dialup/ppp/ppp-2.4.6.ebuild b/net-dialup/ppp/ppp-2.4.6.ebuild
new file mode 100644
index 000000000000..12028691741b
--- /dev/null
+++ b/net-dialup/ppp/ppp-2.4.6.ebuild
@@ -0,0 +1,223 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/net-dialup/ppp/ppp-2.4.6.ebuild,v 1.1 2014/02/19 09:56:32 polynomial-c Exp $
+
+EAPI=5
+
+inherit eutils multilib toolchain-funcs linux-info pam
+
+PATCH_VER="1"
+DESCRIPTION="Point-to-Point Protocol (PPP)"
+HOMEPAGE="http://www.samba.org/ppp"
+SRC_URI="ftp://ftp.samba.org/pub/ppp/${P}.tar.gz
+	http://dev.gentoo.org/~polynomial-c/${P}-patches-${PATCH_VER}.tar.xz
+	http://www.netservers.net.uk/gpl/ppp-dhcpc.tgz"
+
+LICENSE="BSD GPL-2"
+SLOT="0/${PV}"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
+IUSE="activefilter atm dhcp eap-tls gtk ipv6 pam radius"
+
+DEPEND="activefilter? ( net-libs/libpcap )
+	atm? ( net-dialup/linux-atm )
+	pam? ( virtual/pam )
+	gtk? ( x11-libs/gtk+:2 )
+	eap-tls? ( net-misc/curl dev-libs/openssl )"
+RDEPEND="${DEPEND}"
+
+src_prepare() {
+	mv "${WORKDIR}/dhcp" "${S}/pppd/plugins" || die
+
+	use eap-tls || EPATCH_EXCLUDE+=" 8?_all_eaptls-*"
+	EPATCH_SUFFIX="patch" \
+	epatch "${WORKDIR}"/patch
+
+	if use atm ; then
+		einfo "Enabling PPPoATM support"
+		sed -i '/^#HAVE_LIBATM=yes/s:#::' \
+			pppd/plugins/pppoatm/Makefile.linux || die
+	fi
+
+	if ! use activefilter ; then
+		einfo "Disabling active filter"
+		sed -i '/^FILTER=y/s:^:#:' pppd/Makefile.linux || die
+	fi
+
+	if use pam ; then
+		einfo "Enabling PAM"
+		sed -i '/^#USE_PAM=y/s:^#::' pppd/Makefile.linux || die
+	fi
+
+	if use ipv6 ; then
+		einfo "Enabling IPv6"
+		sed -i '/#HAVE_INET6/s:#::' pppd/Makefile.linux || die
+	fi
+
+	einfo "Enabling CBCP"
+	sed -i '/^#CBCP=y/s:#::' pppd/Makefile.linux || die
+
+	if use dhcp ; then
+		einfo "Adding ppp-dhcp plugin files"
+		sed -i \
+			-e '/^SUBDIRS :=/s:$: dhcp:' \
+				pppd/plugins/Makefile.linux || die
+	fi
+
+	# Set correct libdir
+	sed -i -e "s:/lib/pppd:/$(get_libdir)/pppd:" \
+		pppd/{pathnames.h,pppd.8}
+
+	if use radius ; then
+		#set the right paths in radiusclient.conf
+		sed -i -e "s:/usr/local/etc:/etc:" \
+			-e "s:/usr/local/sbin:/usr/sbin:" \
+				pppd/plugins/radius/etc/radiusclient.conf
+		#set config dir to /etc/ppp/radius
+		sed -i -e "s:/etc/radiusclient:/etc/ppp/radius:g" \
+			pppd/plugins/radius/{*.8,*.c,*.h} \
+			pppd/plugins/radius/etc/*
+	else
+		einfo "Disabling radius"
+		sed -i -e '/+= radius/s:^:#:' pppd/plugins/Makefile.linux
+	fi
+}
+
+src_compile() {
+	tc-export AR CC
+	emake COPTS="${CFLAGS} -D_GNU_SOURCE"
+
+	# build pppgetpass
+	cd contrib/pppgetpass || die
+	if use gtk ; then
+		emake -f Makefile.linux
+	else
+		emake pppgetpass.vt
+	fi
+}
+
+src_install() {
+	local i
+	for i in chat pppd pppdump pppstats ; do
+		doman ${i}/${i}.8
+		dosbin ${i}/${i}
+	done
+	fperms u+s-w /usr/sbin/pppd
+
+	# Install pppd header files
+	emake -C pppd INSTROOT="${D}" install-devel
+
+	dosbin pppd/plugins/rp-pppoe/pppoe-discovery
+
+	dodir /etc/ppp/peers
+	insinto /etc/ppp
+	insopts -m0600
+	newins etc.ppp/pap-secrets pap-secrets.example
+	newins etc.ppp/chap-secrets chap-secrets.example
+
+	insopts -m0644
+	doins etc.ppp/options
+
+	exeinto /etc/ppp
+	for i in ip-up ip-down ; do
+		doexe "${WORKDIR}/scripts/${i}"
+		insinto /etc/ppp/${i}.d
+		use ipv6 && dosym ${i} /etc/ppp/${i/ip/ipv6}
+		doins "${WORKDIR}/scripts/${i}.d"/*
+	done
+
+	pamd_mimic_system ppp auth account session
+
+	local PLUGINS_DIR=/usr/$(get_libdir)/pppd/$(awk -F '"' '/VERSION/ {print $2}' pppd/patchlevel.h)
+	# closing " for syntax coloring
+	insinto "${PLUGINS_DIR}"
+	insopts -m0755
+	doins pppd/plugins/minconn.so
+	doins pppd/plugins/passprompt.so
+	doins pppd/plugins/passwordfd.so
+	doins pppd/plugins/winbind.so
+	doins pppd/plugins/rp-pppoe/rp-pppoe.so
+	doins pppd/plugins/pppol2tp/openl2tp.so
+	doins pppd/plugins/pppol2tp/pppol2tp.so
+	if use atm ; then
+		doins pppd/plugins/pppoatm/pppoatm.so
+	fi
+	if use dhcp ; then
+		doins pppd/plugins/dhcp/dhcpc.so
+	fi
+	if use radius ; then
+		doins pppd/plugins/radius/rad{ius,attr,realms}.so
+
+		#Copy radiusclient configuration files (#92878)
+		insinto /etc/ppp/radius
+		insopts -m0644
+		doins pppd/plugins/radius/etc/{dictionary*,issue,port-id-map,radiusclient.conf,realms,servers}
+
+		doman pppd/plugins/radius/pppd-rad{ius,attr}.8
+	fi
+
+	insinto /etc/modprobe.d
+	insopts -m0644
+	newins "${FILESDIR}/modules.ppp" ppp.conf
+
+	dodoc PLUGINS README* SETUP Changes-2.3 FAQ
+	dodoc "${FILESDIR}/README.mpls"
+
+	dosbin scripts/p{on,off,log}
+	doman scripts/pon.1
+
+	# Adding misc. specialized scripts to doc dir
+	insinto /usr/share/doc/${PF}/scripts/chatchat
+	doins scripts/chatchat/*
+	insinto /usr/share/doc/${PF}/scripts
+	doins scripts/*
+
+	if use gtk ; then
+		dosbin contrib/pppgetpass/{pppgetpass.vt,pppgetpass.gtk}
+		newsbin contrib/pppgetpass/pppgetpass.sh pppgetpass
+	else
+		newsbin contrib/pppgetpass/pppgetpass.vt pppgetpass
+	fi
+	doman contrib/pppgetpass/pppgetpass.8
+}
+
+pkg_postinst() {
+	if linux-info_get_any_version && linux_config_src_exists ; then
+		echo
+		ewarn "If the following test report contains a missing kernel configuration option that you need,"
+		ewarn "you should reconfigure and rebuild your kernel before running pppd."
+		CONFIG_CHECK="~PPP ~PPP_ASYNC ~PPP_SYNC_TTY"
+		local ERROR_PPP="CONFIG_PPP:\t missing PPP support (REQUIRED)"
+		local ERROR_PPP_ASYNC="CONFIG_PPP_ASYNC:\t missing asynchronous serial line discipline (optional, but highly recommended)"
+		local WARNING_PPP_SYNC_TTY="CONFIG_PPP_SYNC_TTY:\t missing synchronous serial line discipline (optional; used by 'sync' pppd option)"
+		if use activefilter ; then
+			CONFIG_CHECK="${CONFIG_CHECK} ~PPP_FILTER"
+			local ERROR_PPP_FILTER="CONFIG_PPP_FILTER:\t missing PPP filtering support (REQUIRED)"
+		fi
+		CONFIG_CHECK="${CONFIG_CHECK} ~PPP_DEFLATE ~PPP_BSDCOMP ~PPP_MPPE"
+		local ERROR_PPP_DEFLATE="CONFIG_PPP_DEFLATE:\t missing Deflate compression (optional, but highly recommended)"
+		local ERROR_PPP_BSDCOMP="CONFIG_PPP_BSDCOMP:\t missing BSD-Compress compression (optional, but highly recommended)"
+		local WARNING_PPP_MPPE="CONFIG_PPP_MPPE:\t missing MPPE encryption (optional, mostly used by PPTP links)"
+		CONFIG_CHECK="${CONFIG_CHECK} ~PPPOE ~PACKET"
+		local WARNING_PPPOE="CONFIG_PPPOE:\t missing PPPoE support (optional, needed by rp-pppoe plugin)"
+		local WARNING_PACKET="CONFIG_PACKET:\t missing AF_PACKET support (optional, used by rp-pppoe and dhcpc plugins)"
+		if use atm ; then
+			CONFIG_CHECK="${CONFIG_CHECK} ~PPPOATM"
+			local WARNING_PPPOATM="CONFIG_PPPOATM:\t missing PPPoA support (optional, needed by pppoatm plugin)"
+		fi
+		check_extra_config
+	fi
+
+	# create *-secrets files if not exists
+	[ -f "${ROOT}/etc/ppp/pap-secrets" ] || \
+		cp -pP "${ROOT}/etc/ppp/pap-secrets.example" "${ROOT}/etc/ppp/pap-secrets"
+	[ -f "${ROOT}/etc/ppp/chap-secrets" ] || \
+		cp -pP "${ROOT}/etc/ppp/chap-secrets.example" "${ROOT}/etc/ppp/chap-secrets"
+
+	# lib name has changed
+	sed -i -e "s:^pppoe.so:rp-pppoe.so:" "${ROOT}/etc/ppp/options"
+
+	echo
+	elog "Pon, poff and plog scripts have been supplied for experienced users."
+	elog "Users needing particular scripts (ssh,rsh,etc.) should check out the"
+	elog "/usr/share/doc/${PF}/scripts directory."
+}