www-servers/apache: 2.2 removal

Bug: https://bugs.gentoo.org/692088
Package-Manager: Portage-2.3.81, Repoman-2.3.20
Signed-off-by: Lars Wendler <polynomial-c@gentoo.org>

diff --git a/www-servers/apache/Manifest b/www-servers/apache/Manifest
index b93ba5f41cd79e52249b53f6703a3e08ed82ee3a..bad25e94a303634bb35e0e081cc79ccbf35d9833 100644 (file)
--- a/www-servers/apache/Manifest
+++ b/www-servers/apache/Manifest
@@ -1,4 +1,2 @@
-DIST gentoo-apache-2.2.34-20170918.tar.bz2 64390 BLAKE2B d3f6d85192706d7c49a38cc36e816b3ae531f8c0d42111c33ec32ed39900d36d8a2a85a5d1b5afca22331137f04fb24fb424a42a21caa7eb4f6906fa39cb8224 SHA512 10b42e50dcc196f60bcaefe90c382d62a61339dd8a56e899d6afb6998be4acdd376e2c3509791f22a0acf99d06add497e32703b6d523f640306a6db5e05f358a
 DIST gentoo-apache-2.4.39-20190402.tar.bz2 25491 BLAKE2B ce230b07ec156048c7d7c1eb4b0e732fa6140f55d136e317714591327bde3f85bab7780424e6eef04b7a4518cbdcfdddcbc094409f4ca19ffea1ce967bdf7cf1 SHA512 bc0ffa20cffd9a89c2ea64420fa2243d77e97d7922bcd0b387a7fcfcc3c6908a056972b499a81344f7c3e3e19b55ffc300fd034c54b287f4f32d8931bd50cde4
-DIST httpd-2.2.34.tar.bz2 5779739 BLAKE2B 8cdd41fb5d1880da4a1cfef252b4682f613b938594057ea4c9665d3881a50b298fb7339c1ceb3dafc215aa927048f99d500f2d29c125016d5766954be9b632b4 SHA512 e6dac5865a48533c025fe17523ee74d68c3a23f9512c9441b78a140e33cfb6835573eb049b0ad424eb5c5ca78a1915778c54e8a409da95fbdd3890cb99e08240
 DIST httpd-2.4.41.tar.bz2 7072373 BLAKE2B 88a2390736209d5ef04bffcb867bc8d6019302885e6f3cc63d18123336d4d0657252105a3bfebf4e91b8daa02119d4a61f4c0a9702244858a3193ec6cf681c0f SHA512 350cc7dcd2c439e0590338fa6da3f44df44f9bb885c381e91f91b14c2f48597f6f0bbac0ea118a8a67eaa70ae7edbb769beace368643ed73f6daee44c307b335

diff --git a/www-servers/apache/apache-2.2.34.ebuild b/www-servers/apache/apache-2.2.34.ebuild
deleted file mode 100644 (file)
index a9cf7b2..0000000
--- a/www-servers/apache/apache-2.2.34.ebuild
+++ /dev/null
@@ -1,114 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-# latest gentoo apache files
-GENTOO_PATCHSTAMP="20170918"
-GENTOO_DEVELOPER="whissi"
-GENTOO_PATCHNAME="gentoo-apache-2.2.34"
-
-# IUSE/USE_EXPAND magic
-IUSE_MPMS_FORK="itk peruser prefork"
-IUSE_MPMS_THREAD="event worker"
-
-IUSE_MODULES="actions alias asis auth_basic auth_digest authn_alias authn_anon
-authn_dbd authn_dbm authn_default authn_file authz_dbm authz_default
-authz_groupfile authz_host authz_owner authz_user autoindex cache cern_meta
-charset_lite cgi cgid dav dav_fs dav_lock dbd deflate dir disk_cache dumpio
-env expires ext_filter file_cache filter headers ident imagemap include info
-log_config log_forensic logio mem_cache mime mime_magic negotiation proxy
-proxy_ajp proxy_balancer proxy_connect proxy_ftp proxy_http proxy_scgi rewrite
-reqtimeout setenvif speling status substitute unique_id userdir usertrack
-version vhost_alias"
-# The following are also in the source as of this version, but are not available
-# for user selection:
-# bucketeer case_filter case_filter_in echo http isapi optional_fn_export
-# optional_fn_import optional_hook_export optional_hook_import
-
-# inter-module dependencies
-# TODO: this may still be incomplete
-MODULE_DEPENDS="
-       dav_fs:dav
-       dav_lock:dav
-       deflate:filter
-       disk_cache:cache
-       ext_filter:filter
-       file_cache:cache
-       log_forensic:log_config
-       logio:log_config
-       mem_cache:cache
-       mime_magic:mime
-       proxy_ajp:proxy
-       proxy_balancer:proxy
-       proxy_connect:proxy
-       proxy_ftp:proxy
-       proxy_http:proxy
-       proxy_scgi:proxy
-       substitute:filter
-"
-
-# module<->define mappings
-MODULE_DEFINES="
-       auth_digest:AUTH_DIGEST
-       authnz_ldap:AUTHNZ_LDAP
-       cache:CACHE
-       dav:DAV
-       dav_fs:DAV
-       dav_lock:DAV
-       disk_cache:CACHE
-       file_cache:CACHE
-       info:INFO
-       ldap:LDAP
-       mem_cache:CACHE
-       proxy:PROXY
-       proxy_ajp:PROXY
-       proxy_balancer:PROXY
-       proxy_connect:PROXY
-       proxy_ftp:PROXY
-       proxy_http:PROXY
-       ssl:SSL
-       status:STATUS
-       suexec:SUEXEC
-       userdir:USERDIR
-"
-
-# critical modules for the default config
-MODULE_CRITICAL="
-       authz_host
-       dir
-       mime
-"
-
-inherit apache-2 systemd toolchain-funcs
-
-DESCRIPTION="The Apache Web Server"
-HOMEPAGE="https://httpd.apache.org/"
-
-# some helper scripts are Apache-1.1, thus both are here
-LICENSE="Apache-2.0 Apache-1.1"
-SLOT="2"
-KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86"
-IUSE=""
-
-src_configure() {
-       # Brain dead check.
-       tc-is-cross-compiler && export ap_cv_void_ptr_lt_long="no"
-
-       apache-2_src_configure
-}
-
-src_install() {
-       apache-2_src_install
-
-       # install apxs in /usr/bin (bug #502384) and put a symlink into the
-       # old location until all ebuilds and eclasses have been modified to
-       # use the new location.
-       local apxs_dir="/usr/bin"
-       dodir ${apxs_dir}
-       mv "${D}"/usr/sbin/apxs "${D}"${apxs_dir} || die
-       ln -s ../bin/apxs "${D}"/usr/sbin/apxs || die
-
-       systemd_newunit "${FILESDIR}/apache2.2.service" "apache2.service"
-       systemd_dotmpfilesd "${FILESDIR}/apache.conf"
-}

diff --git a/www-servers/apache/files/apache2.2.service b/www-servers/apache/files/apache2.2.service
deleted file mode 100644 (file)
index 76f783a..0000000
--- a/www-servers/apache/files/apache2.2.service
+++ /dev/null
@@ -1,19 +0,0 @@
-[Unit]
-Description=The Apache HTTP Server
-After=network.target remote-fs.target nss-lookup.target
-
-[Service]
-EnvironmentFile=/etc/conf.d/apache2
-ExecStart=/usr/sbin/apache2 $APACHE2_OPTS -DFOREGROUND
-ExecReload=/usr/sbin/apache2 $APACHE2_OPTS -k graceful
-ExecStop=/usr/sbin/apache2 $APACHE2_OPTS -k graceful-stop
-# We want systemd to give httpd some time to finish gracefully, but still want
-# it to kill httpd after TimeoutStopSec if something went wrong during the
-# graceful stop. Normally, Systemd sends SIGTERM signal right after the
-# ExecStop, which would kill httpd. We are sending useless SIGCONT here to give
-# httpd time to finish.
-KillSignal=SIGCONT
-PrivateTmp=true
-
-[Install]
-WantedBy=multi-user.target