Export LDFLAGS from plugins/Makefile (#234915).

Add usepeerwins option, thanks to Jaco Kroon <jaco at uls dot co dot za>; remove wins-ack USE flag (#234583).
Package-Manager: portage-2.1.4.4

5 files changed, 27 insertions, 324 deletions

diff --git a/net-dialup/ppp/ChangeLog b/net-dialup/ppp/ChangeLog
index 39e3d310be6b..6294fa1fa61a 100644
--- a/net-dialup/ppp/ChangeLog
+++ b/net-dialup/ppp/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for net-dialup/ppp
 # Copyright 2002-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-dialup/ppp/ChangeLog,v 1.225 2008/08/15 08:55:22 mrness Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-dialup/ppp/ChangeLog,v 1.226 2008/08/19 18:20:11 mrness Exp $
+
+*ppp-2.4.4-r21 (19 Aug 2008)
+
+  19 Aug 2008; Alin Năstac <mrness@gentoo.org> metadata.xml,
+  -ppp-2.4.4-r19.ebuild, -ppp-2.4.4-r20.ebuild, +ppp-2.4.4-r21.ebuild:
+  Export LDFLAGS from plugins/Makefile (#234915). Add usepeerwins option,
+  thanks to Jaco Kroon <jaco at uls dot co dot za>; remove wins-ack USE
+  flag (#234583).
 
 *ppp-2.4.4-r20 (15 Aug 2008)
 
diff --git a/net-dialup/ppp/Manifest b/net-dialup/ppp/Manifest
index 8dd39d0945c8..b2be8ca73cde 100644
--- a/net-dialup/ppp/Manifest
+++ b/net-dialup/ppp/Manifest
@@ -1,14 +1,22 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
 AUX README.mpls 530 RMD160 4814f25fa3d788311f37045188cf285fb588da67 SHA1 fdf4abff10b2593ca9012429cf684243cc74fec6 SHA256 5ef99aba902533fe9d17b7dfaf91e72b638cc70b9f811d1e518822ee80b5ff57
 AUX modules.ppp 299 RMD160 ef5ee6fcf66dce67e5bd25220699c3df3ae6ee28 SHA1 d5d8646685dd7d4c0811812e2cb85fee71806d2b SHA256 8947dd48d3d0c128166edc9bb0917b9af88502296fad791d6d90bf165ca50db3
 DIST ppp-2.4.4-gentoo-20070903.tar.gz 49574 RMD160 05ac480547465ba4907ea2df95f910cfef378171 SHA1 71f3ebae77b281d1aff2edd9303eb6e14ef77176 SHA256 79cfb44fd3868a139f11fee6f2a59ef9f2448b060d4b5584696be3048606b40d
 DIST ppp-2.4.4-gentoo-20080412.tar.gz 47912 RMD160 19cb48bf5f283054bb9fb12b20d6456190d9f5eb SHA1 56ecb29bb910fb726ff3fbdf7425c27d63258e3b SHA256 4a4cd83b378c8d422a9c1ac135e8ffb4db46ab2ab819c9d9f65c4c8ebc2a8bba
-DIST ppp-2.4.4-gentoo-20080801.tar.gz 50481 RMD160 07003f07aeb3cc004083ecec87df58a87ff4e03b SHA1 f2691d07faeee3115675894aca2a8bc21974e3d7 SHA256 8536c4ac4bc458c911a654653b141e3eb2ceaa345798d1e102835af3ab9128cd
-DIST ppp-2.4.4-gentoo-20080815.tar.gz 51407 RMD160 8931a425e9ae3c84c88a38019bb506cd9f4cd680 SHA1 d293899f2e50c7bfbea6a1dae4a4f09988889342 SHA256 e5e4fec326cf2abc5b7cdee87f4c3310854011f03bb0e8ff26072d2e7060c766
+DIST ppp-2.4.4-gentoo-20080819.tar.gz 53568 RMD160 9c9fc6a6a90f143f6ce369c899b3dc64ce8469da SHA1 a32273410b7687748a1534a7eb4cfc0c6a4c23dd SHA256 cd9fdc4dbd509f154992447b4a4b80a86af19c92ea8c592cc074d3b6cc5adc8d
 DIST ppp-2.4.4.tar.gz 688763 RMD160 ed289a4506c3af41a72f88103d5e0be44dec3da7 SHA1 9b91b0117e0a8bfaf8c4e894af79e0960dd36259 SHA256 58af45fc07e5f326eea2408df770ea40e4626d1a15e7d564dd054d74880e91ea
 DIST ppp-dhcpc.tgz 33497 RMD160 63bf0d1cc52e91ea536fc593fb7a40502baecd90 SHA1 1a0b02788d522f2137d0b66c749ffe6c96cceb94 SHA256 977fd980bb1d285963d8e27a87b7601ea84317faadfdb40989b258d1853db644
 EBUILD ppp-2.4.4-r14.ebuild 10476 RMD160 8b883a43b569d66421f82e6f912ac13498b6cd82 SHA1 4ca1bd229972fe9e726ed1f517e1cb4670696a6a SHA256 ea7f1162287fdd4a45f407d2950dca9c5ba30e134d163b2b6d80e666ee5823ff
 EBUILD ppp-2.4.4-r15.ebuild 10609 RMD160 87fdd11e24ba386c2e9434633ea9854e402250cd SHA1 ce7e0e273e1e141cd62720de67fc6c192ea3ac18 SHA256 360d7ff2c78162461874dadcce4bb9e32b96fc3db6865b46fab573b5f321dcf1
-EBUILD ppp-2.4.4-r19.ebuild 10796 RMD160 00dc9e71b71fb7bca187feaf129be5b7e523baa8 SHA1 2e8c03bef01f04734e7fc0692f277b31df0f4442 SHA256 beffca60c6b72ecb3ae4f53932f46327b08f3b122a6e07ef8c23e9ff02fb7931
-EBUILD ppp-2.4.4-r20.ebuild 10643 RMD160 a4e97f765a4aac53dbc9847a788a06275d02cebc SHA1 c4e1a73eb8d43754a46232a4680cbd466b92fa90 SHA256 4dac99312b4c951a08217fd71aa3457344d79d7ef0b344b708a1b2cce45fbaf9
-MISC ChangeLog 37368 RMD160 d965384892388327136b7abd7fa30239076a7d6a SHA1 49491801247bb127b46bba629963507e747bce2e SHA256 dd7aa882bbaaa67fa0179ffae4020d31c581d9678dfbe712d376f06d945b4410
-MISC metadata.xml 1568 RMD160 15b891d15e018f27dda8553ff5af358bad02a515 SHA1 546d4233f3b32b61517a63818bcf031a950ad90a SHA256 b1eee16c04134a1f27c8ab6ec29034946c8291087c024b048a9850ffa2d2f60d
+EBUILD ppp-2.4.4-r21.ebuild 10550 RMD160 75969ed8ea45c5d0aba0269f0d9cf42af6c9a3cd SHA1 d7aad8d718cc0b672750fe5e5b67b739d746c0a7 SHA256 3d3d6bae2a4934e5446d00536a82c8306e307ae6b0082a9446d7bf151c04af2e
+MISC ChangeLog 37696 RMD160 16847d7b1a21a03da5ce314a9b9038bca957187f SHA1 d011ebdd909ebe4a325083b3f51913850749c325 SHA256 42ec64d0a0281e872567f3bb586558f32c784669e8bb6addada5618dd1a0f8b2
+MISC metadata.xml 1440 RMD160 4ef716500746f41ceb71abbbd68f0411bc24697b SHA1 065c4a01606a00985340f038ed22b8229d37774f SHA256 111e9045c4c9533769cb65da6a2fc657b60ecd81ddfc0d68655872401e4653d5
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.9 (GNU/Linux)
+
+iEYEARECAAYFAkirDuUACgkQPrHvTlXvhtszWgCfdAH63FyQvT4hkI5NZ/Tapt5Y
+ye4An39Iq6LVuQ40v5Xt2qwBuQohzokm
+=NVBI
+-----END PGP SIGNATURE-----
diff --git a/net-dialup/ppp/metadata.xml b/net-dialup/ppp/metadata.xml
index b93eb10ec959..714b92a83d32 100644
--- a/net-dialup/ppp/metadata.xml
+++ b/net-dialup/ppp/metadata.xml
@@ -27,7 +27,5 @@
     <flag name="pam">Enables PAM (Pluggable Authentication Modules)
     support</flag>
     <flag name="radius">Enables RADIUS support</flag>
-    <flag name="wins-ack">Acknowledge the WINS servers provided by the peer
-    although it will not use them in any way</flag>
   </use>
 </pkgmetadata>
diff --git a/net-dialup/ppp/ppp-2.4.4-r19.ebuild b/net-dialup/ppp/ppp-2.4.4-r19.ebuild
deleted file mode 100644
index 1d598973a991..000000000000
--- a/net-dialup/ppp/ppp-2.4.4-r19.ebuild
+++ /dev/null
@@ -1,309 +0,0 @@
-# Copyright 1999-2008 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-dialup/ppp/ppp-2.4.4-r19.ebuild,v 1.1 2008/08/01 20:58:23 mrness Exp $
-
-inherit eutils 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-20080801.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 mppe-mppc pam radius"
-
-DEPEND="activefilter? ( >=virtual/libpcap-0.9.4 )
-	atm? ( net-dialup/linux-atm )
-	pam? ( virtual/pam )
-	gtk? ( >=x11-libs/gtk+-2.8 )
-	eap-tls? ( net-misc/curl >=dev-libs/openssl-0.9.7 )"
-
-pkg_setup() {
-	if use mppe-mppc; then
-		echo
-		ewarn "The mppe-mppc flag overwrites the pppd native MPPE support with MPPE-MPPC"
-		ewarn "patch developed by Jan Dubiec."
-		ewarn "The resulted pppd will work only with patched kernels with version <= 2.6.14."
-		ewarn "You could obtain the kernel patch from MPPE-MPPC homepage:"
-		ewarn "   http://mppe-mppc.alphacron.de/"
-		ewarn "CAUTION: MPPC is a U.S. patented algorithm!"
-		ewarn "Ask yourself if you really need it and, if you do, consult your lawyer first."
-		ebeep
-	fi
-}
-
-src_unpack() {
-	unpack ${A}
-	cd "${S}"
-
-	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/maxoctets-2Glimit.patch"
-	epatch "${WORKDIR}/patch/defaultgateway.patch"
-	epatch "${WORKDIR}/patch/mschapv2-initialize-response.patch"
-	epatch "${WORKDIR}/patch/linkpidfile.patch"
-	epatch "${WORKDIR}/patch/qa-fixes.patch"
-	epatch "${WORKDIR}/patch/kill-pg.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/pppoe-lcp-timeout.patch"
-	epatch "${WORKDIR}/patch/passwordfd-read-early.patch"
-
-	use eap-tls && {
-		# see http://eaptls.spe.net/index.html for more info
-		einfo "Enabling EAP-TLS support"
-		epatch "${WORKDIR}/patch/eaptls-0.7-gentoo.patch"
-		use mppe-mppc || epatch "${WORKDIR}/patch/eaptls-mppe-0.7.patch"
-	}
-
-	use mppe-mppc && {
-		einfo "Enabling MPPE-MPPC support"
-		epatch "${WORKDIR}/patch/mppe-mppc-1.1.patch"
-		use eap-tls && epatch "${WORKDIR}/patch/eaptls-mppe-0.7-with-mppc.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 "Copying ppp-dhcp plugin files..."
-		tar -xzf "${DISTDIR}/ppp-dhcpc.tgz" -C pppd/plugins/ \
-			&& sed -i -e 's/SUBDIRS := rp-pppoe/SUBDIRS := rp-pppoe 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}
-
-	use radius && {
-		#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/*
-	}
-}
-
-src_compile() {
-	export CC="$(tc-getCC)"
-	export AR="$(tc-getAR)"
-	econf || die "configuration failed"
-	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
-}
-
-pkg_preinst() {
-	has_version "<${CATEGORY}/${PN}-2.4.3-r5"
-	previous_less_than_2_4_3_r5=$?
-
-	if use radius && [ -d "${ROOT}/etc/radiusclient" ] && \
-		[[ $previous_less_than_2_4_3_r5 = 0 ]] ; then
-		ebegin "Copy /etc/radiusclient to /etc/ppp/radius"
-		cp -pPR "${ROOT}/etc/radiusclient" "${ROOT}/etc/ppp/radius"
-		eend $?
-	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
-	pushd pppd && \
-		make INSTROOT="${D}" install-devel && \
-		popd || die "make install-devel failed"
-
-	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}" || 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"
-	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
-	if use mppe-mppc; then
-		sed -i -e 's/ppp_mppe/ppp_mppe_mppc/' "${D}/etc/modprobe.d/ppp"
-	fi
-
-	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 get_version ; 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"
-		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)"
-		if use mppe-mppc ; then
-			CONFIG_CHECK="${CONFIG_CHECK} ~PPP_MPPE_MPPC"
-			local WARNING_PPP_MPPE_MPPC="CONFIG_PPP_MPPE_MPPC:\t missing MPPE/MPPC encryption/compression (optional, mostly used by PPTP links)"
-		else
-			CONFIG_CHECK="${CONFIG_CHECK} ~PPP_MPPE"
-			local WARNING_PPP_MPPE="CONFIG_PPP_MPPE:\t missing MPPE encryption (optional, mostly used by PPTP links)"
-		fi
-		CONFIG_CHECK="${CONFIG_CHECK} ~PPPOE"
-		local WARNING_PPPOE="CONFIG_PPPOE:\t missing PPPoE support (optional needed by rp-pppoe plugin)"
-		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
-		[ -x /sbin/update-modules ] && /sbin/update-modules || /sbin/modules-update
-	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
-	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 && \
-				einfo "/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.4-r20.ebuild b/net-dialup/ppp/ppp-2.4.4-r21.ebuild
index c15d21086684..367e04034327 100644
--- a/net-dialup/ppp/ppp-2.4.4-r20.ebuild
+++ b/net-dialup/ppp/ppp-2.4.4-r21.ebuild
@@ -1,19 +1,19 @@
 # Copyright 1999-2008 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-dialup/ppp/ppp-2.4.4-r20.ebuild,v 1.2 2008/08/15 20:47:40 mr_bones_ Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-dialup/ppp/ppp-2.4.4-r21.ebuild,v 1.1 2008/08/19 18:20:11 mrness Exp $
 
 inherit eutils 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-20080815.tar.gz
+	mirror://gentoo/${P}-gentoo-20080819.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 mppe-mppc pam radius wins-ack"
+IUSE="activefilter atm dhcp eap-tls gtk ipv6 mppe-mppc pam radius"
 
 DEPEND="activefilter? ( >=virtual/libpcap-0.9.4 )
 	atm? ( net-dialup/linux-atm )
@@ -55,6 +55,7 @@ src_unpack() {
 	epatch "${WORKDIR}/patch/gtk2.patch"
 	epatch "${WORKDIR}/patch/pppoe-lcp-timeout.patch"
 	epatch "${WORKDIR}/patch/passwordfd-read-early.patch"
+	epatch "${WORKDIR}/patch/pppd-usepeerwins.patch"
 
 	use eap-tls && {
 		# see http://eaptls.spe.net/index.html for more info
@@ -115,9 +116,6 @@ src_unpack() {
 			pppd/plugins/radius/{*.8,*.c,*.h} \
 			pppd/plugins/radius/etc/*
 	}
-
-	# Acknowledge WINS servers even though pppd will ignore them (#234583)
-	use wins-ack && epatch "${WORKDIR}/patch/wins-ack.patch"
 }
 
 src_compile() {