automatically change pppoe.so to rp-pppoe.so (library name changed in 2.4.2)

3 files changed, 31 insertions, 24 deletions

diff --git a/net-dialup/ppp/ChangeLog b/net-dialup/ppp/ChangeLog
index 39f9a708e676..0ea611ba4990 100644
--- a/net-dialup/ppp/ChangeLog
+++ b/net-dialup/ppp/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for net-dialup/ppp
 # Copyright 2002-2003 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-dialup/ppp/ChangeLog,v 1.39 2003/12/24 03:49:07 brad_mssw Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-dialup/ppp/ChangeLog,v 1.40 2003/12/26 14:07:56 lanius Exp $
+
+  26 Dec 2003; Heinrich Wendel <lanius@gentoo.org> ppp-2.4.2_beta3-r1.ebuild:
+  automatically change pppoe.so to rp-pppoe.so (library name changed in 2.4.2)
 
   23 Dec 2003; Brad House <brad_mssw@gentoo.org> ppp-2.4.2_beta3-r1.ebuild:
   freezes on compile on amd64, even after libtoolize addition
diff --git a/net-dialup/ppp/Manifest b/net-dialup/ppp/Manifest
index f990c20406c4..59d76cd7b9b3 100644
--- a/net-dialup/ppp/Manifest
+++ b/net-dialup/ppp/Manifest
@@ -1,36 +1,36 @@
-MD5 41c65ffd41dc9a321340fcd2a7503755 ChangeLog 7339
-MD5 60bd7a33300ecf284a8bd3636458c2a6 ppp-2.4.2_beta3-r1.ebuild 3418
+MD5 91c7e297d501fda4c22bd07d7d859c9b ppp-2.4.2_beta3-r1.ebuild 3574
 MD5 82e881305bcfc09888896071fb0219fa ppp-2.4.1-r14.ebuild 4613
+MD5 827e91742bef48f631fcdedde1349f2c ChangeLog 7494
 MD5 ec2f84816306825d125d0c01bd86758d metadata.xml 163
+MD5 4e62cdeb360ca0a22becbd2deb6f2dac files/pon 957
+MD5 86cdaf133f7a79fb464f02d83afc7734 files/plog 146
+MD5 05b7394b35a2342033b52134568bf6b8 files/poff 2723
 MD5 5f6f3203688bc5a2eceef8301f482c9f files/chat-default 344
-MD5 271b9ea36d7e7c5c6587036927d604e6 files/confd.ppp0 3309
-MD5 6f7e70fee6e827ad992da785cba032c6 files/digest-ppp-2.4.2_beta3-r1 63
-MD5 4fda43c2f3f8b5b58a58e5d238991c0b files/digest-ppp-2.4.1-r14 65
-MD5 8368eb79ad4618c3c6753801b5c4c689 files/gcc3.3-multiline.patch 1673
+MD5 824964465508977f9d0836f029d6b02f files/ppp-2.4.1-openssl-0.9.6-mppe-patch.gz 36112
 MD5 47bae70427ec4cb3ea1cc87ae799d0e3 files/gcc33-amd64.patch 1207
-MD5 0713ffc9ae6e3ee4ef0f5c3cb752b3ea files/ip-down 285
 MD5 c74b7e519f593babcfc3821832d72819 files/ip-up 282
-MD5 5d83af7b897082a0b1ecd70a2cc2a0c7 files/modules.ppp 268
-MD5 b783e9bd9ac5956c582499f0623195fe files/net.ppp0 4705
-MD5 86cdaf133f7a79fb464f02d83afc7734 files/plog 146
-MD5 05b7394b35a2342033b52134568bf6b8 files/poff 2723
-MD5 4e62cdeb360ca0a22becbd2deb6f2dac files/pon 957
 MD5 44cc662ba9aa61dd9add3ddd4c5ded57 files/pon.1 3607
-MD5 eb5dfeb9b6a2c8b4b2f23df4980952e0 files/ppp-2.4.1-MSCHAPv2-fix.patch 507
-MD5 824964465508977f9d0836f029d6b02f files/ppp-2.4.1-openssl-0.9.6-mppe-patch.gz 36112
-MD5 f82a3ae0dba4ce6031bbf1405071e827 files/ppp-2.4.1-r10.patch 311
 MD5 feb6723fa9b971cb443cff79693db0cd files/ppp-crypto-fix.patch.bz2 35770
+MD5 271b9ea36d7e7c5c6587036927d604e6 files/confd.ppp0 3309
+MD5 4fda43c2f3f8b5b58a58e5d238991c0b files/digest-ppp-2.4.1-r14 65
+MD5 f82a3ae0dba4ce6031bbf1405071e827 files/ppp-2.4.1-r10.patch 311
+MD5 b783e9bd9ac5956c582499f0623195fe files/net.ppp0 4705
+MD5 8368eb79ad4618c3c6753801b5c4c689 files/gcc3.3-multiline.patch 1673
+MD5 6f7e70fee6e827ad992da785cba032c6 files/digest-ppp-2.4.2_beta3-r1 63
+MD5 eb5dfeb9b6a2c8b4b2f23df4980952e0 files/ppp-2.4.1-MSCHAPv2-fix.patch 507
+MD5 5d83af7b897082a0b1ecd70a2cc2a0c7 files/modules.ppp 268
+MD5 0713ffc9ae6e3ee4ef0f5c3cb752b3ea files/ip-down 285
 MD5 f0ad3e0c62aec1771536caf00e28b9c6 files/pppoe.html 7605
-MD5 1fd88dda7f4996799c69a9501d42cc23 files/2.4.2b3/README.mpls 530
-MD5 0e16e7bb8ae71505e719fe5471bd2097 files/2.4.2b3/cflags.patch 3403
+MD5 2890b47660f967a07ac5b211850e46c5 files/2.4.2b3/options-pptp 238
 MD5 7004513b8b14aad3e2f598535e672af4 files/2.4.2b3/chat-default 351
-MD5 12500a756925e9d8f4b2b655e95a2541 files/2.4.2b3/confd.ppp0 2784
-MD5 c4e991f87477e4fe5a402ef3f8dc9a08 files/2.4.2b3/ip-down 642
 MD5 649035cc45cf067d76e0faabfc87c825 files/2.4.2b3/ip-up 704
 MD5 1c6a75aa9390438f483e2885ea40ca72 files/2.4.2b3/killaddr-smarter.patch 6225
-MD5 5d83af7b897082a0b1ecd70a2cc2a0c7 files/2.4.2b3/modules.ppp 268
+MD5 12500a756925e9d8f4b2b655e95a2541 files/2.4.2b3/confd.ppp0 2784
+MD5 fa2a5b8df496922fa2fb592115953b6b files/2.4.2b3/options-pppoe 53
 MD5 bf0ee7e6765e3b18dbe3964be6cd4500 files/2.4.2b3/mpls.patch 10506
 MD5 639e33b901bd31c59ef1b3e0b40f2b08 files/2.4.2b3/net.ppp0 4347
-MD5 fa2a5b8df496922fa2fb592115953b6b files/2.4.2b3/options-pppoe 53
-MD5 2890b47660f967a07ac5b211850e46c5 files/2.4.2b3/options-pptp 238
+MD5 1fd88dda7f4996799c69a9501d42cc23 files/2.4.2b3/README.mpls 530
+MD5 5d83af7b897082a0b1ecd70a2cc2a0c7 files/2.4.2b3/modules.ppp 268
+MD5 c4e991f87477e4fe5a402ef3f8dc9a08 files/2.4.2b3/ip-down 642
 MD5 f0ad3e0c62aec1771536caf00e28b9c6 files/2.4.2b3/pppoe.html 7605
+MD5 0e16e7bb8ae71505e719fe5471bd2097 files/2.4.2b3/cflags.patch 3403
diff --git a/net-dialup/ppp/ppp-2.4.2_beta3-r1.ebuild b/net-dialup/ppp/ppp-2.4.2_beta3-r1.ebuild
index 9f6e717f1854..72fcb6dab432 100644
--- a/net-dialup/ppp/ppp-2.4.2_beta3-r1.ebuild
+++ b/net-dialup/ppp/ppp-2.4.2_beta3-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2003 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-dialup/ppp/ppp-2.4.2_beta3-r1.ebuild,v 1.2 2003/12/24 03:49:07 brad_mssw Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-dialup/ppp/ppp-2.4.2_beta3-r1.ebuild,v 1.3 2003/12/26 14:07:56 lanius Exp $
 
 MY_PV=${PV/_beta/b}
 MY_P=${PN}-${MY_PV}
@@ -127,9 +127,13 @@ pkg_postinst() {
 		/sbin/update-modules
 	fi
 	ewarn "To enable kernel-pppoe read html/pppoe.html in the doc-directory."
+	ewarn "Note: the library name has changed from pppoe.so to rp-pppoe.so."
 	ewarn "Pon, poff and plog scripts have been supplied for experienced users."
 	ewarn "New users or those requiring something more should have a look at"
 	ewarn "the /etc/init.d/net.ppp0 script."
 	ewarn "Users needing particular scripts (ssh,rsh,etc.)should check out the"
 	ewarn "/usr/share/doc/ppp*/scripts directory."
+
+	# lib name has changed
+	sed -i -e "s:pppoe.so:rp-pppoe.so:" ${ROOT}etc/ppp/options
 }