added uclibc support

5 files changed, 34 insertions, 10 deletions

diff --git a/sys-apps/grep/ChangeLog b/sys-apps/grep/ChangeLog
index 70edf9060796..d3f812b4ab62 100644
--- a/sys-apps/grep/ChangeLog
+++ b/sys-apps/grep/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for sys-apps/grep
 # Copyright 2002-2004 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/grep/ChangeLog,v 1.27 2004/06/12 05:36:56 mr_bones_ Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/grep/ChangeLog,v 1.28 2004/06/15 07:06:41 solar Exp $
+
+  15 Jun 2004; <solar@gentoo.org> grep-2.5.1-r1.ebuild,
+  files/grep-2.5.1-restrict_arr.patch:
+  added uclibc support
 
 *grep-2.5.1-r4 (11 Jun 2004)
 
diff --git a/sys-apps/grep/files/grep-2.5.1-restrict_arr.patch b/sys-apps/grep/files/grep-2.5.1-restrict_arr.patch
new file mode 100644
index 000000000000..aa71bbcb9db0
--- /dev/null
+++ b/sys-apps/grep/files/grep-2.5.1-restrict_arr.patch
@@ -0,0 +1,12 @@
+--- lib/posix/regex.h.mps	2004-06-09 22:00:00.000000000 +0200
++++ lib/posix/regex.h	2004-06-09 22:00:40.000000000 +0200
+@@ -533,7 +533,9 @@ extern int re_exec _RE_ARGS ((const char
+ /* For now unconditionally define __restrict_arr to expand to nothing.
+    Ideally we would have a test for the compiler which allows defining
+    it to restrict.  */
++#ifndef __restrict_arr
+ #define __restrict_arr
++#endif
+ 
+ /* POSIX compatibility.  */
+ extern int regcomp _RE_ARGS ((regex_t *__restrict __preg,
diff --git a/sys-apps/grep/grep-2.5.1-r1.ebuild b/sys-apps/grep/grep-2.5.1-r1.ebuild
index f24955509de9..553b663561d4 100644
--- a/sys-apps/grep/grep-2.5.1-r1.ebuild
+++ b/sys-apps/grep/grep-2.5.1-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2004 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/grep/grep-2.5.1-r1.ebuild,v 1.21 2004/04/29 01:09:38 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/grep/grep-2.5.1-r1.ebuild,v 1.22 2004/06/15 07:06:41 solar Exp $
 
 inherit gnuconfig flag-o-matic eutils
 
@@ -13,7 +13,7 @@ SRC_URI="http://ftp.club.cc.cmu.edu/pub/gnu/${PN}/${P}.tar.gz
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="x86 ppc sparc mips alpha arm hppa amd64 ia64 ppc64 s390"
-IUSE="nls build"
+IUSE="nls build uclibc"
 
 DEPEND="virtual/glibc
 	nls? ( sys-devel/gettext )"
@@ -25,6 +25,7 @@ src_unpack() {
 	if [ "${ARCH}" = "sparc" -a "${PROFILE_ARCH}" = "sparc" ] ; then
 		epatch ${FILESDIR}/gentoo-sparc32-dfa.patch
 	fi
+	use uclibc && epatch ${FILESDIR}/grep-2.5.1-restrict_arr.patch
 }
 
 src_compile() {
@@ -33,6 +34,7 @@ src_compile() {
 
 	local myconf=""
 	use nls || myconf="--disable-nls"
+	use uclibc && myconf="${myconf} --without-included-regex"
 	use static && append-flags -static && append-ldflags -static
 
 	econf \
diff --git a/sys-apps/net-tools/ChangeLog b/sys-apps/net-tools/ChangeLog
index 7e597d182d79..39c7c5cd87b5 100644
--- a/sys-apps/net-tools/ChangeLog
+++ b/sys-apps/net-tools/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for sys-apps/net-tools
 # Copyright 2002-2004 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/net-tools/ChangeLog,v 1.29 2004/04/19 05:47:26 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/net-tools/ChangeLog,v 1.30 2004/06/15 07:09:54 solar Exp $
+
+  15 Jun 2004; <solar@gentoo.org> net-tools-1.60-r8.ebuild:
+  added uclibc support
 
   19 Apr 2004; Mike Frysinger <vapier@gentoo.org> :
   Add gcc-3.4 patch #48167 by George L. Emigh.
diff --git a/sys-apps/net-tools/net-tools-1.60-r8.ebuild b/sys-apps/net-tools/net-tools-1.60-r8.ebuild
index 80095394c08b..1a2453afd437 100644
--- a/sys-apps/net-tools/net-tools-1.60-r8.ebuild
+++ b/sys-apps/net-tools/net-tools-1.60-r8.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2004 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/net-tools/net-tools-1.60-r8.ebuild,v 1.3 2004/05/03 22:28:28 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/net-tools/net-tools-1.60-r8.ebuild,v 1.4 2004/06/15 07:09:54 solar Exp $
 
 inherit flag-o-matic gcc 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="x86 ppc sparc mips alpha arm hppa amd64 ia64 ppc64 s390"
-IUSE="nls build static"
+IUSE="nls build static uclibc"
 
 DEPEND="nls? ( sys-devel/gettext )
 	>=sys-apps/sed-4"
@@ -57,8 +57,10 @@ src_unpack() {
 	sed -i -e "s:/usr/man:/usr/share/man:" man/Makefile \
 		|| die "sed man/Makefile failed"
 
-	cp -f ${PATCHDIR}/ether-wake.c ${S}
-	cp -f ${PATCHDIR}/ether-wake.8 ${S}/man/en_US
+	if ! use uclibc ; then
+		cp -f ${PATCHDIR}/ether-wake.c ${S}
+		cp -f ${PATCHDIR}/ether-wake.8 ${S}/man/en_US
+	fi
 
 	if ! use nls ; then
 		sed -i -e 's:\(#define I18N\) 1:\1 0:' config.h || \
@@ -83,18 +85,19 @@ src_compile() {
 		cd ..
 	fi
 
-	$(gcc-getCC) ${CFLAGS} -o ether-wake ether-wake.c || die "ether-wake failed to build"
+	use uclibc || $(gcc-getCC) ${CFLAGS} -o ether-wake ether-wake.c || die "ether-wake failed to build"
 }
 
 src_install() {
 	make BASEDIR=${D} install || die
 
-	dosbin ether-wake || die
+	use uclibc || dosbin ether-wake || die
 	mv ${D}/bin/* ${D}/sbin
 	for i in hostname domainname netstat dnsdomainname ypdomainname nisdomainname
 	do
 		mv ${D}/sbin/${i} ${D}/bin
 	done
+	use uclibc && rm -f ${D}/bin/{yp,nis}domainname
 	dodir /usr/bin
 	dosym /bin/hostname /usr/bin/hostname