Revision bump:

- Keep the layouts directory to avoid it being removed by a package manager
if it's empty.
- The cache directory shouldn't be reached by browsers, thus move it to
hostroot. While there, change setup.inc.patch accordingly.
- Use a file to display post-install instructions by using the function
webapp_postinst_txt provided by the webapp eclass instead of using elog.
(Portage version: 2.1.4.5)

4 files changed, 33 insertions, 23 deletions

diff --git a/net-analyzer/syweb/ChangeLog b/net-analyzer/syweb/ChangeLog
index d15eff0d0e95..a64595fc4404 100644
--- a/net-analyzer/syweb/ChangeLog
+++ b/net-analyzer/syweb/ChangeLog
@@ -1,6 +1,18 @@
 # ChangeLog for net-analyzer/syweb
 # Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-analyzer/syweb/ChangeLog,v 1.2 2008/11/09 21:47:49 tcunha Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/syweb/ChangeLog,v 1.3 2008/12/13 17:43:49 tcunha Exp $
+
+*syweb-0.58-r1 (13 Dec 2008)
+
+  13 Dec 2008; Tiago Cunha <tcunha@gentoo.org> +files/postinstall-en.txt,
+  files/syweb-setup.inc.patch, -syweb-0.58.ebuild, +syweb-0.58-r1.ebuild:
+  Revision bump:
+  - Keep the layouts directory to avoid it being removed by a package manager
+  if it's empty.
+  - The cache directory shouldn't be reached by browsers, thus move it to
+  hostroot. While there, change setup.inc.patch accordingly.
+  - Use a file to display post-install instructions by using the function
+  webapp_postinst_txt provided by the webapp eclass instead of using elog.
 
   09 Nov 2008; Tiago Cunha <tcunha@gentoo.org> metadata.xml:
   Update my email address. Thanks pva
diff --git a/net-analyzer/syweb/files/postinstall-en.txt b/net-analyzer/syweb/files/postinstall-en.txt
new file mode 100644
index 000000000000..7b369e900a1e
--- /dev/null
+++ b/net-analyzer/syweb/files/postinstall-en.txt
@@ -0,0 +1,9 @@
+Test your syweb installation by pointing your browser to the URL
+http://${VHOST_HOSTNAME}/${VHOST_APPDIR}/configtest.php
+
+Customize syweb by editing the file ${MY_INSTALLDIR}/setup.inc.
+
+If you don't want any user interaction, move index_noui.php to index.php.
+
+NOTE that syweb expects a machine/*.rrd style directory structure under
+/var/lib/symon/rrds.
diff --git a/net-analyzer/syweb/files/syweb-setup.inc.patch b/net-analyzer/syweb/files/syweb-setup.inc.patch
index 604a5c9991d1..578939736061 100644
--- a/net-analyzer/syweb/files/syweb-setup.inc.patch
+++ b/net-analyzer/syweb/files/syweb-setup.inc.patch
@@ -1,8 +1,8 @@
 # Rename directories to reflect the changes from the ebuild and the
 # configuration files.
 
---- syweb/htdocs/syweb/setup.inc.orig	2008-08-18 12:22:44.662964324 +0100
-+++ syweb/htdocs/syweb/setup.inc	2008-08-18 12:24:08.884219875 +0100
+--- syweb/htdocs/syweb/setup.inc.orig	2008-12-13 12:48:28.165799500 +0000
++++ syweb/htdocs/syweb/setup.inc	2008-12-13 12:50:09.972014770 +0000
 @@ -32,11 +32,18 @@
  $symon['layout_dir']='/var/www/symon';
  */
@@ -17,7 +17,7 @@
 +
 +/* running Linux, apache not chrooted: */
 +$symon['rrdtool_path']='/usr/bin/rrdtool';
-+$symon['cache_dir']='/var/www/localhost/htdocs/syweb/cache';
++$symon['cache_dir']='/var/www/localhost/syweb/cache';
 +$symon['host_tree']='/var/lib/symon/rrds';
 +$symon['layout_dir']='/var/www/localhost/htdocs/syweb/layouts';
  
diff --git a/net-analyzer/syweb/syweb-0.58.ebuild b/net-analyzer/syweb/syweb-0.58-r1.ebuild
index e85f6f75ef8b..bb1b6f9220ec 100644
--- a/net-analyzer/syweb/syweb-0.58.ebuild
+++ b/net-analyzer/syweb/syweb-0.58-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2008 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-analyzer/syweb/syweb-0.58.ebuild,v 1.1 2008/08/19 07:03:00 pva Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/syweb/syweb-0.58-r1.ebuild,v 1.1 2008/12/13 17:43:49 tcunha Exp $
 
 inherit depend.php eutils webapp
 
@@ -25,9 +25,9 @@ S=${WORKDIR}/${PN}
 src_unpack() {
 	unpack ${A}
 
-	epatch "${FILESDIR}"/${PN}-class_lexer.inc.patch
-	epatch "${FILESDIR}"/${PN}-setup.inc.patch
-	epatch "${FILESDIR}"/${PN}-total_firewall.layout.patch
+	epatch "${FILESDIR}"/${PN}-class_lexer.inc.patch	\
+	       "${FILESDIR}"/${PN}-setup.inc.patch			\
+	       "${FILESDIR}"/${PN}-total_firewall.layout.patch
 }
 
 src_install() {
@@ -37,24 +37,13 @@ src_install() {
 	docinto layouts
 	dodoc "${WORKDIR}"/syweb/symon/total* || die "dodoc layouts failed"
 
-	dodir "${MY_HTDOCSDIR}"/cache
-	dodir "${MY_HTDOCSDIR}"/layouts
-	webapp_serverowned "${MY_HTDOCSDIR}"/cache
+	dodir "${MY_HOSTROOTDIR}"/${PN}/cache
+	keepdir "${MY_HTDOCSDIR}"/layouts
+	webapp_serverowned "${MY_HOSTROOTDIR}"/${PN}/cache
 	insinto "${MY_HTDOCSDIR}"
 	doins -r "${WORKDIR}"/syweb/htdocs/syweb/* || die "doins failed"
 	webapp_configfile "${MY_HTDOCSDIR}"/setup.inc
+	webapp_postinst_txt en "${FILESDIR}"/postinstall-en.txt
 
 	webapp_src_install
 }
-
-pkg_postinst() {
-	elog "Test your syweb configuration by pointing your browser at:"
-	elog "http://${VHOST_HOSTNAME}/${PN}/configtest.php"
-	elog "Customize syweb by editing the file setup.inc."
-	elog "If you don't want any user interaction, move index_noui.php"
-	elog "to index.php."
-	elog "NOTE that syweb expects a machine/*.rrd style directory"
-	elog "structure under /var/lib/symon/rrds."
-
-	webapp_pkg_postinst
-}