fix quoting - dont install COPYING - fix pre-strip (bug #241458)

Package-Manager: portage-2.2_rc20/cvs/Linux 2.6.28-gentoo i686

4 files changed, 67 insertions, 3 deletions

diff --git a/www-servers/webfs/ChangeLog b/www-servers/webfs/ChangeLog
index 15fc5b0b0d3a..2b5c9aa62ab8 100644
--- a/www-servers/webfs/ChangeLog
+++ b/www-servers/webfs/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for www-servers/webfs
-# Copyright 2000-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/www-servers/webfs/ChangeLog,v 1.15 2007/08/13 22:05:37 dertobi123 Exp $
+# Copyright 2000-2009 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/www-servers/webfs/ChangeLog,v 1.16 2009/02/03 00:28:02 bangert Exp $
+
+*webfs-1.21-r1 (03 Feb 2009)
+
+  03 Feb 2009; Thilo Bangert <bangert@gentoo.org>
+  +files/webfs-1.21-Variables.mk-dont-strip-binaries-on-install.patch,
+  +webfs-1.21-r1.ebuild:
+  fix quoting - dont install COPYING - fix pre-strip (bug #241458)
 
   13 Aug 2007; Tobias Scherbaum <dertobi123@gentoo.org> webfs-1.21.ebuild:
   ppc. stable
diff --git a/www-servers/webfs/Manifest b/www-servers/webfs/Manifest
index 237759c1d508..71f67e1e09a6 100644
--- a/www-servers/webfs/Manifest
+++ b/www-servers/webfs/Manifest
@@ -1,8 +1,10 @@
+AUX webfs-1.21-Variables.mk-dont-strip-binaries-on-install.patch 478 RMD160 896ce13f164b7c9ce40d28bf4b59f53e1822920e SHA1 7b0c6052323c44b779192f3d4750d71be5f97e14 SHA256 42ca9c91a9d231f9c11f74461bd9700d76a3edb71b561bea0e615e42b1221791
 AUX webfs.confd 606 RMD160 3347f9c4cff4bb5252591100ec0de69503732488 SHA1 1421d5ed42ffe2ecde36d131a6911f9cdbc52f2f SHA256 8ee86ded9ed145546477eb04c6cc68701fd36be3c35d537e45a987b4c9a4f237
 AUX webfs.initd 1199 RMD160 6159ce0c4df31b1822fe9af7f82eb243f77b30e5 SHA1 275a2eb0ae8ac4713f17aa679f3bb79b8fee2fa9 SHA256 d25ce35d0098ba898768770b8cc053290be0ea2a794007fbaea28724b0041383
 DIST webfs-1.21.tar.gz 44249 RMD160 acce4a01e7741e2fc6f6db22e38c1161af780dbc SHA1 a38880d8cb21e415244d220115ede7b573ac890c SHA256 98c1cb93473df08e166e848e549f86402e94a2f727366925b1c54ab31064a62a
 DIST webfs_1.20.tar.gz 50998 RMD160 2d4ff8e2a6d11d9d4638f678f8f7f99d04fe0c0e SHA1 2cd3c36c02aecc30eb308244256a5aa4ce07831a SHA256 864a33608a9d73ea36271bf07f424d00108247db51bd10efe3304aa7c79cc6bd
 EBUILD webfs-1.20.ebuild 832 RMD160 6397a5379262b4648c0babc9cf5a607b7d552d84 SHA1 352645a678f0da96288602aeeb1fa28fc3b8601f SHA256 61e3ba52ab69d3bb76e5e95b04737af4687327e5fa953565671082e1d551bebe
+EBUILD webfs-1.21-r1.ebuild 1225 RMD160 cf4e27075afd49540faa59b12a6e11b543a623e7 SHA1 5e2fec7d7dde7b2d613b05878f0c6cda171e5885 SHA256 0f06855a5fbd4e7f79bfa051f8990ec584df5406d804d2155b8d191915afe32a
 EBUILD webfs-1.21.ebuild 1082 RMD160 c15d856c758feb4f055973ce9fa469783a31596c SHA1 e6c39e97692d4dfd637b75b9640e159403eab89c SHA256 eb66c5362287ddd63e5c3cd991fefde28a634ad64bbb6390d603746a6c489e34
-MISC ChangeLog 2601 RMD160 25dbba8cd150d0896bf006a2814dbc44322f5a92 SHA1 de9af859204897e8f71e81412fc042b674fc8e32 SHA256 db94f97212912501b32689a8c801247e8d5be3633d0fe45031fc43a2ad37bdeb
+MISC ChangeLog 2842 RMD160 647ba1725a8a997532a5a3f53e406a9fbfb4ed70 SHA1 562127386f7c0877dd7ea639180aa037304739b8 SHA256 49b05d187040eea3096fbac4774c2ec244cc82d6a17045a0c0d79777e53609f4
 MISC metadata.xml 165 RMD160 121ee15955e06988e10dbe52ca5abd31d2529ce9 SHA1 f13cc4199505863990c257fe060882a5f9a32aab SHA256 f8fe79331ed918344f1ff85578f9a39c0c0925017f3f7de12619e4917acf577c
diff --git a/www-servers/webfs/files/webfs-1.21-Variables.mk-dont-strip-binaries-on-install.patch b/www-servers/webfs/files/webfs-1.21-Variables.mk-dont-strip-binaries-on-install.patch
new file mode 100644
index 000000000000..03f2f5c59816
--- /dev/null
+++ b/www-servers/webfs/files/webfs-1.21-Variables.mk-dont-strip-binaries-on-install.patch
@@ -0,0 +1,12 @@
+diff -Naur webfs-1.21.orig/mk/Variables.mk webfs-1.21/mk/Variables.mk
+--- webfs-1.21.orig/mk/Variables.mk	2009-02-03 01:14:18.000000000 +0100
++++ webfs-1.21/mk/Variables.mk	2009-02-03 01:16:01.000000000 +0100
+@@ -23,7 +23,7 @@
+ CXX		?= g++
+ MOC             ?= $(if $(QTDIR),$(QTDIR)/bin/moc,moc)
+ INSTALL		?= install
+-INSTALL_BINARY  := $(INSTALL) -s
++INSTALL_BINARY  := $(INSTALL)
+ INSTALL_SCRIPT  := $(INSTALL)
+ INSTALL_DATA	:= $(INSTALL) -m 644
+ INSTALL_DIR	:= $(INSTALL) -d
diff --git a/www-servers/webfs/webfs-1.21-r1.ebuild b/www-servers/webfs/webfs-1.21-r1.ebuild
new file mode 100644
index 000000000000..44f6a6cc6719
--- /dev/null
+++ b/www-servers/webfs/webfs-1.21-r1.ebuild
@@ -0,0 +1,43 @@
+# Copyright 1999-2009 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/www-servers/webfs/webfs-1.21-r1.ebuild,v 1.1 2009/02/03 00:28:02 bangert Exp $
+
+inherit eutils
+
+DESCRIPTION="Lightweight HTTP server for static content"
+SRC_URI="http://dl.bytesex.org/releases/${PN}/${P}.tar.gz"
+HOMEPAGE="http://linux.bytesex.org/misc/webfs.html"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~ppc ~sparc ~x86"
+IUSE="ssl threads"
+
+DEPEND="ssl? ( dev-libs/openssl )"
+
+RDEPEND="${DEPEND}
+	app-misc/mime-types"
+
+src_unpack() {
+	unpack ${A}
+	cd "${S}"
+	epatch "${FILESDIR}/webfs-1.21-Variables.mk-dont-strip-binaries-on-install.patch"
+}
+
+src_compile() {
+	local myconf
+	use ssl || myconf="${myconf} USE_SSL=no"
+	use threads && myconf="${myconf} USE_THREADS=yes"
+
+	emake prefix=/usr ${myconf} || die "emake failed"
+}
+
+src_install() {
+	local myconf
+	use ssl || myconf="${myconf} USE_SSL=no"
+	use threads && myconf="${myconf} USE_THREADS=yes"
+	einstall ${myconf} mandir="${D}/usr/share/man" || die "make install failed"
+	newinitd "${FILESDIR}"/${PN}.initd ${PN} || die "newinitd failed"
+	newconfd "${FILESDIR}"/${PN}.confd ${PN} || die "newconfd failed"
+	dodoc README
+}