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.

Package-Manager: portage-2.0.51.19

12 files changed, 193 insertions, 118 deletions

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