respect LDFLAGS (#336768)

Package-Manager: portage-2.2_rc98/cvs/Linux i686

4 files changed, 155 insertions, 13 deletions

diff --git a/www-servers/fnord/ChangeLog b/www-servers/fnord/ChangeLog
index 045d0caac691..844f011c9f51 100644
--- a/www-servers/fnord/ChangeLog
+++ b/www-servers/fnord/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for www-servers/fnord
-# Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/www-servers/fnord/ChangeLog,v 1.20 2008/08/22 22:23:47 cardoe Exp $
+# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/www-servers/fnord/ChangeLog,v 1.21 2010/10/22 18:06:37 bangert Exp $
+
+*fnord-1.10-r2 (22 Oct 2010)
+
+  22 Oct 2010; Thilo Bangert <bangert@gentoo.org> +fnord-1.10-r2.ebuild,
+  +files/fnord-1.10-gentoo.diff:
+  respect LDFLAGS (#336768)
 
   22 Aug 2008; Doug Goldstein <cardoe@gentoo.org> metadata.xml:
   add GLEP 56 USE flag desc from use.local.desc
diff --git a/www-servers/fnord/Manifest b/www-servers/fnord/Manifest
index 46f9f50b1d61..c201e6fc6a45 100644
--- a/www-servers/fnord/Manifest
+++ b/www-servers/fnord/Manifest
@@ -1,16 +1,8 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
+AUX fnord-1.10-gentoo.diff 3204 RMD160 9a3fa1befc9624e65521a6c2256d07488fd70afb SHA1 94b5adf5bbf6f1c65c809cbc4b7f9159bcedcc6b SHA256 d770079e5025288dc8d6ca8d4d7f7f2c9c62964f7fa4d415ccc2438f700c9b7f
 AUX fnord-1.8-gentoo.diff 3085 RMD160 a86544b28877d234b638f432d7316e730dfe7f4c SHA1 77b24b4f62ecbb8d421da980059efcacd43f0097 SHA256 07f6d06b609e14a1e47aef851af9ae31ba9355d691ecfe7fbe8aa641e104ac2a
 AUX fnord-1.9-gentoo.diff 3096 RMD160 89bfaa9c4eb6fa0f7ff19473c40dcb3bb6d18b0f SHA1 a54ffe9bfcb2f3557dc6f984141e16b56ac8c74b SHA256 83cd58110845e4549ccf8f70409c103fd80b27f0a3c0fc12ee67ca9dda385518
 DIST fnord-1.10.tar.bz2 33408 RMD160 100432729d24c49adb869dea6dcdf916e8c780d3 SHA1 b40611c05e18deaca43094f379cb1e138ced7f0c SHA256 39a878e910d569fbf3909d8efe7ec6dd85c9484711b0d748b51012a15ddf3cc7
 EBUILD fnord-1.10-r1.ebuild 953 RMD160 27fe011cb54bc098ca40d160ac6a2193c2455b6d SHA1 e590113caa21ed3d29ca23f17fe19c0ba3b6267b SHA256 4ba92e550e93ba0a4f520d89e0abcde3e75073c90fa2396566c06c4be231ca84
-MISC ChangeLog 4730 RMD160 c7db6c79469ebf003d5daff41c1cae69b98e095e SHA1 3366abfad1ca701e76138e02ad41aada93f192f5 SHA256 2c96b758a15268be3e4a1663cb642dff8c648572acaef060ec342d015f4a0713
+EBUILD fnord-1.10-r2.ebuild 964 RMD160 7110c3d978d90a36638e513e127c65df3ccd3a1e SHA1 4848aabbecff1dfb7f91302d629409350fa56dea SHA256 9a079a901ebd9059b3f35d3ad1577fa9bbd62db492b1fe2326b7e622c177aa71
+MISC ChangeLog 4896 RMD160 79ab789cd6fd9c21f8fecc56a7edf8e8b5f1d100 SHA1 0a1580d3a76320c5dda658c3cd49d45c9ed97449 SHA256 b18620cc2d2f6499826225a4b6c9d252089c0da8ee9040db62e6a8c86780c960
 MISC metadata.xml 242 RMD160 2b3ea392f10bf81c7e08417caf24e4078939f1ff SHA1 27bd80d5730a49825a2494e846b99d6314012075 SHA256 e265fa7a78bb5383c54106223704cb0f59f04a87bd8c8eddf97a696d8fe9dd9b
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.9 (GNU/Linux)
-
-iEYEARECAAYFAkivPHgACgkQoeSe8B0zEfwdPACfeHeVCf9YGp4Omr5Z/2f6e79s
-wn4An07e/vr02Lqpqje+jqtzVJ3vIty1
-=dNy2
------END PGP SIGNATURE-----
diff --git a/www-servers/fnord/files/fnord-1.10-gentoo.diff b/www-servers/fnord/files/fnord-1.10-gentoo.diff
new file mode 100644
index 000000000000..3e2f1f5fc7c4
--- /dev/null
+++ b/www-servers/fnord/files/fnord-1.10-gentoo.diff
@@ -0,0 +1,99 @@
+diff -Naur fnord-1.10.orig/fnord-conf fnord-1.10/fnord-conf
+--- fnord-1.10.orig/fnord-conf	2010-10-22 17:31:41.000000000 +0200
++++ fnord-1.10/fnord-conf	2010-10-22 19:57:28.000000000 +0200
+@@ -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 -Naur fnord-1.10.orig/httpd.c fnord-1.10/httpd.c
+--- fnord-1.10.orig/httpd.c	2010-10-22 17:31:41.000000000 +0200
++++ fnord-1.10/httpd.c	2010-10-22 19:57:28.000000000 +0200
+@@ -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 -Naur fnord-1.10.orig/Makefile fnord-1.10/Makefile
+--- fnord-1.10.orig/Makefile	2010-10-22 17:31:41.000000000 +0200
++++ fnord-1.10/Makefile	2010-10-22 19:58:56.000000000 +0200
+@@ -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)
++	$(DIET) $(CC) $(LDFLAGS) -o $@ $^ $(CFLAGS)
+ 
+ fnord-cgi: httpd-cgi.o libowfat.a
+-	$(DIET) $(CC) -o $@ $^ $(CFLAGS)
+-	-strip -R .note -R .comment $@
++	$(DIET) $(CC) $(LDFLAGS) -o $@ $^ $(CFLAGS)
+ 
+ fnord-idx: httpd-idx.o libowfat.a
+-	$(DIET) $(CC) -o $@ $^ $(CFLAGS)
+-	-strip -R .note -R .comment $@
++	$(DIET) $(CC) $(LDFLAGS) -o $@ $^ $(CFLAGS)
+ 
+ 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.10-r2.ebuild b/www-servers/fnord/fnord-1.10-r2.ebuild
new file mode 100644
index 000000000000..efaa90965534
--- /dev/null
+++ b/www-servers/fnord/fnord-1.10-r2.ebuild
@@ -0,0 +1,45 @@
+# Copyright 1999-2010 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/www-servers/fnord/fnord-1.10-r2.ebuild,v 1.1 2010/10/22 18:06:37 bangert Exp $
+
+EAPI="3"
+
+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="~hppa ~ppc ~sparc ~x86"
+IUSE="auth"
+
+DEPEND=""
+RDEPEND="${DEPEND}
+	sys-process/daemontools
+	sys-apps/ucspi-tcp"
+
+pkg_setup() {
+	enewuser fnord -1 -1 /etc/fnord nofiles
+	enewuser fnordlog -1 -1 /etc/fnord nofiles
+}
+
+src_prepare() {
+	epatch "${FILESDIR}/${PN}"-1.10-gentoo.diff
+}
+
+src_compile() {
+	# Fix for bug #45716
+	replace-sparc64-flags
+
+	use auth && \
+		append-flags -DAUTH
+
+	emake DIET="" CFLAGS="${CFLAGS}" LDFLAGS="${LDFLAGS}" || die "emake failed"
+}
+
+src_install () {
+	dobin fnord-conf fnord || die
+	dodoc TODO README* SPEED CHANGES
+}