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

Package-Manager: portage-2.1.2.11

4 files changed, 53 insertions, 32 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/Manifest b/net-dialup/ppp/Manifest
index 4eb7db4e976a..063b8cc2d670 100644
--- a/net-dialup/ppp/Manifest
+++ b/net-dialup/ppp/Manifest
@@ -17,7 +17,7 @@ AUX modules.ppp 299 RMD160 ef5ee6fcf66dce67e5bd25220699c3df3ae6ee28 SHA1 d5d8646
 MD5 1945441c257a952a3de0d95683047ec6 files/modules.ppp 299
 RMD160 ef5ee6fcf66dce67e5bd25220699c3df3ae6ee28 files/modules.ppp 299
 SHA256 8947dd48d3d0c128166edc9bb0917b9af88502296fad791d6d90bf165ca50db3 files/modules.ppp 299
-DIST ppp-2.4.4-patches-20061124.tar.gz 43341 RMD160 8c429879a3f00a415663bbbe657198185d25b1c7 SHA1 d1507488c53877c5ebb152adc6d4211e034eb4c1 SHA256 96fb2e24ff5e7a2584f709d389ecd6ee87e1bec9d9cc2d14fb3d6265ba60bf91
+DIST ppp-2.4.4-gentoo-20070831.tar.gz 49576 RMD160 f3d1bd1c513c4fe6402f0b8b426bd15f9d5ed0b2 SHA1 994b5e845be91f9c5a537b6d1f10583aead9bc31 SHA256 e0d1e1527ff172477890356ab51ed0a9387c9912b1a94446968cc68267b534b9
 DIST ppp-2.4.4-patches-20070614.tar.gz 46290 RMD160 cbacfe1452917978173648237a376add23867476 SHA1 e568c725454528aa7d1ce1622b7f67149d283812 SHA256 822aafb47b823f3cba9e499474327b8ed02dba2c755f092f717f887acd130e16
 DIST ppp-2.4.4-patches-20070817.tar.gz 48064 RMD160 cd21268d0aa3d7e4747eb029c6186a633365f14a SHA1 833a8e7f68ccd2cb72c7e4e0a4216d164b57fbf2 SHA256 226465d4e6a675122de8bbe2179c34e343205165788753fbe051b84a01046ac6
 DIST ppp-2.4.4.tar.gz 688763 RMD160 ed289a4506c3af41a72f88103d5e0be44dec3da7 SHA1 9b91b0117e0a8bfaf8c4e894af79e0960dd36259 SHA256 58af45fc07e5f326eea2408df770ea40e4626d1a15e7d564dd054d74880e91ea
@@ -26,18 +26,18 @@ EBUILD ppp-2.4.4-r11.ebuild 10009 RMD160 8f243c059ca646e1a67543b4b091650dc473aeb
 MD5 dda1ef5ee7b92c295460e158f5cea331 ppp-2.4.4-r11.ebuild 10009
 RMD160 8f243c059ca646e1a67543b4b091650dc473aebf ppp-2.4.4-r11.ebuild 10009
 SHA256 9740b018aaeef4c9c912c89b98e122332efcbe998250d9ef7f98cc53f1782c1a ppp-2.4.4-r11.ebuild 10009
-EBUILD ppp-2.4.4-r4.ebuild 9612 RMD160 e27668b89fcaa582257a1c8d70c10ffe3c3627cb SHA1 341a71515ac11435c779a167f42a478e8cfcd594 SHA256 935824090ae1c3b553d8c5e717b841c5cece5d81f77b54da4277bdfdf45c64fc
-MD5 3259945ac5bf995e3b6527c37e012233 ppp-2.4.4-r4.ebuild 9612
-RMD160 e27668b89fcaa582257a1c8d70c10ffe3c3627cb ppp-2.4.4-r4.ebuild 9612
-SHA256 935824090ae1c3b553d8c5e717b841c5cece5d81f77b54da4277bdfdf45c64fc ppp-2.4.4-r4.ebuild 9612
+EBUILD ppp-2.4.4-r12.ebuild 10110 RMD160 5986f0a77c339b78e2f074a05a23bb7d0ef0f6ed SHA1 9a25280f642c1d9068e1e6e82684bd542083ccc4 SHA256 9a5151e3a19d0a0e8b7ee86f7e5f626e5554603ca85c7227455e2c511ed74943
+MD5 3b536769d03abfe7d3df3f883685e9d3 ppp-2.4.4-r12.ebuild 10110
+RMD160 5986f0a77c339b78e2f074a05a23bb7d0ef0f6ed ppp-2.4.4-r12.ebuild 10110
+SHA256 9a5151e3a19d0a0e8b7ee86f7e5f626e5554603ca85c7227455e2c511ed74943 ppp-2.4.4-r12.ebuild 10110
 EBUILD ppp-2.4.4-r9.ebuild 9909 RMD160 185b4e3532a46a44804a728f2e53f9053c58a7df SHA1 2f4914a82d45284825cc07f1fd1c01d9f7d5fdd0 SHA256 762b978eae43ef682f016fe692f7864d14b58dda5b64b57a91b109b33fa92b3a
 MD5 b139358fddad01cb614cf423533c2125 ppp-2.4.4-r9.ebuild 9909
 RMD160 185b4e3532a46a44804a728f2e53f9053c58a7df ppp-2.4.4-r9.ebuild 9909
 SHA256 762b978eae43ef682f016fe692f7864d14b58dda5b64b57a91b109b33fa92b3a ppp-2.4.4-r9.ebuild 9909
-MISC ChangeLog 32968 RMD160 f416b83b44f40c93434b8c2a9dd1f1ecd03bc529 SHA1 a31f7dbff4af760c68eb58ef336a425d337e4324 SHA256 a4459d0c2cbcc91d527f2ee40c5bbb5673b5abf627c10bb211fb63ffb90f0247
-MD5 55eb8ea498cdd00389b487f31a3799a6 ChangeLog 32968
-RMD160 f416b83b44f40c93434b8c2a9dd1f1ecd03bc529 ChangeLog 32968
-SHA256 a4459d0c2cbcc91d527f2ee40c5bbb5673b5abf627c10bb211fb63ffb90f0247 ChangeLog 32968
+MISC ChangeLog 33191 RMD160 c808574f2b09b7b26537e3fa9b836247a01693d3 SHA1 514d894601d0e3f4f13b85352c54062ad56a3225 SHA256 cea6f00c19c6aa4881b001bf3ab665a4664a5b12e57f19c4742316e7646e0fb2
+MD5 35b3935391610e783580279b17de46c4 ChangeLog 33191
+RMD160 c808574f2b09b7b26537e3fa9b836247a01693d3 ChangeLog 33191
+SHA256 cea6f00c19c6aa4881b001bf3ab665a4664a5b12e57f19c4742316e7646e0fb2 ChangeLog 33191
 MISC metadata.xml 384 RMD160 98dac63bd0265c815e677f10fd2418231c01b19e SHA1 00f7ddc284f2338465ba8a1d1bc31da70dc6d7bc SHA256 a9f217d596c53c39f17c5e0675b4a9a484a1530b75c460ca7bf4896e6e732683
 MD5 8c831d16c63dd88ff9cb350ab8104831 metadata.xml 384
 RMD160 98dac63bd0265c815e677f10fd2418231c01b19e metadata.xml 384
@@ -45,16 +45,16 @@ SHA256 a9f217d596c53c39f17c5e0675b4a9a484a1530b75c460ca7bf4896e6e732683 metadata
 MD5 89e79a1b6e611b088869ec27514c991d files/digest-ppp-2.4.4-r11 723
 RMD160 c686ca12121c341e18ad2becfed60528bed3db8f files/digest-ppp-2.4.4-r11 723
 SHA256 66bd8756fa7ce7fda4f0d56e13a7875e28a20faaf771b3c1fa7ae201bea27bbb files/digest-ppp-2.4.4-r11 723
-MD5 66137b05bcd2dc9a318a500940b3bffb files/digest-ppp-2.4.4-r4 723
-RMD160 225b55c039c0f53bd8d721e2cc918ce20c68fb3e files/digest-ppp-2.4.4-r4 723
-SHA256 ef5eb7b6adc34f5f45194665a4315e7450ac48cbadb96f9712d5b104929b087c files/digest-ppp-2.4.4-r4 723
+MD5 8938b7a10cb7fe765e165b15b612787f files/digest-ppp-2.4.4-r12 720
+RMD160 152166ad02a0173a30a9884ad0c06e7e7db376aa files/digest-ppp-2.4.4-r12 720
+SHA256 154390fb8cf161904408a5ddc1111c829c4bd3f0635cc2e81b061f9046480a75 files/digest-ppp-2.4.4-r12 720
 MD5 20ebf5637d873e1b59e40d424214fa87 files/digest-ppp-2.4.4-r9 723
 RMD160 14a74e61a00598c2ed8ff2ab7e80023f0c4cd6ce files/digest-ppp-2.4.4-r9 723
 SHA256 2ee9d97adf7c68b02e37b124f0a41ae7bee5bd3d142e972d7667a1e9cabd8ed5 files/digest-ppp-2.4.4-r9 723
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.5 (GNU/Linux)
 
-iD8DBQFG0D2bp/wUKkr7RBoRAsQ7AKCS5ys1LUbyBlYKJL3542GM2/luiwCeJtyK
-Q8r/p578vcO8MengFkYdfCA=
-=Vtik
+iD8DBQFG19USVSA5X31g7/gRAojPAKCVVoAcp0Gn0DhDk0whGlRhdQgPKQCePzx3
+g6Gd7AeV0JdwysI3gLYVvHU=
+=qhO0
 -----END PGP SIGNATURE-----
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