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.
Package-Manager: portage-2.1.4.5

5 files changed, 47 insertions, 26 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/Manifest b/net-analyzer/syweb/Manifest
index 65ea6bb87343..1a14023607a1 100644
--- a/net-analyzer/syweb/Manifest
+++ b/net-analyzer/syweb/Manifest
@@ -1,7 +1,18 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
+AUX postinstall-en.txt 355 RMD160 e2b98abf57b081e00ff5edbd502f905b93476876 SHA1 2d65f2e2cbf2bb55a1c4f3eef9ebe84925a234e9 SHA256 d3a8559155e08e4f136ff5cb740812ed20019336ebd3988f06a16f36b5567bb2
 AUX syweb-class_lexer.inc.patch 461 RMD160 b52dba8c8c43b4a7ed53d163855846351ed1b845 SHA1 40b749f3d80ff933e96f2de9ed59444f85ddf8fa SHA256 04ec1b000065f36064bcec46e2355da493ec2b051100cb418f8b63929d1fe9fd
-AUX syweb-setup.inc.patch 909 RMD160 13952d6931114b8e7833374ab8f3f5f1797d5eb9 SHA1 faf1446a0e20b37d73a07080df24f90c633239f0 SHA256 1878fb8da815b1c8963c6d883596c4c6b8ba88051a30ff4f16aae0e9630fc5ad
+AUX syweb-setup.inc.patch 902 RMD160 c548fb1419bd078c272a12b8ea75e50a190b0da4 SHA1 275bb55244994885ed25ee088f1167a73552ca27 SHA256 90da1d9a6e41262575ba7896574c0993f84da2084a3c30d3e367b0f6fdb297a1
 AUX syweb-total_firewall.layout.patch 1673 RMD160 63e130338b7d48dc2debc4c205b955b60fc94c4d SHA1 ff5e7ee658f7a48df7c54a2a8923bc456a4834f3 SHA256 c2572d99370b76787685f20ad82158c182baa4840a5f9409efb2c0537a79a901
 DIST syweb-0.58.tar.gz 40960 RMD160 5dffc149a078789703c1ee10699e8aab350313d7 SHA1 bf0aa3a96533f8d6ae38f5317ae001282510ced4 SHA256 c01dfbc9f069d73d7c92880a0ed05bd7bca3e970ab282c2deb706861af7d6dcf
-EBUILD syweb-0.58.ebuild 1635 RMD160 3b9269837eee717709e3bec8e712830334cf490e SHA1 ff74c77cd54a10609d4d92b9768f82dc4e9a659a SHA256 dd1bf3b70236a85727f8cde050ad73519bce0a586c7328bc31ca0b541966e193
-MISC ChangeLog 575 RMD160 f045c01c5bea21a0c974b770a0267d43f27a7dd3 SHA1 746b627c2d85828d230150241f4e8e91c6c1b3e4 SHA256 0925b08d28bbc6e73c34ee9b47b960a612946a522eaf513796536b1869187636
+EBUILD syweb-0.58-r1.ebuild 1305 RMD160 38a870ae2372f94c71b6da18b1406cd82254639f SHA1 0e79a79e85e384f006255d97ee469c819f62c288 SHA256 1aecf335c4bf547b5d05484774a9b6cc4af59302e4a0c2fcf3ed9517364d1fac
+MISC ChangeLog 1150 RMD160 5a3d6b9be67218d5213708761a8116c2efa5d109 SHA1 98f32b6f934210fdbd22437b8d3ba7fe40e57100 SHA256 2b5ea4a778cd92bf72fa5da39e75ab5b2554c930f6d4706fd4a30ab8c278d8fc
 MISC metadata.xml 224 RMD160 f1478943a7375454e9bcd3aa07ead2e3eda83403 SHA1 ab66886a1a956992d16a2e268a04cd22259c4547 SHA256 59ee7eb0e4c00d6b24b16c4881aec4f1b6918143ce4f015f66d139deff42b804
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.9 (GNU/Linux)
+
+iEYEARECAAYFAklD+YQACgkQ/Kkm35zQzl71AQCfWn2O/V2DnONx2F3bLB0QfG+5
+oYkAnjGD0Tbaqu3MkuBUD9o0eG0rsq/o
+=3Eo0
+-----END PGP SIGNATURE-----
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
-}