Remove references to $ROOT from src_install (#168039).

Package-Manager: portage-2.1.2.2

diff --git a/net-dialup/rp-pppoe/ChangeLog b/net-dialup/rp-pppoe/ChangeLog
index c2609bb4d4f825f9af0756174c254f44c8cab9b8..1d54b2e8a33a14d66ef38564439bd0c956e0bcc1 100644 (file)
--- a/net-dialup/rp-pppoe/ChangeLog
+++ b/net-dialup/rp-pppoe/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for net-dialup/rp-pppoe
 # Copyright 2002-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-dialup/rp-pppoe/ChangeLog,v 1.85 2007/01/05 10:18:43 mrness Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-dialup/rp-pppoe/ChangeLog,v 1.86 2007/03/10 14:22:46 mrness Exp $
+
+  10 Mar 2007; Alin Năstac <mrness@gentoo.org> rp-pppoe-3.8.ebuild:
+  Remove references to $ROOT from src_install (#168039).
 
   05 Jan 2007; Alin Năstac <mrness@gentoo.org> rp-pppoe-3.8.ebuild:
   Remove obsolete setup & postinst messages. Fix bug #160167.

diff --git a/net-dialup/rp-pppoe/Manifest b/net-dialup/rp-pppoe/Manifest
index 190528c0e9502378b2460317b6dd48ea246c4198..a1ddbe51073cd83bd3e90a87c6dc3a5d8ff0c8cf 100644 (file)
--- a/net-dialup/rp-pppoe/Manifest
+++ b/net-dialup/rp-pppoe/Manifest
@@ -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 2335 RMD160 2a34ef93d9af19271c44db398e3c85b905b6c4e8 SHA1 cf168fae497f730f0443744ed5073c521a40be41 SHA256 be2073e68a0188287482ee21ad7a7ce8de7e27e74ac13b34917cd4895c433ed6
-MD5 f2a694fec71f3683870441740ce71fb4 rp-pppoe-3.8.ebuild 2335
-RMD160 2a34ef93d9af19271c44db398e3c85b905b6c4e8 rp-pppoe-3.8.ebuild 2335
-SHA256 be2073e68a0188287482ee21ad7a7ce8de7e27e74ac13b34917cd4895c433ed6 rp-pppoe-3.8.ebuild 2335
-MISC ChangeLog 12842 RMD160 e5d0c9ad4da5996ab43b2d07e35c821d17288a8f SHA1 fac1c73ee4888ab33059e67bc7d22af5f8e7846e SHA256 ecfa75e0e8d5caf4c9038b10450cf185fecce464dc954bd3eeb82ad4b334ffec
-MD5 c656ed5b2dd6b339231d584cf58cbf68 ChangeLog 12842
-RMD160 e5d0c9ad4da5996ab43b2d07e35c821d17288a8f ChangeLog 12842
-SHA256 ecfa75e0e8d5caf4c9038b10450cf185fecce464dc954bd3eeb82ad4b334ffec ChangeLog 12842
+EBUILD rp-pppoe-3.8.ebuild 2396 RMD160 c5100e3adf4cf8b32b515c0fa782d102339c996c SHA1 93d6b88bde1c50f49cfe0da0413781a17c707259 SHA256 9d090a3c7e4075be4e71182df9f1b840f16fa04c25a6124e6622f2693080099b
+MD5 07108d96c7b73a69f27397bfa901be59 rp-pppoe-3.8.ebuild 2396
+RMD160 c5100e3adf4cf8b32b515c0fa782d102339c996c rp-pppoe-3.8.ebuild 2396
+SHA256 9d090a3c7e4075be4e71182df9f1b840f16fa04c25a6124e6622f2693080099b rp-pppoe-3.8.ebuild 2396
+MISC ChangeLog 12969 RMD160 a3b5a05b7904565802463f37dba5c543a03df855 SHA1 ca8c1d60cf5a4108a16e1eb2f5546a1176bdf5f6 SHA256 5f881001ad859835b5b001f8527b715633e2667b7f45af7e113b58093dc3b9f6
+MD5 ebfb6b5cad83b5c12c93e09cbdff79b6 ChangeLog 12969
+RMD160 a3b5a05b7904565802463f37dba5c543a03df855 ChangeLog 12969
+SHA256 5f881001ad859835b5b001f8527b715633e2667b7f45af7e113b58093dc3b9f6 ChangeLog 12969
 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 v2.0.3 (GNU/Linux)
 
-iD8DBQFFniYQJnxX6mF440QRAh0BAJ93wLEBEtst37GB47KkmpToQ3XMXACeJV3i
-KCtJJlXwA6Y849u5RRxQmO0=
-=KvPc
+iD8DBQFF8r88JnxX6mF440QRAj3aAKDwmuOS4dUl5QAmSJrTlBwB9D8tFACfWWPf
+ZmnF0X5TOazZW6r3Z5v2SP4=
+=xkWW
 -----END PGP SIGNATURE-----

diff --git a/net-dialup/rp-pppoe/rp-pppoe-3.8.ebuild b/net-dialup/rp-pppoe/rp-pppoe-3.8.ebuild
index 7ac295cf764816705b1708ae3403ef1f83c3e00e..4fa55a24e9743b112db92bb8a6220a8e30502055 100644 (file)
--- a/net-dialup/rp-pppoe/rp-pppoe-3.8.ebuild
+++ b/net-dialup/rp-pppoe/rp-pppoe-3.8.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2007 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-dialup/rp-pppoe/rp-pppoe-3.8.ebuild,v 1.13 2007/01/05 10:18:43 mrness Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-dialup/rp-pppoe/rp-pppoe-3.8.ebuild,v 1.14 2007/03/10 14:22:46 mrness Exp $
 
 WANT_AUTOCONF="latest"
 WANT_AUTOMAKE="latest"
@@ -56,14 +56,8 @@ src_install () {
        make RPM_INSTALL_ROOT="${D}" docdir=/usr/share/doc/${PF} install \
                || die "install failed"
 
-       #Don't use compiled rp-pppoe plugin; use it from the current version of pppd
+       #Don't use compiled rp-pppoe plugin - see pkg_preinst below
        rm "${D}/etc/ppp/plugins/rp-pppoe.so"
-       local PPPD_VER=`best_version net-dialup/ppp`
-       PPPD_VER=${PPPD_VER#*/*-} #reduce it to ${PV}-${PR}
-       PPPD_VER=${PPPD_VER%%-*} #reduce it to ${PV}
-       if [ -n "${PPPD_VER}" ] && [ -f "${ROOT}/usr/lib/pppd/${PPPD_VER}/rp-pppoe.so" ] ; then
-               dosym /usr/lib/pppd/${PPPD_VER}/rp-pppoe.so /etc/ppp/plugins/rp-pppoe.so
-       fi
 
        prepalldocs
 
@@ -74,6 +68,16 @@ src_install () {
        fi
 }
 
+pkg_preinst() {
+       # Use the rp-pppoe plugin that comes with net-dialup/pppd
+       local PPPD_VER=`best_version net-dialup/ppp`
+       PPPD_VER=${PPPD_VER#*/*-} #reduce it to ${PV}-${PR}
+       PPPD_VER=${PPPD_VER%%-*} #reduce it to ${PV}
+       if [ -n "${PPPD_VER}" ] && [ -f "${ROOT}/usr/lib/pppd/${PPPD_VER}/rp-pppoe.so" ] ; then
+               dosym /usr/lib/pppd/${PPPD_VER}/rp-pppoe.so /etc/ppp/plugins/rp-pppoe.so
+       fi
+}
+
 pkg_postinst() {
        einfo "Use pppoe-setup to configure your dialup connection."
 }