Remove obsolete packages and patches

11 files changed, 0 insertions, 726 deletions

diff --git a/www-servers/apache/Manifest b/www-servers/apache/Manifest
deleted file mode 100644
index ffd3de2..0000000
--- a/www-servers/apache/Manifest
+++ /dev/null
@@ -1,4 +0,0 @@
-DIST gentoo-apache-2.2.29-20140922.tar.bz2 64135 SHA256 8c69c36c2f40fb81ee905b4dd72ab74aab4563c75149d302f372a451498e2678 SHA512 1d9aa12aa3ab79b5f80ee3fda020b33ff6798e5b1abbcbc138acea06a1ab9968ad240d2bdf9c5dbb9640fa9fb6718eec7175df7cc0fb8574cc4d7d5cdfb5bcc4 WHIRLPOOL f655300f0dcd2f4503cbdb25983fed902e4b717ff57e06f66486bebd0ed7cb8df56387be74b4259bfffad949bb446c5ec28f89065b6d5239585324b610be7b88
-DIST gentoo-apache-2.4.10-r1-20140731.tar.bz2 24531 SHA256 8e093a18582c3a20283ed1c09de9acc6832a80b1d5a02962599db0535d38af19 SHA512 c54239df36d7ab30bd14a41241d94b4b49b92c5e50e64857da3e7cde7575d5c0a634d51710bdf75807a57932bf9447906407ae4ef6cb333d7197e82ba5052cd9 WHIRLPOOL 0d184763a033209eaa3c91f7050b24c2a2da24d930ed280a8aa99e32461ac31402e6fd8f57e2122a96e45a8308c4a332144ede7b511ceee352be2f38a6ef7839
-DIST httpd-2.2.29.tar.bz2 5625498 SHA256 574b4f994b99178dfd5160bcb14025402e2ce381be9889b83e4be0ffbf5839a4 SHA512 0b953c97d79dfaaedaee72c6260e7a8e2e1711d47b19f9ace961b33f1226eeb58e37e04694a3e1207e0cf151a9ffbebf379d2bb81306bbf5111ec6db621a68b8 WHIRLPOOL d161104824c5bd6a42675489facf528a8ac2e727a8d2a295111b182e73bb17e7e8a52b720e74a37371e8bd3ddf5745afea32b32171831d95870daa440e7ac2a7
-DIST httpd-2.4.10.tar.bz2 5031834 SHA256 176c4dac1a745f07b7b91e7f4fd48f9c48049fa6f088efe758d61d9738669c6a SHA512 e251f5b330da17a8920c589b9e0326d6dd45db28923167718db27b0af2edf769607e9ae6fbb859afbf0c345937fd59053423a2d74bd18ff2272a0f6a19a6496f WHIRLPOOL c9f81296052a61483ceef4ae4b4c467cf64a4035030472dc8c17355f572a4887ddc6179ade2a764a4e3f0cd4ab7cc34a3fa36577a148c3df7b8d44a5f1f0424d
diff --git a/www-servers/apache/apache-2.2.29.ebuild b/www-servers/apache/apache-2.2.29.ebuild
deleted file mode 100644
index b744910..0000000
--- a/www-servers/apache/apache-2.2.29.ebuild
+++ /dev/null
@@ -1,120 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-# latest gentoo apache files
-GENTOO_PATCHSTAMP="20140922"
-GENTOO_DEVELOPER="polynomial-c"
-GENTOO_PATCHNAME="gentoo-apache-2.2.29"
-
-# 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="http://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 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd"
-IUSE=""
-
-src_prepare() {
-	epatch "${FILESDIR}/apache-2.2.29-Fix-libressl-compatibility.patch"
-	apache-2_src_prepare
-}
-
-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/apache-2.4.10-r1.ebuild b/www-servers/apache/apache-2.4.10-r1.ebuild
deleted file mode 100644
index 1bb7248..0000000
--- a/www-servers/apache/apache-2.4.10-r1.ebuild
+++ /dev/null
@@ -1,232 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-# latest gentoo apache files
-GENTOO_PATCHSTAMP="20140731"
-GENTOO_DEVELOPER="polynomial-c"
-GENTOO_PATCHNAME="gentoo-apache-2.4.10-r1"
-
-# IUSE/USE_EXPAND magic
-IUSE_MPMS_FORK="peruser prefork"
-IUSE_MPMS_THREAD="event worker"
-
-# << obsolete modules:
-# authn_default authz_default mem_cache
-# mem_cache is replaced by cache_disk
-# ?? buggy modules
-# proxy_scgi: startup error: undefined symbol "ap_proxy_release_connection", no fix found
-# >> added modules for reason:
-# compat: compatibility with 2.2 access control
-# authz_host: new module for access control
-# authn_core: functionality provided by authn_alias in previous versions
-# authz_core: new module, provides core authorization capabilities
-# cache_disk: replacement for mem_cache
-# lbmethod_byrequests: Split off from mod_proxy_balancer in 2.3
-# lbmethod_bytraffic: Split off from mod_proxy_balancer in 2.3
-# lbmethod_bybusyness: Split off from mod_proxy_balancer in 2.3
-# lbmethod_heartbeat: Split off from mod_proxy_balancer in 2.3
-# slotmem_shm: Slot-based shared memory provider (for lbmethod_byrequests).
-# socache_shmcb: shared object cache provider. Default config with ssl needs it
-# unixd: fixes startup error: Invalid command 'User'
-IUSE_MODULES="access_compat actions alias asis auth_basic auth_digest
-authn_alias authn_anon authn_core authn_dbd authn_dbm authn_file authz_core
-authz_dbd authz_dbm authz_groupfile authz_host authz_owner authz_user autoindex
-cache cache_disk cern_meta charset_lite cgi cgid dav dav_fs dav_lock dbd deflate
-dir dumpio env expires ext_filter file_cache filter headers ident imagemap
-include info lbmethod_byrequests lbmethod_bytraffic lbmethod_bybusyness
-lbmethod_heartbeat log_config log_forensic logio mime mime_magic negotiation
-proxy proxy_ajp proxy_balancer proxy_connect proxy_ftp proxy_http proxy_scgi
-proxy_fcgi  proxy_wstunnel rewrite ratelimit remoteip reqtimeout setenvif
-slotmem_shm speling socache_shmcb status substitute unique_id userdir usertrack
-unixd 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
-	cache_disk:cache
-	ext_filter:filter
-	file_cache:cache
-	lbmethod_byrequests:proxy_balancer
-	lbmethod_byrequests:slotmem_shm
-	lbmethod_bytraffic:proxy_balancer
-	lbmethod_bybusyness:proxy_balancer
-	lbmethod_heartbeat:proxy_balancer
-	log_forensic:log_config
-	logio:log_config
-	cache_disk:cache
-	mime_magic:mime
-	proxy_ajp:proxy
-	proxy_balancer:proxy
-	proxy_balancer:slotmem_shm
-	proxy_connect:proxy
-	proxy_ftp:proxy
-	proxy_http:proxy
-	proxy_scgi:proxy
-	proxy_fcgi:proxy
-	proxy_wstunnel:proxy
-	substitute:filter
-"
-
-# module<->define mappings
-MODULE_DEFINES="
-	auth_digest:AUTH_DIGEST
-	authnz_ldap:AUTHNZ_LDAP
-	cache:CACHE
-	cache_disk:CACHE
-	dav:DAV
-	dav_fs:DAV
-	dav_lock:DAV
-	file_cache:CACHE
-	info:INFO
-	ldap:LDAP
-	proxy:PROXY
-	proxy_ajp:PROXY
-	proxy_balancer:PROXY
-	proxy_connect:PROXY
-	proxy_ftp:PROXY
-	proxy_http:PROXY
-	proxy_fcgi:PROXY
-	proxy_scgi:PROXY
-	proxy_wstunnel:PROXY
-	socache_shmcb:SSL
-	ssl:SSL
-	status:STATUS
-	suexec:SUEXEC
-	userdir:USERDIR
-"
-
-# critical modules for the default config
-MODULE_CRITICAL="
-	authn_core
-	authz_core
-	authz_host
-	dir
-	mime
-	unixd
-"
-inherit eutils apache-2 systemd toolchain-funcs
-
-DESCRIPTION="The Apache Web Server"
-HOMEPAGE="http://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 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~amd64-linux ~x64-macos ~x86-macos ~m68k-mint ~sparc64-solaris ~x64-solaris"
-IUSE=""
-
-pkg_setup() {
-	# dependend critical modules which are not allowed in global scope due
-	# to USE flag conditionals (bug #499260)
-	use ssl && MODULE_CRITICAL+=" socache_shmcb"
-	use doc && MODULE_CRITICAL+=" alias negotiation setenvif"
-	apache-2_pkg_setup
-}
-
-src_prepare() {
-	epatch "${FILESDIR}/apache-2.4.9-libressl.diff"
-	apache-2_src_prepare
-}
-
-src_configure() {
-	# Brain dead check.
-	tc-is-cross-compiler && export ap_cv_void_ptr_lt_long="no"
-
-	apache-2_src_configure
-}
-
-src_compile() {
-	if tc-is-cross-compiler; then
-		# This header is the same across targets, so use the build compiler.
-		pushd server >/dev/null
-		emake gen_test_char
-		tc-export_build_env BUILD_CC
-		${BUILD_CC} ${BUILD_CFLAGS} ${BUILD_CPPFLAGS} ${BUILD_LDFLAGS} \
-			gen_test_char.c -o gen_test_char $(apr-1-config --includes) || die
-		popd >/dev/null
-	fi
-
-	default
-}
-
-src_install() {
-	apache-2_src_install
-	for i in /usr/bin/{htdigest,logresolve,htpasswd,htdbm,ab,httxt2dbm}; do
-		rm "${ED}"/$i || die "Failed to prune apache-tools bits"
-	done
-	for i in /usr/share/man/man8/{rotatelogs.8,htcacheclean.8}; do
-		rm "${ED}"/$i || die "Failed to prune apache-tools bits"
-	done
-	for i in /usr/share/man/man1/{logresolve.1,htdbm.1,htdigest.1,htpasswd.1,dbmmanage.1,ab.1}; do
-		rm "${ED}"/$i || die "Failed to prune apache-tools bits"
-	done
-	for i in /usr/sbin/{checkgid,fcgistarter,htcacheclean,rotatelogs}; do
-		rm "${ED}/"$i || die "Failed to prune apache-tools bits"
-	done
-
-	# 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="/usr/bin/apxs"
-	cp "${S}"/support/apxs "${ED}"${apxs} || die "Failed to install apxs"
-	ln -s ../bin/apxs "${ED}"/usr/sbin/apxs || die
-	chmod 0755 "${ED}"${apxs} || die
-
-	# Note: wait for mod_systemd to be included in the next release,
-	# then apache2.4.service can be used and systemd support controlled
-	# through --enable-systemd
-	systemd_newunit "${FILESDIR}/apache2.2.service" "apache2.service"
-	systemd_dotmpfilesd "${FILESDIR}/apache.conf"
-	#insinto /etc/apache2/modules.d
-	#doins "${FILESDIR}/00_systemd.conf"
-}
-
-pkg_postinst()
-{
-	apache-2_pkg_postinst || die "apache-2_pkg_postinst failed"
-	# warnings that default config might not work out of the box
-	for mod in $MODULE_CRITICAL; do
-		if ! use "apache2_modules_${mod}"; then
-			echo
-			ewarn "Warning: Critical module not installed!"
-			ewarn "Modules 'authn_core', 'authz_core' and 'unixd'"
-			ewarn "are highly recomended but might not be in the base profile yet."
-			ewarn "Default config for ssl needs module 'socache_shmcb'."
-			ewarn "Enabling the following flags is highly recommended:"
-			for cmod in $MODULE_CRITICAL; do
-				use "apache2_modules_${cmod}" || \
-					ewarn "+ apache2_modules_${cmod}"
-			done
-			echo
-			break
-		fi
-	done
-	# warning for proxy_balancer and missing load balancing scheduler
-	if use apache2_modules_proxy_balancer; then
-		local lbset=
-		for mod in lbmethod_byrequests lbmethod_bytraffic lbmethod_bybusyness lbmethod_heartbeat; do
-			if use "apache2_modules_${mod}"; then
-				lbset=1 && break
-			fi
-		done
-		if [ ! $lbset ]; then
-			echo
-			ewarn "Info: Missing load balancing scheduler algorithm module"
-			ewarn "(They were split off from proxy_balancer in 2.3)"
-			ewarn "In order to get the ability of load balancing, at least"
-			ewarn "one of these modules has to be present:"
-			ewarn "lbmethod_byrequests lbmethod_bytraffic lbmethod_bybusyness lbmethod_heartbeat"
-			echo
-		fi
-	fi
-}
diff --git a/www-servers/apache/files/00_systemd.conf b/www-servers/apache/files/00_systemd.conf
deleted file mode 100644
index b208c97..0000000
--- a/www-servers/apache/files/00_systemd.conf
+++ /dev/null
@@ -1,2 +0,0 @@
-# This file configures systemd module:
-LoadModule systemd_module modules/mod_systemd.so
diff --git a/www-servers/apache/files/apache-2.2.29-Fix-libressl-compatibility.patch b/www-servers/apache/files/apache-2.2.29-Fix-libressl-compatibility.patch
deleted file mode 100644
index 782c0e3..0000000
--- a/www-servers/apache/files/apache-2.2.29-Fix-libressl-compatibility.patch
+++ /dev/null
@@ -1,163 +0,0 @@
-From abc41ab58a209b89a37c052b8b1a12f7f2cc1a65 Mon Sep 17 00:00:00 2001
-From: hasufell <hasufell@gentoo.org>
-Date: Sun, 22 Feb 2015 22:18:59 +0100
-Subject: [PATCH] Fix libressl compatibility
-
----
- acinclude.m4                  | 2 +-
- configure                     | 2 +-
- include/ap_config_auto.h.in   | 6 ++++++
- modules/ssl/ssl_engine_init.c | 8 +++++++-
- modules/ssl/ssl_engine_rand.c | 2 +-
- modules/ssl/ssl_engine_vars.c | 2 ++
- modules/ssl/ssl_util_ssl.c    | 4 ++++
- modules/ssl/ssl_util_ssl.h    | 4 ++++
- 8 files changed, 26 insertions(+), 4 deletions(-)
-
-diff --git a/acinclude.m4 b/acinclude.m4
-index c750b82..f9683d5 100644
---- a/acinclude.m4
-+++ b/acinclude.m4
-@@ -454,7 +454,7 @@ if test "x$ap_ssltk_configured" = "x"; then
-   if test "$ap_ssltk_type" = "openssl"; then
-     AC_CHECK_HEADERS([openssl/engine.h])
-     AC_CHECK_FUNCS([SSLeay_version SSL_CTX_new], [], [liberrors="yes"])
--    AC_CHECK_FUNCS([ENGINE_init ENGINE_load_builtin_engines])
-+    AC_CHECK_FUNCS([ENGINE_init ENGINE_load_builtin_engines SSL_CTX_use_certificate_chain RAND_egd])
-   else
-     AC_CHECK_FUNCS([SSLC_library_version SSL_CTX_new], [], [liberrors="yes"])
-     AC_CHECK_FUNCS(SSL_set_state)
-diff --git a/configure b/configure
-index 36cb84b..fb10e06 100755
---- a/configure
-+++ b/configure
-@@ -13841,7 +13841,7 @@ else
- fi
- done
- 
--    for ac_func in ENGINE_init ENGINE_load_builtin_engines
-+    for ac_func in ENGINE_init ENGINE_load_builtin_engines SSL_CTX_use_certificate_chain RAND_egd
- do :
-   as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh`
- ac_fn_c_check_func "$LINENO" "$ac_func" "$as_ac_var"
-diff --git a/include/ap_config_auto.h.in b/include/ap_config_auto.h.in
-index 6ea7e6f..797543b 100644
---- a/include/ap_config_auto.h.in
-+++ b/include/ap_config_auto.h.in
-@@ -109,6 +109,9 @@
- /* Define to 1 if you have the <pwd.h> header file. */
- #undef HAVE_PWD_H
- 
-+/* Define to 1 if you have the `RAND_egd' function. */
-+#undef HAVE_RAND_EGD
-+
- /* Define to 1 if you have the `setsid' function. */
- #undef HAVE_SETSID
- 
-@@ -127,6 +130,9 @@
- /* Define to 1 if you have the `SSL_CTX_new' function. */
- #undef HAVE_SSL_CTX_NEW
- 
-+/* Define to 1 if you have the `SSL_CTX_use_certificate_chain' function. */
-+#undef HAVE_SSL_CTX_USE_CERTIFICATE_CHAIN
-+
- /* Define to 1 if you have the `SSL_set_cert_store' function. */
- #undef HAVE_SSL_SET_CERT_STORE
- 
-diff --git a/modules/ssl/ssl_engine_init.c b/modules/ssl/ssl_engine_init.c
-index 2c7b900..9d2016d 100644
---- a/modules/ssl/ssl_engine_init.c
-+++ b/modules/ssl/ssl_engine_init.c
-@@ -406,9 +406,11 @@ void ssl_init_Engine(server_rec *s, apr_pool_t *p)
-             ssl_die();
-         }
- 
-+#ifdef ENGINE_CTRL_CHIL_SET_FORKCHECK
-         if (strEQ(mc->szCryptoDevice, "chil")) {
-             ENGINE_ctrl(e, ENGINE_CTRL_CHIL_SET_FORKCHECK, 1, 0, 0);
-         }
-+#endif
- 
-         if (!ENGINE_set_default(e, ENGINE_METHOD_ALL)) {
-             ap_log_error(APLOG_MARK, APLOG_ERR, 0, s,
-@@ -831,7 +833,11 @@ static void ssl_init_ctx_cert_chain(server_rec *s,
-         }
-     }
- 
--    n = SSL_CTX_use_certificate_chain(mctx->ssl_ctx,
-+#ifndef HAVE_SSL_CTX_USE_CERTIFICATE_CHAIN
-+          n = SSL_CTX_use_certificate_chain(mctx->ssl_ctx,
-+#else
-+          n = _SSL_CTX_use_certificate_chain(mctx->ssl_ctx,
-+#endif
-                                       (char *)chain,
-                                       skip_first, NULL);
-     if (n < 0) {
-diff --git a/modules/ssl/ssl_engine_rand.c b/modules/ssl/ssl_engine_rand.c
-index a3c0fc5..e795444 100644
---- a/modules/ssl/ssl_engine_rand.c
-+++ b/modules/ssl/ssl_engine_rand.c
-@@ -83,7 +83,7 @@ int ssl_rand_seed(server_rec *s, apr_pool_t *p, ssl_rsctx_t nCtx, char *prefix)
-                 nDone += ssl_rand_feedfp(p, fp, pRandSeed->nBytes);
-                 ssl_util_ppclose(s, p, fp);
-             }
--#ifdef HAVE_SSL_RAND_EGD
-+#ifdef HAVE_RAND_EGD
-             else if (pRandSeed->nSrc == SSL_RSSRC_EGD) {
-                 /*
-                  * seed in contents provided by the external
-diff --git a/modules/ssl/ssl_engine_vars.c b/modules/ssl/ssl_engine_vars.c
-index 6199734..5bb601f 100644
---- a/modules/ssl/ssl_engine_vars.c
-+++ b/modules/ssl/ssl_engine_vars.c
-@@ -831,6 +831,7 @@ const char *ssl_ext_lookup(apr_pool_t *p, conn_rec *c, int peer,
- static char *ssl_var_lookup_ssl_compress_meth(SSL *ssl)
- {
-     char *result = "NULL";
-+#ifndef OPENSSL_NO_COMP
- #ifdef OPENSSL_VERSION_NUMBER
- #if (OPENSSL_VERSION_NUMBER >= 0x00908000)
-     SSL_SESSION *pSession = SSL_get_session(ssl);
-@@ -858,6 +859,7 @@ static char *ssl_var_lookup_ssl_compress_meth(SSL *ssl)
-     }
- #endif
- #endif
-+#endif
-     return result;
- }
- 
-diff --git a/modules/ssl/ssl_util_ssl.c b/modules/ssl/ssl_util_ssl.c
-index 0ad9854..b9c824d 100644
---- a/modules/ssl/ssl_util_ssl.c
-+++ b/modules/ssl/ssl_util_ssl.c
-@@ -492,7 +492,11 @@ BOOL SSL_X509_INFO_load_path(apr_pool_t *ptemp,
-  * format, possibly followed by a sequence of CA certificates that
-  * should be sent to the peer in the SSL Certificate message.
-  */
-+#ifndef HAVE_SSL_CTX_USE_CERTIFICATE_CHAIN
- int SSL_CTX_use_certificate_chain(
-+#else
-+int _SSL_CTX_use_certificate_chain(
-+#endif
-     SSL_CTX *ctx, char *file, int skipfirst, modssl_read_bio_cb_fn *cb)
- {
-     BIO *bio;
-diff --git a/modules/ssl/ssl_util_ssl.h b/modules/ssl/ssl_util_ssl.h
-index c72ca79..87978da 100644
---- a/modules/ssl/ssl_util_ssl.h
-+++ b/modules/ssl/ssl_util_ssl.h
-@@ -89,7 +89,11 @@ char       *SSL_X509_NAME_to_string(apr_pool_t *, X509_NAME *, unsigned int);
- BOOL        SSL_X509_getCN(apr_pool_t *, X509 *, char **);
- BOOL        SSL_X509_INFO_load_file(apr_pool_t *, STACK_OF(X509_INFO) *, const char *);
- BOOL        SSL_X509_INFO_load_path(apr_pool_t *, STACK_OF(X509_INFO) *, const char *);
-+#ifndef HAVE_SSL_CTX_USE_CERTIFICATE_CHAIN
- int         SSL_CTX_use_certificate_chain(SSL_CTX *, char *, int, modssl_read_bio_cb_fn *);
-+#else
-+int         _SSL_CTX_use_certificate_chain(SSL_CTX *, char *, int, modssl_read_bio_cb_fn *);
-+#endif
- char       *SSL_SESSION_id2sz(unsigned char *, int, char *, int);
- 
- /** util functions for OpenSSL+sslc compat */
--- 
-2.2.1
-
diff --git a/www-servers/apache/files/apache-2.4.9-libressl.diff b/www-servers/apache/files/apache-2.4.9-libressl.diff
deleted file mode 100644
index e6dd1f5..0000000
--- a/www-servers/apache/files/apache-2.4.9-libressl.diff
+++ /dev/null
@@ -1,117 +0,0 @@
---- modules/ssl/ssl_engine_init.c.orig	2014-07-14 14:29:22.000000000 +0200
-+++ modules/ssl/ssl_engine_init.c	2014-12-17 10:13:39.269794278 +0100
-@@ -353,9 +353,11 @@
-             return ssl_die(s);
-         }
- 
-+#ifdef ENGINE_CTRL_CHIL_SET_FORKCHECK
-         if (strEQ(mc->szCryptoDevice, "chil")) {
-             ENGINE_ctrl(e, ENGINE_CTRL_CHIL_SET_FORKCHECK, 1, 0, 0);
-         }
-+#endif
- 
-         if (!ENGINE_set_default(e, ENGINE_METHOD_ALL)) {
-             ap_log_error(APLOG_MARK, APLOG_EMERG, 0, s, APLOGNO(01889)
-@@ -828,7 +830,11 @@
-         }
-     }
- 
--    n = SSL_CTX_use_certificate_chain(mctx->ssl_ctx,
-+#ifndef HAVE_SSL_CTX_USE_CERTIFICATE_CHAIN
-+          n = SSL_CTX_use_certificate_chain(mctx->ssl_ctx,
-+#else
-+          n = _SSL_CTX_use_certificate_chain(mctx->ssl_ctx,
-+#endif
-                                       (char *)chain,
-                                       skip_first, NULL);
-     if (n < 0) {
---- modules/ssl/ssl_util_ssl.c.orig	2014-03-02 21:20:14.000000000 +0100
-+++ modules/ssl/ssl_util_ssl.c	2014-12-17 10:11:23.293801088 +0100
-@@ -460,7 +460,11 @@
-  * format, possibly followed by a sequence of CA certificates that
-  * should be sent to the peer in the SSL Certificate message.
-  */
-+#ifndef HAVE_SSL_CTX_USE_CERTIFICATE_CHAIN
- int SSL_CTX_use_certificate_chain(
-+#else
-+int _SSL_CTX_use_certificate_chain(
-+#endif
-     SSL_CTX *ctx, char *file, int skipfirst, pem_password_cb *cb)
- {
-     BIO *bio;
---- modules/ssl/ssl_util_ssl.h.orig	2014-03-02 21:20:14.000000000 +0100
-+++ modules/ssl/ssl_util_ssl.h	2014-12-17 10:10:36.197804421 +0100
-@@ -69,7 +69,11 @@
- BOOL        SSL_X509_match_name(apr_pool_t *, X509 *, const char *, BOOL, server_rec *);
- BOOL        SSL_X509_INFO_load_file(apr_pool_t *, STACK_OF(X509_INFO) *, const char *);
- BOOL        SSL_X509_INFO_load_path(apr_pool_t *, STACK_OF(X509_INFO) *, const char *);
-+#ifndef HAVE_SSL_CTX_USE_CERTIFICATE_CHAIN
- int         SSL_CTX_use_certificate_chain(SSL_CTX *, char *, int, pem_password_cb *);
-+#else
-+int         _SSL_CTX_use_certificate_chain(SSL_CTX *, char *, int, pem_password_cb *);
-+#endif
- char       *SSL_SESSION_id2sz(unsigned char *, int, char *, int);
- 
- #endif /* __SSL_UTIL_SSL_H__ */
---- modules/ssl/ssl_engine_rand.c.orig	2011-12-05 01:08:01.000000000 +0100
-+++ modules/ssl/ssl_engine_rand.c	2014-12-19 18:39:04.825554353 +0100
-@@ -81,6 +81,7 @@
-                 nDone += ssl_rand_feedfp(p, fp, pRandSeed->nBytes);
-                 ssl_util_ppclose(s, p, fp);
-             }
-+#ifdef HAVE_RAND_EGD
-             else if (pRandSeed->nSrc == SSL_RSSRC_EGD) {
-                 /*
-                  * seed in contents provided by the external
-@@ -90,6 +91,7 @@
-                     continue;
-                 nDone += n;
-             }
-+#endif
-             else if (pRandSeed->nSrc == SSL_RSSRC_BUILTIN) {
-                 struct {
-                     time_t t;
---- configure.orig	2014-07-15 19:15:03.000000000 +0200
-+++ configure	2014-12-19 18:43:31.217134498 +0100
-@@ -24885,7 +24885,7 @@
- fi
- done
- 
--      for ac_func in ENGINE_init ENGINE_load_builtin_engines
-+      for ac_func in ENGINE_init ENGINE_load_builtin_engines SSL_CTX_use_certificate_chain RAND_egd
- do :
-   as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh`
- ac_fn_c_check_func "$LINENO" "$ac_func" "$as_ac_var"
---- include/ap_config_auto.h.in.orig	2014-07-15 19:15:02.000000000 +0200
-+++ include/ap_config_auto.h.in	2014-12-19 18:49:26.301357912 +0100
-@@ -130,6 +130,9 @@
- /* Define to 1 if you have the <pwd.h> header file. */
- #undef HAVE_PWD_H
- 
-+/* Define to 1 if you have the `RAND_egd' function. */
-+#undef HAVE_RAND_EGD
-+
- /* Define to 1 if you have the `setsid' function. */
- #undef HAVE_SETSID
- 
-@@ -139,6 +142,9 @@
- /* Define to 1 if you have the `SSL_CTX_new' function. */
- #undef HAVE_SSL_CTX_NEW
- 
-+/* Define to 1 if you have the `SSL_CTX_use_certificate_chain' function. */
-+#undef HAVE_SSL_CTX_USE_CERTIFICATE_CHAIN
-+
- /* Define to 1 if you have the <stdint.h> header file. */
- #undef HAVE_STDINT_H
- 
---- acinclude.m4.orig	2014-01-05 09:37:21.000000000 +0100
-+++ acinclude.m4	2014-12-19 18:53:07.033409821 +0100
-@@ -576,7 +576,7 @@
-       liberrors=""
-       AC_CHECK_HEADERS([openssl/engine.h])
-       AC_CHECK_FUNCS([SSLeay_version SSL_CTX_new], [], [liberrors="yes"])
--      AC_CHECK_FUNCS([ENGINE_init ENGINE_load_builtin_engines])
-+      AC_CHECK_FUNCS([ENGINE_init ENGINE_load_builtin_engines SSL_CTX_use_certificate_chain RAND_egd])
-       if test "x$liberrors" != "x"; then
-         AC_MSG_WARN([OpenSSL libraries are unusable])
-       fi
diff --git a/www-servers/apache/files/apache-fix-sni.diff b/www-servers/apache/files/apache-fix-sni.diff
deleted file mode 100644
index 099ee63..0000000
--- a/www-servers/apache/files/apache-fix-sni.diff
+++ /dev/null
@@ -1,13 +0,0 @@
-Index: modules/ssl/ssl_engine_config.c
-===================================================================
---- modules/ssl/ssl_engine_config.c	(revision 1585379)
-+++ modules/ssl/ssl_engine_config.c	(working copy)
-@@ -243,7 +243,7 @@
- }
- 
- #define cfgMerge(el,unset)  mrg->el = (add->el == (unset)) ? base->el : add->el
--#define cfgMergeArray(el)   mrg->el = apr_array_append(p, add->el, base->el)
-+#define cfgMergeArray(el)   mrg->el = apr_array_append(p, base->el, add->el)
- #define cfgMergeString(el)  cfgMerge(el, NULL)
- #define cfgMergeBool(el)    cfgMerge(el, UNSET)
- #define cfgMergeInt(el)     cfgMerge(el, UNSET)
diff --git a/www-servers/apache/files/apache.conf b/www-servers/apache/files/apache.conf
deleted file mode 100644
index 56e23ae..0000000
--- a/www-servers/apache/files/apache.conf
+++ /dev/null
@@ -1,2 +0,0 @@
-d /run/apache2 710 root apache
-d /run/apache_ssl_mutex
diff --git a/www-servers/apache/files/apache2.2.service b/www-servers/apache/files/apache2.2.service
deleted file mode 100644
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
diff --git a/www-servers/apache/files/apache2.4.service b/www-servers/apache/files/apache2.4.service
deleted file mode 100644
index ace453f..0000000
--- a/www-servers/apache/files/apache2.4.service
+++ /dev/null
@@ -1,20 +0,0 @@
-[Unit]
-Description=The Apache HTTP Server
-After=network.target remote-fs.target nss-lookup.target
-
-[Service]
-Type=notify
-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
diff --git a/www-servers/apache/metadata.xml b/www-servers/apache/metadata.xml
deleted file mode 100644
index d7b1a48..0000000
--- a/www-servers/apache/metadata.xml
+++ /dev/null
@@ -1,34 +0,0 @@
-<?xml version='1.0' encoding='UTF-8'?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer>
-		<email>polynomial-c@gentoo.org</email>
-		<name>Lars Wendler</name>
-	</maintainer>
-	<longdescription>
-		The Apache HTTP Server Project is an effort to develop and maintain an
-		open-source HTTP server for modern operating systems. The goal of this
-		project is to provide a secure, efficient and extensible server that
-		provides HTTP services in sync with the current HTTP standards.
-	</longdescription>
-	<use>
-		<flag name='suexec'>Install suexec with apache</flag>
-		<flag name='static'>Link in apache2 modules statically rather then plugins</flag>
-		<flag name='apache2_modules_access_compat'>Group authorizations based on host (name or IP address). Available as a compatibility module with previous versions.</flag>
-		<flag name='apache2_modules_authn_core'>Provides core authentication capabilities common to all authentication providers (functionality provided by authn_alias in previous versions).</flag>
-		<flag name='apache2_modules_authz_core'>Provides core authorization capabilities to various authorization/authorization modules, such as authn_file and authz_user.</flag>
-		<flag name='apache2_modules_authz_dbd'>Provides authorization capabilities via SQL database so that authenticated users can be allowed or denied access to portions of the web site by group membership.</flag>
-		<flag name='apache2_modules_cache_disk'>Disk based storage module for the HTTP caching filter (similar to mem_cache in previous versions).</flag>
-		<flag name='apache2_modules_lbmethod_byrequests'>Request counting load balancer scheduler algorithm for proxy_balancer.</flag>
-		<flag name='apache2_modules_lbmethod_bytraffic'>Weighted traffic counting load balancer scheduler algorithm for proxy_balancer.</flag>
-		<flag name='apache2_modules_lbmethod_bybusyness'>Pending request counting load balancer scheduler algorithm for proxy_balancer.</flag>
-		<flag name='apache2_modules_lbmethod_heartbeat'>Heartbeat traffic counting load balancer scheduler algorithm for proxy_balancer.</flag>
-		<flag name='apache2_modules_slotmem_shm'>Slot-based shared memory provider.</flag>
-		<flag name='apache2_modules_socache_shmcb'>A shared object cache provider using a high-performance cyclic buffer inside a shared memory segment.</flag>
-		<flag name='apache2_modules_unixd'>Basic (required) security for Unix-family platforms.</flag>
-		<flag name='apache2_modules_proxy_fcgi'>FCGI support module for mod_proxy.</flag>
-		<flag name='apache2_modules_proxy_wstunnel'>Provides support for the tunnelling of web socket connections to a backend websockets server.</flag>
-		<flag name='apache2_modules_ratelimit'>Ratelimit module for transfer rate management</flag>
-		<flag name='apache2_modules_remoteip'>Remotip module for logging</flag>
-	</use>
-</pkgmetadata>