Add wins-ack USE flag and patch (#234583).

Add USE flag description to metadata.
(Portage version: 2.1.4.4)

3 files changed, 47 insertions, 27 deletions

diff --git a/net-dialup/ppp/ChangeLog b/net-dialup/ppp/ChangeLog
index 8e7b966e4316..39e3d310be6b 100644
--- a/net-dialup/ppp/ChangeLog
+++ b/net-dialup/ppp/ChangeLog
@@ -1,6 +1,13 @@
 # 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.224 2008/08/01 20:58:23 mrness Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-dialup/ppp/ChangeLog,v 1.225 2008/08/15 08:55:22 mrness Exp $
+
+*ppp-2.4.4-r20 (15 Aug 2008)
+
+  15 Aug 2008; Alin Năstac <mrness@gentoo.org> metadata.xml,
+  -ppp-2.4.4-r17.ebuild, +ppp-2.4.4-r20.ebuild:
+  Add wins-ack USE flag and patch (#234583). Add USE flag description to
+  metadata.
 
 *ppp-2.4.4-r19 (01 Aug 2008)
 
diff --git a/net-dialup/ppp/metadata.xml b/net-dialup/ppp/metadata.xml
index 750bba6b4c28..b93eb10ec959 100644
--- a/net-dialup/ppp/metadata.xml
+++ b/net-dialup/ppp/metadata.xml
@@ -1,11 +1,33 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?xml version = '1.0' encoding = 'UTF-8'?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>net-dialup</herd>
-<maintainer>
-  <email>mrness@gentoo.org</email>
-  <name>Alin Nastac</name>
-</maintainer>
-<longdescription>ppp (Paul's PPP Package) is an open source package 
-which implements the Point-to-Point Protocol</longdescription>
+  <herd>net-dialup</herd>
+  <maintainer>
+    <email>mrness@gentoo.org</email>
+    <name>Alin Nastac</name>
+  </maintainer>
+  <longdescription>ppp (Paul's PPP Package) is an open source package which
+  implements the Point-to-Point Protocol</longdescription>
+  <use>
+    <flag name="activefilter">Enables active filter support</flag>
+    <flag name="atm">Enables ATM (Asynchronous Transfer Mode) protocol
+    support</flag>
+    <flag name="dhcp">Installs PPP DHCP client plugin for IP address allocation
+    by a DHCP server (see http://www.netservers.co.uk/gpl/)</flag>
+    <flag name="eap-tls">Enables support for Extensible Authentication
+    Protocol and Transport Level Security (see
+    http://eaptls.spe.net/index.html)</flag>
+    <flag name="gtk">Installs GTK+ password prompting program that can be used
+    by passprompt.so PPP plugin for reading the password from a X11 input
+    terminal</flag>
+    <flag name="ipv6">Enables support for IP version 6</flag>
+    <flag name="mppe-mppc">Enables support for MPPC (Microsoft Point-to-Point
+    Compression) - NEEDS A PATCHED KERNEL &lt;=2.6.14 (see
+    http://mppe-mppc.alphacron.de)</flag>
+    <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-r17.ebuild b/net-dialup/ppp/ppp-2.4.4-r20.ebuild
index 2e1592b33c5b..2ccbf2c27702 100644
--- a/net-dialup/ppp/ppp-2.4.4-r17.ebuild
+++ b/net-dialup/ppp/ppp-2.4.4-r20.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-r17.ebuild,v 1.2 2008/07/15 16:19:27 mrness Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-dialup/ppp/ppp-2.4.4-r20.ebuild,v 1.1 2008/08/15 08:55:22 mrness Exp $
 
-inherit eutils flag-o-matic toolchain-funcs linux-info pam
+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-20080627.tar.gz
+	mirror://gentoo/${P}-gentoo-20080815.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"
+IUSE="activefilter atm dhcp eap-tls gtk ipv6 mppe-mppc pam radius wins-ack"
 
 DEPEND="activefilter? ( >=virtual/libpcap-0.9.4 )
 	atm? ( net-dialup/linux-atm )
@@ -115,12 +115,14 @@ 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() {
 	export CC="$(tc-getCC)"
 	export AR="$(tc-getAR)"
-	append-ldflags -Wl,--allow-shlib-undefined # otherwise linking plugins might fail with undef errors (#210837)
 	econf || die "configuration failed"
 	emake COPTS="${CFLAGS} -D_GNU_SOURCE" || die "compile failed"
 
@@ -133,18 +135,6 @@ src_compile() {
 	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
@@ -300,11 +290,12 @@ pkg_postinst() {
 	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 && \
-				einfo "/etc/ppp/${i}.local has been moved to /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
 }