New upstream version (with true_nozip patch); Install our own conf.d and init.d files.

(Portage version: 2.1_pre7-r4)

8 files changed, 142 insertions, 12 deletions

diff --git a/www-servers/yaws/ChangeLog b/www-servers/yaws/ChangeLog
index e5fd3d50f634..794e82454316 100644
--- a/www-servers/yaws/ChangeLog
+++ b/www-servers/yaws/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for www-servers/yaws
-# Copyright 1999-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/www-servers/yaws/ChangeLog,v 1.2 2005/08/07 00:07:30 mkennedy Exp $
+# Copyright 1999-2006 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/www-servers/yaws/ChangeLog,v 1.3 2006/04/14 06:10:54 mkennedy Exp $
+
+*yaws-1.58 (14 Apr 2006)
+
+  14 Apr 2006; Matthew Kennedy <mkennedy@gentoo.org>
+  +files/1.58-true_nozip.patch, +files/TODO.Gentoo, +files/yaws.conf.d,
+  +files/yaws.init.d, +yaws-1.58.ebuild:
+  New upstream version (with true_nozip patch); Install our own conf.d and
+  init.d files.
 
   07 Aug 2005; Matthew Kennedy <mkennedy@gentoo.org> yaws-1.56.ebuild:
   Keywording ~sparc, ~amd64, ~ppc
diff --git a/www-servers/yaws/Manifest b/www-servers/yaws/Manifest
index f25825ba18d9..5165d2a82ec1 100644
--- a/www-servers/yaws/Manifest
+++ b/www-servers/yaws/Manifest
@@ -1,14 +1,30 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
 MD5 05f65b701a4cea5fa96742986a2ef8a5 ChangeLog 507
+RMD160 20780ff965a959db000cc11511c4150bc71b41d9 ChangeLog 507
+SHA256 a5f728db1782698868131c955043a384809af420177425f85a7282ac522f04e8 ChangeLog 507
+MD5 d320766b46bdb4b74773f6a7b5906416 files/1.58-true_nozip.patch 604
+RMD160 78644013eee7133b7521eaf4bde46ed90d184fd3 files/1.58-true_nozip.patch 604
+SHA256 8ad9630463b091245152325dc87059cc5a447bae73beccf226351ef2fbf19584 files/1.58-true_nozip.patch 604
+MD5 93f5e4b165f10da3a9fa60316e0680b4 files/TODO.Gentoo 103
+RMD160 3f123618edff2886d81f459f0627318760949291 files/TODO.Gentoo 103
+SHA256 78d8412bcf283f100e09fbb9567c33e08a0d0961d2303163a7afdc6fba76b9c0 files/TODO.Gentoo 103
 MD5 0a81c233eb053a10cc3c54282aedc610 files/digest-yaws-1.56 61
+RMD160 6185ff41ee75eea843cdbb75fc646a25c241f10c files/digest-yaws-1.56 61
+SHA256 f41c15b68021ad38c070fc22fa183c0dabc601511ef7dd8a88f5dc885dd4d78c files/digest-yaws-1.56 61
+MD5 3bf4b5ffb407bf6d0a43f8c671b0e503 files/digest-yaws-1.58 229
+RMD160 f93ce69571baebef7338959262f56b0c3bc8aaee files/digest-yaws-1.58 229
+SHA256 5cd2c9f196f6b61e16e5ab4a0152cb8e5cc96945c6b60f737a3e0c36b28d9d53 files/digest-yaws-1.58 229
+MD5 7ac876d73f758b731cf1be93b8b88d82 files/yaws.conf.d 73
+RMD160 dd870c59a81d44a3ad39374c6cf2a35251fdcca2 files/yaws.conf.d 73
+SHA256 2990682d05c75176b92a8d001752b8bd81adee17a4d26a6312b7321186a1e7d3 files/yaws.conf.d 73
+MD5 480871d732d5b5c65b4edb2f9430bd93 files/yaws.init.d 582
+RMD160 cb2d234b945238eca90b912c845139cf019047dd files/yaws.init.d 582
+SHA256 d127734e2575a95074aaf667a186f6e5e8188877bb85e648395f44e33e433e58 files/yaws.init.d 582
 MD5 29890d8b63da61f44362554db749bf57 metadata.xml 477
+RMD160 4d122ba3aca54b8f913dab77ee68826d360c67d8 metadata.xml 477
+SHA256 e0248ad7b03e063dc14187d3313a15102b65328f61f1e277c8c90c0675396d65 metadata.xml 477
 MD5 55fb2c517decd38980cc4d0a9e5fb6cf yaws-1.56.ebuild 1034
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.4.2 (GNU/Linux)
-
-iD8DBQFC9fn9I1lqEGTUzyQRAptYAKC1wvosVtxV7675Pp9aZbl47dEQ4ACfS2NN
-r8qZ4AQSXXezaDrLE5/cOV8=
-=mzZM
------END PGP SIGNATURE-----
+RMD160 b473de29d6964018d8c2b7795620e25bb2371d5c yaws-1.56.ebuild 1034
+SHA256 b2a8b48a8c59ba468aae600636c5f64a0144f4a30a2f0f5db261270c62836de7 yaws-1.56.ebuild 1034
+MD5 f131ffc7c8a908dbca5339f2b4a756e1 yaws-1.58.ebuild 1277
+RMD160 fc7a424fe432b5dd9a394f614fa42705c803c7cd yaws-1.58.ebuild 1277
+SHA256 1c03b466ded6cf8cddfe5980f05e098113e1e0651bc2d79aa08a8c0903a514cb yaws-1.58.ebuild 1277
diff --git a/www-servers/yaws/files/1.58-true_nozip.patch b/www-servers/yaws/files/1.58-true_nozip.patch
new file mode 100644
index 000000000000..755cd706e5bf
--- /dev/null
+++ b/www-servers/yaws/files/1.58-true_nozip.patch
@@ -0,0 +1,19 @@
+diff -ur /tmp/yaws-1.58.orig/src/yaws_ls.erl /tmp/yaws-1.58/src/yaws_ls.erl
+--- /tmp/yaws-1.58.orig/src/yaws_ls.erl	2006-02-14 13:56:46.000000000 -0600
++++ /tmp/yaws-1.58/src/yaws_ls.erl	2006-04-10 22:40:16.000000000 -0500
+@@ -44,7 +44,14 @@
+ 	     dir_header(DirName,DirStr),
+ 	     table_head(Direction),	     
+ 	     parent_dir(),
+-	     if DoAllZip == true -> allzip() end,
++	     case DoAllZip of
++		 true ->
++		     allzip();
++		 true_nozip ->
++		     [];
++		 false ->
++		     []
++	     end,
+ 	     
+ %% 	     if DoAllGZip == true -> alltgz() end,
+ %% 	     if DoAllBZip2 == true -> alltbz2() end,
diff --git a/www-servers/yaws/files/TODO.Gentoo b/www-servers/yaws/files/TODO.Gentoo
new file mode 100644
index 000000000000..a4be28a1a8cf
--- /dev/null
+++ b/www-servers/yaws/files/TODO.Gentoo
@@ -0,0 +1,6 @@
+-*-outline-*-
+
+* Allow for multiple configuration files
+
+* Document how to start more than one server
+
diff --git a/www-servers/yaws/files/digest-yaws-1.58 b/www-servers/yaws/files/digest-yaws-1.58
new file mode 100644
index 000000000000..fda72da51d6c
--- /dev/null
+++ b/www-servers/yaws/files/digest-yaws-1.58
@@ -0,0 +1,3 @@
+MD5 e7dbbd4e7515e89773d78321fbe54935 yaws-1.58.tar.gz 706968
+RMD160 6fdb7d9ba827fd90ccf0b0d1b53c8ca7fc082817 yaws-1.58.tar.gz 706968
+SHA256 4e384031abfbae26094219f32b4f445a9d3983592a2ba230ddfdb53259a21f5c yaws-1.58.tar.gz 706968
diff --git a/www-servers/yaws/files/yaws.conf.d b/www-servers/yaws/files/yaws.conf.d
new file mode 100644
index 000000000000..df096b1bbe64
--- /dev/null
+++ b/www-servers/yaws/files/yaws.conf.d
@@ -0,0 +1,4 @@
+
+YAWS_DAEMON="/usr/bin/yaws"
+YAWS_DAEMON_OPTS="-heart"
+YAWS_ID="default"
diff --git a/www-servers/yaws/files/yaws.init.d b/www-servers/yaws/files/yaws.init.d
new file mode 100644
index 000000000000..df041cbcda04
--- /dev/null
+++ b/www-servers/yaws/files/yaws.init.d
@@ -0,0 +1,33 @@
+#!/sbin/runscript
+# $Header: /var/cvsroot/gentoo-x86/www-servers/yaws/files/yaws.init.d,v 1.1 2006/04/14 06:10:54 mkennedy Exp $
+
+opts="start stop reload status"
+
+depend() {
+	need net
+}
+
+start() {
+	ebegin "Starting ${SVCNAME}"
+	$YAWS_DAEMON -D $YAWS_DAEMON_OPTS -I ${YAWS_ID}
+	eend $?
+}
+
+stop() {
+	ebegin "Stopping ${SVCNAME}"
+	$YAWS_DAEMON -s -I ${YAWS_ID}
+	eend $?
+}
+
+reload() {
+	ebegin "Reloading ${SVCNAME}"
+	$YAWS_DAEMON -h -I ${YAWS_ID}
+	eend $?
+}
+
+status() {
+	 einfo "Status for ${SVCNAME}: "
+	 $YAWS_DAEMON -ls
+	 einfo "Status for ${YAWS_ID}: "
+	 $YAWS_DAEMON -S -I ${YAWS_ID}
+}
\ No newline at end of file
diff --git a/www-servers/yaws/yaws-1.58.ebuild b/www-servers/yaws/yaws-1.58.ebuild
new file mode 100644
index 000000000000..9a3f6c86793a
--- /dev/null
+++ b/www-servers/yaws/yaws-1.58.ebuild
@@ -0,0 +1,41 @@
+# Copyright 1999-2006 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/www-servers/yaws/yaws-1.58.ebuild,v 1.1 2006/04/14 06:10:54 mkennedy Exp $
+
+inherit eutils
+
+DESCRIPTION="Yaws is a high performance HTTP 1.1 web server."
+HOMEPAGE="http://yaws.hyber.org/"
+SRC_URI="http://yaws.hyber.org/download/${P}.tar.gz"
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~x86 ~ppc ~sparc ~amd64"
+IUSE=""
+
+DEPEND="dev-lang/erlang"
+
+# see http://bugs.gentoo.org/show_bug.cgi?id=97707
+
+src_unpack() {
+	unpack ${A}
+	# see http://sourceforge.net/mailarchive/message.php?msg_id=15302808
+	epatch ${FILESDIR}/${PV}-true_nozip.patch
+	find ${S} -depth -type d -name .xvpics -exec rm -rf '{}' \;
+}
+
+src_install() {
+	make DESTDIR=${D} install || die
+	# Use /var/log and not /var/lib/log for Yaws logging directory
+	rm -rf ${D}/var/lib/log
+	sed -i 's,/var/lib/log,/var/log,g' \
+		's,#.*username = root.*,username = nobody,g' \
+		${D}/etc/yaws.conf
+	keepdir /var/log/yaws
+	# We need to keep these directories so that the example yaws.conf works
+	# properly
+	keepdir /usr/lib/yaws/examples/ebin
+	keepdir /usr/lib/yaws/examples/include
+	dodoc ChangeLog LICENSE README
+	newinitd ${FILESDIR}/yaws.init.d yaws
+	newconfd ${FILESDIR}/yaws.conf.d yaws
+}