added patch to allow uclibc to compile without nis

4 files changed, 86 insertions, 10 deletions

diff --git a/sys-fs/devfsd/ChangeLog b/sys-fs/devfsd/ChangeLog
index 7f092651fdb5..4c654c990c25 100644
--- a/sys-fs/devfsd/ChangeLog
+++ b/sys-fs/devfsd/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for sys-fs/devfsd
 # Copyright 2002-2004 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-fs/devfsd/ChangeLog,v 1.10 2004/05/12 13:09:14 pappy Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-fs/devfsd/ChangeLog,v 1.11 2004/06/20 03:08:30 solar Exp $
+
+  19 Jun 2004; <solar@gentoo.org> devfsd-1.3.25-r8.ebuild,
+  files/devfsd-1.3.25-no-nis.patch:
+  added patch to allow uclibc to compile without nis
 
   12 May 2004; Alexander Gabert <pappy@gentoo.org> devfsd-1.3.25-r6.ebuild,
   devfsd-1.3.25-r7.ebuild:
diff --git a/sys-fs/devfsd/Manifest b/sys-fs/devfsd/Manifest
index 75ffb57616d1..6219984f83a4 100644
--- a/sys-fs/devfsd/Manifest
+++ b/sys-fs/devfsd/Manifest
@@ -1,13 +1,14 @@
-MD5 e8460dd8774737764b2788996df8977e ChangeLog 4564
-MD5 3b3024550c2d62d327fadd87e583d378 devfsd-1.3.25-r6.ebuild 1116
-MD5 8d5ee21e9fbd79e6dc3cf42762c09ca3 devfsd-1.3.25-r7.ebuild 1126
-MD5 16a55af09139afd5288f735dd8ae908f devfsd-1.3.25-r8.ebuild 1126
+MD5 205c61d1d9c1cd9fa361561c42ddc158 devfsd-1.3.25-r6.ebuild 1115
+MD5 56fa43af779ebe005c38673bf9d7c39e devfsd-1.3.25-r8.ebuild 1255
+MD5 ee8dde4551551fb818177893971067c9 devfsd-1.3.25-r7.ebuild 1125
+MD5 51cd83a624d0e76884faf126cbf60bef ChangeLog 4712
 MD5 9a09f8d531c582e78977dbfd96edc1f2 metadata.xml 164
-MD5 ebcf65c3f4a7675a7214fb8e28ba9f6d files/devfsd.conf 1555
-MD5 d580e9efc3658a0e71a165b3b531d415 files/devfsd 245
-MD5 41a6be534a78f5a0ad994b10e4134e6e files/devfsd-1.3.25-kernel-2.5.patch 3929
 MD5 b64f47136c8298cec42e00df32c4276f files/devfsd-1.3.25-kernel-2.5.patch.bz2 1556
+MD5 d580e9efc3658a0e71a165b3b531d415 files/devfsd 245
+MD5 3df00d60f0ad517c5489f558c1a95056 files/devfsd-1.3.25-no-nis.patch 2142
 MD5 9483221bc19786c3f7cb5df05a664477 files/devfsd-1.3.25-pic.patch 529
+MD5 ebcf65c3f4a7675a7214fb8e28ba9f6d files/devfsd.conf 1555
+MD5 41a6be534a78f5a0ad994b10e4134e6e files/devfsd-1.3.25-kernel-2.5.patch 3929
 MD5 b8ec7858c1ac54c47302ca839a52188f files/digest-devfsd-1.3.25-r6 65
 MD5 b8ec7858c1ac54c47302ca839a52188f files/digest-devfsd-1.3.25-r7 65
 MD5 b8ec7858c1ac54c47302ca839a52188f files/digest-devfsd-1.3.25-r8 65
diff --git a/sys-fs/devfsd/devfsd-1.3.25-r8.ebuild b/sys-fs/devfsd/devfsd-1.3.25-r8.ebuild
index 1eb893db27c5..ca25d27d7a16 100644
--- a/sys-fs/devfsd/devfsd-1.3.25-r8.ebuild
+++ b/sys-fs/devfsd/devfsd-1.3.25-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-fs/devfsd/devfsd-1.3.25-r8.ebuild,v 1.2 2004/04/06 03:17:56 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-fs/devfsd/devfsd-1.3.25-r8.ebuild,v 1.3 2004/06/20 03:08:30 solar Exp $
 
 inherit eutils flag-o-matic
 
@@ -11,7 +11,7 @@ SRC_URI="ftp://ftp.atnf.csiro.au/pub/people/rgooch/linux/daemons/devfsd/devfsd-v
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="~x86 ~ppc ~sparc ~alpha ~mips hppa ~amd64 ia64 ppc64 s390"
-
+IUSE="uclibc"
 DEPEND="virtual/glibc"
 PROVIDE="virtual/dev-manager"
 
@@ -23,12 +23,14 @@ src_unpack() {
 	cd ${S}
 	epatch ${FILESDIR}/${P}-kernel-2.5.patch
 	epatch ${FILESDIR}/${P}-pic.patch
+	use uclibc && epatch ${FILESDIR}/${P}-no-nis.patch
 
 	sed -e "s:-O2:${CFLAGS}:g" \
 		-e 's:/usr/man:/usr/share/man:' \
 		-e '32,34d;11,16d' -e '6c\' \
 		-e 'DEFINES	:= -DLIBNSL="\\"/lib/libnsl.so.1\\""' \
 		-i GNUmakefile
+	use uclibc && sed -e 's|libnsl.so.1|libnsl.so.0|' -i GNUmakefile
 }
 
 src_compile() {
diff --git a/sys-fs/devfsd/files/devfsd-1.3.25-no-nis.patch b/sys-fs/devfsd/files/devfsd-1.3.25-no-nis.patch
new file mode 100644
index 000000000000..c676b7e980c9
--- /dev/null
+++ b/sys-fs/devfsd/files/devfsd-1.3.25-no-nis.patch
@@ -0,0 +1,69 @@
+--- devfsd/devfsd.c.mps	2003-12-04 15:54:03.000000000 +0100
++++ devfsd/devfsd.c	2003-12-04 16:05:32.000000000 +0100
+@@ -283,8 +283,10 @@
+ #include <regex.h>
+ #include <errno.h>
+ #include <dlfcn.h>
++#ifdef HAVE_NIS
+ #include <rpcsvc/ypclnt.h>
+ #include <rpcsvc/yp_prot.h>
++#endif
+ #include <karma.h>
+ #include "devfsd.h"
+ #include "version.h"
+@@ -414,9 +416,11 @@
+ 			      unsigned long *event_mask);
+ static void process_config_line (CONST char *line, unsigned long *event_mask);
+ static void *dlsym_nofail (const char *file, void *handle, char *symbol);
++#ifdef HAVE_NIS
+ static int process_yp_line (int instatus, char *inkey, int inkeylen,
+ 			    char *inval, int invallen, char *indata);
+ static void load_libnsl (void);
++#endif
+ static flag do_servicing (int fd, unsigned long event_mask);
+ static void service_name (const struct devfsd_notify_struct *info);
+ static void action_permissions (const struct devfsd_notify_struct *info,
+@@ -486,9 +490,11 @@
+     {"fd/2", "stderr"},
+     {NULL, NULL},
+ };
++#ifdef HAVE_NIS
+ static int (*my_yp_all) (char *domain, char *map,
+ 			 struct ypall_callback *callback); /* = NULL */
+ static int (*my_yp_get_default_domain) (char **domainptr); /* = NULL */
++#endif
+ static struct event_type
+ {
+     unsigned int type;        /*  The DEVFSD_NOTIFY_* value                  */
+@@ -714,6 +720,7 @@
+     [RETURNS] Nothing.
+ */
+ {
++#ifdef HAVE_NIS
+     if (location[0] == '+')
+     {
+ 	/*  It's a YP map  */
+@@ -736,6 +743,7 @@
+ 	SYSLOG (LOG_ERR, "error reading map: \"%s\"\n", location + 1);
+ 	exit (1);
+     }
++#endif
+     read_config_file (location, optional, event_mask);
+ }   /*  End Function read_config   */
+ 
+@@ -1006,6 +1014,7 @@
+     return (result);
+ }   /*  End Function dlsym_nofail  */
+ 
++#ifdef HAVE_NIS
+ static void load_libnsl (void)
+ {
+ #ifdef LIBNSL  /*  It comes from a shared object  */
+@@ -1034,6 +1043,7 @@
+     if (invallen > 0) process_config_line (inval, (unsigned long *) indata);
+     return (0);
+ }   /*  End Function process_yp_line  */
++#endif
+ 
+ static flag do_servicing (int fd, unsigned long event_mask)
+ /*  [SUMMARY] Service devfs changes until a signal is received.