net-analyzer/symon: New USE flag 'symux' added, remove old

svn path=/sunrise/; revision=5366

5 files changed, 52 insertions, 25 deletions

diff --git a/net-analyzer/symon/ChangeLog b/net-analyzer/symon/ChangeLog
index 1275af14c..12fd35eff 100644
--- a/net-analyzer/symon/ChangeLog
+++ b/net-analyzer/symon/ChangeLog
@@ -2,6 +2,10 @@
 # Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2
 # $Header: $
 
+  09 Jan 2008; Tiago Cunha (tcunha) <me@tiagocunha.org> files/symon-init.d,
+  +files/symux-init.d, -symon-2.78.ebuild, +symon-2.78-r1.ebuild:
+  New USE flag 'symux' added, remove old
+
   08 Jan 2008; Tiago Cunha (tcunha) <me@tiagocunha.org> symon-2.78.ebuild:
   Added ~amd64 keyword
 
diff --git a/net-analyzer/symon/Manifest b/net-analyzer/symon/Manifest
index f98d17480..9c75b94d8 100644
--- a/net-analyzer/symon/Manifest
+++ b/net-analyzer/symon/Manifest
@@ -1,11 +1,12 @@
-AUX symon-init.d 609 RMD160 5e8e3e1e44204bd1d65207f6c9bad11787945681 SHA1 bb800d88925edab5964da762e12892cdb81b62ac SHA256 29ec7bc55ae7937d02359b34e98323618940e7a6263b1f3fdce2be8c9b091a12
+AUX symon-init.d 402 RMD160 7a99c4de2c33e99425cde04564f1a4d91c870ea8 SHA1 899259ee384a61ff87358e7b42de2162af6c1df9 SHA256 c9429d4da607faef7095c118c998b4ceb635c33b2dc3af0a37ec9bb12feeda42
 AUX symon-symon.conf.patch 610 RMD160 edc2d9ff502ebab575ebb63454b789e306a4ad01 SHA1 49cfe13a2b179781dfb2ccf8f0f037fcc2da0d2f SHA256 8a3c1e03bf5f5456e230556acd16490ca96cb3de1104983012db7d8738bdc560
 AUX symon-symux.conf.patch 1599 RMD160 5131d2679001db3cb440817ec3e000be6f59184e SHA1 fbb36356ea952778d24ec78ad19f0db4b95d808a SHA256 dec14b8c29e183900a74b20eb69f9ad4c20f5988cbcea4175de1728fff18b75d
 AUX symon-syweb-class_lexer.inc.patch 458 RMD160 daa1f26d028901c588602ebc61dddfb867ee3703 SHA1 2f56ff745e3517225ec11ec14ac2fd9f937ef428 SHA256 e1fab2a5b04b9df8a64a006aecb9869290e2e73a9bbd02449d7d9b38d559b163
 AUX symon-syweb-setup.inc.patch 898 RMD160 e8597d4ebd7c77c58c07829665161a21ea7da210 SHA1 07b8a558558288925ae1ec08a496aeef97df824b SHA256 e89d593304eabcd746d26d3bf77fb84a3d5c1fe05026e39e8de56407427624d0
 AUX symon-syweb-total_firewall.layout.patch 1616 RMD160 08462a968ece585cba4331ba596386033776144d SHA1 f942a8cdd8418f487345e0fbf581f744af5ddc0f SHA256 4b1aade4dca5e5e0f6ab12dd7d7265c68fd9a99e42984ae91b330a81cf3cc362
+AUX symux-init.d 368 RMD160 1c493840c0574ead0387971020120be32e5f9948 SHA1 bbf1abf359042a1b120254182214b62faa56794e SHA256 090f20e13ef59590e7d9d4f8dd1db4b18a46cc5172ae6215d4bf551ecdc83fbe
 DIST symon-2.78.tar.gz 102400 RMD160 40ca61ce68778de54d5a1b541d6c640dd7fb479c SHA1 bbe7f2b58e3ed0e42f3b1da97ea4051d2c1cee34 SHA256 cda07388156e66a665c6d53dca4fdce3e210ee6a28c44e64d240715a572b39ac
 DIST syweb-0.57.tar.gz 40960 RMD160 a59c24402344c3d2ae44c4ff586c469289a5e6e8 SHA1 05762c6b472e161d7bae56b603e4eb8595323738 SHA256 d1a5bbec892488f5bbc1ef5b52fd512097421f4e6be8742ad18838d11f42d502
-EBUILD symon-2.78.ebuild 2786 RMD160 68b457fed339113c1bdbd291b482358180a545f4 SHA1 67a95017c9e6b15aee7b76871ab916df41cafc90 SHA256 2676cce4d21b760e248affaae0a0e55e439a44f8a8223c49d92712dc00d26144
-MISC ChangeLog 777 RMD160 8a63966b904f6e7295743bf30b7feada4bd25557 SHA1 dbc0ade3ea27bfd1e58efde5ee18c271ddb7487c SHA256 555edc4143cf449ed6fbcb7b89f1bb0eae86bb19431f112698e85a447391ae2c
+EBUILD symon-2.78-r1.ebuild 2967 RMD160 60265a74735a3ddb37311cb693287704ebd4a045 SHA1 1a62d997f0c73d43a38539a40be1781c0442dab2 SHA256 bf600933f8708677fa9134a84b875d2d8a8947a38a89e10173f10795c0e44d9e
+MISC ChangeLog 961 RMD160 0a3397bb8de25df0fb02652c4fa2a67a0f58e146 SHA1 d7a56293cb4fffbbab95eab34ecacba2b39680d7 SHA256 60d897c91cece14beddd0deee6bae3e74eb2602c324d33ca8b788d855f2ddbc5
 MISC metadata.xml 170 RMD160 645927a396fdc21cdeb089fe42c5397332420ea6 SHA1 ac7f48a14fec325926f9ce1be8fbf1f311b4f2e4 SHA256 d797a2ec6f9dc516c9f9c1a758ee87ad3e8c43101b5dc76c2f872d5bd4639b42
diff --git a/net-analyzer/symon/files/symon-init.d b/net-analyzer/symon/files/symon-init.d
index 4a225c52e..53e16a1fa 100644
--- a/net-analyzer/symon/files/symon-init.d
+++ b/net-analyzer/symon/files/symon-init.d
@@ -7,16 +7,10 @@ start() {
         ebegin "Starting symon"
         start-stop-daemon --start --quiet --exec /usr/sbin/symon -- -u
         eend ${?}
-	ebegin "Starting symux"
-	start-stop-daemon --start --quiet --exec /usr/sbin/symux
-	eend ${?}
 }
 
 stop() {
         ebegin "Stopping symon"
         start-stop-daemon --stop --quiet --pidfile /var/run/symon.pid
         eend ${?}
-	ebegin "Stopping symux"
-        start-stop-daemon --stop --quiet --pidfile /var/run/symux.pid
-        eend ${?}
 }
diff --git a/net-analyzer/symon/files/symux-init.d b/net-analyzer/symon/files/symux-init.d
new file mode 100644
index 000000000..9fc858ca5
--- /dev/null
+++ b/net-analyzer/symon/files/symux-init.d
@@ -0,0 +1,16 @@
+#!/sbin/runscript
+# Copyright 1999-2007 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header:
+
+start() {
+	ebegin "Starting symux"
+	start-stop-daemon --start --quiet --exec /usr/sbin/symux
+	eend ${?}
+}
+
+stop() {
+	ebegin "Stopping symux"
+        start-stop-daemon --stop --quiet --pidfile /var/run/symux.pid
+        eend ${?}
+}
diff --git a/net-analyzer/symon/symon-2.78.ebuild b/net-analyzer/symon/symon-2.78-r1.ebuild
index 7d7c5d05e..2d04a70c3 100644
--- a/net-analyzer/symon/symon-2.78.ebuild
+++ b/net-analyzer/symon/symon-2.78-r1.ebuild
@@ -12,30 +12,31 @@ SRC_URI="http://www.xs4all.nl/~wpd/symon/philes/${P}.tar.gz
 LICENSE="BSD-2"
 SLOT="0"
 KEYWORDS="~amd64 ~sparc ~x86"
-IUSE="syweb"
+IUSE="symux syweb"
 
-DEPEND="net-analyzer/rrdtool
+DEPEND="symux? ( net-analyzer/rrdtool )
 	sys-devel/pmake"
-RDEPEND="net-analyzer/rrdtool
+RDEPEND="symux? ( net-analyzer/rrdtool )
 	syweb? ( virtual/httpd-php )"
 
 S=${WORKDIR}/${PN}
 WEBAPP_MANUAL_SLOT="yes"
 
 pkg_setup() {
-	require_php_with_use gd
-	webapp_pkg_setup
+	if use syweb ; then
+		require_php_with_use gd
+		webapp_pkg_setup
+	fi
 }
 
 src_unpack() {
 	unpack ${A}
 
 	epatch "${FILESDIR}"/${PN}-symon.conf.patch
-	epatch "${FILESDIR}"/${PN}-symux.conf.patch
 
-	# the default user will be symon, not _symon
-	# not really used atm, but probably will if chroot will ever be implemented
-	sed -i -e 's|_symon|symon|g' symon/symon/symon.8
+	# if the symux USE flag was not specified don't build the target
+	! use symux && sed -i -e 's|symux||' symon/Makefile
+	use symux && epatch "${FILESDIR}"/${PN}-symux.conf.patch
 
 	if use syweb ; then
 		epatch "${FILESDIR}"/${PN}-syweb-class_lexer.inc.patch
@@ -50,24 +51,35 @@ src_compile() {
 
 src_install() {
 	insinto /etc
-	doins symon/symon.conf symux/symux.conf
+	doins symon/symon.conf
 
 	newinitd "${FILESDIR}"/${PN}-init.d ${PN} || die "newinitd failed."
 
 	dodoc CHANGELOG HACKERS TODO
 
-	doman symon/symon.8 symux/symux.8
-
+	doman symon/symon.8
 	dosbin symon/symon
-	dosbin symux/symux
 
 	dodir /usr/share/symon
 	insinto /usr/share/symon
-	doins symon/c_config.sh symux/c_smrrds.sh
+	doins symon/c_config.sh
 	fperms a+x,u-w /usr/share/symon/c_config.sh
-	fperms u-w,u+x /usr/share/symon/c_smrrds.sh
 
-	dodir /var/lib/symon/rrds/localhost
+	if use symux ; then
+		insinto /etc
+		doins symux/symux.conf
+
+		newinitd "${FILESDIR}"/symux-init.d symux || die "newinitd failed."
+
+		doman symux/symux.8
+		dosbin symux/symux
+
+		insinto /usr/share/symon
+		doins symux/c_smrrds.sh
+		fperms u-w,u+x /usr/share/symon/c_smrrds.sh
+
+		dodir /var/lib/symon/rrds/localhost
+	fi
 
 	if use syweb ; then
 		docinto /layouts