Version bump for bug 84344; Marked 1.8 stable on x86. Tidy old crusty ebuilds. Moved replace-sparc64-flags to src_compile where it belongs; replaced naughty useradd stuff with enewuser calls.

(Portage version: 2.0.51.19)

20 files changed, 277 insertions, 376 deletions

diff --git a/www-servers/fnord/ChangeLog b/www-servers/fnord/ChangeLog
index b634de22359b..a7fa09814b40 100644
--- a/www-servers/fnord/ChangeLog
+++ b/www-servers/fnord/ChangeLog
@@ -1,6 +1,18 @@
 # ChangeLog for www-servers/fnord
 # Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/www-servers/fnord/ChangeLog,v 1.7 2005/03/03 18:48:54 ciaranm Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-servers/fnord/ChangeLog,v 1.8 2005/03/07 10:37:47 ka0ttic Exp $
+
+*fnord-1.9 (07 Mar 2005)
+
+  07 Mar 2005; Aaron Walker <ka0ttic@gentoo.org>
+  -files/fnord-1.2-gentoo.diff, -files/fnord-1.5-gentoo.diff,
+  -files/fnord-1.6-gentoo.diff, -files/fnord-1.7-gentoo.diff,
+  +files/fnord-1.8-gentoo.diff, +files/fnord-1.9-gentoo.diff,
+  -fnord-1.2.ebuild, -fnord-1.5.ebuild, -fnord-1.6.ebuild,
+  -fnord-1.7.ebuild, fnord-1.8.ebuild, +fnord-1.9.ebuild:
+  Version bump for bug 84344; Marked 1.8 stable on x86. Tidy old crusty
+  ebuilds. Moved replace-sparc64-flags to src_compile where it belongs;
+  replaced naughty useradd stuff with enewuser calls.
 
   03 Mar 2005; Ciaran McCreesh <ciaranm@gentoo.org> fnord-1.2.ebuild,
   fnord-1.5.ebuild, fnord-1.6.ebuild, fnord-1.7.ebuild, fnord-1.8.ebuild:
diff --git a/www-servers/fnord/Manifest b/www-servers/fnord/Manifest
index 38da76493c27..dd70dca16540 100644
--- a/www-servers/fnord/Manifest
+++ b/www-servers/fnord/Manifest
@@ -1,26 +1,8 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
-MD5 10fda0496ef8fb7ec3c7fbb39ace04dc fnord-1.5.ebuild 1143
-MD5 242995d506b4fd3a849f53bab9f1969b fnord-1.8.ebuild 1374
-MD5 2bc2427f12d46d85ea3eee176f6b8b61 fnord-1.7.ebuild 1159
-MD5 c3c307e543d5e110129a32a4193e694f ChangeLog 2547
-MD5 912786d0ca83ddbc3724ec6eb88cf96d fnord-1.2.ebuild 808
+MD5 52678da31096453afeae0a37e6fe5ccb fnord-1.9.ebuild 1021
+MD5 d5b87e230d975e4c484d5da226517288 fnord-1.8.ebuild 1043
+MD5 d0eca2c620ab51e3312707579e548d78 ChangeLog 3124
 MD5 4a186842848d9c384e2d12785ba426bc metadata.xml 165
-MD5 afe925c96dc1f987c3991cb8e8f8c458 fnord-1.6.ebuild 1143
-MD5 21beb01e04084f4563874810ede17c52 files/digest-fnord-1.7 61
-MD5 cfe29c85fe244c226c7fb0447dc65f9a files/fnord-1.6-gentoo.diff 1067
-MD5 425afc9577f40bd59da3670f501397a5 files/digest-fnord-1.6 61
-MD5 cfe29c85fe244c226c7fb0447dc65f9a files/fnord-1.5-gentoo.diff 1067
-MD5 930bc8292c8284d9a03358ea9800ab5d files/fnord-1.2-gentoo.diff 566
-MD5 cfe29c85fe244c226c7fb0447dc65f9a files/fnord-1.7-gentoo.diff 1067
-MD5 b62630fa7f881f229b3e8005ecc61357 files/digest-fnord-1.2 61
-MD5 11565a1aba8d8158cbb63ed770acc2d1 files/digest-fnord-1.5 61
-MD5 85428d084958af68c83cb83b276287a4 files/digest-fnord-1.8 125
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.2.6 (GNU/Linux)
-
-iD8DBQFCJ1wKLLFUmVNQ7rkRAo8sAJ0a703wue4bXr3aUJTABfNsItVgXACfaEMQ
-7EEEv5rDxpOEp/2BlXFUlV8=
-=fO0+
------END PGP SIGNATURE-----
+MD5 1d9ee0b855c06d76df64dc86afba9a7d files/digest-fnord-1.8 61
+MD5 877e5b40e7ec509a900652d0861fde6c files/digest-fnord-1.9 61
+MD5 75acbce97597457068fb8121940fe60b files/fnord-1.8-gentoo.diff 3085
+MD5 90a1130421471ca792b334582f788751 files/fnord-1.9-gentoo.diff 3096
diff --git a/www-servers/fnord/files/digest-fnord-1.2 b/www-servers/fnord/files/digest-fnord-1.2
deleted file mode 100644
index 063daa276819..000000000000
--- a/www-servers/fnord/files/digest-fnord-1.2
+++ /dev/null
@@ -1 +0,0 @@
-MD5 ad5b7a3e44862e1af44fbea9be80af4c fnord-1.2.tar.bz2 23880
diff --git a/www-servers/fnord/files/digest-fnord-1.5 b/www-servers/fnord/files/digest-fnord-1.5
deleted file mode 100644
index 793e72a9cd95..000000000000
--- a/www-servers/fnord/files/digest-fnord-1.5
+++ /dev/null
@@ -1 +0,0 @@
-MD5 e391820c9894224a9f41de2beb61c1a0 fnord-1.5.tar.bz2 25110
diff --git a/www-servers/fnord/files/digest-fnord-1.6 b/www-servers/fnord/files/digest-fnord-1.6
deleted file mode 100644
index 073d04351e68..000000000000
--- a/www-servers/fnord/files/digest-fnord-1.6
+++ /dev/null
@@ -1 +0,0 @@
-MD5 475519f17c2a1cdcbc1604dadecf0b83 fnord-1.6.tar.bz2 25338
diff --git a/www-servers/fnord/files/digest-fnord-1.7 b/www-servers/fnord/files/digest-fnord-1.7
deleted file mode 100644
index ce810ced552b..000000000000
--- a/www-servers/fnord/files/digest-fnord-1.7
+++ /dev/null
@@ -1 +0,0 @@
-MD5 1625fdff8323959ba7aa1bbba9772b01 fnord-1.7.tar.bz2 26325
diff --git a/www-servers/fnord/files/digest-fnord-1.8 b/www-servers/fnord/files/digest-fnord-1.8
index 5c7d12c0b270..70e37fd43f3f 100644
--- a/www-servers/fnord/files/digest-fnord-1.8
+++ b/www-servers/fnord/files/digest-fnord-1.8
@@ -1,2 +1 @@
 MD5 b695893e0d3073e5237303b0808c6470 fnord-1.8.tar.bz2 28206
-MD5 98cb7da912c56ddbf9173e62514bab3c fnord-1.8-gentoo.diff 1067
diff --git a/www-servers/fnord/files/digest-fnord-1.9 b/www-servers/fnord/files/digest-fnord-1.9
new file mode 100644
index 000000000000..d85328fba2c4
--- /dev/null
+++ b/www-servers/fnord/files/digest-fnord-1.9
@@ -0,0 +1 @@
+MD5 7867e64539e1ad1f98704275e2f95387 fnord-1.9.tar.bz2 28753
diff --git a/www-servers/fnord/files/fnord-1.2-gentoo.diff b/www-servers/fnord/files/fnord-1.2-gentoo.diff
deleted file mode 100644
index 8c59be99f211..000000000000
--- a/www-servers/fnord/files/fnord-1.2-gentoo.diff
+++ /dev/null
@@ -1,20 +0,0 @@
---- httpd.c.orig	Sat Mar 30 15:04:06 2002
-+++ httpd.c	Sat Mar 30 15:06:52 2002
-@@ -24,7 +24,7 @@
- #include "scan.h"
- 
- /* uncomment the following line to enable support for CGI */
--// #define CGI
-+#define CGI
- 
- #ifdef CGI
- /* uncomment the following line to enable support for "index.cgi"
-@@ -34,7 +34,7 @@
- 
- /* uncomment the following line to enable support for autogenerated
-  * directory-listings for directories without index */
--/* #define DIR_LIST */
-+#define DIR_LIST
- 
- #ifdef DIR_LIST
- /* uncomment the following line to enable support for system symlink
diff --git a/www-servers/fnord/files/fnord-1.5-gentoo.diff b/www-servers/fnord/files/fnord-1.5-gentoo.diff
deleted file mode 100644
index d33d415217da..000000000000
--- a/www-servers/fnord/files/fnord-1.5-gentoo.diff
+++ /dev/null
@@ -1,31 +0,0 @@
---- httpd.c.orig	2002-09-17 12:26:41.000000000 +0200
-+++ httpd.c	2002-09-17 12:27:02.000000000 +0200
-@@ -23,7 +23,7 @@
- #include "scan.h"
- 
- /* uncomment the following line to enable support for CGI */
--// #define CGI
-+#define CGI
- 
- #ifdef CGI
- /* uncomment the following line to enable support for "index.cgi"
-@@ -37,7 +37,7 @@
- 
- /* uncomment the following line to enable support for autogenerated
-  * directory-listings for directories without index */
--/* #define DIR_LIST */
-+#define DIR_LIST
- 
- #ifdef DIR_LIST
- /* uncomment the following line to enable support for system symlink
---- fnord-conf.orig	2002-09-17 12:25:31.000000000 +0200
-+++ fnord-conf	2002-09-17 12:25:46.000000000 +0200
-@@ -17,7 +17,7 @@
- mkdir -p $dir
- echo "#!/bin/sh" > $dir/run
- echo "cd $webroot" >> $dir/run
--echo "exec tcpserver -u $acct -RHl localhost ${myip:-0} 80 /command/fnord-httpd 2>&1" >> $dir/run
-+echo "exec tcpserver -u $acct -RHl localhost ${myip:-0} 80 /usr/bin/fnord 2>&1" >> $dir/run
- chmod 755 $dir/run
- 
- # tell old daemontools that it should spawn a log process, too
diff --git a/www-servers/fnord/files/fnord-1.6-gentoo.diff b/www-servers/fnord/files/fnord-1.6-gentoo.diff
deleted file mode 100644
index d33d415217da..000000000000
--- a/www-servers/fnord/files/fnord-1.6-gentoo.diff
+++ /dev/null
@@ -1,31 +0,0 @@
---- httpd.c.orig	2002-09-17 12:26:41.000000000 +0200
-+++ httpd.c	2002-09-17 12:27:02.000000000 +0200
-@@ -23,7 +23,7 @@
- #include "scan.h"
- 
- /* uncomment the following line to enable support for CGI */
--// #define CGI
-+#define CGI
- 
- #ifdef CGI
- /* uncomment the following line to enable support for "index.cgi"
-@@ -37,7 +37,7 @@
- 
- /* uncomment the following line to enable support for autogenerated
-  * directory-listings for directories without index */
--/* #define DIR_LIST */
-+#define DIR_LIST
- 
- #ifdef DIR_LIST
- /* uncomment the following line to enable support for system symlink
---- fnord-conf.orig	2002-09-17 12:25:31.000000000 +0200
-+++ fnord-conf	2002-09-17 12:25:46.000000000 +0200
-@@ -17,7 +17,7 @@
- mkdir -p $dir
- echo "#!/bin/sh" > $dir/run
- echo "cd $webroot" >> $dir/run
--echo "exec tcpserver -u $acct -RHl localhost ${myip:-0} 80 /command/fnord-httpd 2>&1" >> $dir/run
-+echo "exec tcpserver -u $acct -RHl localhost ${myip:-0} 80 /usr/bin/fnord 2>&1" >> $dir/run
- chmod 755 $dir/run
- 
- # tell old daemontools that it should spawn a log process, too
diff --git a/www-servers/fnord/files/fnord-1.7-gentoo.diff b/www-servers/fnord/files/fnord-1.7-gentoo.diff
deleted file mode 100644
index d33d415217da..000000000000
--- a/www-servers/fnord/files/fnord-1.7-gentoo.diff
+++ /dev/null
@@ -1,31 +0,0 @@
---- httpd.c.orig	2002-09-17 12:26:41.000000000 +0200
-+++ httpd.c	2002-09-17 12:27:02.000000000 +0200
-@@ -23,7 +23,7 @@
- #include "scan.h"
- 
- /* uncomment the following line to enable support for CGI */
--// #define CGI
-+#define CGI
- 
- #ifdef CGI
- /* uncomment the following line to enable support for "index.cgi"
-@@ -37,7 +37,7 @@
- 
- /* uncomment the following line to enable support for autogenerated
-  * directory-listings for directories without index */
--/* #define DIR_LIST */
-+#define DIR_LIST
- 
- #ifdef DIR_LIST
- /* uncomment the following line to enable support for system symlink
---- fnord-conf.orig	2002-09-17 12:25:31.000000000 +0200
-+++ fnord-conf	2002-09-17 12:25:46.000000000 +0200
-@@ -17,7 +17,7 @@
- mkdir -p $dir
- echo "#!/bin/sh" > $dir/run
- echo "cd $webroot" >> $dir/run
--echo "exec tcpserver -u $acct -RHl localhost ${myip:-0} 80 /command/fnord-httpd 2>&1" >> $dir/run
-+echo "exec tcpserver -u $acct -RHl localhost ${myip:-0} 80 /usr/bin/fnord 2>&1" >> $dir/run
- chmod 755 $dir/run
- 
- # tell old daemontools that it should spawn a log process, too
diff --git a/www-servers/fnord/files/fnord-1.8-gentoo.diff b/www-servers/fnord/files/fnord-1.8-gentoo.diff
new file mode 100644
index 000000000000..147e7ab485b9
--- /dev/null
+++ b/www-servers/fnord/files/fnord-1.8-gentoo.diff
@@ -0,0 +1,96 @@
+diff --exclude='*~' -urN fnord-1.8.orig/fnord-conf fnord-1.8/fnord-conf
+--- fnord-1.8.orig/fnord-conf	2005-03-06 22:45:55.181287400 -0500
++++ fnord-1.8/fnord-conf	2005-03-06 22:46:13.049571008 -0500
+@@ -17,7 +17,7 @@
+ mkdir -p $dir
+ echo "#!/bin/sh" > $dir/run
+ echo "cd $webroot" >> $dir/run
+-echo "exec tcpserver -u $acct -RHl localhost ${myip:-0} 80 /command/fnord-httpd 2>&1" >> $dir/run
++echo "exec tcpserver -u $acct -RHl localhost ${myip:-0} 80 /usr/bin/fnord 2>&1" >> $dir/run
+ chmod 755 $dir/run
+ 
+ # tell old daemontools that it should spawn a log process, too
+diff --exclude='*~' -urN fnord-1.8.orig/httpd.c fnord-1.8/httpd.c
+--- fnord-1.8.orig/httpd.c	2005-03-06 22:45:55.181287400 -0500
++++ fnord-1.8/httpd.c	2005-03-06 22:48:01.591070192 -0500
+@@ -25,7 +25,9 @@
+ #include "scan.h"
+ 
+ /* uncomment the following line to enable support for CGI */
+-// #define CGI
++#ifndef CGI
++# define CGI
++#endif
+ 
+ #ifdef CGI
+ /* uncomment the following line to enable support for "index.cgi"
+@@ -39,7 +41,9 @@
+ 
+ /* uncomment the following line to enable support for autogenerated
+  * directory-listings for directories without index */
+-/* #define DIR_LIST */
++#ifndef DIR_LIST
++# define DIR_LIST
++#endif
+ 
+ #ifdef DIR_LIST
+ /* uncomment the following line to enable support for system symlink
+diff --exclude='*~' -urN fnord-1.8.orig/Makefile fnord-1.8/Makefile
+--- fnord-1.8.orig/Makefile	2005-03-06 22:45:55.178287856 -0500
++++ fnord-1.8/Makefile	2005-03-06 22:50:44.729269416 -0500
+@@ -1,28 +1,19 @@
+-CC=gcc
+-CXX=g++
+-
+-#LIBOWFAT=../libowfat/
+-DIET=diet -Os
+-
+-CFLAGS=-Os -fomit-frame-pointer
+-#CFLAGS=-g
++CC:=gcc
++CXX:=g++
+ 
+ all: fnord fnord-cgi fnord-idx
+ 
+ fnord: httpd
+ 	cp -p $^ $@
+-	-strip -R .note -R .comment $@
+ 
+ httpd: httpd.o libowfat.a
+ 	$(DIET) $(CC) -o $@ $^ $(CFLAGS)
+ 
+ fnord-cgi: httpd-cgi.o libowfat.a
+ 	$(DIET) $(CC) -o $@ $^ $(CFLAGS)
+-	-strip -R .note -R .comment $@
+ 
+ fnord-idx: httpd-idx.o libowfat.a
+ 	$(DIET) $(CC) -o $@ $^ $(CFLAGS)
+-	-strip -R .note -R .comment $@
+ 
+ libowfat.a: httpd.o buffer_1.o buffer_puts.o buffer_flush.o buffer_put.o \
+ buffer_putulong.o buffer_2.o buffer_putspace.o buffer_stubborn.o \
+@@ -32,19 +23,19 @@
+ 	-ranlib $@
+ 
+ httpd.o: httpd.c
+-	$(DIET) $(CC) -pipe $(CFLAGS) -c $^ -DFNORD=\"fnord/$(shell head -1 CHANGES|sed 's/://')\"
++	$(DIET) $(CC) $(CFLAGS) -c $^ -DFNORD=\"fnord/$(shell head -1 CHANGES|sed 's/://')\"
+ 
+ httpd-cgi.o: httpd.c
+-	$(DIET) $(CC) -pipe $(CFLAGS) -c httpd.c -o $@ -DCGI -DFNORD=\"fnord/$(shell head -1 CHANGES|sed 's/://')\"
++	$(DIET) $(CC) $(CFLAGS) -c httpd.c -o $@ -DCGI -DFNORD=\"fnord/$(shell head -1 CHANGES|sed 's/://')\"
+ 
+ httpd-idx.o: httpd.c
+-	$(DIET) $(CC) -pipe $(CFLAGS) -c httpd.c -o $@ -DDIR_LIST -DFNORD=\"fnord/$(shell head -1 CHANGES|sed 's/://')\"
++	$(DIET) $(CC) $(CFLAGS) -c httpd.c -o $@ -DDIR_LIST -DFNORD=\"fnord/$(shell head -1 CHANGES|sed 's/://')\"
+ 
+ %.o: %.c
+-	$(DIET) $(CC) -pipe $(CFLAGS) -c $^
++	$(DIET) $(CC) $(CFLAGS) -c $^
+ 
+ %.o: %.cpp
+-	$(DIET) $(CXX) -pipe $(CFLAGS) -c $^
++	$(DIET) $(CXX) $(CFLAGS) -c $^
+ 
+ .PHONY: rename clean install server
+ server: fnord
diff --git a/www-servers/fnord/files/fnord-1.9-gentoo.diff b/www-servers/fnord/files/fnord-1.9-gentoo.diff
new file mode 100644
index 000000000000..c32c53daf539
--- /dev/null
+++ b/www-servers/fnord/files/fnord-1.9-gentoo.diff
@@ -0,0 +1,96 @@
+diff --exclude='*~' -urN fnord-1.9.orig/fnord-conf fnord-1.9/fnord-conf
+--- fnord-1.9.orig/fnord-conf	2003-06-05 19:32:39.000000000 -0400
++++ fnord-1.9/fnord-conf	2005-03-06 22:39:30.243806792 -0500
+@@ -17,7 +17,7 @@
+ mkdir -p $dir
+ echo "#!/bin/sh" > $dir/run
+ echo "cd $webroot" >> $dir/run
+-echo "exec envuidgid $acct tcpserver -RHl localhost ${myip:-0} 80 fnord 2>&1" >> $dir/run
++echo "exec envuidgid $acct tcpserver -RHl localhost ${myip:-0} 80 /usr/bin/fnord 2>&1" >> $dir/run
+ chmod 755 $dir/run
+ 
+ # tell old daemontools that it should spawn a log process, too
+diff --exclude='*~' -urN fnord-1.9.orig/httpd.c fnord-1.9/httpd.c
+--- fnord-1.9.orig/httpd.c	2005-01-31 11:10:39.000000000 -0500
++++ fnord-1.9/httpd.c	2005-03-06 22:42:07.761860408 -0500
+@@ -25,7 +25,9 @@
+ #include "scan.h"
+ 
+ /* uncomment the following line to enable support for CGI */
+-// #define CGI
++#ifndef CGI
++# define CGI
++#endif
+ 
+ #ifdef CGI
+ /* uncomment the following line to enable support for "index.cgi"
+@@ -39,7 +41,9 @@
+ 
+ /* uncomment the following line to enable support for autogenerated
+  * directory-listings for directories without index */
+-/* #define DIR_LIST */
++#ifndef DIR_LIST
++# define DIR_LIST
++#endif
+ 
+ #ifdef DIR_LIST
+ /* uncomment the following line to enable support for system symlink
+diff --exclude='*~' -urN fnord-1.9.orig/Makefile fnord-1.9/Makefile
+--- fnord-1.9.orig/Makefile	2005-01-31 13:33:58.000000000 -0500
++++ fnord-1.9/Makefile	2005-03-06 22:51:27.914704232 -0500
+@@ -1,28 +1,19 @@
+-CC=gcc
+-CXX=g++
+-
+-#LIBOWFAT=../libowfat/
+-DIET=diet -Os
+-
+-CFLAGS=-Os -fomit-frame-pointer
+-#CFLAGS=-g
++CC:=gcc
++CXX:=g++
+ 
+ all: fnord fnord-cgi fnord-idx
+ 
+ fnord: httpd
+ 	cp -p $^ $@
+-	-strip -R .note -R .comment $@
+ 
+ httpd: httpd.o libowfat.a
+ 	$(DIET) $(CC) -o $@ $^ $(CFLAGS)
+ 
+ fnord-cgi: httpd-cgi.o libowfat.a
+ 	$(DIET) $(CC) -o $@ $^ $(CFLAGS)
+-	-strip -R .note -R .comment $@
+ 
+ fnord-idx: httpd-idx.o libowfat.a
+ 	$(DIET) $(CC) -o $@ $^ $(CFLAGS)
+-	-strip -R .note -R .comment $@
+ 
+ libowfat.a: httpd.o buffer_1.o buffer_puts.o buffer_flush.o buffer_put.o \
+ buffer_putulong.o buffer_2.o buffer_putspace.o buffer_stubborn.o \
+@@ -32,19 +23,19 @@
+ 	-ranlib $@
+ 
+ httpd.o: httpd.c
+-	$(DIET) $(CC) -pipe $(CFLAGS) -c $^ -DFNORD=\"fnord/$(shell head -n 1 CHANGES|sed 's/://')\"
++	$(DIET) $(CC) $(CFLAGS) -c $^ -DFNORD=\"fnord/$(shell head -n 1 CHANGES|sed 's/://')\"
+ 
+ httpd-cgi.o: httpd.c
+-	$(DIET) $(CC) -pipe $(CFLAGS) -c httpd.c -o $@ -DCGI -DFNORD=\"fnord/$(shell head -n 1 CHANGES|sed 's/://')\"
++	$(DIET) $(CC) $(CFLAGS) -c httpd.c -o $@ -DCGI -DFNORD=\"fnord/$(shell head -n 1 CHANGES|sed 's/://')\"
+ 
+ httpd-idx.o: httpd.c
+-	$(DIET) $(CC) -pipe $(CFLAGS) -c httpd.c -o $@ -DDIR_LIST -DFNORD=\"fnord/$(shell head -n 1 CHANGES|sed 's/://')\"
++	$(DIET) $(CC) $(CFLAGS) -c httpd.c -o $@ -DDIR_LIST -DFNORD=\"fnord/$(shell head -n 1 CHANGES|sed 's/://')\"
+ 
+ %.o: %.c
+-	$(DIET) $(CC) -pipe $(CFLAGS) -c $^
++	$(DIET) $(CC) $(CFLAGS) -c $^
+ 
+ %.o: %.cpp
+-	$(DIET) $(CXX) -pipe $(CFLAGS) -c $^
++	$(DIET) $(CXX) $(CFLAGS) -c $^
+ 
+ .PHONY: rename clean install server
+ server: fnord
diff --git a/www-servers/fnord/fnord-1.2.ebuild b/www-servers/fnord/fnord-1.2.ebuild
deleted file mode 100644
index 08201d80cd53..000000000000
--- a/www-servers/fnord/fnord-1.2.ebuild
+++ /dev/null
@@ -1,36 +0,0 @@
-# Copyright 1999-2005 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/www-servers/fnord/fnord-1.2.ebuild,v 1.3 2005/03/03 18:48:54 ciaranm Exp $
-
-S=${WORKDIR}/${P}
-DESCRIPTION="Yet another small httpd."
-SRC_URI="http://www.fefe.de/fnord/${P}.tar.bz2"
-HOMEPAGE="http://www.fefe.de/fnord/"
-KEYWORDS="x86 sparc"
-SLOT="0"
-IUSE=""
-LICENSE="GPL-2"
-
-DEPEND="dev-libs/dietlibc"
-
-RDEPEND="sys-process/daemontools"
-
-src_unpack() {
-	unpack ${A} ; cd ${S}
-	mv Makefile Makefile.orig
-	sed -e "s:^CFLAGS=-O.*:CFLAGS=${CFLAGS}:" \
-		Makefile.orig > Makefile
-
-	patch -p0 < ${FILESDIR}/${PF}-gentoo.diff
-}
-
-src_compile() {
-	emake || die
-}
-
-src_install () {
-	exeinto /usr/bin
-	doexe fnord-conf fnord fnord-cgi
-
-	dodoc TODO README SPEED COPYING CHANGES
-}
diff --git a/www-servers/fnord/fnord-1.5.ebuild b/www-servers/fnord/fnord-1.5.ebuild
deleted file mode 100644
index a871af01db9d..000000000000
--- a/www-servers/fnord/fnord-1.5.ebuild
+++ /dev/null
@@ -1,55 +0,0 @@
-# Copyright 1999-2005 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/www-servers/fnord/fnord-1.5.ebuild,v 1.3 2005/03/03 18:48:54 ciaranm Exp $
-
-S=${WORKDIR}/${P}
-
-DESCRIPTION="Yet another small httpd."
-SRC_URI="http://www.fefe.de/fnord/${P}.tar.bz2"
-HOMEPAGE="http://www.fefe.de/fnord/"
-
-KEYWORDS="x86 sparc"
-SLOT="0"
-LICENSE="GPL-2"
-IUSE=""
-
-DEPEND="dev-libs/dietlibc"
-RDEPEND="sys-process/daemontools"
-
-pkg_setup() {
-
-	if ! grep -q ^fnord: /etc/passwd ; then
-	    useradd  -g nofiles -s /bin/false -d /etc/fnord -c "fnord" fnord\
-			|| die "problem adding user fnord"
-	fi
-	if ! grep -q ^fnordlog: /etc/passwd ; then
-	    useradd  -g nofiles -s /bin/false -d /etc/fnord -c "fnordlog" fnordlog\
-			|| die "problem adding user fnordlog"
-	fi
-}
-
-src_unpack() {
-
-	unpack ${A} ; cd ${S}
-	mv Makefile Makefile.orig
-	sed -e "s:^CFLAGS=-O.*:CFLAGS=${CFLAGS}:" \
-		Makefile.orig > Makefile
-
-	patch -p0 < ${FILESDIR}/${PF}-gentoo.diff
-
-}
-
-src_compile() {
-
-	emake || die
-
-}
-
-src_install () {
-
-	exeinto /usr/bin
-	doexe fnord-conf fnord
-
-	dodoc TODO README SPEED COPYING CHANGES
-
-}
diff --git a/www-servers/fnord/fnord-1.6.ebuild b/www-servers/fnord/fnord-1.6.ebuild
deleted file mode 100644
index 07d4bb83ee8f..000000000000
--- a/www-servers/fnord/fnord-1.6.ebuild
+++ /dev/null
@@ -1,55 +0,0 @@
-# Copyright 1999-2005 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/www-servers/fnord/fnord-1.6.ebuild,v 1.3 2005/03/03 18:48:54 ciaranm Exp $
-
-S=${WORKDIR}/${P}
-
-DESCRIPTION="Yet another small httpd."
-SRC_URI="http://www.fefe.de/fnord/${P}.tar.bz2"
-HOMEPAGE="http://www.fefe.de/fnord/"
-
-KEYWORDS="x86 sparc"
-SLOT="0"
-LICENSE="GPL-2"
-IUSE=""
-
-DEPEND="dev-libs/dietlibc"
-RDEPEND="sys-process/daemontools"
-
-pkg_setup() {
-
-	if ! grep -q ^fnord: /etc/passwd ; then
-	    useradd  -g nofiles -s /bin/false -d /etc/fnord -c "fnord" fnord\
-			|| die "problem adding user fnord"
-	fi
-	if ! grep -q ^fnordlog: /etc/passwd ; then
-	    useradd  -g nofiles -s /bin/false -d /etc/fnord -c "fnordlog" fnordlog\
-			|| die "problem adding user fnordlog"
-	fi
-}
-
-src_unpack() {
-
-	unpack ${A} ; cd ${S}
-	mv Makefile Makefile.orig
-	sed -e "s:^CFLAGS=-O.*:CFLAGS=${CFLAGS}:" \
-		Makefile.orig > Makefile
-
-	patch -p0 < ${FILESDIR}/${PF}-gentoo.diff
-
-}
-
-src_compile() {
-
-	emake || die
-
-}
-
-src_install () {
-
-	exeinto /usr/bin
-	doexe fnord-conf fnord
-
-	dodoc TODO README SPEED COPYING CHANGES
-
-}
diff --git a/www-servers/fnord/fnord-1.7.ebuild b/www-servers/fnord/fnord-1.7.ebuild
deleted file mode 100644
index cb4f27b35125..000000000000
--- a/www-servers/fnord/fnord-1.7.ebuild
+++ /dev/null
@@ -1,55 +0,0 @@
-# Copyright 1999-2005 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/www-servers/fnord/fnord-1.7.ebuild,v 1.4 2005/03/03 18:48:54 ciaranm Exp $
-
-inherit eutils
-
-DESCRIPTION="Yet another small httpd."
-SRC_URI="http://www.fefe.de/fnord/${P}.tar.bz2"
-HOMEPAGE="http://www.fefe.de/fnord/"
-
-KEYWORDS="x86 sparc"
-SLOT="0"
-LICENSE="GPL-2"
-
-DEPEND="dev-libs/dietlibc"
-RDEPEND="sys-process/daemontools"
-IUSE=""
-
-pkg_setup() {
-
-	if ! grep -q ^fnord: /etc/passwd ; then
-	    useradd  -g nofiles -s /bin/false -d /etc/fnord -c "fnord" fnord\
-			|| die "problem adding user fnord"
-	fi
-	if ! grep -q ^fnordlog: /etc/passwd ; then
-	    useradd  -g nofiles -s /bin/false -d /etc/fnord -c "fnordlog" fnordlog\
-			|| die "problem adding user fnordlog"
-	fi
-}
-
-src_unpack() {
-
-	unpack ${A} ; cd ${S}
-	mv Makefile Makefile.orig
-	sed -e "s:^CFLAGS=-O.*:CFLAGS=${CFLAGS}:" \
-		Makefile.orig > Makefile
-
-	epatch ${FILESDIR}/${PF}-gentoo.diff || die "epatch failed."
-
-}
-
-src_compile() {
-
-	emake || die
-
-}
-
-src_install () {
-
-	exeinto /usr/bin
-	doexe fnord-conf fnord
-
-	dodoc TODO README SPEED COPYING CHANGES
-
-}
diff --git a/www-servers/fnord/fnord-1.8.ebuild b/www-servers/fnord/fnord-1.8.ebuild
index a378fa1b5d7b..d2e78e3eadbd 100644
--- a/www-servers/fnord/fnord-1.8.ebuild
+++ b/www-servers/fnord/fnord-1.8.ebuild
@@ -1,18 +1,16 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/www-servers/fnord/fnord-1.8.ebuild,v 1.7 2005/03/03 18:48:54 ciaranm Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-servers/fnord/fnord-1.8.ebuild,v 1.8 2005/03/07 10:37:47 ka0ttic Exp $
 
-# flag-o-matic needed for replace-sparc64-flags
-inherit flag-o-matic eutils
+inherit flag-o-matic eutils fixheadtails
 
 DESCRIPTION="Yet another small httpd."
-SRC_URI="http://www.fefe.de/fnord/${P}.tar.bz2
-	mirror://gentoo/${P}-gentoo.diff"
 HOMEPAGE="http://www.fefe.de/fnord/"
+SRC_URI="http://www.fefe.de/fnord/${P}.tar.bz2"
 
-KEYWORDS="~x86 sparc ppc"
-SLOT="0"
 LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="x86 sparc ppc"
 IUSE="diet"
 
 DEPEND="diet?(dev-libs/dietlibc)
@@ -20,41 +18,30 @@ DEPEND="diet?(dev-libs/dietlibc)
 
 RDEPEND="${DEPEND}
 	sys-process/daemontools
-	sys-apps/ucspi-tcp
-	"
+	sys-apps/ucspi-tcp"
 
 pkg_setup() {
-
-	if ! grep -q ^fnord: /etc/passwd ; then
-	    useradd  -g nofiles -s /bin/false -d /etc/fnord -c "fnord" fnord\
-			|| die "problem adding user fnord"
-	fi
-	if ! grep -q ^fnordlog: /etc/passwd ; then
-	    useradd  -g nofiles -s /bin/false -d /etc/fnord -c "fnordlog" fnordlog\
-			|| die "problem adding user fnordlog"
-	fi
+	enewuser fnord -1 /bin/false /etc/fnord nofiles
+	enewuser fnordlog -1 /bin/false /etc/fnord nofiles
 }
 
 src_unpack() {
-	# Fix for bug #45716
-	replace-sparc64-flags
-
-	unpack ${A} ; cd ${S}
-	sed -i "s:^CFLAGS=-O.*:CFLAGS=${CFLAGS}:" Makefile
-
-	epatch ${DISTDIR}/${PF}-gentoo.diff || die "epatch failed."
+	unpack ${A} && cd ${S}
+	epatch ${FILESDIR}/${P}-gentoo.diff
+	ht_fix_all
 }
 
 src_compile() {
-	local DIET
+	local DIET=""
+	use diet && DIET="diet"
 
-	use diet && DIET=diet || DIET=""
-	emake DIET="$DIET"
+	# Fix for bug #45716
+	replace-sparc64-flags
+
+	emake DIET="${DIET}" CFLAGS="${CFLAGS}" || die "emake failed"
 }
 
 src_install () {
-	exeinto /usr/bin
-	doexe fnord-conf fnord
-
+	dobin fnord-conf fnord || die
 	dodoc TODO README SPEED COPYING CHANGES
 }
diff --git a/www-servers/fnord/fnord-1.9.ebuild b/www-servers/fnord/fnord-1.9.ebuild
new file mode 100644
index 000000000000..ed71a0475b4c
--- /dev/null
+++ b/www-servers/fnord/fnord-1.9.ebuild
@@ -0,0 +1,46 @@
+# Copyright 1999-2005 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/www-servers/fnord/fnord-1.9.ebuild,v 1.1 2005/03/07 10:37:47 ka0ttic Exp $
+
+inherit flag-o-matic eutils
+
+DESCRIPTION="Yet another small httpd."
+HOMEPAGE="http://www.fefe.de/fnord/"
+SRC_URI="http://www.fefe.de/fnord/${P}.tar.bz2"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~x86 ~sparc ~ppc"
+IUSE="diet"
+
+DEPEND="diet?(dev-libs/dietlibc)
+	!diet? ( virtual/libc )"
+
+RDEPEND="${DEPEND}
+	sys-process/daemontools
+	sys-apps/ucspi-tcp"
+
+pkg_setup() {
+	enewuser fnord -1 /bin/false /etc/fnord nofiles
+	enewuser fnordlog -1 /bin/false /etc/fnord nofiles
+}
+
+src_unpack() {
+	unpack ${A} && cd ${S}
+	epatch ${FILESDIR}/${P}-gentoo.diff
+}
+
+src_compile() {
+	local DIET=""
+	use diet && DIET="diet"
+
+	# Fix for bug #45716
+	replace-sparc64-flags
+
+	emake DIET="${DIET}" CFLAGS="${CFLAGS}" || die "emake failed"
+}
+
+src_install () {
+	dobin fnord-conf fnord || die
+	dodoc TODO README SPEED COPYING CHANGES
+}