Re-add script directory to ppp-2.4.4-gentoo tarball and make sure it never happens again (#229757).

Fix passwordfd-read-early patch (#229773).
Package-Manager: portage-2.1.4.4

3 files changed, 21 insertions, 24 deletions

diff --git a/net-dialup/ppp/ChangeLog b/net-dialup/ppp/ChangeLog
index 50c5f9534c9b..2984f5080c7a 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.217 2008/06/25 21:12:36 mrness Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-dialup/ppp/ChangeLog,v 1.218 2008/06/27 19:24:03 mrness Exp $
+
+*ppp-2.4.4-r17 (27 Jun 2008)
+
+  27 Jun 2008; Alin Năstac <mrness@gentoo.org> -ppp-2.4.4-r16.ebuild,
+  +ppp-2.4.4-r17.ebuild:
+  Re-add script directory to ppp-2.4.4-gentoo tarball and make sure it never
+  happens again (#229757). Fix passwordfd-read-early patch (#229773).
 
 *ppp-2.4.4-r16 (25 Jun 2008)
 
diff --git a/net-dialup/ppp/Manifest b/net-dialup/ppp/Manifest
index 9161985abb5a..113dbc408abd 100644
--- a/net-dialup/ppp/Manifest
+++ b/net-dialup/ppp/Manifest
@@ -1,22 +1,12 @@
------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-20080625.tar.gz 49080 RMD160 390e6af057c277ebc46d658b9a9ebe62925c2d3f SHA1 d978257eec5c4b8d9198ce062d9db0f7b72318c3 SHA256 23e1b20a201b262d3da71e640cb2883e88014a459638760afbd521587bf013c6
+DIST ppp-2.4.4-gentoo-20080627.tar.gz 50335 RMD160 e4bc81686336e08a51420f6cc73fdec36e22539d SHA1 8cfd8cd2eba516f0e971862fa1888eb2bf4382c4 SHA256 f5c40b643d130c1b95917ec9ecf2f45376d610452ce861b1b4dc5a2c8022a255
 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 10636 RMD160 15321c05aacbf6fee06644e23d95eb0d31b61b83 SHA1 1c5fc456a4dcae1dcc097877ec13fbf8646ea583 SHA256 ddacadeb849b1c1095797eeb758b9f1072f1e7ebd5a2a5c9158909977f7eab00
-EBUILD ppp-2.4.4-r16.ebuild 10695 RMD160 68aee0ca76d493ddc4f85e2690a91ae47c5b383b SHA1 f6ba62d52826d1a25f75f189d4ac9acd092cb788 SHA256 c1cb432be0da868dbdecb5a7f4de1af78415b47df23dd9c028df20ba34ff20d6
-MISC ChangeLog 36041 RMD160 ae0faa1789b53fe775126f8027ea8cdc0549af37 SHA1 c8097f0a8c9eaa6210e4781028d2de15479333dc SHA256 f6c969d15d26dbfa139b1b93f2f4e7846ceaaf902f2cdb08b2fe8f755cdc1a47
+EBUILD ppp-2.4.4-r17.ebuild 10944 RMD160 759ca530a57d8ed3c83a430219d953adc1f6a7cd SHA1 9688a97836791b426b4d6fa7892b8db800a5e2ab SHA256 a6dc5595a939b3e366c412a0f94894e3bc165fce1a447ab32149fc2e85b90542
+MISC ChangeLog 36315 RMD160 38c099734457ad0e6a4923f90ef685d0b30b26b1 SHA1 f6406b8b309906104054ffdb98d5eb8811f9d362 SHA256 2722cddf183c37cb0160922043a4762c65d031576051630b9b6dce1613747714
 MISC metadata.xml 384 RMD160 98dac63bd0265c815e677f10fd2418231c01b19e SHA1 00f7ddc284f2338465ba8a1d1bc31da70dc6d7bc SHA256 a9f217d596c53c39f17c5e0675b4a9a484a1530b75c460ca7bf4896e6e732683
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.9 (GNU/Linux)
-
-iEYEARECAAYFAkhitM8ACgkQ+fWpoTWIA9EZtwCdEHP/kySemRjMMhke/Dxg5CMn
-xN0An1SXeCfAb6oxgwJDz9YjgUvZ6uYm
-=zIcH
------END PGP SIGNATURE-----
diff --git a/net-dialup/ppp/ppp-2.4.4-r16.ebuild b/net-dialup/ppp/ppp-2.4.4-r17.ebuild
index d77057347ce9..1dfeb7caf90f 100644
--- a/net-dialup/ppp/ppp-2.4.4-r16.ebuild
+++ b/net-dialup/ppp/ppp-2.4.4-r17.ebuild
@@ -1,13 +1,13 @@
 # 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-r16.ebuild,v 1.1 2008/06/25 21:12:36 mrness Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-dialup/ppp/ppp-2.4.4-r17.ebuild,v 1.1 2008/06/27 19:24:03 mrness Exp $
 
 inherit eutils flag-o-matic 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/~mrness/distfiles/${P}-gentoo-20080625.tar.gz
+	http://dev.gentoo.org/~mrness/distfiles/${P}-gentoo-20080627.tar.gz
 	dhcp? ( http://www.netservers.co.uk/gpl/ppp-dhcpc.tgz )"
 
 LICENSE="BSD GPL-2"
@@ -172,10 +172,10 @@ src_install() {
 
 	exeinto /etc/ppp
 	for i in ip-up ip-down ; do
-		doexe "${WORKDIR}/scripts/${i}"
+		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"/*
+		doins "${WORKDIR}/scripts/${i}.d"/* || die "failed to install ${i}.d scripts"
 	done
 
 	pamd_mimic_system ppp auth account session
@@ -219,16 +219,16 @@ src_install() {
 	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
+	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/*
+	doins scripts/chatchat/* || die "failed to install chat scripts in doc dir"
 	insinto /usr/share/doc/${PF}/scripts
-	doins scripts/*
+	doins scripts/* || die "failed to install scripts in doc dir"
 
 	if use gtk; then
 		dosbin contrib/pppgetpass/{pppgetpass.vt,pppgetpass.gtk}