Remove local copies of linux-headers and rely on the system one being up-to-date #427684 by SpanKY.

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

3 files changed, 36 insertions, 20 deletions

diff --git a/net-dialup/ppp/ChangeLog b/net-dialup/ppp/ChangeLog
index 1be7977ae559..f6e4035a0a37 100644
--- a/net-dialup/ppp/ChangeLog
+++ b/net-dialup/ppp/ChangeLog
@@ -1,6 +1,10 @@
 # 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.277 2012/06/14 01:48:45 zmedico Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-dialup/ppp/ChangeLog,v 1.278 2012/08/07 15:05:23 vapier Exp $
+
+  07 Aug 2012; Mike Frysinger <vapier@gentoo.org> ppp-2.4.5-r2.ebuild:
+  Remove local copies of linux-headers and rely on the system one being up-to-
+  date #427684 by SpanKY.
 
   14 Jun 2012; Zac Medico <zmedico@gentoo.org> ppp-2.4.4-r25.ebuild,
   ppp-2.4.5-r1.ebuild, ppp-2.4.5-r2.ebuild:
diff --git a/net-dialup/ppp/Manifest b/net-dialup/ppp/Manifest
index 240267befbe8..7b474a760f36 100644
--- a/net-dialup/ppp/Manifest
+++ b/net-dialup/ppp/Manifest
@@ -1,23 +1,33 @@
 -----BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
+Hash: SHA256
 
-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-20091116.tar.gz 54932 RMD160 5f37dbae97a4e55ae25ed54d8ae521cb51064c50 SHA1 b35cbec42b3a0794281921e7879eab322f27da70 SHA256 52f174b3df36110d14c522869c507f64aef4d2d01db2dec2936cc9917c9fa716
-DIST ppp-2.4.4.tar.gz 688763 RMD160 ed289a4506c3af41a72f88103d5e0be44dec3da7 SHA1 9b91b0117e0a8bfaf8c4e894af79e0960dd36259 SHA256 58af45fc07e5f326eea2408df770ea40e4626d1a15e7d564dd054d74880e91ea
-DIST ppp-2.4.5-gentoo-20101127.tar.gz 41562 RMD160 b9aa87b7f185eda2d022580ccbb9b23d2c2a4f42 SHA1 b63aa5c0c91458fe82a2be2cca2fbe264db2b301 SHA256 d49f51dd10dfc97f25bb5dbc4acc61c708d890da231295467ac3710751d2bcdd
-DIST ppp-2.4.5-gentoo-20111111.tar.gz 41883 RMD160 e94c89a8404182ae0b2b9757c23ae69db012918d SHA1 98748395fbbd85509ba0059745ae708e57cc9f91 SHA256 950e06cb9e9c844e88cb99c3fc1dbb7515814d75f7f6e87a81fbb245e48ba4ed
-DIST ppp-2.4.5.tar.gz 684342 RMD160 231682ab2314d182c893c64523fd89f571a258de SHA1 cb977b31584e3488e08a643aaa672fdb229d2e78 SHA256 43317afec9299f9920b96f840414c977f0385410202d48e56d2fdb8230003505
-DIST ppp-dhcpc.tgz 33497 RMD160 63bf0d1cc52e91ea536fc593fb7a40502baecd90 SHA1 1a0b02788d522f2137d0b66c749ffe6c96cceb94 SHA256 977fd980bb1d285963d8e27a87b7601ea84317faadfdb40989b258d1853db644
-EBUILD ppp-2.4.4-r25.ebuild 10959 RMD160 0a997eb3caee109dedcd842659a79a5096bd0d7e SHA1 d571a9e7884f5cbea3f7e0db0f9a20fe1f07c05b SHA256 1d06adc4cf4ac0b6d857e03186c8d3ec45e77965a8f382f295e1cfbaca245373
-EBUILD ppp-2.4.5-r1.ebuild 10047 RMD160 5c0997b23ea3048b17ab867d90be0b7526a508e8 SHA1 4137e8ffd8eddba11b111bcd53144cfe4d495c9c SHA256 a2591d0d4a9fff20c460983e388d3095cb284778cdae8e6a7b7d8140f40e0016
-EBUILD ppp-2.4.5-r2.ebuild 10077 RMD160 841ba4bf4648e1855f04b0c2a748744562ad9bb0 SHA1 ca639f8f9a65813f317f46228fe592ea50626ed3 SHA256 e76cd6c6c937a1e3859391ed94a65fb7b21d0c4d14d9e09000c52d763ab9c288
-MISC ChangeLog 44345 RMD160 634f47d7009d806aa62dba2be609daa83854a783 SHA1 2511b5f0e648c544dd49f1f4a760d7d7849e3c49 SHA256 081462c6930d5855e51fbb804a0efb40410bc9d33b9841db70c02d6f593ac4e9
-MISC metadata.xml 1355 RMD160 35a8f31f6f932ef69373b767d5186ffffb77c75d SHA1 86a300877654fb2763ed876577dbea4f55b424b6 SHA256 13d1a96a0ab4ad880369f5a7ea0b480de8af8a58545864e63199b1146cc5dd82
+AUX README.mpls 530 SHA256 5ef99aba902533fe9d17b7dfaf91e72b638cc70b9f811d1e518822ee80b5ff57 SHA512 2b617365fce74cceeb14e53f476b454c4420273661050d25e1c524cf5d56a7554318a268f7b9ebb100592b61a01d274efaeed28abb9ca0adaeb71ef981201b36 WHIRLPOOL f96310ae7e75bd4e289d97767f6a74a6a0a0006855068755d7cfb484950e145246472b3a6cffcd0db44c589ed43720f998872ef1e7b12a3ccd02e833d80e6e84
+AUX modules.ppp 299 SHA256 8947dd48d3d0c128166edc9bb0917b9af88502296fad791d6d90bf165ca50db3 SHA512 58bf5d6d286a08bd6dd595b39ee425efedd5745dddf33a9c90505891546eb46f4cf1306d83911bef61bc4611816aa0f6aef5d3e0f14c2f4ddd0a588780570041 WHIRLPOOL dfc2d6fb1a36b74b0dd998739bb1c5977234c2d88100f686fb6faae2826795b0ca217937a7775660421f5ebc356e5e1378849ac6e56fef018eceab6f90bb26e3
+DIST ppp-2.4.4-gentoo-20091116.tar.gz 54932 SHA256 52f174b3df36110d14c522869c507f64aef4d2d01db2dec2936cc9917c9fa716 SHA512 6669294cac124f78f197558f28872adaf08cb6ba3344093946c02d3581e70efea6992b30b0be726637a4122d8354bb1e25e73af71f1e7da8bdbf63db5aa0eeb6 WHIRLPOOL ff633a5e740f38bc665bec435613eb423de0f8370d119fc3cf36dee100cb02e5ec78eb88f2b530498bd49c76a792d97c76dd188b7ce02c8eb4efe85d9af67938
+DIST ppp-2.4.4.tar.gz 688763 SHA256 58af45fc07e5f326eea2408df770ea40e4626d1a15e7d564dd054d74880e91ea SHA512 70bde7121a0a2e150a7eec85731ca1055a2741da7886a8b8734c075637703d223bb579c3d14ad32a009488e07deaa62e7948e2d3e73077e6fb3db076841f7270 WHIRLPOOL 12aa49200253afd3958c7fc078ac7333080c6d0ca96c541e39e70b05d6b8c8e90fe98553d4cbef7804cf66c74b2798e1839b44db9e0cc0e6093d87b53bf24b6f
+DIST ppp-2.4.5-gentoo-20101127.tar.gz 41562 SHA256 d49f51dd10dfc97f25bb5dbc4acc61c708d890da231295467ac3710751d2bcdd SHA512 f24d9bdb8ee1cea7effcb314d88337672a4423a74249153da34999117f056e118981956c49cb8b3801054a38a52c4fcc3cd048fac9b339ad77f0f8b0ea9c99c6 WHIRLPOOL 421c2c78266eeda12ead02711a4d6c38f6cc7fe32c0f128a9a66e402a5c99b5ad6af9f109132ad437588e807846fb3945144126660414d7775a95335ada6bd8e
+DIST ppp-2.4.5-gentoo-20111111.tar.gz 41883 SHA256 950e06cb9e9c844e88cb99c3fc1dbb7515814d75f7f6e87a81fbb245e48ba4ed SHA512 ff9ac176e532ece8f0b13adf75c6999bd81a6f8a75a9edb490219c160cc7a2f055ace7a6ff73bc84965fafa2eb8a689a7106a349923be8c73464e2c00ab16ab6 WHIRLPOOL fb2d7a408ceebae22c83246d441fa5955ed013e9eeadb6247f06fe41512eb47860578768b3fe2f9a0683844e7c40e271e4b22b9f401a87dec376c17fcc9825e9
+DIST ppp-2.4.5.tar.gz 684342 SHA256 43317afec9299f9920b96f840414c977f0385410202d48e56d2fdb8230003505 SHA512 3688720a0f9ee47802e72dc6aa3d47c7312c195007f37a6ceb087fdb6f1f77ad75e922a568cffed6d1a857f06d79460d6d38b56e179310e493a0380a0c5a4f6e WHIRLPOOL 210dbcfc754256e5317cffa0b6f51e7ae9e45d88815e4952e893ab85d024daef8131747624e355b97225f0b365e677fa4bd82ee2a7890810bc25c5521324b83f
+DIST ppp-dhcpc.tgz 33497 SHA256 977fd980bb1d285963d8e27a87b7601ea84317faadfdb40989b258d1853db644
+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
+MISC ChangeLog 44521 SHA256 a0e015a5b4ae0fc9f82d42605d3caaeb3ddbc2d43b385036981673d481ea842e SHA512 d046cfe1d833c119cc8708bb9e6879da5c8dd32de4a0a18fd84c6de8c412dfee7728e5cfca05d2f5e4018249073e71af278abe0c5eabda8ff6ff08b51b484ab3 WHIRLPOOL 16759f8b2864e44a5921faf8aee6addc434bf0f56921e124255b244c4a169359353c9b0d11d446bb33cac43176feb8b9d0c5c4a5b15353010efaff9a000f66da
+MISC metadata.xml 1355 SHA256 13d1a96a0ab4ad880369f5a7ea0b480de8af8a58545864e63199b1146cc5dd82 SHA512 c04ba18a61308349854637fe6625238c7759b3f7600e3bd7867562fea29903b0364bff815dceb71c5daef09d5e897e810a7389289826f1079f820ea0bb8c94a6 WHIRLPOOL 56811f2d00adccb6fb105fec27e06cf1b51f2da56269cd60483e6b5ebae007b12a40fbc5db5029b0900477fdc144247f3e0dd12456ef7d7edc7627cbebfad4fb
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.19 (GNU/Linux)
 
-iEYEARECAAYFAk/ZQwMACgkQ/ejvha5XGaOFSgCgnrd/xRP4BCKcfhWBn7f4OIDN
-xS8AmwdXEYDXwBuRt5tSXbzmHMfQNk+I
-=o+jY
+iQIcBAEBCAAGBQJQIS65AAoJELEHsLL7fEFWcpoP/jvo0teSBdW/AS+XCHP8k1hd
+0Y+svr7YZ2bQl9NY32YBQd+CZM1I/bpZLoaH3WdUcKldhDP1hTQLZt+2oxh+Pjc4
+dLJOcO8r5BdDr/oT4uApVImUUDK0NYj3waevN/9RVr3PfogzMJjk9JoZ+p5HRuLX
+ikQqUeIuJtm8p0uSKUYZeDxm2aY4/u5zRjls8EbwU5/nlkWbRyciUx/FI8zi1w3r
+F3CPX0mdYQ4CvKBL2i+PwZk2dMV5oD/qpUr4V37fQeYqHDlCZJR+G59kQg7YkXgx
+cleV8D/vrOhFVr1s9XLQHn8tiJADEtGu+LInJK0JKW3kyOGMkVeMxV3MD4e1L/+0
+aHJuAY6JG5ja43fOVMs2CySumYqzJeEKulLaPnWw4aL0lpQWOmlh8W0sM/3c5x02
+AtbdUy77tv+I1HjplxW2IS8SVTE7WBKJcOG0i15XHJssGA/03Aa0BuRR/Pw/DaRN
+le2fJEl9LRY8LZiys97Zhv6zdkqObTTSPd97gVPLol/CsrguNnJLIMTKMz9wGd6S
+PzRz/w3fTmmCJgB3skTEBuWqyZl2voCSzzSgmGd1pEyVpsZZaGSIg8u8R8nELmzb
+ClRAR+ifruztpcyIs9TSxmHv54aVCbRU8EJ6nIIGlHeJexF9s1qjvWoZOu1LHAI6
+S0IzxqFUqUuikSRktE6N
+=7cWU
 -----END PGP SIGNATURE-----
diff --git a/net-dialup/ppp/ppp-2.4.5-r2.ebuild b/net-dialup/ppp/ppp-2.4.5-r2.ebuild
index ba1b3c15e30b..a2619426dc17 100644
--- a/net-dialup/ppp/ppp-2.4.5-r2.ebuild
+++ b/net-dialup/ppp/ppp-2.4.5-r2.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-r2.ebuild,v 1.3 2012/06/14 01:48:45 zmedico Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-dialup/ppp/ppp-2.4.5-r2.ebuild,v 1.4 2012/08/07 15:05:23 vapier Exp $
 
 EAPI="2"
 
@@ -25,6 +25,9 @@ DEPEND="activefilter? ( net-libs/libpcap )
 RDEPEND="${DEPEND}"
 
 src_prepare() {
+	# Use the headers from the kernel #427684
+	rm include/linux/if_pppol2tp.h || die
+
 	epatch "${WORKDIR}/patch/make-vars.patch"
 	epatch "${WORKDIR}/patch/mpls.patch"
 	epatch "${WORKDIR}/patch/killaddr-smarter.patch"
@@ -40,7 +43,6 @@ src_prepare() {
 	epatch "${WORKDIR}/patch/pppd-usepeerwins.patch"
 	epatch "${WORKDIR}/patch/connect-errors.patch"
 	epatch "${WORKDIR}/patch/Makefile.patch"
-	epatch "${WORKDIR}/patch/pppol2tpv3-2.6.35.patch"
 	epatch "${WORKDIR}/patch/pado-timeout.patch"
 	epatch "${WORKDIR}/patch/lcp-echo-adaptive.patch"