commit: a23b47f8d35c85cb33250de63fbc2e8e48788cc4 Author: Aaron Bauman <bman <AT> gentoo <DOT> org> AuthorDate: Sun Jan 5 04:04:39 2020 +0000 Commit: Aaron Bauman <bman <AT> gentoo <DOT> org> CommitDate: Sun Jan 5 04:04:39 2020 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a23b47f8
www-*/*: drop last-rited pkgs Signed-off-by: Aaron Bauman <bman <AT> gentoo.org> profiles/package.mask | 6 - www-apps/hiawatha-monitor/Manifest | 1 - .../hiawatha-monitor/hiawatha-monitor-1.6.ebuild | 33 ----- www-apps/hiawatha-monitor/metadata.xml | 8 -- www-servers/hiawatha/Manifest | 1 - .../hiawatha/files/hiawatha-9.5-cflags.patch | 17 --- www-servers/hiawatha/files/hiawatha.initd-r1 | 25 ---- www-servers/hiawatha/files/hiawatha.service | 9 -- www-servers/hiawatha/hiawatha-9.15.ebuild | 142 --------------------- www-servers/hiawatha/metadata.xml | 19 --- 10 files changed, 261 deletions(-) diff --git a/profiles/package.mask b/profiles/package.mask index 0b92df820d5..b91f9bc1875 100644 --- a/profiles/package.mask +++ b/profiles/package.mask @@ -706,12 +706,6 @@ sci-astronomy/casacore # Removal in 30 days. Bug #602024. app-laptop/nvidiabl -# Michał Górny <mgo...@gentoo.org> (2019-12-01) -# Unmaintained. Not bumped since 2015. -# Removal in 30 days. Bug #585126. -www-servers/hiawatha -www-apps/hiawatha-monitor - # Michał Górny <mgo...@gentoo.org> (2019-12-01) # Unmaintained. Last release in 2012. Buggy ebuild. # Removal in 30 days. Bug #658302. diff --git a/www-apps/hiawatha-monitor/Manifest b/www-apps/hiawatha-monitor/Manifest deleted file mode 100644 index ba75b7329de..00000000000 --- a/www-apps/hiawatha-monitor/Manifest +++ /dev/null @@ -1 +0,0 @@ -DIST monitor-1.6.tar.gz 622470 BLAKE2B 79813f162dae9a72b9e62550e58b737b878e69d1eb6ce348f62dd9d8c4309529b9dd77eeba6876fec90d0db6c3894aea5c62ada940a17d53bb8cba876ec31855 SHA512 4983638bfa0bfbe3f391b2319cf2f5ba63527cddc8c667618aba001929140453c8058f35d83bedb53f4dc0e5d5139d3a33dd7d9bac46f94e32dff81e65d53f5e diff --git a/www-apps/hiawatha-monitor/hiawatha-monitor-1.6.ebuild b/www-apps/hiawatha-monitor/hiawatha-monitor-1.6.ebuild deleted file mode 100644 index 8444fca6d85..00000000000 --- a/www-apps/hiawatha-monitor/hiawatha-monitor-1.6.ebuild +++ /dev/null @@ -1,33 +0,0 @@ -# Copyright 1999-2019 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -MY_P="monitor" - -DESCRIPTION="Monitoring application for www-servers/hiawatha" -HOMEPAGE="https://www.hiawatha-webserver.org/howto/monitor"; -SRC_URI="https://www.hiawatha-webserver.org/files/${MY_P}-${PV}.tar.gz " - -LICENSE="GPL-3" -SLOT="0" -KEYWORDS="~amd64 ~x86" -IUSE="" - -RDEPEND=">=dev-lang/php-5:*[mysql,mysqli,xslt] - virtual/cron - virtual/mysql - www-servers/hiawatha[xslt]" - -S=${WORKDIR}/${MY_P} - -DOCS=( ChangeLog README.md INSTALL ) - -src_install () { - default - - rm -f ChangeLog README.md LICENSE INSTALL - - insinto /usr/share/${PN} - doins -r * -} diff --git a/www-apps/hiawatha-monitor/metadata.xml b/www-apps/hiawatha-monitor/metadata.xml deleted file mode 100644 index c69fcf398c8..00000000000 --- a/www-apps/hiawatha-monitor/metadata.xml +++ /dev/null @@ -1,8 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd";> -<pkgmetadata> - <!-- maintainer-needed --> - <upstream> - <remote-id type="github">hsleisink/monitor</remote-id> - </upstream> -</pkgmetadata> diff --git a/www-servers/hiawatha/Manifest b/www-servers/hiawatha/Manifest deleted file mode 100644 index 681fdafcfc8..00000000000 --- a/www-servers/hiawatha/Manifest +++ /dev/null @@ -1 +0,0 @@ -DIST hiawatha-9.15.tar.gz 869922 BLAKE2B 0cd15df60c4f3ad76ceb1405c57e414c26756ab27779d7d1805f1cef218ba409f2f3abe48b3e50ede434f3fa0974b5d86521e697548470448f7c8364f4ae9b6f SHA512 e5f0459475863c7cb2d15bdf2a9712f13c96ac450f349fd89e60fd600aad9010f25182aa6353a3014069a9798544a56ef79695918613946b63fecd3806b1982b diff --git a/www-servers/hiawatha/files/hiawatha-9.5-cflags.patch b/www-servers/hiawatha/files/hiawatha-9.5-cflags.patch deleted file mode 100644 index 4ff33cd0d12..00000000000 --- a/www-servers/hiawatha/files/hiawatha-9.5-cflags.patch +++ /dev/null @@ -1,17 +0,0 @@ -From: Julian Ospald <hasuf...@gentoo.org> -Date: Fri May 23 16:59:33 UTC 2014 -Subject: make optimization level build-type dependant - ---- hiawatha-9.5/CMakeLists.txt -+++ hiawatha-9.5/CMakeLists.txt -@@ -2,7 +2,9 @@ - project(Hiawatha C) - - # Compiler --set(CMAKE_C_FLAGS "-O2 -Wall -Wextra ${CMAKE_C_FLAGS}") -+set(CMAKE_C_FLAGS "-Wall -Wextra ${CMAKE_C_FLAGS}") -+set(CMAKE_C_FLAGS_RELEASE "-O2") -+set(CMAKE_C_FLAGS_RELWITHDEBINFO "-O2") - set(CMAKE_BUILD_TYPE "RelWithDebInfo") - - # Options diff --git a/www-servers/hiawatha/files/hiawatha.initd-r1 b/www-servers/hiawatha/files/hiawatha.initd-r1 deleted file mode 100644 index a6ebb0d64c4..00000000000 --- a/www-servers/hiawatha/files/hiawatha.initd-r1 +++ /dev/null @@ -1,25 +0,0 @@ -#!/sbin/openrc-run -# Copyright 1999-2015 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 "@HIAWATHA_PID_DIR@/hiawatha.pid" - eend $? -} - -stop() { - ebegin "Stopping ${SVCNAME}" - start-stop-daemon \ - --stop \ - --exec "/usr/sbin/hiawatha" \ - --pidfile "@HIAWATHA_PID_DIR@/hiawatha.pid" - eend $? -} diff --git a/www-servers/hiawatha/files/hiawatha.service b/www-servers/hiawatha/files/hiawatha.service deleted file mode 100644 index 35e740b7e39..00000000000 --- a/www-servers/hiawatha/files/hiawatha.service +++ /dev/null @@ -1,9 +0,0 @@ -[Unit] -Description=Hiawatha webserver -After=network.target - -[Service] -ExecStart=/usr/sbin/hiawatha -d - -[Install] -WantedBy=multi-user.target diff --git a/www-servers/hiawatha/hiawatha-9.15.ebuild b/www-servers/hiawatha/hiawatha-9.15.ebuild deleted file mode 100644 index 754860d9b1a..00000000000 --- a/www-servers/hiawatha/hiawatha-9.15.ebuild +++ /dev/null @@ -1,142 +0,0 @@ -# Copyright 1999-2017 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI=5 - -inherit cmake-utils eutils systemd user - -DESCRIPTION="Advanced and secure webserver" -HOMEPAGE="https://www.hiawatha-webserver.org"; -SRC_URI="https://www.hiawatha-webserver.org/files/${P}.tar.gz"; - -LICENSE="GPL-2" -SLOT="0" -KEYWORDS="~amd64 ~x86" -IUSE="+cache ipv6 monitor +rewrite +rproxy +ssl tomahawk +xslt" - -RDEPEND=" - sys-libs/zlib - ssl? ( >=net-libs/mbedtls-2.0[threads] ) - xslt? ( dev-libs/libxslt - dev-libs/libxml2 )" -DEPEND="${RDEPEND}" -PDEPEND="monitor? ( www-apps/hiawatha-monitor )" - -# set these in the environment of your PM if you want to use different values -HIAWATHA_CONFIG_DIR="${HIAWATHA_CONFIG_DIR:-/etc/hiawatha}" -HIAWATHA_LOG_DIR="${HIAWATHA_LOG_DIR:-/var/log/hiawatha}" -HIAWATHA_PID_DIR="${HIAWATHA_PID_DIR:-/var/run}" -HIAWATHA_WEBROOT_DIR="${HIAWATHA_WEBROOT_DIR:-/var/www/hiawatha}" -HIAWATHA_WORK_DIR="${HIAWATHA_WORK_DIR:-/var/lib/hiawatha}" -HIAWATHA_USER="${HIAWATHA_USER:-hiawatha}" -HIAWATHA_GROUP="${HIAWATHA_GROUP:-hiawatha}" - -safe_sed() { - local replace_of=$1 - local replace_with=$2 - local file=$3 - # optional - local outfile=$4 - - grep -E "${replace_of}" "${file}" 1>/dev/null \ - || die "\"${replace_of}\" not found in ${file}!" - - if [[ -n ${outfile} ]] ; then - einfo "Sedding ${file} into ${outfile}" - sed -r \ - -e "s|${replace_of}|${replace_with}|" \ - "${file}" > ${outfile} || die "sed on ${file} to ${outfile} failed!" - else - einfo "Sedding ${file} in-place" - sed -r -i \ - -e "s|${replace_of}|${replace_with}|" \ - "${file}" || die "sed on ${file} failed!" - fi - -} - -pkg_pretend() { - einfo - einfo "You can change hiawatha user and group, as well as the" - einfo "directories the webserver is going to use. For that," - einfo "set the following environment variables in your PM:" - einfo " HIAWATHA_CONFIG_DIR" - einfo " default: /etc/hiawatha" - einfo " current: ${HIAWATHA_CONFIG_DIR}" - einfo " HIAWATHA_LOG_DIR" - einfo " default: /var/log/hiawatha" - einfo " current: ${HIAWATHA_LOG_DIR}" - einfo " HIAWATHA_PID_DIR" - einfo " default: /var/run" - einfo " current: ${HIAWATHA_PID_DIR}" - einfo " HIAWATHA_WEBROOT_DIR" - einfo " default: /var/www/hiawatha" - einfo " current: ${HIAWATHA_WEBROOT_DIR}" - einfo " HIAWATHA_WORK_DIR" - einfo " default: /var/lib/hiawatha" - einfo " current: ${HIAWATHA_WORK_DIR}" - einfo " HIAWATHA_USER" - einfo " default: hiawatha" - einfo " current: ${HIAWATHA_USER}" - einfo " HIAWATHA_GROUP" - einfo " default: hiawatha" - einfo " current: ${HIAWATHA_GROUP}" - einfo -} - -pkg_setup() { - enewgroup ${HIAWATHA_GROUP} - enewuser ${HIAWATHA_USER} -1 -1 "${HIAWATHA_WEBROOT_DIR}" ${HIAWATHA_GROUP} -} - -src_prepare() { - epatch "${FILESDIR}"/${PN}-9.5-cflags.patch - - safe_sed "^#ServerId =.*$" "ServerId = ${HIAWATHA_USER}" \ - config/hiawatha.conf.in - - safe_sed "@HIAWATHA_PID_DIR@" "${HIAWATHA_PID_DIR}" \ - "${FILESDIR}/hiawatha.initd-r1" \ - "${T}/hiawatha.initd-r1" -} - -src_configure() { - local mycmakeargs=( - -DCONFIG_DIR:STRING="${HIAWATHA_CONFIG_DIR}" - -DENABLE_CACHE=$(usex cache) - -DENABLE_IPV6=$(usex ipv6) - -DENABLE_LOADCHECK=$(usex kernel_linux) - -DENABLE_MONITOR=$(usex monitor) - -DENABLE_RPROXY=$(usex rproxy) - -DENABLE_TLS=$(usex ssl) - -DENABLE_TOMAHAWK=$(usex tomahawk) - -DENABLE_TOOLKIT=$(usex rewrite) - -DENABLE_XSLT=$(usex xslt) - -DLOG_DIR:STRING="${HIAWATHA_LOG_DIR}" - -DPID_DIR:STRING="${HIAWATHA_PID_DIR}" - -DUSE_SYSTEM_MBEDTLS=$(usex ssl) - -DWEBROOT_DIR:STRING="${HIAWATHA_WEBROOT_DIR}" - -DWORK_DIR:STRING="${HIAWATHA_WORK_DIR}" - ) - - cmake-utils_src_configure -} - -src_install() { - cmake-utils_src_install - - rm -r "${ED%/}${HIAWATHA_WEBROOT_DIR}"/* || die - - newinitd "${T}"/hiawatha.initd-r1 hiawatha - systemd_dounit "${FILESDIR}"/hiawatha.service - - local i - for i in "${HIAWATHA_LOG_DIR}" "${HIAWATHA_WORK_DIR}" ; do - keepdir "${i}" - fowners ${HIAWATHA_USER}:${HIAWATHA_GROUP} "${i}" - fperms 0750 "${i}" - done - - keepdir "${HIAWATHA_WEBROOT_DIR}" - fowners ${HIAWATHA_USER}:${HIAWATHA_GROUP} "${HIAWATHA_WEBROOT_DIR}" -} diff --git a/www-servers/hiawatha/metadata.xml b/www-servers/hiawatha/metadata.xml deleted file mode 100644 index 9c55764f918..00000000000 --- a/www-servers/hiawatha/metadata.xml +++ /dev/null @@ -1,19 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd";> -<pkgmetadata> - <!-- maintainer-needed --> - <use> - <flag name="cache">Enable caching of content</flag> - <flag name="monitor">Pull in www-apps/hiawatha-monitor</flag> - <flag name="rewrite">Enable the rewrite toolkit</flag> - <flag name="ssl">Enable TLS support via - <pkg>net-libs/mbedtls</pkg></flag> - <flag name="tomahawk">Enable Tomahawk control server</flag> - <flag name="xslt">Enable XSLT support. - This is also needed for directory listings</flag> - <flag name="rproxy">Enable reverse proxy support</flag> - </use> - <upstream> - <remote-id type="github">hsleisink/hiawatha</remote-id> - </upstream> -</pkgmetadata>
