summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorNed Ludd <solar@gentoo.org>2005-05-30 02:42:32 +0000
committerNed Ludd <solar@gentoo.org>2005-05-30 02:42:32 +0000
commitb23e951d8aa9e3062ff19a41f8d3084b29145c3a (patch)
treee06fb81c4c2e101806016d93c8e7d4e20f21dda3
parent- update sys-apps/miscfiles to use libc expanded variable elibc_uclibc vs ucl... (diff)
downloadhistorical-b23e951d8aa9e3062ff19a41f8d3084b29145c3a.tar.gz
historical-b23e951d8aa9e3062ff19a41f8d3084b29145c3a.tar.bz2
historical-b23e951d8aa9e3062ff19a41f8d3084b29145c3a.zip
- update sys-apps/net-tools to use libc expanded variable elibc_uclibc vs uclibc so USE=-* works
-rw-r--r--sys-apps/net-tools/ChangeLog6
-rw-r--r--sys-apps/net-tools/Manifest12
-rw-r--r--sys-apps/net-tools/net-tools-1.60-r9.ebuild12
3 files changed, 23 insertions, 7 deletions
diff --git a/sys-apps/net-tools/ChangeLog b/sys-apps/net-tools/ChangeLog
index 8969d19892fa..05c0d34cbbe5 100644
--- a/sys-apps/net-tools/ChangeLog
+++ b/sys-apps/net-tools/ChangeLog
@@ -1,6 +1,10 @@
# ChangeLog for sys-apps/net-tools
# Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/net-tools/ChangeLog,v 1.53 2005/04/09 13:00:55 corsair Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/net-tools/ChangeLog,v 1.54 2005/05/30 02:42:32 solar Exp $
+
+ 29 May 2005; <solar@gentoo.org> net-tools-1.60-r9.ebuild:
+ - update sys-apps/net-tools to use libc expanded variable elibc_uclibc vs
+ uclibc so USE=-* works
09 Apr 2005; Markus Rothe <corsair@gentoo.org> net-tools-1.60-r11.ebuild:
Stable on ppc64
diff --git a/sys-apps/net-tools/Manifest b/sys-apps/net-tools/Manifest
index b5da00888f6b..1631e573aa7c 100644
--- a/sys-apps/net-tools/Manifest
+++ b/sys-apps/net-tools/Manifest
@@ -1,3 +1,6 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
MD5 f2d060ba7da394a61bdd8510cd205b6b net-tools-1.60-r9.ebuild 3311
MD5 be270bfec132b7d0bfb178d1624ca358 net-tools-1.60-r11.ebuild 2106
MD5 50a4c9f1b3432af1c8d9e0ac912f3300 ChangeLog 8819
@@ -9,3 +12,12 @@ MD5 05ebbcad45030e806f8be710defa0aac files/digest-net-tools-1.60-r11 145
MD5 f8edd79687cbd930b5a5d749b3d8b4f1 files/1.60-man.patch 987
MD5 b1288e643ec595e07f37d7fd0d755ba5 files/digest-net-tools-1.60-r9 148
MD5 51de6eabe2d6d6dc860f72c41cee636b files/net-tools-1.60-2.6-compilefix.patch 784
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.4.0 (GNU/Linux)
+
+iQCVAwUBQpp9np4WFLgrx1GWAQL7hwP+NZgbgI+zS4xxdGmDSqF75Z1fCKM59AcG
+S+zzfY5KK6KJW7lNv2BuFKk+ieaWNRc1ePk1rYMs3WM3GP7qiBAqKquy1u4gzZyV
+6tpbSUrLqLLPveRdWvBjvUvxuckOq8WrSp0amPMWzsQiXiwI7pXHSAf486nnGe13
+YjEoGN/6lT4=
+=/Yqb
+-----END PGP SIGNATURE-----
diff --git a/sys-apps/net-tools/net-tools-1.60-r9.ebuild b/sys-apps/net-tools/net-tools-1.60-r9.ebuild
index 028185eaae92..78030870123c 100644
--- a/sys-apps/net-tools/net-tools-1.60-r9.ebuild
+++ b/sys-apps/net-tools/net-tools-1.60-r9.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/sys-apps/net-tools/net-tools-1.60-r9.ebuild,v 1.15 2005/01/02 23:43:25 ciaranm Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/net-tools/net-tools-1.60-r9.ebuild,v 1.16 2005/05/30 02:42:32 solar Exp $
inherit flag-o-matic toolchain-funcs eutils
@@ -12,7 +12,7 @@ SRC_URI="http://www.tazenda.demon.co.uk/phil/net-tools/${P}.tar.bz2
LICENSE="GPL-2"
SLOT="0"
KEYWORDS="alpha amd64 arm hppa ia64 mips ppc ppc64 s390 sh sparc x86"
-IUSE="nls build static uclibc"
+IUSE="nls build static"
RDEPEND=""
DEPEND="nls? ( sys-devel/gettext )
@@ -63,7 +63,7 @@ src_unpack() {
sed -i -e "s:/usr/man:/usr/share/man:" man/Makefile \
|| die "sed man/Makefile failed"
- if ! use uclibc ; then
+ if ! use elibc_uclibc ; then
cp -f ${PATCHDIR}/ether-wake.c ${S}
cp -f ${PATCHDIR}/ether-wake.8 ${S}/man/en_US
fi
@@ -89,7 +89,7 @@ src_compile() {
emake i18ndir || die "emake i18ndir failed"
fi
- if ! use uclibc ; then
+ if ! use elibc_uclibc ; then
$(tc-getCC) ${CFLAGS} -o ether-wake ether-wake.c || die "ether-wake failed to build"
fi
}
@@ -97,13 +97,13 @@ src_compile() {
src_install() {
make BASEDIR="${D}" install || die "make install failed"
- if ! use uclibc ; then
+ if ! use elibc_uclibc ; then
dosbin ether-wake || die "dosbin failed"
fi
mv ${D}/bin/* ${D}/sbin || die "mv failed"
mv ${D}/sbin/{hostname,domainname,netstat,dnsdomainname,ypdomainname,nisdomainname} ${D}/bin \
|| die "mv failed"
- use uclibc && rm -f ${D}/bin/{yp,nis}domainname
+ use elibc_uclibc && rm -f ${D}/bin/{yp,nis}domainname
dodir /usr/bin
dosym /bin/hostname /usr/bin/hostname