| 1 |
commit: a23b47f8d35c85cb33250de63fbc2e8e48788cc4 |
| 2 |
Author: Aaron Bauman <bman <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Sun Jan 5 04:04:39 2020 +0000 |
| 4 |
Commit: Aaron Bauman <bman <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Sun Jan 5 04:04:39 2020 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a23b47f8 |
| 7 |
|
| 8 |
www-*/*: drop last-rited pkgs |
| 9 |
|
| 10 |
Signed-off-by: Aaron Bauman <bman <AT> gentoo.org> |
| 11 |
|
| 12 |
profiles/package.mask | 6 - |
| 13 |
www-apps/hiawatha-monitor/Manifest | 1 - |
| 14 |
.../hiawatha-monitor/hiawatha-monitor-1.6.ebuild | 33 ----- |
| 15 |
www-apps/hiawatha-monitor/metadata.xml | 8 -- |
| 16 |
www-servers/hiawatha/Manifest | 1 - |
| 17 |
.../hiawatha/files/hiawatha-9.5-cflags.patch | 17 --- |
| 18 |
www-servers/hiawatha/files/hiawatha.initd-r1 | 25 ---- |
| 19 |
www-servers/hiawatha/files/hiawatha.service | 9 -- |
| 20 |
www-servers/hiawatha/hiawatha-9.15.ebuild | 142 --------------------- |
| 21 |
www-servers/hiawatha/metadata.xml | 19 --- |
| 22 |
10 files changed, 261 deletions(-) |
| 23 |
|
| 24 |
diff --git a/profiles/package.mask b/profiles/package.mask |
| 25 |
index 0b92df820d5..b91f9bc1875 100644 |
| 26 |
--- a/profiles/package.mask |
| 27 |
+++ b/profiles/package.mask |
| 28 |
@@ -706,12 +706,6 @@ sci-astronomy/casacore |
| 29 |
# Removal in 30 days. Bug #602024. |
| 30 |
app-laptop/nvidiabl |
| 31 |
|
| 32 |
-# Michał Górny <mgorny@g.o> (2019-12-01) |
| 33 |
-# Unmaintained. Not bumped since 2015. |
| 34 |
-# Removal in 30 days. Bug #585126. |
| 35 |
-www-servers/hiawatha |
| 36 |
-www-apps/hiawatha-monitor |
| 37 |
- |
| 38 |
# Michał Górny <mgorny@g.o> (2019-12-01) |
| 39 |
# Unmaintained. Last release in 2012. Buggy ebuild. |
| 40 |
# Removal in 30 days. Bug #658302. |
| 41 |
|
| 42 |
diff --git a/www-apps/hiawatha-monitor/Manifest b/www-apps/hiawatha-monitor/Manifest |
| 43 |
deleted file mode 100644 |
| 44 |
index ba75b7329de..00000000000 |
| 45 |
--- a/www-apps/hiawatha-monitor/Manifest |
| 46 |
+++ /dev/null |
| 47 |
@@ -1 +0,0 @@ |
| 48 |
-DIST monitor-1.6.tar.gz 622470 BLAKE2B 79813f162dae9a72b9e62550e58b737b878e69d1eb6ce348f62dd9d8c4309529b9dd77eeba6876fec90d0db6c3894aea5c62ada940a17d53bb8cba876ec31855 SHA512 4983638bfa0bfbe3f391b2319cf2f5ba63527cddc8c667618aba001929140453c8058f35d83bedb53f4dc0e5d5139d3a33dd7d9bac46f94e32dff81e65d53f5e |
| 49 |
|
| 50 |
diff --git a/www-apps/hiawatha-monitor/hiawatha-monitor-1.6.ebuild b/www-apps/hiawatha-monitor/hiawatha-monitor-1.6.ebuild |
| 51 |
deleted file mode 100644 |
| 52 |
index 8444fca6d85..00000000000 |
| 53 |
--- a/www-apps/hiawatha-monitor/hiawatha-monitor-1.6.ebuild |
| 54 |
+++ /dev/null |
| 55 |
@@ -1,33 +0,0 @@ |
| 56 |
-# Copyright 1999-2019 Gentoo Authors |
| 57 |
-# Distributed under the terms of the GNU General Public License v2 |
| 58 |
- |
| 59 |
-EAPI=7 |
| 60 |
- |
| 61 |
-MY_P="monitor" |
| 62 |
- |
| 63 |
-DESCRIPTION="Monitoring application for www-servers/hiawatha" |
| 64 |
-HOMEPAGE="https://www.hiawatha-webserver.org/howto/monitor" |
| 65 |
-SRC_URI="https://www.hiawatha-webserver.org/files/${MY_P}-${PV}.tar.gz " |
| 66 |
- |
| 67 |
-LICENSE="GPL-3" |
| 68 |
-SLOT="0" |
| 69 |
-KEYWORDS="~amd64 ~x86" |
| 70 |
-IUSE="" |
| 71 |
- |
| 72 |
-RDEPEND=">=dev-lang/php-5:*[mysql,mysqli,xslt] |
| 73 |
- virtual/cron |
| 74 |
- virtual/mysql |
| 75 |
- www-servers/hiawatha[xslt]" |
| 76 |
- |
| 77 |
-S=${WORKDIR}/${MY_P} |
| 78 |
- |
| 79 |
-DOCS=( ChangeLog README.md INSTALL ) |
| 80 |
- |
| 81 |
-src_install () { |
| 82 |
- default |
| 83 |
- |
| 84 |
- rm -f ChangeLog README.md LICENSE INSTALL |
| 85 |
- |
| 86 |
- insinto /usr/share/${PN} |
| 87 |
- doins -r * |
| 88 |
-} |
| 89 |
|
| 90 |
diff --git a/www-apps/hiawatha-monitor/metadata.xml b/www-apps/hiawatha-monitor/metadata.xml |
| 91 |
deleted file mode 100644 |
| 92 |
index c69fcf398c8..00000000000 |
| 93 |
--- a/www-apps/hiawatha-monitor/metadata.xml |
| 94 |
+++ /dev/null |
| 95 |
@@ -1,8 +0,0 @@ |
| 96 |
-<?xml version="1.0" encoding="UTF-8"?> |
| 97 |
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> |
| 98 |
-<pkgmetadata> |
| 99 |
- <!-- maintainer-needed --> |
| 100 |
- <upstream> |
| 101 |
- <remote-id type="github">hsleisink/monitor</remote-id> |
| 102 |
- </upstream> |
| 103 |
-</pkgmetadata> |
| 104 |
|
| 105 |
diff --git a/www-servers/hiawatha/Manifest b/www-servers/hiawatha/Manifest |
| 106 |
deleted file mode 100644 |
| 107 |
index 681fdafcfc8..00000000000 |
| 108 |
--- a/www-servers/hiawatha/Manifest |
| 109 |
+++ /dev/null |
| 110 |
@@ -1 +0,0 @@ |
| 111 |
-DIST hiawatha-9.15.tar.gz 869922 BLAKE2B 0cd15df60c4f3ad76ceb1405c57e414c26756ab27779d7d1805f1cef218ba409f2f3abe48b3e50ede434f3fa0974b5d86521e697548470448f7c8364f4ae9b6f SHA512 e5f0459475863c7cb2d15bdf2a9712f13c96ac450f349fd89e60fd600aad9010f25182aa6353a3014069a9798544a56ef79695918613946b63fecd3806b1982b |
| 112 |
|
| 113 |
diff --git a/www-servers/hiawatha/files/hiawatha-9.5-cflags.patch b/www-servers/hiawatha/files/hiawatha-9.5-cflags.patch |
| 114 |
deleted file mode 100644 |
| 115 |
index 4ff33cd0d12..00000000000 |
| 116 |
--- a/www-servers/hiawatha/files/hiawatha-9.5-cflags.patch |
| 117 |
+++ /dev/null |
| 118 |
@@ -1,17 +0,0 @@ |
| 119 |
-From: Julian Ospald <hasufell@g.o> |
| 120 |
-Date: Fri May 23 16:59:33 UTC 2014 |
| 121 |
-Subject: make optimization level build-type dependant |
| 122 |
- |
| 123 |
---- hiawatha-9.5/CMakeLists.txt |
| 124 |
-+++ hiawatha-9.5/CMakeLists.txt |
| 125 |
-@@ -2,7 +2,9 @@ |
| 126 |
- project(Hiawatha C) |
| 127 |
- |
| 128 |
- # Compiler |
| 129 |
--set(CMAKE_C_FLAGS "-O2 -Wall -Wextra ${CMAKE_C_FLAGS}") |
| 130 |
-+set(CMAKE_C_FLAGS "-Wall -Wextra ${CMAKE_C_FLAGS}") |
| 131 |
-+set(CMAKE_C_FLAGS_RELEASE "-O2") |
| 132 |
-+set(CMAKE_C_FLAGS_RELWITHDEBINFO "-O2") |
| 133 |
- set(CMAKE_BUILD_TYPE "RelWithDebInfo") |
| 134 |
- |
| 135 |
- # Options |
| 136 |
|
| 137 |
diff --git a/www-servers/hiawatha/files/hiawatha.initd-r1 b/www-servers/hiawatha/files/hiawatha.initd-r1 |
| 138 |
deleted file mode 100644 |
| 139 |
index a6ebb0d64c4..00000000000 |
| 140 |
--- a/www-servers/hiawatha/files/hiawatha.initd-r1 |
| 141 |
+++ /dev/null |
| 142 |
@@ -1,25 +0,0 @@ |
| 143 |
-#!/sbin/openrc-run |
| 144 |
-# Copyright 1999-2015 Gentoo Foundation |
| 145 |
-# Distributed under the terms of the GNU General Public License v2 |
| 146 |
- |
| 147 |
-depend() { |
| 148 |
- need net |
| 149 |
-} |
| 150 |
- |
| 151 |
-start() { |
| 152 |
- ebegin "Starting ${SVCNAME}" |
| 153 |
- start-stop-daemon \ |
| 154 |
- --start \ |
| 155 |
- --exec "/usr/sbin/hiawatha" \ |
| 156 |
- --pidfile "@HIAWATHA_PID_DIR@/hiawatha.pid" |
| 157 |
- eend $? |
| 158 |
-} |
| 159 |
- |
| 160 |
-stop() { |
| 161 |
- ebegin "Stopping ${SVCNAME}" |
| 162 |
- start-stop-daemon \ |
| 163 |
- --stop \ |
| 164 |
- --exec "/usr/sbin/hiawatha" \ |
| 165 |
- --pidfile "@HIAWATHA_PID_DIR@/hiawatha.pid" |
| 166 |
- eend $? |
| 167 |
-} |
| 168 |
|
| 169 |
diff --git a/www-servers/hiawatha/files/hiawatha.service b/www-servers/hiawatha/files/hiawatha.service |
| 170 |
deleted file mode 100644 |
| 171 |
index 35e740b7e39..00000000000 |
| 172 |
--- a/www-servers/hiawatha/files/hiawatha.service |
| 173 |
+++ /dev/null |
| 174 |
@@ -1,9 +0,0 @@ |
| 175 |
-[Unit] |
| 176 |
-Description=Hiawatha webserver |
| 177 |
-After=network.target |
| 178 |
- |
| 179 |
-[Service] |
| 180 |
-ExecStart=/usr/sbin/hiawatha -d |
| 181 |
- |
| 182 |
-[Install] |
| 183 |
-WantedBy=multi-user.target |
| 184 |
|
| 185 |
diff --git a/www-servers/hiawatha/hiawatha-9.15.ebuild b/www-servers/hiawatha/hiawatha-9.15.ebuild |
| 186 |
deleted file mode 100644 |
| 187 |
index 754860d9b1a..00000000000 |
| 188 |
--- a/www-servers/hiawatha/hiawatha-9.15.ebuild |
| 189 |
+++ /dev/null |
| 190 |
@@ -1,142 +0,0 @@ |
| 191 |
-# Copyright 1999-2017 Gentoo Foundation |
| 192 |
-# Distributed under the terms of the GNU General Public License v2 |
| 193 |
- |
| 194 |
-EAPI=5 |
| 195 |
- |
| 196 |
-inherit cmake-utils eutils systemd user |
| 197 |
- |
| 198 |
-DESCRIPTION="Advanced and secure webserver" |
| 199 |
-HOMEPAGE="https://www.hiawatha-webserver.org" |
| 200 |
-SRC_URI="https://www.hiawatha-webserver.org/files/${P}.tar.gz" |
| 201 |
- |
| 202 |
-LICENSE="GPL-2" |
| 203 |
-SLOT="0" |
| 204 |
-KEYWORDS="~amd64 ~x86" |
| 205 |
-IUSE="+cache ipv6 monitor +rewrite +rproxy +ssl tomahawk +xslt" |
| 206 |
- |
| 207 |
-RDEPEND=" |
| 208 |
- sys-libs/zlib |
| 209 |
- ssl? ( >=net-libs/mbedtls-2.0[threads] ) |
| 210 |
- xslt? ( dev-libs/libxslt |
| 211 |
- dev-libs/libxml2 )" |
| 212 |
-DEPEND="${RDEPEND}" |
| 213 |
-PDEPEND="monitor? ( www-apps/hiawatha-monitor )" |
| 214 |
- |
| 215 |
-# set these in the environment of your PM if you want to use different values |
| 216 |
-HIAWATHA_CONFIG_DIR="${HIAWATHA_CONFIG_DIR:-/etc/hiawatha}" |
| 217 |
-HIAWATHA_LOG_DIR="${HIAWATHA_LOG_DIR:-/var/log/hiawatha}" |
| 218 |
-HIAWATHA_PID_DIR="${HIAWATHA_PID_DIR:-/var/run}" |
| 219 |
-HIAWATHA_WEBROOT_DIR="${HIAWATHA_WEBROOT_DIR:-/var/www/hiawatha}" |
| 220 |
-HIAWATHA_WORK_DIR="${HIAWATHA_WORK_DIR:-/var/lib/hiawatha}" |
| 221 |
-HIAWATHA_USER="${HIAWATHA_USER:-hiawatha}" |
| 222 |
-HIAWATHA_GROUP="${HIAWATHA_GROUP:-hiawatha}" |
| 223 |
- |
| 224 |
-safe_sed() { |
| 225 |
- local replace_of=$1 |
| 226 |
- local replace_with=$2 |
| 227 |
- local file=$3 |
| 228 |
- # optional |
| 229 |
- local outfile=$4 |
| 230 |
- |
| 231 |
- grep -E "${replace_of}" "${file}" 1>/dev/null \ |
| 232 |
- || die "\"${replace_of}\" not found in ${file}!" |
| 233 |
- |
| 234 |
- if [[ -n ${outfile} ]] ; then |
| 235 |
- einfo "Sedding ${file} into ${outfile}" |
| 236 |
- sed -r \ |
| 237 |
- -e "s|${replace_of}|${replace_with}|" \ |
| 238 |
- "${file}" > ${outfile} || die "sed on ${file} to ${outfile} failed!" |
| 239 |
- else |
| 240 |
- einfo "Sedding ${file} in-place" |
| 241 |
- sed -r -i \ |
| 242 |
- -e "s|${replace_of}|${replace_with}|" \ |
| 243 |
- "${file}" || die "sed on ${file} failed!" |
| 244 |
- fi |
| 245 |
- |
| 246 |
-} |
| 247 |
- |
| 248 |
-pkg_pretend() { |
| 249 |
- einfo |
| 250 |
- einfo "You can change hiawatha user and group, as well as the" |
| 251 |
- einfo "directories the webserver is going to use. For that," |
| 252 |
- einfo "set the following environment variables in your PM:" |
| 253 |
- einfo " HIAWATHA_CONFIG_DIR" |
| 254 |
- einfo " default: /etc/hiawatha" |
| 255 |
- einfo " current: ${HIAWATHA_CONFIG_DIR}" |
| 256 |
- einfo " HIAWATHA_LOG_DIR" |
| 257 |
- einfo " default: /var/log/hiawatha" |
| 258 |
- einfo " current: ${HIAWATHA_LOG_DIR}" |
| 259 |
- einfo " HIAWATHA_PID_DIR" |
| 260 |
- einfo " default: /var/run" |
| 261 |
- einfo " current: ${HIAWATHA_PID_DIR}" |
| 262 |
- einfo " HIAWATHA_WEBROOT_DIR" |
| 263 |
- einfo " default: /var/www/hiawatha" |
| 264 |
- einfo " current: ${HIAWATHA_WEBROOT_DIR}" |
| 265 |
- einfo " HIAWATHA_WORK_DIR" |
| 266 |
- einfo " default: /var/lib/hiawatha" |
| 267 |
- einfo " current: ${HIAWATHA_WORK_DIR}" |
| 268 |
- einfo " HIAWATHA_USER" |
| 269 |
- einfo " default: hiawatha" |
| 270 |
- einfo " current: ${HIAWATHA_USER}" |
| 271 |
- einfo " HIAWATHA_GROUP" |
| 272 |
- einfo " default: hiawatha" |
| 273 |
- einfo " current: ${HIAWATHA_GROUP}" |
| 274 |
- einfo |
| 275 |
-} |
| 276 |
- |
| 277 |
-pkg_setup() { |
| 278 |
- enewgroup ${HIAWATHA_GROUP} |
| 279 |
- enewuser ${HIAWATHA_USER} -1 -1 "${HIAWATHA_WEBROOT_DIR}" ${HIAWATHA_GROUP} |
| 280 |
-} |
| 281 |
- |
| 282 |
-src_prepare() { |
| 283 |
- epatch "${FILESDIR}"/${PN}-9.5-cflags.patch |
| 284 |
- |
| 285 |
- safe_sed "^#ServerId =.*$" "ServerId = ${HIAWATHA_USER}" \ |
| 286 |
- config/hiawatha.conf.in |
| 287 |
- |
| 288 |
- safe_sed "@HIAWATHA_PID_DIR@" "${HIAWATHA_PID_DIR}" \ |
| 289 |
- "${FILESDIR}/hiawatha.initd-r1" \ |
| 290 |
- "${T}/hiawatha.initd-r1" |
| 291 |
-} |
| 292 |
- |
| 293 |
-src_configure() { |
| 294 |
- local mycmakeargs=( |
| 295 |
- -DCONFIG_DIR:STRING="${HIAWATHA_CONFIG_DIR}" |
| 296 |
- -DENABLE_CACHE=$(usex cache) |
| 297 |
- -DENABLE_IPV6=$(usex ipv6) |
| 298 |
- -DENABLE_LOADCHECK=$(usex kernel_linux) |
| 299 |
- -DENABLE_MONITOR=$(usex monitor) |
| 300 |
- -DENABLE_RPROXY=$(usex rproxy) |
| 301 |
- -DENABLE_TLS=$(usex ssl) |
| 302 |
- -DENABLE_TOMAHAWK=$(usex tomahawk) |
| 303 |
- -DENABLE_TOOLKIT=$(usex rewrite) |
| 304 |
- -DENABLE_XSLT=$(usex xslt) |
| 305 |
- -DLOG_DIR:STRING="${HIAWATHA_LOG_DIR}" |
| 306 |
- -DPID_DIR:STRING="${HIAWATHA_PID_DIR}" |
| 307 |
- -DUSE_SYSTEM_MBEDTLS=$(usex ssl) |
| 308 |
- -DWEBROOT_DIR:STRING="${HIAWATHA_WEBROOT_DIR}" |
| 309 |
- -DWORK_DIR:STRING="${HIAWATHA_WORK_DIR}" |
| 310 |
- ) |
| 311 |
- |
| 312 |
- cmake-utils_src_configure |
| 313 |
-} |
| 314 |
- |
| 315 |
-src_install() { |
| 316 |
- cmake-utils_src_install |
| 317 |
- |
| 318 |
- rm -r "${ED%/}${HIAWATHA_WEBROOT_DIR}"/* || die |
| 319 |
- |
| 320 |
- newinitd "${T}"/hiawatha.initd-r1 hiawatha |
| 321 |
- systemd_dounit "${FILESDIR}"/hiawatha.service |
| 322 |
- |
| 323 |
- local i |
| 324 |
- for i in "${HIAWATHA_LOG_DIR}" "${HIAWATHA_WORK_DIR}" ; do |
| 325 |
- keepdir "${i}" |
| 326 |
- fowners ${HIAWATHA_USER}:${HIAWATHA_GROUP} "${i}" |
| 327 |
- fperms 0750 "${i}" |
| 328 |
- done |
| 329 |
- |
| 330 |
- keepdir "${HIAWATHA_WEBROOT_DIR}" |
| 331 |
- fowners ${HIAWATHA_USER}:${HIAWATHA_GROUP} "${HIAWATHA_WEBROOT_DIR}" |
| 332 |
-} |
| 333 |
|
| 334 |
diff --git a/www-servers/hiawatha/metadata.xml b/www-servers/hiawatha/metadata.xml |
| 335 |
deleted file mode 100644 |
| 336 |
index 9c55764f918..00000000000 |
| 337 |
--- a/www-servers/hiawatha/metadata.xml |
| 338 |
+++ /dev/null |
| 339 |
@@ -1,19 +0,0 @@ |
| 340 |
-<?xml version="1.0" encoding="UTF-8"?> |
| 341 |
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> |
| 342 |
-<pkgmetadata> |
| 343 |
- <!-- maintainer-needed --> |
| 344 |
- <use> |
| 345 |
- <flag name="cache">Enable caching of content</flag> |
| 346 |
- <flag name="monitor">Pull in www-apps/hiawatha-monitor</flag> |
| 347 |
- <flag name="rewrite">Enable the rewrite toolkit</flag> |
| 348 |
- <flag name="ssl">Enable TLS support via |
| 349 |
- <pkg>net-libs/mbedtls</pkg></flag> |
| 350 |
- <flag name="tomahawk">Enable Tomahawk control server</flag> |
| 351 |
- <flag name="xslt">Enable XSLT support. |
| 352 |
- This is also needed for directory listings</flag> |
| 353 |
- <flag name="rproxy">Enable reverse proxy support</flag> |
| 354 |
- </use> |
| 355 |
- <upstream> |
| 356 |
- <remote-id type="github">hsleisink/hiawatha</remote-id> |
| 357 |
- </upstream> |
| 358 |
-</pkgmetadata> |
Archives