From ebc7d2dcc6a30e7e7a4c1060bb9d0e69f6c3a20e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ren=C3=A9=20=27Necoro=27=20Neumann?= <necoro@necoro.net>
Date: Sat, 20 Apr 2013 18:12:33 +0200
Subject: Factor out hiawatha-monitor

---
 www-servers/hiawatha/hiawatha-9.0.ebuild | 42 ++++++--------------------------
 www-servers/hiawatha/metadata.xml        |  6 ++---
 2 files changed, 11 insertions(+), 37 deletions(-)

diff --git a/www-servers/hiawatha/hiawatha-9.0.ebuild b/www-servers/hiawatha/hiawatha-9.0.ebuild
index ac5aa6d..414c07a 100644
--- a/www-servers/hiawatha/hiawatha-9.0.ebuild
+++ b/www-servers/hiawatha/hiawatha-9.0.ebuild
@@ -6,47 +6,35 @@ EAPI=5
 
 CMAKE_MIN_VERSION="2.8.4"
 
-M_P="monitor-0.6"
-
 inherit cmake-utils
 
 DESCRIPTION="Advanced and secure webserver"
 HOMEPAGE="http://www.hiawatha-webserver.org"
-SRC_URI="http://www.hiawatha-webserver.org/files/${P}.tar.gz
-	monitor? ( http://www.hiawatha-webserver.org/files/${M_P}.tar.gz )"
+SRC_URI="http://www.hiawatha-webserver.org/files/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="~amd64"
 IUSE="debug +cache chroot ipv6 monitor +rewrite rproxy ssl tomahawk xsl"
 
-DEPEND="
-	ssl?  ( >=net-libs/polarssl-1.2 )
-	xsl? ( dev-libs/libxslt
-	 	dev-libs/libxml2 )
-		"
-
-RDEPEND="${DEPEND}
-	monitor? ( 	virtual/cron
-		=dev-lang/php-5*[mysql,xsl]
-		virtual/mysql )
-		"
+DEPEND="ssl? ( >=net-libs/polarssl-1.2 )
+        xsl? ( dev-libs/libxslt
+               dev-libs/libxml2 )"
 
-REQUIRED_USE="monitor? ( xsl )"
+RDEPEND="${DEPEND}"
+PDEPEND="monitor? ( www-apps/hiawatha-monitor )"
 
 PATCHES=("${FILESDIR}"/${P}-no-bundled-polarssl.patch)
 
 src_configure() {
 	if use debug; then
 		CMAKE_BUILD_TYPE="RelWithDebInfo"
-	else
-		CMAKE_BUILD_TYPE="Gentoo"
 	fi
 	if use kernel_linux; then
-		myargs=" -DENABLE_LOADCHECK=ON "
+		local myargs=" -DENABLE_LOADCHECK=ON "
 	fi
 
-	mycmakeargs=(
+	local mycmakeargs=(
 		$(cmake-utils_use_enable cache CACHE)
 		$(cmake-utils_use_enable chroot CHROOT)
 		$(cmake-utils_use_enable ipv6 IPV6)
@@ -72,18 +60,4 @@ src_install() {
 	newinitd "${FILESDIR}"/hiawatha.initd  hiawatha
 
 	keepdir /var/l{ib,og}/hiawatha
-	if use monitor; then
-		insinto /usr/share/"${PN}"/monitor
-		doins -r "${WORKDIR}"/monitor/*
-		newdoc "${WORKDIR}"/monitor/README README.monitor
-		newdoc "${WORKDIR}"/monitor/ChangeLog ChangeLog.monitor
-	fi
-}
-
-pkg_postinst() {
-	if use monitor; then
-		einfo "You requested the server monitor feature. The required files have been"
-		einfo "installed to /usr/share/${PN}/monitor."
-		einfo "Please follow the instructions in /usr/share/${PN}/monitor/README."
-	fi
 }
diff --git a/www-servers/hiawatha/metadata.xml b/www-servers/hiawatha/metadata.xml
index 9417ba1..17ef17e 100644
--- a/www-servers/hiawatha/metadata.xml
+++ b/www-servers/hiawatha/metadata.xml
@@ -3,9 +3,9 @@
 <pkgmetadata>
 	<maintainer><email>maintainer-wanted@gentoo.org</email></maintainer>
 	<use>
-		<flag name='cache'>Enable caching of content</flag>
-		<flag name='chroot'>Enable running in a chroot</flag>
-		<flag name='monitor'>Install the monitor package, an additional PHP/MySQL site</flag>
+		<flag name='cache'>Enable caching of content.</flag>
+		<flag name='chroot'>Enable running in a chroot.</flag>
+		<flag name='monitor'>Pull in www-apps/hiawatha-monitor.</flag>
 		<flag name='rewrite'>Enable the rewrite toolkit.</flag>
 		<flag name='rproxy'>Allow Hiawatha to run a reverse proxy.</flag>
 		<flag name='tomahawk'>Enable Tomahawk control server.</flag>
-- 
cgit v1.2.3