Use gtk+-2 library (#189350). Add support for /etc/ppp/ip-{up,down}.d directories (#190143).

(Portage version: 2.1.2.11)

3 files changed, 38 insertions, 17 deletions

diff --git a/net-dialup/ppp/ChangeLog b/net-dialup/ppp/ChangeLog
index 1dfe91513fca..88a4e1e3da4c 100644
--- a/net-dialup/ppp/ChangeLog
+++ b/net-dialup/ppp/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for net-dialup/ppp
 # Copyright 2002-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-dialup/ppp/ChangeLog,v 1.194 2007/08/17 08:03:14 mrness Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-dialup/ppp/ChangeLog,v 1.195 2007/08/31 08:44:55 mrness Exp $
+
+*ppp-2.4.4-r12 (31 Aug 2007)
+
+  31 Aug 2007; Alin Năstac <mrness@gentoo.org> -ppp-2.4.4-r4.ebuild,
+  +ppp-2.4.4-r12.ebuild:
+  Use gtk+-2 library (#189350). Add support for /etc/ppp/ip-{up,down}.d
+  directories (#190143).
 
 *ppp-2.4.4-r11 (17 Aug 2007)
 
diff --git a/net-dialup/ppp/files/digest-ppp-2.4.4-r4 b/net-dialup/ppp/files/digest-ppp-2.4.4-r12
index ddc27d97febd..3d559c48d422 100644
--- a/net-dialup/ppp/files/digest-ppp-2.4.4-r4
+++ b/net-dialup/ppp/files/digest-ppp-2.4.4-r12
@@ -1,6 +1,6 @@
-MD5 045f3c2a7228c415c005fb6dd66a6253 ppp-2.4.4-patches-20061124.tar.gz 43341
-RMD160 8c429879a3f00a415663bbbe657198185d25b1c7 ppp-2.4.4-patches-20061124.tar.gz 43341
-SHA256 96fb2e24ff5e7a2584f709d389ecd6ee87e1bec9d9cc2d14fb3d6265ba60bf91 ppp-2.4.4-patches-20061124.tar.gz 43341
+MD5 a45ea166827e4f95fcb4dc9a1f021946 ppp-2.4.4-gentoo-20070831.tar.gz 49576
+RMD160 f3d1bd1c513c4fe6402f0b8b426bd15f9d5ed0b2 ppp-2.4.4-gentoo-20070831.tar.gz 49576
+SHA256 e0d1e1527ff172477890356ab51ed0a9387c9912b1a94446968cc68267b534b9 ppp-2.4.4-gentoo-20070831.tar.gz 49576
 MD5 183800762e266132218b204dfb428d29 ppp-2.4.4.tar.gz 688763
 RMD160 ed289a4506c3af41a72f88103d5e0be44dec3da7 ppp-2.4.4.tar.gz 688763
 SHA256 58af45fc07e5f326eea2408df770ea40e4626d1a15e7d564dd054d74880e91ea ppp-2.4.4.tar.gz 688763
diff --git a/net-dialup/ppp/ppp-2.4.4-r4.ebuild b/net-dialup/ppp/ppp-2.4.4-r12.ebuild
index 4e729a3c10f8..e94f305da09d 100644
--- a/net-dialup/ppp/ppp-2.4.4-r4.ebuild
+++ b/net-dialup/ppp/ppp-2.4.4-r12.ebuild
@@ -1,24 +1,24 @@
 # Copyright 1999-2007 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-r4.ebuild,v 1.17 2007/08/25 14:31:37 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-dialup/ppp/ppp-2.4.4-r12.ebuild,v 1.1 2007/08/31 08:44:55 mrness Exp $
 
 inherit eutils flag-o-matic toolchain-funcs linux-info
 
 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}-patches-20061124.tar.gz
+	mirror://gentoo/${P}-gentoo-20070831.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"
+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? ( sys-libs/pam )
-	gtk? ( =x11-libs/gtk+-1* )
+	gtk? ( >=x11-libs/gtk+-2.8 )
 	eap-tls? ( net-misc/curl >=dev-libs/openssl-0.9.7 )"
 
 pkg_setup() {
@@ -46,6 +46,13 @@ src_unpack() {
 	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"
 
 	use eap-tls && {
 		# see http://eaptls.spe.net/index.html for more info
@@ -133,13 +140,18 @@ pkg_preinst() {
 }
 
 src_install() {
-	local y
-	for y in chat pppd pppdump pppstats
+	local i
+	for i in chat pppd pppdump pppstats
 	do
-		doman ${y}/${y}.8
-		dosbin ${y}/${y}
+		doman ${i}/${i}.8
+		dosbin ${i}/${i}
 	done
-	chmod u+s-w "${D}/usr/sbin/pppd"
+	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
 
@@ -152,13 +164,15 @@ src_install() {
 	insopts -m0644
 	doins etc.ppp/options
 
-	insopts -m0755
-	doins "${FILESDIR}/ip-up"
-	doins "${FILESDIR}/ip-down"
+	exeinto /etc/ppp
+	for i in ip-up ip-down ; do
+		doexe "${WORKDIR}/scripts/${i}"
+		insinto /etc/ppp/${i}.d
+		doins "${WORKDIR}/scripts/${i}.d"/*
+	done
 
 	if use pam; then
 		insinto /etc/pam.d
-		insopts -m0644
 		newins pppd/ppp.pam ppp || die "not found ppp.pam"
 	fi