Fix broken compilation on glibc-2.5 , second try (bug #159896 comment #19)

Package-Manager: portage-2.1.1-r2

diff --git a/net-dialup/rp-pppoe/Manifest b/net-dialup/rp-pppoe/Manifest
index 953e2decb615950b35734a1214506b9f0209c29c..24abf05b69c375146f101aa8b35e7ff405fbc297 100644 (file)
--- a/net-dialup/rp-pppoe/Manifest
+++ b/net-dialup/rp-pppoe/Manifest
@@ -1,14 +1,14 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA1
 
+AUX rp-pppoe-3.8-configure.patch 2718 RMD160 fd30c474c49c27c8c6c1bc8d529165eabd7d5de7 SHA1 183d7fe2567f74c7fa8227f7d4a83fdfef966626 SHA256 746d3581e8c8a31d1848b76cc071ad82a4d4f81c31b79b5e285344eaa3065915
+MD5 1cbd938e71180f324baf19908d32b158 files/rp-pppoe-3.8-configure.patch 2718
+RMD160 fd30c474c49c27c8c6c1bc8d529165eabd7d5de7 files/rp-pppoe-3.8-configure.patch 2718
+SHA256 746d3581e8c8a31d1848b76cc071ad82a4d4f81c31b79b5e285344eaa3065915 files/rp-pppoe-3.8-configure.patch 2718
 AUX rp-pppoe-3.8-gentoo-netscripts.patch 5218 RMD160 9ba899b3282ce0bae119e35c5d610c697f11565a SHA1 b04de3b2417b4f0bfba1cea22d27bbb0456d7bce SHA256 4b1018f1f9d1ed7fb8ef6f63fced3850128536954c82273c10ab660b2daf849c
 MD5 338e60715ff505051dc5b3549936124f files/rp-pppoe-3.8-gentoo-netscripts.patch 5218
 RMD160 9ba899b3282ce0bae119e35c5d610c697f11565a files/rp-pppoe-3.8-gentoo-netscripts.patch 5218
 SHA256 4b1018f1f9d1ed7fb8ef6f63fced3850128536954c82273c10ab660b2daf849c files/rp-pppoe-3.8-gentoo-netscripts.patch 5218
-AUX rp-pppoe-3.8-no-strip.patch 676 RMD160 718a19e956f5eb3c58a2ac48b77757365a4edf3a SHA1 63550b2c875ff5babb6a844f5d456fd18b2dbc51 SHA256 6fa84fc5b5dec5aec70160e7035e3c12e1cd9eb17594df59856b05b49d2cf06a
-MD5 edc9b6a8714bb84d440db444f81dece7 files/rp-pppoe-3.8-no-strip.patch 676
-RMD160 718a19e956f5eb3c58a2ac48b77757365a4edf3a files/rp-pppoe-3.8-no-strip.patch 676
-SHA256 6fa84fc5b5dec5aec70160e7035e3c12e1cd9eb17594df59856b05b49d2cf06a files/rp-pppoe-3.8-no-strip.patch 676
 AUX rp-pppoe-3.8-plugin-options.patch 1364 RMD160 8af5cccf80a2c1b26fa50e4ee0da749dacc44222 SHA1 38868f162dc64c69673f1a85dc22bfcbbe7183dc SHA256 508bedec65a24eb876b2eb2151adce84efd51689e8472383debb01b29b82be13
 MD5 1938913a9606e60e4fa510512e8f206e files/rp-pppoe-3.8-plugin-options.patch 1364
 RMD160 8af5cccf80a2c1b26fa50e4ee0da749dacc44222 files/rp-pppoe-3.8-plugin-options.patch 1364
@@ -19,14 +19,14 @@ RMD160 9aa18182f5a611f54041162976b4f33740439443 files/rp-pppoe-3.8-username-char
 SHA256 21209268903d2c359e5eb4547ab6417f0c63d41791fe413728d690ed879c93bd files/rp-pppoe-3.8-username-charset.patch 1946
 DIST ppp-2.4.3.tar.gz 688092 RMD160 845821496bacb07d93bb7572a171854853ef722b SHA1 5e2789f4dedc81943fa9f94c840cccc2407056f7 SHA256 1e0fddb5f53613dd14ab10b25435e88092fed1eff09b4ac4448d5be01f3b0b11
 DIST rp-pppoe-3.8.tar.gz 212931 RMD160 039798154acae9e7a066172f23904d766ba68a9a SHA1 d9a4346701e580b4a6049a940557b38533f9e8f7 SHA256 d916e9cfe1e62395f63a5361936fa855f6d0f0a37dc7227b394cdb725f553479
-EBUILD rp-pppoe-3.8.ebuild 3006 RMD160 3dd7214c16ec1f4ed63db88d3ad2fb4afca7402a SHA1 6932e2d2ae0288b36b74897a3e65490daf026114 SHA256 5a77c5fdcaa588a0eeb70546805f332d235767de0dc6c8662c20d5f5352c9351
-MD5 99768ea34bd1bb71a04d039f2739ef3d rp-pppoe-3.8.ebuild 3006
-RMD160 3dd7214c16ec1f4ed63db88d3ad2fb4afca7402a rp-pppoe-3.8.ebuild 3006
-SHA256 5a77c5fdcaa588a0eeb70546805f332d235767de0dc6c8662c20d5f5352c9351 rp-pppoe-3.8.ebuild 3006
-MISC ChangeLog 12624 RMD160 30a36845584b0ce4bab3eea8d3102e4839653830 SHA1 bf62d2d41c2be6e29e34de552bf612ac50c0fec1 SHA256 70975b72284b3fe88fdc1a5a12d09ba9b4cebe1b59f287d38ee01afce8043ed6
-MD5 ab66354bb0f8b7e9c09edada52edb74a ChangeLog 12624
-RMD160 30a36845584b0ce4bab3eea8d3102e4839653830 ChangeLog 12624
-SHA256 70975b72284b3fe88fdc1a5a12d09ba9b4cebe1b59f287d38ee01afce8043ed6 ChangeLog 12624
+EBUILD rp-pppoe-3.8.ebuild 2900 RMD160 9b89f53f709c8866bbaebe0f14f5e015b171ad92 SHA1 08006f64d7b36b043a158b7400b14966fe8afa59 SHA256 8791fc1aa6fa141412035b02e9ee11005ebd94196e9bf717e8afe6373d4963ae
+MD5 64a21ad7c71e88c6299c6ee89598513f rp-pppoe-3.8.ebuild 2900
+RMD160 9b89f53f709c8866bbaebe0f14f5e015b171ad92 rp-pppoe-3.8.ebuild 2900
+SHA256 8791fc1aa6fa141412035b02e9ee11005ebd94196e9bf717e8afe6373d4963ae rp-pppoe-3.8.ebuild 2900
+MISC ChangeLog 12710 RMD160 36a1a79f676d886d3c85b399f24fd236432acd23 SHA1 bf2478dd71e26d3401380776d20976cc96e0fd03 SHA256 295e6d69eb88f488f40858bd4e7ef0dc86aa4dd18a72d525f9a2caf9b6842393
+MD5 4f9d75a537205ba7e93cd5a37af6692b ChangeLog 12710
+RMD160 36a1a79f676d886d3c85b399f24fd236432acd23 ChangeLog 12710
+SHA256 295e6d69eb88f488f40858bd4e7ef0dc86aa4dd18a72d525f9a2caf9b6842393 ChangeLog 12710
 MISC metadata.xml 163 RMD160 df94c60cc0bb7abe5913b464a33966b142b2fe1e SHA1 d8332605fd22c32f15438bbdf24aa622c3d2738a SHA256 1137a0fd866641cf719b0c2e9e77ca9fa4541a42f2cc851fe4659cf2677acca3
 MD5 ec2f84816306825d125d0c01bd86758d metadata.xml 163
 RMD160 df94c60cc0bb7abe5913b464a33966b142b2fe1e metadata.xml 163
@@ -35,9 +35,9 @@ MD5 c345665140f7ae9908f3256aee68a72f files/digest-rp-pppoe-3.8 467
 RMD160 7b4162f713393d8f869d7436d009f2ebe2d5c38a files/digest-rp-pppoe-3.8 467
 SHA256 9f689e517bfc64f62e853de28c0b87a95e877d2ecf076ec4d556663820303ebe files/digest-rp-pppoe-3.8 467
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.4.5 (GNU/Linux)
+Version: GnuPG v1.4.6 (GNU/Linux)
 
-iD8DBQFFnRehJnxX6mF440QRAvHLAJ9fWTaVjr5uRLG2jcyQnK1ylJ38tACguvJL
-vOvA52CjppzefTypi6IQFHs=
-=Cvnc
+iD8DBQFFnX6RJnxX6mF440QRAraxAJ9r5Reu9R+eK0tnUK8wD8AbKpAPPwCfUy65
+nr4tccF4tBUuHDswFJzrlN4=
+=5Pxs
 -----END PGP SIGNATURE-----

diff --git a/net-dialup/rp-pppoe/files/rp-pppoe-3.8-no-strip.patch b/net-dialup/rp-pppoe/files/rp-pppoe-3.8-no-strip.patch
deleted file mode 100644 (file)
index 785d600..0000000
--- a/net-dialup/rp-pppoe/files/rp-pppoe-3.8-no-strip.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff -Nru rp-pppoe-3.8.orig/gui/Makefile.in rp-pppoe-3.8/gui/Makefile.in
---- rp-pppoe-3.8.orig/gui/Makefile.in  2006-09-23 18:05:31.000000000 +0300
-+++ rp-pppoe-3.8/gui/Makefile.in       2006-09-23 18:16:02.623018000 +0300
-@@ -46,7 +46,7 @@
-       -mkdir -p $(RPM_INSTALL_ROOT)$(sbindir)
-       -mkdir -p $(RPM_INSTALL_ROOT)$(bindir)
-       -mkdir -p $(RPM_INSTALL_ROOT)/etc/ppp/rp-pppoe-gui
--      $(install) -m 4755 -s pppoe-wrapper $(RPM_INSTALL_ROOT)$(sbindir)
-+      $(install) -m 4755 pppoe-wrapper $(RPM_INSTALL_ROOT)$(sbindir)
-       $(install) -m 755 tkpppoe $(RPM_INSTALL_ROOT)$(bindir)
-       -mkdir -p $(RPM_INSTALL_ROOT)$(mandir)/man1
-       $(install) -m 644 pppoe-wrapper.1 $(RPM_INSTALL_ROOT)$(mandir)/man1