diff options
| author | René 'Necoro' Neumann <necoro@necoro.net> | 2013-04-25 18:50:26 +0200 |
|---|---|---|
| committer | René 'Necoro' Neumann <necoro@necoro.net> | 2013-04-25 18:50:26 +0200 |
| commit | c7f7803349508e17bbc3e6a78809ae9d5639b2f1 (patch) | |
| tree | 14dbf8aeedfc42d0eb1566d658027b1d0241ad16 | |
| parent | 920341bdf91a6e2b58f92effbb7d0b4e71fd8fbc (diff) | |
| download | overlay-c7f7803349508e17bbc3e6a78809ae9d5639b2f1.tar.gz overlay-c7f7803349508e17bbc3e6a78809ae9d5639b2f1.tar.bz2 overlay-c7f7803349508e17bbc3e6a78809ae9d5639b2f1.zip | |
Hiawatha changes
| -rw-r--r-- | www-apps/hiawatha-monitor/Manifest | 2 | ||||
| -rw-r--r-- | www-apps/hiawatha-monitor/hiawatha-monitor-0.6.ebuild | 2 | ||||
| -rw-r--r-- | www-servers/hiawatha/Manifest | 6 | ||||
| -rw-r--r-- | www-servers/hiawatha/hiawatha-9.1.1.ebuild (renamed from www-servers/hiawatha/hiawatha-9.1.ebuild) | 19 | ||||
| -rw-r--r-- | www-servers/hiawatha/metadata.xml | 1 |
5 files changed, 21 insertions, 9 deletions
diff --git a/www-apps/hiawatha-monitor/Manifest b/www-apps/hiawatha-monitor/Manifest index 7d11589..2ad2479 100644 --- a/www-apps/hiawatha-monitor/Manifest +++ b/www-apps/hiawatha-monitor/Manifest @@ -1,2 +1,2 @@ DIST monitor-0.6.tar.gz 538567 SHA256 8b0627f5fd78c680dd56afb49fe34c96ff252d41582b152c08153a2b6baccf08 SHA512 07731b821ea7fcde83f93af472786d6c4e816544f2e7c8bfa3669f042af19f917a772af0dbfeba786832865d0aa8794af5b248d8d7935a49d7fa7634b6903fad WHIRLPOOL 8d065dbc4e67f7eda047896a94e7303b668da055e9375617c8f4c2f30858673c0ba6fa7e7d3048756637366e940e2b24493c086e452dce3657fc42ac7e20d643 -EBUILD hiawatha-monitor-0.6.ebuild 711 SHA256 32aa29d28166f6cdccd497c6a0041c1b0042b64d1ebc61fff7579751f53bb296 SHA512 6b1bcc4d5c7bafc76c366e92a2cfbc030e8436f8a7b6e0dabe2e23a2a99bbb9bb1fa2fe46f72d3b6ff19d3916dd77f468c51c0f2834deebb3c1dd8caa88608a9 WHIRLPOOL 52d649f62758770dd611b8f573d204cd0690089c819e4ea700a6495ae48852c97774f451d6fa3c5d8288c734cc68d00f9ce62c4c53e148c12e8db3b6028b6701 +EBUILD hiawatha-monitor-0.6.ebuild 712 SHA256 0db42108a69c804bb2d5b258e2769a1baf09f454110bf925871985ec306385be SHA512 8280a8fd7785e5708e95991f856758eb0337e74ac0d9b3eddba497960547b877ec8b3234d503b29098582c569e07fe80a3a0e07cbeb82d9c1a92d6a981a06ddd WHIRLPOOL 0c4acf277d6cbd3a9dc4f2fd55a39164545f5cda87017aaf3a01dd56d0265f9d23a92391e2699d8f34f011cc95d09e90f306069b96baabcb0f170e4b084d856b diff --git a/www-apps/hiawatha-monitor/hiawatha-monitor-0.6.ebuild b/www-apps/hiawatha-monitor/hiawatha-monitor-0.6.ebuild index c370be9..b5003d3 100644 --- a/www-apps/hiawatha-monitor/hiawatha-monitor-0.6.ebuild +++ b/www-apps/hiawatha-monitor/hiawatha-monitor-0.6.ebuild @@ -17,7 +17,7 @@ IUSE="" DEPEND="" RDEPEND=" - www-servers/hiawatha[xsl] + www-servers/hiawatha[xslt] virtual/cron =dev-lang/php-5*[mysql,xsl] virtual/mysql" diff --git a/www-servers/hiawatha/Manifest b/www-servers/hiawatha/Manifest index 94a929d..52b0faa 100644 --- a/www-servers/hiawatha/Manifest +++ b/www-servers/hiawatha/Manifest @@ -1,7 +1,7 @@ AUX hiawatha-9.0-no-bundled-polarssl.patch 1398 SHA256 306a5c2615910636e79d86e82f38bbda0896e68f668bea3a2bbef0acc979312b SHA512 b982d0a40e410fa70568764e8ee2b771f505748604845938bdb0fafa3f7b974d01f81b1d8ffe3254c80bbde02e821a15d74ae5dd5fbb8b0a7d0fefb9edee1599 WHIRLPOOL eb8f6a92e332fa6d71dbf9a98f32db31fe05b53e56b42166316676aed80aa96a72c185d645509e01d42226788d317fd992a19176cc61214e2edb854acc837b3a AUX hiawatha.initd 450 SHA256 131f1fa9277edc742f92a69fc3c4bf7880864ef7ac93633a7170e8452a4e4c13 SHA512 dfa3b58f4fdb9400a2c9ce77740bc1c175ad5206429170ba7336cdd12adabb3f6be9cce911be015f404a65c5d10807854427a186ee90405662ee43e3e4ab8824 WHIRLPOOL 39264768b25aae0e79745e010545f36df300894091d02198eb28d6313b89241dd1bca9fbfab2fc396b376fbb9a95b79db40435387d92b9e62a37b1506ff734a9 DIST hiawatha-9.0.tar.gz 666274 SHA256 5e40119afb050b11737250c08d89ac7ba7472645738a48c06aa79979a19729fc SHA512 395333c1477c42cce9cb5540a7e6589afb16103bd78dd9bbd06df598ed04a3e29f2dfe19c20cf73c258de6cc00653e97aa204bd18f391a919c7129ebff9d6e5d WHIRLPOOL 691cc874d7079b8146871abf7c2733c62cd21154b8fbd04c2aa6d1ad438ab93e4ce03608e52d5b825fda6169f2e8f7c08e15f593c90837e54bba629a2d4f5041 -DIST hiawatha-9.1.tar.gz 668935 SHA256 83f889d77acaed453742a95ea2b5a1a5e2cdc01bd7288064c1d0664afd452154 SHA512 a79b982f8b55b32dfe19da1a21f80f355c8d6bd13d758b548d066186fb8e6056fa1ad7c501cc3afa096665e035baacb5960de91640872b965ee0b234f61f6e2e WHIRLPOOL 0ff17931f475e1f14940ee73334df28e50a9538ed7be3bb32d6e098494112781ed09ab6406ca4b4338c50ba312cb22c5f816ad77fe8aaa32941c0b18e57ff39b +DIST hiawatha-9.1.1.tar.gz 669052 SHA256 68b1c65eb5f9ab2527875fd0960d3b88aaddb7c79594a405687db2aabac40395 SHA512 3f7632dd80282c68911636b59760c28b63f5673f36c1edff00545fa7b6f6a1f0fa090c4a18c8f5a97d0a46ef90fbaf60843b0c0bec513b4e1e27e672380a3143 WHIRLPOOL 7ed5d483afdeb0c57bad1279a9cd97f63927ca72bec6f0eed3eb326d44aaf092503a12f62cabbbda8a9d1e106ad83102fe7357657f6edc3d2612b127247a87ae EBUILD hiawatha-9.0.ebuild 1531 SHA256 aa384558b4151ef5a34543bde154c686a906f34deeb0f91a4d5538340c55c779 SHA512 863c211cce1bdd9e353a6cbe5148cc16208b800bdf4908e73b31c8fd8af0bb19fb010b0ac51b6a94ae7285339dd0d8908dc20e8273ab10b5f270423e01943e0c WHIRLPOOL d94c59da6a093016e08638109efd6a327446896484f79c1e643c01a324c475a148fbf0c6260a5259da6a2573f0f3efa2ce3943a6c945a2cff5c9915865f24882 -EBUILD hiawatha-9.1.ebuild 1466 SHA256 dd53355cda46b91fbba625f2a6458d4323c649980fd7714456ddeea685a78e3e SHA512 620d9cdfac38406346f8aa6608f061b39a4d2937971d53ad42f339c2303e96b020088ce4d73956daeff28ec2775d54289f7640c97664cbd59308b9d2d45726c4 WHIRLPOOL c922c3438e88904e23af3e402b023e90e8d03edebbad31a425cf248741fa3dd500d4958f62ee3a2b033294ea53bdb30996a1beb051600b38b555a0ffb6495452 -MISC metadata.xml 591 SHA256 0bfe816256782a71b03169ae99d3f5615814ee6a89ba95c3dcbcc2b331906c78 SHA512 60dee97034f30e8a118bcb9248314f8567974f4e5e4dde451dc90c842c70c4b72be5acb83dcda083183fa4f25be4c4c937b3917d2cabc94e86f5d105a5e6bd4c WHIRLPOOL f900782475798d45be666f99a70462cdcafa60397d18fe42d999bd00927d7313e24af2381478a2a6d0f3e6a5084b4d76a9b2be48a9b5574192fd94b5d5a5f64b +EBUILD hiawatha-9.1.1.ebuild 1772 SHA256 42a7d03d7aade61453e4bc960f138f8f7c45a2a442c49bf6c5c2a89b9cb6b3a5 SHA512 70e784b5aba33af73f59e2168aa1d21fe876c4cd87441d8dcc0b2ddb9cef52e7d79a3eba03032b3392d8547cd3bcd6ef425b27bfa53bb49c648fe64772593d7f WHIRLPOOL 585f5a2cd97631ff82376ac2622a0bba110b2f432f31effa7ee18a7714c74b1d71a9f386c6c34cda83a027f33cc2354f9fe51e94b6999711bfaccafd3ed757a7 +MISC metadata.xml 683 SHA256 5601eb98666599670ae673aaa22672807004799cc4d5ec81535840bc064fa16b SHA512 85caaa20b75909a5dfe1877414205fdfefe2e721e4867c6821a71ddcd06bb090ee0070d18c5fe4045c2cd3bee7194588aaea69a8e146931e0ab73055dcca7d8a WHIRLPOOL 37f7a5f992b6f9c1f82f336f45841cf78636dee2c33a12adb3b7a0cc186bd3d4b45073c717a2b40af2337ea26443e09655112c53660a4ac2393361da2412192d diff --git a/www-servers/hiawatha/hiawatha-9.1.ebuild b/www-servers/hiawatha/hiawatha-9.1.1.ebuild index 27dadf1..f397f98 100644 --- a/www-servers/hiawatha/hiawatha-9.1.ebuild +++ b/www-servers/hiawatha/hiawatha-9.1.1.ebuild @@ -12,24 +12,34 @@ DESCRIPTION="Advanced and secure webserver" HOMEPAGE="http://www.hiawatha-webserver.org" SRC_URI="http://www.hiawatha-webserver.org/files/${P}.tar.gz" +# NB: version 9.1.1 is a "Gentoo-only" release, which removed the dependency on +# the bundled PolarSSL +# --> it is not anounced on the hiawatha homepage + 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) @@ -37,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 17ef17e..14aa2fc 100644 --- a/www-servers/hiawatha/metadata.xml +++ b/www-servers/hiawatha/metadata.xml @@ -9,6 +9,7 @@ <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> + <flag name='xslt'>Enable XSLT support. This is also needed for directory listings.</flag> </use> </pkgmetadata> |