Make patch apply. Fixes bug#430830. Patch by Andrey Volkov.

Package-Manager: portage-2.2.0_alpha121/cvs/Linux x86_64

3 files changed, 30 insertions, 27 deletions

diff --git a/net-dialup/ppp/ChangeLog b/net-dialup/ppp/ChangeLog
index 55321491144a..da7719f55e90 100644
--- a/net-dialup/ppp/ChangeLog
+++ b/net-dialup/ppp/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for net-dialup/ppp
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-dialup/ppp/ChangeLog,v 1.279 2012/08/10 04:12:54 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-dialup/ppp/ChangeLog,v 1.280 2012/08/18 14:10:16 scarabeus Exp $
+
+  18 Aug 2012; Tomáš Chvátal <scarabeus@gentoo.org> ppp-2.4.5-r3.ebuild:
+  Make patch apply. Fixes bug#430830. Patch by Andrey Volkov.
 
 *ppp-2.4.5-r3 (10 Aug 2012)
 
diff --git a/net-dialup/ppp/Manifest b/net-dialup/ppp/Manifest
index 6b84f3902903..a63961a04d8d 100644
--- a/net-dialup/ppp/Manifest
+++ b/net-dialup/ppp/Manifest
@@ -9,27 +9,27 @@ DIST ppp-2.4.5-gentoo-20101127.tar.gz 41562 SHA256 d49f51dd10dfc97f25bb5dbc4acc6
 DIST ppp-2.4.5-gentoo-20111111.tar.gz 41883 SHA256 950e06cb9e9c844e88cb99c3fc1dbb7515814d75f7f6e87a81fbb245e48ba4ed SHA512 ff9ac176e532ece8f0b13adf75c6999bd81a6f8a75a9edb490219c160cc7a2f055ace7a6ff73bc84965fafa2eb8a689a7106a349923be8c73464e2c00ab16ab6 WHIRLPOOL fb2d7a408ceebae22c83246d441fa5955ed013e9eeadb6247f06fe41512eb47860578768b3fe2f9a0683844e7c40e271e4b22b9f401a87dec376c17fcc9825e9
 DIST ppp-2.4.5-patches-1.tar.xz 37188 SHA256 c654757af62bb49af15d3dd4c3686074e8817752e4756e993e023a56556e055c SHA512 ba4803698510cdcec17c627365e1ac1329b167d58b83fb7140222425ee507fc2aab1443cfaa1ecfe4eb2a68dca2a25562966ad2be7262ac1b5fe626f379ca071 WHIRLPOOL e6cc28d46a1f005b91314d7ac5ec321f34e34da246868c69334a18113788964358e3ca1d074dc1a6c5e1f72b8bee9f8607572e63672b03b4d95a19e15e583c45
 DIST ppp-2.4.5.tar.gz 684342 SHA256 43317afec9299f9920b96f840414c977f0385410202d48e56d2fdb8230003505 SHA512 3688720a0f9ee47802e72dc6aa3d47c7312c195007f37a6ceb087fdb6f1f77ad75e922a568cffed6d1a857f06d79460d6d38b56e179310e493a0380a0c5a4f6e WHIRLPOOL 210dbcfc754256e5317cffa0b6f51e7ae9e45d88815e4952e893ab85d024daef8131747624e355b97225f0b365e677fa4bd82ee2a7890810bc25c5521324b83f
-DIST ppp-dhcpc.tgz 33497 SHA256 977fd980bb1d285963d8e27a87b7601ea84317faadfdb40989b258d1853db644
+DIST ppp-dhcpc.tgz 33497 SHA256 977fd980bb1d285963d8e27a87b7601ea84317faadfdb40989b258d1853db644 SHA512 aeaf791b14f5a09c0e2079072a157e65132cbff46e608bc0724e6a5827a01da934f5006e2774eb7105f83e607a52cb4987238f4385cf6f5cc86cbe305a556738 WHIRLPOOL 74e5e0d7f9bc52d1b9cfeff83fe74c2b38cc10c60636cd9c0f5d67d61dc7da56dbf2bcc84afa29444546792876cb36afbc853a6515ce9b3d83d6de98eacedd1e
 EBUILD ppp-2.4.4-r25.ebuild 10959 SHA256 1d06adc4cf4ac0b6d857e03186c8d3ec45e77965a8f382f295e1cfbaca245373 SHA512 884f0fef8fca451b18746ad04639788a3fb6bcae4211f36ffa695b9ce7eb9d590a7d394bc390c406f81eddbc2a8f55fdff1376ba14495ee9906e3c1f9ab2ee37 WHIRLPOOL 7f9f60e0cf5743e8d3759268253338009f3069b283eeefeca95ad50b5b11458824ae07c5afe69983bd398b157bab0dcc67fdd9c080d617dd9b8959f04cf6ea27
 EBUILD ppp-2.4.5-r1.ebuild 10047 SHA256 a2591d0d4a9fff20c460983e388d3095cb284778cdae8e6a7b7d8140f40e0016 SHA512 3a9546138f54f33827a95d5cf13beb92319d419a25d496cff55b7f89ea4cb5cc3dc89880cec0b4ffd4ca8c0bffc102b51551d32c0219a7d06c9c8f1ea3cc00c1 WHIRLPOOL a11b3a285f513b0a30017a1c45768db2b4bdfbdb4585033db8a4b261e14ff2c52227cfa8f2687343395e7856d57e960ad1dd3051765c938b0d9bcd1c9e8c210e
 EBUILD ppp-2.4.5-r2.ebuild 10108 SHA256 88800148e714e3e614078e0a5c8b601f9ed6ca43832bd7ce60020067eb4f3ab5 SHA512 dbbab510d62d11e1a4f5eff267dee2b825e4dd99a7ed72c1729dd0bdb82ebcb338eb2a5a95f9591760309a27ab420881ba9260dd70c603654fbde20f8111d746 WHIRLPOOL 8215e78fb67e504002cc2811ac5847550a2f00e0e57c9ef4d1ed050ec1262c0685393c24c0c0e737b7173d228b205f2ca8c55dfbe82e6eaefec7c1edc6323d2e
-EBUILD ppp-2.4.5-r3.ebuild 7156 SHA256 c90abe915e297b12f7a26fcd6e270a17de509bb03c3d986894c37f1706501f1e SHA512 94df64e5634e169ec53ce04222d6eea8237cc94d151881d040e10c3da874a2ec42a66a732c63ba24ca3e6219e031e64492de99adc782ec4c092770b44bf438e5 WHIRLPOOL 98ef832d3e1bb327ef100df599b8a03999a723bcae1a42009a52434cf831b104cf513b04ddefea90c7c7bf958958463818f7829ef1af5155a595b410c5639aac
-MISC ChangeLog 44668 SHA256 36f31dfb5cdae9b90bad07ef099db0f01646c804323d67a834054c42c6aabe9b SHA512 91d8fd61d7a643318e5e7b9db6aa479e453f8f85e6d2bfabdf62a07dac106d326c1055667f719cc974e24c737fd426ba910a1e464dd09fd766e76ab1b0746a10 WHIRLPOOL dff2f6c13d95fffc74f61926e56e29c00b399b5d625312e41c57c754a4910e5747c10896f93ba1eb6a1a0332cbeabfc0c56a8c8029318871db331e4834dba169
+EBUILD ppp-2.4.5-r3.ebuild 7159 SHA256 5f6020b7b1747268b0acd9f3074928e16d7193e01bc76585c5caf2a51bf852c3 SHA512 12483695126b3c95b42a75478c8daa0ee281c8b39cc4e501caa21b64224152f028285a300de7db27e7793b1938ff592b66d2298101f898e094890f49af531a9c WHIRLPOOL 66579b50e7467f7077f70c156f4e4555e2815a1e585076b16a8caa6fa4da6be00a73c70115e86380799eff0cd468753dcfe3a7139ba71890d916da5c2b2c9dbe
+MISC ChangeLog 44810 SHA256 21fc20970d48013e8e93985a49bb6d2f02cc6753eca39f5260d15c4ff2527cb6 SHA512 b23cbda73783fcfbc0d445dcb0352fb30b082b5a65630edcd54feb90ba790775af2c0c22997ed7d1d800693b349938d28200ebb01717c0af29666a2886e1cb9b WHIRLPOOL e00b9f6e8e3f541b33cfe07679c9e7d6543a403e247141ac51c664cd5ab75375fb2b20c937e29fa7df28471724f63ca2b007a4dad7e8f2a08dc65d972afea88c
 MISC metadata.xml 1355 SHA256 13d1a96a0ab4ad880369f5a7ea0b480de8af8a58545864e63199b1146cc5dd82 SHA512 c04ba18a61308349854637fe6625238c7759b3f7600e3bd7867562fea29903b0364bff815dceb71c5daef09d5e897e810a7389289826f1079f820ea0bb8c94a6 WHIRLPOOL 56811f2d00adccb6fb105fec27e06cf1b51f2da56269cd60483e6b5ebae007b12a40fbc5db5029b0900477fdc144247f3e0dd12456ef7d7edc7627cbebfad4fb
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.19 (GNU/Linux)
 
-iQIcBAEBCAAGBQJQJIpNAAoJELEHsLL7fEFWL8AQAInonSfnLL5BPYQDz7nIVAvm
-cwLUds2W3/aKNUi7PMbxCBRDoif6lAdb11C1LRTlDdQS9EFp0oZovq9SucMWxSfj
-zOpebUogUKNjIQ62xWtFGpKSJOhKmyN8qSdcaYSuVZWklj/VTLIVT1DkSxR6eAfu
-3N3mWt7SwGc6Pe4MGzLb/+Cnro9Htnh7c2ZQLsi7NncWp5DA2Xv6peZc9JLIczMx
-DHkGJxipe/woeNtgKjJF3nuPZl2OX/Y/jOSXAIABS29ozfqcEscvZc3mzrAPw1Yr
-Hoi7m7DteY5HKYnWdvMj92d20kQjUlqD2PEsyavujSRIx9bvCPt/KivLMr2jk2tB
-VXnyywcMHpy4REeSH7LgmmZt1BiFOC6UtgcqOsD+gIt/05LbfV3oxlflzlj0P8QW
-jPtmzi0kjh4qYvTgxG7Mw8itqNqWFrwC/aA7SlEZHZ+SbNwr9quDJ1CRnPOMDrjM
-QCmTrZqm47p4jCRgVJAGCagBcQ/y2YOuNLG45dGjsaNJmsPL0tqhYjYKDLOV5tTr
-/sSDI/7fCzjWWdNF0n20kN01I+Sw0VUeXksVv8bS7+iR/S8rf1hWgg4dVJMcHlYE
-Zxigt59HeP78ZZ0CmWJDPGkJQxIKOyNOiNuWXnuTCZLYWFXiOhuaBn9ibxv5w3fm
-RCeDFv1961fu0snsOXaB
-=Qu0U
+iQIcBAEBCAAGBQJQL6JOAAoJEOSiRoyO7jvoNbAP/0OcQqZV1B848Bz4eM8wwmGo
+wXNaVN1hcOHk12ai9gr7sQTYqsIbwX5Ly0ZMmyYdI7wF6Mnud9ec6IWu6PkGqlYR
+1I9q4pL8ziE1DIPyLO9OAgxgPK8TQSQfQgK5wPXYFvUxqjv/E+MXmlneQqGHJY8V
+zeqCeO3P5jc+lqWDYgDH+v8l4ljaqJ2HimCvybuEK1uFgpDt3MZdSIbdqGwoJ5WA
+xC7BtsyAc8iBxooJhZbo8NXYw+Y9NVOw6Q4KiLBrtKnn6MPTIbc5n/gqjt4Y0RPC
+M/0FV+TDfF5lF24Sbk4GCMFToPQGjW+135vgwChka3QWnrTdVyOAoNmBhD928MfR
+Laqj6Tfrzk3djKJ6yDsgdWuq/8msxlfzV9Ga3kvTUIxxx9qGbB7Mwkl7e+/uRjI+
+W27stp6/c0MP3kNTtzuB5EO+QL1wgDbebm5jPUK0Tp69HL8bc5G+jO2y3qS1QFBw
+jvFyKXbG6BqofEEfdCg2US6gvAktULThlurzcTKqYDFF0JGKbTkxosNGA8WIOx1L
+DBHfoz732HEzs4bAt2QWqtsbDlVa2seJbl+uvO/M2bD03FgCYZF70vZ8+5V6m78o
+BxuFJLzJ+xUckG61jRljb5frcKnDvxcaqkZZu+XrKy1jQJ9RimME98MMhxRQ7tK5
+hWLpCFrSWJCP7fNRYky9
+=kYn+
 -----END PGP SIGNATURE-----
diff --git a/net-dialup/ppp/ppp-2.4.5-r3.ebuild b/net-dialup/ppp/ppp-2.4.5-r3.ebuild
index 2b85d46a43a4..08c24dcb0ae1 100644
--- a/net-dialup/ppp/ppp-2.4.5-r3.ebuild
+++ b/net-dialup/ppp/ppp-2.4.5-r3.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-dialup/ppp/ppp-2.4.5-r3.ebuild,v 1.1 2012/08/10 04:12:54 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-dialup/ppp/ppp-2.4.5-r3.ebuild,v 1.2 2012/08/18 14:10:16 scarabeus Exp $
 
 EAPI="4"
 
@@ -29,6 +29,15 @@ src_prepare() {
 	# Use the headers from the kernel #427684
 	rm include/linux/if_pppol2tp.h || die
 
+	if use dhcp ; then
+		# copy the ppp-dhcp plugin files
+		einfo "Adding ppp-dhcp plugin files"
+		mv "${WORKDIR}/dhcp" "${S}/pppd/plugins" || die
+		sed -i \
+			-e 's/\(SUBDIRS := .*rp-pppoe.*\)$/\1 dhcp/' \
+			pppd/plugins/Makefile.linux || die
+	fi
+
 	use eap-tls || EPATCH_EXCLUDE+=" 8?_all_eaptls-*"
 	use dhcp || EPATCH_EXCLUDE+=" 8?_all_dhcp-*"
 	EPATCH_SUFFIX="patch" epatch "${WORKDIR}"/patch
@@ -56,15 +65,6 @@ src_prepare() {
 	einfo "Enabling CBCP"
 	sed -i "s/^#CBCP=y/CBCP=y/" pppd/Makefile.linux
 
-	if use dhcp ; then
-		# copy the ppp-dhcp plugin files
-		einfo "Adding ppp-dhcp plugin files"
-		mv "${WORKDIR}/dhcp" "${S}/pppd/plugins" || die
-		sed -i \
-			-e 's/\(SUBDIRS := .*rp-pppoe.*\)$/\1 dhcp/' \
-			pppd/plugins/Makefile.linux || die
-	fi
-
 	# Set correct libdir
 	sed -i -e "s:/lib/pppd:/$(get_libdir)/pppd:" \
 		pppd/{pathnames.h,pppd.8}