www-servers/hiawatha: remove unused versions 9.8, 9.14, and 9.14-r1.

Package-Manager: Portage-2.3.3, Repoman-2.3.1

diff --git a/www-servers/hiawatha/Manifest b/www-servers/hiawatha/Manifest
index 9a62e6afa2089b2d1c5194e8d3f966d7afaf0f50..f41287cb86d059026eed2cde61143b64b0ef603d 100644 (file)
--- a/www-servers/hiawatha/Manifest
+++ b/www-servers/hiawatha/Manifest
@@ -1,3 +1 @@
-DIST hiawatha-9.14.tar.gz 891930 SHA256 79c92587cd86a0461d952c99036f5615dacdcaccabe0a9a29359e6044d809bfa SHA512 66ad77c132d34daa5eb597ce67d7b26581c59534e5cf83dd65f78567a9a1798030cd42fef2d612bd1935243db979a2ef1df873f01b0d0a009395ef3da1dca6e6 WHIRLPOOL 8dbeb2c33e9111a27b76f3e5e307872314e85c481a600c39a1e02e7f9e08e1cc0d64f79838dad92a4a5a555cb86334487dd247efb56f0ef9c15a7735da27ddae
 DIST hiawatha-9.15.tar.gz 869922 SHA256 e9252133a1114095d1a9a89144b88828ee3b9754f435bd88270f7bf444dd9421 SHA512 e5f0459475863c7cb2d15bdf2a9712f13c96ac450f349fd89e60fd600aad9010f25182aa6353a3014069a9798544a56ef79695918613946b63fecd3806b1982b WHIRLPOOL 80840072765430b05ecaf1ec631d3f1981c6f420edc18b4bcc7957f53f28ed2800170bbcec943c287da2968e6ac769514843fc54aa2a927d7d451057ed76d4d3
-DIST hiawatha-9.8.tar.gz 888977 SHA256 6fe9bd408361bc07b47fe6eeaf98d6b644e1cd258b3470da3e70aba510e83b64 SHA512 f55b6065e0dd1dab11ccbbb44e981944aab5b542077fc2b4a03ec8c055be80bedb7b639fe9c52ccf0fc279648b9f4bfc0cbfa018b195b155907810bdfc4ec51a WHIRLPOOL 342c19df23dbe4eef7056f2424d53badede5a8dcf8bb713e7d3892f21e1061ae5e1a0c985f1fc824b10f25eb9fcc9cf0cbf8d384240bf814df4f9dca45dd96f2

diff --git a/www-servers/hiawatha/files/hiawatha-9.14-system-mbedtls.patch b/www-servers/hiawatha/files/hiawatha-9.14-system-mbedtls.patch
deleted file mode 100644 (file)
index 05f3d09..0000000
--- a/www-servers/hiawatha/files/hiawatha-9.14-system-mbedtls.patch
+++ /dev/null
@@ -1,25 +0,0 @@
-Add missing libraries to linker.
-
-
---- CMakeLists.txt
-+++ CMakeLists.txt
-@@ -114,7 +114,7 @@
-               #add_definitions(-DMBEDTLS_THREADING_PTHREAD -DMBEDTLS_THREADING_C)
-               add_subdirectory(mbedtls)
-       endif()
--      set(MBEDTLS_LIBRARY "mbedtls")
-+      set(MBEDTLS_LIBRARIES "mbedtls" "mbedx509" "mbedcrypto")
- endif()
- 
- # Hiawatha
-@@ -144,8 +144,8 @@
- target_link_libraries(wigwam ${CRYPT_LIBRARY})
- target_link_libraries(hiawatha ${CRYPT_LIBRARY} pthread ${Z_LIBRARY})
- if(ENABLE_TLS)
--      target_link_libraries(hiawatha ${MBEDTLS_LIBRARY})
--      target_link_libraries(wigwam ${MBEDTLS_LIBRARY})
-+      target_link_libraries(hiawatha ${MBEDTLS_LIBRARIES})
-+      target_link_libraries(wigwam ${MBEDTLS_LIBRARIES})
-       if(NOT USE_SYSTEM_MBEDTLS)
-               set_target_properties(hiawatha PROPERTIES INSTALL_RPATH ${CMAKE_INSTALL_FULL_LIBDIR}/hiawatha)
-               set_target_properties(wigwam PROPERTIES INSTALL_RPATH ${CMAKE_INSTALL_FULL_LIBDIR}/hiawatha)

diff --git a/www-servers/hiawatha/files/hiawatha.initd b/www-servers/hiawatha/files/hiawatha.initd
deleted file mode 100644 (file)
index 61bea73..0000000
--- a/www-servers/hiawatha/files/hiawatha.initd
+++ /dev/null
@@ -1,25 +0,0 @@
-#!/sbin/openrc-run
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-depend() {
-       need net
-}
-
-start() {
-       ebegin "Starting ${SVCNAME}"
-       start-stop-daemon \
-               --start \
-               --exec "/usr/sbin/hiawatha" \
-               --pidfile "/var/run/hiawatha.pid"
-       eend $?
-}
-
-stop() {
-       ebegin "Stopping ${SVCNAME}"
-       start-stop-daemon \
-               --stop \
-               --exec "/usr/sbin/hiawatha" \
-               --pidfile "/var/run/hiawatha.pid"
-       eend $?
-}

diff --git a/www-servers/hiawatha/hiawatha-9.14-r1.ebuild b/www-servers/hiawatha/hiawatha-9.14-r1.ebuild
deleted file mode 100644 (file)
index 4bab0bb..0000000
--- a/www-servers/hiawatha/hiawatha-9.14-r1.ebuild
+++ /dev/null
@@ -1,84 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-# ssl USE flag currently broken, unconditionally enabled
-# rproxy USE flag broken too, unconditionally enabled
-
-EAPI=5
-
-inherit cmake-utils systemd user
-
-DESCRIPTION="Advanced and secure webserver"
-HOMEPAGE="http://www.hiawatha-webserver.org"
-SRC_URI="http://www.hiawatha-webserver.org/files/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="+cache ipv6 monitor +rewrite tomahawk +xslt"
-
-RDEPEND="
-       >=net-libs/mbedtls-2.0[threads]
-       xslt? ( dev-libs/libxslt
-                       dev-libs/libxml2 )"
-DEPEND="${RDEPEND}"
-PDEPEND="monitor? ( www-apps/hiawatha-monitor )"
-
-# set this in make.conf if you want to use a different user/group
-HIAWATHA_USER=${HIAWATHA_USER:-hiawatha}
-HIAWATHA_GROUP=${HIAWATHA_GROUP:-hiawatha}
-
-pkg_setup() {
-       enewgroup ${HIAWATHA_GROUP}
-       enewuser ${HIAWATHA_USER} -1 -1 /var/www/hiawatha ${HIAWATHA_GROUP}
-}
-
-src_prepare() {
-       epatch "${FILESDIR}"/${PN}-9.5-cflags.patch \
-               "${FILESDIR}"/${PN}-9.14-system-mbedtls.patch
-
-       grep '#ServerId =' config/hiawatha.conf.in 1>/dev/null || die
-       sed -i \
-               -e "s/#ServerId =.*$/ServerId = ${HIAWATHA_USER}/" \
-               config/hiawatha.conf.in || die
-}
-
-src_configure() {
-       local mycmakeargs=(
-               -DCONFIG_DIR:STRING=/etc/hiawatha
-               $(cmake-utils_use_enable cache CACHE)
-               $(cmake-utils_use_enable ipv6 IPV6)
-               $(cmake-utils_use_enable kernel_linux LOADCHECK)
-               $(cmake-utils_use_enable monitor MONITOR)
-               -DENABLE_TLS=YES
-               $(cmake-utils_use_enable tomahawk TOMAHAWK)
-               $(cmake-utils_use_enable rewrite TOOLKIT)
-               $(cmake-utils_use_enable xslt XSLT)
-               -DUSE_SYSTEM_MBEDTLS=ON
-               -DLOG_DIR:STRING=/var/log/hiawatha
-               -DPID_DIR:STRING=/var/run
-               -DWEBROOT_DIR:STRING=/var/www/hiawatha
-               -DWORK_DIR:STRING=/var/lib/hiawatha
-       )
-
-       cmake-utils_src_configure
-}
-
-src_install() {
-       cmake-utils_src_install
-
-       rm -rf "${ED%/}"/var/www/hiawatha/*
-
-       newinitd "${FILESDIR}"/hiawatha.initd hiawatha
-       systemd_dounit "${FILESDIR}"/hiawatha.service
-
-       local i
-       for i in /var/{lib,log}/hiawatha ; do
-               keepdir ${i}
-               fowners ${HIAWATHA_USER}:${HIAWATHA_GROUP} ${i}
-               fperms 0750 ${i}
-       done
-
-       keepdir /var/www/hiawatha
-       fowners ${HIAWATHA_USER}:${HIAWATHA_GROUP} /var/www/hiawatha
-}

diff --git a/www-servers/hiawatha/hiawatha-9.14.ebuild b/www-servers/hiawatha/hiawatha-9.14.ebuild
deleted file mode 100644 (file)
index ab58be3..0000000
--- a/www-servers/hiawatha/hiawatha-9.14.ebuild
+++ /dev/null
@@ -1,81 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-# ssl USE flag currently broken, unconditionally enabled
-# rproxy USE flag broken too, unconditionally enabled
-
-EAPI=5
-
-inherit cmake-utils systemd user
-
-DESCRIPTION="Advanced and secure webserver"
-HOMEPAGE="http://www.hiawatha-webserver.org"
-SRC_URI="http://www.hiawatha-webserver.org/files/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="+cache ipv6 monitor +rewrite tomahawk +xslt"
-
-RDEPEND="
-       xslt? ( dev-libs/libxslt
-                       dev-libs/libxml2 )"
-DEPEND="${RDEPEND}"
-PDEPEND="monitor? ( www-apps/hiawatha-monitor )"
-
-# set this in make.conf if you want to use a different user/group
-HIAWATHA_USER=${HIAWATHA_USER:-hiawatha}
-HIAWATHA_GROUP=${HIAWATHA_GROUP:-hiawatha}
-
-pkg_setup() {
-       enewgroup ${HIAWATHA_GROUP}
-       enewuser ${HIAWATHA_USER} -1 -1 /var/www/hiawatha ${HIAWATHA_GROUP}
-}
-
-src_prepare() {
-       epatch "${FILESDIR}"/${PN}-9.5-cflags.patch
-
-       grep '#ServerId =' config/hiawatha.conf.in 1>/dev/null || die
-       sed -i \
-               -e "s/#ServerId =.*$/ServerId = ${HIAWATHA_USER}/" \
-               config/hiawatha.conf.in || die
-}
-
-src_configure() {
-       local mycmakeargs=(
-               -DCONFIG_DIR:STRING=/etc/hiawatha
-               $(cmake-utils_use_enable cache CACHE)
-               $(cmake-utils_use_enable ipv6 IPV6)
-               $(cmake-utils_use_enable kernel_linux LOADCHECK)
-               $(cmake-utils_use_enable monitor MONITOR)
-               -DENABLE_TLS=YES
-               $(cmake-utils_use_enable tomahawk TOMAHAWK)
-               $(cmake-utils_use_enable rewrite TOOLKIT)
-               $(cmake-utils_use_enable xslt XSLT)
-               -DLOG_DIR:STRING=/var/log/hiawatha
-               -DPID_DIR:STRING=/var/run
-               -DWEBROOT_DIR:STRING=/var/www/hiawatha
-               -DWORK_DIR:STRING=/var/lib/hiawatha
-       )
-
-       cmake-utils_src_configure
-}
-
-src_install() {
-       cmake-utils_src_install
-
-       rm -rf "${ED%/}"/var/www/hiawatha/*
-
-       newinitd "${FILESDIR}"/hiawatha.initd hiawatha
-       systemd_dounit "${FILESDIR}"/hiawatha.service
-
-       local i
-       for i in /var/{lib,log}/hiawatha ; do
-               keepdir ${i}
-               fowners ${HIAWATHA_USER}:${HIAWATHA_GROUP} ${i}
-               fperms 0750 ${i}
-       done
-
-       keepdir /var/www/hiawatha
-       fowners ${HIAWATHA_USER}:${HIAWATHA_GROUP} /var/www/hiawatha
-}

diff --git a/www-servers/hiawatha/hiawatha-9.8.ebuild b/www-servers/hiawatha/hiawatha-9.8.ebuild
deleted file mode 100644 (file)
index a5d28c0..0000000
--- a/www-servers/hiawatha/hiawatha-9.8.ebuild
+++ /dev/null
@@ -1,87 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-# ssl USE flag currently broken, unconditionally enabled
-# rproxy USE flag broken too, unconditionally enabled
-
-EAPI=5
-
-inherit cmake-utils systemd user
-
-DESCRIPTION="Advanced and secure webserver"
-HOMEPAGE="http://www.hiawatha-webserver.org"
-SRC_URI="http://www.hiawatha-webserver.org/files/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="debug +cache ipv6 monitor +rewrite tomahawk +xslt"
-
-RDEPEND="
-       >=net-libs/polarssl-1.3[threads]
-       xslt? ( dev-libs/libxslt
-                       dev-libs/libxml2 )"
-DEPEND="${RDEPEND}"
-PDEPEND="monitor? ( www-apps/hiawatha-monitor )"
-
-# set this in make.conf if you want to use a different user/group
-HIAWATHA_USER=${HIAWATHA_USER:-hiawatha}
-HIAWATHA_GROUP=${HIAWATHA_GROUP:-hiawatha}
-
-pkg_setup() {
-       enewgroup ${HIAWATHA_GROUP}
-       enewuser ${HIAWATHA_USER} -1 -1 /var/www/hiawatha ${HIAWATHA_GROUP}
-}
-
-src_prepare() {
-       epatch "${FILESDIR}"/${PN}-9.5-cflags.patch
-
-       rm -r polarssl || die
-
-       grep '#ServerId =' config/hiawatha.conf.in 1>/dev/null || die
-       sed -i \
-               -e "s/#ServerId =.*$/ServerId = ${HIAWATHA_USER}/" \
-               config/hiawatha.conf.in || die
-}
-
-src_configure() {
-       local mycmakeargs=(
-               -DCONFIG_DIR:STRING=/etc/hiawatha
-               $(cmake-utils_use_enable cache CACHE)
-               $(cmake-utils_use_enable debug DEBUG)
-               $(cmake-utils_use_enable ipv6 IPV6)
-               $(cmake-utils_use_enable kernel_linux LOADCHECK)
-               $(cmake-utils_use_enable monitor MONITOR)
-               -DENABLE_SSL=YES
-               $(cmake-utils_use_enable tomahawk TOMAHAWK)
-               $(cmake-utils_use_enable rewrite TOOLKIT)
-               $(cmake-utils_use_enable xslt XSLT)
-               -DLOG_DIR:STRING=/var/log/hiawatha
-               -DPID_DIR:STRING=/var/run
-               -DUSE_SHARED_POLARSSL_LIBRARY=ON
-               -DUSE_SYSTEM_POLARSSL=ON
-               -DWEBROOT_DIR:STRING=/var/www/hiawatha
-               -DWORK_DIR:STRING=/var/lib/hiawatha
-       )
-
-       cmake-utils_src_configure
-}
-
-src_install() {
-       cmake-utils_src_install
-
-       rm -rf "${ED%%/}"/var/www/hiawatha/*
-
-       newinitd "${FILESDIR}"/hiawatha.initd hiawatha
-       systemd_dounit "${FILESDIR}"/hiawatha.service
-
-       local i
-       for i in /var/{lib,log}/hiawatha ; do
-               keepdir ${i}
-               fowners ${HIAWATHA_USER}:${HIAWATHA_GROUP} ${i}
-               fperms 0750 ${i}
-       done
-
-       keepdir /var/www/hiawatha
-       fowners ${HIAWATHA_USER}:${HIAWATHA_GROUP} /var/www/hiawatha
-}