www-servers/hiawatha: Fix useflags: Remove 'chroot' and rename 'xsl' to 'xslt'

4 files changed, 20 insertions, 8 deletions

diff --git a/www-servers/hiawatha/ChangeLog b/www-servers/hiawatha/ChangeLog
index eebd23211..1b1ac376b 100644
--- a/www-servers/hiawatha/ChangeLog
+++ b/www-servers/hiawatha/ChangeLog
@@ -2,6 +2,10 @@
 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
 # $Header: $
 
+  25 Apr 2013; René Neumann (Necoro) <gentoo@necoro.eu> hiawatha-9.1.1.ebuild,
+  metadata.xml:
+  Fix useflags: Remove 'chroot' and rename 'xsl' to 'xslt'
+
 *hiawatha-9.1.1 (24 Apr 2013)
 
   24 Apr 2013; René Neumann (Necoro) <gentoo@necoro.eu>
diff --git a/www-servers/hiawatha/Manifest b/www-servers/hiawatha/Manifest
index f5c599437..31ab48c5a 100644
--- a/www-servers/hiawatha/Manifest
+++ b/www-servers/hiawatha/Manifest
@@ -1,5 +1,5 @@
 AUX hiawatha.initd 450 SHA256 c229c23712d71cf830a46f152f78a1aa726cf7c7cf9129ef7acfefb73483ae4c SHA512 412ba77b765015dccf6804d0ef06c55590b7dbec0bf3beb18652e05ae0efc364061bb8892e9727d2a7ac5df93656b62bcb89448dfa4272ae6ae26c633523b17a WHIRLPOOL b4316496f5b7e0ea330ccf51a14e7fcaf586bde794e29dc13828e34e05e5bf35c5db2d7544b7fd6ba369f9d0a2fb0fbfe358cb1dc75d0aadb95d0cae61c63b1d
 DIST hiawatha-9.1.1.tar.gz 669052 SHA256 68b1c65eb5f9ab2527875fd0960d3b88aaddb7c79594a405687db2aabac40395 SHA512 3f7632dd80282c68911636b59760c28b63f5673f36c1edff00545fa7b6f6a1f0fa090c4a18c8f5a97d0a46ef90fbaf60843b0c0bec513b4e1e27e672380a3143 WHIRLPOOL 7ed5d483afdeb0c57bad1279a9cd97f63927ca72bec6f0eed3eb326d44aaf092503a12f62cabbbda8a9d1e106ad83102fe7357657f6edc3d2612b127247a87ae
-EBUILD hiawatha-9.1.1.ebuild 1620 SHA256 01564acfb2615cc320cddca71788495ec20c7353dfb4fbbaa4d9d0f620246a6f SHA512 74937973949fcbd71380690d62fb7183c0b513aded71e5150dda8ef0f56ea5c5cb5279d4b66a9d44bf166e62b57b43f4c5f7f175a8090d198c6b0923d0b180f3 WHIRLPOOL 1f10e11ee423d5466a0f73088fe861aa0ad433c2fa58e38e3ace4ed807da45ac5f857c185c8641f8a2f29a25ef0338350ff821d97cb1bd180012fd2eb7774b4c
-MISC ChangeLog 336 SHA256 14ca9d2e73ffb647f009b86caa21f6fe124c6c2a18bae5fe818716cc3b824133 SHA512 1c872674abee21738700230fe9455206951ed1f22db715382b6b9e59a5de765b8b53a043d7a6dc6bf99fdc504859e9278a914765cc9f23affd61b33fa8d44513 WHIRLPOOL 866336e854851c920d3574109ab01b661e428334e85cb753d69d9d7d6afbc5dc8756ca8183639697300c1d73d12b358645e0924653a6901692886174811984ca
-MISC metadata.xml 594 SHA256 fe1ce22e1f3ea2933c808af251f30e6216fa8b39216f2201afe3126c60a3728f SHA512 7099486aee8af5dfc7be20aa1e926bf024a460e1a8c5f4077763f8061e6ccc3eaae0aeb2c88532e8d0d56355bf9e6ed58c2e159e58bb421bfddb29f84eb71f3f WHIRLPOOL 37a4c537cc9c92bfe877faa87a8b3d555062e53cc8c3ab0af3b5c8fbf15573bfda3be4a5e65cb3771b8499a507dff0f5473f69bc853a9960ad41cbeac85ea05f
+EBUILD hiawatha-9.1.1.ebuild 1772 SHA256 42a7d03d7aade61453e4bc960f138f8f7c45a2a442c49bf6c5c2a89b9cb6b3a5 SHA512 70e784b5aba33af73f59e2168aa1d21fe876c4cd87441d8dcc0b2ddb9cef52e7d79a3eba03032b3392d8547cd3bcd6ef425b27bfa53bb49c648fe64772593d7f WHIRLPOOL 585f5a2cd97631ff82376ac2622a0bba110b2f432f31effa7ee18a7714c74b1d71a9f386c6c34cda83a027f33cc2354f9fe51e94b6999711bfaccafd3ed757a7
+MISC ChangeLog 492 SHA256 42fdd495d1765d3f4aee3fcd004640a3e37cbf8eb53942da8a8677ec4a0c1777 SHA512 ba98bbe3efe3862ed5d3b2f17f368096189b3eb65c99f3f19b6a0a0bcd0789a89827cc17919ebf57d82a07651576981fab04fee08fd06058339beaf2e3f897a3 WHIRLPOOL 9c8029fdbb116e6758e9a770195e3ac91b019fbf3466dba38e08a6a8379c4c35be9c13ffbfdac402f8c3271d287557fafad33dd37734cc11cb168deb8e21150d
+MISC metadata.xml 688 SHA256 899bd3d1f7bf5024a1c7e29f19f032fc79a9a86ebd9d382dd254b36af4d4691a SHA512 8ec0fd508963cc9dec8cd3976549273f142a254f9076a444287240de0192c7ca45c22014681dd1dbf7411e2cd20e8085c9b0e988c3c7d16675c143bbfaf34bb7 WHIRLPOOL 4194b103b767d72ccf26b93143b7508bbfb9df84bee57a1b00758a9e324759683043614acfe0f41a8be2f8862f17768c856171ef8c79222f4dfa8a7186be1e20
diff --git a/www-servers/hiawatha/hiawatha-9.1.1.ebuild b/www-servers/hiawatha/hiawatha-9.1.1.ebuild
index 74a500fd2..f397f9873 100644
--- a/www-servers/hiawatha/hiawatha-9.1.1.ebuild
+++ b/www-servers/hiawatha/hiawatha-9.1.1.ebuild
@@ -19,21 +19,27 @@ 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"
+IUSE="debug +cache ipv6 monitor +rewrite rproxy ssl tomahawk +xslt"
 
 DEPEND="
 	sys-libs/zlib
 	ssl? ( >=net-libs/polarssl-1.2 )
-	xsl? (	dev-libs/libxslt
+	xslt? (	dev-libs/libxslt
 			dev-libs/libxml2 )"
 
 RDEPEND="${DEPEND}"
 PDEPEND="monitor? ( www-apps/hiawatha-monitor )"
 
+pkg_setup() {
+	if ! use xslt; then
+		ewarn "XSLT has been disabled on your request."
+		ewarn "Note that XSLT is needed for directory listings."
+	fi
+}
+
 src_configure() {
 	local mycmakeargs=(
 		$(cmake-utils_use_enable cache CACHE)
-		$(cmake-utils_use_enable chroot CHROOT)
 		$(cmake-utils_use_enable ipv6 IPV6)
 		$(cmake-utils_use_enable debug DEBUG)
 		$(cmake-utils_use_enable monitor MONITOR)
@@ -41,7 +47,8 @@ src_configure() {
 		$(cmake-utils_use_enable rproxy RPROXY)
 		$(cmake-utils_use_enable ssl SSL)
 		$(cmake-utils_use_use    ssl SYSTEM_POLARSSL)
-		$(cmake-utils_use_enable xsl XSLT)
+		$(cmake-utils_use_enable tomahawk TOMAHAWK)
+		$(cmake-utils_use_enable xslt XSLT)
 
 		$(cmake_utils_use_enable kernel_linux LOADCHECK)
 		-DLOG_DIR:STRING=/var/log/hiawatha
diff --git a/www-servers/hiawatha/metadata.xml b/www-servers/hiawatha/metadata.xml
index dadddeb50..80d95667f 100644
--- a/www-servers/hiawatha/metadata.xml
+++ b/www-servers/hiawatha/metadata.xml
@@ -7,8 +7,9 @@
 		<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 as a reverse proxy.</flag>
+		<flag name='rproxy'>Allow Hiawatha to serve as a reverse proxy.</flag>
 		<flag name='tomahawk'>Enable Tomahawk control server.</flag>
+		<flag name='xslt'>Enable XSLT support. This is also needed for directory listings.</flag>
 	</use>
 </pkgmetadata>