diff options
| author |   Herbie Hopkins <herbs@gentoo.org> | 2005-05-10 15:12:16 +0000 |
|---|---|---|
| committer | Herbie Hopkins <herbs@gentoo.org> | 2005-05-10 15:12:16 +0000 |
| commit | 416d0934aea2f43e74366222b4f7beac420319aa (patch) | |
| tree | ebde5d7000264ee038bc0befcbc2a3a3e9eb4d40 /net-dialup | |
| parent | Version bump. (diff) | |
| download | gentoo-2-416d0934aea2f43e74366222b4f7beac420319aa.tar.gz gentoo-2-416d0934aea2f43e74366222b4f7beac420319aa.tar.bz2 gentoo-2-416d0934aea2f43e74366222b4f7beac420319aa.zip | |
Fixed multilib-strict issue, bug #92111
(Portage version: 2.0.51.21-r1)
Diffstat (limited to 'net-dialup')
| -rw-r--r-- | net-dialup/ppp/ChangeLog | 5 | ||||
| -rw-r--r-- | net-dialup/ppp/Manifest | 14 | ||||
| -rw-r--r-- | net-dialup/ppp/ppp-2.4.3-r3.ebuild | 8 |
3 files changed, 12 insertions, 15 deletions
diff --git a/net-dialup/ppp/ChangeLog b/net-dialup/ppp/ChangeLog index ffc889978584..28bd94029c0e 100644 --- a/net-dialup/ppp/ChangeLog +++ b/net-dialup/ppp/ChangeLog @@ -1,6 +1,9 @@ # ChangeLog for net-dialup/ppp # Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/net-dialup/ppp/ChangeLog,v 1.107 2005/05/08 14:45:44 tove Exp $ +# $Header: /var/cvsroot/gentoo-x86/net-dialup/ppp/ChangeLog,v 1.108 2005/05/10 15:12:16 herbs Exp $ + + 10 May 2005; Herbie Hopkins <herbs@gentoo.org> ppp-2.4.3-r3.ebuild: + Fixed multilib-strict issue, bug #92111 08 May 2005; Torsten Veller <tove@gentoo.org> ppp-2.4.3-r3.ebuild: using toolchain-funcs diff --git a/net-dialup/ppp/Manifest b/net-dialup/ppp/Manifest index 6ec7eb9d51c5..79cc63353762 100644 --- a/net-dialup/ppp/Manifest +++ b/net-dialup/ppp/Manifest @@ -1,12 +1,9 @@ ------BEGIN PGP SIGNED MESSAGE----- -Hash: SHA1 - MD5 7fabd0811dbf88750b8a7cd65f1b7cb2 ppp-2.4.3-r2.ebuild 5673 MD5 f498fcc5704e842bdd3a13e71626f676 ppp-2.4.3.ebuild 5712 MD5 c4e90e104aa550d26d90ee354e7a2136 ppp-2.4.1-r14.ebuild 4702 MD5 558237b810ac812265ad87bb956270de ppp-2.4.3-r1.ebuild 5799 -MD5 7144ec915675ec2c2700a010c6b57345 ppp-2.4.3-r3.ebuild 5954 -MD5 17f9bdf1a02ebbfadf639df810b47138 ChangeLog 18272 +MD5 bfb38bc737a5b02181a17898c3aa0b0d ppp-2.4.3-r3.ebuild 6075 +MD5 34899afadb2987e522ba02dcda2f572e ChangeLog 18385 MD5 e6fdfdc4317d7fe324c50bd0477ca3f8 metadata.xml 295 MD5 4dce8b15c7a47d9a225b1047fda9870e ppp-2.4.2-r10.ebuild 5899 MD5 4e62cdeb360ca0a22becbd2deb6f2dac files/pon 957 @@ -55,10 +52,3 @@ MD5 d166dfb51a6e7fa6a5a05120817dbccd files/2.4.3/fixes-from-upstream-cvs.patch 2 MD5 1fd88dda7f4996799c69a9501d42cc23 files/2.4.3/README.mpls 530 MD5 5d83af7b897082a0b1ecd70a2cc2a0c7 files/2.4.3/modules.ppp 268 MD5 f0ad3e0c62aec1771536caf00e28b9c6 files/2.4.3/pppoe.html 7605 ------BEGIN PGP SIGNATURE----- -Version: GnuPG v1.4.1 (GNU/Linux) - -iD8DBQFCfiYrV3J2n04EauwRApm9AJ92nGRs0Kf55im4dft5lsXNUUdUxQCg3mRf -5bMeYgA6BbrrafuxdnS5200= -=ytJG ------END PGP SIGNATURE----- diff --git a/net-dialup/ppp/ppp-2.4.3-r3.ebuild b/net-dialup/ppp/ppp-2.4.3-r3.ebuild index cc743722cf38..7e83e263e4ed 100644 --- a/net-dialup/ppp/ppp-2.4.3-r3.ebuild +++ b/net-dialup/ppp/ppp-2.4.3-r3.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2005 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/net-dialup/ppp/ppp-2.4.3-r3.ebuild,v 1.2 2005/05/08 14:45:44 tove Exp $ +# $Header: /var/cvsroot/gentoo-x86/net-dialup/ppp/ppp-2.4.3-r3.ebuild,v 1.3 2005/05/10 15:12:16 herbs Exp $ inherit eutils flag-o-matic toolchain-funcs @@ -71,6 +71,10 @@ src_unpack() { epatch ${FILESDIR}/ppp-sys_error_to_strerror.patch || die } + # Set correct libdir + sed -i -e "s:/lib/pppd:/$(get_libdir)/pppd:" \ + ${S}/pppd/{pathnames.h,pppd.8} || die + find ${S} -type f -name Makefile.linux \ -exec sed -i -e '/^CC[[:space:]]*=/d' {} \; } @@ -130,7 +134,7 @@ src_install() { insopts -m0600 newins ${FILESDIR}/confd.ppp0 net.ppp0 - local PLUGINS_DIR=/usr/lib/pppd/$(awk -F '"' '/VERSION/ {print $2}' pppd/patchlevel.h) + local PLUGINS_DIR=/usr/$(get_libdir)/pppd/$(awk -F '"' '/VERSION/ {print $2}' pppd/patchlevel.h) #closing " for sintax coloring dodir ${PLUGINS_DIR} insinto ${PLUGINS_DIR} |