reinit the tree, so we can have metadata

author: V3n3RiX <venerix@redcorelinux.org> 2017-10-09 18:53:29 +0100
committer: V3n3RiX <venerix@redcorelinux.org> 2017-10-09 18:53:29 +0100
commit: 4f2d7949f03e1c198bc888f2d05f421d35c57e21 (patch)
tree: ba5f07bf3f9d22d82e54a462313f5d244036c768 /www-apache
275 files changed, 7737 insertions, 0 deletions
diff --git a/www-apache/anyterm/Manifest b/www-apache/anyterm/Manifest
new file mode 100644
index 000000000000..b7a2450bc9e6
--- /dev/null
+++ b/www-apache/anyterm/Manifest
@@ -0,0 +1,12 @@
+AUX anyterm-1.1.28-respect-LDFLAGS.patch 775 SHA256 91b57a8336222f22ceaac1106f097954a8b89113e684bd32908d3e0df503d1f5 SHA512 04f2205ffca6599434b13f4eb538bebe84203f2a6fbb55c2d95176df8816a3b79ce969ea0f9d06f6638d374a0635d008d2ff5d1c72b5d52621cc555045a87d0e WHIRLPOOL 91c0679922102ec458292df4b7a4db29fafb2038f8a1604e5df7752ab531498edb5d82c64b49964f52b24d354dbf17ebd740df933ebca71a8ab47476e0d076ee
+AUX anyterm-1.1.29-boost-1.50.patch 1707 SHA256 e1cfabe501a9ad01331db681ad04a5096f79806dfa8fc08490a5f3377bc481a4 SHA512 c327b1bbc09a0d13fa6100d1d334687270f491f8221b770909c38e2219b60e9cd5aae7799e2b3c0bc25aa1c0ff0c9cf6b0facf6d2b3096215e3df8e58ee44f31 WHIRLPOOL 5e9060db6f5e6c1163090eb0d18bcc90233dfa8bb263ce8ae78e29c5bdd11878f38b3623dece18631aeb7c173406c9de1a86a5bcc41a99d92c805b58a736b86c
+AUX anyterm-1.1.29-gcc-4.4.patch 212 SHA256 770240bb496231737f79ac4e763d01e01b4d6dfa139aa801026433614ed4d99a SHA512 378bcd7ca8eea9678eee16e75d3b72370e07e5b1f9b041662a19336fed4e2dd27416a5fc1fa6cac02cc15635076e68f16382d8e249a011e884b016a1553b35ee WHIRLPOOL 070147ca1064aafa0f070d49f084b46683dfffad1df7d94cd1c43c193c4ddb3ed42d2fc6f8b2aaf95676c1031b7a2a5ffd661f778793baa1204a326f10efc480
+AUX anyterm-1.1.29-gcc6.patch 14014 SHA256 633ebcbbdd9340972be62462c48aa2a212726ad00ded058272b4836d141afeb8 SHA512 44418b4ea76a8cc54deeb43a8f67710e21422fdaa996b54fd9ecea2e3f1c7b009f9582d282fa47a8854867f369559c301d0a20836b86cac3c4f1ff995aaf6b97 WHIRLPOOL d06a0044c72bcb1b9ed22ce310660406b37855eaf20dd02f9c94616dbce27a91ef5a4b48ac1180926026c7a31e2e42607c7142c3f5aa241d3043a3d68b1ed892
+AUX anyterm.conf.d 157 SHA256 c630f4972d3ce3b8236abea1269060e033387a00e9455f36bfb94f02a5f5ec06 SHA512 2784a5579fc1020e70066b53474252c20a6a11f64253ce519d293bd37f73380eb55317c2d0f1ce060cec817a6bddd330c0bc74ff9a4e99d2ee72f0679afa4654 WHIRLPOOL 4aace288c2aedf70e4ec18fb87ab51183a9fe06dfc796d440c224a71ac16340f0f254752e31352e06062fde4aec51cd53450f24b70d2bed8d17a138dc3a90901
+AUX anyterm.init.d 426 SHA256 eb3a04c2e4a7dcd77ea961ba4d172629be64236f012f885c5332d53e8c741154 SHA512 5c4086796bc9d63b96605df9931aadd8d1bc3021bbe5366412c309d9bbf519abdcd065b5cd602ea33555bb4edc8c376e72b5f8a6db63f19843b8cffec255304d WHIRLPOOL 00c485d5bceb8acfaa40849496df9448ae80b7f6973c4c15386c3db011901bcf9c0601e6889951acb0c7e71c949c1021448173f743eb0ba288f3738265273064
+DIST anyterm-1.1.29.tbz2 178424 SHA256 6e7710cf2240cb4eced295bdf17de4b6ce223c7fe4d1668260a6d60a8aec9846 SHA512 119b2b3eae416721bfd7511d5325f8a8b7bdf4438655a5760f3cac2a91c0d41db2b1efd6bc8f3effb99bff646a21d88ab6e670ece0191e69aeb85f093dc5ab75 WHIRLPOOL 7ba0d59b2e8aeb76f2b08e2ab276b4252cff518f86460763f70a54d90854ca62974b8400cffe9a1b1e65f55a028f89334b932ee3ca673382774cb88a9361621b
+EBUILD anyterm-1.1.29-r1.ebuild 1306 SHA256 68930cfc75a8eb48cb4ff5a8103026ca7dd9c96fac0802e96dcac3c6988d9451 SHA512 304c486fafe2025694539190e4d5f4736e23e4e41e86ce24b4e4e3c43723c45768e102d78ed65747e3f1e4b866430a949df44dca3192d7ee2529fd4f006ba16c WHIRLPOOL 9faa257dd93cac908f51839848a937fe553e3c95866c830cab4ee30b8d06680eae686e6afb170bd87a6886abcf909c6399d6a84a8a53b5b23b7835ad240b521c
+EBUILD anyterm-1.1.29.ebuild 1077 SHA256 7a0c015df82234bcff310d814d09b191ebda1bb86231b2afd358f9d06f8df5ce SHA512 6285a4a16d4f9cfc085f88d96cdb6cb25a9aaf8bec2d41b88bd21730a5d16558731bd5fd961dd6ebbb6e8e6e8078b40c52ba99af199e48a799eed8a130e90479 WHIRLPOOL d84e7be19a0834fba15e0fa36d4a0fa2b2f54f96e11ec2752d93ba2f889d61ddd2ac890baffe337b435e1418d9d7dcd8bf8a2663a8e777f14f0c0f9ce4598ddc
+MISC ChangeLog 3405 SHA256 1fabb8434944a75c6a2c2de67a9b729014edc2a7edf871711dac47ca4624ee0e SHA512 3e4ad4abfcde5c50a08b53148072e4bfb764c4b5b743e2c346d0051cdd2bcf6dcaceb67195d40e153df1091a58cc2002acb9d96b1a4b5544cb7158768e4146af WHIRLPOOL 9d355fcc5d137ec87b307d2839127d8c5fca8415e8ddd2e772fd7c70f1e72edd1e15917cc991a55f2b86fb52e0c39e8640d63aef6b5ba07fe5548e5757267995
+MISC ChangeLog-2015 4939 SHA256 2edb0ee455f4fe253db83a9b8116e4c6c862861d748a21d6a23a04ec5d60dcc4 SHA512 6dd128fcacf9c427367ab63c6e6eb47bc754792d285796af97d2a79e823f0dd5812c116785ce7b2ebf1ee8d235ec766d8088545319ab21bf5e56faaeacee180c WHIRLPOOL 3e50208def029d8ff8042a9c446a24dd3b0902c11b52d0800b93d1c4bda138264cfc6ec6410dd354aaec0d212dca69875df9501907069e0e52ec556b7c2c61c8
+MISC metadata.xml 250 SHA256 d9fcac0092614f226b371c1819fe3a264758bfd9fedc2874c35a7b3dd6d77291 SHA512 8a7934e6db1aa1e0aba026a0438fb291819be69c134d54bb3af0638facc3e0a47bc30557c944bfaf5adbdd1dbdcbc96dec88d69ab809b1758e5701ff38fc6282 WHIRLPOOL 113cbaecb7ee19172633b0ee77ecfa10f6742848fd0f5f0797b95865f291e063ce3916719af48a81a72adfdaf40a4b18815e2434f0de91e2baa63822951470f0
diff --git a/www-apache/anyterm/anyterm-1.1.29-r1.ebuild b/www-apache/anyterm/anyterm-1.1.29-r1.ebuild
new file mode 100644
index 000000000000..7a3008eebbd2
--- /dev/null
+++ b/www-apache/anyterm/anyterm-1.1.29-r1.ebuild
@@ -0,0 +1,55 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit flag-o-matic toolchain-funcs
+
+DESCRIPTION="A terminal anywhere"
+HOMEPAGE="https://anyterm.org/"
+SRC_URI="https://anyterm.org/download/${P}.tbz2"
+
+LICENSE="GPL-2 Boost-1.0"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+RDEPEND="virtual/ssh"
+DEPEND="${RDEPEND}
+	>=dev-libs/boost-1.34.1"
+
+PATCHES=(
+	"${FILESDIR}/${PN}-1.1.28-respect-LDFLAGS.patch"
+	"${FILESDIR}/${P}-gcc-4.4.patch"
+	"${FILESDIR}/${P}-boost-1.50.patch"
+	"${FILESDIR}/${P}-gcc6.patch"
+)
+
+src_prepare() {
+	default
+
+	# Fix underlinking issue caused by recent boost versions
+	# depending on boost::system, Gentoo bug #579522
+	sed -e 's/\($(CXX) -o $@ $(LDFLAGS) $(OBJS) $(BLOBS) $(LINK_FLAGS)\)/\1 -lboost_system/' \
+		-i common.mk || die
+}
+
+src_compile() {
+	# this package uses `ld -r -b binary` and thus resulting executable contains
+	# executable stack
+	append-ldflags -Wl,-z,noexecstack
+	emake CC="$(tc-getCC)" CXX="$(tc-getCXX)"
+}
+
+src_install() {
+	dosbin anytermd
+	dodoc CHANGELOG README
+	doman anytermd.1
+	newinitd "${FILESDIR}/anyterm.init.d" anyterm
+	newconfd "${FILESDIR}/anyterm.conf.d" anyterm
+}
+
+pkg_postinst() {
+	elog "To proceed with installation, read the following:"
+	elog "https://anyterm.org/install.html"
+}
diff --git a/www-apache/anyterm/anyterm-1.1.29.ebuild b/www-apache/anyterm/anyterm-1.1.29.ebuild
new file mode 100644
index 000000000000..0c499ce28eea
--- /dev/null
+++ b/www-apache/anyterm/anyterm-1.1.29.ebuild
@@ -0,0 +1,45 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="2"
+
+inherit eutils flag-o-matic
+
+DESCRIPTION="A terminal anywhere"
+HOMEPAGE="https://anyterm.org/"
+SRC_URI="https://anyterm.org/download/${P}.tbz2"
+
+LICENSE="GPL-2 Boost-1.0"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+RDEPEND="virtual/ssh"
+DEPEND="${RDEPEND}
+	>=dev-libs/boost-1.34.1"
+
+src_prepare() {
+	epatch "${FILESDIR}/${PN}-1.1.28-respect-LDFLAGS.patch"
+	epatch "${FILESDIR}/${P}-gcc-4.4.patch"
+	epatch "${FILESDIR}/${P}-boost-1.50.patch"
+}
+
+src_compile() {
+	# this package uses `ld -r -b binary` and thus resulting executable contains
+	# executable stack
+	append-ldflags -Wl,-z,noexecstack
+	emake CC="$(tc-getCC)" CXX="$(tc-getCXX)" || die
+}
+
+src_install() {
+	dosbin anytermd || die
+	dodoc CHANGELOG README || die
+	doman anytermd.1 || die
+	newinitd "${FILESDIR}/anyterm.init.d" anyterm || die
+	newconfd "${FILESDIR}/anyterm.conf.d" anyterm || die
+}
+
+pkg_postinst() {
+	elog "To proceed installation, read following:"
+	elog "https://anyterm.org/install.html"
+}
diff --git a/www-apache/anyterm/files/anyterm-1.1.28-respect-LDFLAGS.patch b/www-apache/anyterm/files/anyterm-1.1.28-respect-LDFLAGS.patch
new file mode 100644
index 000000000000..ef27604d87e0
--- /dev/null
+++ b/www-apache/anyterm/files/anyterm-1.1.28-respect-LDFLAGS.patch
@@ -0,0 +1,26 @@
+=== modified file 'common.mk'
+--- anyterm-1.1.29/common.mk	2009-01-24 12:40:55 +0000
++++ anyterm-1.1.29/common.mk	2009-01-24 14:02:19 +0000
+@@ -71,7 +71,7 @@
+ OBJS=$(addsuffix .o,$(notdir $(basename $(CC_SRCS))))
+ 
+ %.o: %.cc
+-	$(CXX) $(CC_COMPILE_FLAGS) -c $<
++	$(CXX) $(CPPFLAGS) $(CXXFLAGS) $(CC_COMPILE_FLAGS) -c $<
+ 
+ ifdef HAVE_GNU_LD
+ %.blob.o: ../browser/%
+@@ -87,10 +87,10 @@
+ 
+ 
+ anytermd: $(OBJS) $(BLOBS) $(LIBPBE_LIB)
+-	$(CXX) -o $@ $(OBJS) $(BLOBS) $(LINK_FLAGS)
++	$(CXX) -o $@ $(LDFLAGS) $(OBJS) $(BLOBS) $(LINK_FLAGS)
+ 
+ %.d: %.cc
+-	$(CXX) -MM -MG -MT $@ -MT $(<:%.cc=%.o) $(CPP_FLAGS) $(GCC_FLAGS) -o $@ $<
++	$(CXX) $(CPPFLAGS) $(CXXFLAGS) -MM -MG -MT $@ -MT $(<:%.cc=%.o) $(CPP_FLAGS) $(GCC_FLAGS) -o $@ $<
+ 
+ DEPENDS=$(addsuffix .d,$(basename $(OBJS)))
+ 
+
diff --git a/www-apache/anyterm/files/anyterm-1.1.29-boost-1.50.patch b/www-apache/anyterm/files/anyterm-1.1.29-boost-1.50.patch
new file mode 100644
index 000000000000..c3357247f4eb
--- /dev/null
+++ b/www-apache/anyterm/files/anyterm-1.1.29-boost-1.50.patch
@@ -0,0 +1,58 @@
+Patch by Arfrever; sent to upstream developer.
+
+--- anyterm-1.1.29/libpbe/src/parse_http_request.cc
++++ anyterm-1.1.29/libpbe/src/parse_http_request.cc
+@@ -18,11 +18,11 @@
+ 
+ #include "parse_http_request.hh"
+ 
+-#include <boost/spirit.hpp>
+-#include <boost/spirit/actor/insert_at_actor.hpp>
+-#include <boost/spirit/dynamic/if.hpp>
+-#include <boost/spirit/utility/loops.hpp>
+-#include <boost/spirit/iterator/multi_pass.hpp>
++#include <boost/spirit/include/classic.hpp>
++#include <boost/spirit/include/classic_if.hpp>
++#include <boost/spirit/include/classic_insert_at_actor.hpp>
++#include <boost/spirit/include/classic_loops.hpp>
++#include <boost/spirit/include/classic_multi_pass.hpp>
+ 
+ #include <boost/lexical_cast.hpp>
+ #include <boost/scoped_array.hpp>
+@@ -31,7 +31,7 @@
+ 
+ 
+ using namespace std;
+-using namespace boost::spirit;
++using namespace boost::spirit::classic;
+ 
+ 
+ namespace pbe {
+--- anyterm-1.1.29/libpbe/src/URI.cc
++++ anyterm-1.1.29/libpbe/src/URI.cc
+@@ -18,11 +18,11 @@
+ 
+ #include "URI.hh"
+ 
+-#include <boost/spirit.hpp>
+-#include <boost/spirit/actor/insert_at_actor.hpp>
+-#include <boost/spirit/dynamic/if.hpp>
+-#include <boost/spirit/utility/loops.hpp>
+-#include <boost/spirit/iterator/multi_pass.hpp>
++#include <boost/spirit/include/classic.hpp>
++#include <boost/spirit/include/classic_if.hpp>
++#include <boost/spirit/include/classic_insert_at_actor.hpp>
++#include <boost/spirit/include/classic_loops.hpp>
++#include <boost/spirit/include/classic_multi_pass.hpp>
+ 
+ #include <boost/lexical_cast.hpp>
+ #include <boost/scoped_array.hpp>
+@@ -30,7 +30,7 @@
+ #include <map>
+ 
+ using namespace std;
+-using namespace boost::spirit;
++using namespace boost::spirit::classic;
+ 
+ 
+ namespace pbe {
diff --git a/www-apache/anyterm/files/anyterm-1.1.29-gcc-4.4.patch b/www-apache/anyterm/files/anyterm-1.1.29-gcc-4.4.patch
new file mode 100644
index 000000000000..c6fd2e6ad1ae
--- /dev/null
+++ b/www-apache/anyterm/files/anyterm-1.1.29-gcc-4.4.patch
@@ -0,0 +1,10 @@
+--- anyterm-1.1.29/libpbe/src/SmtpClient.cc
++++ anyterm-1.1.29/libpbe/src/SmtpClient.cc
+@@ -20,6 +20,7 @@
+ #include "ip.hh"
+ #include "select.hh"
+ 
++#include <stdio.h>
+ #include <syslog.h>
+ #include <unistd.h>
+ 
diff --git a/www-apache/anyterm/files/anyterm-1.1.29-gcc6.patch b/www-apache/anyterm/files/anyterm-1.1.29-gcc6.patch
new file mode 100644
index 000000000000..bbd443a62712
--- /dev/null
+++ b/www-apache/anyterm/files/anyterm-1.1.29-gcc6.patch
@@ -0,0 +1,146 @@
+--- a/src/html.cc
++++ b/src/html.cc
+@@ -50,16 +50,16 @@
+       }
+       classes += L'i'+fg;
+     }
+-    h += L"<span class=\"" + classes + L"\">";
++    h += UCS4STR("<span class=\"") + classes + UCS4STR("\">");
+     return true;
+   }
+   return false;
+ }
+ 
+-static const ucs4_char* attr_end    = L"</span>";
++static const ucs4_char* attr_end    = UCS4STR("</span>");
+ 
+-static const ucs4_char* cursor_start = L"<span class=\"cursor\">";
+-static const ucs4_char* cursor_end   = L"</span>";
++static const ucs4_char* cursor_start = UCS4STR("<span class=\"cursor\">");
++static const ucs4_char* cursor_end   = UCS4STR("</span>");
+ 
+ 
+ ucs4_string htmlify_screen(const Screen& screen)
+@@ -97,9 +97,9 @@
+ 	  h+=cursor_start;
+ 	}
+         switch (ch) {
+-          case '<':  h+=L"&lt;"; break;
+-          case '>':  h+=L"&gt;"; break;
+-          case '&':  h+=L"&amp;"; break;
++          case '<':  h+=UCS4STR("&lt;"); break;
++          case '>':  h+=UCS4STR("&gt;"); break;
++          case '&':  h+=UCS4STR("&amp;"); break;
+           case ' ':  h+=L'\u00A0'; break;
+           default:   h+=ch; break;
+         }
+@@ -111,7 +111,7 @@
+     if (styled) {
+       h+=attr_end;
+     }
+-    h+=L"<br>";
++    h+=UCS4STR("<br>");
+   }
+ 
+   return h;
+--- a/src/editscript.cc
++++ b/src/editscript.cc
+@@ -95,7 +95,7 @@
+   simplify_editscript(e,simp_e);
+ 
+   ucs4_string editscript;
+-  ucs4_string editscript_r = L"R";
++  ucs4_string editscript_r = UCS4STR("R");
+   bool any_common = false;
+   bool any_change = false;
+ 
+@@ -127,7 +127,7 @@
+   }
+ 
+   if (!any_change) {
+-    return L"n";
++    return UCS4STR("n");
+   } else if (any_common) {
+     return editscript;
+   } else {
+--- a/src/unicode.hh
++++ b/src/unicode.hh
+@@ -30,7 +30,16 @@
+ #define UCS4_NATIVE "UCS-4BE"
+ #endif
+ 
++// char32_t is built-in in C++11.  Pre C++11, use wchar_t.
++// Define a macro UCS4STR() to declare a string literal as L"..." or U"...".
++
++#if __cplusplus < 201100L
+ typedef wchar_t char32_t;
++#define UCS4STR(s) L##s
++#else
++#define UCS4STR(s) U##s
++#endif
++
+ typedef char32_t ucs4_char;
+ typedef std::basic_string<ucs4_char> ucs4_string;
+ 
+--- a/libpbe/include/charset/char_t.hh
++++ b/libpbe/include/charset/char_t.hh
+@@ -63,9 +63,15 @@
+ };
+ 
+ typedef char_t<8>::type  char8_t;
++
++#define HAVE_BUILTIN_CHAR_T __cplusplus >= 201100L
++#if ! HAVE_BUILTIN_CHAR_T
++
+ typedef char_t<16>::type char16_t;
+ typedef char_t<32>::type char32_t;
+ 
++#endif
++
+ 
+ };
+ 
+--- a/libpbe/src/generated/iso8859_tables_body.cc
++++ b/libpbe/src/generated/iso8859_tables_body.cc
+@@ -2,22 +2,22 @@
+   // ISO-8859-2
+   { 0x0104, 0x02D8, 0x0141, 0x00A4, 0x013D, 0x015A, 0x00A7, 0x00A8, 0x0160, 0x015E, 0x0164, 0x0179, 0x00AD, 0x017D, 0x017B, 0x00B0, 0x0105, 0x02DB, 0x0142, 0x00B4, 0x013E, 0x015B, 0x02C7, 0x00B8, 0x0161, 0x015F, 0x0165, 0x017A, 0x02DD, 0x017E, 0x017C, 0x0154, 0x00C1, 0x00C2, 0x0102, 0x00C4, 0x0139, 0x0106, 0x00C7, 0x010C, 0x00C9, 0x0118, 0x00CB, 0x011A, 0x00CD, 0x00CE, 0x010E, 0x0110, 0x0143, 0x0147, 0x00D3, 0x00D4, 0x0150, 0x00D6, 0x00D7, 0x0158, 0x016E, 0x00DA, 0x0170, 0x00DC, 0x00DD, 0x0162, 0x00DF, 0x0155, 0x00E1, 0x00E2, 0x0103, 0x00E4, 0x013A, 0x0107, 0x00E7, 0x010D, 0x00E9, 0x0119, 0x00EB, 0x011B, 0x00ED, 0x00EE, 0x010F, 0x0111, 0x0144, 0x0148, 0x00F3, 0x00F4, 0x0151, 0x00F6, 0x00F7, 0x0159, 0x016F, 0x00FA, 0x0171, 0x00FC, 0x00FD, 0x0163, 0x02D9,},
+   // ISO-8859-3
+-  { 0x0126, 0x02D8, 0x00A3, 0x00A4, -1, 0x0124, 0x00A7, 0x00A8, 0x0130, 0x015E, 0x011E, 0x0134, 0x00AD, -1, 0x017B, 0x00B0, 0x0127, 0x00B2, 0x00B3, 0x00B4, 0x00B5, 0x0125, 0x00B7, 0x00B8, 0x0131, 0x015F, 0x011F, 0x0135, 0x00BD, -1, 0x017C, 0x00C0, 0x00C1, 0x00C2, -1, 0x00C4, 0x010A, 0x0108, 0x00C7, 0x00C8, 0x00C9, 0x00CA, 0x00CB, 0x00CC, 0x00CD, 0x00CE, 0x00CF, -1, 0x00D1, 0x00D2, 0x00D3, 0x00D4, 0x0120, 0x00D6, 0x00D7, 0x011C, 0x00D9, 0x00DA, 0x00DB, 0x00DC, 0x016C, 0x015C, 0x00DF, 0x00E0, 0x00E1, 0x00E2, -1, 0x00E4, 0x010B, 0x0109, 0x00E7, 0x00E8, 0x00E9, 0x00EA, 0x00EB, 0x00EC, 0x00ED, 0x00EE, 0x00EF, -1, 0x00F1, 0x00F2, 0x00F3, 0x00F4, 0x0121, 0x00F6, 0x00F7, 0x011D, 0x00F9, 0x00FA, 0x00FB, 0x00FC, 0x016D, 0x015D, 0x02D9,},
++  { 0x0126, 0x02D8, 0x00A3, 0x00A4, 0xffff, 0x0124, 0x00A7, 0x00A8, 0x0130, 0x015E, 0x011E, 0x0134, 0x00AD, 0xffff, 0x017B, 0x00B0, 0x0127, 0x00B2, 0x00B3, 0x00B4, 0x00B5, 0x0125, 0x00B7, 0x00B8, 0x0131, 0x015F, 0x011F, 0x0135, 0x00BD, 0xffff, 0x017C, 0x00C0, 0x00C1, 0x00C2, 0xffff, 0x00C4, 0x010A, 0x0108, 0x00C7, 0x00C8, 0x00C9, 0x00CA, 0x00CB, 0x00CC, 0x00CD, 0x00CE, 0x00CF, 0xffff, 0x00D1, 0x00D2, 0x00D3, 0x00D4, 0x0120, 0x00D6, 0x00D7, 0x011C, 0x00D9, 0x00DA, 0x00DB, 0x00DC, 0x016C, 0x015C, 0x00DF, 0x00E0, 0x00E1, 0x00E2, 0xffff, 0x00E4, 0x010B, 0x0109, 0x00E7, 0x00E8, 0x00E9, 0x00EA, 0x00EB, 0x00EC, 0x00ED, 0x00EE, 0x00EF, 0xffff, 0x00F1, 0x00F2, 0x00F3, 0x00F4, 0x0121, 0x00F6, 0x00F7, 0x011D, 0x00F9, 0x00FA, 0x00FB, 0x00FC, 0x016D, 0x015D, 0x02D9,},
+   // ISO-8859-4
+   { 0x0104, 0x0138, 0x0156, 0x00A4, 0x0128, 0x013B, 0x00A7, 0x00A8, 0x0160, 0x0112, 0x0122, 0x0166, 0x00AD, 0x017D, 0x00AF, 0x00B0, 0x0105, 0x02DB, 0x0157, 0x00B4, 0x0129, 0x013C, 0x02C7, 0x00B8, 0x0161, 0x0113, 0x0123, 0x0167, 0x014A, 0x017E, 0x014B, 0x0100, 0x00C1, 0x00C2, 0x00C3, 0x00C4, 0x00C5, 0x00C6, 0x012E, 0x010C, 0x00C9, 0x0118, 0x00CB, 0x0116, 0x00CD, 0x00CE, 0x012A, 0x0110, 0x0145, 0x014C, 0x0136, 0x00D4, 0x00D5, 0x00D6, 0x00D7, 0x00D8, 0x0172, 0x00DA, 0x00DB, 0x00DC, 0x0168, 0x016A, 0x00DF, 0x0101, 0x00E1, 0x00E2, 0x00E3, 0x00E4, 0x00E5, 0x00E6, 0x012F, 0x010D, 0x00E9, 0x0119, 0x00EB, 0x0117, 0x00ED, 0x00EE, 0x012B, 0x0111, 0x0146, 0x014D, 0x0137, 0x00F4, 0x00F5, 0x00F6, 0x00F7, 0x00F8, 0x0173, 0x00FA, 0x00FB, 0x00FC, 0x0169, 0x016B, 0x02D9,},
+   // ISO-8859-5
+   { 0x0401, 0x0402, 0x0403, 0x0404, 0x0405, 0x0406, 0x0407, 0x0408, 0x0409, 0x040A, 0x040B, 0x040C, 0x00AD, 0x040E, 0x040F, 0x0410, 0x0411, 0x0412, 0x0413, 0x0414, 0x0415, 0x0416, 0x0417, 0x0418, 0x0419, 0x041A, 0x041B, 0x041C, 0x041D, 0x041E, 0x041F, 0x0420, 0x0421, 0x0422, 0x0423, 0x0424, 0x0425, 0x0426, 0x0427, 0x0428, 0x0429, 0x042A, 0x042B, 0x042C, 0x042D, 0x042E, 0x042F, 0x0430, 0x0431, 0x0432, 0x0433, 0x0434, 0x0435, 0x0436, 0x0437, 0x0438, 0x0439, 0x043A, 0x043B, 0x043C, 0x043D, 0x043E, 0x043F, 0x0440, 0x0441, 0x0442, 0x0443, 0x0444, 0x0445, 0x0446, 0x0447, 0x0448, 0x0449, 0x044A, 0x044B, 0x044C, 0x044D, 0x044E, 0x044F, 0x2116, 0x0451, 0x0452, 0x0453, 0x0454, 0x0455, 0x0456, 0x0457, 0x0458, 0x0459, 0x045A, 0x045B, 0x045C, 0x00A7, 0x045E, 0x045F,},
+   // ISO-8859-6
+-  { -1, -1, -1, 0x00A4, -1, -1, -1, -1, -1, -1, -1, 0x060C, 0x00AD, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, 0x061B, -1, -1, -1, 0x061F, -1, 0x0621, 0x0622, 0x0623, 0x0624, 0x0625, 0x0626, 0x0627, 0x0628, 0x0629, 0x062A, 0x062B, 0x062C, 0x062D, 0x062E, 0x062F, 0x0630, 0x0631, 0x0632, 0x0633, 0x0634, 0x0635, 0x0636, 0x0637, 0x0638, 0x0639, 0x063A, -1, -1, -1, -1, -1, 0x0640, 0x0641, 0x0642, 0x0643, 0x0644, 0x0645, 0x0646, 0x0647, 0x0648, 0x0649, 0x064A, 0x064B, 0x064C, 0x064D, 0x064E, 0x064F, 0x0650, 0x0651, 0x0652,},
++  { 0xffff, 0xffff, 0xffff, 0x00A4, 0xffff, 0xffff, 0xffff, 0xffff, 0xffff, 0xffff, 0xffff, 0x060C, 0x00AD, 0xffff, 0xffff, 0xffff, 0xffff, 0xffff, 0xffff, 0xffff, 0xffff, 0xffff, 0xffff, 0xffff, 0xffff, 0xffff, 0x061B, 0xffff, 0xffff, 0xffff, 0x061F, 0xffff, 0x0621, 0x0622, 0x0623, 0x0624, 0x0625, 0x0626, 0x0627, 0x0628, 0x0629, 0x062A, 0x062B, 0x062C, 0x062D, 0x062E, 0x062F, 0x0630, 0x0631, 0x0632, 0x0633, 0x0634, 0x0635, 0x0636, 0x0637, 0x0638, 0x0639, 0x063A, 0xffff, 0xffff, 0xffff, 0xffff, 0xffff, 0x0640, 0x0641, 0x0642, 0x0643, 0x0644, 0x0645, 0x0646, 0x0647, 0x0648, 0x0649, 0x064A, 0x064B, 0x064C, 0x064D, 0x064E, 0x064F, 0x0650, 0x0651, 0x0652,},
+   // ISO-8859-7
+-  { 0x2018, 0x2019, 0x00A3, 0x20AC, 0x20AF, 0x00A6, 0x00A7, 0x00A8, 0x00A9, 0x037A, 0x00AB, 0x00AC, 0x00AD, -1, 0x2015, 0x00B0, 0x00B1, 0x00B2, 0x00B3, 0x0384, 0x0385, 0x0386, 0x00B7, 0x0388, 0x0389, 0x038A, 0x00BB, 0x038C, 0x00BD, 0x038E, 0x038F, 0x0390, 0x0391, 0x0392, 0x0393, 0x0394, 0x0395, 0x0396, 0x0397, 0x0398, 0x0399, 0x039A, 0x039B, 0x039C, 0x039D, 0x039E, 0x039F, 0x03A0, 0x03A1, -1, 0x03A3, 0x03A4, 0x03A5, 0x03A6, 0x03A7, 0x03A8, 0x03A9, 0x03AA, 0x03AB, 0x03AC, 0x03AD, 0x03AE, 0x03AF, 0x03B0, 0x03B1, 0x03B2, 0x03B3, 0x03B4, 0x03B5, 0x03B6, 0x03B7, 0x03B8, 0x03B9, 0x03BA, 0x03BB, 0x03BC, 0x03BD, 0x03BE, 0x03BF, 0x03C0, 0x03C1, 0x03C2, 0x03C3, 0x03C4, 0x03C5, 0x03C6, 0x03C7, 0x03C8, 0x03C9, 0x03CA, 0x03CB, 0x03CC, 0x03CD, 0x03CE,},
++  { 0x2018, 0x2019, 0x00A3, 0x20AC, 0x20AF, 0x00A6, 0x00A7, 0x00A8, 0x00A9, 0x037A, 0x00AB, 0x00AC, 0x00AD, 0xffff, 0x2015, 0x00B0, 0x00B1, 0x00B2, 0x00B3, 0x0384, 0x0385, 0x0386, 0x00B7, 0x0388, 0x0389, 0x038A, 0x00BB, 0x038C, 0x00BD, 0x038E, 0x038F, 0x0390, 0x0391, 0x0392, 0x0393, 0x0394, 0x0395, 0x0396, 0x0397, 0x0398, 0x0399, 0x039A, 0x039B, 0x039C, 0x039D, 0x039E, 0x039F, 0x03A0, 0x03A1, 0xffff, 0x03A3, 0x03A4, 0x03A5, 0x03A6, 0x03A7, 0x03A8, 0x03A9, 0x03AA, 0x03AB, 0x03AC, 0x03AD, 0x03AE, 0x03AF, 0x03B0, 0x03B1, 0x03B2, 0x03B3, 0x03B4, 0x03B5, 0x03B6, 0x03B7, 0x03B8, 0x03B9, 0x03BA, 0x03BB, 0x03BC, 0x03BD, 0x03BE, 0x03BF, 0x03C0, 0x03C1, 0x03C2, 0x03C3, 0x03C4, 0x03C5, 0x03C6, 0x03C7, 0x03C8, 0x03C9, 0x03CA, 0x03CB, 0x03CC, 0x03CD, 0x03CE,},
+   // ISO-8859-8
+-  { -1, 0x00A2, 0x00A3, 0x00A4, 0x00A5, 0x00A6, 0x00A7, 0x00A8, 0x00A9, 0x00D7, 0x00AB, 0x00AC, 0x00AD, 0x00AE, 0x00AF, 0x00B0, 0x00B1, 0x00B2, 0x00B3, 0x00B4, 0x00B5, 0x00B6, 0x00B7, 0x00B8, 0x00B9, 0x00F7, 0x00BB, 0x00BC, 0x00BD, 0x00BE, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, 0x2017, 0x05D0, 0x05D1, 0x05D2, 0x05D3, 0x05D4, 0x05D5, 0x05D6, 0x05D7, 0x05D8, 0x05D9, 0x05DA, 0x05DB, 0x05DC, 0x05DD, 0x05DE, 0x05DF, 0x05E0, 0x05E1, 0x05E2, 0x05E3, 0x05E4, 0x05E5, 0x05E6, 0x05E7, 0x05E8, 0x05E9, 0x05EA, -1, -1, 0x200E, 0x200F,},
++  { 0xffff, 0x00A2, 0x00A3, 0x00A4, 0x00A5, 0x00A6, 0x00A7, 0x00A8, 0x00A9, 0x00D7, 0x00AB, 0x00AC, 0x00AD, 0x00AE, 0x00AF, 0x00B0, 0x00B1, 0x00B2, 0x00B3, 0x00B4, 0x00B5, 0x00B6, 0x00B7, 0x00B8, 0x00B9, 0x00F7, 0x00BB, 0x00BC, 0x00BD, 0x00BE, 0xffff, 0xffff, 0xffff, 0xffff, 0xffff, 0xffff, 0xffff, 0xffff, 0xffff, 0xffff, 0xffff, 0xffff, 0xffff, 0xffff, 0xffff, 0xffff, 0xffff, 0xffff, 0xffff, 0xffff, 0xffff, 0xffff, 0xffff, 0xffff, 0xffff, 0xffff, 0xffff, 0xffff, 0xffff, 0xffff, 0xffff, 0xffff, 0x2017, 0x05D0, 0x05D1, 0x05D2, 0x05D3, 0x05D4, 0x05D5, 0x05D6, 0x05D7, 0x05D8, 0x05D9, 0x05DA, 0x05DB, 0x05DC, 0x05DD, 0x05DE, 0x05DF, 0x05E0, 0x05E1, 0x05E2, 0x05E3, 0x05E4, 0x05E5, 0x05E6, 0x05E7, 0x05E8, 0x05E9, 0x05EA, 0xffff, 0xffff, 0x200E, 0x200F,},
+   // ISO-8859-9
+   { 0x00A1, 0x00A2, 0x00A3, 0x00A4, 0x00A5, 0x00A6, 0x00A7, 0x00A8, 0x00A9, 0x00AA, 0x00AB, 0x00AC, 0x00AD, 0x00AE, 0x00AF, 0x00B0, 0x00B1, 0x00B2, 0x00B3, 0x00B4, 0x00B5, 0x00B6, 0x00B7, 0x00B8, 0x00B9, 0x00BA, 0x00BB, 0x00BC, 0x00BD, 0x00BE, 0x00BF, 0x00C0, 0x00C1, 0x00C2, 0x00C3, 0x00C4, 0x00C5, 0x00C6, 0x00C7, 0x00C8, 0x00C9, 0x00CA, 0x00CB, 0x00CC, 0x00CD, 0x00CE, 0x00CF, 0x011E, 0x00D1, 0x00D2, 0x00D3, 0x00D4, 0x00D5, 0x00D6, 0x00D7, 0x00D8, 0x00D9, 0x00DA, 0x00DB, 0x00DC, 0x0130, 0x015E, 0x00DF, 0x00E0, 0x00E1, 0x00E2, 0x00E3, 0x00E4, 0x00E5, 0x00E6, 0x00E7, 0x00E8, 0x00E9, 0x00EA, 0x00EB, 0x00EC, 0x00ED, 0x00EE, 0x00EF, 0x011F, 0x00F1, 0x00F2, 0x00F3, 0x00F4, 0x00F5, 0x00F6, 0x00F7, 0x00F8, 0x00F9, 0x00FA, 0x00FB, 0x00FC, 0x0131, 0x015F, 0x00FF,},
+-  // ISO-8859-10
++  // ISO-88590xffff0
+   { 0x0104, 0x0112, 0x0122, 0x012A, 0x0128, 0x0136, 0x00A7, 0x013B, 0x0110, 0x0160, 0x0166, 0x017D, 0x00AD, 0x016A, 0x014A, 0x00B0, 0x0105, 0x0113, 0x0123, 0x012B, 0x0129, 0x0137, 0x00B7, 0x013C, 0x0111, 0x0161, 0x0167, 0x017E, 0x2015, 0x016B, 0x014B, 0x0100, 0x00C1, 0x00C2, 0x00C3, 0x00C4, 0x00C5, 0x00C6, 0x012E, 0x010C, 0x00C9, 0x0118, 0x00CB, 0x0116, 0x00CD, 0x00CE, 0x00CF, 0x00D0, 0x0145, 0x014C, 0x00D3, 0x00D4, 0x00D5, 0x00D6, 0x0168, 0x00D8, 0x0172, 0x00DA, 0x00DB, 0x00DC, 0x00DD, 0x00DE, 0x00DF, 0x0101, 0x00E1, 0x00E2, 0x00E3, 0x00E4, 0x00E5, 0x00E6, 0x012F, 0x010D, 0x00E9, 0x0119, 0x00EB, 0x0117, 0x00ED, 0x00EE, 0x00EF, 0x00F0, 0x0146, 0x014D, 0x00F3, 0x00F4, 0x00F5, 0x00F6, 0x0169, 0x00F8, 0x0173, 0x00FA, 0x00FB, 0x00FC, 0x00FD, 0x00FE, 0x0138,},
+-  // ISO-8859-11
+-  { 0x0E01, 0x0E02, 0x0E03, 0x0E04, 0x0E05, 0x0E06, 0x0E07, 0x0E08, 0x0E09, 0x0E0A, 0x0E0B, 0x0E0C, 0x0E0D, 0x0E0E, 0x0E0F, 0x0E10, 0x0E11, 0x0E12, 0x0E13, 0x0E14, 0x0E15, 0x0E16, 0x0E17, 0x0E18, 0x0E19, 0x0E1A, 0x0E1B, 0x0E1C, 0x0E1D, 0x0E1E, 0x0E1F, 0x0E20, 0x0E21, 0x0E22, 0x0E23, 0x0E24, 0x0E25, 0x0E26, 0x0E27, 0x0E28, 0x0E29, 0x0E2A, 0x0E2B, 0x0E2C, 0x0E2D, 0x0E2E, 0x0E2F, 0x0E30, 0x0E31, 0x0E32, 0x0E33, 0x0E34, 0x0E35, 0x0E36, 0x0E37, 0x0E38, 0x0E39, 0x0E3A, -1, -1, -1, -1, 0x0E3F, 0x0E40, 0x0E41, 0x0E42, 0x0E43, 0x0E44, 0x0E45, 0x0E46, 0x0E47, 0x0E48, 0x0E49, 0x0E4A, 0x0E4B, 0x0E4C, 0x0E4D, 0x0E4E, 0x0E4F, 0x0E50, 0x0E51, 0x0E52, 0x0E53, 0x0E54, 0x0E55, 0x0E56, 0x0E57, 0x0E58, 0x0E59, 0x0E5A, 0x0E5B,},
+-  // ISO-8859-12 does not exist
++  // ISO-88590xffff1
++  { 0x0E01, 0x0E02, 0x0E03, 0x0E04, 0x0E05, 0x0E06, 0x0E07, 0x0E08, 0x0E09, 0x0E0A, 0x0E0B, 0x0E0C, 0x0E0D, 0x0E0E, 0x0E0F, 0x0E10, 0x0E11, 0x0E12, 0x0E13, 0x0E14, 0x0E15, 0x0E16, 0x0E17, 0x0E18, 0x0E19, 0x0E1A, 0x0E1B, 0x0E1C, 0x0E1D, 0x0E1E, 0x0E1F, 0x0E20, 0x0E21, 0x0E22, 0x0E23, 0x0E24, 0x0E25, 0x0E26, 0x0E27, 0x0E28, 0x0E29, 0x0E2A, 0x0E2B, 0x0E2C, 0x0E2D, 0x0E2E, 0x0E2F, 0x0E30, 0x0E31, 0x0E32, 0x0E33, 0x0E34, 0x0E35, 0x0E36, 0x0E37, 0x0E38, 0x0E39, 0x0E3A, 0xffff, 0xffff, 0xffff, 0xffff, 0x0E3F, 0x0E40, 0x0E41, 0x0E42, 0x0E43, 0x0E44, 0x0E45, 0x0E46, 0x0E47, 0x0E48, 0x0E49, 0x0E4A, 0x0E4B, 0x0E4C, 0x0E4D, 0x0E4E, 0x0E4F, 0x0E50, 0x0E51, 0x0E52, 0x0E53, 0x0E54, 0x0E55, 0x0E56, 0x0E57, 0x0E58, 0x0E59, 0x0E5A, 0x0E5B,},
++  // ISO-88590xffff2 does not exist
+   {},
+--- a/libpbe/include/charset/char_t.hh
++++ b/libpbe/include/charset/char_t.hh
+@@ -64,7 +64,7 @@
+ 
+ typedef char_t<8>::type  char8_t;
+ 
+-#define HAVE_BUILTIN_CHAR_T __cplusplus >= 201100L
++#define HAVE_BUILTIN_CHAR_T (__cplusplus >= 201100L)
+ #if ! HAVE_BUILTIN_CHAR_T
+ 
+ typedef char_t<16>::type char16_t;
diff --git a/www-apache/anyterm/files/anyterm.conf.d b/www-apache/anyterm/files/anyterm.conf.d
new file mode 100644
index 000000000000..d4aa00bf987b
--- /dev/null
+++ b/www-apache/anyterm/files/anyterm.conf.d
@@ -0,0 +1,7 @@
+# run anytermd as this user
+USER='nobody'
+# run anyterm on this port
+PORT='7676'
+
+# Other options you wish to pass to anyterm
+ANYTERM_OPTIONS="--local-only"
diff --git a/www-apache/anyterm/files/anyterm.init.d b/www-apache/anyterm/files/anyterm.init.d
new file mode 100644
index 000000000000..f48fff7783e0
--- /dev/null
+++ b/www-apache/anyterm/files/anyterm.init.d
@@ -0,0 +1,20 @@
+#!/sbin/openrc-run
+# Copyright 1999-2009 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License, v2 or later
+
+depend() {
+	need net
+}
+
+start() {
+	ebegin "Starting ${SVCNAME}"
+	start-stop-daemon --start --exec /usr/sbin/anytermd -- \
+		--user "${USER}" --port ${PORT} ${ANYTERM_OPTIONS}
+	eend $?
+}
+
+stop() {
+	ebegin "Stopping ${SVCNAME}"
+	start-stop-daemon --stop --exec /usr/sbin/anytermd
+	eend $?
+}
diff --git a/www-apache/anyterm/metadata.xml b/www-apache/anyterm/metadata.xml
new file mode 100644
index 000000000000..2b9b44f73497
--- /dev/null
+++ b/www-apache/anyterm/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="project">
+		<email>web-apps@gentoo.org</email>
+		<name>Gentoo Webapps</name>
+	</maintainer>
+</pkgmetadata>
diff --git a/www-apache/libapreq2/Manifest b/www-apache/libapreq2/Manifest
new file mode 100644
index 000000000000..fbf2162705f5
--- /dev/null
+++ b/www-apache/libapreq2/Manifest
@@ -0,0 +1,7 @@
+AUX 76_mod_apreq.conf 316 SHA256 caa62918391447ea10dc72be8db902722eae8af222df0d307df625dd495e9d3b SHA512 2a4d7c8415162d27ae182f091b8a2219c2865ff7ace0a5b8944e853cd256955888482877ab7cce55342a3d30686f9d7932bbbfdcc8c037e15c92e60de9eab20b WHIRLPOOL 2f3a5bc08211b13ac7279908195080f541d17bebb936ad646b41d60f0b1f5b427e0986d5abeecf02b8c37409f5d5575702370066247b8c14dc473826cd6d4a12
+AUX libapreq2-2.08-doc.patch 1188 SHA256 2ceee7ec3bf91a48b42094ce31ab1449b7193ea4c31aca0764ac98f13da5dccc SHA512 dc889d7890d9059efdb3fcd4d6b1e485929b69c073ff6266b90f82e89efe5bdd633fd4dc09ccd4aac3f8816271c00dca69b39ffe4706baf7d3094404784cd766 WHIRLPOOL 53311615c4d7ebbc4080c0e724adfdf3817e6ae1836f82eb8395df5b44cbc2869b9f1623b23aa259d3c0ddfe40a69b8b08eaf718ab6f5ac92cf97dba799aff1a
+DIST libapreq2-2.13.tar.gz 891320 SHA256 5731e6833b32d88e4a5c690e45ddf20fcf969ce3da666c5627d775e92da0cf6e SHA512 54553cb90c0d3f6fb34ff19364c5804976c4aff1bae551ae051fdd06f41695770f1e285c40e03dbd93ae738adc332f38f1a1994167598364071feaec833fdf05 WHIRLPOOL 8b018b5d71dc83c1029a0d4040f94fca8fcf1ea4490c4d34d0a702d873242953c22eed497c6c2e9d493f2386f4e37e8f462c02371e1e51d347d9f4ab383ae466
+EBUILD libapreq2-2.13-r1.ebuild 1431 SHA256 2a50a266aa3b2b66e0eb895b3179eadd7bcaefe6a67b5ebf99ca97220e6b8b70 SHA512 751c34af300a3b020a0df6ad82882ffdf840f6fd28295c3bc388d3c902080efab7537e9ea349880a478e274b9966c8eefa8f27a1db4295dfe53df11ad189e60a WHIRLPOOL eb3dcf3c9b04c936a79523dd0cb4f8c85a210a3adff1885ccf684253c12081217de832334886393beee1d622dd4240d9d309295051d28b1beb8013ec4170aefb
+MISC ChangeLog 2703 SHA256 c47c09d02358678588ef3835a5c0ce723cde7405fe82a07b2f6e868f80ac0c99 SHA512 dd4bf3a9a035deb13344b95811fa25935a942503f16c67870907e6f63c29ad6c102b84aa592d54616e5b387a3c0a528f3e83fb7fd130a22fb3b3da261b413848 WHIRLPOOL d8350b34366505284c363c23484e0c0bafa8a314a11ccffd1da333678fc5f598373469f3337cb83553a2e468cd46d33f73a85e1311245ebc68c4966be3c5ee21
+MISC ChangeLog-2015 9194 SHA256 6caee5be8cd629363a1b3dd44a69c2e62ea07e10828879a4b876ee69b8795e1b SHA512 00d0399273bde09afe3ec7830785562b3139b6f8a692afeededee1d20a45872d54ac384857289ee3b0bf93a5ed655d3a57c83d0ad2f9e203a7baa29c0a0d575b WHIRLPOOL 1c55254b6191c96d87adf6fa8ddd28fc01a58f7d6115a4730eeee4c0bb9d89c7bd29713e8effcebf62d9aedd769beabb93800fadfda96af4149b7228b13268ba
+MISC metadata.xml 166 SHA256 2caff447f5bd2701d8456ada5cc633c41ef4373fa4bfeabeb73599d40bcc941b SHA512 a56648c974a1d14dd4c18237532773c72057a13ab90c58b5da04f185e3c12a8bd8d5c21fb06053507f31766291a82dc7d87b34cd65fd94cfe2af7295c813ef84 WHIRLPOOL 1ff70497eca6531f0e0614c72a19f4b8e5ff486a58d369f4f0b36308d1d6b01168f9da887740e3b9f536236be251d3fe05f904d27a9233a7cf613416ba882968
diff --git a/www-apache/libapreq2/files/76_mod_apreq.conf b/www-apache/libapreq2/files/76_mod_apreq.conf
new file mode 100644
index 000000000000..15d925d404f8
--- /dev/null
+++ b/www-apache/libapreq2/files/76_mod_apreq.conf
@@ -0,0 +1,13 @@
+<IfDefine APREQ>
+LoadModule apreq_module modules/mod_apreq2.so
+
+# load the Perl modules
+# uncomment the ones you require
+#PerlModule APR::Request::Apache2
+#PerlModule APR::Request::CGI
+#PerlModule APR::Request::Cookie
+#PerlModule Apache2::Cookie
+#PerlModule Apache2::Request
+</IfDefine>
+
+# vim: ts=4 filetype=apache
diff --git a/www-apache/libapreq2/files/libapreq2-2.08-doc.patch b/www-apache/libapreq2/files/libapreq2-2.08-doc.patch
new file mode 100644
index 000000000000..a1e444070320
--- /dev/null
+++ b/www-apache/libapreq2/files/libapreq2-2.08-doc.patch
@@ -0,0 +1,24 @@
+diff -Naurp libapreq2-2.08.old/build/doxygen.conf libapreq2-2.08/build/doxygen.conf
+--- libapreq2-2.08.old/build/doxygen.conf	2006-08-09 00:30:19.000000000 -0400
++++ libapreq2-2.08/build/doxygen.conf	2007-05-05 07:54:21.000000000 -0400
+@@ -27,7 +27,7 @@ WARN_IF_UNDOCUMENTED   = YES
+ WARN_IF_DOC_ERROR      = YES
+ WARN_FORMAT            = "$file:$line: $text"
+ 
+-INPUT                  = . include module/apache module/apache2
++INPUT                  = . include module/apache2
+ FILE_PATTERNS          = *.h *.dox CHANGES STATUS
+ RECURSIVE              = NO
+ EXTRACT_STATIC         = YES
+diff -Naurp libapreq2-2.08.old/build/doxygen.conf.in libapreq2-2.08/build/doxygen.conf.in
+--- libapreq2-2.08.old/build/doxygen.conf.in	2006-08-09 00:26:44.000000000 -0400
++++ libapreq2-2.08/build/doxygen.conf.in	2007-05-05 07:57:18.000000000 -0400
+@@ -27,7 +27,7 @@ WARN_IF_UNDOCUMENTED   = YES
+ WARN_IF_DOC_ERROR      = YES
+ WARN_FORMAT            = "$file:$line: $text"
+ 
+-INPUT                  = . include module/apache module/apache2
++INPUT                  = . include module/apache2
+ FILE_PATTERNS          = *.h *.dox CHANGES STATUS
+ RECURSIVE              = NO
+ EXTRACT_STATIC         = YES
diff --git a/www-apache/libapreq2/libapreq2-2.13-r1.ebuild b/www-apache/libapreq2/libapreq2-2.13-r1.ebuild
new file mode 100644
index 000000000000..cf5812b4cd01
--- /dev/null
+++ b/www-apache/libapreq2/libapreq2-2.13-r1.ebuild
@@ -0,0 +1,63 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+inherit apache-module perl-module multilib
+
+DESCRIPTION="A library for manipulating client request data via the Apache API"
+SRC_URI="mirror://apache/httpd/libapreq/${P}.tar.gz"
+HOMEPAGE="https://httpd.apache.org/apreq/"
+
+LICENSE="Apache-2.0"
+SLOT="2"
+KEYWORDS="amd64 ppc ppc64 x86"
+IUSE="perl"
+
+DEPEND="${DEPEND}
+	perl? (
+		>=dev-perl/ExtUtils-XSBuilder-0.23
+		virtual/perl-version
+		>=www-apache/mod_perl-2
+	)"
+RDEPEND="${DEPEND}"
+
+APACHE2_MOD_FILE="module/apache2/.libs/mod_apreq2.so"
+APACHE2_MOD_CONF="76_mod_apreq"
+APACHE2_MOD_DEFINE="APREQ"
+DOCFILES="docs/html/*.html CHANGES README INSTALL MANIFEST"
+
+need_apache2
+
+pkg_setup() {
+	perl_set_version
+}
+
+src_prepare() {
+	epatch "${FILESDIR}"/libapreq2-2.08-doc.patch
+
+	sed -i -e "s/PERL \$PERL_OPTS/PERL/" "${S}"/acinclude.m4 || die
+	sed -i -e "s/PERL \$PERL_OPTS/PERL/" "${S}"/aclocal.m4 || die
+	sed -i -e "s/PERL \$PERL_OPTS/PERL/" "${S}"/configure  || die
+}
+
+src_configure() {
+	econf \
+		--with-apache2-apxs=${APXS} \
+		$(use_enable perl perl-glue)
+}
+
+src_install() {
+	apache-module_src_install
+
+	make DESTDIR="${D}" INSTALLDIRS=vendor install || die "make install failed"
+	doman docs/man/man3/*.3
+
+	perl_delete_localpod
+
+	for i in $(find "${D}" -type f -not -name '*.so'); do
+		if file ${i} | grep -i " text"; then
+			sed -i -e "s:${D}:/:g" ${i}
+		fi
+	done
+}
diff --git a/www-apache/libapreq2/metadata.xml b/www-apache/libapreq2/metadata.xml
new file mode 100644
index 000000000000..6f49eba8f496
--- /dev/null
+++ b/www-apache/libapreq2/metadata.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<!-- maintainer-needed -->
+</pkgmetadata>
diff --git a/www-apache/metadata.xml b/www-apache/metadata.xml
new file mode 100644
index 000000000000..0e2da9ad654b
--- /dev/null
+++ b/www-apache/metadata.xml
@@ -0,0 +1,36 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE catmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<catmetadata>
+	<longdescription lang="en">
+		The www-apache category contains modules for the Apache webserver.
+	</longdescription>
+	<longdescription lang="es">
+		La categoría www-apache contiene módulos del servidor web Apache.
+	</longdescription>
+	<longdescription lang="de">
+		Die Kategorie www-apache enthält Module für den Webserver Apache.
+	</longdescription>
+	<longdescription lang="ja">
+		www-apacheカテゴリーにはApacheウエブサーバーのモジュールが含まれています。
+	</longdescription>
+	<longdescription lang="nl">
+		De www-apache categorie bevat modules voor de Apache webserver.
+	</longdescription>
+	<longdescription lang="sk">
+		Kategória www-apache obsahuje moduly pre webserver Apache.
+	</longdescription>
+	<longdescription lang="vi">
+		Nhóm www-apache chứa các module cho Apache server.
+	</longdescription>
+	<longdescription lang="it">
+		La categoria www-apache contiene moduli per il web server Apache.
+	</longdescription>
+	<longdescription lang="pt">
+		A categoria www-apache contém certos módulos para o servidor de
+		web Apache.
+	</longdescription>
+	<longdescription lang="pl">
+		Kategoria www-apache zawiera moduły serwera Apache.
+	</longdescription>
+</catmetadata>
+
diff --git a/www-apache/mod_access_dnsbl/Manifest b/www-apache/mod_access_dnsbl/Manifest
new file mode 100644
index 000000000000..d504c718270a
--- /dev/null
+++ b/www-apache/mod_access_dnsbl/Manifest
@@ -0,0 +1,6 @@
+AUX 10_mod_access_dnsbl.conf 257 SHA256 4ceeb192a40e53085a10fd963719ce7ee63511b748f3af67f223580171d4c241 SHA512 e64857e36dbc08547fb85d3543fb9e0d76a93dc6a670ba74daff1b2a4cccc0bc072fe8f4b808eadab16af9b3d264ed57b61c812b8060321b6e8a24862712d3ed WHIRLPOOL e37ece6361cc5dd88a41408797e41a82b243057e85fd4225b0a2d0a88b731bab22a4579e07e63a605c997882c7fe17c12abefa1baf50c412a0d155a755fa4eec
+DIST mod_access_dnsbl-0.02.tar.gz 3648 SHA256 9f2aba05c8a026866529f7e51d2035e288eb184a46cfc7ecacb6548a2b279bce SHA512 5d4217798f2fdced4e6bac55187edfb8534ce4db85a0ca7d3e5a832b962ea12df8ad47284e4f29f9ce5029bd26ffafc403cf3b8cb566d1a108168162a68682f6 WHIRLPOOL 97900fb78d851bab84635a5bb955e586e5b0f6390b49ff7d2a9bab5f05dd865c50c4332e81aa68ed73bf9ae0b071a236bb0a0edcabf7f61a75cf4d43cf87a718
+EBUILD mod_access_dnsbl-0.02.ebuild 516 SHA256 cf6e50c37638340f58810b186ea2f6f678a3a47705fb76d0e33543daba9cbf4c SHA512 4691e944c707b49918f48b077e0199b163da14fe7cae1e1bb6d213b7f354369ca3b8853683440d2ae6de968bb8178be4d08ba8375b3a424a666385dfc3c72835 WHIRLPOOL 4e346d87ee7aa061ddfc61aa3f8e2374ce22f70413ab04673a4d7c93401a73d8f2af73d3ec08443c0a9f2001cbb7d7b8dd687898fe5f338e9843e7fd8a71302e
+MISC ChangeLog 2584 SHA256 0feac74721bf4fc9cfa1232902fd035e5344a2af2982783be010e46a9477eea4 SHA512 e60054f906229504b800bfb8a2f1dd3f23de66b095f109f6ae8b7b1a9b9a40391288f970dec0466b37f3b80a2feb33073bf427decdbafe968fbd3556cf72c941 WHIRLPOOL fce5aeecf983f64185bbe50701d1dc4a033698b8ad9f282398dcdbaa561d6a4c338d564100b38bd277bfb370295b95df41baf3b47d432d097320a22a101f3603
+MISC ChangeLog-2015 1159 SHA256 59cb6350ab7ce3ee6ae600a70a4d2b027a9e2164b32e9f9347937e33a8092a29 SHA512 5678a8205d59425f2a778eaa59490263b155ec84c6517bca4f3897f13e8a9a0c215090dd975bf0e0f5a5d43d3f19718c2aaf496e1c12c49491387bae0f005ecd WHIRLPOOL ef297eb5b5b1a87b4840d7a25969729e71c97d30e188d54a739d1296b85b4a6b29e43ace0473b6487ff7dbe43674b1e98316b6baac1273ed55857b77c18b604e
+MISC metadata.xml 166 SHA256 2caff447f5bd2701d8456ada5cc633c41ef4373fa4bfeabeb73599d40bcc941b SHA512 a56648c974a1d14dd4c18237532773c72057a13ab90c58b5da04f185e3c12a8bd8d5c21fb06053507f31766291a82dc7d87b34cd65fd94cfe2af7295c813ef84 WHIRLPOOL 1ff70497eca6531f0e0614c72a19f4b8e5ff486a58d369f4f0b36308d1d6b01168f9da887740e3b9f536236be251d3fe05f904d27a9233a7cf613416ba882968
diff --git a/www-apache/mod_access_dnsbl/files/10_mod_access_dnsbl.conf b/www-apache/mod_access_dnsbl/files/10_mod_access_dnsbl.conf
new file mode 100644
index 000000000000..7e9419e97fd1
--- /dev/null
+++ b/www-apache/mod_access_dnsbl/files/10_mod_access_dnsbl.conf
@@ -0,0 +1,11 @@
+<IfDefine DNSBL>
+LoadModule access_dnsbl_module  modules/mod_access_dnsbl.so
+
+# example configuration:
+#<Directory /var/www/localhost/htdocs/protected>
+#	DNSBLOrder allow,deny
+#	DNSBLDeny from spammers
+#</Directory>
+</IfDefine>
+
+# vim: ts=4 filetype=apache
diff --git a/www-apache/mod_access_dnsbl/metadata.xml b/www-apache/mod_access_dnsbl/metadata.xml
new file mode 100644
index 000000000000..6f49eba8f496
--- /dev/null
+++ b/www-apache/mod_access_dnsbl/metadata.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<!-- maintainer-needed -->
+</pkgmetadata>
diff --git a/www-apache/mod_access_dnsbl/mod_access_dnsbl-0.02.ebuild b/www-apache/mod_access_dnsbl/mod_access_dnsbl-0.02.ebuild
new file mode 100644
index 000000000000..1b09a51ceb29
--- /dev/null
+++ b/www-apache/mod_access_dnsbl/mod_access_dnsbl-0.02.ebuild
@@ -0,0 +1,23 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+inherit apache-module
+
+DESCRIPTION="Specify access controls based on DNSBL zones"
+HOMEPAGE="http://www.apacheconsultancy.com/modules/${PN}/"
+SRC_URI="http://www.apacheconsultancy.com/modules/${PN}/${P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+DEPEND="www-apache/mod_dnsbl_lookup"
+RDEPEND="${DEPEND}"
+
+APACHE2_MOD_CONF="10_${PN}"
+APACHE2_MOD_DEFINE="DNSBL"
+
+need_apache2
diff --git a/www-apache/mod_auth_kerb/Manifest b/www-apache/mod_auth_kerb/Manifest
new file mode 100644
index 000000000000..3ed95512a686
--- /dev/null
+++ b/www-apache/mod_auth_kerb/Manifest
@@ -0,0 +1,16 @@
+AUX 11_mod_auth_kerb.conf 338 SHA256 6e07afc54b27fe6947bfdf32ac55d01f9df3deba1015078ac98a52381eabdb62 SHA512 82ea692ed8189bb3255347d5d7829f84c8b3edc66e9d99c974f9c8ed56227a60b8925eee11f027fbd694ef1be8d09ff3f4b92e96cd68a77cea84e6e237048c53 WHIRLPOOL d778c16f29ee4e9b0ffba179f2d8a171e0064469f96e605fa1097157695ea6ba957f58af87bf572ce087b38b2628a69f4f42741e2bd6d6f104538c19ca95459d
+AUX mod_auth_kerb-5.4-cachedir.patch 608 SHA256 570c9144c442ee6ef5e7cb6f6f0e7aa645fceb0693e53aa91274ac6bf397f10c SHA512 8dbb61a84fa7fb76787f71de9c70f4d41b0dd1245eff594131f1569a64331ea3bcb055d0dba178eeee71e2a125fae649561009a43b9f81c1eac08eb912dd4400 WHIRLPOOL b45bdc2f9b347356d1299ab453c37bea01865c94b7a7aac7eb93ee495ee286d0777cbd8351b1c7c8b491f4746c8d1bf783fe832b9698f2394df83454bdb9c0d2
+AUX mod_auth_kerb-5.4-delegation.patch 2589 SHA256 1c4625e1de2904957ac156df220d8d6898d89cdc4712772bd02e564673bb87b9 SHA512 c0193da69cc5a77bf4099f45e981a97af1ce1f4ca2d989aa18421aff285e9ac5693422d3755f15157cb2161af49960a6c16d773a2a60f1dcca30a73703422b7f WHIRLPOOL 5182f41e05cce675bb2aeae85ba76c4128f620067a34291fed450112cc4cf77c2635359ef18a6d6f501aa92b40d265d480fd2ea4a25207049277af2354478d7d
+AUX mod_auth_kerb-5.4-fixes.patch 1098 SHA256 1f9a21ff56473783c27cf69d78bb0618768447c71749522e39ba83c727c81335 SHA512 4881deb0accbd1ebff88a210036f2c66d443625727580ca25a8a403a96a8fa39edc2a01769584a474d1a1dbf028438a754319c3e318b2bef9114db754d542112 WHIRLPOOL 3685d3934e3a5032fafc5acae83f5574e6f493530f5d4a5c95cb8e982d6c5a1f7dc2bed0b5a6ec9004dc903c43fa80d7ee88bd60cbd5564481b80db7cd7902b1
+AUX mod_auth_kerb-5.4-handle-continue.patch 735 SHA256 24d1cc7f12be73a3f99f3943ac7171d9a87d1bb959a3d7f225e9f92109f7964d SHA512 583a10d7790987e50a9ac7c602466007f38469b38f7d3da8761c342c8ba900a18b4ff800cd2b4e82bfdb3927f14fbf09c0684b315f08e4b9604068d8a29442d8 WHIRLPOOL 86401b48be24fdd06c10ffe8bc28f74888219002b26b7919622864c0a53141e48d7db59dc7ed980dfee9290a28c2cafbe83ecfc8e05854ce967f93dcd0a54a98
+AUX mod_auth_kerb-5.4-heimdal.patch 346 SHA256 0753e55546ecd1f8843a9c350aac9e6f0012f1145bc7845947e07cb0f6a9194f SHA512 27d82783e677ec238189e5ff7844529e433502e435afcf8cfc59c3a6b2b49083c5cdb339d87316b18874057f59b43a9f08bcc1fc6863e27fe7f5ce6307db46e7 WHIRLPOOL 5bf0626a72b3639b1819fd531a216585e946d778325e1f2d0b17b29c41ef983db7793594d274c674ce035c070ff8b5be63450c6231983a7d7d5891da74cb6381
+AUX mod_auth_kerb-5.4-httpd24.patch 2622 SHA256 b98c3a8720fac455f1cf78d1bf4219aef0bc49ce269d79de783db6401bed2668 SHA512 739ffc704286630af557487f93f9cbb0786ab62401fcf20b0d22dcc991388a0691bb94422f80db9fa85bfe926b28bbf96dcb5149e48118f978a38aff52856bf7 WHIRLPOOL 6c8fafa301d041b7d7816122511df9243a6f5bb947c219d35618eafcbedffb576fdff7f4a368f6ecd27eae1222f3449731baee44caa9b46757f5e0b074a16ffa
+AUX mod_auth_kerb-5.4-longuser.patch 1007 SHA256 3de2bdab5980381ba8a65f4f04931edddf1ff35f345a30ea65383a7368e01f8b SHA512 0ffd82fddb6bd9eff466c7a11f5221c5006814e8ca99aef1de48dae4537ce0d11c718506d84be572f116e74d10bb9031021ddc17a65bfc86e42edbaf77063617 WHIRLPOOL 307cef9246fe5ecdf62730898798e1af4beb2f55ff5d27017562d8f53398233cc66b9f035fa3281e47702ae2bd9ea967d28f2f71274a2a60565417c5721599c3
+AUX mod_auth_kerb-5.4-rcopshack.patch 2244 SHA256 813ad49f9c0aa8495e716a7ed902bfcef4282cb10793112ad0e92b667620e33c SHA512 4da4e51baec036fdf035ee6f215453129b4b93a7733887834c08c0c5a7610ebe8e0981ad34a5cd5ed86af58c926bd65417fe09f64ce42d56b41e5051b96f6ca5 WHIRLPOOL 18ee97dc4bab314b1943778c74c660878a8477520e5cad69e78d0e2b2c39076254cd81973987e42ee1ed8b113dcee4949b81de0976f7e4d025e29753cd952b3a
+AUX mod_auth_kerb-5.4-s4u2proxy.patch 20821 SHA256 e23924f9c3424f535cd244e88a775dfcb6dae728a39d4fd86e775a057fed4463 SHA512 077230aa39efa52b31ed289edabc4fcfe5887fa249fcc6fdab82e1e7ac1f996bad6e04991ee7ce4c139b4cb1a411a365a710e47a6f1d6b7634914640227c7bc9 WHIRLPOOL 9eb0ad364e60335a0389390b5a258ee75da5089a9007db5e8bea5cfbce1e57fabb7145fb42582d25d90bae9453ded056aaf8d8a39d19b726b16a197532e7d301
+AUX mod_auth_kerb.conf 40 SHA256 d807aa047581efc57df9737d6313a50e0e6d1f7c87f71066cc4db7560575dceb SHA512 fd21cb7d6da1ac4ce5becab4e3c72a56245878625990ebddbf1d612a3b9cc273a6b3e87509db59ed67e934b5834c3db10914118982cb77a6b8220b0f65cd6e1d WHIRLPOOL 8e53b796562e6e6045a04a5b1f78949927660d79ac9b13335e0e386054020d6c59df2ad02d589eb621498688a9e058835ad87fdedf24753313a0ca6359d1a8a5
+DIST mod_auth_kerb-5.4.tar.gz 93033 SHA256 690ddd66c6d941e2fa2dada46588329a6f57d0a3b9b2fd9bf055ebc427558265 SHA512 93fdf0e43af1c24e8c8204d09240b708747068ef99dd8d21b45cb4d132d31e6d582d49ea5e23b905f55cb0d4a20b1ecb58de1bcbfdad1d016e536fc622b63214 WHIRLPOOL 1b92217b7cf66d731a72cf9d58f188002ccadd75fc3d9075290347e6b4f1511111d3cff147fab73616951cbdb9430e8038adf5c4e204d374886bec3be69ff51c
+EBUILD mod_auth_kerb-5.4-r2.ebuild 1113 SHA256 3cb7a94ff968c77de9732f290d2129ed875c8bf06c710a7e6989d7d04e6b3e9f SHA512 4eb53033a6f8ed7a8352c191af9619b6e5c383981c4fad1b92f81f70780673e28ebf276a81268f62ffc564cf4806bee6b57a23281c0917bb6057b94cc94d80ed WHIRLPOOL 72b28187340ce8c1d3daa011d27c706b12cc45b35b03b8f1750023377b53d9eb7eb940df786de0a9bcac8dd1451f4d75d81ed5fb7b3137155b00124c73c667d7
+MISC ChangeLog 3948 SHA256 9760cbfaffb0b7511e2194e454fce9007faae8e4d2f6cc4a3c3b918ef3579df5 SHA512 0928e2e233e840a165f26431870eb7b4b0d71df7a616f18360f5362692b5f2cf607c2d60f3bfde3c67e81254156d864e8d6c910d1329c346f55ad08165ddab98 WHIRLPOOL 40908fe1bfd0ad4304d8e86eed4214344e8891ee65d6ca2c9663e1e77fe5fcd4ad9b132d34a22dbb864b9fba4f378ce57253b98460cdef582682a6a47195fb87
+MISC ChangeLog-2015 7430 SHA256 2547eec2bd3ac5bf0819f600b44b0723bf40d66f88437a5bcb5f0fa617f674d6 SHA512 b7a9dab3427c39f647eb1e8eeb6187eaada17424cf4b9c67d5dbf21293f4b7eeb5aa27c6198a6e9063f0863112c882c90cfc80c691352a60eb278a34f153f1f3 WHIRLPOOL 3394a7727edf1ac8ee1d334999e3eb6af597a0c16994ef44f92d37f4c3ccb7ab0162c54e90d3d055e99cc54ca1ca142e4a10b6d0fdfa78a8a9d3a5ae51e9e3ec
+MISC metadata.xml 248 SHA256 9cdc0bd0462305a9cfe7da218b0fa9bc5c1c96da826c39a0840771422ce3b940 SHA512 f46a08a90200cc49b6389361c42fc1580504fcbb3ce3ce817916a6c6ae1c9b700f3dcbfa95e7b1284372c6cd5e51c7d93ea9076c5c26fa3b02f1ad7e1c053c36 WHIRLPOOL 399ed860a092dc9f6154c46ef396f816b507721446fc5713ed4d1cf33e9793ef05209ebd029f86295571f0ce89b5739cad9aac73d8d405b0610f9a57b7097f6d
diff --git a/www-apache/mod_auth_kerb/files/11_mod_auth_kerb.conf b/www-apache/mod_auth_kerb/files/11_mod_auth_kerb.conf
new file mode 100644
index 000000000000..e567274c7707
--- /dev/null
+++ b/www-apache/mod_auth_kerb/files/11_mod_auth_kerb.conf
@@ -0,0 +1,14 @@
+<IfDefine AUTH_KERB>
+LoadModule auth_kerb_module modules/mod_auth_kerb.so
+
+<Directory "/var/www/private">
+	AuthType Kerberos
+	AuthName "Kerberos Login"
+	# See the INSTALL file about howto create the keytab
+	Krb5Keytab conf/apache.keytab
+	KrbAuthRealms EXAMPLE.COM
+	Require valid-user
+</Directory>
+</IfDefine>
+
+# vim: ts=4 filetype=apache
diff --git a/www-apache/mod_auth_kerb/files/mod_auth_kerb-5.4-cachedir.patch b/www-apache/mod_auth_kerb/files/mod_auth_kerb-5.4-cachedir.patch
new file mode 100644
index 000000000000..ebc435824c4b
--- /dev/null
+++ b/www-apache/mod_auth_kerb/files/mod_auth_kerb-5.4-cachedir.patch
@@ -0,0 +1,15 @@
+
+Per https://bugzilla.redhat.com//show_bug.cgi?id=796430
+switch the cache dir to be relative to runtimedir.
+
+--- mod_auth_kerb-5.4/src/mod_auth_kerb.c.cachedir
++++ mod_auth_kerb-5.4/src/mod_auth_kerb.c
+@@ -891,7 +891,7 @@ create_krb5_ccache(krb5_context kcontext
+    int ret;
+    krb5_ccache tmp_ccache = NULL;
+ 
+-   ccname = apr_psprintf(r->connection->pool, "FILE:%s/krb5cc_apache_XXXXXX", P_tmpdir);
++   ccname = apr_pstrdup(r->connection->pool, "FILE:/run/httpd/krbcache/krb5cc_apache_XXXXXX");
+    fd = mkstemp(ccname + strlen("FILE:"));
+    if (fd < 0) {
+       log_rerror(APLOG_MARK, APLOG_ERR, 0, r,
diff --git a/www-apache/mod_auth_kerb/files/mod_auth_kerb-5.4-delegation.patch b/www-apache/mod_auth_kerb/files/mod_auth_kerb-5.4-delegation.patch
new file mode 100644
index 000000000000..a01e9f21e435
--- /dev/null
+++ b/www-apache/mod_auth_kerb/files/mod_auth_kerb-5.4-delegation.patch
@@ -0,0 +1,68 @@
+
+https://bugzilla.redhat.com/show_bug.cgi?id=688210
+
+--- mod_auth_kerb-5.4/src/mod_auth_kerb.c.delegation
++++ mod_auth_kerb-5.4/src/mod_auth_kerb.c
+@@ -209,6 +209,7 @@ typedef struct krb5_conn_data {
+ 	char *authline;
+ 	char *user;
+ 	char *mech;
++	char *ccname;
+ 	int  last_return;
+ } krb5_conn_data;
+ 
+@@ -875,7 +876,7 @@ create_krb5_ccache(krb5_context kcontext
+    int ret;
+    krb5_ccache tmp_ccache = NULL;
+ 
+-   ccname = apr_psprintf(r->pool, "FILE:%s/krb5cc_apache_XXXXXX", P_tmpdir);
++   ccname = apr_psprintf(r->connection->pool, "FILE:%s/krb5cc_apache_XXXXXX", P_tmpdir);
+    fd = mkstemp(ccname + strlen("FILE:"));
+    if (fd < 0) {
+       log_rerror(APLOG_MARK, APLOG_ERR, 0, r,
+@@ -905,7 +906,7 @@ create_krb5_ccache(krb5_context kcontext
+    }
+ 
+    apr_table_setn(r->subprocess_env, "KRB5CCNAME", ccname);
+-   apr_pool_cleanup_register(r->pool, ccname, krb5_cache_cleanup,
++   apr_pool_cleanup_register(r->connection->pool, ccname, krb5_cache_cleanup,
+ 	 		     apr_pool_cleanup_null);
+ 
+    *ccache = tmp_ccache;
+@@ -1866,10 +1868,15 @@ already_succeeded(request_rec *r, char *
+    if (apr_pool_userdata_get((void**)&conn_data, keyname, r->connection->pool) != 0)
+ 	return NULL;
+ 
+-   if(conn_data) {
+-	if(strcmp(conn_data->authline, auth_line) == 0) {
+-		log_rerror(APLOG_MARK, APLOG_DEBUG, 0, r, "matched previous auth request");
+-		return conn_data;
++   if(conn_data && conn_data->ccname != NULL) {
++       apr_finfo_t finfo;
++
++       if (apr_stat(&finfo, conn_data->ccname + strlen("FILE:"), 
++                    APR_FINFO_NORM, r->pool) == APR_SUCCESS
++           && (finfo.valid & APR_FINFO_TYPE)
++           && finfo.filetype == APR_REG) {
++           log_rerror(APLOG_MARK, APLOG_DEBUG, 0, r, "matched previous auth request");
++           return conn_data;
+ 	}
+    }
+    return NULL;
+@@ -2001,6 +2008,8 @@ kerb_authenticate_user(request_rec *r)
+ 	ret = prevauth->last_return;
+ 	MK_USER = prevauth->user;
+ 	MK_AUTH_TYPE = prevauth->mech;
++	if (prevauth->ccname)
++		apr_table_setn(r->subprocess_env, "KRB5CCNAME", prevauth->ccname);
+    }
+ 
+    /*
+@@ -2011,6 +2020,7 @@ kerb_authenticate_user(request_rec *r)
+        prevauth->user = apr_pstrdup(r->connection->pool, MK_USER);
+        prevauth->authline = apr_pstrdup(r->connection->pool, auth_line);
+        prevauth->mech = apr_pstrdup(r->connection->pool, auth_type);
++       prevauth->ccname = apr_pstrdup(r->connection->pool, apr_table_get(r->subprocess_env, "KRB5CCNAME"));
+        prevauth->last_return = ret;
+        snprintf(keyname, sizeof(keyname) - 1,
+            "mod_auth_kerb::connection::%s::%ld", 
diff --git a/www-apache/mod_auth_kerb/files/mod_auth_kerb-5.4-fixes.patch b/www-apache/mod_auth_kerb/files/mod_auth_kerb-5.4-fixes.patch
new file mode 100644
index 000000000000..b86be697ae06
--- /dev/null
+++ b/www-apache/mod_auth_kerb/files/mod_auth_kerb-5.4-fixes.patch
@@ -0,0 +1,40 @@
+
+Compiler warning fixes.
+
+--- mod_auth_kerb-5.4/src/mod_auth_kerb.c.fixes
++++ mod_auth_kerb-5.4/src/mod_auth_kerb.c
+@@ -677,7 +677,8 @@ end:
+ static krb5_error_code
+ verify_krb5_user(request_rec *r, krb5_context context, krb5_principal principal,
+       		 const char *password, krb5_principal server,
+-		 krb5_keytab keytab, int krb_verify_kdc, char *krb_service_name, krb5_ccache *ccache)
++		 krb5_keytab keytab, int krb_verify_kdc, 
++                 const char *krb_service_name, krb5_ccache *ccache)
+ {
+    krb5_creds creds;
+    krb5_get_init_creds_opt options;
+@@ -1280,6 +1281,7 @@ get_gss_creds(request_rec *r,
+    return 0;
+ }
+ 
++#ifndef GSSAPI_SUPPORTS_SPNEGO
+ static int
+ cmp_gss_type(gss_buffer_t token, gss_OID oid)
+ {
+@@ -1306,6 +1308,7 @@ cmp_gss_type(gss_buffer_t token, gss_OID
+ 
+    return memcmp(p, oid->elements, oid->length);
+ }
++#endif
+ 
+ static int
+ authenticate_user_gss(request_rec *r, kerb_auth_config *conf,
+@@ -1722,7 +1725,7 @@ kerb_authenticate_user(request_rec *r)
+    return ret;
+ }
+ 
+-int
++static int
+ have_rcache_type(const char *type)
+ {
+    krb5_error_code ret;
diff --git a/www-apache/mod_auth_kerb/files/mod_auth_kerb-5.4-handle-continue.patch b/www-apache/mod_auth_kerb/files/mod_auth_kerb-5.4-handle-continue.patch
new file mode 100644
index 000000000000..4b77a497f4ce
--- /dev/null
+++ b/www-apache/mod_auth_kerb/files/mod_auth_kerb-5.4-handle-continue.patch
@@ -0,0 +1,20 @@
+diff --git a/src/mod_auth_kerb.c b/src/mod_auth_kerb.c
+index 2aab5ee..ca81878 100644
+--- a/src/mod_auth_kerb.c
++++ b/src/mod_auth_kerb.c
+@@ -1744,7 +1744,6 @@ authenticate_user_gss(request_rec *r, kerb_auth_config *conf,
+      goto end;
+   }
+ 
+-#if 0
+   /* This is a _Kerberos_ module so multiple authentication rounds aren't
+    * supported. If we wanted a generic GSS authentication we would have to do
+    * some magic with exporting context etc. */
+@@ -1752,7 +1751,6 @@ authenticate_user_gss(request_rec *r, kerb_auth_config *conf,
+      ret = HTTP_UNAUTHORIZED;
+      goto end;
+   }
+-#endif
+ 
+   major_status = gss_display_name(&minor_status, client_name, &output_token, NULL);
+   gss_release_name(&minor_status, &client_name); 
diff --git a/www-apache/mod_auth_kerb/files/mod_auth_kerb-5.4-heimdal.patch b/www-apache/mod_auth_kerb/files/mod_auth_kerb-5.4-heimdal.patch
new file mode 100644
index 000000000000..a5d3d4ba62cd
--- /dev/null
+++ b/www-apache/mod_auth_kerb/files/mod_auth_kerb-5.4-heimdal.patch
@@ -0,0 +1,10 @@
+--- mod_auth_kerb-5.4/src/mod_auth_kerb.c	2010-10-04 16:21:22.169285716 +0200
++++ mod_auth_kerb-5.4.new/src/mod_auth_kerb.c	2010-10-04 16:20:41.584250095 +0200
+@@ -89,6 +89,7 @@
+ #include <krb5.h>
+ #ifdef HEIMDAL
+ #  include <gssapi.h>
++#  include <gssapi/gssapi_krb5.h>
+ #else
+ #  include <gssapi/gssapi.h>
+ #  include <gssapi/gssapi_generic.h>
diff --git a/www-apache/mod_auth_kerb/files/mod_auth_kerb-5.4-httpd24.patch b/www-apache/mod_auth_kerb/files/mod_auth_kerb-5.4-httpd24.patch
new file mode 100644
index 000000000000..86c9b47d6bd3
--- /dev/null
+++ b/www-apache/mod_auth_kerb/files/mod_auth_kerb-5.4-httpd24.patch
@@ -0,0 +1,75 @@
+
+Fixes for 2.4 API.
+
+--- mod_auth_kerb-5.4/src/mod_auth_kerb.c.httpd24
++++ mod_auth_kerb-5.4/src/mod_auth_kerb.c
+@@ -179,6 +179,16 @@ static apr_global_mutex_t *s4u2proxy_loc
+ #define PROXYREQ_PROXY STD_PROXY
+ #endif
+ 
++#if MODULE_MAGIC_NUMBER_MAJOR >= 20100606
++/* 2.4.x or later */
++#define WITH_HTTPD24 1
++#define client_ip(r) ((r)->useragent_ip)
++APLOG_USE_MODULE(auth_kerb);
++#else
++#define client_ip(r) ((r)->connection->remote_ip)
++#define ap_unixd_set_global_mutex_perms unixd_set_global_mutex_perms
++#endif
++
+ /*************************************************************************** 
+  Auth Configuration Structure
+  ***************************************************************************/
+@@ -383,7 +393,11 @@ cmd_delegationlock(cmd_parms *cmd, void
+ }
+ 
+ static void
+-log_rerror(const char *file, int line, int level, int status,
++log_rerror(const char *file, int line, 
++#ifdef WITH_HTTPD24
++	   int module_index,
++#endif
++	   int level, int status,
+            const request_rec *r, const char *fmt, ...)
+ {
+    char errstr[1024];
+@@ -394,7 +408,9 @@ log_rerror(const char *file, int line, i
+    va_end(ap);
+ 
+    
+-#ifdef STANDARD20_MODULE_STUFF
++#if defined(WITH_HTTPD24)
++   ap_log_rerror(file, line, module_index, level, status, r, "%s", errstr);
++#elif defined(STANDARD20_MODULE_STUFF)
+    ap_log_rerror(file, line, level | APLOG_NOERRNO, status, r, "%s", errstr);
+ #else
+    ap_log_rerror(file, line, level | APLOG_NOERRNO, r, "%s", errstr);
+@@ -1860,8 +1876,8 @@ already_succeeded(request_rec *r, char *
+    char keyname[1024];
+ 
+    snprintf(keyname, sizeof(keyname) - 1,
+-	"mod_auth_kerb::connection::%s::%ld", r->connection->remote_ip, 
+-	r->connection->id);
++	    "mod_auth_kerb::connection::%s::%ld", client_ip(r), 
++	    r->connection->id);
+ 
+    if (apr_pool_userdata_get((void**)&conn_data, keyname, r->connection->pool) != 0)
+ 	return NULL;
+@@ -2014,7 +2030,7 @@ kerb_authenticate_user(request_rec *r)
+        prevauth->last_return = ret;
+        snprintf(keyname, sizeof(keyname) - 1,
+            "mod_auth_kerb::connection::%s::%ld", 
+-	   r->connection->remote_ip, r->connection->id);
++		client_ip(r), r->connection->id);
+        apr_pool_userdata_set(prevauth, keyname, NULL, r->connection->pool);
+    }
+ 
+@@ -2073,7 +2089,7 @@ s4u2proxylock_create(server_rec *s, apr_
+     }
+ 
+ #ifdef AP_NEED_SET_MUTEX_PERMS
+-    rc = unixd_set_global_mutex_perms(s4u2proxy_lock);
++    rc = ap_unixd_set_global_mutex_perms(s4u2proxy_lock);
+     if (rc != APR_SUCCESS) {
+         ap_log_error(APLOG_MARK, APLOG_CRIT, rc, s,
+                      "mod_auth_kerb: Parent could not set permissions "
diff --git a/www-apache/mod_auth_kerb/files/mod_auth_kerb-5.4-longuser.patch b/www-apache/mod_auth_kerb/files/mod_auth_kerb-5.4-longuser.patch
new file mode 100644
index 000000000000..100fd364af85
--- /dev/null
+++ b/www-apache/mod_auth_kerb/files/mod_auth_kerb-5.4-longuser.patch
@@ -0,0 +1,31 @@
+
+https://bugzilla.redhat.com/show_bug.cgi?id=867153
+
+Patch by: jkaluza
+
+--- mod_auth_kerb-5.4/src/mod_auth_kerb.c.longuser
++++ mod_auth_kerb-5.4/src/mod_auth_kerb.c
+@@ -80,6 +80,7 @@
+ 
+ #define MECH_NEGOTIATE "Negotiate"
+ #define SERVICE_NAME "HTTP"
++#define MAX_LOCAL_USERNAME 255
+ 
+ #include <httpd.h>
+ #include <http_config.h>
+@@ -1815,13 +1816,13 @@ do_krb5_an_to_ln(request_rec *r) {
+ 		    krb5_get_err_text(kcontext, code));
+ 	   goto end;
+   }
+-  MK_USER_LNAME = apr_pcalloc(r->pool, strlen(MK_USER)+1);
++  MK_USER_LNAME = apr_pcalloc(r->pool, MAX_LOCAL_USERNAME+1);
+   if (MK_USER_LNAME == NULL) {
+      log_rerror(APLOG_MARK, APLOG_ERR, 0, r,
+ 	   	"ap_pcalloc() failed (not enough memory)");
+      goto end;
+   }
+-    code = krb5_aname_to_localname(kcontext, client, strlen(MK_USER), MK_USER_LNAME);
++    code = krb5_aname_to_localname(kcontext, client, MAX_LOCAL_USERNAME, MK_USER_LNAME);
+     if (code) {
+ 		  if (code != KRB5_LNAME_NOTRANS) {
+       			log_rerror(APLOG_MARK, APLOG_ERR, 0, r,
diff --git a/www-apache/mod_auth_kerb/files/mod_auth_kerb-5.4-rcopshack.patch b/www-apache/mod_auth_kerb/files/mod_auth_kerb-5.4-rcopshack.patch
new file mode 100644
index 000000000000..abbf4dba47b2
--- /dev/null
+++ b/www-apache/mod_auth_kerb/files/mod_auth_kerb-5.4-rcopshack.patch
@@ -0,0 +1,73 @@
+
+Remove the Krb5 1.3.x-specific hack which mucks about with
+libkrb5 internals, and shouldn't.
+
+--- mod_auth_kerb-5.4/src/mod_auth_kerb.c.rcopshack
++++ mod_auth_kerb-5.4/src/mod_auth_kerb.c
+@@ -285,34 +285,6 @@ mkstemp(char *template)
+ }
+ #endif
+ 
+-#if defined(KRB5) && !defined(HEIMDAL)
+-/* Needed to work around problems with replay caches */
+-#include "mit-internals.h"
+-
+-/* This is our replacement krb5_rc_store function */
+-static krb5_error_code KRB5_LIB_FUNCTION
+-mod_auth_kerb_rc_store(krb5_context context, krb5_rcache rcache,
+-                       krb5_donot_replay_internal *donot_replay)
+-{
+-   return 0;
+-}
+-
+-/* And this is the operations vector for our replay cache */
+-const krb5_rc_ops_internal mod_auth_kerb_rc_ops = {
+-  0,
+-  "dfl",
+-  krb5_rc_dfl_init,
+-  krb5_rc_dfl_recover,
+-  krb5_rc_dfl_destroy,
+-  krb5_rc_dfl_close,
+-  mod_auth_kerb_rc_store,
+-  krb5_rc_dfl_expunge,
+-  krb5_rc_dfl_get_span,
+-  krb5_rc_dfl_get_name,
+-  krb5_rc_dfl_resolve
+-};
+-#endif
+-
+ /*************************************************************************** 
+  Auth Configuration Initialization
+  ***************************************************************************/
+@@ -1252,31 +1224,6 @@ get_gss_creds(request_rec *r,
+       return HTTP_INTERNAL_SERVER_ERROR;
+    }
+ 
+-#ifndef HEIMDAL
+-   /*
+-    * With MIT Kerberos 5 1.3.x the gss_cred_id_t is the same as
+-    * krb5_gss_cred_id_t and krb5_gss_cred_id_rec contains a pointer to
+-    * the replay cache.
+-    * This allows us to override the replay cache function vector with
+-    * our own one.
+-    * Note that this is a dirty hack to get things working and there may
+-    * well be unknown side-effects.
+-    */
+-   {
+-      krb5_gss_cred_id_t gss_creds = (krb5_gss_cred_id_t) *server_creds;
+-
+-      /* First we try to verify we are linked with 1.3.x to prevent from
+-         crashing when linked with 1.4.x */
+-      if (gss_creds && (gss_creds->usage == GSS_C_ACCEPT)) {
+-	 if (gss_creds->rcache && gss_creds->rcache->ops &&
+-	     gss_creds->rcache->ops->type &&  
+-	     memcmp(gss_creds->rcache->ops->type, "dfl", 3) == 0)
+-          /* Override the rcache operations */
+-	 gss_creds->rcache->ops = &mod_auth_kerb_rc_ops;
+-      }
+-   }
+-#endif
+-   
+    return 0;
+ }
+ 
diff --git a/www-apache/mod_auth_kerb/files/mod_auth_kerb-5.4-s4u2proxy.patch b/www-apache/mod_auth_kerb/files/mod_auth_kerb-5.4-s4u2proxy.patch
new file mode 100644
index 000000000000..07a6e3b7c8ef
--- /dev/null
+++ b/www-apache/mod_auth_kerb/files/mod_auth_kerb-5.4-s4u2proxy.patch
@@ -0,0 +1,601 @@
+
+Add S4U2Proxy feature:
+
+http://sourceforge.net/mailarchive/forum.php?thread_name=4EE665D1.3000308%40redhat.com&forum_name=modauthkerb-help
+
+The attached patches add support for using s4u2proxy 
+(http://k5wiki.kerberos.org/wiki/Projects/Services4User) to allow the 
+web service to obtain credentials on behalf of the authenticated user.
+
+The first patch adds basic support for s4u2proxy. This requires the web 
+administrator to manually create and manage the credentails cache for 
+the apache user (via a cron job, for example).
+
+The second patch builds on this and makes mod_auth_kerb manage the 
+ccache instead.
+
+These are patches against the current CVS HEAD (mod_auth_krb 5.4).
+
+I've added a new module option to enable this support, 
+KrbConstrainedDelegation. The default is off.
+
+diff -up --recursive mod_auth_kerb-5.4.orig/README mod_auth_kerb-5.4/README
+--- mod_auth_kerb-5.4.orig/README	2008-11-26 11:51:05.000000000 -0500
++++ mod_auth_kerb-5.4/README	2014-01-21 13:46:21.482223432 -0500
+@@ -122,4 +122,16 @@ KrbSaveCredentials, the tickets will be
+ credential cache that will be available for the request handler. The ticket
+ file will be removed after request is handled.
+ 
++Constrained Delegation
++----------------------
++S4U2Proxy, or constrained delegation, enables a service to use a client's
++ticket to itself to request another ticket for delegation. The KDC
++checks krbAllowedToDelegateTo to decide if it will issue a new ticket.
++If KrbConstrainedDelegation is enabled the server will use its own credentials
++to retrieve a delegated ticket for the user. For this to work the user must
++have a forwardable ticket (though the delegation flag need not be set).
++The server needs a valid credentials cache for this to work.
++
++The module itself will obtain and manage the necessary credentials.
++
+ $Id: README,v 1.12 2008/09/17 14:01:55 baalberith Exp $
+diff -up --recursive mod_auth_kerb-5.4.orig/src/mod_auth_kerb.c mod_auth_kerb-5.4/src/mod_auth_kerb.c
+--- mod_auth_kerb-5.4.orig/src/mod_auth_kerb.c	2014-01-21 13:45:21.605538007 -0500
++++ mod_auth_kerb-5.4/src/mod_auth_kerb.c	2014-01-21 13:46:46.746668762 -0500
+@@ -42,6 +42,31 @@
+  * POSSIBILITY OF SUCH DAMAGE.
+  */
+ 
++/*
++ * Locking mechanism inspired by mod_rewrite.
++ *
++ * Licensed to the Apache Software Foundation (ASF) under one or more
++ * contributor license agreements.  See the NOTICE file distributed with
++ * this work for additional information regarding copyright ownership.
++ * The ASF licenses this file to You under the Apache License, Version 2.0
++ * (the "License"); you may not use this file except in compliance with
++ * the License.  You may obtain a copy of the License at
++ *
++ *     http://www.apache.org/licenses/LICENSE-2.0
++ *
++ * Unless required by applicable law or agreed to in writing, software
++ * distributed under the License is distributed on an "AS IS" BASIS,
++ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
++ * See the License for the specific language governing permissions and
++ * limitations under the License.
++ */
++
++/*
++ * S4U2Proxy code
++ *
++ * Copyright (C) 2012  Red Hat
++ */
++
+ #ident "$Id: mod_auth_kerb.c,v 1.150 2008/12/04 10:14:03 baalberith Exp $"
+ 
+ #include "config.h"
+@@ -49,6 +74,7 @@
+ #include <stdlib.h>
+ #include <stdio.h>
+ #include <stdarg.h>
++#include <unixd.h>
+ 
+ #define MODAUTHKERB_VERSION "5.4"
+ 
+@@ -131,6 +157,12 @@ module AP_MODULE_DECLARE_DATA auth_kerb_
+ module auth_kerb_module;
+ #endif
+ 
++#ifdef STANDARD20_MODULE_STUFF
++/* s4u2proxy only supported in 2.0+ */
++static const char *lockname;
++static apr_global_mutex_t *s4u2proxy_lock = NULL;
++#endif
++
+ /*************************************************************************** 
+  Macros To Ease Compatibility
+  ***************************************************************************/
+@@ -165,6 +197,7 @@ typedef struct {
+ 	int krb_method_gssapi;
+ 	int krb_method_k5pass;
+ 	int krb5_do_auth_to_local;
++       int krb5_s4u2proxy;
+ #endif
+ #ifdef KRB4
+ 	char *krb_4_srvtab;
+@@ -185,6 +218,11 @@ set_kerb_auth_headers(request_rec *r, co
+ 
+ static const char*
+ krb5_save_realms(cmd_parms *cmd, void *sec, const char *arg);
++static const char *
++cmd_delegationlock(cmd_parms *cmd, void *dconf, const char *a1);
++
++static int
++obtain_server_credentials(request_rec *r, const char *service_name);
+ 
+ #ifdef STANDARD20_MODULE_STUFF
+ #define command(name, func, var, type, usage)           \
+@@ -237,6 +275,12 @@ static const command_rec kerb_auth_cmds[
+ 
+    command("KrbLocalUserMapping", ap_set_flag_slot, krb5_do_auth_to_local,
+      FLAG, "Set to 'on' to have Kerberos do auth_to_local mapping of principal names to system user names."),
++
++   command("KrbConstrainedDelegation", ap_set_flag_slot, krb5_s4u2proxy,
++     FLAG, "Set to 'on' to have Kerberos use S4U2Proxy delegation."),
++
++    AP_INIT_TAKE1("KrbConstrainedDelegationLock", cmd_delegationlock, NULL,
++     RSRC_CONF, "the filename of a lockfile used for inter-process synchronization"),
+ #endif 
+ 
+ #ifdef KRB4
+@@ -302,6 +346,7 @@ static void *kerb_dir_create_config(MK_P
+ #endif
+ #ifdef KRB5
+   ((kerb_auth_config *)rec)->krb5_do_auth_to_local = 0;
++	((kerb_auth_config *)rec)->krb5_s4u2proxy = 0;
+ 	((kerb_auth_config *)rec)->krb_method_k5pass = 1;
+ 	((kerb_auth_config *)rec)->krb_method_gssapi = 1;
+ #endif
+@@ -319,6 +364,24 @@ krb5_save_realms(cmd_parms *cmd, void *v
+    return NULL;
+ }
+ 
++static const char *
++cmd_delegationlock(cmd_parms *cmd, void *dconf, const char *a1)
++{
++    const char *error;
++
++    if ((error = ap_check_cmd_context(cmd, GLOBAL_ONLY)) != NULL)
++        return error;
++
++    /* fixup the path, especially for s4u2proxylock_remove() */
++    lockname = ap_server_root_relative(cmd->pool, a1);
++
++    if (!lockname) {
++        return apr_pstrcat(cmd->pool, "Invalid KrbConstrainedDelegationLock path ", a1, NULL);
++    }
++
++    return NULL;
++}
++
+ static void
+ log_rerror(const char *file, int line, int level, int status,
+            const request_rec *r, const char *fmt, ...)
+@@ -1170,6 +1233,7 @@ get_gss_creds(request_rec *r,
+    gss_buffer_desc token = GSS_C_EMPTY_BUFFER;
+    OM_uint32 major_status, minor_status, minor_status2;
+    gss_name_t server_name = GSS_C_NO_NAME;
++   gss_cred_usage_t usage = GSS_C_ACCEPT;
+    char buf[1024];
+    int have_server_princ;
+ 
+@@ -1212,10 +1276,14 @@ get_gss_creds(request_rec *r,
+ 
+    log_rerror(APLOG_MARK, APLOG_DEBUG, 0, r, "Acquiring creds for %s",
+ 	      token.value);
++   if (conf->krb5_s4u2proxy) {
++       usage = GSS_C_BOTH;
++       obtain_server_credentials(r, conf->krb_service_name);
++   }
+    gss_release_buffer(&minor_status, &token);
+    
+    major_status = gss_acquire_cred(&minor_status, server_name, GSS_C_INDEFINITE,
+-			           GSS_C_NO_OID_SET, GSS_C_ACCEPT,
++			           GSS_C_NO_OID_SET, usage,
+ 				   server_creds, NULL, NULL);
+    gss_release_name(&minor_status2, &server_name);
+    if (GSS_ERROR(major_status)) {
+@@ -1257,6 +1325,302 @@ cmp_gss_type(gss_buffer_t token, gss_OID
+ }
+ #endif
+ 
++/* Renew the ticket if it will expire in under a minute */
++#define RENEWAL_TIME 60
++
++/*
++ * Services4U2Proxy lets a server prinicipal request another service
++ * principal on behalf of a user. To do this the Apache service needs
++ * to have its own ccache. This will ensure that the ccache has a valid
++ * principal and will initialize or renew new credentials when needed.
++ */
++
++static int
++verify_server_credentials(request_rec *r,
++                          krb5_context kcontext,
++                          krb5_ccache ccache,
++                          krb5_principal princ,
++                          int *renew
++)
++{
++    krb5_creds match_cred;
++    krb5_creds creds;
++    char * princ_name = NULL;
++    char *tgs_princ_name = NULL;
++    krb5_timestamp now;
++    krb5_error_code kerr = 0;
++
++    *renew = 0;
++
++    memset (&match_cred, 0, sizeof(match_cred));
++    memset (&creds, 0, sizeof(creds));
++
++    if (NULL == ccache || NULL == princ) {
++        /* Nothing to verify */
++        *renew = 1;
++        goto cleanup;
++    }
++
++    if ((kerr = krb5_unparse_name(kcontext, princ, &princ_name))) {
++        log_rerror(APLOG_MARK, APLOG_ERR, 0, r,
++                   "Could not unparse principal %s (%d)",
++                   error_message(kerr), kerr);
++        goto cleanup;
++    }
++
++    log_rerror(APLOG_MARK, APLOG_DEBUG, 0, r,
++        "Using principal %s for s4u2proxy", princ_name);
++
++    tgs_princ_name = apr_psprintf(r->pool, "%s/%.*s@%.*s", KRB5_TGS_NAME,
++                                  krb5_princ_realm(kcontext, princ)->length,
++                                  krb5_princ_realm(kcontext, princ)->data,
++                                  krb5_princ_realm(kcontext, princ)->length,
++                                  krb5_princ_realm(kcontext, princ)->data);
++
++    if ((kerr = krb5_parse_name(kcontext, tgs_princ_name, &match_cred.server))) 
++    {
++        log_rerror(APLOG_MARK, APLOG_ERR, 0, r,
++                        "Could not parse principal %s: %s (%d)",
++                        tgs_princ_name, error_message(kerr), kerr);
++        goto cleanup;
++    }
++
++    match_cred.client = princ;
++
++    if ((kerr = krb5_cc_retrieve_cred(kcontext, ccache, 0, &match_cred, &creds)))
++    {
++        krb5_unparse_name(kcontext, princ, &princ_name);
++        log_rerror(APLOG_MARK, APLOG_DEBUG, 0, r,
++                   "Could not unparse principal %s: %s (%d)",
++                   princ_name, error_message(kerr), kerr);
++        goto cleanup;
++    }
++
++    if ((kerr = krb5_timeofday(kcontext, &now))) {
++        log_rerror(APLOG_MARK, APLOG_ERR, 0, r,
++                        "Could not get current time: %d (%s)",
++                        kerr, error_message(kerr));
++        goto cleanup;
++    }
++
++    if (now > (creds.times.endtime + RENEWAL_TIME)) {
++        log_rerror(APLOG_MARK, APLOG_ERR, 0, r,
++                   "Credentials for %s have expired or will soon "
++                   "expire - now %d endtime %d",
++                   princ_name, now, creds.times.endtime);
++        *renew = 1;
++    } else {
++        log_rerror(APLOG_MARK, APLOG_DEBUG, 0, r,
++                   "Credentials for %s will expire at "
++                   "%d, it is now %d", princ_name, creds.times.endtime, now);
++    }
++
++cleanup:
++    /* Closing context, ccache, etc happens elsewhere */
++    if (match_cred.server) {
++        krb5_free_principal(kcontext, match_cred.server);
++    }
++    if (creds.client) {
++        krb5_free_cred_contents(kcontext, &creds);
++    }
++
++    return kerr;
++}
++
++static int
++obtain_server_credentials(request_rec *r,
++                          const char *service_name)
++{
++    krb5_context kcontext = NULL;
++    krb5_keytab keytab = NULL;
++    krb5_ccache ccache = NULL;
++    char * princ_name = NULL;
++    char *tgs_princ_name = NULL;
++    krb5_error_code kerr = 0;
++    krb5_principal princ = NULL;
++    krb5_creds creds;
++    krb5_get_init_creds_opt gicopts;
++    int renew = 0;
++    apr_status_t rv = 0;
++
++    memset(&creds, 0, sizeof(creds));
++
++    if ((kerr = krb5_init_context(&kcontext))) {
++        log_rerror(APLOG_MARK, APLOG_ERR, 0, r,
++            "Kerberos context initialization failed: %s (%d)", error_message(kerr), kerr);
++        goto done;
++    }
++
++    if ((kerr = krb5_cc_default(kcontext, &ccache))) {
++        log_rerror(APLOG_MARK, APLOG_ERR, 0, r,
++                        "Could not get default Kerberos ccache: %s (%d)",
++                        error_message(kerr), kerr);
++        goto done;
++    }
++
++    if ((kerr = krb5_cc_get_principal(kcontext, ccache, &princ))) {
++        char * name = NULL;
++
++        if ((asprintf(&name, "%s:%s", krb5_cc_get_type(kcontext, ccache),
++          krb5_cc_get_name(kcontext, ccache))) == -1) {
++            kerr = KRB5_CC_NOMEM;
++            goto done;
++        }
++
++        if (KRB5_FCC_NOFILE == kerr) {
++            log_rerror(APLOG_MARK, APLOG_DEBUG, 0, r,
++                       "Credentials cache %s not found, create one", name);
++            krb5_cc_close(kcontext, ccache);
++            ccache = NULL;
++            free(name);
++        } else {
++            log_rerror(APLOG_MARK, APLOG_ERR, 0, r,
++                       "Failure to open credentials cache %s: %s (%d)",
++                       name, error_message(kerr), kerr);
++            free(name);
++            goto done;
++        }
++    }
++
++    kerr = verify_server_credentials(r, kcontext, ccache, princ, &renew);
++
++    if (kerr || !renew) {
++        goto done;
++    }
++
++#ifdef STANDARD20_MODULE_STUFF
++    if (s4u2proxy_lock) {
++        rv = apr_global_mutex_lock(s4u2proxy_lock);
++        if (rv != APR_SUCCESS) {
++            ap_log_rerror(APLOG_MARK, APLOG_ERR, rv, r,
++                          "apr_global_mutex_lock(s4u2proxy_lock) "
++                          "failed");
++        }
++    }
++#endif
++
++    /* We have the lock, check again to be sure another process hasn't already
++     * renewed the ticket.
++     */
++    kerr = verify_server_credentials(r, kcontext, ccache, princ, &renew);
++    if (kerr || !renew) {
++        goto unlock;
++    }
++
++    if (NULL == princ) {
++        if (strchr(service_name, '/') != NULL)
++           kerr = krb5_parse_name(kcontext, service_name, &princ);
++        else
++           kerr = krb5_sname_to_principal(kcontext, ap_get_server_name(r),
++                                         (service_name) ? service_name : SERVICE_NAME,
++                                         KRB5_NT_SRV_HST, &princ);
++
++        if (kerr) {
++            log_rerror(APLOG_MARK, APLOG_ERR, 0, r,
++                       "Could not parse principal: %s (%d) ",
++                       error_message(kerr), kerr);
++            goto unlock;
++        }
++
++        if ((kerr = krb5_unparse_name(kcontext, princ, &princ_name))) {
++            log_rerror(APLOG_MARK, APLOG_DEBUG, 0, r,
++                       "Could not unparse principal %s: %s (%d)",
++                       princ_name, error_message(kerr), kerr);
++        }
++    } else if (NULL == princ_name) {
++        if ((kerr = krb5_unparse_name(kcontext, princ, &princ_name))) {
++            log_rerror(APLOG_MARK, APLOG_DEBUG, 0, r,
++                       "Could not unparse principal %s: %s (%d)",
++                       princ_name, error_message(kerr), kerr);
++            goto unlock;
++        }
++    }
++
++    if ((kerr = krb5_kt_default(kcontext, &keytab))) {
++        log_rerror(APLOG_MARK, APLOG_ERR, 0, r,
++                   "Unable to get default keytab: %s (%d)",
++                   error_message(kerr), kerr);
++        goto unlock;
++    }
++
++    log_rerror(APLOG_MARK, APLOG_DEBUG, 0, r,
++               "Obtaining new credentials for %s", princ_name);
++    krb5_get_init_creds_opt_init(&gicopts);
++    krb5_get_init_creds_opt_set_forwardable(&gicopts, 1);
++
++    tgs_princ_name = apr_psprintf(r->pool, "%s/%.*s@%.*s", KRB5_TGS_NAME,
++                                  krb5_princ_realm(kcontext, princ)->length,
++                                  krb5_princ_realm(kcontext, princ)->data,
++                                  krb5_princ_realm(kcontext, princ)->length,
++                                  krb5_princ_realm(kcontext, princ)->data);
++
++    if ((kerr = krb5_get_init_creds_keytab(kcontext, &creds, princ, keytab,
++         0, tgs_princ_name, &gicopts))) {
++        log_rerror(APLOG_MARK, APLOG_ERR, 0, r,
++                   "Failed to obtain credentials for principal %s: "
++                   "%s (%d)", princ_name, error_message(kerr), kerr);
++        goto unlock;
++    }
++
++    krb5_kt_close(kcontext, keytab);
++    keytab = NULL;
++
++    if (NULL == ccache) {
++        if ((kerr = krb5_cc_default(kcontext, &ccache))) {
++            log_rerror(APLOG_MARK, APLOG_ERR, 0, r,
++                      "Failed to open default ccache: %s (%d)",
++                      error_message(kerr), kerr);
++            goto unlock;
++        }
++    }
++
++    if ((kerr = krb5_cc_initialize(kcontext, ccache, princ))) {
++        log_rerror(APLOG_MARK, APLOG_ERR, 0, r,
++                   "Failed to initialize ccache for %s: %s (%d)",
++                   princ_name, error_message(kerr), kerr);
++        goto unlock;
++    }
++
++    if ((kerr = krb5_cc_store_cred(kcontext, ccache, &creds))) {
++        log_rerror(APLOG_MARK, APLOG_ERR, 0, r,
++                   "Failed to store %s in ccache: %s (%d)",
++                   princ_name, error_message(kerr), kerr);
++        goto unlock;
++    }
++
++unlock:
++#ifdef STANDARD20_MODULE_STUFF
++    if (s4u2proxy_lock) {
++        apr_global_mutex_unlock(s4u2proxy_lock);
++        if (rv != APR_SUCCESS) {
++            ap_log_rerror(APLOG_MARK, APLOG_ERR, rv, r,
++                          "apr_global_mutex_unlock(s4u2proxy_lock) "
++                          "failed");
++        }
++    }
++#endif
++
++done:
++    if (0 == kerr)
++        log_rerror(APLOG_MARK, APLOG_DEBUG, 0, r,
++                   "Done obtaining credentials for s4u2proxy");
++    else
++        log_rerror(APLOG_MARK, APLOG_DEBUG, 0, r,
++                   "Failed to obtain credentials for s4u2proxy");
++
++    if (creds.client) {
++        krb5_free_cred_contents(kcontext, &creds);
++    }
++    if (ccache) {
++        krb5_cc_close(kcontext, ccache);
++    }
++    if (kcontext) {
++        krb5_free_context(kcontext);
++    }
++
++    return kerr;
++}
++
+ static int
+ authenticate_user_gss(request_rec *r, kerb_auth_config *conf,
+ 		      const char *auth_line, char **negotiate_ret_value)
+@@ -1697,10 +2061,60 @@ have_rcache_type(const char *type)
+ /*************************************************************************** 
+  Module Setup/Configuration
+  ***************************************************************************/
++#ifdef STANDARD20_MODULE_STUFF
++static apr_status_t
++s4u2proxylock_create(server_rec *s, apr_pool_t *p)
++{
++    apr_status_t rc;
++
++    /* only operate if a lockfile is used */
++    if (lockname == NULL || *(lockname) == '\0') {
++        return APR_SUCCESS;
++    }
++
++    /* create the lockfile */
++    rc = apr_global_mutex_create(&s4u2proxy_lock, lockname,
++                                 APR_LOCK_DEFAULT, p);
++    if (rc != APR_SUCCESS) {
++        ap_log_error(APLOG_MARK, APLOG_CRIT, rc, s,
++                     "Parent could not create lock file %s", lockname);
++        return rc;
++    }
++
++#ifdef AP_NEED_SET_MUTEX_PERMS
++    rc = unixd_set_global_mutex_perms(s4u2proxy_lock);
++    if (rc != APR_SUCCESS) {
++        ap_log_error(APLOG_MARK, APLOG_CRIT, rc, s,
++                     "mod_auth_kerb: Parent could not set permissions "
++                     "on lock; check User and Group directives");
++        return rc;
++    }
++#endif
++
++    return APR_SUCCESS;
++}
++
++static apr_status_t
++s4u2proxylock_remove(void *unused)
++{
++    /* only operate if a lockfile is used */
++    if (lockname == NULL || *(lockname) == '\0') {
++        return APR_SUCCESS;
++    }
++
++    /* destroy the rewritelock */
++    apr_global_mutex_destroy(s4u2proxy_lock);
++    s4u2proxy_lock = NULL;
++    lockname = NULL;
++    return APR_SUCCESS;
++}
++#endif
++
+ #ifndef STANDARD20_MODULE_STUFF
+ static void
+ kerb_module_init(server_rec *dummy, pool *p)
+ {
++   apr_status_t status;
+ #ifndef HEIMDAL
+    /* Suppress the MIT replay cache.  Requires MIT Kerberos 1.4.0 or later.
+       1.3.x are covered by the hack overiding the replay calls */
+@@ -1741,6 +2155,7 @@ static int
+ kerb_init_handler(apr_pool_t *p, apr_pool_t *plog,
+       		  apr_pool_t *ptemp, server_rec *s)
+ {
++   apr_status_t rv;
+    ap_add_version_component(p, "mod_auth_kerb/" MODAUTHKERB_VERSION);
+ #ifndef HEIMDAL
+    /* Suppress the MIT replay cache.  Requires MIT Kerberos 1.4.0 or later.
+@@ -1748,14 +2163,41 @@ kerb_init_handler(apr_pool_t *p, apr_poo
+    if (getenv("KRB5RCACHETYPE") == NULL && have_rcache_type("none"))
+       putenv(strdup("KRB5RCACHETYPE=none"));
+ #endif
++#ifdef STANDARD20_MODULE_STUFF
++    rv = s4u2proxylock_create(s, p);
++    if (rv != APR_SUCCESS) {
++        return HTTP_INTERNAL_SERVER_ERROR;
++    }
++
++    apr_pool_cleanup_register(p, (void *)s, s4u2proxylock_remove,
++                              apr_pool_cleanup_null);
++#endif
+    
+    return OK;
+ }
+ 
+ static void
++initialize_child(apr_pool_t *p, server_rec *s)
++{
++    apr_status_t rv = 0;
++
++#ifdef STANDARD20_MODULE_STUFF
++    if (lockname != NULL && *(lockname) != '\0') {
++        rv = apr_global_mutex_child_init(&s4u2proxy_lock, lockname, p);
++        if (rv != APR_SUCCESS) {
++            ap_log_error(APLOG_MARK, APLOG_CRIT, rv, s,
++                         "mod_auth_kerb: could not init s4u2proxy_lock"
++                         " in child");
++        }
++    }
++#endif
++}
++
++static void
+ kerb_register_hooks(apr_pool_t *p)
+ {
+    ap_hook_post_config(kerb_init_handler, NULL, NULL, APR_HOOK_MIDDLE);
++   ap_hook_child_init(initialize_child, NULL, NULL, APR_HOOK_MIDDLE);
+    ap_hook_check_user_id(kerb_authenticate_user, NULL, NULL, APR_HOOK_MIDDLE);
+ }
+ 
diff --git a/www-apache/mod_auth_kerb/files/mod_auth_kerb.conf b/www-apache/mod_auth_kerb/files/mod_auth_kerb.conf
new file mode 100644
index 000000000000..b38a0f361e4d
--- /dev/null
+++ b/www-apache/mod_auth_kerb/files/mod_auth_kerb.conf
@@ -0,0 +1 @@
+d /run/httpd/krbcache 700 apache apache
diff --git a/www-apache/mod_auth_kerb/metadata.xml b/www-apache/mod_auth_kerb/metadata.xml
new file mode 100644
index 000000000000..0556c97c6422
--- /dev/null
+++ b/www-apache/mod_auth_kerb/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<!-- maintainer-needed -->
+	<upstream>
+		<remote-id type="sourceforge">modauthkerb</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/www-apache/mod_auth_kerb/mod_auth_kerb-5.4-r2.ebuild b/www-apache/mod_auth_kerb/mod_auth_kerb-5.4-r2.ebuild
new file mode 100644
index 000000000000..1d1b560367c0
--- /dev/null
+++ b/www-apache/mod_auth_kerb/mod_auth_kerb-5.4-r2.ebuild
@@ -0,0 +1,53 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+inherit apache-module eutils systemd
+
+DESCRIPTION="An Apache authentication module using Kerberos"
+HOMEPAGE="http://modauthkerb.sourceforge.net/"
+SRC_URI="mirror://sourceforge/modauthkerb/${P}.tar.gz"
+
+LICENSE="BSD openafs-krb5-a HPND"
+SLOT="0"
+KEYWORDS="amd64 x86"
+IUSE=""
+
+DEPEND="virtual/krb5"
+RDEPEND="${DEPEND}"
+
+APACHE2_MOD_CONF="11_${PN}"
+APACHE2_MOD_DEFINE="AUTH_KERB"
+
+DOCFILES="INSTALL README"
+
+need_apache2
+
+PATCHES=(
+	"${FILESDIR}"/${P}-rcopshack.patch
+	"${FILESDIR}"/${P}-fixes.patch
+	"${FILESDIR}"/${P}-s4u2proxy.patch
+	"${FILESDIR}"/${P}-httpd24.patch
+	"${FILESDIR}"/${P}-delegation.patch
+	"${FILESDIR}"/${P}-cachedir.patch
+	"${FILESDIR}"/${P}-longuser.patch
+	"${FILESDIR}"/${P}-handle-continue.patch
+	"${FILESDIR}"/${P}-heimdal.patch
+)
+
+src_prepare() {
+	epatch "${PATCHES[@]}"
+}
+
+src_configure() {
+	CFLAGS="" APXS="${APXS}" econf --with-krb5=/usr --without-krb4
+}
+
+src_compile() {
+	emake
+}
+
+src_install() {
+	apache-module_src_install
+	systemd_dotmpfilesd "${FILESDIR}/${PN}.conf"
+}
diff --git a/www-apache/mod_auth_radius/Manifest b/www-apache/mod_auth_radius/Manifest
new file mode 100644
index 000000000000..5c00db522e21
--- /dev/null
+++ b/www-apache/mod_auth_radius/Manifest
@@ -0,0 +1,7 @@
+AUX 1.5.8-includes.patch 719 SHA256 a6e6cd0791f0095986effcbaf4f8f1b1ca2a66f3c26076dd941f7fc5eba4744a SHA512 8c9bd0e4a9afd5ab009b956685bc0c94cef1a50dc112f701994804acd8fe821d1c25367c5bede3e95ad190149d1bd482dea90ff8824bb5a2aa20fa9451e81ad2 WHIRLPOOL d326d79d1bf5ec7222b37c1aa25d8d5afba8944cd478ba29e92e8ac3a49fe6e9e4c51e956f2610cb1706460c6269a06d820c427fed374e1d3a55715e6b237a46
+AUX 1.5.8-remote_ip-obsolete.patch 1326 SHA256 b80cf4f9c9c7f5062b7396c106b6b2f5c8962faa30b3f3ead3f39da7b4bac588 SHA512 172b319b90580e08200d787821e28fbd85ffb0dd6fb17566cbad62fd5908be225b7e7b34adc6cb0800f97650de2b0e5bc0cbe7e30f8fdb7ee75674bb7b670db4 WHIRLPOOL 738876f2c52c71d03304be321689a204925df5206711217d6b30840388902e40af48fcced94ca76e5bc924e187a1e59eeb65ed62a75c9859c7a01f7d36d306ef
+DIST mod_auth_radius-1.5.8.tar 122880 SHA256 6a16cb64c8e3da5ccef5db007d3ab3fa53274bdb37c5f6b1821a12de42aa6d93 SHA512 0fcc43a44ea17b33595a850abb03ff6b92e100dfbeffc82caa9516f6eb7914fb463cb62286d624203a2c7035d05a107dda7b68c5cedf7de3b8be95b9266b6988 WHIRLPOOL 15ffe4db98758e0ef41390f46e97f686ed678b9358347de3b3257ba8d0fac9623935563040a0138c8c81179deb8dca0f998f90441c8b538d45e14548fbc97403
+EBUILD mod_auth_radius-1.5.8.ebuild 762 SHA256 3ff68d7835a79c54cc21fa19c671db3cb2bcb6fbe656c484b2d2697c5225936c SHA512 43e55f7e6ebc3cd4ba9ba797d97f998aa5c2b286dbdd90eff70ec94f36486da6ba860ffc7a144196e8c4ac94124d2c39fa7e6582300e241aafd604fa871222a6 WHIRLPOOL 35d5821466d81f956e155a3e43ee19b841cd0367c52050832a4aca93d86dde1bed2c8f14188be5e829d5048948c1a2214f4ad3519e8ed371166da6cc44fb93a9
+MISC ChangeLog 2272 SHA256 5f2e2d42217d40dc89debce4cdd888a4772a6b4a9c4eaa902f027bf93c46f76e SHA512 204098ceeee253df1ab43e684bd6ea6230cd9d4b484dbc3dbf454c524453ad9bef4b195af01a173a357e7a45712fd189faa0911ca8b203fe7bb819dd236394a4 WHIRLPOOL ae065ae3d2f4d04bdbfec574a4f7af21b6cce5053b910799791333afa6c9eb8036c0f67020fd74b9b4376271bf82653b3d1d784c01ccc208b2e137eff1164ee3
+MISC ChangeLog-2015 985 SHA256 3ade83be14c8081340006f64d8edf88ff9223a7daed30b6e064a2aa9782b37ea SHA512 3f4a034cbd9570510c62ae22797bcfc4c166f139b8ad5e36a78fea0d167d06ad65791edb4eb66b4cee7ea4d1c59985020953ed74b1b9ce908de5365e4553391f WHIRLPOOL 4663265dc38890e96444b176bfe142512a9e4db950341e04254324a88dc8cfc86c3411f70777942a8bc0fc20dd0f62d10c5bf2b97338a36a3bdbe836f338e095
+MISC metadata.xml 251 SHA256 f6ff468128d9aa804b47d9a184c761b4123b908d302eec0953226acd00fc80df SHA512 7ea734b9e52a4e36b11e004da4a8178aa529574adee2129ba57b1ce75fd5017431fdfffe7a4a536c798ae645497a44b07c748d77308325cf4d6af070ff167edd WHIRLPOOL 1610f6ab9cfa21736bbc4643fec692b621f8889a5888b4189847af4aa6f5719829cfaba363c480483fe7e8fb2c40d417e986964b52cb21d564940c4b51f8554d
diff --git a/www-apache/mod_auth_radius/files/1.5.8-includes.patch b/www-apache/mod_auth_radius/files/1.5.8-includes.patch
new file mode 100644
index 000000000000..b1482c5f9bee
--- /dev/null
+++ b/www-apache/mod_auth_radius/files/1.5.8-includes.patch
@@ -0,0 +1,25 @@
+diff -uNr mod_auth_radius-1.5.8.ORIG/mod_auth_radius-2.0.c mod_auth_radius-1.5.8/mod_auth_radius-2.0.c
+--- mod_auth_radius-1.5.8.ORIG/mod_auth_radius-2.0.c	2013-05-08 14:26:19.103330264 +0100
++++ mod_auth_radius-1.5.8/mod_auth_radius-2.0.c	2013-05-08 14:29:40.331333283 +0100
+@@ -287,15 +287,21 @@
+ 
+  */
+ 
++#include <arpa/inet.h>
+ #include <netdb.h>
+ #include <openssl/md5.h>
+ #include <sys/stat.h>
++#include <sys/types.h>
++#include <unistd.h>
++#include <sys/socket.h>
++#include <netinet/in.h>
+ 
+ #include "httpd.h"
+ #include "http_config.h"
+ #include "http_core.h"
+ #include "http_log.h"
+ #include "http_protocol.h"
++#include "http_request.h"
+ #include "util_md5.h"
+ #include "apr_general.h"
+ #include "apr_tables.h"
diff --git a/www-apache/mod_auth_radius/files/1.5.8-remote_ip-obsolete.patch b/www-apache/mod_auth_radius/files/1.5.8-remote_ip-obsolete.patch
new file mode 100644
index 000000000000..77d0880e8d97
--- /dev/null
+++ b/www-apache/mod_auth_radius/files/1.5.8-remote_ip-obsolete.patch
@@ -0,0 +1,21 @@
+diff -uNr mod_auth_radius-1.5.8.ORIG/mod_auth_radius-2.0.c mod_auth_radius-1.5.8/mod_auth_radius-2.0.c
+--- mod_auth_radius-1.5.8.ORIG/mod_auth_radius-2.0.c	2013-05-08 14:18:02.746322816 +0100
++++ mod_auth_radius-1.5.8/mod_auth_radius-2.0.c	2013-05-08 14:19:03.589323729 +0100
+@@ -683,7 +683,7 @@
+    * benefit here.
+    */  
+   apr_snprintf(one, COOKIE_SIZE, "%s%s%s%s%s%08x", scr->secret,
+-	      r->user, passwd, c->remote_ip, hostname, expires);
++	      r->user, passwd, c->client_ip, hostname, expires);
+ 
+   /* if you're REALLY worried about what's going on */
+ 
+@@ -691,7 +691,7 @@
+   ap_log_error(APLOG_MARK, APLOG_NOERRNO | APLOG_DEBUG, 0, r->server," secret     = %s\n", scr->secret);
+   ap_log_error(APLOG_MARK, APLOG_NOERRNO | APLOG_DEBUG, 0, r->server," user       = %s\n", r->user);
+   ap_log_error(APLOG_MARK, APLOG_NOERRNO | APLOG_DEBUG, 0, r->server," passwd     = %s\n", passwd);
+-  ap_log_error(APLOG_MARK, APLOG_NOERRNO | APLOG_DEBUG, 0, r->server," remote ip  = %s\n", c->remote_ip);
++  ap_log_error(APLOG_MARK, APLOG_NOERRNO | APLOG_DEBUG, 0, r->server," remote ip  = %s\n", c->client_ip);
+   ap_log_error(APLOG_MARK, APLOG_NOERRNO | APLOG_DEBUG, 0, r->server," hostname   = %s\n", hostname);
+   ap_log_error(APLOG_MARK, APLOG_NOERRNO | APLOG_DEBUG, 0, r->server," expiry     = %08x\n", expires);
+ #endif
diff --git a/www-apache/mod_auth_radius/metadata.xml b/www-apache/mod_auth_radius/metadata.xml
new file mode 100644
index 000000000000..5087760546f6
--- /dev/null
+++ b/www-apache/mod_auth_radius/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+  <maintainer type="person">
+    <email>chainsaw@gentoo.org</email>
+    <name>Tony Vroon</name>
+  </maintainer>
+</pkgmetadata>
diff --git a/www-apache/mod_auth_radius/mod_auth_radius-1.5.8.ebuild b/www-apache/mod_auth_radius/mod_auth_radius-1.5.8.ebuild
new file mode 100644
index 000000000000..878aebee4c0e
--- /dev/null
+++ b/www-apache/mod_auth_radius/mod_auth_radius-1.5.8.ebuild
@@ -0,0 +1,39 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="5"
+
+inherit apache-module eutils
+
+DESCRIPTION="Radius authentication for Apache"
+HOMEPAGE="http://freeradius.org/mod_auth_radius/"
+SRC_URI="ftp://ftp.freeradius.org/pub/radius/${P}.tar"
+
+LICENSE="Apache-2.0"
+KEYWORDS="~amd64"
+SLOT="0"
+IUSE=""
+
+APACHE2_MOD_FILE=".libs/mod_auth_radius-2.0.so"
+APACHE2_MOD_DEFINE="AUTH_RADIUS"
+
+APXS2_ARGS="-c ${PN}-2.0.c"
+
+DOCFILES="README"
+
+need_apache2
+
+src_prepare() {
+	epatch "${FILESDIR}/${PV}-includes.patch"
+	if has_version ">=www-servers/apache-2.4"; then
+		epatch "${FILESDIR}/${PV}-remote_ip-obsolete.patch"
+	fi
+}
+
+src_compile() {
+	apache-module_src_compile
+}
+
+src_install() {
+	apache-module_src_install
+}
diff --git a/www-apache/mod_auth_tkt/Manifest b/www-apache/mod_auth_tkt/Manifest
new file mode 100644
index 000000000000..bcbb7f4556bb
--- /dev/null
+++ b/www-apache/mod_auth_tkt/Manifest
@@ -0,0 +1,7 @@
+AUX 10_mod_auth_tkt.conf 852 SHA256 1419906b22cf22a876e2cbf2f35e9da5c258da2bc35bf730978bc9f94f432f62 SHA512 f3a5b209f89421780f4ac0f40662670403da41dfcebf46846d61fc4c7ef2359aaf44e12fcedb9f548e30abf7eab8c7c8b2fb2e425fc7c2d5c9e0e2db5de64958 WHIRLPOOL 7320fa04f3754ea7d2fc400fbde9203b59d4f195f46201087db28b7a0d684c797d2f287258035c881065d256cf6b136fbad8ccf80ec20d9035b8e66d40eea1fd
+AUX mod_auth_tkt-2.1.0-apache-2.4.patch 1467 SHA256 02bec4a82d98d6c454d90fda98ad8ca53559c8f455211ad9fc0d19e43ec14c42 SHA512 12fb6273ff8d95591dbd7bb9839961425fb4526f54ab8f0ee09fbf3f9927a2754453dbfbaf55b34ab454e915867ee3085e77d34ad8b22d7aa4bc55e49a75550b WHIRLPOOL f8aa5e40ec00e096ca0f12d3247028bce84437e2de05a6a60eee443d98caf7ba55dc3de92db882cb87738ae6fbb679a24fab3991f07af21ba17f2f7a46b294f6
+DIST mod_auth_tkt-2.1.0.tar.gz 100731 SHA256 ba456531656be5682f0a6a632a6eccb98c2459753c59b80b843e1d19cc7f8724 SHA512 e99ed60dbe2deebd654c4c849b20f7aa929ab476b9142e3da1aad8468b4922f4c36d30086396bb15676a3dc3e4ad9ac97e3524d1c70c6f18cea4c436174463b0 WHIRLPOOL f8fde3b318a1cd236e07baa23c39e6d5f6873c6097a54df438bc114383049c67b6db73789eab23fa8b8d8dee738424c8d832f9f286010d33a5e8b07565292f7c
+EBUILD mod_auth_tkt-2.1.0-r1.ebuild 1046 SHA256 d53197ad749c12a144391a01902ade808c75ed6a313a23b4dee4d5c3ff4a64bb SHA512 45d59bc894f0344704222bf7967d449241193b1af7e251c8523ef8d19024fbf873320a545cc581b38b95d616c513a78044fc1ef54acfee4bdb4f3237f9cf122c WHIRLPOOL 952a0e794d38c43ed6c69a351a2fd297ba69f2a564ba27ff606d135e84014e61793ba93e09b078766d0d794c6798f42927b12bd13c761834ab9f958af0df68d3
+MISC ChangeLog 2755 SHA256 d655e2955a6befeb3cc2ca21e2cd49f0b0e6446ab3d778df5f8d8206d91dd740 SHA512 b95a0b22ecb061c856903ea21f0e8d2570937c3b82cc951d6d1f49bfcedf23d565e91183f4cf00050e2b9c22ff751d3e873874706a4c42f02913ad94df73e4f1 WHIRLPOOL 615224aedb99c880c1797957070a8974abc354ed6125ff809b7bb31b5bc6f3ea8b49e888893c1de97a9da162353fd3307f1b7c4ae7dc8349e11c5474f1a202b8
+MISC ChangeLog-2015 1321 SHA256 f2e27bed6599787f717ecba2e9fa60fe67c78722506e36ba112416547c710726 SHA512 98a90ecf2b35ec4162cc6afe8c5a1ff3e5e3db1e26a535d6f94189ca57011cd5077df4aee3534979dba4c6935d71297470ca3ee11a1e4d40f4a95247a721aecf WHIRLPOOL 9ceb5f59c3a96781fb3b61cf7287ebd922b67cc22284125d22c7632ff0e46d7ae83d6d911c645c3d5dbeeac8e957337ee63de7f580b3979eee693eea8fa1986b
+MISC metadata.xml 166 SHA256 2caff447f5bd2701d8456ada5cc633c41ef4373fa4bfeabeb73599d40bcc941b SHA512 a56648c974a1d14dd4c18237532773c72057a13ab90c58b5da04f185e3c12a8bd8d5c21fb06053507f31766291a82dc7d87b34cd65fd94cfe2af7295c813ef84 WHIRLPOOL 1ff70497eca6531f0e0614c72a19f4b8e5ff486a58d369f4f0b36308d1d6b01168f9da887740e3b9f536236be251d3fe05f904d27a9233a7cf613416ba882968
diff --git a/www-apache/mod_auth_tkt/files/10_mod_auth_tkt.conf b/www-apache/mod_auth_tkt/files/10_mod_auth_tkt.conf
new file mode 100644
index 000000000000..4fe66cc90b5f
--- /dev/null
+++ b/www-apache/mod_auth_tkt/files/10_mod_auth_tkt.conf
@@ -0,0 +1,24 @@
+# See 'man mod_auth_tkt' for details on the individual directives.
+<IfDefine AUTH_TKT>
+LoadModule auth_tkt_module modules/mod_auth_tkt.so
+
+# Shared secret - CHANGE THIS before using!
+TKTAuthSecret "672c158d-67b8-42e4-aec7-f1e1abb882bb"
+
+# Used by sample CGI scripts to locate this config file
+SetEnv MOD_AUTH_TKT_CONF "/etc/apache2/modules.d/10_mod_auth_tkt.conf"
+
+# Protected directory example
+#<Directory /var/www/localhost/htdocs>
+#	AuthType Basic
+#	require valid-user
+#	TKTAuthLoginURL https://www.CHANGEME.com/pub/login.cgi
+#	# If an internet server, you probably want the following on (at least initially)
+#	TKTAuthIgnoreIP on
+#	# If you just want *optional* authentication, so that casual users and robots
+#	# can still access some content, uncomment the following
+#	# TKTAuthGuestLogin on
+#</Directory>
+</IfDefine>
+
+# vim: ts=4 filetype=apache
diff --git a/www-apache/mod_auth_tkt/files/mod_auth_tkt-2.1.0-apache-2.4.patch b/www-apache/mod_auth_tkt/files/mod_auth_tkt-2.1.0-apache-2.4.patch
new file mode 100644
index 000000000000..1e6ee28f5657
--- /dev/null
+++ b/www-apache/mod_auth_tkt/files/mod_auth_tkt-2.1.0-apache-2.4.patch
@@ -0,0 +1,40 @@
+Description: Build fix for apache 2.4
+ Fix for API changes in apache 2.4.
+Author: Ivo De Decker <ivo.dedecker@ugent.be>
+Forwarded: https://sourceforge.net/mailarchive/forum.php?thread_name=20120518111425.GA9186%40ugent.be&forum_name=modauthtkt-users
+Last-Update: 2012-05-17
+
+--- libapache2-mod-auth-tkt-2.1.0.orig/src/mod_auth_tkt.c
++++ libapache2-mod-auth-tkt-2.1.0/src/mod_auth_tkt.c
+@@ -6,6 +6,7 @@
+ #include "http_config.h"
+ #include "http_log.h"
+ #include "http_core.h"
++#include "http_request.h"
+ #include "http_protocol.h"
+ #include "util_md5.h"
+ #include "sha2.h"
+@@ -798,7 +799,11 @@ ticket_digest(request_rec *r, auth_tkt *
+   unsigned char *buf2 = apr_palloc(r->pool, sconf->digest_sz + strlen(secret));
+   int len = 0;
+   char *digest = NULL;
++#if AP_MODULE_MAGIC_AT_LEAST(20111130,0) 
++  char *remote_ip = conf->ignore_ip > 0 ? "0.0.0.0" : r->connection->client_ip;
++#else
+   char *remote_ip = conf->ignore_ip > 0 ? "0.0.0.0" : r->connection->remote_ip;
++#endif
+   unsigned long ip;
+   struct in_addr ia;
+   char *d;
+@@ -1575,7 +1580,11 @@ static void
+ auth_tkt_register_hooks (apr_pool_t *p)
+ {
+   ap_hook_post_config(auth_tkt_version, NULL, NULL, APR_HOOK_MIDDLE);
++#if AP_MODULE_MAGIC_AT_LEAST(20080403,1) 
++  ap_hook_check_authn(auth_tkt_check, NULL, NULL, APR_HOOK_FIRST, AP_AUTH_INTERNAL_PER_CONF);
++#else
+   ap_hook_check_user_id(auth_tkt_check, NULL, NULL, APR_HOOK_FIRST);
++#endif
+ }
+ 
+ /* Declare and populate the main module data structure */
diff --git a/www-apache/mod_auth_tkt/metadata.xml b/www-apache/mod_auth_tkt/metadata.xml
new file mode 100644
index 000000000000..6f49eba8f496
--- /dev/null
+++ b/www-apache/mod_auth_tkt/metadata.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<!-- maintainer-needed -->
+</pkgmetadata>
diff --git a/www-apache/mod_auth_tkt/mod_auth_tkt-2.1.0-r1.ebuild b/www-apache/mod_auth_tkt/mod_auth_tkt-2.1.0-r1.ebuild
new file mode 100644
index 000000000000..7b9bb46132f7
--- /dev/null
+++ b/www-apache/mod_auth_tkt/mod_auth_tkt-2.1.0-r1.ebuild
@@ -0,0 +1,52 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+inherit apache-module eutils
+
+DESCRIPTION="Apache module for cookie based authentication"
+HOMEPAGE="http://www.openfusion.com.au/labs/mod_auth_tkt/"
+SRC_URI="http://www.openfusion.com.au/labs/dist/${PN}/${P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+DEPEND="dev-lang/perl"
+RDEPEND=""
+
+APACHE2_MOD_CONF="10_${PN}"
+APACHE2_MOD_DEFINE="AUTH_TKT"
+
+DOCFILES="README"
+
+# test suite is completely broken
+RESTRICT="test"
+
+need_apache2
+
+src_prepare() {
+	epatch "${FILESDIR}"/${P}-apache-2.4.patch
+}
+
+src_configure() {
+	./configure --apachever=2.2 --apxs=${APXS}
+}
+
+src_compile() {
+	emake
+}
+
+src_install() {
+	apache-module_src_install
+	pod2man --section=5 --release=${PV} doc/${PN}.{pod,5}
+	doman doc/${PN}.5
+}
+
+pkg_postinst() {
+	apache-module_pkg_postinst
+	einfo "See 'man mod_auth_tkt' for details on the individual directives."
+	einfo "Remember to change shared secret 'TKTAuthSecret' before using!"
+	einfo
+}
diff --git a/www-apache/mod_auth_xradius/Manifest b/www-apache/mod_auth_xradius/Manifest
new file mode 100644
index 000000000000..ab70a5e749ea
--- /dev/null
+++ b/www-apache/mod_auth_xradius/Manifest
@@ -0,0 +1,9 @@
+AUX 0.4.6-apache24-api-changes.diff 539 SHA256 696cc6a553d5d46a8e5e190e847e5b16bbb514d191ca739b610f4ccc100f531b SHA512 c5392d82592eb01e2f46126baad5f3e35e4fc25d37c9520e34836e60ebb4cf6be7bc0be831efd5ed50fd5c7d538928e48c94524970c5649b51e3ff5ee366bac1 WHIRLPOOL be1d794bc1c87d7fb151f5eaf79893aa0a2fdf8d4df4bd5b858b9a4bcca15c7c01caa172c9276f32251cbfe1b102701e46d6eeecb04f8189f4d6feaa3b6e3da5
+AUX 0.4.6-fallback-support.diff 1596 SHA256 0f4bd2a60cca9e974ebb2a9c566107bd64e2347de31d8779c73fefcaa8406f05 SHA512 2b30f0df918626f927173b5563d9a91f2c215013052d34a81d3dae601ef64dff7b1dcec55b7251b8c30093b1830b6bb06578ac866cc77202f796f4061e82fa33 WHIRLPOOL 5b6fad60fef5fab60dde912aab71a0f33333a74df211b794f7e04de82bd0d61a56042d05e1b813b241f9e1a438613cad52fe9384a06457418400611d1f3d4132
+AUX 0.4.6-obsolete-autotools-syntax.diff 435 SHA256 8d3a6e6d38e68b7ce1d7faa086eee39f366c5abfa12faf87768d7131d4b74272 SHA512 00de4870d9ee16ee9554aa0cd46ff9cdabbe0666131d29bc18dd2e7706f94265ee9c525d17409c3bbda4de32ffbe994286822ec8efb20887813a3076d9abb0c9 WHIRLPOOL f908cbe4bbc58c98143f85fe67585e4234beb2bae7c4801b7f69c8b3d71f447aa8347b49aece4ef8f0c70aad40b24ab56f4f56b3f83152aa786d58ec1b425c6b
+DIST mod_auth_xradius-0.4.6.tar.bz2 180591 SHA256 ab45f9986e37ca38ef6b8ae765e2baa647529c848c0d21b49abf60cc1e9fbf0b SHA512 7edb26f988f9842825bec1b04f5127816bd53f76d2284d79d87afef2b5d6e9fa8cb8156c3f5543aeb9b013f65295fa70098ade603f00ce6e90b3b0c3e8c41b6a WHIRLPOOL 305cb5d53ee3fe9db7473761a0b4e179ab042e61f88710f7373c8edcb4bde07a6d3cb67f25444ef4bc2e341b6d775fbf59a139532feb18c4f0a0d9488efc7c54
+EBUILD mod_auth_xradius-0.4.6-r1.ebuild 692 SHA256 8c100c12002de58dfc63142736e830d297d4fc69c17482ab4cc2902b160ebb53 SHA512 20b8c49705ce7ef29575937ca86b14f97723bcb7390f16a76f085aaf4a06d253c182060431126bedfe7a2e80e8e5fc4ee81778a1c3c39eb96f2cd440f8134b06 WHIRLPOOL 3db4f6cf9b27a9c9d10280e7d0c575f6c0ef3cdf3eb9d1268c8381658c1ab3907aa81184b9a46ea717dac84394c284a1eb760da3f15a8e8a47284a076fdf4f96
+EBUILD mod_auth_xradius-0.4.6.ebuild 614 SHA256 dce9653fd7795e8c9955b56e92c101edc21959b9ed3d5642da41e9cf680628db SHA512 c0fb488a96aeca2f188ed478dd3dd531c31d9e0c072456b8496cc44ccf3b88a6eb15bd6eccc2a184a3c2193480087ca1f20f5d1167a7c231fecc9bd55c322956 WHIRLPOOL 2309a8baeac829d316eb60b80b37ea3b47231fc50bdf008e93d87173789549b9aaca4c8f51bf9bbde0a4546bfab709ce04e23fc44bbd03d903a50bd2e5318da2
+MISC ChangeLog 2406 SHA256 b2ee2de7379b3d6b96fe6d7e1743e59a51b590b4adc2d869dfa3756f642770ea SHA512 60b077d12f19ebb8b7fd35b674a7bae49a9c83b421254f0f8230ac8683d48937a04ec5786021f9dc02cbeef491efea2160c1c5140f5e1773cc0f72259d971a8e WHIRLPOOL 6e4dfb9f4a84211cb89ff221717ebc139b7bc86d87a1df3dd56f5d28e2efc0ba9588e61a0ae4a166ed37d8d502cff4d5dfe63a56b6ad579f87b6b107d764091a
+MISC ChangeLog-2015 1046 SHA256 b52aabd2f9595c21a893369fb79149607b2aff7307419f7988d09f2e849ae5ae SHA512 5aa0e1f066594d6f3e0f381a99b550b7750a11b7992ceed0341a1faa1d910436cbe3e81a94c4856bf647959c917061867ca97f41ea3d3f10902bfa62a64a592e WHIRLPOOL 9d12dfb11fae0c4b7b3983a6032d61a1744ae55a7f242a28946947c37a463083bc43d19afcdc91544cb1278ba575e3c9cafcb0fbd9def476830e0c0d3847680c
+MISC metadata.xml 251 SHA256 f6ff468128d9aa804b47d9a184c761b4123b908d302eec0953226acd00fc80df SHA512 7ea734b9e52a4e36b11e004da4a8178aa529574adee2129ba57b1ce75fd5017431fdfffe7a4a536c798ae645497a44b07c748d77308325cf4d6af070ff167edd WHIRLPOOL 1610f6ab9cfa21736bbc4643fec692b621f8889a5888b4189847af4aa6f5719829cfaba363c480483fe7e8fb2c40d417e986964b52cb21d564940c4b51f8554d
diff --git a/www-apache/mod_auth_xradius/files/0.4.6-apache24-api-changes.diff b/www-apache/mod_auth_xradius/files/0.4.6-apache24-api-changes.diff
new file mode 100644
index 000000000000..a760bd6ce79e
--- /dev/null
+++ b/www-apache/mod_auth_xradius/files/0.4.6-apache24-api-changes.diff
@@ -0,0 +1,14 @@
+--- src/xradius_cache.c.orig	2013-06-10 10:02:53.263071428 +0100
++++ src/xradius_cache.c	2013-06-10 10:03:45.789072216 +0100
+@@ -143,9 +143,9 @@
+     /* Running as Root */
+     if (geteuid() == 0)  {
+         /* Allow the configured Apache use to read/write to the DBM */
+-        chown(path1, unixd_config.user_id, -1);
++        chown(path1, ap_unixd_config.user_id, -1);
+         if (path2 != NULL) { 
+-            chown(path2, unixd_config.user_id, -1);
++            chown(path2, ap_unixd_config.user_id, -1);
+         }
+     }
+ #endif
diff --git a/www-apache/mod_auth_xradius/files/0.4.6-fallback-support.diff b/www-apache/mod_auth_xradius/files/0.4.6-fallback-support.diff
new file mode 100644
index 000000000000..da43dc4b2776
--- /dev/null
+++ b/www-apache/mod_auth_xradius/files/0.4.6-fallback-support.diff
@@ -0,0 +1,31 @@
+diff -uNr mod_auth_xradius-0.4.6.ORIG/src/mod_auth_xradius.c mod_auth_xradius-0.4.6/src/mod_auth_xradius.c
+--- mod_auth_xradius-0.4.6.ORIG/src/mod_auth_xradius.c	2014-09-24 13:41:22.990073508 +0100
++++ mod_auth_xradius-0.4.6/src/mod_auth_xradius.c	2014-09-24 13:50:17.204100114 +0100
+@@ -125,15 +125,15 @@
+     rctx = xrad_auth_open();
+ 
+     /* Loop through the array of RADIUS Servers, adding them to the rctx object */
+-    sr = (xrad_server_info *) dc->servers->elts;
+     for (i = 0; i < dc->servers->nelts; ++i) {        
+-        rc = xrad_add_server(rctx, sr[i].hostname, sr[i].port, sr[i].secret,
++        sr = &(((xrad_server_info*)dc->servers->elts)[i]);
++        rc = xrad_add_server(rctx, sr->hostname, sr->port, sr->secret,
+                              dc->timeout, dc->maxtries);
+         
+         if (rc != 0) {
+             ap_log_rerror(APLOG_MARK, APLOG_ERR, 0, r,
+                           "xradius: Failed to add server '%s:%d': (%d) %s",
+-                          sr[i].hostname, sr[i].port, rc, xrad_strerror(rctx));
++                          sr->hostname, sr->port, rc, xrad_strerror(rctx));
+             goto run_cleanup;
+         }        
+     }
+@@ -294,7 +294,7 @@
+     /* To properly use the Pools, this array is allocated from the here, instead of
+         inside the directory configuration creation function. */
+     if (dc->servers == NULL) {
+-        dc->servers = apr_array_make(parms->pool, 4, sizeof(xrad_server_info*));
++        dc->servers = apr_array_make(parms->pool, 4, sizeof(xrad_server_info));
+     }
+     
+     sr = apr_array_push(dc->servers);
diff --git a/www-apache/mod_auth_xradius/files/0.4.6-obsolete-autotools-syntax.diff b/www-apache/mod_auth_xradius/files/0.4.6-obsolete-autotools-syntax.diff
new file mode 100644
index 000000000000..affb3181485a
--- /dev/null
+++ b/www-apache/mod_auth_xradius/files/0.4.6-obsolete-autotools-syntax.diff
@@ -0,0 +1,19 @@
+--- configure.ac.orig	2013-06-10 09:56:06.905065330 +0100
++++ configure.ac	2013-06-10 09:56:45.968065916 +0100
+@@ -4,6 +4,7 @@
+ AC_PREREQ(2.53)
+ AC_CONFIG_SRCDIR([src/mod_auth_xradius.c])
+ AC_CONFIG_AUX_DIR(config)
++AC_CONFIG_MACRO_DIR([m4])
+ OOO_MAINTAIN_MODE
+ AM_MAINTAINER_MODE
+ AC_CANONICAL_TARGET
+@@ -15,7 +16,7 @@
+ AC_PROG_CC
+ AC_PROG_LD
+ AC_PROG_INSTALL
+-AC_PROG_RANLIB
++LT_INIT
+ 
+ AP_VERSION=2.0.40
+ CHECK_APACHE(,$AP_VERSION,
diff --git a/www-apache/mod_auth_xradius/metadata.xml b/www-apache/mod_auth_xradius/metadata.xml
new file mode 100644
index 000000000000..5087760546f6
--- /dev/null
+++ b/www-apache/mod_auth_xradius/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+  <maintainer type="person">
+    <email>chainsaw@gentoo.org</email>
+    <name>Tony Vroon</name>
+  </maintainer>
+</pkgmetadata>
diff --git a/www-apache/mod_auth_xradius/mod_auth_xradius-0.4.6-r1.ebuild b/www-apache/mod_auth_xradius/mod_auth_xradius-0.4.6-r1.ebuild
new file mode 100644
index 000000000000..b6d651e94748
--- /dev/null
+++ b/www-apache/mod_auth_xradius/mod_auth_xradius-0.4.6-r1.ebuild
@@ -0,0 +1,27 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="5"
+
+inherit autotools eutils
+
+DESCRIPTION="Radius authentication for Apache"
+HOMEPAGE="http://www.outoforder.cc/projects/apache/mod_auth_xradius/"
+SRC_URI="http://www.outoforder.cc/downloads/${PN}/${P}.tar.bz2"
+
+LICENSE="Apache-2.0"
+KEYWORDS="~amd64"
+SLOT="0"
+IUSE=""
+
+DEPEND="www-servers/apache"
+DOCFILES="README"
+
+src_prepare() {
+	epatch "${FILESDIR}/${PV}-obsolete-autotools-syntax.diff"
+	epatch "${FILESDIR}/${PV}-fallback-support.diff"
+	if has_version ">=www-servers/apache-2.4"; then
+		epatch "${FILESDIR}/${PV}-apache24-api-changes.diff"
+	fi
+	AT_M4DIR="m4" eautoreconf
+}
diff --git a/www-apache/mod_auth_xradius/mod_auth_xradius-0.4.6.ebuild b/www-apache/mod_auth_xradius/mod_auth_xradius-0.4.6.ebuild
new file mode 100644
index 000000000000..71d87a53dd38
--- /dev/null
+++ b/www-apache/mod_auth_xradius/mod_auth_xradius-0.4.6.ebuild
@@ -0,0 +1,25 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="5"
+
+inherit autotools eutils
+
+DESCRIPTION="Radius authentication for Apache"
+HOMEPAGE="http://www.outoforder.cc/projects/apache/mod_auth_xradius/"
+SRC_URI="http://www.outoforder.cc/downloads/${PN}/${P}.tar.bz2"
+
+LICENSE="Apache-2.0"
+KEYWORDS="~amd64"
+SLOT="0"
+IUSE=""
+
+DOCFILES="README"
+
+src_prepare() {
+	epatch "${FILESDIR}/${PV}-obsolete-autotools-syntax.diff"
+	if has_version ">=www-servers/apache-2.4"; then
+		epatch "${FILESDIR}/${PV}-apache24-api-changes.diff"
+	fi
+	AT_M4DIR="m4" eautoreconf
+}
diff --git a/www-apache/mod_authn_sasl/Manifest b/www-apache/mod_authn_sasl/Manifest
new file mode 100644
index 000000000000..51756471a232
--- /dev/null
+++ b/www-apache/mod_authn_sasl/Manifest
@@ -0,0 +1,6 @@
+AUX 10_mod_authn_sasl.conf 118 SHA256 1c44e0a2150fa2c7cae0b668d5249c06b633e49c350cbad4826f4902ef858a5b SHA512 894dadf64c33e959228bb58ebb89c25d178e02d2eb5fcdf7fe3c45750a98c9bcf043d65f974f37f45ea94a7539256b74727b083f2196df8ff0a98ba76d52c390 WHIRLPOOL a21a42fc9d7ef92833c9d1cfc0e91d3df1ab1ecf0ecb4d85832613dcaf80d852ccb3266105b461680a1ac7ef2861349dc4569b79b0c8bfde6b8be0a57d3d793a
+DIST mod_authn_sasl-1.2.tar.bz2 274790 SHA256 4329e1f429560041cebe67b74a588330f382759bcbb91d3e4145b18e59734b57 SHA512 cc967d350c7110f98b56fa94244473dd2cfc813e7992d7aa8a0ae2219264834b1e2218a1f0982bad661e335bfd713cfb9e8efa6ab69f07a309370e4b7d74ef02 WHIRLPOOL e906277df03d5027f9911d62f47d06ecff0bdb4a230b326c0d4361129bdf0358fd665c2e4c9b1ed54f79aa51fc02bae1edde4132369dee897c5ef86bd49e9fe8
+EBUILD mod_authn_sasl-1.2.ebuild 616 SHA256 64be0517c1f76b244a13dac10daed910ccce38458c8ac865c319990bd1079a55 SHA512 0611148c12e620be562face0817cca67fa3cb0c4504eab9c7e2329a2cd0ac7b0010039680ff27d4d533865f921c181f0f25695ebd0288d432b6da85bc0f8da1a WHIRLPOOL 17aea7a3bb6a98aa050f5882b512ec019b890bb70c84e9a46c3cee8daf3f1773759a2a6004aa3ca8fa2128b792b1b84ed25528064b2978f33c5babe5c97a294b
+MISC ChangeLog 3118 SHA256 d01194786b24c58af57ab26051e544a734013c660998731d99c87fc2474a762b SHA512 b91a7b397e46752bb0489aa70e86c5c8b6d0b9970ad37448f6de2307ac67a1a0c8ccac41dfa6cc01cbe982865490944eed8b89fa137a30e071d2ca3984a4378f WHIRLPOOL 5dfe18c823e7e5ca19edd1aa3cbb59b14229ce1ef8b208f80130e3820acce395b3024637c4345a0921db762dcb97c4de1f9a39929b46ad614feff0952f4040b0
+MISC ChangeLog-2015 1080 SHA256 1668bb79b747ed4225dad69e7aa6e8123f63dcc53db4df95249e3abf96b7ce48 SHA512 03cd0c4306926d5d326f97a72ebd3f398af118e568e2a7f717ddcbbf60e46e0e594c3e377bbdc54cb94945799205589fae1f4aec8d9033339dbc8811b0516802 WHIRLPOOL 72a85a91bc7e513deb3634535641e28157f9cf7448f9fec3525d26fc937e905df637ed507e1c3383d5ab2d9c924271184d5e7662f4c4f65b5c34ec36cdb3f930
+MISC metadata.xml 251 SHA256 7ac3a8e79011ae2ce693a94bb84abf9ab296368a5db8eca944c686b9ad1b3963 SHA512 ba7afea8e71d4207b483c778f455c5446e64344c9387f6fd7578e9be516037e76f790618a3dd3102839fb4da860046475e1be63edcd96b2056c12f82ed8594ea WHIRLPOOL f7d6b78e60069a1ed38549af353f3f0a4721a0f2cac4fb8a51b1cffe500c46518cb2e51be04516c34305d748659b683ae9e5aba99a43b5f301f2da812795c84a
diff --git a/www-apache/mod_authn_sasl/files/10_mod_authn_sasl.conf b/www-apache/mod_authn_sasl/files/10_mod_authn_sasl.conf
new file mode 100644
index 000000000000..05f71c156e41
--- /dev/null
+++ b/www-apache/mod_authn_sasl/files/10_mod_authn_sasl.conf
@@ -0,0 +1,5 @@
+<IfDefine AUTHN_SASL>
+LoadModule authn_sasl_module modules/mod_authn_sasl.so
+</IfDefine>
+
+# vim: ts=4 filetype=apache
diff --git a/www-apache/mod_authn_sasl/metadata.xml b/www-apache/mod_authn_sasl/metadata.xml
new file mode 100644
index 000000000000..f37eabef386a
--- /dev/null
+++ b/www-apache/mod_authn_sasl/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<!-- maintainer-needed -->
+	<upstream>
+		<remote-id type="sourceforge">mod-authn-sasl</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/www-apache/mod_authn_sasl/mod_authn_sasl-1.2.ebuild b/www-apache/mod_authn_sasl/mod_authn_sasl-1.2.ebuild
new file mode 100644
index 000000000000..1d9f899a9195
--- /dev/null
+++ b/www-apache/mod_authn_sasl/mod_authn_sasl-1.2.ebuild
@@ -0,0 +1,26 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+inherit eutils apache-module
+
+DESCRIPTION="Cyrus SASL authentication module for Apache"
+HOMEPAGE="http://mod-authn-sasl.sourceforge.net/"
+SRC_URI="http://downloads.sourceforge.net/project/mod-authn-sasl/mod-authn-sasl/${PV}/${P}.tar.bz2"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~x86"
+IUSE=""
+
+DEPEND="dev-libs/cyrus-sasl"
+RDEPEND="${DEPEND}"
+
+APXS2_ARGS="-c ${PN}.c -lsasl2"
+APACHE2_MOD_CONF="10_${PN}"
+APACHE2_MOD_DEFINE="AUTHN_SASL"
+
+need_apache2
+
+src_install() {
+	apache-module_src_install
+}
diff --git a/www-apache/mod_authnz_external/Manifest b/www-apache/mod_authnz_external/Manifest
new file mode 100644
index 000000000000..fa9654a91b91
--- /dev/null
+++ b/www-apache/mod_authnz_external/Manifest
@@ -0,0 +1,6 @@
+AUX 10_mod_authnz_external.conf 987 SHA256 60c42e55bb7ae02436031143116516084b298d2d067412f78332669cecdc79bd SHA512 3840a8f29c3575f700f7ad262d8fe01fe42b3273cb674c543715eb8af053cab990f08264739bac7c46dd16d54eb53cf6a8bed556376b29ad78b50e6c3031a061 WHIRLPOOL e967b65a080adee01320e63e3e3fa4e70941616da44361591695331ab4dfea57e57fe5134605a873a3191fe03f1a54a604519e2e64975d5acaf3491850a18088
+DIST mod_authnz_external-3.3.2.tar.gz 36160 SHA256 a16b31d81c20e024e7efe480fe98b48d5ce40d520b0a13ff38ab003cc527f1e8 SHA512 8216744dbaed8dbde0d33658e38594463409e613412bd94f3e5f5a816f5e793a395ddda7c582ff1d1e69e48efdd1efb48c168d4cbc37cc7807a0dcb92eace0be WHIRLPOOL 34407a3a62d2bb4ca67fbc08bafff145ed5a52308a13e6e4b21d0b2d774b34e2a2980839d9d4bc145f1197038fe7bcd8674a7bd434f0119e39e1a5fa0a4d1d71
+EBUILD mod_authnz_external-3.3.2.ebuild 557 SHA256 e0e180c093e5616a7a259157c7828f1c443b7c82be1fb5d03642ef9943bb7b40 SHA512 13fcdfd45a9fe6e9150af4a3bf18295c446b7bad7acde88561d7187fee930ae98667d93d9a385a344d37f252b3c2789a544681ee1dd1fd34667e32e302af197c WHIRLPOOL 3750fc564d2afd7ab2370b50dd4c25953bfeb7aa4d37650d10b8547b6cb0df4d0ee4a9879907a13091167bbe3c89121a55594a7c638f8ef6b553d58bb5b3187d
+MISC ChangeLog 3968 SHA256 97b1cdb9a011dd82d7196a6c8168aefed4caecaf46dc10cffb3cf1be7df2c55b SHA512 809a11aa79f948b64c08577bf2925d3ad5221782f96e1cc025e75940febeaeafbf56cec24047fffbf1844fc70112dd2765c101a1c49d551ddbd74753185952a3 WHIRLPOOL c4913ee30f0c1aef9d0151b7e033cb1d4f1e1cc89f888ebb3e552220e7ca71451816230f689b914891bb4503268f90f9dcb0c784d95e96f516d808751b8c1b46
+MISC ChangeLog-2015 2029 SHA256 8e21d1a98b5a7edcbeba5e54d4b9f86cf6d8be5e66b53ff0b8bbbcfb63c0f00a SHA512 ca8dc99ca7155386a8930c26fb14b2b5517abf1c377f8a41587f807cd9852a69fa3bdbb3dfa6ae84d1022e240093f38970e5559cce723ed0cd3084e25c964b6a WHIRLPOOL 7e341e1efd3d0ed1d0f5f6ea8c2b617134ab6fd59d1682fdf9a15d8a0bea0d06a37ae95e8de6c17c6d70ccce3d2d83b8d3f280668ec062db6ec62fc51466ec88
+MISC metadata.xml 317 SHA256 63f388c17051fcbcffc9ca702aa072f29c6ed8ac2d9351fa80f168b519f11b36 SHA512 dd0608a4624d18f25915bbbbb601013954476a62609ebe59118862428b5397893e6b4bce5d09b79eb49402ab5ae4dbac8954a8bca9a58d0121f6906d3655f367 WHIRLPOOL 0702b780a2c2b4197ecde83f5ef7b40fa6e14dc85749773ea521f94b4d184964309c26dff980254ba60abbf27a309734e84d9435b0c04e78d21fd339b3a4037f
diff --git a/www-apache/mod_authnz_external/files/10_mod_authnz_external.conf b/www-apache/mod_authnz_external/files/10_mod_authnz_external.conf
new file mode 100644
index 000000000000..fc59272caa0e
--- /dev/null
+++ b/www-apache/mod_authnz_external/files/10_mod_authnz_external.conf
@@ -0,0 +1,34 @@
+<IfDefine AUTHNZ_EXTERNAL>
+LoadModule authnz_external_module modules/mod_authnz_external.so
+
+# provided by net-www/pwauth
+#AddExternalAuth  pwauth /etc/apache2/modules/pwauth
+#SetExternalAuthMethod  pwauth pipe
+
+# For external group check (provided by net-www/pwauth)
+#AddExternalGroup unixgroup modules/unixgroup
+#SetExternalGroupMethod  unixgroup environment
+
+# Put an .htaccess file in whatever directory you want to protect.
+# A typical .htaccess file would look like:
+#
+#     AuthName Your-Site-Name
+#     AuthType Basic
+#     AuthExternal pwauth
+#     Require valid-user
+# or
+#     Require user1
+#
+#     GroupExternal unixgroup
+#     AuthGroupFile /dev/null
+#     Require group <groupname1> <groupname2> ...
+#
+# Alternately, you can put a <Directory> block with the same directives
+# in your httpd.conf file.
+#
+# Note1: Using group method, don't forget to add users in the authorized group
+# group files
+# somegroup:x:500:user1,user2,user3
+</IfDefine>
+
+# vim: ts=4 filetype=apache
diff --git a/www-apache/mod_authnz_external/metadata.xml b/www-apache/mod_authnz_external/metadata.xml
new file mode 100644
index 000000000000..f298748b0602
--- /dev/null
+++ b/www-apache/mod_authnz_external/metadata.xml
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<!-- maintainer-needed -->
+	<upstream>
+		<remote-id type="google-code">mod-auth-external</remote-id>
+		<remote-id type="github">phokz/mod-auth-external</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/www-apache/mod_authnz_external/mod_authnz_external-3.3.2.ebuild b/www-apache/mod_authnz_external/mod_authnz_external-3.3.2.ebuild
new file mode 100644
index 000000000000..499caf55e844
--- /dev/null
+++ b/www-apache/mod_authnz_external/mod_authnz_external-3.3.2.ebuild
@@ -0,0 +1,20 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+inherit eutils apache-module
+
+DESCRIPTION="An Apache2 authentication DSO using external programs"
+HOMEPAGE="https://github.com/phokz/mod-auth-external"
+SRC_URI="https://mod-auth-external.googlecode.com/files/${P}.tar.gz"
+
+LICENSE="Apache-1.1"
+SLOT="2"
+KEYWORDS="amd64 x86"
+IUSE=""
+need_apache2_4
+
+DOCFILES="AUTHENTICATORS CHANGES INSTALL INSTALL.HARDCODE README TODO UPGRADE"
+
+APACHE2_MOD_CONF="10_${PN}"
+APACHE2_MOD_DEFINE="AUTHNZ_EXTERNAL"
diff --git a/www-apache/mod_backtrace/Manifest b/www-apache/mod_backtrace/Manifest
new file mode 100644
index 000000000000..9a3cb45184f3
--- /dev/null
+++ b/www-apache/mod_backtrace/Manifest
@@ -0,0 +1,6 @@
+AUX 10_mod_backtrace.conf 113 SHA256 ceb4a1cf7c4d528a58e6d2807851cf2b31c38ab042fe966d21a5b919981a3d5a SHA512 ed2f22ac750411d46508d9f5e740c9c3c32e2eb43c909c0eea743101f6d4213f7a2d3ccded0efdb5e10a148c407fb9f0213a01c5e741b1ee96dc4e5145642a3e WHIRLPOOL 055dc6aa6c6b04147334c9b47be3bbb92b383b45585bf4286408bed88e837853fd2c11262538b484fefcb9e1ccb1c8c64a81c8be8dbacfb9245dfc0e1646e3ae
+DIST wku_bt-2.01.zip 933169 SHA256 3033a07b284a67e519e3b2d09a255b9cd8ce5902d3d9971d4cf182dec75c7d27 SHA512 c1bde8a26b395fc5fc66cd83c9282a8c519f34d27bef628ec502cec4245a7d446300178c9c94a5c5c0eb817bb8dd146587607760f9c9e780986d6ec53f03fb4c WHIRLPOOL dc2fa4debac883909f084562ffa0d9ab9e7f60a76bd02ee0054a0258444165f6fa63490bfefeaa03fe476ca9abc1ba93e2ad60858ba3ee4611b227b48e49bf1f
+EBUILD mod_backtrace-2.01.ebuild 778 SHA256 47a687fbf58e6766c2951efdab788f5b6c921b3d9b5fbe604278e725f9030bf7 SHA512 2636bf45f9a4b331eb38fc3b9e343af7f1d79300ce5b162eabefd5e368a8503791d282596177695dc0ecc8ce5f5f4c5bdd2825bc95f8bfbe7140fbd9d55402f9 WHIRLPOOL f517f97338e0d10872c83e369e2e543975b164e0be57a2f13c3aaa580010b725cd6f2886e3de07b7a54119b47ef8dfa347ba5d732fec1719f1d1dd2d400f6faf
+MISC ChangeLog 2570 SHA256 e3836e88a02378dc048e24caabadbb6f559b813f62cfe20a7467f2ed4a6e1ab2 SHA512 6de943a14ec60df559c4e7f8e65362edc9d2f1a046ff8db25b15528617bb38a4877d8eea1e6873ad10780db8e41fbed31162afd686937bbe5b0612ca5c727f3f WHIRLPOOL 20150868a0356b33f7282fcdb0c1ab1c56b78e5187ba3d65c0ec14b93a1b7ac9170b3aa338c7d44558d71d746ab5c3da54e1b55ca0961df54bbda515d1fddb3c
+MISC ChangeLog-2015 1374 SHA256 c885c79f9a7184e7da7546ff99372aa87918c563cbc78b8f1af11c949443472f SHA512 8d5dd06e1d75e936586cc436b5868eaa0c78a605f0641425734f9eb3028c62c41e7e623d9b8ec9ee86fb050d6b0db223ac2f1c64b9500915fcddc74c3d586986 WHIRLPOOL fd276e0985b46553d4d3016325718c6386afaa2b63bb96cce611cfb3f95f1bd760099def147b7159055eb4ca5e34cda039e5d3554534187102a6276685a236bc
+MISC metadata.xml 302 SHA256 955d080e97e2b80bea3b0079d4e58ca599a8cf85984ea79bd99832068019630d SHA512 aa7e120d38115493ed4424ee798365ca7d5ab728d263c4dcca008420cb56254883628ef572b922f316237b1e6e2807f17651ac8dda4fde22573a84e56180b533 WHIRLPOOL ec6be520d7c0fd7d6d57012a5fd362459234dea94d1a51cf615f74bcc59e96d5f5bdf399d8d32b0e70c4eb0b5eaec2015175272096fdc18ce7dc1e3b10b64528
diff --git a/www-apache/mod_backtrace/files/10_mod_backtrace.conf b/www-apache/mod_backtrace/files/10_mod_backtrace.conf
new file mode 100644
index 000000000000..822efd2667fb
--- /dev/null
+++ b/www-apache/mod_backtrace/files/10_mod_backtrace.conf
@@ -0,0 +1,4 @@
+<IfDefine BACKTRACE>
+  LoadModule backtrace_module modules/mod_backtrace.so
+  EnableExceptionHook On
+</IfDefine>
diff --git a/www-apache/mod_backtrace/metadata.xml b/www-apache/mod_backtrace/metadata.xml
new file mode 100644
index 000000000000..a28b6a2da5c8
--- /dev/null
+++ b/www-apache/mod_backtrace/metadata.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<!-- maintainer-needed -->
+<use>
+  <flag name="unwind">
+    Use <pkg>sys-libs/libunwind</pkg> to provide better resolution of
+    function names.
+  </flag>
+</use>
+</pkgmetadata>
diff --git a/www-apache/mod_backtrace/mod_backtrace-2.01.ebuild b/www-apache/mod_backtrace/mod_backtrace-2.01.ebuild
new file mode 100644
index 000000000000..04115faa8877
--- /dev/null
+++ b/www-apache/mod_backtrace/mod_backtrace-2.01.ebuild
@@ -0,0 +1,35 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+inherit apache-module depend.apache
+
+DESCRIPTION="Debug segmentation faults in Apache threads"
+HOMEPAGE="https://emptyhammock.com/projects/httpd/diag/"
+SRC_URI="https://emptyhammock.com/downloads/wku_bt-${PV}.zip"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="unwind"
+
+RDEPEND="=www-servers/apache-2*[debug]
+	unwind? ( sys-libs/libunwind )"
+DEPEND="${RDEPEND}
+	app-arch/unzip"
+
+APACHE2_MOD_CONF="10_${PN}"
+APACHE2_MOD_DEFINE="BACKTRACE"
+
+need_apache2
+
+S="${WORKDIR}/wku_bt-${PV}"
+
+src_compile() {
+	APXS2_ARGS="-c ${PN}.c diag.c -ldl"
+	if use unwind; then
+		APXS2_ARGS+=" -lunwind -DDIAG_HAVE_LIBUNWIND_BACKTRACE=1"
+	fi
+	apache-module_src_compile
+}
diff --git a/www-apache/mod_bw/Manifest b/www-apache/mod_bw/Manifest
new file mode 100644
index 000000000000..19bdb289c736
--- /dev/null
+++ b/www-apache/mod_bw/Manifest
@@ -0,0 +1,7 @@
+AUX 11_mod_bw.conf 422 SHA256 00d512a4bc8b97610795957f5cbcaeb5dcf27c9d2602ee10f81c90bcfe275746 SHA512 8bbe8c7a2b83a6fe4dfa5849b447193b400de4bea9c3d70c4d4aac0d315eb16a3c48c9c75424a6d01c553c94a2fe500d7e01b8406201dbc34ed459961a2f8a7c WHIRLPOOL a02e3efdb3379e3c0ec3f7636b533298dab1e1d7dc4f2f93a264dc17b7db496727a5e067dce50ddd69d0a638add26a4191a1baad567d3ffec3b838f647e4c45c
+AUX mod_bw-0.9.2-apache24.patch 1637 SHA256 44d01f9bea2e793084054d22aace8df325dfda96336bf29920509be2b91412fa SHA512 93e16714477c8e35a5780db1480aa4ff733ee3e38e8ce43f80a7d4ac63052a98ea003716e37b37ca6fbe5efeb2621576c7efbbbfc835590852fd904a1babfda1 WHIRLPOOL dce7a9484b987ba8b740cb36edabca5066b3461789fb335edc358c8bab88df46a85c2558cc0c3ea8ba8b48ce02c12e11af65eb34b77ffb6db12a358252bcae2a
+DIST mod_bw-0.92.tgz 23816 SHA256 658eb3f63e2181ac0b6fc3ea33f0eaf637d6ef832c7df3a0e3f3d0cd2376cd7f SHA512 caa5c0eccb12498ca59428e0ac6b06e6a6c86c1126693071b5df20f32cc5a5673197b2e53e58c9edb0f0f8efd8d1c276cfdc9962cb90b219baf1bd0785ea2443 WHIRLPOOL 639bd389f9124973b5592865c6ecbc5402f0bf28876abf55f19fe5e2e43eaf61f00c615b52b6c2b62dbbfc0195efdf2967b0ce646e27368ad983ef3fa62ce546
+EBUILD mod_bw-0.9.2-r1.ebuild 535 SHA256 cfa95f90ee6da243c79059d364d1c6552f837a190a7b022cc97f9e5352c6d09d SHA512 e29794fbcf4f03491398e35982870d39a347401254dfba08a2f16b6bee436b69b9dfabb2b3dc499e6de20e9946de1456affd6363c66af2830b50965223411568 WHIRLPOOL fa28319e415731c293db9455afc09fa6ae0c30e5dfda6e3ef43d20f9480bde3e8c5aa0219d85e4c3d246bbc529fdd31c193d350c21cc2c1511bb255f1f908405
+MISC ChangeLog 2586 SHA256 389c2b9a568a1d3642b61ba6223ecf5b6f83d0e56c399b6b189f0e124824ad11 SHA512 3e7a639e2e2e65f288ff2bea20f70da9b195a851aa8cf1340d95f33788866566def1e450daa905546cef936776ac440ddb7866c0de4f3d6d40a63563d4aa4715 WHIRLPOOL a0661bbc9fef3fcfe8e4d83e1e1a43e45141baefc0d4b537b57c98b8b0e236a5295c26b5eb64d33131b1a7f4c1bb625df2c0850bdddd4c768890f4ba27702561
+MISC ChangeLog-2015 3831 SHA256 8202f4dd4deef49605f1da7a509df952bb14d20499b75afbaa16571c9ffb7813 SHA512 e9f34d6d564823814f8f250faee5af17379aa50f2f70e8ad26c3f77f6e933d5998ddd61ae1b1fc2ee7b1a9d10f1905048ad5d3e2e464ced4916ea6d7d24a2837 WHIRLPOOL 5480f364a551c5b2faa38316a0be94c675136554cd859285ac04fd8efcfeb539b24e7410d9d78ee67e7eeed67b8d2c47c5fb8e16841d04ca8d08737768cf5c72
+MISC metadata.xml 166 SHA256 2caff447f5bd2701d8456ada5cc633c41ef4373fa4bfeabeb73599d40bcc941b SHA512 a56648c974a1d14dd4c18237532773c72057a13ab90c58b5da04f185e3c12a8bd8d5c21fb06053507f31766291a82dc7d87b34cd65fd94cfe2af7295c813ef84 WHIRLPOOL 1ff70497eca6531f0e0614c72a19f4b8e5ff486a58d369f4f0b36308d1d6b01168f9da887740e3b9f536236be251d3fe05f904d27a9233a7cf613416ba882968
diff --git a/www-apache/mod_bw/files/11_mod_bw.conf b/www-apache/mod_bw/files/11_mod_bw.conf
new file mode 100644
index 000000000000..1d990612bdc5
--- /dev/null
+++ b/www-apache/mod_bw/files/11_mod_bw.conf
@@ -0,0 +1,16 @@
+<IfDefine BW>
+LoadModule bw_module modules/mod_bw.so
+
+# This must be turned on for mod_bandwidth to actually do anything
+# These directives can go inside a VirtualHost or Directory, etc...
+#BandWidthModule On
+
+# Limit 196.168.0.0/24 to 80KB/sec, with a minimum of 60KB/sec
+#BandWidth 196.168.0 80000
+#BandWidth 196.168.0 60000
+
+# Everyone else shares 50KB/sec
+#Bandwidth all 50000
+</IfDefine>
+
+# vim: ts=4 filetype=apache
diff --git a/www-apache/mod_bw/files/mod_bw-0.9.2-apache24.patch b/www-apache/mod_bw/files/mod_bw-0.9.2-apache24.patch
new file mode 100644
index 000000000000..27af0dbc1c6f
--- /dev/null
+++ b/www-apache/mod_bw/files/mod_bw-0.9.2-apache24.patch
@@ -0,0 +1,49 @@
+--- a/mod_bw.c	2010-07-20 18:14:30.000000000 +0200
++++ b/mod_bw.c	2014-03-31 14:36:27.064883758 +0200
+@@ -105,6 +105,10 @@ Changelog :
+     #define apr_atomic_set32 apr_atomic_set
+ #endif
+ 
++#define APACHE_VERSION_AT_LEAST(major,minor)                              \
++(((major) < AP_SERVER_MAJORVERSION_NUMBER)                                \
++ || ((major) == AP_SERVER_MAJORVERSION_NUMBER && (minor) <= AP_SERVER_MINORVERSION_NUMBER))
++
+ /* Enum types of "from address" */
+ enum from_type {
+     T_ALL,
+@@ -564,7 +568,11 @@ static long get_bw_rate(request_rec * r,
+             return e[i].rate;
+ 
+         case T_IP:
++#if APACHE_VERSION_AT_LEAST(2,4)
++            if (apr_ipsubnet_test(e[i].x.ip, r->useragent_addr)) {
++#else
+             if (apr_ipsubnet_test(e[i].x.ip, r->connection->remote_addr)) {
++#endif
+                 return e[i].rate;
+             }
+             break;
+@@ -655,7 +663,11 @@ static int get_maxconn(request_rec * r,
+             return e[i].max;
+ 
+         case T_IP:
++#if APACHE_VERSION_AT_LEAST(2,4)
++            if (apr_ipsubnet_test(e[i].x.ip, r->useragent_addr)) {
++#else
+             if (apr_ipsubnet_test(e[i].x.ip, r->connection->remote_addr)) {
++#endif
+                 return e[i].max;
+             }
+             break;
+@@ -706,7 +718,11 @@ static int get_sid(request_rec * r, apr_
+             return e[i].sid;
+ 
+         case T_IP:
++#if APACHE_VERSION_AT_LEAST(2,4)
++            if (apr_ipsubnet_test(e[i].x.ip, r->useragent_addr)) {
++#else
+             if (apr_ipsubnet_test(e[i].x.ip, r->connection->remote_addr)) {
++#endif
+                 return e[i].sid;
+             }
+             break;
diff --git a/www-apache/mod_bw/metadata.xml b/www-apache/mod_bw/metadata.xml
new file mode 100644
index 000000000000..6f49eba8f496
--- /dev/null
+++ b/www-apache/mod_bw/metadata.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<!-- maintainer-needed -->
+</pkgmetadata>
diff --git a/www-apache/mod_bw/mod_bw-0.9.2-r1.ebuild b/www-apache/mod_bw/mod_bw-0.9.2-r1.ebuild
new file mode 100644
index 000000000000..c6bc263c140a
--- /dev/null
+++ b/www-apache/mod_bw/mod_bw-0.9.2-r1.ebuild
@@ -0,0 +1,29 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+inherit apache-module eutils
+
+DESCRIPTION="Bandwidth Management Module for Apache2"
+HOMEPAGE="http://www.ivn.cl/apache/"
+
+SRC_URI="http://ivn.cl/files/source/${P/9./9}.tgz"
+
+KEYWORDS="amd64 ppc x86"
+LICENSE="Apache-2.0"
+SLOT="0"
+IUSE=""
+
+DEPEND="sys-devel/libtool"
+RDEPEND=""
+
+APACHE2_MOD_CONF="11_${PN}"
+APACHE2_MOD_DEFINE="BW"
+
+need_apache2
+
+S="${WORKDIR}"
+
+src_prepare() {
+	epatch "${FILESDIR}/${P}-apache24.patch"
+}
diff --git a/www-apache/mod_caucho/Manifest b/www-apache/mod_caucho/Manifest
new file mode 100644
index 000000000000..0443847056c2
--- /dev/null
+++ b/www-apache/mod_caucho/Manifest
@@ -0,0 +1,6 @@
+AUX 88_mod_caucho.conf 496 SHA256 6b12d77e108f406ea311564de19a3e34393b74bfd4d35fabbd66d23d86338dfa SHA512 0e0751e633af0734e95306d26a05e6e6c8dd301862a46a47ebfa04721f648a16f5615554fd3a52288cef14bb9fb4786b11720fd96db7e8f6dcfdae651e578a26 WHIRLPOOL f5b0474955a953d479b3d0a683d71c56723a09d8d1456d5010f0a20f15ecae990da3e2ed5e7f12f3a9f864052ebadad3d4524002f5f694ec2f12bea0c4639751
+DIST resin-4.0.47-src.tar.gz 33022378 SHA256 b97ce450a1059336a4cdf05a16d072128009f7172d028a3b1c2f4eefba4d353a SHA512 c070277c970144a990c45afc86b0626d424618c0ec8122cd7e0e60745339a7f79f5d47483b5a33c24f7fb192e72a2d49823155718b8565a2c273333119279703 WHIRLPOOL 3e703a7c68c0c6cc930277e918656d11a1ff65e5f8bbfccb9dac7ea41b22a7f65b2d28efae8fdbaa181402d0416d87db56f9c974f76f2d5d075db92df8a32f0c
+EBUILD mod_caucho-4.0.47.ebuild 1199 SHA256 ba42b4d511a3cb895b033d3dbea70c7cc415e3f424bb33b0a3e533cb191465a1 SHA512 4dd17ea0b82eb3b7f4655254f67178521e152c22c9f37f236e1325fe98240107045d90461c4a97ddaf7eb5e47efda3bb419c77307d382469e1b6b8162065bbe4 WHIRLPOOL fa42d80b15e021926027c0dc9b90697f753bf343b6d2a8af2587cbce6208485ae1ee46922b5d95f9ac598b9bfdf20ca916db89169089c046cd5fd42f4becaa0a
+MISC ChangeLog 3494 SHA256 b5e82acfd10fed08019e5a699937d0303bd2c7be0b8b30ba1cc57eadae78a754 SHA512 016fa002c66af04f53deaa41ac5ac8afd9aed16717c6bce523480c121b4ec0ddfae76b00c9820390e1eebc8ea0d60c0b29323ecb37b2d730d5842dc598d9752e WHIRLPOOL 3c879a886577ae6ffd7ee61c1bdd3413d3ff13047b93de5999ea71f0f0bb1c8b2dd2de9173947d2d168f75ea73b5cefe27113bc8afb5ad27fd18e0c4b87b5480
+MISC ChangeLog-2015 13195 SHA256 28f3bf7736d2f8693c531c3a35ab240ba7376b8bcaac98105376c0eebc8ed4ad SHA512 55653b081c8880707385210189721917ee0d8254de1a2ec67657e6efcf6af45e8163138436a838c84c8034baf8787f9a681dc814070433e288eed8e86c1d9bbe WHIRLPOOL 1894cf246ae574808bf96574ba21988754f40d481aa1dbd484c145290e1d39b2e6037d2d8fba3e1cdc10aebe393d1e48285b9d1257f6ac17fa2cda8b14bfb834
+MISC metadata.xml 236 SHA256 3e778d35b34b5cc1a4dd7ce105fe7d2a99b25fb6dfe24709455da94baa8a0548 SHA512 1755c2590e59060f697294c5ad125b83f2d50e05a71f7091b7de75953941914cd2db3a893bd6154a2c90fa4aff5e313e75e3e174dbba1edd5c112787da5be253 WHIRLPOOL 7967660784d0d28e9a3c3c222c5bf85b3a8b59fd84b61780e4e7cc1aa5d8bd87bee40e4c5c42e646f15d6641fe182340bcbe8be94c785f40e0ac870c7a96e5cc
diff --git a/www-apache/mod_caucho/files/88_mod_caucho.conf b/www-apache/mod_caucho/files/88_mod_caucho.conf
new file mode 100644
index 000000000000..20e0e7081136
--- /dev/null
+++ b/www-apache/mod_caucho/files/88_mod_caucho.conf
@@ -0,0 +1,21 @@
+<IfDefine CAUCHO>
+# Load module:
+LoadModule caucho_module modules/mod_caucho.so
+
+# Define first Resin server:
+ResinConfigServer localhost 6802
+
+# If you want to use load balancing add more hosts:
+# ResinConfigServer host1.example.com 6802
+# ResinConfigServer host2.example.com 6802
+
+# This enables status page of server: http://localhost/caucho-status
+CauchoStatus yes
+
+# To use this module:
+#<Location /webapp/*>
+#	SetHandler caucho-request
+#</Location>
+</IfDefine>
+
+# vim: ts=4 filetype=apache
diff --git a/www-apache/mod_caucho/metadata.xml b/www-apache/mod_caucho/metadata.xml
new file mode 100644
index 000000000000..952a4b9b605c
--- /dev/null
+++ b/www-apache/mod_caucho/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="project">
+		<email>java@gentoo.org</email>
+		<name>Java</name>
+	</maintainer>
+</pkgmetadata>
diff --git a/www-apache/mod_caucho/mod_caucho-4.0.47.ebuild b/www-apache/mod_caucho/mod_caucho-4.0.47.ebuild
new file mode 100644
index 000000000000..6987de2600c6
--- /dev/null
+++ b/www-apache/mod_caucho/mod_caucho-4.0.47.ebuild
@@ -0,0 +1,38 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+inherit eutils apache-module
+
+DESCRIPTION="mod_caucho connects Resin and Apache2"
+HOMEPAGE="http://www.caucho.com/"
+SRC_URI="http://www.caucho.com/download/resin-${PV}-src.tar.gz"
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc64 ~x86"
+
+need_apache2_4
+
+APACHE2_MOD_CONF="88_${PN}"
+APACHE2_MOD_DEFINE="CAUCHO"
+
+S="${WORKDIR}/resin-${PV}"
+
+# Although building this manually with apxs is bad, trying to make the
+# build scripts behave is worse. You have to:
+#
+# * Patch configure.ac and Makefile.in to respect flags.
+# * Run eautoreconf (or patch configure and chmod it too).
+# * Inherit java-pkg-2, DEPEND on virtual/jdk, and define pkg_setup just
+#   to needlessly satisfy configure or patch out large chunks of it.
+# * Define src_compile to only build the Apache module.
+# * It will still report an implicit declaration of cse_free. If you try
+#   to fix this, it will complain that the argument count doesn't match.
+
+APXS2_S="${S}/modules/c/src/apache2"
+APXS2_ARGS="-c -DAPACHE_24 -I../common ${PN}.c ../common/stream.c ../common/config.c ../common/memory.c"
+
+src_configure() {
+	:
+}
diff --git a/www-apache/mod_common_redirect/Manifest b/www-apache/mod_common_redirect/Manifest
new file mode 100644
index 000000000000..4c392ef04ed1
--- /dev/null
+++ b/www-apache/mod_common_redirect/Manifest
@@ -0,0 +1,6 @@
+AUX 20_mod_common_redirect.conf 133 SHA256 104eb0e02ebbfd407593d79bdbfe74a09a410b253400c5ba3f2fd1d992d317c4 SHA512 5152736abde393b0ab9e1df1167cdaaf951ef23ad83e53482eacad4a49b3cdef9d840bc4d0ff38504ea2bdb0d78dc5e5075b2e83726068d495b1aafd30f39d69 WHIRLPOOL f55364b1d8abd1e3295f80ea80930dd048e5b550ed357b76c984a4309addb30bd8deab6762f327e87201cea839e2af9c7a60c18fce0fbd7063f28d9e97e8eef6
+DIST mod_common_redirect-0.1.1.tar.gz 3341 SHA256 d51b48c5fd140b051055339c79719597e194f38d1cee7149ee98669772d97c23 SHA512 861f7db59095f35b760ab67e703a6ae40c0f31d310c9b9498d7d477ffcdf1f1f673fd0f637acbd1c3911ac140581dfa49457ae56602035f8e834f56774706263 WHIRLPOOL 0e6e9592d1f8b241fb3b021ecfb1930894aaa0c3c60171a6ae60245a10d8ee99809ad3fe1f8282081e57969b937ea48e0a4906b92f9b8b38be09f9d20b304e0c
+EBUILD mod_common_redirect-0.1.1.ebuild 698 SHA256 5f86015af7aeacec89cf5310491e8385ebab524760b22d35d3a27c0c91b9cc2a SHA512 99e9e42829f66cff3384e0ac79eafa858d48b7944bf7df0cb6c8f983b4df64e6f2a6c471585252e6f61292200c7915d32852c18a52c71f04343745a2719035ed WHIRLPOOL 0e8b5f0622dec4955ffbd94de0a3674601813c10f0bf515795c76039ad76587c5f9b8c123b7914b3179daf569952de4213c60c708877e85c35eac8fc42e580f1
+MISC ChangeLog 2996 SHA256 2e371632c27f2d401f25e6ed7be56f94b4a29a4b998b659c0ae801dc397ad996 SHA512 b0508fcc2a9e17039054664a6ddbfe55b19f2a37ec0f85a297ef4084727fca884dfdd364bad891e3e095554bccb2ddc0def029e4c1a03931838f066ba5077d9e WHIRLPOOL 3048c9da0a4678350c9854be65959c7ca19bca4622f1e6d8b823c20cc88dbd81bea146e81d07791faa3412b6fe20d8b091144adad60dcf78db0edc3d1a7c424d
+MISC ChangeLog-2015 1241 SHA256 1222ee655713bf1e1de1d3a411e0c371f44756dd7661d34e7c061b4bc6cb90a6 SHA512 cf7ede20c99bde02799d2913c29160013f92551c2b63f701c6063e27606c7a4ca0def15eabc2b11560159e9ede9057c2c007da73d5a78e0805c2125e943e0b66 WHIRLPOOL d5685bce656658f4574c4d463d148c529f2260479c4b62b3c63b1760d9c5f82e5fc4774cc79de38ac8b92277d42288352d96b76fcf4e4b4078989d141358e663
+MISC metadata.xml 258 SHA256 02e9ea004837cc31cea229f648c3295abb4ffb8166884109b7da9d22c9371290 SHA512 c01fb3d6cdc9ad3bcf61ef3957c6fe9e2202cc99ba05ece5bec1971c8f608c3dc057c506fb0ee680e44488c76aa6f871a1d3549323b3f6b5e1d3075950ed41ab WHIRLPOOL 11ace723287f78ee14995d743434384af7053501607e24eb8fd0c382234807471848b560ba0b527c744a7c9f00225ec5a739a7f9758c78d0005b0c1534ce8487
diff --git a/www-apache/mod_common_redirect/files/20_mod_common_redirect.conf b/www-apache/mod_common_redirect/files/20_mod_common_redirect.conf
new file mode 100644
index 000000000000..f2d135e66ecd
--- /dev/null
+++ b/www-apache/mod_common_redirect/files/20_mod_common_redirect.conf
@@ -0,0 +1,5 @@
+<IfDefine COMMON_REDIRECT>
+LoadModule common_redirect_module modules/mod_common_redirect.so
+</IfDefine>
+
+# vim: ts=4 filetype=apache
diff --git a/www-apache/mod_common_redirect/metadata.xml b/www-apache/mod_common_redirect/metadata.xml
new file mode 100644
index 000000000000..00699924dd1e
--- /dev/null
+++ b/www-apache/mod_common_redirect/metadata.xml
@@ -0,0 +1,8 @@
+<?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">hollow/mod_common_redirect</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/www-apache/mod_common_redirect/mod_common_redirect-0.1.1.ebuild b/www-apache/mod_common_redirect/mod_common_redirect-0.1.1.ebuild
new file mode 100644
index 000000000000..8f49770faaca
--- /dev/null
+++ b/www-apache/mod_common_redirect/mod_common_redirect-0.1.1.ebuild
@@ -0,0 +1,29 @@
+# Copyright 1999-2011 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=4
+
+inherit apache-module
+
+GITHUB_AUTHOR="hollow"
+GITHUB_PROJECT="mod_common_redirect"
+GITHUB_COMMIT="595a370"
+
+DESCRIPTION="mod_common_redirect implements common redirects without mod_rewrite overhead"
+HOMEPAGE="https://github.com/hollow/mod_common_redirect"
+SRC_URI="https://nodeload.github.com/${GITHUB_AUTHOR}/${GITHUB_PROJECT}/tarball/v${PV} -> ${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="amd64 x86"
+IUSE=""
+
+DEPEND=""
+RDEPEND=""
+
+APACHE2_MOD_CONF="20_${PN}"
+APACHE2_MOD_DEFINE="COMMON_REDIRECT"
+
+need_apache2
+
+S="${WORKDIR}"/${GITHUB_AUTHOR}-${GITHUB_PROJECT}-${GITHUB_COMMIT}
diff --git a/www-apache/mod_depends/Manifest b/www-apache/mod_depends/Manifest
new file mode 100644
index 000000000000..1ca963e2b45d
--- /dev/null
+++ b/www-apache/mod_depends/Manifest
@@ -0,0 +1,6 @@
+AUX 0.7/09_mod_depends.conf 109 SHA256 275ebf0f626c4d0d62d22fed25db7961b1f5fa3dcce8649635aa412d46db8a29 SHA512 cbbc85641aedd1ae0bdd0495770de834654f9181a270cfb54273d14be27622603f7870b868ff149dcee3298827fd41baa41ba7ca9b96456c2dbd5b1655e9f1c1 WHIRLPOOL 7227fe8ca6fe4dab3a1a0ddb8787870628e71dccccef92daf93b297efc2214a195c415053c550baaddafc4796db501ea9ec4b43637ff99106a9c413074d9ad38
+DIST mod_depends-0.7.0_p200702041.tar.bz2 232205 SHA256 726c3a6f188ce8cd6e55241bef16146824694c4ed24bbb0b469df03f2c5f32a4 SHA512 2680a16e2907b3dae774e665ef2db1cc051634bf1b136b11fda822f0d56e6e4d6ec984016ec24dca300fbb70d1d65d53c2ea4331b1735da3be74bc9550722df7 WHIRLPOOL ca2c5a836b73430ce6144bf98d92a9651f5fd06eeeb40a7e6e82792618edd1aa520632fffedb15bdfd07bb6e35498030ec037de55e96883b14962722a44f19cd
+EBUILD mod_depends-0.7.0_p200702041.ebuild 776 SHA256 020099e3f4ed10b454fd5c69e45fd6841638d6f5fa9d5b24b8584473328eb128 SHA512 37028149eadb9b5646e26d93264729674d84e3ce1b41dd2d310df167ec5d5d9b027331088eaded74aa60ec15249fd8e5c97416520d2be165d8619290b139b426 WHIRLPOOL 263d55230b8cba66f8006ef60dde8816f9bce98f700e04ae9ff4ce499380e02971de3e57beca0363a3a062c80da1ef79745948a0c60c95bbf81d0a8c28715867
+MISC ChangeLog 2592 SHA256 0268b01b3e4442b8fe9300bf3fdde5ba9d0d66f3825764205204effef927432d SHA512 7bd90bf92c92611d473c84615c23e91570cf909a8a9944f41cc461cae2fb5425177df1407d6137252328dbbdf699d1b7ac221f4adfa1abd4388ba27d27548ef5 WHIRLPOOL 4b9bb0873fb380ebc5d73a6a7fe27f7c56a1fb44e85b2a5f1c44453be6313e721641d9e8b2d0cd0730235e9f09fc21931a220d63af3b332c76a45cffc3cfed06
+MISC ChangeLog-2015 1116 SHA256 21d9f6a4eb0c4011bb341eeb778a734e95dd24cfd87a307f296bdf14753dcaab SHA512 54302a6269e19245077a4232563fa6368ab666cbe7dd671bce57f426cb0b232d47c60411e888735d72e930045bfc670b54b7a39bcb8428ffcc16b55b6daedc86 WHIRLPOOL c9cdd3f02c95fc6860b65966af9a235d4fda56ca2bc5d1dea18a30cc02a4f56735a3c2869e87a62c468163c112fd27ca1d60ea9abfd97e8df3c18040f1088542
+MISC metadata.xml 166 SHA256 2caff447f5bd2701d8456ada5cc633c41ef4373fa4bfeabeb73599d40bcc941b SHA512 a56648c974a1d14dd4c18237532773c72057a13ab90c58b5da04f185e3c12a8bd8d5c21fb06053507f31766291a82dc7d87b34cd65fd94cfe2af7295c813ef84 WHIRLPOOL 1ff70497eca6531f0e0614c72a19f4b8e5ff486a58d369f4f0b36308d1d6b01168f9da887740e3b9f536236be251d3fe05f904d27a9233a7cf613416ba882968
diff --git a/www-apache/mod_depends/files/0.7/09_mod_depends.conf b/www-apache/mod_depends/files/0.7/09_mod_depends.conf
new file mode 100644
index 000000000000..ff2226e74077
--- /dev/null
+++ b/www-apache/mod_depends/files/0.7/09_mod_depends.conf
@@ -0,0 +1,5 @@
+<IfDefine DEPENDS>
+LoadModule depends_module modules/mod_depends.so
+</IfDefine>
+
+# vim: ts=4 filetype=apache
diff --git a/www-apache/mod_depends/metadata.xml b/www-apache/mod_depends/metadata.xml
new file mode 100644
index 000000000000..6f49eba8f496
--- /dev/null
+++ b/www-apache/mod_depends/metadata.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<!-- maintainer-needed -->
+</pkgmetadata>
diff --git a/www-apache/mod_depends/mod_depends-0.7.0_p200702041.ebuild b/www-apache/mod_depends/mod_depends-0.7.0_p200702041.ebuild
new file mode 100644
index 000000000000..1264d04dd548
--- /dev/null
+++ b/www-apache/mod_depends/mod_depends-0.7.0_p200702041.ebuild
@@ -0,0 +1,36 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+inherit eutils apache-module
+
+DESCRIPTION="An apache helper module for handling dependencies properly"
+SRC_URI="http://upstream.rm-rf.in/${PN}/${P}.tar.bz2"
+HOMEPAGE="http://www.outoforder.cc/projects/apache/mod_depends/"
+
+SLOT="0"
+LICENSE="Apache-2.0"
+KEYWORDS="~amd64 ~ppc ~x86"
+IUSE=""
+
+APACHE2_MOD_CONF="0.7/09_${PN}"
+APACHE2_MOD_DEFINE="DEPENDS"
+
+need_apache2
+
+src_compile() {
+	econf --with-apxs="${APXS}" || die "configure failed"
+	emake || die "make failed"
+}
+
+src_install() {
+	AP_INCLUDEDIR=$(${APXS} -q INCLUDEDIR)
+
+	insinto ${AP_INCLUDEDIR}
+	doins include/mod_depends.h || die
+
+	mv -v src/.libs/{lib,}mod_depends.so
+
+	apache-module_src_install
+}
+
+# vim:ts=4
diff --git a/www-apache/mod_diagnostics/Manifest b/www-apache/mod_diagnostics/Manifest
new file mode 100644
index 000000000000..45063ce97b7c
--- /dev/null
+++ b/www-apache/mod_diagnostics/Manifest
@@ -0,0 +1,6 @@
+AUX 20_mod_diagnostics.conf 127 SHA256 2573e9771588e9a0cf668d3de63d7d7a396d3ed369b8ec0a93e5b7b0c204dee6 SHA512 ab19ed00552ac8424b773aea82b6760936cb1574e7dd43adc980c71fe6649419d8de6948a55c33b848ffa62cddff9680b202b7e1911f8448760d8b9f82b48692 WHIRLPOOL 6d6dd0ffb5513b0cbb4393c8a2fac992940c1fe31c229572235f53ce223c5557395c95f8db534c3fb8f4fccc79d7404b567baae5384133fc40d0cc9a38e32d17
+DIST mod_diagnostics-0.0.1.c 6373 SHA256 838947b5019dfb865dc2fcaca5acaeff123bde6f83dc2dd9064fb1153cd1ea14 SHA512 b6f6498f70e37279508ca732aa3bbeb7180175ac35f16cfb88fa2c7558edec64b1cc3659b4516909888119f7984d51a98cadc9ef07480fdff5eac72174e8835b WHIRLPOOL b82a602279177211f9edc8d2400511999246a3082ea3961a3d43d6fafa11b9798e6f462d44ddb36d1e100cdf40a7c60b83209b5650281900abc79f4d4109a341
+EBUILD mod_diagnostics-0.0.1.ebuild 589 SHA256 f60ec5f54ae5e91e08712835ccd9584ba6145100b8dd80c62fdf87dc37ab2bee SHA512 ce38f5ac2dc51acb68b963435e6c0c08299bb9a7d16f567ff592124aa47e2bb06fc828a9f1db1d7803a22b1589fc5ec1ef6ea3a4de8ae39bad420e703aa68123 WHIRLPOOL ee327f8e83e0136156256f360c68489d570dd2644445180848a54e75ab869c630af72394a91a2ade9cbfbdea39e17655191be6631fff715f9564511160a109b4
+MISC ChangeLog 2582 SHA256 e7039e4aeb5c3a038131c97e437d34ab301f2e70b416cb18e032eb0ff2569bae SHA512 2db9306b4cde0506855c483e56015ca5be304c6540fcd062046fa416461bc4e092602f3d4827e2f37fdb5888f171ff930378dac12ab2e0f4076ac0e6a181d5fe WHIRLPOOL 7c2553903b9d9eb02cb32354d288b3c6a33c4057456b11262acd2216e8bf9d5942f3c593632131d34be0cebec6c421954a65720d8ae957f9954f8bc6fffd6886
+MISC ChangeLog-2015 1259 SHA256 8457925271ca5e26bdf1717ba1b195392175c9d3f60e3f7f01110b942cd68ca4 SHA512 025a208391e51887cfbc73adfeed14a58cb58d299acdaf67e31ee8361eb68c45a1311250c82fda8ac2bec1ea80614d653d56d0817e8acbfa6297bbc5d856867d WHIRLPOOL 10e8cc9adebe458ad708166aafd4f3ef741b51d916a259e4ebdb7c4fc820a7ab7bbc76b353da4db48ea0fc0af1c272439987a9eec722647c971fdd0ea8a9c132
+MISC metadata.xml 166 SHA256 2caff447f5bd2701d8456ada5cc633c41ef4373fa4bfeabeb73599d40bcc941b SHA512 a56648c974a1d14dd4c18237532773c72057a13ab90c58b5da04f185e3c12a8bd8d5c21fb06053507f31766291a82dc7d87b34cd65fd94cfe2af7295c813ef84 WHIRLPOOL 1ff70497eca6531f0e0614c72a19f4b8e5ff486a58d369f4f0b36308d1d6b01168f9da887740e3b9f536236be251d3fe05f904d27a9233a7cf613416ba882968
diff --git a/www-apache/mod_diagnostics/files/20_mod_diagnostics.conf b/www-apache/mod_diagnostics/files/20_mod_diagnostics.conf
new file mode 100644
index 000000000000..7600654ea7f1
--- /dev/null
+++ b/www-apache/mod_diagnostics/files/20_mod_diagnostics.conf
@@ -0,0 +1,5 @@
+<IfDefine DIAGNOSTICS>
+LoadModule diagnostic_filter_module modules/mod_diagnostics.so
+</IfDefine>
+
+# vim: ts=4 filetype=apache
diff --git a/www-apache/mod_diagnostics/metadata.xml b/www-apache/mod_diagnostics/metadata.xml
new file mode 100644
index 000000000000..6f49eba8f496
--- /dev/null
+++ b/www-apache/mod_diagnostics/metadata.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<!-- maintainer-needed -->
+</pkgmetadata>
diff --git a/www-apache/mod_diagnostics/mod_diagnostics-0.0.1.ebuild b/www-apache/mod_diagnostics/mod_diagnostics-0.0.1.ebuild
new file mode 100644
index 000000000000..95aad5b617c5
--- /dev/null
+++ b/www-apache/mod_diagnostics/mod_diagnostics-0.0.1.ebuild
@@ -0,0 +1,26 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+inherit apache-module
+
+KEYWORDS="x86"
+
+DESCRIPTION="An Apache2 module which can do debugging of modules in the Apache2 Filter Chain"
+HOMEPAGE="http://apache.webthing.com/mod_diagnostics/"
+SRC_URI="mirror://gentoo/${P}.c"
+LICENSE="GPL-2"
+SLOT="0"
+IUSE=""
+
+DEPEND=""
+RDEPEND=""
+
+APACHE2_MOD_CONF="20_${PN}"
+APACHE2_MOD_DEFINE="DIAGNOSTICS"
+
+need_apache2
+
+src_unpack() {
+	mkdir -p "${S}" || die "mkdir S failed"
+	cp -f "${DISTDIR}/${P}.c" "${S}/${PN}.c" || die "source copy failed"
+}
diff --git a/www-apache/mod_dnsbl_lookup/Manifest b/www-apache/mod_dnsbl_lookup/Manifest
new file mode 100644
index 000000000000..bd8a32e88fea
--- /dev/null
+++ b/www-apache/mod_dnsbl_lookup/Manifest
@@ -0,0 +1,6 @@
+AUX 09_mod_dnsbl_lookup.conf 195 SHA256 a34c506c717a14633dd856e57de428ed28297747ee147453691eec2aac7576d2 SHA512 2ce549bfd1bddc2f319c2a30ed0c7a73d5e5ac330e33bf329995ebc40c2deac9efab14e849949c639d7cc3b2946bf0a8903f578b8f4998a4eee0247a027f3ab4 WHIRLPOOL c30df678717432602e989132ce012564c212f15e445a50d5e45bc5ba9b0e5e128e44d518107744afe4375a9bffa96f990cae308ce2a220e87921acd9b3aa4008
+DIST mod_dnsbl_lookup-0.91.tar.gz 7344 SHA256 62a2c881c96453bdbf79aa6e3033044074a99ddf749fea734c955e73b26b3d69 SHA512 18213d40d14aaadd72ef3d84a1408ba384596e71fb3821a7ad882f82eecbac7e06ce476943a12692446f04d96cbb668c36ff59da4e6a600384e17537b5389948 WHIRLPOOL 90c0cdc2a690a691f7d4c9868f96f139d3d29b72227b5c3fb96fd2bea8b2782dc5146464e33619f0110824f4f064ee3f512ea5dd7fbc544ffc0f88180fdb756f
+EBUILD mod_dnsbl_lookup-0.91.ebuild 549 SHA256 2fabd103d1df392f281dbb5a0abf6db1d71f0f45dc93e2e571f223a81553c50e SHA512 c08533f6c82428690713821a402833222e198d445238db8651c87f41c062863ae66f4849b76fd34a4ccd8263a1a138e33f557be523a9bf9049f4b4ebd6e4b27b WHIRLPOOL ee94c017cc67fc0e82bda42cb609f6f1df663cf509163e5bbe312b63271322152af96464b3a95d0b8fe8ef279780ba2df8adedc8eb5c14cd12b97a6fd3084c54
+MISC ChangeLog 2584 SHA256 2093f699b77f201a12ba02d87d22c061b5b7108c594009b58aec36a993025a1d SHA512 76600ad38e8fb0e5354e4cc020ca6231b72d72f6d9833837cccfaabba3a881e7b9eea764ba8199ce2e677b923b6b4ad5c95bf1b057da72d294f45615ff1e376f WHIRLPOOL 1720ca24129716fce24c437afe4ddd4220ff6aea13d162c676bdc5913585b25a8708396ba5366ed87aefd149b3403539f884b2292ddcaaab7d1e6f2ce133ba8e
+MISC ChangeLog-2015 845 SHA256 b285d7db96f480b8fc82a25f55a74c6837d814d0bd8ac70503a48c4d40886708 SHA512 962308dd09d371e8c8ae450aa05863dc14ecd24e0d5268fdfed4849abce1443ad4d1c0cd1f11d14fcbfad89269aaa662ed454af8c20928ea46b0d079f4ccdf88 WHIRLPOOL 065d33d5398dbf66e66a6fd22c8371e754cd1e5f0282462903b2efd18a8c210501c724ac74442f792d11070e2ccfe42e95b2d90ed1096b64c006b9e1fc17120c
+MISC metadata.xml 166 SHA256 2caff447f5bd2701d8456ada5cc633c41ef4373fa4bfeabeb73599d40bcc941b SHA512 a56648c974a1d14dd4c18237532773c72057a13ab90c58b5da04f185e3c12a8bd8d5c21fb06053507f31766291a82dc7d87b34cd65fd94cfe2af7295c813ef84 WHIRLPOOL 1ff70497eca6531f0e0614c72a19f4b8e5ff486a58d369f4f0b36308d1d6b01168f9da887740e3b9f536236be251d3fe05f904d27a9233a7cf613416ba882968
diff --git a/www-apache/mod_dnsbl_lookup/files/09_mod_dnsbl_lookup.conf b/www-apache/mod_dnsbl_lookup/files/09_mod_dnsbl_lookup.conf
new file mode 100644
index 000000000000..ae944d34c1a4
--- /dev/null
+++ b/www-apache/mod_dnsbl_lookup/files/09_mod_dnsbl_lookup.conf
@@ -0,0 +1,7 @@
+<IfDefine DNSBL>
+LoadModule dnsbl_lookup_module modules/mod_dnsbl_lookup.so
+DNSBLZone spammers dnsbl.ahbl.org any
+DNSBLZone spammers sbl.spamhaus.org any
+</IfDefine>
+
+# vim: ts=4 filetype=apache
diff --git a/www-apache/mod_dnsbl_lookup/metadata.xml b/www-apache/mod_dnsbl_lookup/metadata.xml
new file mode 100644
index 000000000000..6f49eba8f496
--- /dev/null
+++ b/www-apache/mod_dnsbl_lookup/metadata.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<!-- maintainer-needed -->
+</pkgmetadata>
diff --git a/www-apache/mod_dnsbl_lookup/mod_dnsbl_lookup-0.91.ebuild b/www-apache/mod_dnsbl_lookup/mod_dnsbl_lookup-0.91.ebuild
new file mode 100644
index 000000000000..445d25a457fa
--- /dev/null
+++ b/www-apache/mod_dnsbl_lookup/mod_dnsbl_lookup-0.91.ebuild
@@ -0,0 +1,28 @@
+# Copyright 1999-2008 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+inherit apache-module eutils
+
+KEYWORDS="~amd64 ~x86"
+
+DESCRIPTION="A helper module for Apache2 providing DNSBL lookup"
+HOMEPAGE="http://www.sysdesign.ca"
+SRC_URI="http://www.sysdesign.ca/archive/${P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+IUSE=""
+
+DEPEND=""
+RDEPEND=""
+
+APACHE2_MOD_CONF="09_${PN}"
+APACHE2_MOD_DEFINE="DNSBL"
+
+need_apache2
+
+src_install() {
+	apache-module_src_install
+	insinto $(${APXS} -q INCLUDEDIR)
+	doins dnsbl_lookup.h
+}
diff --git a/www-apache/mod_dnssd/Manifest b/www-apache/mod_dnssd/Manifest
new file mode 100644
index 000000000000..4059a808e306
--- /dev/null
+++ b/www-apache/mod_dnssd/Manifest
@@ -0,0 +1,8 @@
+AUX 80_mod_dnssd.conf 118 SHA256 578105c2e7aac757101853945bce59a9033c0fe7a642762bc439b60cc887d489 SHA512 ef13ddde307b6e4c8e48727d1d2145ca3ae99f8e105d4606628edd86576fde0ba4dd3cb6fb71a95d66a523e90cf30e5a3608d581760038f147f137fa5c6c4e28 WHIRLPOOL ac125ec4042b281fb394bcf52b984d752befccef075ed2965a2621ab533053457dfd9a62c72131f39304aa38b85caa54dbd5de49204afa41982fe767eb1fbe3e
+AUX mod_dnssd-0.6-httpd24.patch 603 SHA256 a12265e9397204ab078b133da01770acfd69ad3f7abb4b1bec9e8ec83e5c6e21 SHA512 c8e3428a1b4dfe0a24ed244ed30eb8b1181642a05d75de2b2b61ea48168f881b026d6c3fd0fbdfcc344736a1d93e4458853853e335076e498d6df091ccdde228 WHIRLPOOL 9e41382e124e05626052c4997f62f85cd31569c7897536e7ffe218c3a2dda67574786c7fbac5bdb96370317f4c8d6de36e70176d48fce9004e19ccf160ae8261
+AUX mod_dnssd-0.6-ldflags.patch 571 SHA256 d9375c3a536cea1413b108a7b7281d4772fa3cb68d0a57f7ec1a3b4b90bdf831 SHA512 419c9565ac03a352568b3ab97e03e6878b5721a455fdd8f07f328d4a64ab401776f3a5ccd2a31e10b64fbbf334693c8f6e3636ed65f9f06f6f83d433f6366d6c WHIRLPOOL e48c58a8a2f670902fc5427e1b8221befb5f4edab288a19a4055fec65eeae4cef465129810b49896d2c6977167ff48e836d40f92eadaed34ece8ae0fcf3c7866
+DIST mod_dnssd-0.6.tar.gz 86417 SHA256 2cd171d76eba398f03c1d5bcc468a1756f4801cd8ed5bd065086e4374997c5aa SHA512 c3eacd2065f996ace76496b828a5be4b735225782c88ed0fba00c37ffed91af7c81cef755556968880e11e05fbaf65a4326728cb82abcad03ccaf925be1f29d3 WHIRLPOOL aa27272b8e35fcc492e7265171ce720f9cefc157fdb9f4997474f669e97d168ce851f6351c8857dd8bf01d3e0ea2c87085de1aa2ddb114317d0649b84a2717ba
+EBUILD mod_dnssd-0.6-r1.ebuild 872 SHA256 adaf675e6f02404d6c8f846534ac4d07b27da88e8587bbcd464c3f24a6dfde63 SHA512 b28c0309ff6e3f407e4fb848e6799e6958537422049685b8245b7a0c9e4c54dbccee5cf879b72a80715367d090230239b6f76defd5f095781ce5d7e42168bfbf WHIRLPOOL 42580265968ebb04b3d49ac424ac1f7977bf2e7d26cee9936edcc396a365d0f6bb05611a90b4867ca69241f2dd08e1ab4e12053e187d47b24cce09d42f25384a
+MISC ChangeLog 2632 SHA256 e276621cf3b6e6679a903879ea0e62509812dc689403d8f8a67a21853fb68b73 SHA512 4caf2049810e03d2939670245b5427a2e712148471ad09798ddc3e1d52f6468491302816f3de4bf620ca6db226dd2980c0673355b5cea37b39d0f8a47b2b7a47 WHIRLPOOL a250275dc417b6f46d710cb28f33299b20accf9c84c1655fd63c460c82fbff7def5309f1bfb9d07b7b1bb94439ebbc58c2a63c36f5dae73626bcc17cfb4f0e8c
+MISC ChangeLog-2015 2079 SHA256 f3aac24c8c44f693f2cc0a3e381729473ffdba2458d454a1249b28753d601044 SHA512 20608bc2b26b2fbb9a49542aabd06c428f34c9e2baa021f514b94d2ec77815cd69dfd082787ed6a352d9c8810577303680bce1b7597f8c5a92052d2e99544b15 WHIRLPOOL 9003415326561cae4358a1d9ba6655fee6ef8600ab03925116e1c5d8752283624a5ee3daad5ab0e7a7e8be6ccc8c86b5293c990eb899ae270b99f4ff28951812
+MISC metadata.xml 166 SHA256 2caff447f5bd2701d8456ada5cc633c41ef4373fa4bfeabeb73599d40bcc941b SHA512 a56648c974a1d14dd4c18237532773c72057a13ab90c58b5da04f185e3c12a8bd8d5c21fb06053507f31766291a82dc7d87b34cd65fd94cfe2af7295c813ef84 WHIRLPOOL 1ff70497eca6531f0e0614c72a19f4b8e5ff486a58d369f4f0b36308d1d6b01168f9da887740e3b9f536236be251d3fe05f904d27a9233a7cf613416ba882968
diff --git a/www-apache/mod_dnssd/files/80_mod_dnssd.conf b/www-apache/mod_dnssd/files/80_mod_dnssd.conf
new file mode 100644
index 000000000000..1c67f7e86efc
--- /dev/null
+++ b/www-apache/mod_dnssd/files/80_mod_dnssd.conf
@@ -0,0 +1,6 @@
+<IfDefine DNSSD>
+LoadModule dnssd_module modules/mod_dnssd.so
+DNSSDEnable on
+</IfDefine>
+
+# vim: ts=4 filetype=apache
diff --git a/www-apache/mod_dnssd/files/mod_dnssd-0.6-httpd24.patch b/www-apache/mod_dnssd/files/mod_dnssd-0.6-httpd24.patch
new file mode 100644
index 000000000000..6eb505810405
--- /dev/null
+++ b/www-apache/mod_dnssd/files/mod_dnssd-0.6-httpd24.patch
@@ -0,0 +1,24 @@
+--- mod_dnssd-0.6/src/mod_dnssd.c.httpd24
++++ mod_dnssd-0.6/src/mod_dnssd.c
+@@ -26,6 +26,9 @@
+ #include <unixd.h>
+ #include <apr_signal.h>
+ #include <mpm_common.h>
++#if AP_MODULE_MAGIC_AT_LEAST(20090130,0)
++#include <mod_unixd.h>
++#endif
+ 
+ #include <unistd.h>
+ 
+@@ -576,7 +579,11 @@ static void child_process(apr_pool_t *p,
+ 
+     ap_assert(d);
+ 
++#if AP_MODULE_MAGIC_AT_LEAST(20090130,0)
++    ap_unixd_setup_child();
++#else
+     unixd_setup_child();
++#endif
+ 
+     if (pipe(sigterm_pipe_fds) < 0) {
+         ap_log_error(APLOG_MARK, APLOG_ERR, 0, r.main_server, "pipe() failed: %s", strerror(errno));
diff --git a/www-apache/mod_dnssd/files/mod_dnssd-0.6-ldflags.patch b/www-apache/mod_dnssd/files/mod_dnssd-0.6-ldflags.patch
new file mode 100644
index 000000000000..699f2301f442
--- /dev/null
+++ b/www-apache/mod_dnssd/files/mod_dnssd-0.6-ldflags.patch
@@ -0,0 +1,22 @@
+---
+ Respect LDFLAGS and properly use LIBS to avoid missing symbols at runtime.
+
+--- src/Makefile.in
++++ src/Makefile.in
+@@ -16,13 +16,14 @@
+ 
+ APXS=@APXS@
+ APACHECTL=@APACHECTL@
+-LIBS=-Wl,"@LIBS@" @AVAHI_LIBS@
++LIBS="@LIBS@" @AVAHI_LIBS@
+ CFLAGS=-Wc,"@CFLAGS@" @AVAHI_CFLAGS@
++APXS_LDFLAGS=`for ldflag in $(LDFLAGS); do echo -Wl,$$ldflag; done`
+ 
+ all: mod_dnssd.la
+ 
+ mod_dnssd.la: @srcdir@/mod_dnssd.c
+-	$(APXS) -c $(CFLAGS) $(LIBS) @srcdir@/mod_dnssd.c
++	$(APXS) -c $(CFLAGS) $(APXS_LDFLAGS) @srcdir@/mod_dnssd.c $(LIBS)
+ 
+ install: all
+ 	$(APXS) -i -a mod_dnssd.la 
diff --git a/www-apache/mod_dnssd/metadata.xml b/www-apache/mod_dnssd/metadata.xml
new file mode 100644
index 000000000000..6f49eba8f496
--- /dev/null
+++ b/www-apache/mod_dnssd/metadata.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<!-- maintainer-needed -->
+</pkgmetadata>
diff --git a/www-apache/mod_dnssd/mod_dnssd-0.6-r1.ebuild b/www-apache/mod_dnssd/mod_dnssd-0.6-r1.ebuild
new file mode 100644
index 000000000000..933f6ca15a8e
--- /dev/null
+++ b/www-apache/mod_dnssd/mod_dnssd-0.6-r1.ebuild
@@ -0,0 +1,39 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+inherit apache-module eutils
+
+DESCRIPTION="mod_dnssd is an Apache module which adds Zeroconf support via DNS-SD using Avahi"
+HOMEPAGE="http://0pointer.de/lennart/projects/mod_dnssd/"
+SRC_URI="http://0pointer.de/lennart/projects/${PN}/${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="amd64 ~arm x86"
+IUSE=""
+
+DEPEND="net-dns/avahi[dbus]"
+RDEPEND="${DEPEND}"
+
+APACHE2_MOD_CONF="80_${PN}"
+APACHE2_MOD_DEFINE="DNSSD"
+
+need_apache2
+
+src_prepare() {
+	# Respect LDFLAGS and use LIBS properly.
+	epatch "${FILESDIR}/${P}-ldflags.patch"
+
+	# Fedora patch for apache 2.4
+	epatch "${FILESDIR}/${P}-httpd24.patch"
+}
+
+src_configure() {
+	econf --with-apxs=${APXS} --disable-lynx
+}
+
+# Do not use inherited src_compile since it doesn't do what we want
+src_compile() {
+	emake
+}
diff --git a/www-apache/mod_evasive/Manifest b/www-apache/mod_evasive/Manifest
new file mode 100644
index 000000000000..2e5e31acb364
--- /dev/null
+++ b/www-apache/mod_evasive/Manifest
@@ -0,0 +1,6 @@
+AUX 10_mod_evasive.conf 935 SHA256 4f73e43bc1673987f045c9a34387b28ffbd0a2a079b87a9d8e52dc9608c21b1f SHA512 4ba4591738df21b624826ca11ed83d6751592c03e1dcd1df44e1dc3ec9ebc5533f51c86a6e91fa650770972f2d242257043d02d0c22800a9a119ee9e79d5148e WHIRLPOOL 7827f5ba6839cabe0a1efc4659ffee59af680e6cf6fc5a5a5a62ff4fbc105d7f92cdf62a501d2c765f61b3675ebf444848919bb2119da20cdf1bf92c16187a32
+DIST mod_evasive_1.10.1.tar.gz 20454 SHA256 07c45139aa313899484a900f0fc162b3e17eb4f60fe474d7f3dd6c9941e95667 SHA512 03b276d1a3dc8e853ca7f3791d66383492a7ae8f3b73988f0eefa7e4e31f267da432e811de81c8d721033e152e94139efc99ad80da809f220a1330e9d43d39ba WHIRLPOOL d461998009eba9c961388b29e504e33d151f7720b84c7151b1b69e25428e55ef8eb1b42edf3bbbc1dcc9b1432760efb80bf45bf1060361d95e4b983e381a17a7
+EBUILD mod_evasive-1.10.1-r1.ebuild 794 SHA256 b49b9bfef0648d64b77c09f98a549f95d95b0a6fff42b91943abee1823af0dc8 SHA512 533b58f4754d4ac11aa5faa358f060148b1f7f5571225878e3947a688b0e30eb589bf58a80efe037e0b589c8fad1d361ad4f1929f9c6012fe328e911c350fc34 WHIRLPOOL 50af7c9cc2c0a24b251348ad2c192969207f78b3415adc4ad6615e4879675bfb5b49f3a9b62ce824832985308c61a1293c5b602f0ce1a7d5ca1acf074933d03c
+MISC ChangeLog 2572 SHA256 3b21a755c96758e025f7c54c17c555f9c8c66b321089c70b33f5ccf04f4d2309 SHA512 ade37523ee19e1f9d3f358f638290eed507d10544b488cbe33758e29a349203cd2edc5cc309aefb94c325cc53be8d4c85f50de2b96280a30ddfa1015c946a00f WHIRLPOOL 852921a269a76f7562ce9f32b9e6a51020d5fb6edc3e7034aaefd170842fa2534a3ab7f56a9095415246ae7dc1f7dc8af1ebde23400890a1011ccec970c46639
+MISC ChangeLog-2015 1234 SHA256 5afa49564bb1ac00e8039ed6c2d03e05377e39269388fa09268c539a1f2f5644 SHA512 1bbf53a40ab5c9151b60f1c27d8138768d65f678c6952812607bd1a5034ed6622749f780ad88ffda1189f8093167c9e8ffe760e30b6bc4ff982aaa7b35202e02 WHIRLPOOL d69a008c7a50aec882a6e3f0cfbf4b8ba0eb5cd9683e916c02f7a2481a5df1cca617e524eabc118f6f287a02c723fea8291f44baa3646fd7cdf7e5305dce2a51
+MISC metadata.xml 166 SHA256 2caff447f5bd2701d8456ada5cc633c41ef4373fa4bfeabeb73599d40bcc941b SHA512 a56648c974a1d14dd4c18237532773c72057a13ab90c58b5da04f185e3c12a8bd8d5c21fb06053507f31766291a82dc7d87b34cd65fd94cfe2af7295c813ef84 WHIRLPOOL 1ff70497eca6531f0e0614c72a19f4b8e5ff486a58d369f4f0b36308d1d6b01168f9da887740e3b9f536236be251d3fe05f904d27a9233a7cf613416ba882968
diff --git a/www-apache/mod_evasive/files/10_mod_evasive.conf b/www-apache/mod_evasive/files/10_mod_evasive.conf
new file mode 100644
index 000000000000..31ea08c7bf09
--- /dev/null
+++ b/www-apache/mod_evasive/files/10_mod_evasive.conf
@@ -0,0 +1,31 @@
+<IfDefine EVASIVE>
+LoadModule evasive_module modules/mod_evasive.so
+
+DOSHashTableSize 3097
+DOSPageCount 5
+DOSSiteCount 100
+DOSPageInterval 2
+DOSSiteInterval 2
+DOSBlockingPeriod 10
+
+# Set here an email to notify the DoS to someone
+# (here is better to set the server administrator email)
+DOSEmailNotify root
+
+# Uncomment this line if you want to execute a specific command
+# after the DoS detection
+#DOSSystemCommand    "su - someuser -c '/sbin/... %s ...'"
+
+# Specify the desired mod_evasive log location
+DOSLogDir /var/log/apache2/evasive
+
+# WHITELISTING IP ADDRESSES
+# IP addresses of trusted clients can be whitelisted to insure they are never
+# denied.  The purpose of whitelisting is to protect software, scripts, local
+# searchbots, or other automated tools from being denied for requesting large
+# amounts of data from the server.
+#DOSWhitelist    127.0.0.* 
+#DOSWhitelist    172.16.1.*
+</IfDefine>
+
+# vim: ts=4 filetype=apache
diff --git a/www-apache/mod_evasive/metadata.xml b/www-apache/mod_evasive/metadata.xml
new file mode 100644
index 000000000000..6f49eba8f496
--- /dev/null
+++ b/www-apache/mod_evasive/metadata.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<!-- maintainer-needed -->
+</pkgmetadata>
diff --git a/www-apache/mod_evasive/mod_evasive-1.10.1-r1.ebuild b/www-apache/mod_evasive/mod_evasive-1.10.1-r1.ebuild
new file mode 100644
index 000000000000..d9ffcc51580b
--- /dev/null
+++ b/www-apache/mod_evasive/mod_evasive-1.10.1-r1.ebuild
@@ -0,0 +1,37 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+inherit apache-module eutils
+
+KEYWORDS="~amd64 ~x86"
+
+DESCRIPTION="Evasive maneuvers module for the event of an HTTP DoS"
+HOMEPAGE="https://github.com/jzdziarski/mod_evasive"
+SRC_URI="http://www.zdziarski.com/projects/mod_evasive/${P/-/_}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+IUSE=""
+
+DEPEND=""
+RDEPEND=""
+
+APACHE2_MOD_CONF="10_${PN}"
+APACHE2_MOD_DEFINE="EVASIVE"
+
+need_apache2_4
+
+S="${WORKDIR}"/${PN}
+
+src_prepare() {
+	# Apache 2.4
+	sed -i -e 's/connection->remote_ip/connection->client_ip/' mod_evasive20.c || die
+	mv ${PN}20.c ${PN}.c
+	sed -i -e 's:evasive20_module:evasive_module:g' ${PN}.c || die
+}
+
+src_install() {
+	keepdir /var/log/apache2/evasive
+	apache-module_src_install
+}
diff --git a/www-apache/mod_extract_forwarded/Manifest b/www-apache/mod_extract_forwarded/Manifest
new file mode 100644
index 000000000000..f96624dc1ee7
--- /dev/null
+++ b/www-apache/mod_extract_forwarded/Manifest
@@ -0,0 +1,6 @@
+AUX 98_mod_extract_forwarded.conf 197 SHA256 b2292a7ad2afa9aa8e19b054143bd5c6fbf9473eae566f29ef074ccca18f7195 SHA512 197199ea86b5d1c3f50c57c0f9c4b31f14d2138d62e02de33a18e1b04f8c10f27568786a8168b113e5469727fc427005f225dad057a7875f0db737273ea567f3 WHIRLPOOL cb658e1c1ef73047a12d6e8b481f3a6026c7412e9a7da59140bd095a5a56f82a1ce40ea6db55dd3e5e5f0cd60c94fb977ae25ec3d28deb07fad0f78d8c8c1ca8
+DIST mod_extract_forwarded-2.0.3_pre2015052015.tar.xz 13548 SHA256 284861a3267b8b494408a692cf6b4c7f31957e18b25ba7f6b1a6e0cd3bcd1bd9 SHA512 26cfde6343885eea964dcd96ce9bc5952bfb9b5b27b093abd71358a26548c1361e37449d2f38a68aa0bac0bc43e465d65d6fbfaf91598b94ced2e65b861a14db WHIRLPOOL 2a68b21233616fc77d9faa812dffd51c7629f49059c53cc42c4c9b585a738c2579899105c0eed15fac288232698045e8f0009a576173bf3878f80ae3ea6d807b
+EBUILD mod_extract_forwarded-2.0.3_pre2015052015.ebuild 797 SHA256 154940b4f4f47bf3cb624de8d1be4c63e1d08efe47506fc7d017e741f8bcee54 SHA512 b8a57a4351a1b4985f7bcdc0ba78fd86256d4fc4818c164b4c1d0386e27eb62e4c0856ed05a6e9c9d30db5a46b8f0514e5b06cbebb4cf689094bb309c8521666 WHIRLPOOL 0abc511d9340ce840aa19d5f1eff4a7377c7cba4f4530059913182e69aa7a4c802d55e5d63867376cd10ccc5378f9c6e5f10809ae733017af71893fef20a0242
+MISC ChangeLog 3321 SHA256 6da94381346ee498bb37f9893511d1820efc3b69a2d03e1659224cd5448a9e0c SHA512 f1623c96b757a18a3fddfb6cb74a17458eafe47f06f9f642ae8ec7d8186e8bb0539892d3cd7a8ae9924b9ed6ceda8c7ec2def3b8d2321ddc0e7cb1dfbfadc110 WHIRLPOOL 20f11bc101fb1054eaddc603e331fd833f71c1e0e77989be8c289b828c2081fc102935ad7c08fe2ad8255d0e20884b7653ebbfcb33768bfa2ee3f04fb15f0742
+MISC ChangeLog-2015 1598 SHA256 48d3dde1c41091efc3af7a337383c4d6573041346da9206a8607e4bcd3d11f53 SHA512 4f4cbea8a2ec5cc85093856a916d92d04f6acb727c0e3b0aa0e8c3782dd5ce49392f42d079979b23dcaae646318abeef6308037a7b519fc3306e649e034d2038 WHIRLPOOL 80701a162bae0c1484fba62dddb2b756433923fc28ba92cdcfea71905a0f41a0a9e742f586b881946c4d086620a13d3d4d8bed495fc44fa48ca87c88a95b7e4a
+MISC metadata.xml 255 SHA256 93c598d46989f659d7182249fe42bf543ee96d39921cb7adda4f8dd9deae3421 SHA512 872ec5f38b8d42f79ec992590a584ea855abdc6e4a5aad7f0ff60ae63a91de047e7770e17d92cc3bda7cfa421bda2872ff3c3c7c686892a2bd40430571658308 WHIRLPOOL 63705df8846055c92f48c7dcce89809f228c234903a1fd4559630612c028fcdcfec2585d9ef34d475ab7957e816a32bc1ae9851e508f85a976af9c20956abe0c
diff --git a/www-apache/mod_extract_forwarded/files/98_mod_extract_forwarded.conf b/www-apache/mod_extract_forwarded/files/98_mod_extract_forwarded.conf
new file mode 100644
index 000000000000..18f7e866dbb3
--- /dev/null
+++ b/www-apache/mod_extract_forwarded/files/98_mod_extract_forwarded.conf
@@ -0,0 +1,9 @@
+<IfDefine EXTRACT_FORWARDED>
+LoadModule extract_forwarded_module modules/mod_extract_forwarded.so
+
+MEForder refuse,accept
+MEFrefuse all
+MEFaccept localhost
+</IfDefine>
+
+# vim: ts=4 filetype=apache
diff --git a/www-apache/mod_extract_forwarded/metadata.xml b/www-apache/mod_extract_forwarded/metadata.xml
new file mode 100644
index 000000000000..cd3828aea5dc
--- /dev/null
+++ b/www-apache/mod_extract_forwarded/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<!-- maintainer-needed -->
+<use>
+		<flag name="mod_proxy">Enable support for Apache's internal proxy</flag>
+	</use>
+</pkgmetadata>
diff --git a/www-apache/mod_extract_forwarded/mod_extract_forwarded-2.0.3_pre2015052015.ebuild b/www-apache/mod_extract_forwarded/mod_extract_forwarded-2.0.3_pre2015052015.ebuild
new file mode 100644
index 000000000000..284bedb2db25
--- /dev/null
+++ b/www-apache/mod_extract_forwarded/mod_extract_forwarded-2.0.3_pre2015052015.ebuild
@@ -0,0 +1,29 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+inherit apache-module
+
+DESCRIPTION="Rewrites X-Forwarded-For to REMOTE_ADDR for reverse proxy configurations"
+HOMEPAGE="http://www.openinfo.co.uk/apache/index.html"
+#SRC_URI="http://www.openinfo.co.uk/apache/extract_forwarded-${PV}.tar.gz"
+SRC_URI="https://dev.gentoo.org/~pacho/maintainer-needed/${P}.tar.xz"
+
+LICENSE="Apache-1.1"
+SLOT="0"
+KEYWORDS="amd64 x86"
+IUSE="mod_proxy"
+
+DEPEND=""
+RDEPEND="mod_proxy? ( www-servers/apache[apache2_modules_proxy_connect] )"
+
+APACHE2_MOD_CONF="98_${PN}"
+APACHE2_MOD_DEFINE="EXTRACT_FORWARDED"
+
+need_apache2_4
+
+src_prepare() {
+	if ! use mod_proxy; then
+		sed -i -e 's:#define USING_proxy_http_module .*::' mod_extract_forwarded.c || die
+	fi
+}
diff --git a/www-apache/mod_fastcgi_handler/Manifest b/www-apache/mod_fastcgi_handler/Manifest
new file mode 100644
index 000000000000..7a7a7d9df8fb
--- /dev/null
+++ b/www-apache/mod_fastcgi_handler/Manifest
@@ -0,0 +1,6 @@
+AUX 20_mod_fastcgi_handler.conf 133 SHA256 58d9d72eacb72700f4a3a4f0b9481dd353de019843bcda1318c151c8ede009cb SHA512 d78c4d4f5ed85d8b42c435684d302dcbfc3f6eae6bdef3035226ad7da6225aee38dc05899b8b8c282bf77c61fe3422b4de5b48db4c948f9df49465e54f999f2f WHIRLPOOL 2f2e09321efe1d257c980482dadd9a008e89479f1491b347c99ed7df446ea2e742cc1ab625447406b89aba0c1c8334f28fad7f4dca4a622b94792ef5852f1165
+DIST mod_fastcgi_handler-0.6.tar.gz 10980 SHA256 1d1676005a50c77101681c054df3e76939b6885060027882d4a506141637c39e SHA512 36598183170338871ea2952e6e54914f402353ec51425d2256d336d914ebadc6e7c928a03d60ed0f607dae8c137fe467a48ca6e779b2978bf34c5e34fa7058e5 WHIRLPOOL 6cd78558af23b24397927aae65091ba88a2d175e22cb46a3ce9eaf015f33ed984b829bbf0ef0449ce576d5592d42f0bc6a1f528c150e01e6934a092e08b56abd
+EBUILD mod_fastcgi_handler-0.6.ebuild 690 SHA256 5e18476238c604f28985464e18275eb672c3a19890d8818d50d6cca2f5bd4727 SHA512 02918f9ea0f222beae8e09e6ebd9f8d4482373a6f23d89230d303b494d8f9245fd36db48ba9ea3c709316cce12f0fea1295eb2588e0c65766a8084e7970d57de WHIRLPOOL 6a554bc3100937b9f680dc858894c71dec2e7b5263c5c171d48ced068cfe0a7ae5d8c159c9265c26f9b169302a48c64018495a229602d9e63565a1818bc1b61b
+MISC ChangeLog 2759 SHA256 8e8f290da06fd3ed1a8e07dcc1bce7925c705e6d5b329757270a83ec12df9ea7 SHA512 0a9bc9492c8baf2c7f1aef0e197f921c9255daadabcf1e8d02153993064f48ffa88b8262375f27c667beadd5c4ed2d66dd16e137250c7a9df71cff9ff0da8fc4 WHIRLPOOL 7dd6ef53ff0a5849e64e3a3a3192d448b730b2b7a55633330e6488d25f6a0e2a8623826ac8c3108b889c09422e35afda9ad95955b11ad281f4a772b4757c829e
+MISC ChangeLog-2015 1219 SHA256 0b2203f5e39a5e57c6e287b98fa100b4c3308ed4edc23c2290759d883e50c118 SHA512 890f68f45e718fedd977bae84dc4877f7776b62bd5837d41da242ed174a14ca91b9b94ba3c3912669ffd9600c49367f7f9546d1953d4779ba84030b5ac6b251b WHIRLPOOL a01db1b8d8bce9874bf49c68e70d076e8936aca4eae48e6a3d0bf318c21cb3c340e7ce0c72a7d53d4ccc00d8ac6db6dcb44693760e0ad5c9c0d109eb8ea21701
+MISC metadata.xml 230 SHA256 024d5690d06404399ea4d4c5c6146e683f22e7aead3fd2887981ff4a68db26eb SHA512 dad890785b93be37bae607ebf64fb129487e376fd20deb56e3ce781d62a385017ac715d89c72104df6f9b62f7e6dbcd5c87d34495119cedbde92971d9c37931d WHIRLPOOL 227090bf5cdb7a919675563c01c273a3b0a8514f24c880757243e2f97815e4408abf87a5bce0f05ff032deef71ab10ae3675d1f76dfcbb1f92384b78562fb713
diff --git a/www-apache/mod_fastcgi_handler/files/20_mod_fastcgi_handler.conf b/www-apache/mod_fastcgi_handler/files/20_mod_fastcgi_handler.conf
new file mode 100644
index 000000000000..dd07c33cc100
--- /dev/null
+++ b/www-apache/mod_fastcgi_handler/files/20_mod_fastcgi_handler.conf
@@ -0,0 +1,5 @@
+<IfDefine FASTCGI_HANDLER>
+LoadModule fastcgi_handler_module modules/mod_fastcgi_handler.so
+</IfDefine>
+
+# vim: ts=4 filetype=apache
diff --git a/www-apache/mod_fastcgi_handler/metadata.xml b/www-apache/mod_fastcgi_handler/metadata.xml
new file mode 100644
index 000000000000..92d21e107b0d
--- /dev/null
+++ b/www-apache/mod_fastcgi_handler/metadata.xml
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<upstream>
+		<remote-id type="github">hollow/mod_fastcgi_handler</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/www-apache/mod_fastcgi_handler/mod_fastcgi_handler-0.6.ebuild b/www-apache/mod_fastcgi_handler/mod_fastcgi_handler-0.6.ebuild
new file mode 100644
index 000000000000..4b07964fa875
--- /dev/null
+++ b/www-apache/mod_fastcgi_handler/mod_fastcgi_handler-0.6.ebuild
@@ -0,0 +1,31 @@
+# Copyright 1999-2011 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="3"
+
+GITHUB_AUTHOR="hollow"
+GITHUB_PROJECT="mod_fastcgi_handler"
+GITHUB_COMMIT="c5e075b"
+
+inherit apache-module
+
+DESCRIPTION="A simple FastCGI handler module"
+HOMEPAGE="https://github.com/hollow/mod_fastcgi_handler"
+SRC_URI="https://nodeload.github.com/${GITHUB_AUTHOR}/${GITHUB_PROJECT}/tarball/v${PV} -> ${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+DEPEND=""
+RDEPEND=""
+
+S="${WORKDIR}"/${GITHUB_AUTHOR}-${GITHUB_PROJECT}-${GITHUB_COMMIT}
+
+APACHE2_MOD_CONF="20_${PN}"
+APACHE2_MOD_DEFINE="FASTCGI_HANDLER"
+
+APXS2_ARGS="-o ${PN}.so -c *.c"
+
+need_apache2
diff --git a/www-apache/mod_fcgid/Manifest b/www-apache/mod_fcgid/Manifest
new file mode 100644
index 000000000000..3fdc433ecd4c
--- /dev/null
+++ b/www-apache/mod_fcgid/Manifest
@@ -0,0 +1,7 @@
+AUX 2.2/20_mod_fcgid.conf 165 SHA256 5b1b5584360b3811241459c435260cd2af8aa2a612f940e376b6aefdbca283ff SHA512 f534c02703f697e76d4c1e57aa9785d81f58374ad4d4f458299e23d64bf3b80c9c5380a9c60862bcfbfbc0d6bef4f0e5c8c11c53e2f90c3824d3b1afd64bcd7c WHIRLPOOL de918e810d47fb5cd5821457ab229876748a8f4a525484731355bff7a2a076d200f5ef9aa96ebd5b944d459c909720f25a7d5258e78c839a4c6d063916c26b23
+DIST mod_fcgid-2.3.9.tar.bz2 80205 SHA256 442c29528e34fefc946dd356fcf8240e1953aed89eb5597fc55898d3d06f183f SHA512 c429c14990cc8b492e88db1aa00fc2593bfb1b129b9001be21670d42c8f3e5038acd3f4556b48f3ac7dfc03c8d3656f0d4402122932e5bdc2c2aab1c7c235121 WHIRLPOOL a872bd74b92ee8c5ed8edec23bfe3d4ebbcff29670883462040c8c2c825b1ad71a42c0e85f8c278c0bef887e7f35e3fb9d931b27a9aa6e99afccf6623674188d
+EBUILD mod_fcgid-2.3.9-r1.ebuild 711 SHA256 dd4f329d2cd708836007bcd11a67e5f6e20891389c386dda69ef89ee137d4eca SHA512 d51c7abfe86a7fa81e801492a2f0694488baf83ed3c37f5bb8f322fbd25654cf78a3729346148d3d912f250ba8fc595e5c8a848e894ad780d0e2f4aab0a0c689 WHIRLPOOL 7a157af47ead1a5cb007fec068aba9780385a05d16e8c84a60eb09f32ce37a2b1438a866bc598c4487ebaed1853fb8a50c47ae411b46760a9acf867f495e2c43
+EBUILD mod_fcgid-2.3.9.ebuild 701 SHA256 1cf45deb7c6c2a163c551774588d45ad6515565fb68712a6e4019af793f48d82 SHA512 76c4d99bf2874befa78874ab36682e325945d65718d007eabaab9991018f40aff4dd54fb0a8068df102f2056e0e155050ed2c43e1910c514597f8d14d3886b47 WHIRLPOOL bcc086edf6a0d5d14d5bf22c5df40ed4f63327eb936241f9acf0a9aa3d24a4802d0fce1570f1479fc34e4e36ad0681248d1d030dbf8c11fc3919755cd6af26ce
+MISC ChangeLog 2761 SHA256 4f6fb77f5c83dddb3f9810a20d3349ca9aa1db5ec6be66b4c37f5f60da0ea127 SHA512 d97bafae43b2874ee8ad5b50049544780eeef385c49b2ba6da9a7894a36a94d081674aa07b6d0eebd894609259b082e805eac1820ed936942366834215dedca4 WHIRLPOOL c2eff6cf8e738c48424821095591295ebe107707c3a2c1d64b01c4e368b1d99c0a520e3357600497703d82d2358961fa547f64e5fa56f4cd665420a01c61a165
+MISC ChangeLog-2015 10495 SHA256 e05db28aca43900794f34ec6fbe7170181cd695d465d7c6f6dc1752a86d73d00 SHA512 2ebdc2da70ab2c7948cc75a634c8c021dffcb4aa7395727a190d428caddccc76609b8769ff1c42dbe5cdf1c7230930073d1f8e3a35985d73837e5c180b388253 WHIRLPOOL 48fcccca0a72856e54613fec3658e2bc5277e43d4b56167131525e78b5e2771452679423b28e58efdbbe62006fee611bda05e858f3f2b4aa977cb16b34dea161
+MISC metadata.xml 393 SHA256 c6394ebf8ed57ce20cc1e08c36494ad8e79ef84aff49bcef26daee9a7bb44096 SHA512 44e77be6b2d4119e5c63945fca1a68a517e0953b47262d101feae8c083fbe5799ad0032ebe11ce8330df3b15dd59ba12d641070803c619e76f3ad7d080df5ef9 WHIRLPOOL c0ac74ed3e0c1d5c75d7e583e5c7ea977a5add4770317b2e2cdd7bb4d93ec317ab7c7c26d787a1d969383085877d5a31b5dc56aa1226df0df2336ab57681441e
diff --git a/www-apache/mod_fcgid/files/2.2/20_mod_fcgid.conf b/www-apache/mod_fcgid/files/2.2/20_mod_fcgid.conf
new file mode 100644
index 000000000000..38cfa39e0bdf
--- /dev/null
+++ b/www-apache/mod_fcgid/files/2.2/20_mod_fcgid.conf
@@ -0,0 +1,7 @@
+<IfDefine FCGID>
+LoadModule fcgid_module modules/mod_fcgid.so
+SocketPath /var/run/fcgidsock
+SharememPath /var/run/fcgid_shm
+</IfDefine>
+
+# vim: ts=4 filetype=apache
diff --git a/www-apache/mod_fcgid/metadata.xml b/www-apache/mod_fcgid/metadata.xml
new file mode 100644
index 000000000000..4afcd3009012
--- /dev/null
+++ b/www-apache/mod_fcgid/metadata.xml
@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<!-- maintainer-needed -->
+	<longdescription lang="en">
+		mod_fcgid has a new process management strategy, which concentrates on
+		reducing the number of fastcgi server, and kick out the corrupt fastcgi
+		server as soon as possible.
+	</longdescription>
+</pkgmetadata>
diff --git a/www-apache/mod_fcgid/mod_fcgid-2.3.9-r1.ebuild b/www-apache/mod_fcgid/mod_fcgid-2.3.9-r1.ebuild
new file mode 100644
index 000000000000..df4dab78ef92
--- /dev/null
+++ b/www-apache/mod_fcgid/mod_fcgid-2.3.9-r1.ebuild
@@ -0,0 +1,30 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+inherit apache-module eutils multilib
+
+DESCRIPTION="Binary-compatible alternative to mod_fastcgi with better process management"
+HOMEPAGE="https://httpd.apache.org/mod_fcgid/"
+SRC_URI="mirror://apache/httpd/mod_fcgid/${P}.tar.bz2"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~hppa ~ppc ~ppc64 ~x86"
+IUSE=""
+
+APACHE2_MOD_CONF="2.2/20_${PN}"
+APACHE2_MOD_DEFINE="FCGID"
+
+DOCFILES="CHANGES-FCGID README-FCGID STATUS-FCGID"
+
+need_apache2
+
+src_configure() {
+	./configure.apxs || die "apxs configure failed"
+}
+
+src_compile () {
+	emake
+	ln -sf modules/fcgid/.libs .libs || die "symlink creation failed"
+}
diff --git a/www-apache/mod_fcgid/mod_fcgid-2.3.9.ebuild b/www-apache/mod_fcgid/mod_fcgid-2.3.9.ebuild
new file mode 100644
index 000000000000..b660fe032275
--- /dev/null
+++ b/www-apache/mod_fcgid/mod_fcgid-2.3.9.ebuild
@@ -0,0 +1,26 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+inherit apache-module eutils multilib
+
+DESCRIPTION="Binary-compatible alternative to mod_fastcgi with better process management"
+HOMEPAGE="https://httpd.apache.org/mod_fcgid/"
+SRC_URI="mirror://apache/httpd/mod_fcgid/${P}.tar.bz2"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="amd64 ~hppa ppc ~ppc64 x86"
+IUSE=""
+
+APACHE2_MOD_CONF="2.2/20_${PN}"
+APACHE2_MOD_DEFINE="FCGID"
+
+DOCFILES="CHANGES-FCGID README-FCGID STATUS-FCGID"
+
+need_apache2
+
+src_compile () {
+	./configure.apxs || die "apxs configure failed!"
+	make || die "make failed"
+	ln -sf modules/fcgid/.libs .libs || die "symlink creation failed"
+}
diff --git a/www-apache/mod_flvx/Manifest b/www-apache/mod_flvx/Manifest
new file mode 100644
index 000000000000..63f31619ab57
--- /dev/null
+++ b/www-apache/mod_flvx/Manifest
@@ -0,0 +1,6 @@
+AUX 20_mod_flvx.conf 260 SHA256 7157391e2cfbd493b47b27e2483965085c253db13fbc34d7a9b8480ecef4a4b9 SHA512 ae10683106b50f0b0cbf6c911260829923618a0438c662c671d1efcb1c2b533e1c0ada91881e0023d7cf04156d5bf290021aba8e6bd9d28e6c3c001cd6ba3a28 WHIRLPOOL e5f7ac620b1ce2597de3d822e6d91060ae6b5600cf106cdea06377f6504c61752b923c96f450705353825bc6769dcb0613a069bb1139ac65861a49b6b99ccf30
+DIST mod_flvx-0.0.1.tar.bz2 1636 SHA256 bfcd82f5782f86577124ab88339762fe08e3e5a108e80bb56a20e12a6cc951c2 SHA512 9374c6c9ff3a1f20cc7a86ba07f5aa1c707868849266ed17dc877d5026d7f1dd20e9030488fc846f8a80b7424ac72154315743d7c1605822a9c5d5e66d1483e5 WHIRLPOOL 74c942e079dfc760d6732ae82212a0b74c6b32197a81b6de9ce46d352704a630a91a6ab13820daf060550cd35c87aa8486872fdebd00967fa5ef52f3c7c64c27
+EBUILD mod_flvx-0.0.1-r1.ebuild 480 SHA256 e7babf4092df28415f7bb171ab334be30a9e89c72a91b3bdec32603830579386 SHA512 d2ae7fa70015bf0693a44890152c917d7ba433cdff6660ddcddb1e0044d088cfa57e3e149a950a6caa6ab4f5340a95e32ef0afc49ebc0b7bc2c813cefb567e3f WHIRLPOOL 3bde9d99d8690bc950cfd89904361ed63d67c24ed3296316c6356677ec94d353153d4ba1149b72e626884076c30b9cfc3e297bc05a204a3762374334ac3dc0d5
+MISC ChangeLog 2558 SHA256 4ee9bab710ad2b5fe40f906b61bf0ded75b3c290457f9042612b0084b2f123e4 SHA512 100e9eabad963dac2c4af80e8085d9b11118c11cbbc866f71dc28bf934a7d87e9e4c4ca952bd170da2cf113cc66910950aa61c9d75c2f6ebbd484034590b2ebb WHIRLPOOL 5eaebe7e3abc13a38e0286bdccd5cabcdc39da4be5efc96576f693403e54e3d519506ebb1de4cfb4e493b0c4c421ab1ed7e7f65be972eaa3c098169e699d145f
+MISC ChangeLog-2015 814 SHA256 bfac00f2fec4d407a02e73b1e957a4e88e8e43539f76744820a08acfcbaf8b01 SHA512 e544ac3c6f1d897ffdbea5cb4622aaa9b59d251be4786623609a8ba8593587e1ec184507e1fee551f709c3db90ae9f0b1ae0dbf04e6a119ded365b2b41aad9f1 WHIRLPOOL e220d89e2959fc1451fb31ecc77d95b56cfaed2b69dcf136969b091636d8f6f2451cf37e384be846e4aeb60faf7b132134c6d1c8cf6b0ea669b4086a0d31d14b
+MISC metadata.xml 166 SHA256 2caff447f5bd2701d8456ada5cc633c41ef4373fa4bfeabeb73599d40bcc941b SHA512 a56648c974a1d14dd4c18237532773c72057a13ab90c58b5da04f185e3c12a8bd8d5c21fb06053507f31766291a82dc7d87b34cd65fd94cfe2af7295c813ef84 WHIRLPOOL 1ff70497eca6531f0e0614c72a19f4b8e5ff486a58d369f4f0b36308d1d6b01168f9da887740e3b9f536236be251d3fe05f904d27a9233a7cf613416ba882968
diff --git a/www-apache/mod_flvx/files/20_mod_flvx.conf b/www-apache/mod_flvx/files/20_mod_flvx.conf
new file mode 100644
index 000000000000..72096ca68e38
--- /dev/null
+++ b/www-apache/mod_flvx/files/20_mod_flvx.conf
@@ -0,0 +1,11 @@
+<IfDefine FLVX>
+	LoadModule flvx_module modules/mod_flvx.so
+
+	# Avoiding AddHandler directive for security
+	# https://bugs.gentoo.org/show_bug.cgi?id=544572
+	<FilesMatch "\.flv$">
+		SetHandler flv-stream
+	</FilesMatch>
+</IfDefine>
+
+# vim: ts=4 filetype=apache
diff --git a/www-apache/mod_flvx/metadata.xml b/www-apache/mod_flvx/metadata.xml
new file mode 100644
index 000000000000..6f49eba8f496
--- /dev/null
+++ b/www-apache/mod_flvx/metadata.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<!-- maintainer-needed -->
+</pkgmetadata>
diff --git a/www-apache/mod_flvx/mod_flvx-0.0.1-r1.ebuild b/www-apache/mod_flvx/mod_flvx-0.0.1-r1.ebuild
new file mode 100644
index 000000000000..5015fab375dc
--- /dev/null
+++ b/www-apache/mod_flvx/mod_flvx-0.0.1-r1.ebuild
@@ -0,0 +1,21 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+inherit eutils apache-module
+
+DESCRIPTION="mod_flvx allows to seek inside FLV files for streaming purposes"
+HOMEPAGE="http://journal.paul.querna.org/articles/2006/07/11/mod_flvx/"
+SRC_URI="mirror://gentoo/${P}.tar.bz2"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+DEPEND=""
+RDEPEND=""
+
+APACHE2_MOD_CONF="20_${PN}"
+APACHE2_MOD_DEFINE="FLVX"
+
+need_apache2
diff --git a/www-apache/mod_geoip2/Manifest b/www-apache/mod_geoip2/Manifest
new file mode 100644
index 000000000000..2c68eb965356
--- /dev/null
+++ b/www-apache/mod_geoip2/Manifest
@@ -0,0 +1,7 @@
+AUX 30_mod_geoip2.conf 103 SHA256 d0932c23b2827d1600df6ddaf9729f36913497e47a7ba4ae545f910a07d89735 SHA512 64ca6e70fdcbcb30e85dc9c5b7f1561aa61b71e74afad2fd188cb52a5675a686bc7ec17dfd9c83fdd4830cd47752bf956234e6a0248aaa36ab2de530c3537e61 WHIRLPOOL cb7a222befb6a6ca20258a000029bd090fe6070d1eb41245b747fedc4ad6b5d6303c2bfdaf2903b13295e6ae000b00d11f2a07db620f4d2340a85f324282767f
+AUX mod_geoip2-1.2.7-httpd24.patch 980 SHA256 a4154641d7c4a364854d836d80ea77cd37fd272dd04a7041488643f255bcf01f SHA512 b4d9cdb333efa1ad57360fb02ba4537b63df0e93bea5517c4de956cad172eefd30ecb73e66cf35310181b8df4347e97f1939e24b9d9af236e8d87866718f3035 WHIRLPOOL d26f8e877771a0826676fc0b5e94a8227ef9298036d1c45fa1e401ebdd7136904aabf12d7233a76af2d1133bc3f493952f54026261d81a7e2184cb7736836a74
+DIST mod_geoip2_1.2.7.tar.gz 11983 SHA256 76e0512b282e6e2799f5d5616b9e26f448bee263f495ba31d1f72e3be9d0d5b6 SHA512 0ce240c477115af08f7d6b41186c3ea1d29cf4c5c081eb6e55fff8d9b1fd3dcfefe95df544d30d3c2e6c941e72eb719a7d938cd9e3e55fad5a8722bfe112605e WHIRLPOOL bc6466fe63e8e460a7b2a2806238ba3ab2379dce5451b88fea4fdd8fb121938d516ec4afc677e5784f0bc6572f292dfbc02e6410aa7ab4811d4ac4ce1d5d8be2
+EBUILD mod_geoip2-1.2.7-r1.ebuild 822 SHA256 484d3e7d044e44a0f5e3ce74150750ae246045dd356e51f4bd3d4013179dc43d SHA512 62b5b3f9dd82d9ef2b1dd04ea4b326670d76effebaa2cade94f53083f4b1b6eb5604d0c8cb439f10dc44e0b72bbb3337af1ae359dad2bb0ba7d5014c701f0ef5 WHIRLPOOL 12f402f64a90863148853274603a6cb04766e88e92f8e241e4591eba57ab0f6cddc8aef00677f8db7c78ff3f2b49705c4e041139552e242456c71552b76e3fb0
+MISC ChangeLog 2607 SHA256 0502c9389e51bc1e9070daed9e9992a67f54b3af17fe85bb85b1fda1417974e0 SHA512 a43b95a72d8a73acb031342f015dcb230492278d03e6d865179953de1b7efa99f3ab3f8e0d486981ad980168a1c0992ad1bbf648917a88a4790f9b38e27fbc9f WHIRLPOOL 8dcfcceb96834021787c257c406ea9bdf80c79023276b0fdf91e056b273f75f99e5bdd92744e860f8b084204b9da902e21ef6c07bdcbbf1a1d1a7ac9a83c040c
+MISC ChangeLog-2015 997 SHA256 93acdd0d5071d80a12761dbaa83e8167d0e139a28670d506420dba44b3bc9c8f SHA512 a2f58e17fa7ad75c0d3fff645c4547bab443f8f1ac521ac8819cc7ebe17f2f981d99e0edbbc223541c617bdf851c8eb06d998dfd48c49b477b305abe1fcf840d WHIRLPOOL e08f6ab893ed3cadf46d5a17422b397fbff67a3ef54720b030017ae1e9bc67a73e23dc3d79bf54e42ee3d525784db12c7b54aed8af4d6d3110fdb0fb6cf60228
+MISC metadata.xml 166 SHA256 2caff447f5bd2701d8456ada5cc633c41ef4373fa4bfeabeb73599d40bcc941b SHA512 a56648c974a1d14dd4c18237532773c72057a13ab90c58b5da04f185e3c12a8bd8d5c21fb06053507f31766291a82dc7d87b34cd65fd94cfe2af7295c813ef84 WHIRLPOOL 1ff70497eca6531f0e0614c72a19f4b8e5ff486a58d369f4f0b36308d1d6b01168f9da887740e3b9f536236be251d3fe05f904d27a9233a7cf613416ba882968
diff --git a/www-apache/mod_geoip2/files/30_mod_geoip2.conf b/www-apache/mod_geoip2/files/30_mod_geoip2.conf
new file mode 100644
index 000000000000..41206ad7ba0a
--- /dev/null
+++ b/www-apache/mod_geoip2/files/30_mod_geoip2.conf
@@ -0,0 +1,5 @@
+<IfDefine GEOIP>
+LoadModule geoip_module modules/mod_geoip.so
+</IfDefine>
+
+# vim: ts=4 filetype=apache
diff --git a/www-apache/mod_geoip2/files/mod_geoip2-1.2.7-httpd24.patch b/www-apache/mod_geoip2/files/mod_geoip2-1.2.7-httpd24.patch
new file mode 100644
index 000000000000..563e35b1137e
--- /dev/null
+++ b/www-apache/mod_geoip2/files/mod_geoip2-1.2.7-httpd24.patch
@@ -0,0 +1,35 @@
+--- mod_geoip.c.geoip
++++ mod_geoip.c
+@@ -66,6 +66,7 @@
+ #include "http_config.h"
+ #include "http_protocol.h"
+ #include "http_log.h"
++#include "util_script.h"
+ #include "ap_config.h"
+ #include "apr_strings.h"
+ #include <GeoIP.h>
+@@ -320,7 +321,11 @@
+ 		return DECLINED;
+ 
+ 	if (!cfg->scanProxyHeaders) {
++#if AP_MODULE_MAGIC_AT_LEAST(20111130,0)
++		ipaddr = r->useragent_ip;
++#else
+ 		ipaddr = r->connection->remote_ip;
++#endif
+ 	}
+ 	else {
+ 		ap_add_common_vars(r);
+@@ -338,7 +343,11 @@
+ 		}
+ 		if (!ipaddr_ptr) {
+ 			ap_log_error(APLOG_MARK, APLOG_DEBUG | APLOG_NOERRNO, 0, r->server, "[mod_geoip]: Error while getting ipaddr from proxy headers. Using REMOTE_ADDR.");
+-			ipaddr = r->connection->remote_ip;
++#if AP_MODULE_MAGIC_AT_LEAST(20111130,0)
++			ipaddr = r->useragent_ip;
++#else
++	                ipaddr = r->connection->remote_ip;
++#endif
+ 		}
+ 		else {
+ 			ap_log_error(APLOG_MARK, APLOG_DEBUG | APLOG_NOERRNO, 0, r->server, "[mod_geoip]: IPADDR_PTR: %s", ipaddr_ptr);
diff --git a/www-apache/mod_geoip2/metadata.xml b/www-apache/mod_geoip2/metadata.xml
new file mode 100644
index 000000000000..6f49eba8f496
--- /dev/null
+++ b/www-apache/mod_geoip2/metadata.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<!-- maintainer-needed -->
+</pkgmetadata>
diff --git a/www-apache/mod_geoip2/mod_geoip2-1.2.7-r1.ebuild b/www-apache/mod_geoip2/mod_geoip2-1.2.7-r1.ebuild
new file mode 100644
index 000000000000..cde3422fef2e
--- /dev/null
+++ b/www-apache/mod_geoip2/mod_geoip2-1.2.7-r1.ebuild
@@ -0,0 +1,34 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+inherit apache-module eutils
+
+MY_P="${PN}_${PV}"
+MY_PN="${PN/2}"
+
+DESCRIPTION="geoip module gets the country and city a request originated from"
+HOMEPAGE="http://www.maxmind.com/app/mod_geoip"
+SRC_URI="http://geolite.maxmind.com/download/geoip/api/mod_geoip2/${MY_P}.tar.gz"
+LICENSE="Apache-1.1"
+
+KEYWORDS="~x86 ~amd64"
+IUSE=""
+SLOT="0"
+
+DEPEND=">=dev-libs/geoip-1.4.8"
+RDEPEND="${DEPEND}"
+
+S="${WORKDIR}/${MY_P}"
+
+# See apache-module.eclass for more information.
+APACHE2_MOD_CONF="30_${PN}"
+APACHE2_MOD_FILE="${S}/.libs/${MY_PN}.so"
+APXS2_ARGS="-l GeoIP -c ${MY_PN}.c"
+DOCFILES="INSTALL README README.php Changes"
+
+need_apache2
+
+src_unpack() {
+	unpack ${A} && cd "${S}"
+	epatch "${FILESDIR}/${P}-httpd24.patch"
+}
diff --git a/www-apache/mod_gnutls/Manifest b/www-apache/mod_gnutls/Manifest
new file mode 100644
index 000000000000..8f16001d0e08
--- /dev/null
+++ b/www-apache/mod_gnutls/Manifest
@@ -0,0 +1,6 @@
+AUX 47_mod_gnutls.conf 1125 SHA256 bbe6b19c62f4a47d7083ea07d78b7d9a368ab1fb95afc059b87993c19567550b SHA512 cafa6b049f4131b3cb43a4c62a6fb06e9ac5c44bea1901865dd5d48692f22bb5f6243d812f7f2b2d2adf0d39a16480f062043556bedc740b5630809ba9c972f7 WHIRLPOOL 1bc96d9db8c71c95261f0bc19f127c65a61c3f1218e27772cdfb7302d8f19f6a9aa579fe8dac890efd6789c8dfabe7f86e81d649d0bb2285d9a45b08196e0c72
+DIST mod_gnutls-0.8.2.tar.bz2 415903 SHA256 05eeb78e41f1fd6780607a17d705b1965ce5c3ce6223a9a8a86ba9288d22e683 SHA512 b1690aeee4f6d104e4b6a7bd443e289204630b33e00b7b145b11291d8819b5c3d5bd52b535746b8ebdfee7a5f34df527243b743b8c5d716b1d0617e319d43f4d WHIRLPOOL f3b57579bbdfea5ed845df8bd551f7b03b3f49f1b22ede1ff5c1b1b7c7fd1eeea0a55f0fb7ffe4a91cb9d5bce60f7e2e47d586f2f58057b18cf950eee24b1fbb
+EBUILD mod_gnutls-0.8.2-r1.ebuild 1002 SHA256 d2a08099cfffffcefeb1f368c713c3b5fe0f1237c2e05af1cdad8430605074c1 SHA512 90377f614bea6c8689be1f6e26d94e9ac3effa43a143366f4c6c2bbd363d214252ef4e35fc272eef74cd1776cd08dc889dd5013ec6b7641d53085b211138275e WHIRLPOOL 3e2a27077d230d275fd488bdc33183318eda7c57d97d2b835229a1fdae85ead3d4599b6dadb9449973adda3455a805d31107ae8769b013626df30418b1c31271
+MISC ChangeLog 4594 SHA256 510f0d34a08a98ae21267cdb4b16378564e3258ba83ce2d940fd259478e35ef1 SHA512 de5fa5f7434e0f7f45f2afca6e31a0121ffefe42cb4824ab0aa85401eb95d77b5218aa0d0037aa6048bda0bb87080507e57b33d82f8ec0b2c49981cb8a293494 WHIRLPOOL 1f0928a4d82eee45863038a378d7fb21c9ff70cb4078e3bb6dd67b9ed45cf523dd2bd451dfd0b953355872e3c028ad210e4ed9746cb2383416927fa193b65ab1
+MISC ChangeLog-2015 6058 SHA256 c0754abe9061116f204f7ba33b4cad4e88df06cf9a77cbe4de57524197dccdbf SHA512 4542fbcfb1be292ada71bfeecdb1abbd46941c41b2efb2fa52f4532af7efeb45195e1ca5a3733e47c0d38e954ae7512742a7b2ffc4303416fdd9887ef4fe99b8 WHIRLPOOL 216f97c914ee52ebfe98e1eb5722d5906fde5ff45aea3411b0c35ad7e94f2f33ad651908c9b1ba602829ca9a33695d9b82cf5b0d20ee0e3cb2fdb74d03333e6f
+MISC metadata.xml 255 SHA256 42291ecdbc745487c205fe39446325b98c3da38b68645b9e028c92f3e0b65bdf SHA512 a162282826a4c1ec206bc30afd84b64f7b3efa011122bf2f0f228fd5f89de5f2a8c218d0c72671e744a8207b143966afe62d3687974c2ac3aaef9450d442e0ba WHIRLPOOL 11caeb9245f4312d4bfee3fc9b3c1f45d1fb1d95c8bc3db7462a85311d569f2b585d55857acd35fc15190f06960713118ef66d94c67e8f2e8da23388cc5318a3
diff --git a/www-apache/mod_gnutls/files/47_mod_gnutls.conf b/www-apache/mod_gnutls/files/47_mod_gnutls.conf
new file mode 100644
index 000000000000..cd88204c9e83
--- /dev/null
+++ b/www-apache/mod_gnutls/files/47_mod_gnutls.conf
@@ -0,0 +1,30 @@
+<IfDefine GNUTLS>
+LoadModule gnutls_module  modules/mod_gnutls.so
+
+# mod_gnutls can optionally use a memcached server to store it's SSL Sessions
+# This is useful in a cluster enviroment, where you want all of your servers
+# to share a single SSL Session Cache.
+#GnuTLSCache memcache "127.0.0.1 server2.example.com server3.example.com"
+
+# The Default method is to use a DBM backed Cache.  It isn't super fast, but
+# it is portable and does not require another server to be running like memcached.
+GnuTLSCache dbm /var/cache/mod_gnutls/gnutls_cache
+</IfDefine>
+
+# the following is an example virtual-host as you could configure it.
+# however, this is just an example. You should always put your own
+# configuration stuff inside your own files within vhosts.d/ directory.
+#<VirtualHost 1.2.3.4:443>
+#	# insert other directives ... here ...
+#
+#	# This enables the mod_gnutls Handlers for this Virtual Host
+#	GnuTLSEnable On
+#
+#	# This is the Private key for your server.
+#	GnuTLSKeyFile conf/server.key
+#
+#	# This is the Server Certificate.  
+#	GnuTLSCertificateFile conf/server.cert
+#</VirtualHost>
+
+# vim: ts=4 filetype=apache
diff --git a/www-apache/mod_gnutls/metadata.xml b/www-apache/mod_gnutls/metadata.xml
new file mode 100644
index 000000000000..aaae44841a8d
--- /dev/null
+++ b/www-apache/mod_gnutls/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+    <maintainer type="person">
+	<email>polynomial-c@gentoo.org</email>
+	<name>Lars Wendler</name>
+    </maintainer>
+</pkgmetadata>
diff --git a/www-apache/mod_gnutls/mod_gnutls-0.8.2-r1.ebuild b/www-apache/mod_gnutls/mod_gnutls-0.8.2-r1.ebuild
new file mode 100644
index 000000000000..c85c93b2b0cc
--- /dev/null
+++ b/www-apache/mod_gnutls/mod_gnutls-0.8.2-r1.ebuild
@@ -0,0 +1,52 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+inherit autotools apache-module
+
+DESCRIPTION="mod_gnutls uses GnuTLS to provide SSL/TLS encryption for Apache2, similarly to mod_ssl"
+HOMEPAGE="https://mod.gnutls.org/"
+SRC_URI="https://mod.gnutls.org/downloads/${P}.tar.bz2"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="amd64 x86"
+IUSE="test"
+
+CDEPEND=">=net-libs/gnutls-3.3.0:="
+DEPEND="${CDEPEND}
+	test? ( app-crypt/monkeysphere )"
+RDEPEND="${CDEPEND}"
+
+# Fails because gpg-agent cannot be accessed
+RESTRICT="test"
+
+APACHE2_MOD_CONF="47_${PN}"
+APACHE2_MOD_DEFINE="GNUTLS"
+
+DOCFILES="CHANGELOG NOTICE README"
+
+need_apache2_4
+
+src_prepare() {
+	default
+	eautoreconf
+}
+
+src_configure() {
+	econf --with-apxs="${APXS}" \
+		--disable-strict \
+		--disable-doxygen-dot \
+		--disable-doxygen-doc \
+		--disable-doxygen-html \
+		--disable-doxygen-pdf \
+		ac_cv_path_UNSHARE=no
+}
+
+src_compile() {
+	emake
+}
+
+src_install() {
+	apache-module_src_install
+}
diff --git a/www-apache/mod_h2/Manifest b/www-apache/mod_h2/Manifest
new file mode 100644
index 000000000000..b7e584196b76
--- /dev/null
+++ b/www-apache/mod_h2/Manifest
@@ -0,0 +1,11 @@
+AUX mod_http2.conf 154 SHA256 07f90a2a29b9c2c3eec2ea86e98f23364ccf32fa090977e81ddfeca8ed6f2f09 SHA512 85b20350c8abb947c91e2cb462d4cd62f502e6eede3bddd5c10502b61a24396bec57c15d4419d31d4afc857053c1fb2606392023527b7eceea0b10978ce170e5 WHIRLPOOL 5bbdb50aa00572ade7edbb14eada640f37171d66d0d12950471a1ba1b503fd4904594bae9c60c2eceb79e62ff6b42da70c60954bb0fc6e55d904e323a308be8d
+DIST mod_http2-1.10.10.tar.gz 528560 SHA256 9fa881c7f2cdc955b790406bebf6e0542d35b91aeb2a400e21c244e853971ee8 SHA512 b4b9e734ed35ca63fa114462f1adb358bb73e4cbd8df95ab28c4518b8f7db40233f4ba13bc2194847eb9c1adbc3eb86fc63cbb56389fc0867767658d4d8ba77b WHIRLPOOL ee319ff6ba21832de525efa15ff1a2cd2bfef7ba80e60713342af63edf2a76d4c60c76f6b63ca172fcd33b45e728711f12646f08cc8f932f2a0802771dd95ca2
+DIST mod_http2-1.4.7.tar.gz 476716 SHA256 0d51a019917aa6bf7866cf23bf837626592ad0e74408eb341d070982cb88380a SHA512 6d91d8f73de4a571dc9ac24328b2f7214afcc9a3a00cbf93a74954533a45b647480f96f0cb1c85d767e980080b21561891a55b16943b0369a0fe2573bba1b54f WHIRLPOOL 0b81b8baf871ff043e972c65c685ae9f18737c0909bff65528a6ea3dd56735a2230c9dda67879a5684e867681fc6487f483ef006611397061b367bc275793ad6
+DIST mod_http2-1.5.6.tar.gz 502108 SHA256 73c11780e82e65c11e71e5a44685c22a7d8f07203d55dca094ea61d7a5bbaffc SHA512 8cc8894d56e32489f8e3064145cb527a415723131bdefd99583b6678af5fc50e3d4ebbf59f4734640bef0381ac0f808c780dafb9a3fe6bb45e7af4d595470716 WHIRLPOOL a2f3efb9e7ecf657be61d46a832a1b438cdaab0e44114e8ec717d9b77e8500308e7c904248c195bb55157410a103cffff8714e0378e2d2099ecb7aa7d679a4a7
+EBUILD mod_h2-1.10.10.ebuild 913 SHA256 b9dd5c94eb7cf7ad7cefbd33c130c0b07d5b75ea2d52ce6c58be4a307d046e83 SHA512 08f4d81ba78e40b322cb378d737eaec7bbc2f9cb41a68615e115f09bccc04d6c512caf79ef2cc0bb1e763edf79dfea97ad3c58c0e1f90961d256077e83c59f25 WHIRLPOOL 6c4ffc0252d5a4ea9a45ffae47a6b956355f5279236d2c2d6d4d138c562d72a1157c141b705a560f69d666729300572140810d2da0efecad237e5dfbf1ac35d4
+EBUILD mod_h2-1.4.7.ebuild 928 SHA256 55fdef1456a55a3738acd6c82723e69e836e08350e1a7b4394260a27292642ee SHA512 d787d18963a026c82ad6c59e665d1262b0a47e812f61a553cca35e9b19ab52d215c643b19d3927713f6ab6f46f78c5d88e7aca8d76f7770cd41b90f15cd68c59 WHIRLPOOL 670207b23329d353c1666b5a148ee9edcb1c9440a77d820ba3708db723b5421cab9baca3f23700e490991de6967f4ae01ebd1a38d7529020234ea89cf8e17921
+EBUILD mod_h2-1.5.6.ebuild 928 SHA256 55fdef1456a55a3738acd6c82723e69e836e08350e1a7b4394260a27292642ee SHA512 d787d18963a026c82ad6c59e665d1262b0a47e812f61a553cca35e9b19ab52d215c643b19d3927713f6ab6f46f78c5d88e7aca8d76f7770cd41b90f15cd68c59 WHIRLPOOL 670207b23329d353c1666b5a148ee9edcb1c9440a77d820ba3708db723b5421cab9baca3f23700e490991de6967f4ae01ebd1a38d7529020234ea89cf8e17921
+EBUILD mod_h2-9999.ebuild 913 SHA256 b9dd5c94eb7cf7ad7cefbd33c130c0b07d5b75ea2d52ce6c58be4a307d046e83 SHA512 08f4d81ba78e40b322cb378d737eaec7bbc2f9cb41a68615e115f09bccc04d6c512caf79ef2cc0bb1e763edf79dfea97ad3c58c0e1f90961d256077e83c59f25 WHIRLPOOL 6c4ffc0252d5a4ea9a45ffae47a6b956355f5279236d2c2d6d4d138c562d72a1157c141b705a560f69d666729300572140810d2da0efecad237e5dfbf1ac35d4
+MISC ChangeLog 3732 SHA256 8f2ea53edad0a86cc37573b2889f1660893784570ebc910d1966a63e7371f5fc SHA512 233992e7893b478ac1a7a79742e77b5241b7ef4987afea9b0f4f5947d29d5367277e3a5909368c59c53e5e6079b9fb4aae167be1ed75919b6c95df053373c467 WHIRLPOOL 9cf239fff53fdf1e9890e053a91832179bdc9382f37f27434ffa237cee8ddb21b17e9044a1ac7d703f4bcc4455417e0cbb2ef644f110690ef11b4026608ad9ed
+MISC ChangeLog-2015 2092 SHA256 960452768d74f8d98c45ed5cc71a6ef741eabfbb9b96784fd77af6f8fe61bb64 SHA512 88e536e0d7bb04227ddd6e8220c9620942098ace4fee49f04bda5987cd7a091097faa02d9bf3016634ef467c3c25ead9eb7f1234075fe98f133665ae8aa7a4a1 WHIRLPOOL ce062bbbd98299b22bc06769a4b86d2b95126ca752d2d61b41cf62f6d88187798e0af8c9e6fae87d7434974fe4d7853d775097e83efbf7b252fd3b54f3913561
+MISC metadata.xml 294 SHA256 bb7e77276047cd9607cac287be11a67d3425fff62f30c8293902c2a0f81640ea SHA512 304e42bd6856bbd80b3cda9de6b98aedda238a8499f8d93d7be5bfe04b2a704345c3bf2a6337166bdfa390f91da6130f7b52ec61c6b07be1d9823edadfb54b5a WHIRLPOOL 0f33ee594c9683724be039d0dafe4d2f8e8c9bf856d97b6e53c143fc655bf1d3b447602ed23a0a474eb0c796441abe8fced74dfa888b09583a01ad0a32880869
diff --git a/www-apache/mod_h2/files/mod_http2.conf b/www-apache/mod_h2/files/mod_http2.conf
new file mode 100644
index 000000000000..aa36a6a1d65e
--- /dev/null
+++ b/www-apache/mod_h2/files/mod_http2.conf
@@ -0,0 +1,8 @@
+<IfDefine HTTP2>
+
+LoadModule http2_module modules/mod_http2.so
+
+# https://httpd.apache.org/docs/2.4/mod/mod_http2.html
+Protocols h2 http/1.1
+
+</IfDefine>
diff --git a/www-apache/mod_h2/metadata.xml b/www-apache/mod_h2/metadata.xml
new file mode 100644
index 000000000000..fc78d93eca53
--- /dev/null
+++ b/www-apache/mod_h2/metadata.xml
@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="person">
+		<email>vapier@gentoo.org</email>
+	</maintainer>
+	<upstream>
+		<remote-id type="github">icing/mod_h2</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/www-apache/mod_h2/mod_h2-1.10.10.ebuild b/www-apache/mod_h2/mod_h2-1.10.10.ebuild
new file mode 100644
index 000000000000..eaf87ecaf6b9
--- /dev/null
+++ b/www-apache/mod_h2/mod_h2-1.10.10.ebuild
@@ -0,0 +1,47 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="6"
+
+inherit apache-module
+
+MY_P="${PN/h2/http2}-${PV}"
+
+if [[ ${PV} == 9999 ]] ; then
+	EGIT_REPO_URI="https://github.com/icing/mod_h2.git"
+	inherit autotools git-r3
+else
+	S="${WORKDIR}/${MY_P}"
+	SRC_URI="https://github.com/icing/mod_h2/releases/download/v${PV}/${MY_P}.tar.gz"
+	KEYWORDS="~amd64 ~x86"
+fi
+
+DESCRIPTION="HTTP/2 module for Apache"
+HOMEPAGE="https://github.com/icing/mod_h2"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+IUSE="ssl"
+
+RDEPEND=">=net-libs/nghttp2-1.0
+	>=www-servers/apache-2.4.20[-apache2_modules_http2,ssl?]"
+DEPEND="${RDEPEND}"
+
+need_apache2_4
+
+src_prepare() {
+	default
+	[[ ${PV} = 9999 ]] && eautoreconf
+}
+
+src_compile() {
+	default
+}
+
+src_install() {
+	default
+
+	APACHE2_MOD_DEFINE="HTTP2"
+	insinto "${APACHE_MODULES_CONFDIR}"
+	newins "${FILESDIR}/mod_http2.conf" "41_mod_http2.conf"
+}
diff --git a/www-apache/mod_h2/mod_h2-1.4.7.ebuild b/www-apache/mod_h2/mod_h2-1.4.7.ebuild
new file mode 100644
index 000000000000..48f0e8ef3707
--- /dev/null
+++ b/www-apache/mod_h2/mod_h2-1.4.7.ebuild
@@ -0,0 +1,49 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="5"
+
+inherit apache-module
+
+MY_P="${PN/h2/http2}-${PV}"
+
+if [[ ${PV} == 9999 ]] ; then
+	EGIT_REPO_URI="https://github.com/icing/mod_h2.git"
+	inherit git-2
+else
+	SRC_URI="https://github.com/icing/mod_h2/releases/download/v${PV}/${MY_P}.tar.gz"
+	KEYWORDS="~amd64 ~x86"
+fi
+
+DESCRIPTION="HTTP/2 module for Apache"
+HOMEPAGE="https://github.com/icing/mod_h2"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+IUSE="ssl"
+
+RDEPEND=">=net-libs/nghttp2-1.0
+	>=www-servers/apache-2.4.20[-apache2_modules_http2,ssl?]"
+DEPEND="${RDEPEND}"
+
+S="${WORKDIR}/${MY_P}"
+
+need_apache2_4
+
+src_configure() {
+	econf \
+		--docdir='$(datarootdir)'/doc/${PF} \
+		--disable-werror
+}
+
+src_compile() {
+	default
+}
+
+src_install() {
+	default
+
+	APACHE2_MOD_DEFINE="HTTP2"
+	insinto "${APACHE_MODULES_CONFDIR}"
+	newins "${FILESDIR}/mod_http2.conf" "41_mod_http2.conf"
+}
diff --git a/www-apache/mod_h2/mod_h2-1.5.6.ebuild b/www-apache/mod_h2/mod_h2-1.5.6.ebuild
new file mode 100644
index 000000000000..48f0e8ef3707
--- /dev/null
+++ b/www-apache/mod_h2/mod_h2-1.5.6.ebuild
@@ -0,0 +1,49 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="5"
+
+inherit apache-module
+
+MY_P="${PN/h2/http2}-${PV}"
+
+if [[ ${PV} == 9999 ]] ; then
+	EGIT_REPO_URI="https://github.com/icing/mod_h2.git"
+	inherit git-2
+else
+	SRC_URI="https://github.com/icing/mod_h2/releases/download/v${PV}/${MY_P}.tar.gz"
+	KEYWORDS="~amd64 ~x86"
+fi
+
+DESCRIPTION="HTTP/2 module for Apache"
+HOMEPAGE="https://github.com/icing/mod_h2"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+IUSE="ssl"
+
+RDEPEND=">=net-libs/nghttp2-1.0
+	>=www-servers/apache-2.4.20[-apache2_modules_http2,ssl?]"
+DEPEND="${RDEPEND}"
+
+S="${WORKDIR}/${MY_P}"
+
+need_apache2_4
+
+src_configure() {
+	econf \
+		--docdir='$(datarootdir)'/doc/${PF} \
+		--disable-werror
+}
+
+src_compile() {
+	default
+}
+
+src_install() {
+	default
+
+	APACHE2_MOD_DEFINE="HTTP2"
+	insinto "${APACHE_MODULES_CONFDIR}"
+	newins "${FILESDIR}/mod_http2.conf" "41_mod_http2.conf"
+}
diff --git a/www-apache/mod_h2/mod_h2-9999.ebuild b/www-apache/mod_h2/mod_h2-9999.ebuild
new file mode 100644
index 000000000000..eaf87ecaf6b9
--- /dev/null
+++ b/www-apache/mod_h2/mod_h2-9999.ebuild
@@ -0,0 +1,47 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="6"
+
+inherit apache-module
+
+MY_P="${PN/h2/http2}-${PV}"
+
+if [[ ${PV} == 9999 ]] ; then
+	EGIT_REPO_URI="https://github.com/icing/mod_h2.git"
+	inherit autotools git-r3
+else
+	S="${WORKDIR}/${MY_P}"
+	SRC_URI="https://github.com/icing/mod_h2/releases/download/v${PV}/${MY_P}.tar.gz"
+	KEYWORDS="~amd64 ~x86"
+fi
+
+DESCRIPTION="HTTP/2 module for Apache"
+HOMEPAGE="https://github.com/icing/mod_h2"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+IUSE="ssl"
+
+RDEPEND=">=net-libs/nghttp2-1.0
+	>=www-servers/apache-2.4.20[-apache2_modules_http2,ssl?]"
+DEPEND="${RDEPEND}"
+
+need_apache2_4
+
+src_prepare() {
+	default
+	[[ ${PV} = 9999 ]] && eautoreconf
+}
+
+src_compile() {
+	default
+}
+
+src_install() {
+	default
+
+	APACHE2_MOD_DEFINE="HTTP2"
+	insinto "${APACHE_MODULES_CONFDIR}"
+	newins "${FILESDIR}/mod_http2.conf" "41_mod_http2.conf"
+}
diff --git a/www-apache/mod_jk/Manifest b/www-apache/mod_jk/Manifest
new file mode 100644
index 000000000000..bdad7d2f5236
--- /dev/null
+++ b/www-apache/mod_jk/Manifest
@@ -0,0 +1,7 @@
+AUX 88_mod_jk.conf 5607 SHA256 c8b42dbbe6bffa01114ff5cfa55823804bbd0b33a8b01b689af717cda44a94c5 SHA512 5190adbfc9f1f6ed3c5b9c7f76c0ccd12a9e9f36b22180f2998f30e9f3ce2f10559b10aaf5efbe87c2e1cff26608783b266007990426868e1a25c924233168f1 WHIRLPOOL c49b74b4d2f7da3b74698e57cef62be6c99eff484a8fd4264c43d0aedf663f9351f41c9f6aad0df24468424bc34d7d0b943e8868017b1234404ae2b26f525507
+AUX jk-workers.properties 1034 SHA256 a1ef6f9fe43e9a1dfabc754a6b7258da7966822c5c4d21fabca030347d31486d SHA512 0c2603f9b689c1a395c7ff3973921424a3310b0b1a7c2c79f6053ad438412cabd71f1d125981a320f29de607ea0a67b229a629916ccca7ad78cd833027a80268 WHIRLPOOL 24f62190e9c90da629aee21bbaa9a683035b86f81b0743b13d5744585821eec41cfce4eca44c2783d6f2335840defce511bfa85247c5b223eb8560934a152750
+DIST tomcat-connectors-1.2.42-src.tar.gz 3143693 SHA256 ea119f234c716649d4e7d4abd428852185b6b23a9205655e45554b88f01f3e31 SHA512 9a796e2a7865a99c16595deaead94e843c291ed7229f48414edf0a260b2dda05fc94671e8b863a9ccef719bbe2ca7622c06e3dae6ccf68a41f7d96e847b68791 WHIRLPOOL e103c1bff37b841d629b42b0a2b23f5048666f58e102da4c42571a54323454e5a799c1c2494f8641ad8b16e267954d7eb60688f4ca13b8fe12d3d81f9897565a
+EBUILD mod_jk-1.2.42.ebuild 1268 SHA256 719d21628c9825f1ae608c4ffb1cacaf76c5dd86a9f7a91f79df9df9a1e2f571 SHA512 292ad3a793d2e7078abcf251fc40e566ef691ec880a88b345721ec9ee321967dbd60b673e587a9cdf271252d4d3e050a4e8fc778eac4c3fb1ff0e123b4fc5fae WHIRLPOOL 03aef46eb68635e4b29ab7a25b807f9f808545e772591c220a8b3f1913cb5875d5ddcc5d2dfc9536b174e449dab1e1811a6d28a62c90e9f8add5fa20041f4231
+MISC ChangeLog 2673 SHA256 daa52a5001d88b346e116e86df6c3f5a979516027040886eb4321c70fac76b54 SHA512 787043340297f066ddbb52bf063783f46119aa6c9dd15f6f32f5d9dd86539e069237aab17938987817995e0f8651a2c4d2d0ff292942695d1e80d2d3c259bb3d WHIRLPOOL 276bb0f0343df68701014aded620ad45932288f7045603bd01f0f2760c27a4cca1686a308e0170a33674bd85cafce97204a8c8d3f1451ab3a2c9a7207a7a61a6
+MISC ChangeLog-2015 12699 SHA256 5dbb9d42a33854f5a5a2f0ce133addde8d0ed919a3a6f03cd252a6af68047a7c SHA512 62aca0a2a19ae8be36b62ad9893eb26f043ac63097205a56ca7b5ab44d7dc31574a82553ec04fdc8351fd104edfe4f4e0a6b16f6ce44a40832879dceabdde2b8 WHIRLPOOL 31efd79defeaa4ad856f85837d9455fade6c56ec1afc5d4e5870a8bb9d91111a93eb65fd63169726ca45ddb04fdd0e5e44c7b103a6210d338aa08da7edb7f4c0
+MISC metadata.xml 446 SHA256 34ce3c5e71dbf80d6b8366345f170194877e94f8f406fb8be211727022094b76 SHA512 e6e67b81753c0e2758c199d30ea0fb1b7f899e86a33a129faaaa84235dccbf74ab62f1bb61eed3b8647536bbc560f1db865090b17e808070adce387ce0636d0b WHIRLPOOL 9beffec527819d3e7c329b9a61df7a3ba10430da6b98344ad7b416ded194b13e0fe16b8f8d9927d7784938b9ee13c51d8fedb848de07f8c1043a7aef13a645a9
diff --git a/www-apache/mod_jk/files/88_mod_jk.conf b/www-apache/mod_jk/files/88_mod_jk.conf
new file mode 100644
index 000000000000..1c66783cca12
--- /dev/null
+++ b/www-apache/mod_jk/files/88_mod_jk.conf
@@ -0,0 +1,165 @@
+<IfDefine JK>
+LoadModule jk_module    modules/mod_jk.so
+
+###
+### Where to find workers.properties
+###
+# JkWorkersFile specify the location where mod_jk will find
+# the workers definitions.
+JkWorkersFile	/etc/apache2/jk-workers.properties
+
+
+###
+### Where to put mod_jk logs
+###
+# specify the location where mod_jk is going to place its log file.
+JkLogFile	/var/log/apache2/mod_jk.log
+
+###
+### Where to put mod_jk shm file
+###
+# specify the location where mod_jk is going to place its shared memory file.
+JkShmFile	/var/log/apache2/jk-runtime-status
+
+###
+### Set the jk log level [debug/error/info]
+###
+# info log will contains standard mod_jk activity (default).
+# error log will contains also error reports.
+# debug log will contains all informations on mod_jk activity
+JkLogLevel	info
+
+
+###
+### Select the log format
+###
+# JkLogStampFormat will configure the date/time format found
+# on mod_jk logfile. Using the strftime() format string it's
+# set by default to "[%a %b %d %H:%M:%S %Y]"
+#JkLogStampFormat "[%a %b %d %H:%M:%S %Y] "
+
+
+###
+### JkOptions indicate to send SSL KEY SIZE,
+###
+# The directive JkOptions allow you to set many forwarding
+# options which will enable (+) or disable (-) following option.
+#
+#
+# JkOptions ForwardKeySize , you ask mod_jk, when using ajp13, to
+# forward also the SSL Key Size as required by Servlet API 2.3.
+# This flag shouldn't be set when servlet engine is Tomcat 3.2.x
+# (on by default).
+#
+#
+# JkOptions ForwardURICompat , you told mod_jk to send the URI to
+# Tomcat normally, which is less spec compliant but mod_rewrite
+# compatible, use it for compatibility with Tomcat 3.2.x engines
+# (on by default).
+#
+#
+# JkOptions ForwardURICompatUnparsed , the forwarded URI is unparsed,
+# it's spec compliant but broke mod_rewrite.
+#
+#
+# JkOptions ForwardURIEscaped , the forwarded URI is escaped and
+# Tomcat (since 3.3 rc2) will do the decoding part.
+#
+#
+# JkOptions ForwardDirectories is used in conjunction with Directory-
+# Index directive of Apache web server. As such mod_dir should be
+# available to Apache, statically or dynamically (DSO)
+#
+# When DirectoryIndex is configured, Apache will create sub-requests
+# for each of the local-url's specified in the directive, to determine
+# if there is a local file that matches (this is done by stat-ing the file).
+#
+# If ForwardDirectories is set to false (default) and Apache doesn't
+# find any files that match, Apache will serve the content of the
+# directory (if directive Options specifies Indexes for that directory)
+# or a 403 Forbidden response (if directive Options doesn't specify
+# Indexes for that directory).
+#
+# If ForwardDirectories is set to true and Apache doesn't find any
+# files that match, the request will be forwarded to Tomcat for
+# resolution. This is used in cases when Apache cannot see the index
+# files on the file system for various reasons: Tomcat is running on
+# a different machine, the JSP file has been precompiled etc.
+#
+# Note that locally visible files will take precedence over the ones
+# visible only to Tomcat (i.e. if Apache can see the file, that's
+# the one that's going to get served). This is important if there is
+# more then one type of file that Tomcat normally serves - for
+# instance Velocity pages and JSP pages.
+#
+JkOptions +ForwardKeySize +ForwardURICompat -ForwardDirectories
+
+
+###
+### JkEnvVar forward environment vars
+###
+# The directive JkEnvVar allow you to forward an environment vars
+# from Apache server to Tomcat engine.
+#
+#JkEnvVar SSL_CLIENT_V_START
+
+
+###
+### JkRequestLogFormat set the request format
+###
+# JkRequestLogFormat will configure the format of mod_jk individual
+# request logging. Request logging is configured and enabled on a
+# per virtual host basis. To enable request logging for a virtual
+# host just add a JkRequestLogFormat config. The syntax of the
+# format string is similiar to the Apache LogFormat command, here
+# is a list of the available request log format options:
+#
+# Options	Description
+# %b		Bytes sent, excluding HTTP headers (CLF format)
+# %B		Bytes sent, excluding HTTP headers
+# %H		The request protocol
+# %m		The request method
+# %p		The canonical Port of the server serving the request
+# %q		The query string (prepended with a ? if a query string exists, otherwise an empty string)
+# %r		First line of request
+# %s		Request HTTP status code
+# %T		Request duration, elapsed time to handle request in seconds '.' micro seconds
+# %U		The URL path requested, not including any query string.
+# %v		The canonical ServerName of the server serving the request
+# %V		The server name according to the UseCanonicalName setting
+# %w		Tomcat worker name
+#
+JkRequestLogFormat "%w %V %T"
+
+
+###
+### JkMount assign specific URLs to Tomcat
+###
+# JkMount directive assign specific URLs to Tomcat. In general the
+# structure of a JkMount directive is:
+#
+# send all requests ending in .jsp to worker1
+#  JkMount /*.jsp worker1
+#
+# send all requests ending /servlet to worker1
+#  JkMount /*/servlet/ worker1
+#
+# send all requests jsp requests to files located in /otherworker will go worker2
+#  JkMount /otherworker/*.jsp worker2
+#
+#
+# You can use the JkMount directive at the top level or inside
+# <VirtualHost> sections of your httpd.conf file.
+#
+
+
+# We specify an autoalias, that makes it possible that apache is still
+# reponsible for serving static html files. All requests of files with
+# the ending .jsp will be redirected to a default Tomcat installation which
+# uses the default profile. Change this to fit your needs.
+jkAutoAlias /var/lib/tomcat-5.5/default/webapps/
+jkMount /*.jsp ajp13
+
+</IfDefine>
+
+# vim: ts=4 filetype=apache
diff --git a/www-apache/mod_jk/files/jk-workers.properties b/www-apache/mod_jk/files/jk-workers.properties
new file mode 100644
index 000000000000..b73892fae9e5
--- /dev/null
+++ b/www-apache/mod_jk/files/jk-workers.properties
@@ -0,0 +1,36 @@
+# workers.properties -
+#
+# This file provides jk derived plugins with the needed information to
+# connect to the different tomcat workers.  Note that the distributed
+# version of this file requires modification before it is usable by a
+# plugin.
+#
+# As a general note, the characters $( and ) are used internally to define
+# macros. Do not use them in your own configuration!
+
+# The list of Tomcat workers
+#
+worker.list=ajp13
+
+
+#------ DEFAULT ajp13 WORKER DEFINITION ------------------------------
+#---------------------------------------------------------------------
+#
+
+# Defining a worker named ajp13 and of type ajp13
+# Note that the name and the type do not have to match.
+#
+worker.ajp13.port=8009
+worker.ajp13.host=localhost
+worker.ajp13.type=ajp13
+#
+# Specifies the load balance factor when used with
+# a load balancing worker.
+# Note:
+#  ----> lbfactor must be > 0
+#  ----> Low lbfactor means less work done by the worker.
+worker.ajp13.lbfactor=1
+
+#
+# Specify the size of the open connection cache.
+worker.ajp13.cachesize=10
diff --git a/www-apache/mod_jk/metadata.xml b/www-apache/mod_jk/metadata.xml
new file mode 100644
index 000000000000..7502a331d87c
--- /dev/null
+++ b/www-apache/mod_jk/metadata.xml
@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="project">
+		<email>java@gentoo.org</email>
+		<name>Java</name>
+	</maintainer>
+	<longdescription>
+		mod_jk is a connector used to connect Tomcat JSP/Servlet 
+		container with web servers such as Apache, Netscape, 
+		Iplanet, SunOne and even IIS using the AJP protocol.
+	</longdescription>
+</pkgmetadata>
diff --git a/www-apache/mod_jk/mod_jk-1.2.42.ebuild b/www-apache/mod_jk/mod_jk-1.2.42.ebuild
new file mode 100644
index 000000000000..b3af1a400990
--- /dev/null
+++ b/www-apache/mod_jk/mod_jk-1.2.42.ebuild
@@ -0,0 +1,60 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+inherit apache-module java-pkg-opt-2 readme.gentoo-r1
+
+MY_P="tomcat-connectors-${PV#-*}-src"
+
+DESCRIPTION="JK module for connecting Tomcat and Apache using the ajp13 protocol"
+HOMEPAGE="https://tomcat.apache.org/connectors-doc/"
+SRC_URI="mirror://apache/tomcat/tomcat-connectors/jk/${MY_P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="amd64 ~ppc x86"
+IUSE="java"
+
+S="${WORKDIR}/${MY_P}/native"
+
+APACHE2_MOD_FILE="${S}/apache-2.0/${PN}.so"
+APACHE2_MOD_CONF="88_${PN}"
+APACHE2_MOD_DEFINE="JK"
+
+CONF_DIR="${WORKDIR}/${MY_P}/conf"
+
+DEPEND="java? ( >=virtual/jdk-1.4 )"
+RDEPEND=""
+
+need_apache2
+
+DOC_CONTENTS="
+	Advanced Directives and Options can be found at:
+	https://tomcat.apache.org/connectors-doc/reference/workers.html
+"
+
+pkg_setup() {
+	use java && java-pkg-2_pkg_setup
+}
+
+src_configure() {
+	econf \
+		--with-apxs=${APXS}
+}
+
+src_compile() {
+	emake LIBTOOL="/bin/sh $(pwd)/libtool --silent"
+}
+
+src_install() {
+	# install the workers.properties file
+	insinto "${APACHE_CONFDIR}"
+	newins "${CONF_DIR}/workers.properties" \
+		jk-workers.properties
+	doins "${CONF_DIR}/uriworkermap.properties"
+
+	apache-module_src_install
+
+	readme.gentoo_create_doc
+}
diff --git a/www-apache/mod_ldap_userdir/Manifest b/www-apache/mod_ldap_userdir/Manifest
new file mode 100644
index 000000000000..54879cd24598
--- /dev/null
+++ b/www-apache/mod_ldap_userdir/Manifest
@@ -0,0 +1,6 @@
+AUX 47_mod_ldap_userdir.conf 284 SHA256 387b836d2496489e190f9673794474300db3ddb7b802b84fdfc8bd6022b14ad3 SHA512 7651fade1a9bda54e6ea1d3c2a8b6853f91c6c43f7d914cbd8e1bfa94ef2c31b0ac1c3798d9430fa62805d4b48eb358ad8e665cb0e9c833fc622c78e4789f747 WHIRLPOOL d86a4ccd2e886dfdebc781241aa9e01180ab4a2e3c041e18405e1001e6cad166549855e2b009f00ed4951ddc2efd428212c878be8a16e2c38c9098417e52301a
+DIST mod_ldap_userdir-1.1.19.tar.gz 51483 SHA256 467c3c9e40c1a8f39fe01ffedf5b9a462e14ed2a6ce2ec493c53f081b5a99fb5 SHA512 57d75ac58ac841641050e1f6e022bd6c7df9192da29439264bbe83e938e84a474952996e53bcba1f490ab24415c98b7e972bc3af14cb46a7bc35016b6533ff28 WHIRLPOOL b41afe88159e83316bed62011e0cb1f5430c3cd5b5026ac7418d2afd6f007d2299b9414490c9f3b8e37b9061fde82117aec8816e30e8abd1a79672cc88a01e2d
+EBUILD mod_ldap_userdir-1.1.19.ebuild 911 SHA256 83cfe8ed0dbd7c08db6215c7d87bfc3f63b46aef0c822eadfdc591cc587e0f5b SHA512 3249d9cf0ead821dd706e6d4199e9dc69493036a0a42f6c5075da65962a8e1c06579306dfa41bf584392fc2552f881bab42a1f4888d01a7b9e1e503acbe8a8bc WHIRLPOOL b6e12d9dbead56e9d66823bb2b00323dd153abcbe38c1b1a1d86007fb6e27a619d1f952eda911da3b2139ef500d42566b4b57f8c75838594f9b708c1e3c97384
+MISC ChangeLog 2588 SHA256 34c25616e15c4714c14303ec9c731caac4486979628f44e9d59a3022f210f06b SHA512 ab7fba506d9bbbdf4fd2d7659c7fa93c8abf4d2d277d127dc736cfa7b55b60024d40b67a8e24787ce741ea78c12afa70b0825b66df4a2ad7d1b2c3105e600ed8 WHIRLPOOL 9dbf6ada6c09ad6d01b05e4878a0bd648f978cd3998bfad9baff691a9171b8cc45c83178bb083cf3a6ef0f8e8fa6d66123c43d747966b0ff608094407db095ae
+MISC ChangeLog-2015 5321 SHA256 61b39550b5b892bad85728ffec708912cd2104c426bb7e69a7631890e135eefb SHA512 d9cb5c92929901411caab2099cd7cdb3d45ca587adbc0f8438e8a5ea67f4c12af29f37d05f8ca1da243ae31de9904ed7383dd84affe4ad1ab9ec02e48b37e9c2 WHIRLPOOL 872ea3756e85b2201d97992bf65b6096048356cb5d30f35b77944b92e5f50ce1a12b6cf726998c9dbc8007ec2572d3d20eb2889f36c685ae63c66c566d3f339a
+MISC metadata.xml 166 SHA256 2caff447f5bd2701d8456ada5cc633c41ef4373fa4bfeabeb73599d40bcc941b SHA512 a56648c974a1d14dd4c18237532773c72057a13ab90c58b5da04f185e3c12a8bd8d5c21fb06053507f31766291a82dc7d87b34cd65fd94cfe2af7295c813ef84 WHIRLPOOL 1ff70497eca6531f0e0614c72a19f4b8e5ff486a58d369f4f0b36308d1d6b01168f9da887740e3b9f536236be251d3fe05f904d27a9233a7cf613416ba882968
diff --git a/www-apache/mod_ldap_userdir/files/47_mod_ldap_userdir.conf b/www-apache/mod_ldap_userdir/files/47_mod_ldap_userdir.conf
new file mode 100644
index 000000000000..1e14e80e152b
--- /dev/null
+++ b/www-apache/mod_ldap_userdir/files/47_mod_ldap_userdir.conf
@@ -0,0 +1,9 @@
+<IfDefine LDAP_USERDIR>
+LoadModule ldap_userdir_module modules/mod_ldap_userdir.so
+
+LDAPUserDir             public_html
+LDAPUserDirDNInfo       cn=root,dc=yourcompany,dc=com yourpassword
+LDAPUserDirBaseDN       ou=People,dc=yourcompany,dc=com
+</IfDefine>
+
+# vim: ts=4 filetype=apache
diff --git a/www-apache/mod_ldap_userdir/metadata.xml b/www-apache/mod_ldap_userdir/metadata.xml
new file mode 100644
index 000000000000..6f49eba8f496
--- /dev/null
+++ b/www-apache/mod_ldap_userdir/metadata.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<!-- maintainer-needed -->
+</pkgmetadata>
diff --git a/www-apache/mod_ldap_userdir/mod_ldap_userdir-1.1.19.ebuild b/www-apache/mod_ldap_userdir/mod_ldap_userdir-1.1.19.ebuild
new file mode 100644
index 000000000000..11e4d4c075f9
--- /dev/null
+++ b/www-apache/mod_ldap_userdir/mod_ldap_userdir-1.1.19.ebuild
@@ -0,0 +1,33 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+inherit apache-module depend.apache
+
+DESCRIPTION="Look up Apache ~user directories in an LDAP directory"
+HOMEPAGE="http://horde.net/~jwm/software/${PN}/"
+SRC_URI="http://horde.net/~jwm/software/${PN}/${P}.tar.gz"
+
+LICENSE="GPL-1"
+SLOT="0"
+KEYWORDS="amd64 ppc x86"
+IUSE="ssl"
+
+DEPEND="net-nds/openldap
+	ssl? ( dev-libs/openssl )"
+
+# The module will compile fine without apache[ldap], but Apache will
+# crash if you try to load ${PN} without mod_ldap loaded. The funny-
+# looking atom was taken from depend.apache.eclass (need_apache2).
+RDEPEND="${DEPEND}
+	=www-servers/apache-2*[ldap]"
+
+APACHE2_MOD_CONF="47_${PN}"
+APACHE2_MOD_DEFINE="LDAP LDAP_USERDIR"
+
+DOCFILES="DIRECTIVES README user-ldif"
+
+# Don't try to get away without this, even though it causes some deps to
+# be repeated.
+need_apache2
diff --git a/www-apache/mod_limitipconn/Manifest b/www-apache/mod_limitipconn/Manifest
new file mode 100644
index 000000000000..8c091e5eac8b
--- /dev/null
+++ b/www-apache/mod_limitipconn/Manifest
@@ -0,0 +1,7 @@
+AUX 27_mod_limitipconn.conf 554 SHA256 b66b7c2824eedf49dba6d808fc1870cb8e7c3cfc1fab2c1002b9f22ded5a31c6 SHA512 7ded8b48b769529a8fcb6b25855d31ef82cf3de423a75ae5e986974ba2c21643adff235ec9bfcde1955513d10fc3fc9dde172ddb9fb43626eb625bed96936c3d WHIRLPOOL bf3917246b27313d9bbf716154a97016bec7ff0d4c7896c0c12faa44596068b505e8f36d285f65f7edec1f5ab630901ae11f1bcad57d24108071e817c0fe35df
+DIST mod_limitipconn-0.24.tar.bz2 10150 SHA256 69ca8fbf99d4e02db75e129df07d1604db771e9c10c1b199e2accaa96aec2a1f SHA512 caf1337231ac83ef57938b0f89769afcf309a4a09a0a2c3fb171e49f038d42a5859dfdac06b2c7766f05d9431132b8752aa8ad5164794c89638eb90f392e827f WHIRLPOOL 740f0b2901099544f1fc03154ccec9ccac393501c1e5ffa8a3727a5f336cbceb54334174fb7f6b8e46cfdb8d49858b79d47fe6cc3ab056ff5c74826df77e0ad2
+EBUILD mod_limitipconn-0.24-r2.ebuild 574 SHA256 8c1156c34efeaf9fb991bcb6813f106895abea6746cc7165f3a677aac0f7d0cc SHA512 6a1eab8da29a5f3aa7a820549f4518b6c01fe1df123045e5c164054b8e1a37e292a074e38d468e1999dd045093f81ccca42e47fde29f211805c64b8f2d356836 WHIRLPOOL 67148ec2f68e276f5e51bba511eb47eb24553b61fdaf289f144052e4bf7c20572b51595b27a5b59012b81b62cbb3ac7ed2f5be84ecdf65c3be0e16a4f789834f
+EBUILD mod_limitipconn-0.24.ebuild 542 SHA256 864aa53dff4a28d923dd4fc19597d11c827af9c678c79dfaf7432713511c7ef3 SHA512 b0e22578cdd74142ede232058ae0187029d61fc2cfc012647ee4caf6a521780d652c09ae6bd9adbd76e0c1ad668dc132d537097e9020f8589c349f273977a0e8 WHIRLPOOL 4672fa2c70cf74f0440c8b04ec183a97214d036adaeba011fcce56be1fac7757540bcffa2502772694769ee2c8257221cf968df4917d7a63d7368f2f9e2ca1db
+MISC ChangeLog 3312 SHA256 63959f2d94ee845218e784f5a63b472d086e99c208d062fdcf329a897c99ecba SHA512 f87a5664fcd3ec232d8cfacd138caadb6ef784a02c682d104608860587ea2a6bb9d4955e8c9b8991be4f3ec4bed23fe0347a4849fbd25f4759934aee96fda3c7 WHIRLPOOL 0491f2a17d66a32540398393190f128e0b0f04a88ad27652a545f84ad5db1c7d9e9410d29f81e15ee200d06c1ebfd6059022394d28f0ba55ff9705bdec984718
+MISC ChangeLog-2015 4723 SHA256 8cbbd6ea249b8393b09b4dc64de9f214b4fb8214241116b02407a61a1a7155aa SHA512 77814b9875451537751a7608abfdc6a2b7305788506e1ff88cd1eb41a28305977e4fa1b81cdb08558864025bf3c9cb0e190da1e633629d7b077676094427bba3 WHIRLPOOL 493c3f8cce9d63a1c6f31d5650fa10ed7e40fd078195de874f463a212f3d46d72bf533a14511d0e1a12eb1690ce971cca437e1f884d3c218795de35d2accd13b
+MISC metadata.xml 361 SHA256 94c3cb6177d32b90e2a82741cd46809ee224375be68f39790eba79a56dc97d2b SHA512 7e9284c4abba13f0d9538d2626d985f02e0c4f1e5f3c3b8c504174096b74a7aec26a2c363e807340195b6978c7c4504d768995648ef7b708a1dbebdf7c4d62b0 WHIRLPOOL 4ff110610278f3ff793ddeebacb08440e8bd4fcf4776711194141996581c1897f3efe3a02fd257bf06f3430fa31c792f02093168739f5a406c4dfb1078484257
diff --git a/www-apache/mod_limitipconn/files/27_mod_limitipconn.conf b/www-apache/mod_limitipconn/files/27_mod_limitipconn.conf
new file mode 100644
index 000000000000..0c3f9d7ed4ae
--- /dev/null
+++ b/www-apache/mod_limitipconn/files/27_mod_limitipconn.conf
@@ -0,0 +1,20 @@
+<IfDefine LIMITIPCONN>
+LoadModule limitipconn_module modules/mod_limitipconn.so
+
+<Location /somewhere>
+	MaxConnPerIP 3
+	# exempting images from the connection limit is often a good
+	# idea if your web page has lots of inline images, since these
+	# pages often generate a flurry of concurrent image requests
+	NoIPLimit image/*
+</Location>
+
+<Location /mp3>
+	MaxConnPerIP 1
+	# In this case, all MIME types other than audio/mpeg and video*
+	# are exempt from the limit check
+	OnlyIPLimit audio/mpeg video
+</Location>
+</IfDefine>
+
+# vim: ts=4 filetype=apache
diff --git a/www-apache/mod_limitipconn/metadata.xml b/www-apache/mod_limitipconn/metadata.xml
new file mode 100644
index 000000000000..675939a7cec5
--- /dev/null
+++ b/www-apache/mod_limitipconn/metadata.xml
@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<!-- maintainer-needed -->
+	<longdescription>
+	  Apache module to limit the maximum number of simultaneous
+	  connections per IP address. Allows inclusion and exclusion of files
+	  based on MIME type.
+	</longdescription>
+</pkgmetadata>
diff --git a/www-apache/mod_limitipconn/mod_limitipconn-0.24-r2.ebuild b/www-apache/mod_limitipconn/mod_limitipconn-0.24-r2.ebuild
new file mode 100644
index 000000000000..bf840e0eafc1
--- /dev/null
+++ b/www-apache/mod_limitipconn/mod_limitipconn-0.24-r2.ebuild
@@ -0,0 +1,26 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit apache-module
+
+DESCRIPTION="Limit the number of simultaneous apache connections"
+HOMEPAGE="http://dominia.org/djao/limitipconn2.html"
+SRC_URI="http://dominia.org/djao/limit/${P}.tar.bz2"
+
+LICENSE="Apache-2.0"
+SLOT="2"
+KEYWORDS="~amd64 ~ppc ~x86"
+IUSE=""
+
+DEPEND=""
+RDEPEND="=www-servers/apache-2*[apache2_modules_status]"
+need_apache2
+
+RESTRICT="test"
+
+APACHE2_MOD_CONF="27_${PN}"
+APACHE2_MOD_DEFINE="LIMITIPCONN STATUS"
+
+DOCFILES="ChangeLog README"
diff --git a/www-apache/mod_limitipconn/mod_limitipconn-0.24.ebuild b/www-apache/mod_limitipconn/mod_limitipconn-0.24.ebuild
new file mode 100644
index 000000000000..f13624185577
--- /dev/null
+++ b/www-apache/mod_limitipconn/mod_limitipconn-0.24.ebuild
@@ -0,0 +1,25 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+inherit apache-module
+
+DESCRIPTION="Allows administrators to limit the number of simultaneous downloads permitted"
+HOMEPAGE="http://dominia.org/djao/limitipconn2.html"
+SRC_URI="http://dominia.org/djao/limit/${P}.tar.bz2"
+
+LICENSE="Apache-2.0"
+SLOT="2"
+KEYWORDS="amd64 ppc x86"
+IUSE=""
+
+DEPEND=""
+RDEPEND=""
+
+RESTRICT="test"
+
+APACHE2_MOD_CONF="27_${PN}"
+APACHE2_MOD_DEFINE="LIMITIPCONN INFO"
+
+DOCFILES="ChangeLog README"
+
+need_apache2
diff --git a/www-apache/mod_log_rotate/Manifest b/www-apache/mod_log_rotate/Manifest
new file mode 100644
index 000000000000..58e166a13b75
--- /dev/null
+++ b/www-apache/mod_log_rotate/Manifest
@@ -0,0 +1,8 @@
+AUX 10_mod_log_rotate.conf 132 SHA256 446b30c718fea4d9209c5658d2dd64414412bfda793d032c89ef3b50b8f7624a SHA512 70f973aba76042486bc9ca71365bc2c0e1e78266956418d3804ba4af4a6a491373e62da96b40a7ad1a5f24ab75692419214565e4e579ba75ec5a1259dbdbed27 WHIRLPOOL ee33a7f38abebbe4ff88e97a277894c1a856984bd63ef3ded03b267dbe6efaa20f240538be87dc09f17db19270d706a59b907685fa9f923ad99c74cebb8eefc2
+DIST mod_log_rotate-1.00.tar.bz2 4697 SHA256 8a46b9ebecee09ff3dc240dcc28f153b66135764b80e374de60a0a4f1301eb5a SHA512 dbfa1399f70333e6d53cee039ba9c81a213b485a8a6824976983ebc85b2c856061dbbc13fa899b5e98912c519c9fb37009bf2fbf8b6a9f46cca65c0e3bd1595e WHIRLPOOL 257b7d189e045913e31cea822bd137eaab3b052fb1b196a8b4057c02466c9fb55a3ed1929c5230d18a7d75f710f19691132b3062caf4f2ca0c4057e82be11be0
+DIST mod_log_rotate-1.01.tar.gz 9772 SHA256 c87465630591b938b2263abc566354befd263aea31ad045752a006de57584432 SHA512 7da606ae8ce5e0f2ade16fdffffc57fa9549b4b5e9529eb3149ff7390caa64f7ec065aa7416b5c8ab751e2b3eaf35cf79c96b8c7e68e1165a46851547781c076 WHIRLPOOL cfdd957f86f964b2c6dc0deb3c838d67a899d8e7ce6c4a9421930c77a6cbd2755aa4903acae371b3a36bada6dccdbdd876a41dc369610cadca04ff5ed875d7f6
+EBUILD mod_log_rotate-1.00.ebuild 491 SHA256 aeb541e32f062a9f1ae197ab559ee091c2188af01c0dd8083bb8663f6a3cbd05 SHA512 6d79927268a08592c0c28dbb31cf72671732bf40437ffe097f47ff233f1dc67eb0bd1ef20f2fedfc1b1ba640ccbf538c8298f3df3b636e1c85b5efbd1fbc7538 WHIRLPOOL a34f207c47c2caa0d03d47a8aa7a16f76a6a98a542a3199c89847a868b743c15bfd4897866684a4b0a72fcda7adc17a6dd0d1a3b64b8b6a3b3e226b528f11942
+EBUILD mod_log_rotate-1.01.ebuild 515 SHA256 276d0d01b4bbabbaac25c846ee3026fd364e5145c14df18f1224d6e1ea0202da SHA512 e95e2f4cc77f2395fca279a3e4cc762ba6baeb0d5bd43792e5a937953b59b99dce831f892e9d8a90ab6e3381b8b7bf5dd16f063676ccdaddb3ea9db6717a55e5 WHIRLPOOL f53088f52e03829116b84b9e78ab2b9fb7e6715db5053d150efd3df63468c8fec9b3f5e69ea43d98561a0fff812732c3a961ac0cf76cc888ecb4cbc0062027f3
+MISC ChangeLog 2640 SHA256 efeb373bd44b93bf2770e0a7f3ff55bc09ff92c52c8abc0614360d1bb6f59b43 SHA512 e771bdcb6416263e0d556c0a7c1a4ee55a78886439ce071e9daa9cec150ada02b581bb2660d85806b66dc9c728a25e01dabb7193b220966fd7646d7e5c58f469 WHIRLPOOL f8c508f3c9714c8036942bd9dabca7766829c8620717ec257be059a53aea9193225c0c770e6d3d3b12f022a3feb6eec6dc9ad7872597b1028431ec84251c67cd
+MISC ChangeLog-2015 953 SHA256 b675af73e3b1984c2777a7e6b0689b1000bfeb1169ab5e82d5e2c586a8d01550 SHA512 474f639a7d8cc8f5d9748cf05a0282885dfc855047e9e8a4338b1a566c9c28484d26c7c156da444d224d86de1ff3a1778cc6f1ef3d86f52c51a1ab648d7bfa1b WHIRLPOOL 09dc0f33325f5813615f7cdbf989955725df85bfef72b546480ee3bb39effc9115df402840b388f95836467535523dbaa7e27121ac807feb5fe010cdca96fc8b
+MISC metadata.xml 253 SHA256 e5048323e0a5c7276d4986369c0decf7ea6e3c793a3400d682eb0f0f0246fc1a SHA512 e09da9ca586edbc4a97e071e75a8eabfee4845ea3f4849fecda9be93c653c992c6aac4bbd35cba273546f21144fd0fc18b82a4ae0c2e30aeb25e65b90df962c5 WHIRLPOOL b497d152bf10d2ad7580de61b4a6ffb75e1047749f9869ec6d092343a09f00160154962d514d960ecc24dc1ad621eebd7ea6c7a228d808e48b3a343a2cf1ef43
diff --git a/www-apache/mod_log_rotate/files/10_mod_log_rotate.conf b/www-apache/mod_log_rotate/files/10_mod_log_rotate.conf
new file mode 100644
index 000000000000..eb17b4622ff1
--- /dev/null
+++ b/www-apache/mod_log_rotate/files/10_mod_log_rotate.conf
@@ -0,0 +1,6 @@
+<IfDefine LOG_ROTATE>
+LoadModule log_rotate_module modules/mod_log_rotate.so
+RotateLogs On
+</IfDefine>
+
+# vim: ts=4 filetype=apache
diff --git a/www-apache/mod_log_rotate/metadata.xml b/www-apache/mod_log_rotate/metadata.xml
new file mode 100644
index 000000000000..7ab3a95a559b
--- /dev/null
+++ b/www-apache/mod_log_rotate/metadata.xml
@@ -0,0 +1,8 @@
+<?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">JBlond/mod_log_rotate</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/www-apache/mod_log_rotate/mod_log_rotate-1.00.ebuild b/www-apache/mod_log_rotate/mod_log_rotate-1.00.ebuild
new file mode 100644
index 000000000000..9170275285e9
--- /dev/null
+++ b/www-apache/mod_log_rotate/mod_log_rotate-1.00.ebuild
@@ -0,0 +1,21 @@
+# Copyright 1999-2009 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+inherit eutils apache-module
+
+DESCRIPTION="mod_log_rotate adds log rotation support to mod_log_config based on strftime(3)"
+HOMEPAGE="http://www.hexten.net/wiki/index.php/Mod-log-rotate"
+SRC_URI="mirror://gentoo/${P}.tar.bz2"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="amd64 x86"
+IUSE=""
+
+DEPEND=""
+RDEPEND=""
+
+APACHE2_MOD_CONF="10_${PN}"
+APACHE2_MOD_DEFINE="LOG_ROTATE"
+
+need_apache2
diff --git a/www-apache/mod_log_rotate/mod_log_rotate-1.01.ebuild b/www-apache/mod_log_rotate/mod_log_rotate-1.01.ebuild
new file mode 100644
index 000000000000..5fe8569c2b77
--- /dev/null
+++ b/www-apache/mod_log_rotate/mod_log_rotate-1.01.ebuild
@@ -0,0 +1,24 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+inherit apache-module
+
+DESCRIPTION="Log rotation support for mod_log_config based on strftime(3)"
+HOMEPAGE="https://github.com/JBlond/${PN}"
+SRC_URI="https://github.com/JBlond/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+DEPEND=""
+RDEPEND=""
+
+APACHE2_MOD_CONF="10_${PN}"
+APACHE2_MOD_DEFINE="LOG_ROTATE"
+DOCFILES="README.md"
+
+need_apache2
diff --git a/www-apache/mod_log_sql/Manifest b/www-apache/mod_log_sql/Manifest
new file mode 100644
index 000000000000..8187eaebe43b
--- /dev/null
+++ b/www-apache/mod_log_sql/Manifest
@@ -0,0 +1,8 @@
+AUX 1.101/42_mod_log_sql.conf 938 SHA256 b4d652ded6486c93fa524f68243dad635a7e02c600727110d7758e3eb8794cf1 SHA512 9e3829b974b4d676a3a2e5d98243a8a0f9b9f462722d67d56dba05932aa22aeb9d2581b1833f4701e61ba5c07cd9fdefd8422735582da00b74428912f136ea7e WHIRLPOOL 945aed18d0a8cb276d60e797651092f187c1e8a60f616ab38d70ebd02af14e002efc8d51acec335df7e2ef3ab8045d1335b32eca5888aeb4b91c04d39a317b40
+AUX 42_mod_log_sql.conf 827 SHA256 92e35990cdde4d2761730d017f123efe4adc223c375d8ce5f7c3f71111d1494e SHA512 0e43b3c89216fe33886373a4036d3ef5f873e8c99f6fbb640224e606d29a1f220e692fb73e6b54cb87aff502e4642f17245a6771c4e0d6426d0834f564cf2f4f WHIRLPOOL 0c3d96c7297c4cc970c0d68113ea6a617771884aff7f7f6d7d7b7f8d849707eb106497c7efde580b528c34bd162b2e9433b10ca5bba94fbd25d77f8c5412891e
+AUX mod_log_sql-1.101-apache-2.4.patch 633 SHA256 9273ab1b5164c0b3f49290f759fb9499e4f66013886aa7b16c271db99242977c SHA512 9ce5fc6183d76a32a073d0778404d1b112a3f44eddb589a80146b82762535cf909f303af41dd0bbd650d70e362e85e4fb361039c4fcdfd1a8af134d6d02a2fd4 WHIRLPOOL be4e82ebcf50f782a564ecffad95c7471ab7b3d4af1c75838afee0e291844bee6f51f4a732ccdac57f04d5075c77f8f3e57ed1a52964b54b40b6586c1e41656a
+DIST mod_log_sql-1.101.tar.bz2 127500 SHA256 0907579b0466844f7f1886af92a9ea36b4815ec869929ba577c74d32b6d69a5e SHA512 30ea586443cf042e52149012613d80ca0c6631847618366905e90f99bfab235ca6e050fa1dbdb98ef54be6d68b34564781c6efb36ba89f7b51e4f3e00892d91f WHIRLPOOL 1fb6c8725a6321fe565a13121592694750354686e6a3035abb80bc7250d3a2884dd0bea0421f2d02768c196eeb409cb7e600e48dfed0fd7f14146d242666d681
+EBUILD mod_log_sql-1.101-r2.ebuild 1504 SHA256 3e782374005587b99c3ebc6f6d42a2267949fd8153ecd2cebfbd5431863bdb3f SHA512 b49f76ef2444ef56ebc7d3c2d425990d8a31bc99acd066364c597b95c0905c75290e2add1e1ab1b5a87a64320594fea01388d3295a6b3763f6d3d370a399d198 WHIRLPOOL 16fd320e889889a31e274ddce3703b2c132e25c7d28ee84ec7e0f3c5a149aa5b258065420734ed2167b9f273e51c178c674e5caa7f59d7e137bb7212b4bf584e
+MISC ChangeLog 3215 SHA256 a197cca5b8732d9929a046e369caffd12bedeeaeac36baf52e4bca7f634e4034 SHA512 4acba8807c62290cf7d10b50deb51322a4b704814dac50da53687f6aacdbe02b6f0ebbbe7db26de3ff993228c4419ea6cacbb130e46923f2aedd539f1e9fced3 WHIRLPOOL aa338eabbd9a140d72fd7d795b57e879ca162e27fd9d61e7971c9de3734818eda2175ef6ae1765b181e2854dba9c24d2d4e65e7a83d101943984099c69ebc866
+MISC ChangeLog-2015 7296 SHA256 c92b7c0631e985f65e97c7b821899e22df66f5ecaab75d47e07c6e2107315ca5 SHA512 daa9e54c352748222514a78b62c7d90fb733166aa04fd4725e775829afecb767853c02f6abe2741de642f99600418d8cd1c7f378100873bc18a182229e9329b6 WHIRLPOOL e5c439ce9bda9f8cfb503d67357a87dc69144d6eedb3f96fe4d345a767e1ea8bac5f51f0b0af8c1dc459bd9c0a852113ed54c33595201539362336939b672f6b
+MISC metadata.xml 166 SHA256 2caff447f5bd2701d8456ada5cc633c41ef4373fa4bfeabeb73599d40bcc941b SHA512 a56648c974a1d14dd4c18237532773c72057a13ab90c58b5da04f185e3c12a8bd8d5c21fb06053507f31766291a82dc7d87b34cd65fd94cfe2af7295c813ef84 WHIRLPOOL 1ff70497eca6531f0e0614c72a19f4b8e5ff486a58d369f4f0b36308d1d6b01168f9da887740e3b9f536236be251d3fe05f904d27a9233a7cf613416ba882968
diff --git a/www-apache/mod_log_sql/files/1.101/42_mod_log_sql.conf b/www-apache/mod_log_sql/files/1.101/42_mod_log_sql.conf
new file mode 100644
index 000000000000..57bd78d34ae4
--- /dev/null
+++ b/www-apache/mod_log_sql/files/1.101/42_mod_log_sql.conf
@@ -0,0 +1,33 @@
+<IfDefine LOG_SQL>
+LoadModule log_sql_module modules/mod_log_sql.so
+LoadModule log_sql_logio_module modules/mod_log_sql_logio.so
+
+<IfDefine DBI>
+LoadModule log_sql_dbi_module modules/mod_log_sql_dbi.so
+</IfDefine>
+
+<IfDefine !DBI>
+LoadModule log_sql_mysql_module modules/mod_log_sql_mysql.so
+</IfDefine>
+
+<IfDefine SSL>
+LoadModule log_sql_ssl_module modules/mod_log_sql_ssl.so
+</IfDefine>
+
+LogSQLLoginInfo mysql://user:passwd@host/database
+LogSQLDBParam socketfile /var/run/mysqld/mysqld.sock
+
+# LogSQLMassVirtualHosting automatically sets LogSQLCreateTables to 'on'
+#LogSQLCreateTables on
+LogSQLMassVirtualHosting on
+
+LogSQLMachineID machine_id
+LogSQLPreserveFile logs/mod_log_sql_preserve.sql
+
+# See http://www.outoforder.cc/projects/apache/mod_log_sql/docs-2.0/
+# for details about LogSQLTransferLogFormat
+# be compatible with the Combined Log Format (CLF)
+LogSQLTransferLogFormat AbHhmRSsTUuv
+</IfDefine>
+
+# vim: ts=4 filetype=apache
diff --git a/www-apache/mod_log_sql/files/42_mod_log_sql.conf b/www-apache/mod_log_sql/files/42_mod_log_sql.conf
new file mode 100644
index 000000000000..d5ae3813fc56
--- /dev/null
+++ b/www-apache/mod_log_sql/files/42_mod_log_sql.conf
@@ -0,0 +1,28 @@
+<IfDefine LOG_SQL>
+LoadModule log_sql_module modules/mod_log_sql.so
+LoadModule log_sql_mysql_module modules/mod_log_sql_mysql.so
+
+<IfDefine SSL>
+LoadModule log_sql_ssl_module modules/mod_log_sql_ssl.so
+</IfDefine>
+
+LogSQLLoginInfo mysql://user:passwd@host/database
+LogSQLDBParam socketfile /var/run/mysqld/mysqld.sock
+
+# LogSQLMassVirtualHosting automatically sets LogSQLCreateTables to 'on'
+#LogSQLCreateTables on
+LogSQLMassVirtualHosting on
+
+LogSQLMachineID machine_id
+LogSQLPreserveFile logs/mod_log_sql_preserve.sql
+
+# See http://www.outoforder.cc/projects/apache/mod_log_sql/docs-2.0/
+# for details about LogSQLTransferLogFormat
+# be compatible with the Combined Log Format (CLF)
+LogSQLTransferLogFormat AbHhmRSsTUuv
+<IfDefine SSL>
+LogSQLTransferLogFormat AbHhmRSsTUuv
+</IfDefine>
+</IfDefine>
+
+# vim: ts=4 filetype=apache
diff --git a/www-apache/mod_log_sql/files/mod_log_sql-1.101-apache-2.4.patch b/www-apache/mod_log_sql/files/mod_log_sql-1.101-apache-2.4.patch
new file mode 100644
index 000000000000..afbaf3927b7d
--- /dev/null
+++ b/www-apache/mod_log_sql/files/mod_log_sql-1.101-apache-2.4.patch
@@ -0,0 +1,17 @@
+Description: Fixes compatibility with Apache 2.4 API
+Author: Thomas Goirand <zigo@debian.org>
+Bug-Debian: http://bugs.debian.org/666797
+Forwarded: http://lists.outoforder.cc/pipermail/mod_log_sql/2012-April/000358.html
+Last-Update: 2013-07-10
+
+--- libapache-mod-log-sql-1.100.orig/functions.h
++++ libapache-mod-log-sql-1.100/functions.h
+@@ -14,7 +14,7 @@ static const char *extract_remote_addres
+ 
+ static const char *extract_remote_address(request_rec *r, char *a)
+ {
+-    return r->connection->remote_ip;
++    return r->useragent_ip;
+ }
+ 
+ static const char *extract_local_address(request_rec *r, char *a) __attribute__((unused));
diff --git a/www-apache/mod_log_sql/metadata.xml b/www-apache/mod_log_sql/metadata.xml
new file mode 100644
index 000000000000..6f49eba8f496
--- /dev/null
+++ b/www-apache/mod_log_sql/metadata.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<!-- maintainer-needed -->
+</pkgmetadata>
diff --git a/www-apache/mod_log_sql/mod_log_sql-1.101-r2.ebuild b/www-apache/mod_log_sql/mod_log_sql-1.101-r2.ebuild
new file mode 100644
index 000000000000..0ffe17b300e7
--- /dev/null
+++ b/www-apache/mod_log_sql/mod_log_sql-1.101-r2.ebuild
@@ -0,0 +1,61 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+inherit apache-module eutils
+
+DESCRIPTION="An Apache module for logging to an SQL (MySQL) database"
+HOMEPAGE="http://www.outoforder.cc/projects/apache/mod_log_sql/"
+SRC_URI="http://www.outoforder.cc/downloads/${PN}/${P}.tar.bz2"
+
+LICENSE="Artistic"
+SLOT="0"
+KEYWORDS="amd64 ~ppc x86"
+IUSE="dbi ssl"
+
+DEPEND="virtual/mysql
+	dbi? ( dev-db/libdbi )
+	ssl? ( dev-libs/openssl:0 )"
+RDEPEND="${DEPEND}"
+
+APACHE2_MOD_CONF="1.101/42_${PN}"
+APACHE2_MOD_DEFINE="LOG_SQL"
+
+APACHE2_EXECFILES="
+	.libs/${PN}_logio.so
+	.libs/${PN}_mysql.so
+	.libs/${PN}_ssl.so"
+
+DOCFILES="AUTHORS CHANGELOG docs/README docs/manual.html \
+contrib/create_tables.sql contrib/make_combined_log.pl contrib/mysql_import_combined_log.pl"
+
+need_apache2_4
+
+src_prepare() {
+	epatch "${FILESDIR}"/${P}-apache-2.4.patch
+}
+
+src_configure() {
+	local myconf="--with-apxs=${APXS}"
+	use ssl && myconf="${myconf} --with-ssl-inc=/usr"
+	use ssl || myconf="${myconf} --without-ssl-inc"
+	use dbi && myconf="${myconf} --with-dbi=/usr"
+	use dbi || myconf="${myconf} --without-dbi"
+	econf ${myconf}
+}
+
+src_compile() {
+	emake
+}
+
+src_install() {
+	use dbi && APACHE2_EXECFILES="${APACHE2_EXECFILES} .libs/${PN}_dbi.so"
+	apache-module_src_install
+}
+
+pkg_postinst() {
+	use dbi && APACHE2_MOD_DEFINE="${APACHE2_MOD_DEFINE} DBI"
+	apache-module_pkg_postinst
+	einfo "Refer to /usr/share/doc/${PF}/ for scripts"
+	einfo "on how to create logging tables."
+}
diff --git a/www-apache/mod_macro/Manifest b/www-apache/mod_macro/Manifest
new file mode 100644
index 000000000000..1f8d3b99534d
--- /dev/null
+++ b/www-apache/mod_macro/Manifest
@@ -0,0 +1,9 @@
+AUX 00_example.conf 619 SHA256 d0aca1e5b925d0646c23caac510c17acc4bab3a98618c7792a90dd2863670207 SHA512 5e43c3bcab0839a70916dcea63bf4b57af6976b48cc1db7541dac23a3d1f1ddcedd9a0193a8e8726dc295297ca2440b4a29f7e37d29d8bbd93c820fef165477f WHIRLPOOL 77118df955bb4b9acb5a5107aeac643efacbde63b142e764db2960f0eea06c8e48fbd0657258ba227d2379be64b651959cd1aa658c150d9bfe05247102d0a385
+AUX 27_mod_macro.conf 140 SHA256 09d5fa69b530cd40c4713d9688f4083fb28977fc55ec25974458b9a42d783772 SHA512 5bf8eef9312f4c4b87fe2e3d3ac7aa1484d5be9eaa4372e0f135f442622011e3adf4dc38d88d3940fa50516ea698ae1a10028281357497324063349e8ca5de69 WHIRLPOOL ca9f7c51564db87df110a897f4d39d50ce9bb338b670db0cd53131deb840bd60a6e037f53b55e68c3cb02527983aa4209070657b20b7c97dc98ea7427b3a0fdf
+DIST mod_macro-1.1.10.tar.bz2 13517 SHA256 9ce558d0b182a721a04e5b499ba2684d07c5ba2c7a552d8a844489beb9e339d0 SHA512 65cc668de21afcb365d8e71369e8c50548270557f66d3905b9757625f0a24cad461c103fe929dcdcabc92438a8e74dcf77e9b807c00045b0c97396e8ce55d04e WHIRLPOOL 606f82efced8c1d15fd192741e5d8a1694754a6c5fc92c1416c039fa1c0a560f0dd74e9e038798e3d586268c2a0bb8dfb8e3511380836d06b03cbe9f2ecd230e
+DIST mod_macro-1.2.1.tar.gz 16870 SHA256 f22c6342b36526fb401dea4dba4c2b61a72083da973b9ca1c4777a77d5128fc3 SHA512 39e584d90dd576c67952338624ad54b6cd09b1abf88295e760fa9c48f677e96c00a5c0fbf4df1c83501c8a8985c82378014d40722620a03915ff300adaf3fad0 WHIRLPOOL 981260c53b26a366dc10c67fd0dfed0004bde5ef7a60427a74b5d89ba308c6ce9cf53698a70401d34901da7dbafb0caba9c53a89609f7dce92a49a694c185118
+EBUILD mod_macro-1.1.10.ebuild 660 SHA256 0c35316480ebd0444a9577acfbdc55cffdbd637a4b504dbe701b4a987f50d929 SHA512 17dbebda555e1899b38fbfdd101ed1c7c12ed5014cfa1fd939a8be0be97e4ba3c742905f0846496890e5df8ac208c75b2c0d127ba777c699f6b768c29d8e47ce WHIRLPOOL 7b3120a5ac90c9296cf0213dc6b5f7ff85d2665d0d3c0e83b8d04d8f9a30f17765f170eecf6f9b5aad3e4e640489c6d493281a374f2de9e549c09c47c9ad1833
+EBUILD mod_macro-1.2.1.ebuild 741 SHA256 4480ee4caf8b3d53d555aa4b48c2bb309f90254a9e85b63a4f4f0cee2f8b1ff1 SHA512 e5f53f50337ee99bb331848a83ed05f0588b177ae12bc376aa48062ae2cdb23726f81d47af64378db82389178832ea5d85f416a4874a1a278afbc5b525b9a929 WHIRLPOOL d2caf9890514bda35a629f540d835a719775a4627cbcdca512ee6d5c9a3cc59c25603dff636359e46efdaf1d508501a1bb249ff6525138a6c9c284e2d6ebcefe
+MISC ChangeLog 2640 SHA256 cf4aba092876225223a80572a3d975b31455ecf9224cc7aefbbbca88e72a3e99 SHA512 42e040d75eaeeefd8be70e1a8b4922e17d5e5d2ed55c15927eb047b1cf491bcd0d89add9878679beea9ea1008023fd50ddf03b1a66c709d57d382ab04fa1eb42 WHIRLPOOL a6ed9864becc192f1170a2de46fd3ba4a5df23a8325adaad3fa1da0db44bb852963fbe92a8cad02c346eb6516f075272b3a608cfc214998f12dd1baa490af640
+MISC ChangeLog-2015 2791 SHA256 1a8c541bdbeaea58ea55222d3a4ff40b6709cd2902b923bb429137ee03d85515 SHA512 f50a1f1fd1537c80062ffa41ef47be25b38222a55b884d5a70868ff93b479c569df042abd711a0a732b399820eb64e297ea0a8f46c4d4b8ef5a37f6dcffc908a WHIRLPOOL df289219b31d0fa15e50374de29ac92f72ad57fb4c0be40c313cdda144b4595bb6bf068c37548b34cc58691e87d656ddff5f9eae12729c368c2853324682fb70
+MISC metadata.xml 166 SHA256 2caff447f5bd2701d8456ada5cc633c41ef4373fa4bfeabeb73599d40bcc941b SHA512 a56648c974a1d14dd4c18237532773c72057a13ab90c58b5da04f185e3c12a8bd8d5c21fb06053507f31766291a82dc7d87b34cd65fd94cfe2af7295c813ef84 WHIRLPOOL 1ff70497eca6531f0e0614c72a19f4b8e5ff486a58d369f4f0b36308d1d6b01168f9da887740e3b9f536236be251d3fe05f904d27a9233a7cf613416ba882968
diff --git a/www-apache/mod_macro/files/00_example.conf b/www-apache/mod_macro/files/00_example.conf
new file mode 100644
index 000000000000..5b60e92ca830
--- /dev/null
+++ b/www-apache/mod_macro/files/00_example.conf
@@ -0,0 +1,26 @@
+# Definition of a MyVirtualHost Macro.
+<Macro MyVirtualHost $host $port $dir>
+	Listen $port
+
+	<VirtualHost $host:$port>
+		DocumentRoot $dir
+
+		<Directory $dir>
+			# do something here...
+		</Directory>
+
+		# limit access to intranet subdir.
+		<Directory $dir/intranet>
+			order deny,allow
+			deny from all
+			allow from 10.0.0.0/8
+		</Directory>
+	</VirtualHost>
+</Macro>
+
+# Use of MyVirtualHost with different arguments.
+#Use MyVirtualHost www.apache.org 80 /projects/apache/web
+#Use MyVirtualHost www.perl.com 8080 /projects/perl/web
+#Use MyVirtualHost www.ensmp.fr 1234 /projects/mines/web
+
+# vim: ts=4 filetype=apache
diff --git a/www-apache/mod_macro/files/27_mod_macro.conf b/www-apache/mod_macro/files/27_mod_macro.conf
new file mode 100644
index 000000000000..67ce8e4d2688
--- /dev/null
+++ b/www-apache/mod_macro/files/27_mod_macro.conf
@@ -0,0 +1,6 @@
+<IfDefine MACRO>
+LoadModule macro_module modules/mod_macro.so
+Include /etc/apache2/macros.d/*.conf
+</IfDefine>
+
+# vim: ts=4 filetype=apache
diff --git a/www-apache/mod_macro/metadata.xml b/www-apache/mod_macro/metadata.xml
new file mode 100644
index 000000000000..6f49eba8f496
--- /dev/null
+++ b/www-apache/mod_macro/metadata.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<!-- maintainer-needed -->
+</pkgmetadata>
diff --git a/www-apache/mod_macro/mod_macro-1.1.10.ebuild b/www-apache/mod_macro/mod_macro-1.1.10.ebuild
new file mode 100644
index 000000000000..2e4731fa9676
--- /dev/null
+++ b/www-apache/mod_macro/mod_macro-1.1.10.ebuild
@@ -0,0 +1,30 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+inherit apache-module
+
+DESCRIPTION="An Apache2 module providing macros for the Apache config file"
+HOMEPAGE="http://www.coelho.net/mod_macro/"
+SRC_URI="http://www.coelho.net/${PN}/${P}.tar.bz2"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="amd64 x86"
+IUSE=""
+
+DEPEND=""
+RDEPEND=""
+
+APACHE2_MOD_CONF="27_${PN}"
+APACHE2_MOD_DEFINE="MACRO"
+
+DOCFILES="CHANGES INSTALL README mod_macro.html"
+
+need_apache2_2
+
+src_install() {
+	apache-module_src_install
+	keepdir "${APACHE_CONFDIR}"/macros.d/
+	insinto "${APACHE_CONFDIR}"/macros.d/
+	doins "${FILESDIR}"/00_example.conf
+}
diff --git a/www-apache/mod_macro/mod_macro-1.2.1.ebuild b/www-apache/mod_macro/mod_macro-1.2.1.ebuild
new file mode 100644
index 000000000000..6c0fdca8c521
--- /dev/null
+++ b/www-apache/mod_macro/mod_macro-1.2.1.ebuild
@@ -0,0 +1,31 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+inherit apache-module
+
+DESCRIPTION="An Apache2 module providing macros for the Apache config file"
+HOMEPAGE="http://www.coelho.net/mod_macro/"
+#SRC_URI="http://www.coelho.net/${PN}/${P}.tar.bz2"
+SRC_URI="http://people.apache.org/~fabien/${PN}/${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+DEPEND="sys-devel/libtool"
+RDEPEND=""
+
+APACHE2_MOD_CONF="27_${PN}"
+APACHE2_MOD_DEFINE="MACRO"
+
+DOCFILES="CHANGES INSTALL README mod_macro.html"
+
+need_apache2_4
+
+src_install() {
+	apache-module_src_install
+	keepdir "${APACHE_CONFDIR}"/macros.d/
+	insinto "${APACHE_CONFDIR}"/macros.d/
+	doins "${FILESDIR}"/00_example.conf
+}
diff --git a/www-apache/mod_musicindex/Manifest b/www-apache/mod_musicindex/Manifest
new file mode 100644
index 000000000000..6211e267a341
--- /dev/null
+++ b/www-apache/mod_musicindex/Manifest
@@ -0,0 +1,9 @@
+AUX 50_mod_musicindex.conf 118 SHA256 43e6495e358adf6cf64e77e01012a13c4cdb8ae83d6f5754e58e38ab09f2ed18 SHA512 95c74787d194d55aba605e9e43f07f690d63960f09eaf8086d639f966c2a1b1343ffeea6c96cc02db31bcf263652a9aeb5a8f374a5c422000bbbec88078be319 WHIRLPOOL 1959cb6225daa0f765d6363f3021bfaee4a2037f06b6d46cf99d7e3b11f9a52cc7f75ba0cd276c0f0dafec697d5dc77d4163adb7263d8a9cabfd69305d3fa740
+DIST mod_musicindex-1.4.1.tar.gz 508795 SHA256 0fb052ebb8fa511467fd21696d798dee35b2e611955572cf746e9712e531a596 SHA512 2d3acfcf319070dd5352db66b14766498189e9d0790596c4c712b7564f9221cf058ca38fa118f18ec358c2d7c37d695d61f9d43d91bf83fa9582d834f06fbfea WHIRLPOOL 0969ca9d4ebc1b16d6581bc8af851d152a565bfc0cb412a580e8c40f6c9794e2c428731f8d091708396ae8a9b3fe658dcd4c0c98041d02879737e58885d8e0e4
+DIST mod_musicindex-1.4.1_valid-rss.png 1523 SHA256 736dfb61c58977af6766eeeeaf061696c5f035864773f66bdd495da1bc841f78 SHA512 e9df8ea0c6da2d1f268f8aa17e396dcdf53a61d1196ed67f44f03f22f0c5a9661a1e8a96f6d506c02374bc4f0923be9371372a2c678b705017ee733be2b402ec WHIRLPOOL 39b162b7b5914a9e6957b4c30bcfa9cbdbbdd9ca03859ebebee0174999b1f7d37ccc72ad265ca1f429abbb991e39e961de36d1889dfd2e2510a55907db5fbe1d
+DIST mod_musicindex-1.4.1_valid-xhtml11 1842 SHA256 52ae8eb2852754b330097997e243cb98d6c2982a6d707d62c707bed34cc7200b SHA512 8beb13a595b402e7de416ae05992f3e0a17719554fbc83cd5c3e0518cd859c560339a61c2f198c8e4982ca397f29823b521e05f29ed632826bfb02646990cc9c WHIRLPOOL fdb36ee7e9f9500840bf19f37d8383aa665e42b995b58206eb46c87017838d7c6d746d017f2f8c52ba15823bfec103544405319a4d90911ed6734390ef76140a
+DIST mod_musicindex-1.4.1_vcss 1547 SHA256 a5e988ededb2aa6ac2fbada686f36a5185bcfa983e316729a4540fb87ec54a0b SHA512 6c2fa4a0c3fbad68752d7471f95838b69816fd00f58c28f32076af24972117d8b0f2cebb075548ec1317f886a8955cf5686dda571c4d5a823d3ff09da8e33a70 WHIRLPOOL f57b89b7792a175f5cdff71900698cdf59c898cec46dc9e6f4ae6e7b803589924726232aab67506b5bda662187a502ff743babfca9456c001a7088aa16488b0b
+EBUILD mod_musicindex-1.4.1.ebuild 1587 SHA256 02c35e1f109d3f62c9fa7178df513c13146e4d8ec1114d6338a85e8fee936b62 SHA512 b84d5257d779a2896ce010051dc9d536b6e479c95dfdf8af87a41e1b986e74638eaf0d3d56c13395dba3a7ccf59e1e945d9ee7881908ab8bd60f4c96909a2b6a WHIRLPOOL 82bead0c31c35467d0259c5090bcf15c0c65fd96d49f15da0b59634d6477fa2506073aca24af71b428d344850e7610b2365e6e7d237fc96acac0824a4caf2871
+MISC ChangeLog 2576 SHA256 438a885f6ac5ec6df4f7122a40af19869b85d8efa59a8eb6fb687ccaa508c431 SHA512 60bdf890b0e6b05b74820937db60cc42946da984e6a44fa93b17a979e46190a8046f3899852ab3303352131e94a3339e7b5451f7aea53c748909988a8bcc5eb1 WHIRLPOOL 394fba7fd53258e02a239d8f646b476789b420417896322832ce032b0b72df1864101c65681bcc772c32d716650491f1478c9183ff63e45482f2a3e28a2d446e
+MISC ChangeLog-2015 1866 SHA256 577b7b86193ea59f4c0c98a1b9ac8cc857ad344084401e786dad18d20b3cabd5 SHA512 c80ddbd4464fff2651b5fa33ea6d444940506d2de9c843b0bfc151669d82193412b818bccbcd757e98a017ee689eeec837e756eb4d7564611ab8e3a2fb9df216 WHIRLPOOL 2bede1098f5be994825b7063c05451fc5bd748fcc6411e701fa89254f49c7477f0db0dd2ca2c53239d055c2b90e96a66bddf7ca770b4dd04d14f68f40422485a
+MISC metadata.xml 333 SHA256 1c5f61059f4dfe6f00964501d5dd516e62862f0240b10576dcc08363223261f2 SHA512 7f5c3eee6608c17b0718c8a4ac1fb87872842b40acebc2e2aa32c5a475b4b7eccc56897c697a30bc8bc2e23fd40575e0bca598ad53fe1426057f5f463cab7de1 WHIRLPOOL c4c62e4880ceb1d16ec8cf9d7d9ab9ddf9b0cb8f4230be75133a957a83f2bd6a34c51aba0f45de7eea843d0bebe5ff810769ed66b2fbb346ef943120dde83ac7
diff --git a/www-apache/mod_musicindex/files/50_mod_musicindex.conf b/www-apache/mod_musicindex/files/50_mod_musicindex.conf
new file mode 100644
index 000000000000..1d3db0caebf5
--- /dev/null
+++ b/www-apache/mod_musicindex/files/50_mod_musicindex.conf
@@ -0,0 +1,5 @@
+<IfDefine MUSICINDEX>
+LoadModule musicindex_module modules/mod_musicindex.so
+</IfDefine>
+
+# vim: ts=4 filetype=apache
diff --git a/www-apache/mod_musicindex/metadata.xml b/www-apache/mod_musicindex/metadata.xml
new file mode 100644
index 000000000000..383819313fcd
--- /dev/null
+++ b/www-apache/mod_musicindex/metadata.xml
@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<!-- maintainer-needed -->
+<use>
+		<flag name="cache">Add File cache support</flag>
+		<flag name="mysql">Add MySQL cache support</flag>
+		<flag name="archive">Add archive support</flag>
+	</use>
+</pkgmetadata>
diff --git a/www-apache/mod_musicindex/mod_musicindex-1.4.1.ebuild b/www-apache/mod_musicindex/mod_musicindex-1.4.1.ebuild
new file mode 100644
index 000000000000..d87b3ed75c33
--- /dev/null
+++ b/www-apache/mod_musicindex/mod_musicindex-1.4.1.ebuild
@@ -0,0 +1,59 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+inherit apache-module
+
+DESCRIPTION="mod_musicindex allows nice displaying of directories containing music files"
+HOMEPAGE="http://www.parisc-linux.org/~varenet/musicindex/"
+SRC_URI="http://hacks.slashdirt.org/musicindex/${P}.tar.gz
+	http://validator.w3.org/feed/images/valid-rss.png -> ${P}_valid-rss.png
+	http://jigsaw.w3.org/css-validator/images/vcss -> ${P}_vcss
+	http://www.w3.org/Icons/valid-xhtml11 -> ${P}_valid-xhtml11"
+
+LICENSE="LGPL-2.1"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="+mp3 +mp4 +flac +vorbis +cache mysql archive"
+
+DEPEND="mp3? ( media-libs/libmad media-libs/libid3tag )
+	mp4? ( media-libs/libmp4v2:0 )
+	flac? ( media-libs/flac )
+	vorbis? ( media-libs/libvorbis )
+	archive? ( app-arch/libarchive )
+	mysql? ( virtual/mysql )"
+RDEPEND="${DEPEND}
+	sys-devel/libtool"
+
+APACHE2_MOD_CONF="50_${PN}"
+APACHE2_MOD_DEFINE="MUSICINDEX"
+DOCFILES="AUTHORS BUGS ChangeLog README UPGRADING"
+
+need_apache2
+
+src_configure() {
+	econf \
+		$(use_enable mp3) \
+		$(use_enable mp4) \
+		$(use_enable flac) \
+		$(use_enable vorbis) \
+		$(use_enable archive) \
+		$(use_enable cache filecache) \
+		$(use_enable mysql mysqlcache)
+}
+
+src_compile() {
+	emake || die "emake failed"
+}
+
+src_install() {
+	emake DESTDIR="${D}" install || die "emake failed"
+	apache-module_src_install
+
+	# install W3C images
+	insinto /usr/share/mod_musicindex
+	newins "${DISTDIR}/${P}_valid-rss.png" valid-rss.png
+	newins "${DISTDIR}/${P}_valid-xhtml11" valid-xhtml11
+	newins "${DISTDIR}/${P}_vcss" vcss
+}
diff --git a/www-apache/mod_nss/Manifest b/www-apache/mod_nss/Manifest
new file mode 100644
index 000000000000..436ed7ab593a
--- /dev/null
+++ b/www-apache/mod_nss/Manifest
@@ -0,0 +1,6 @@
+AUX 47_mod_nss.conf 8849 SHA256 78f48475b21bd8a5b1304c8bd14437a0e92e9a8b6ffbe7ecd243f83d37da8342 SHA512 d3ff614e17afea1cb0c5e451ba53cf5bb1c0d5c0ee6017fdecba0e976262376e36b5556b2d08cb131ebfdd795cfe4a6736dabda99059fc40aeff63a1c4d37a23 WHIRLPOOL 6e9e4fbc61620aa98d8817e1b3b3c5d2b972f19d6e9ad9ecdf34e4ffe503839f532094d120c872a1eff49e2daa3d5f1e7f4756daa26c7561d7ca694b676d93e4
+DIST mod_nss-1.0.12.tar.gz 171657 SHA256 6a206d85c8c772eb9f424aaf5774b69c235af869d54cc8f45018ec82e1b89404 SHA512 f3217f34a20818aea571e17529130290082933b32386a868c8c7f24eb3166bbace4f64d7d73a850c944e54f74342179fff6b9d8af824e0225feeb993aea1d99a WHIRLPOOL df692da1478c86feab7005498b3f0cf24136b210bef3ea25790e4fc6613690e61f9a9485ce11f5f2ec0f931702a9db08a4fafa286bf37fa0f0df6c1df224270b
+EBUILD mod_nss-1.0.12-r1.ebuild 1265 SHA256 a25d61743068c8f054e1a0e60ab2f0b1b5caaf67c036992134f53f3b746f310d SHA512 a6bb433412f9e2149899516143af205b302c4e6f66c9273122275926f728d9b9bb0b77fa3e1f8d9796a221e568766514c05c15262477e54c45e992a17b15f341 WHIRLPOOL 3e8d0ff6baa3c161a7c2b984f1ff4414f6a4cd1fd7410f0cdf0b6d3376315b4708dc36ec85b5081f1257f325ca3fd66d0ee1f6fc288ff8b3b815ae3a638c015c
+MISC ChangeLog 3118 SHA256 338ec89b09af79b3f1424cf61c5262ab2aa4eaaa74d1e4214fdd20576f7efd8e SHA512 860a1d9ece12d7ec949674e410448b353d4374894d09424fc390018603062afa87ee7f7c5598e4ee391a4dcb261ee7a8543379b14ceb48e60905777f17d58a88 WHIRLPOOL c015d3d59086a7c1ff5206cc6aa3a174410455808734b9d559af2d6c1041b49e459cd41fbc6c80dfaaba940f91f0e44ffec980d4caf68990aefd13c952c5495e
+MISC ChangeLog-2015 1398 SHA256 9cac80aa71d93ddf40030c5ff992553fbb48eeaad5c6730f84ede2db36cf2561 SHA512 1d7744a8e013d42b62561fda6b3815d831e45621bef0c4f347f029550d2ac2a3821a317585a58ae65c3c67d0efeeab2795b7e72afc706f4f3a5cabdf6e790c1e WHIRLPOOL d4a624e2fcc3d3d5679e662429cfb57a5a6cc213b0043ec5351899d9ef23680f02841a1dc4751b5cfddb37aea452e0b50b0e38ef6840004e8c5bbcc8f4b4159c
+MISC metadata.xml 240 SHA256 f996bc17094f612e659dcbe2d91be2d7fe5c7cfbf3b5ee7060d6adf3aff22cdd SHA512 12bc0c58114b3c377663bdbfadf973193f074b46bfa51fad44b6ace89c757e07a7bfa1e41cbc1904151e7fd35c7ffe63b7a2083e11f313de136ba58017d21b86 WHIRLPOOL afe38be63cfac552eb3662d4a555dd43bf0ed3fb421a7b5bd53abf0228b7c18ec1d347f4e12d2d085dfbbf5d19e7a0ace0373980c420b2ba3a7f9bc3ce93b934
diff --git a/www-apache/mod_nss/files/47_mod_nss.conf b/www-apache/mod_nss/files/47_mod_nss.conf
new file mode 100644
index 000000000000..731f61c03b35
--- /dev/null
+++ b/www-apache/mod_nss/files/47_mod_nss.conf
@@ -0,0 +1,224 @@
+#
+# This is the Apache server configuration file providing SSL support using.
+# the mod_nss plugin.  It contains the configuration directives to instruct
+# the server how to serve pages over an https connection.
+# 
+# Do NOT simply read the instructions in here without understanding
+# what they do.  They're here only as hints or reminders.  If you are unsure
+# consult the online docs. You have been warned.  
+#
+
+<IfDefine NSS>
+        LoadModule nss_module  modules/mod_nss.so
+</IfDefine>
+
+<IfModule mod_nss.c>
+#
+# When we also provide SSL we have to listen to the 
+# standard HTTP port (see above) and to the HTTPS port
+#
+# Note: Configurations that use IPv6 but not IPv4-mapped addresses need two
+#       Listen directives: "Listen [::]:8443" and "Listen 0.0.0.0:8443"
+#
+Listen 8443
+
+##
+##  SSL Global Context
+##
+##  All SSL configuration in this context applies both to
+##  the main server and all SSL-enabled virtual hosts.
+##
+
+#
+#   Some MIME-types for downloading Certificates and CRLs
+#
+AddType application/x-x509-ca-cert .crt
+AddType application/x-pkcs7-crl    .crl
+
+#   Pass Phrase Dialog:
+#   Configure the pass phrase gathering process.
+#   The filtering dialog program (`builtin' is a internal
+#   terminal dialog) has to provide the pass phrase on stdout.
+NSSPassPhraseDialog  builtin
+
+
+#   Pass Phrase Helper:
+#   This helper program stores the token password pins between
+#   restarts of Apache.
+NSSPassPhraseHelper /usr/sbin/nss_pcache
+
+#   Configure the SSL Session Cache. 
+#   NSSSessionCacheSize is the number of entries in the cache.
+#   NSSSessionCacheTimeout is the SSL2 session timeout (in seconds).
+#   NSSSession3CacheTimeout is the SSL3/TLS session timeout (in seconds).
+NSSSessionCacheSize 10000
+NSSSessionCacheTimeout 100
+NSSSession3CacheTimeout 86400
+
+#
+# Pseudo Random Number Generator (PRNG):
+# Configure one or more sources to seed the PRNG of the SSL library.
+# The seed data should be of good random quality.
+# WARNING! On some platforms /dev/random blocks if not enough entropy
+# is available. Those platforms usually also provide a non-blocking
+# device, /dev/urandom, which may be used instead.
+#
+# This does not support seeding the RNG with each connection.
+
+NSSRandomSeed startup builtin
+#NSSRandomSeed startup file:/dev/random  512
+#NSSRandomSeed startup file:/dev/urandom 512
+
+</IfModule>
+
+
+#!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!1
+#	include -D NSS_EXAMPLE if you have
+#!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!1
+
+
+<IfDefine NSS_EXAMPLE>
+
+##
+## SSL Virtual Host Context
+##
+
+<VirtualHost _default_:8443>
+
+#   General setup for the virtual host
+DocumentRoot "/var/www/localhost/htdocs"
+ServerName localhost:8443
+ServerAdmin you@example.com>
+
+
+# Include vhosts.d/default_vhost.include
+
+
+
+# mod_nss can log to separate log files, you can choose to do that if you'd like
+# LogLevel is not inherited from httpd.conf.
+ErrorLog /var/log/apache2/nss_error_log
+TransferLog var/log/apache2/access_log
+LogLevel debug
+
+#   SSL Engine Switch:
+#   Enable/Disable SSL for this virtual host.
+NSSEngine on
+
+#   SSL Cipher Suite:
+#   List the ciphers that the client is permitted to negotiate.
+#   See the mod_nss documentation for a complete list.
+
+# SSL 3 ciphers. SSL 2 is disabled by default.
+#NSSCipherSuite +rsa_rc4_128_md5,+rsa_rc4_128_sha,+rsa_3des_sha,-rsa_des_sha,-rsa_rc4_40_md5,-rsa_rc2_40_md5,-rsa_null_md5,-rsa_null_sha,+fips_3des_sha,-fips_des_sha,-fortezza,-fortezza_rc4_128_sha,-fortezza_null,-rsa_des_56_sha,-rsa_rc4_56_sha,+rsa_aes_128_sha,+rsa_aes_256_sha
+
+# SSL 3 ciphers + ECC ciphers. SSL 2 is disabled by default.
+#
+# Comment out the NSSCipherSuite line above and use the one below if you have
+# ECC enabled NSS and mod_nss and want to use Elliptical Curve Cryptography
+NSSCipherSuite +rsa_rc4_128_md5,+rsa_rc4_128_sha,+rsa_3des_sha,-rsa_des_sha,-rsa_rc4_40_md5,-rsa_rc2_40_md5,-rsa_null_md5,-rsa_null_sha,+fips_3des_sha,-fips_des_sha,-fortezza,-fortezza_rc4_128_sha,-fortezza_null,-rsa_des_56_sha,-rsa_rc4_56_sha,+rsa_aes_128_sha,+rsa_aes_256_sha,-ecdh_ecdsa_null_sha,+ecdh_ecdsa_rc4_128_sha,+ecdh_ecdsa_3des_sha,+ecdh_ecdsa_aes_128_sha,+ecdh_ecdsa_aes_256_sha,-ecdhe_ecdsa_null_sha,+ecdhe_ecdsa_rc4_128_sha,+ecdhe_ecdsa_3des_sha,+ecdhe_ecdsa_aes_128_sha,+ecdhe_ecdsa_aes_256_sha,-ecdh_rsa_null_sha,+ecdh_rsa_128_sha,+ecdh_rsa_3des_sha,+ecdh_rsa_aes_128_sha,+ecdh_rsa_aes_256_sha,-echde_rsa_null,+ecdhe_rsa_rc4_128_sha,+ecdhe_rsa_3des_sha,+ecdhe_rsa_aes_128_sha,+ecdhe_rsa_aes_256_sha
+
+NSSProtocol SSLv3,TLSv1
+
+#   SSL Certificate Nickname:
+#   The nickname of the RSA server certificate you are going to use.
+NSSNickname Server-Cert
+
+#   SSL Certificate Nickname:
+#   The nickname of the ECC server certificate you are going to use, if you
+#   have an ECC-enabled version of NSS and mod_nss
+#NSSECCNickname Server-Cert-ecc
+
+#   Server Certificate Database:
+#   The NSS security database directory that holds the certificates and
+#   keys. The database consists of 3 files: cert8.db, key3.db and secmod.db.
+#   Provide the directory that these files exist.
+NSSCertificateDatabase /etc/apache2/nss/
+
+#   Database Prefix:
+#   In order to be able to store multiple NSS databases in one directory
+#   they need unique names. This option sets the database prefix used for
+#   cert8.db and key3.db.
+#NSSDBPrefix my-prefix-
+
+#   Client Authentication (Type):
+#   Client certificate verification type.  Types are none, optional and
+#   require.
+NSSVerifyClient none
+
+#
+#   Online Certificate Status Protocol (OCSP).
+#   Verify that certificates have not been revoked before accepting them.
+NSSOCSP off
+
+#
+#   Use a default OCSP responder. If enabled this will be used regardless
+#   of whether one is included in a client certificate. Note that the
+#   server certificate is verified during startup.
+#
+#   NSSOCSPDefaultURL defines the service URL of the OCSP responder
+#   NSSOCSPDefaultName is the nickname of the certificate to trust to
+#       sign the OCSP responses.
+#NSSOCSPDefaultResponder on
+#NSSOCSPDefaultURL http://example.com/ocsp/status
+#NSSOCSPDefaultName ocsp-nickname
+
+#   Access Control:
+#   With SSLRequire you can do per-directory access control based
+#   on arbitrary complex boolean expressions containing server
+#   variable checks and other lookup directives.  The syntax is a
+#   mixture between C and Perl.  See the mod_nss documentation
+#   for more details.
+#<Location />
+#NSSRequire (    %{SSL_CIPHER} !~ m/^(EXP|NULL)/ \
+#            and %{SSL_CLIENT_S_DN_O} eq "Snake Oil, Ltd." \
+#            and %{SSL_CLIENT_S_DN_OU} in {"Staff", "CA", "Dev"} \
+#            and %{TIME_WDAY} >= 1 and %{TIME_WDAY} <= 5 \
+#            and %{TIME_HOUR} >= 8 and %{TIME_HOUR} <= 20       ) \
+#           or %{REMOTE_ADDR} =~ m/^192\.76\.162\.[0-9]+$/
+#</Location>
+
+#   SSL Engine Options:
+#   Set various options for the SSL engine.
+#   o FakeBasicAuth:
+#     Translate the client X.509 into a Basic Authorisation.  This means that
+#     the standard Auth/DBMAuth methods can be used for access control.  The
+#     user name is the `one line' version of the client's X.509 certificate.
+#     Note that no password is obtained from the user. Every entry in the user
+#     file needs this password: `xxj31ZMTZzkVA'.
+#   o ExportCertData:
+#     This exports two additional environment variables: SSL_CLIENT_CERT and
+#     SSL_SERVER_CERT. These contain the PEM-encoded certificates of the
+#     server (always existing) and the client (only existing when client
+#     authentication is used). This can be used to import the certificates
+#     into CGI scripts.
+#   o StdEnvVars:
+#     This exports the standard SSL/TLS related `SSL_*' environment variables.
+#     Per default this exportation is switched off for performance reasons,
+#     because the extraction step is an expensive operation and is usually
+#     useless for serving static content. So one usually enables the
+#     exportation for CGI and SSI requests only.
+#   o StrictRequire:
+#     This denies access when "NSSRequireSSL" or "NSSRequire" applied even
+#     under a "Satisfy any" situation, i.e. when it applies access is denied
+#     and no other module can change it.
+#   o OptRenegotiate:
+#     This enables optimized SSL connection renegotiation handling when SSL
+#     directives are used in per-directory context. 
+#NSSOptions +FakeBasicAuth +ExportCertData +CompatEnvVars +StrictRequire
+<Files ~ "\.(cgi|shtml|phtml|php3?)$">
+    NSSOptions +StdEnvVars
+</Files>
+<Directory "/usr/cgi-bin">
+    NSSOptions +StdEnvVars
+</Directory>
+
+#   Per-Server Logging:
+#   The home of a custom SSL log file. Use this when you want a
+#   compact non-error SSL logfile on a virtual host basis.
+#CustomLog /home/rcrit/redhat/apache/logs/ssl_request_log \
+#          "%t %h %{SSL_PROTOCOL}x %{SSL_CIPHER}x \"%r\" %b"
+
+</VirtualHost>                                  
+
+</IfDefine>
diff --git a/www-apache/mod_nss/metadata.xml b/www-apache/mod_nss/metadata.xml
new file mode 100644
index 000000000000..e88185d1d141
--- /dev/null
+++ b/www-apache/mod_nss/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<!-- maintainer-needed -->
+<use>
+	<flag name="ecc">enable Elliptical Curve Cyptography</flag>
+</use>
+</pkgmetadata>
diff --git a/www-apache/mod_nss/mod_nss-1.0.12-r1.ebuild b/www-apache/mod_nss/mod_nss-1.0.12-r1.ebuild
new file mode 100644
index 000000000000..551b08179f36
--- /dev/null
+++ b/www-apache/mod_nss/mod_nss-1.0.12-r1.ebuild
@@ -0,0 +1,62 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+inherit autotools apache-module eutils
+
+DESCRIPTION="SSL/TLS module for the Apache HTTP server"
+HOMEPAGE="https://fedorahosted.org/mod_nss/"
+SRC_URI="https://fedorahosted.org/released/mod_nss/${P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="+ecc"
+
+DEPEND="
+	>=dev-libs/nspr-4.6.4
+	>=dev-libs/nss-3.11.4
+	sys-apps/sed
+	virtual/pkgconfig
+"
+RDEPEND="
+	>=dev-libs/nspr-4.6.4
+	>=dev-libs/nss-3.11.4
+	net-dns/bind-tools
+"
+
+APACHE2_MOD_CONF="47_${PN}"
+APACHE2_MOD_DEFINE="NSS"
+
+DOCFILES="NOTICE README"
+
+need_apache2
+
+src_prepare() {
+	default
+
+	# setup proper exec name
+	sed -i -e 's/certutil/nsscertutil/' gencert.in || die "sed failed"
+	eautoreconf
+}
+
+src_configure() {
+	econf $(use_enable ecc) --with-apxs=${APXS}
+}
+
+src_compile() {
+	# default src_compile fails:
+	# In file included from mod_nss.c:16:0:
+	# mod_nss.h:51:18: fatal error: nspr.h: No such file or directory
+	emake
+}
+
+src_install() {
+	# override broken build system
+	mv .libs/libmodnss.so .libs/"${PN}".so || die "cannot move lib"
+	dosbin gencert nss_pcache
+	dodoc docs/mod_nss.html
+	newbin migrate.pl nss_migrate
+	dodir /etc/apache2/nss
+	apache-module_src_install
+}
diff --git a/www-apache/mod_pcgi2/Manifest b/www-apache/mod_pcgi2/Manifest
new file mode 100644
index 000000000000..9acab60b8f5b
--- /dev/null
+++ b/www-apache/mod_pcgi2/Manifest
@@ -0,0 +1,6 @@
+AUX 20_mod_pcgi.conf 197 SHA256 9301d24db94f070b7e2a92fbb3b25ac229b2bbfdeb80c6102a30636982e0a3c9 SHA512 88058fdf57409bdff759e6f1ec73e10b13e479883bc34992a8bab72a8100854ca8c225e74d97402a719aed6b82594f47de231ebd7c0b8f14a276eece039b4828 WHIRLPOOL d824f08c87a86fcac6250fa53b8b48c6ef0d7d5f571fd0196e36e31bece0e2f8252ce87d228c1505d8fb2e79e461b4824634f4f6c97977df2031cca104017ef7
+DIST mod_pcgi2-2.0.2-src.tar.gz 32214 SHA256 853f8a02483774d3cf9f1861d467481086fc75cbd38f5e0a00c265574587a63e SHA512 81e10168702559644d1a23211ba34fd1fe55f8334e1a97d11efcaa7032f8a485fb28e579e96c6b0d4f14a25544baf188a3806746e8949b7143ac0adb148e1531 WHIRLPOOL 53108449f1c7acc397a7fb9e98442d81c7f529453de69239cf9a95fb2c61b9312a3b1a937b14eebc63d0151d0ebdc5c8315bbf4cf306ee8f66ff2dc2ac66963a
+EBUILD mod_pcgi2-2.0.2.ebuild 643 SHA256 c17f98dce59382bf0d9b09c21c83e9ed510cd85246541a5f6b205aabeab015ab SHA512 5e1ad826b400b5c8ed7d6ada59e1497a114e57fec8a79768f09bf2cf564615b1a5248290c0df1a156a5ee6f32c8288aa8632aa24d1b254b772337552bd0a18b2 WHIRLPOOL ea62606fabee60d7021014d9ea86f7df4c6fe8f42810095bd350ff8224a2507d0f7a5ef21553befce82953fb8b27d74f28fb27c4e6c7edd441807f3476df29b7
+MISC ChangeLog 2555 SHA256 e49c3d5a531ee6576b3e66b7d2c65d569ea1aa41ae5ae84cd6d667b940984495 SHA512 ccfbd1073e322997951bc820c601ed928b56f61cd2730d73b293370e2d0c89855aabf12fd2ea3b7bf102a2115c6e0bbb12021b057663b49a6e15b09ce92d3258 WHIRLPOOL 91c5480af016146a7d80f713d1c80b59bdabbe3babace4e38c6ae106febbed20bc5b9994b2632296d3635463705fb99bedc76c6ac8a51bb0db81c8839e777897
+MISC ChangeLog-2015 2842 SHA256 22525418ae27f29988ce8f2a0bab88866023758bce193905c8c024f2334e6f74 SHA512 ef9033a48922d37bc1a841bd72dfeb087a7f0f8627f238dad9c18632da6fdeb01e4cc68cc0a1d5de15ea5577138eff96d0d1340c2c991e33c07d7cfe7b60ffc3 WHIRLPOOL 90070c7b7bbd3673a139903767f41a204e27af0fc2e6f32fabf147a3d65211b486e21894db432ba662659abd532e720f19c5b9af8c3927431d1be1bcebcd166e
+MISC metadata.xml 166 SHA256 2caff447f5bd2701d8456ada5cc633c41ef4373fa4bfeabeb73599d40bcc941b SHA512 a56648c974a1d14dd4c18237532773c72057a13ab90c58b5da04f185e3c12a8bd8d5c21fb06053507f31766291a82dc7d87b34cd65fd94cfe2af7295c813ef84 WHIRLPOOL 1ff70497eca6531f0e0614c72a19f4b8e5ff486a58d369f4f0b36308d1d6b01168f9da887740e3b9f536236be251d3fe05f904d27a9233a7cf613416ba882968
diff --git a/www-apache/mod_pcgi2/files/20_mod_pcgi.conf b/www-apache/mod_pcgi2/files/20_mod_pcgi.conf
new file mode 100644
index 000000000000..4849530c96bc
--- /dev/null
+++ b/www-apache/mod_pcgi2/files/20_mod_pcgi.conf
@@ -0,0 +1,8 @@
+<IfDefine PCGI>
+LoadModule pcgi2_module modules/mod_pcgi2.so
+
+# please see /usr/share/doc/mod_pcgi-*/README
+# for details on the required apache directives
+</IfDefine>
+
+# vim: ts=4 filetype=apache
diff --git a/www-apache/mod_pcgi2/metadata.xml b/www-apache/mod_pcgi2/metadata.xml
new file mode 100644
index 000000000000..6f49eba8f496
--- /dev/null
+++ b/www-apache/mod_pcgi2/metadata.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<!-- maintainer-needed -->
+</pkgmetadata>
diff --git a/www-apache/mod_pcgi2/mod_pcgi2-2.0.2.ebuild b/www-apache/mod_pcgi2/mod_pcgi2-2.0.2.ebuild
new file mode 100644
index 000000000000..a4073a0480b0
--- /dev/null
+++ b/www-apache/mod_pcgi2/mod_pcgi2-2.0.2.ebuild
@@ -0,0 +1,27 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+inherit apache-module
+
+KEYWORDS="~ppc ~x86"
+
+DESCRIPTION="An Apache module to talk to Zope Corporation's PCGI"
+HOMEPAGE="http://www.zope.org/Members/phd/mod_pcgi2/"
+SRC_URI="http://zope.org/Members/phd/${PN}/${PN}/${P}-src.tar.gz"
+LICENSE="GPL-2"
+SLOT="0"
+IUSE=""
+
+DEPEND="www-apps/pcgi"
+RDEPEND="${DEPEND}"
+
+S="${WORKDIR}/${PN/mod_}"
+
+APXS2_ARGS="-n pcgi2 -DUNIX -DAPACHE2 -DMOD_PCGI2 -c mod_pcgi2.c pcgi-wrapper.c parseinfo.c "
+
+APACHE2_MOD_CONF="20_mod_pcgi"
+APACHE2_MOD_DEFINE="PCGI"
+
+DOCFILES="NEWS README ChangeLog"
+
+need_apache
diff --git a/www-apache/mod_perl/Manifest b/www-apache/mod_perl/Manifest
new file mode 100644
index 000000000000..5c92ce4dca9b
--- /dev/null
+++ b/www-apache/mod_perl/Manifest
@@ -0,0 +1,12 @@
+AUX 2.0.3/75_mod_perl.2.2.conf 1221 SHA256 e7c2f4b84e9c9fc73e421740736f67674ebc7e7f13f8b2f71c9360f746fd441a SHA512 caaf66604e385f24ddebf282c42b880362fa19f9195fca105171b3d3edfa5b995d7bda9899be60f78341e20e2fad75fbb097740ea43781a44a60a4a5b7f650b7 WHIRLPOOL 8601fb27162befa58c94009e4e726cbd6fec7f2014a23b68b93b88f18d0b44cbebeee3ebdb0970600aa9785b5cff6f86eb6edb33d59f874622dfb828b22b5d0b
+AUX 2.0.3/75_mod_perl.conf 1295 SHA256 b26ede61b2e03fd14432725ee6e5180dc3f289a123567073ee0dc9e7679b41f2 SHA512 f6842055bf41b457e77f25de4fccb4981456669e269a01faf606f5de31050fe41c2741c2591bc89a46914c876bfebb914e7d3a07108db8220ec0b8218781c22e WHIRLPOOL 12be8c9fe44f02b50140b87d0f68b5444f3df5e6eb0bf1d51da9f01f7c4101ebeba5c0803ce8656c2be157619e2f74f5713401ebd827895738ac4d5434d48930
+AUX 2.0.3/apache2-mod_perl-startup.pl 478 SHA256 f77741fb3bb18928fb15f95c6908a17d8f06d7efbb6785e0732f201347e26544 SHA512 3af399b3aa0bf5421ddef581b1042cbd71fa3fc9d27aa87feafb4754cc8e7bf9659eb70082f0c73f0022b31e8870ff68021af692e41b391dec6c5e7608589e29 WHIRLPOOL 78518f0d5952246700424af8d85dae73a17061e009b7d89aa55c7c93fed877addc8550524ebf6fb5f353ee50210a3773dadac9e1c8f84f2b2bc32c4ab2df2981
+AUX mod_perl-2.0.1-sneak-tmpdir.patch 337 SHA256 1f319a15e3d12a349c46c0783c7ad840d81d01ed41adda55c47d4ac31595615d SHA512 8e41d94db8cdd181393be8b4922a9e9760576cb051f93d652cf3f324671a464bfc2741bf18661ac4509db257cb5975b408f33799aea76a2e46ad15af08a68792 WHIRLPOOL a24853b0ada357b2a53d5ffe34969f792305a674388d6dc385912167a7ce45d376035a0810f75a1740872bac452187e7172f11afe06f8553f25560476a5fa1da
+AUX mod_perl-2.0.10_rc1-Gentoo-not-Unix.patch 1517 SHA256 7d3e4aa00a1ec564f2af9b93ef4e184ca5ecac2927a5d7d10d1c99fae1eac768 SHA512 4ac22d4e8942d2fb4d07f10897c7670acd77d28a7b47049e95dffe026d335c26681a0fa4a43c67b53fafa8c5bdba7991bad150e3bc00a8e3c40a7d7e59938c63 WHIRLPOOL f91cb45f45d87e5c05a843270aa2adf4bbaff6e3618a54128db6929c4d163cd0f02ae91f1ac7f67753da6328b67b8f47f41f5585ac719793e800d2ebc258f8fb
+AUX mod_perl-2.0.10_rc1-bundled-Apache-Test.patch 2777 SHA256 c1740e70637f8077bac80c8542f649ed9eaa8c60437c3c514b978f8ff48a2375 SHA512 ebb583607d4a8587d340384bb5c8deb50a3001beaaf9a536f4731baa3664a6d2667de309d1549175bf721643ad3f107988de4d2c9e213429888044dd726447ee WHIRLPOOL 44c8c9ab97a7f586ac554cd90111c0fc9209a9623715d4e415ea98661c599dbacdcd1ed7dbde4364a23b096a270d949b3b4251b1d8404ee9530cd0cc7559fc3b
+AUX mod_perl-2.0.4-inline.patch 678 SHA256 4438195d61e62d39cf2c6d8427238426cd98bd8778d25c0086c2093e8ab55f29 SHA512 5669230db6e70b31b087851fd792004c4a292975e507f248b8dc7ce195559ab9b0579db8bea84d823f7d53e351990ecda057d7fe63273d486b5f12204d7160a5 WHIRLPOOL 6c9b1a8262b7caaf803e6f1246eacb83fe9e677a973d02bd0d2e39aa2718e424f59ac15aeea073057dd68268e5fd066b653abd7ad418c326f34e027de5227566
+DIST mod_perl-2.0.10.tar.gz 3846211 SHA256 d1cf83ed4ea3a9dfceaa6d9662ff645177090749881093051020bf42f9872b64 SHA512 0bf1a885cb32a3393e95f87e71983097613e263b9052dbf22494663b506e36a25d0256afed24285232276d9f43ebd3adaa18b91129bfb62116a8ccb023855bca WHIRLPOOL 5ca9c3d961292a36d6be08e6f619385d54dd3551fc27a7387f53604e9971429c732fc988df50c35b1d62d520bab763fe4d127beb09aef86209583f2ef0d21eaf
+EBUILD mod_perl-2.0.10.ebuild 3723 SHA256 2b57bb66ecafd0409db715eb356dc4f1f8fa5c13371fdbef95cce0ae83e0f23f SHA512 61e4ad8cfdd7f61aec044c8a3315f4c7e37d0c6bb55fe50975a65b8a45609f7adf84c24374dc2e8a308ceecda6453b06159bc331fff4d727681d5e92463621b1 WHIRLPOOL 9cc4912d688fb3ed5ad909cfe446b732957aae295dd9da7e859b994be7020ab7aa8930912b2891f15e447925a74363cc55e3d9ab534456d4d08f01b29398a7f0
+MISC ChangeLog 6690 SHA256 7ef24f5deabb87d26ca3dc5f64d6546401c703fde9b13fd19549d355d428ae6a SHA512 1f7391188652dbd32b35d544be4c57f1cfcce8d2827d0f7b93ce714c70cec205e605221822ccb811814bdc9c0591a8c3165d5c435a293ad30bf9ed849bbea084 WHIRLPOOL 3a28d2260fabad886cf73465a2a03f24ee493d3354f3a0522aed7b75b0f913a07b7e6a9f960572a270551576f4e81307a6674a21bb58650947c2c3c858114b6d
+MISC ChangeLog-2015 26961 SHA256 9b2aa1e0e1dfaaaeba4726b4e3b6a5854465496a1b87103dff7b51c6ba3eb72d SHA512 7bdad7572461e5874b8dbc51ba8a973126d24efc587697102ea2c932b2f7077c7cf4060577a75aa819b8c9d318c907b0d2dcc1f25be8f999e0c8bee68e0a2179 WHIRLPOOL 97e8f553953b9232d89a9b4767b37c0b80d4d6bd98835414a7e8cd0556aaba72c545b7b851c02f3cb727b0a40b899c7709608a1658c0944ad166db7323866880
+MISC metadata.xml 486 SHA256 0f5204aa677dc5bd349b670d2be6f4e6c2327f79db8e2ae2c8fd96c5f33abdb2 SHA512 fe1670239ff1d6375cd0d6d3ef70e93cc687d6116693e4cd3df2670823c88b757e9c77e7955b09e33cc241785944cf2e99d336495e36846b3097cbbd96a5c5ac WHIRLPOOL f7352f1c9195dbef8152a1e01623a01f713dcdf8c8a3d11c8108f21e9a9722c1d95d7b649a3bf24ecba318778de06ff0e003fc240db4d6043f089931a5ed25eb
diff --git a/www-apache/mod_perl/files/2.0.3/75_mod_perl.2.2.conf b/www-apache/mod_perl/files/2.0.3/75_mod_perl.2.2.conf
new file mode 100644
index 000000000000..596d2cc73c6e
--- /dev/null
+++ b/www-apache/mod_perl/files/2.0.3/75_mod_perl.2.2.conf
@@ -0,0 +1,50 @@
+<IfDefine PERL>
+LoadModule perl_module modules/mod_perl.so
+
+#PerlTrace all
+PerlRequire "/etc/apache2/modules.d/apache2-mod_perl-startup.pl"
+PerlModule ModPerl::Registry
+
+# Provide two aliases to the same cgi-bin directory, to see the effects of the
+# 2 different mod_perl modes for Apache2::Registry Mode
+Alias /perl/ /var/www/localhost/perl/
+# for Apache2::Perlrun Mode
+Alias /cgi-perl/ /var/www/localhost/perl/
+
+<Location /perl-status>
+	SetHandler perl-script
+	PerlResponseHandler Apache2::Status
+	Order deny,allow
+	Deny from all
+	Allow from 127.0.0.1
+</Location>
+
+<Directory /home/*/public_html/perl>
+	SetHandler perl-script
+	PerlResponseHandler ModPerl::PerlRun
+	Options -Indexes ExecCGI
+	PerlOptions +ParseHeaders
+</Directory>
+
+# set Apache::Registry Mode for /perl Alias
+<Location /perl/*.pl>
+	SetHandler perl-script
+	PerlResponseHandler ModPerl::Registry
+	Options -Indexes ExecCGI
+	PerlSendHeader On
+	Order allow,deny
+	Allow from all
+</Location>
+
+# set Apache::PerlRun Mode for /cgi-perl Alias
+<Location /cgi-perl/*.pl>
+	SetHandler perl-script
+	PerlResponseHandler ModPerl::PerlRun
+	Options -Indexes ExecCGI
+	PerlSendHeader On
+	Order allow,deny
+	Allow from all
+</Location>
+</IfDefine>
+
+# vim: ts=4 filetype=apache
diff --git a/www-apache/mod_perl/files/2.0.3/75_mod_perl.conf b/www-apache/mod_perl/files/2.0.3/75_mod_perl.conf
new file mode 100644
index 000000000000..9cf7b7b4394f
--- /dev/null
+++ b/www-apache/mod_perl/files/2.0.3/75_mod_perl.conf
@@ -0,0 +1,54 @@
+<IfDefine PERL>
+LoadModule perl_module modules/mod_perl.so
+
+#PerlTrace all
+PerlRequire "/etc/apache2/modules.d/apache2-mod_perl-startup.pl"
+PerlModule ModPerl::Registry
+
+# Provide two aliases to the same cgi-bin directory, to see the effects of the
+# 2 different mod_perl modes for Apache2::Registry Mode
+Alias /perl/ /var/www/localhost/perl/
+# for Apache2::Perlrun Mode
+Alias /cgi-perl/ /var/www/localhost/perl/
+
+<Location /perl-status>
+	SetHandler perl-script
+	PerlResponseHandler Apache2::Status
+	Require host localhost
+</Location>
+
+<Directory /home/*/public_html/perl>
+	SetHandler perl-script
+	PerlResponseHandler ModPerl::PerlRun
+	PerlOptions +ParseHeaders
+
+	# Clear all existing options and only permit cgi.
+	Options ExecCGI
+</Directory>
+
+# set Apache::Registry Mode for /perl Alias
+<Location /perl/*.pl>
+	SetHandler perl-script
+	PerlResponseHandler ModPerl::Registry
+	PerlSendHeader On
+
+	# Clear all existing options and only permit cgi.
+	Options ExecCGI
+
+	Require all granted
+</Location>
+
+# set Apache::PerlRun Mode for /cgi-perl Alias
+<Location /cgi-perl/*.pl>
+	SetHandler perl-script
+	PerlResponseHandler ModPerl::PerlRun
+	PerlSendHeader On
+
+	# Clear all existing options and only permit cgi.
+	Options ExecCGI
+
+	Require all granted
+</Location>
+</IfDefine>
+
+# vim: ts=4 filetype=apache
diff --git a/www-apache/mod_perl/files/2.0.3/apache2-mod_perl-startup.pl b/www-apache/mod_perl/files/2.0.3/apache2-mod_perl-startup.pl
new file mode 100644
index 000000000000..afc048ac125b
--- /dev/null
+++ b/www-apache/mod_perl/files/2.0.3/apache2-mod_perl-startup.pl
@@ -0,0 +1,24 @@
+use lib qw(/home/httpd/perl);
+
+# enable if the mod_perl 1.0 compatibility is needed
+#use Apache2::compat ();
+
+use ModPerl::Util (); #for CORE::GLOBAL::exit
+
+use Apache2::RequestRec ();
+use Apache2::RequestIO ();
+use Apache2::RequestUtil ();
+
+use Apache2::ServerRec ();
+use Apache2::ServerUtil ();
+use Apache2::Connection ();
+use Apache2::Log ();
+
+use APR::Table ();
+
+use ModPerl::Registry ();
+
+use Apache2::Const -compile => ':common';
+use APR::Const -compile => ':common';
+
+1;
diff --git a/www-apache/mod_perl/files/mod_perl-2.0.1-sneak-tmpdir.patch b/www-apache/mod_perl/files/mod_perl-2.0.1-sneak-tmpdir.patch
new file mode 100644
index 000000000000..0930278aeba3
--- /dev/null
+++ b/www-apache/mod_perl/files/mod_perl-2.0.1-sneak-tmpdir.patch
@@ -0,0 +1,11 @@
+--- t/conf/modperl_extra.pl.orig	2005-05-16 18:27:45.000000000 +1000
++++ t/conf/modperl_extra.pl	2005-05-16 18:34:46.000000000 +1000
+@@ -136,6 +136,8 @@
+ sub test_modperl_env {
+     # see t/response/TestModperl/env.pm
+     $ENV{MODPERL_EXTRA_PL} = __FILE__;
++    $ENV{TMPDIR} = __FILE__;
++    $ENV{TMPDIR} =~ s,/work/.*,/temp,;
+ }
+ 
+ 1;
diff --git a/www-apache/mod_perl/files/mod_perl-2.0.10_rc1-Gentoo-not-Unix.patch b/www-apache/mod_perl/files/mod_perl-2.0.10_rc1-Gentoo-not-Unix.patch
new file mode 100644
index 000000000000..578878f05d04
--- /dev/null
+++ b/www-apache/mod_perl/files/mod_perl-2.0.10_rc1-Gentoo-not-Unix.patch
@@ -0,0 +1,36 @@
+Tests fail because the server banner contains "Gentoo" instead of "Unix". Disable them.
+
+
+diff -ruN mod_perl-2.0.10-rc1.orig/t/response/TestAPI/server_const.pm mod_perl-2.0.10-rc1/t/response/TestAPI/server_const.pm
+--- mod_perl-2.0.10-rc1.orig/t/response/TestAPI/server_const.pm	2016-09-30 14:45:31.000000000 +0200
++++ mod_perl-2.0.10-rc1/t/response/TestAPI/server_const.pm	2016-10-01 13:18:02.359794404 +0200
+@@ -25,7 +25,7 @@
+ 
+     my $r = shift;
+ 
+-    plan $r, tests => 6;
++    plan $r, tests => 4;
+ 
+     # test Apache2::ServerUtil constant subroutines
+ 
+@@ -45,13 +45,13 @@
+     ok t_cmp($server_descr, qr!\bworld domination series/2\.0\b!,
+              'Apache2::ServerUtil::get_server_description() -- component');
+ 
+-    # assuming ServerTokens Full (default) the banner equals description
+-    ok t_cmp(Apache2::ServerUtil::get_server_banner, $server_descr,
+-             'Apache2::ServerUtil::get_server_banner()');
+-
+-    # version is just an alias for banner
+-    ok t_cmp(Apache2::ServerUtil::get_server_version, $server_descr,
+-             'Apache2::ServerUtil::get_server_version()');
++#    # assuming ServerTokens Full (default) the banner equals description
++#    ok t_cmp(Apache2::ServerUtil::get_server_banner, $server_descr,
++#             'Apache2::ServerUtil::get_server_banner()');
++
++#    # version is just an alias for banner
++#    ok t_cmp(Apache2::ServerUtil::get_server_version, $server_descr,
++#             'Apache2::ServerUtil::get_server_version()');
+ 
+     Apache2::Const::OK;
+ }
diff --git a/www-apache/mod_perl/files/mod_perl-2.0.10_rc1-bundled-Apache-Test.patch b/www-apache/mod_perl/files/mod_perl-2.0.10_rc1-bundled-Apache-Test.patch
new file mode 100644
index 000000000000..e8ec5d0308da
--- /dev/null
+++ b/www-apache/mod_perl/files/mod_perl-2.0.10_rc1-bundled-Apache-Test.patch
@@ -0,0 +1,80 @@
+diff -ruN mod_perl-2.0.10-rc1.orig/Makefile.PL mod_perl-2.0.10-rc1/Makefile.PL
+--- mod_perl-2.0.10-rc1.orig/Makefile.PL	2016-09-30 14:45:23.000000000 +0200
++++ mod_perl-2.0.10-rc1/Makefile.PL	2016-10-01 00:35:17.140862642 +0200
+@@ -25,7 +25,7 @@
+ 
+ }
+ 
+-use lib qw(lib Apache-Test/lib);
++use lib qw(lib);
+ 
+ use Config;
+ use File::Spec::Functions;
+@@ -122,15 +122,6 @@
+ 
+ sub configure {
+ 
+-    # mod_perl test suite relies on having Apache-Test bundled with
+-    # the mod_perl source, since any pre-installed version may not do
+-    # the right thing
+-    unless (-d "Apache-Test") {
+-        error "Can't find a sub-directory Apache-Test. " .
+-            "Make sure that you are using a complete source distribution";
+-        exit 1;
+-    }
+-
+     set_modperl_version();
+ 
+     if ($old_modperl_version) {
+@@ -853,14 +844,9 @@
+ run_subtests ::
+ 	cd ModPerl-Registry && $(MAKE) test
+ 
+-run_subtests ::
+-	cd Apache-Reload && $(MAKE) test
+-
+ EOF
+ 
+     $preamble .= <<'EOF' unless $build->mpm_is_threaded();
+-run_subtests ::
+-	cd Apache-SizeLimit && $(MAKE) test
+ 
+ EOF
+ 
+diff -ruN mod_perl-2.0.10-rc1.orig/lib/ModPerl/BuildMM.pm mod_perl-2.0.10-rc1/lib/ModPerl/BuildMM.pm
+--- mod_perl-2.0.10-rc1.orig/lib/ModPerl/BuildMM.pm	2016-09-30 14:45:23.000000000 +0200
++++ mod_perl-2.0.10-rc1/lib/ModPerl/BuildMM.pm	2016-10-01 00:35:17.140862642 +0200
+@@ -39,12 +39,10 @@
+ ModPerl::MM::override_eu_mm_mv_all_methods(@methods);
+ use strict 'refs';
+ 
+-my $apache_test_dir = catdir Cwd::getcwd(), "Apache-Test", "lib";
+-
+ #to override MakeMaker MOD_INSTALL macro
+ sub mod_install {
+     q{$(PERL) -I$(INST_LIB) -I$(PERL_LIB) \\}."\n" .
+-    qq{-I$apache_test_dir -MModPerl::BuildMM \\}."\n" .
++    qq{-MModPerl::BuildMM \\}."\n" .
+     q{-e "ExtUtils::Install::install({@ARGV},'$(VERBINST)',0,'$(UNINST)');"}."\n";
+ }
+ 
+@@ -271,7 +269,7 @@
+ 
+                 push @target,
+                     '$(FULLPERL) -I$(INST_LIB) ' .
+-                    "-I$apache_test_dir -MModPerl::BuildMM " .
++                    "-MModPerl::BuildMM " .
+                     "-e ModPerl::BuildMM::glue_pod $pm $podpath $blib";
+ 
+                 # Win32 doesn't normally install man pages
+diff -ruN mod_perl-2.0.10-rc1.orig/lib/ModPerl/Manifest.pm mod_perl-2.0.10-rc1/lib/ModPerl/Manifest.pm
+--- mod_perl-2.0.10-rc1.orig/lib/ModPerl/Manifest.pm	2016-09-30 14:45:23.000000000 +0200
++++ mod_perl-2.0.10-rc1/lib/ModPerl/Manifest.pm	2016-10-01 00:35:17.140862642 +0200
+@@ -119,7 +119,6 @@
+ t/apr-ext/perlio
+ # PAUSE breaks if a dist has more than one META.yml. the top-level
+ # META.yml already excludes Apache-Test from indexing
+-Apache-Test/META.yml
+ # exclude Apache-Test/MANIFEST since it confuses the mp2 build (e.g it
+ # wants Apache-Test/META.yml which we don't supply, see above)
+ Apache-Test/MANIFEST
diff --git a/www-apache/mod_perl/files/mod_perl-2.0.4-inline.patch b/www-apache/mod_perl/files/mod_perl-2.0.4-inline.patch
new file mode 100644
index 000000000000..5c51a803b816
--- /dev/null
+++ b/www-apache/mod_perl/files/mod_perl-2.0.4-inline.patch
@@ -0,0 +1,22 @@
+https://bugs.gentoo.org/550244
+
+taken from Fedora:
+http://pkgs.fedoraproject.org/cgit/mod_perl.git/tree/mod_perl-2.0.4-inline.patch?h=f22
+
+fixes building with gcc-5:
+apache2: Syntax error on line 148 of /etc/apache2/httpd.conf:
+Syntax error on line 2 of /etc/apache2/modules.d/75_mod_perl.conf:
+Cannot load modules/mod_perl.so into server:
+/usr/lib64/apache2/modules/mod_perl.so: undefined symbol: modperl_handler_name
+
+--- mod_perl-2.0.4/src/modules/perl/modperl_common_util.h.inline
++++ mod_perl-2.0.4/src/modules/perl/modperl_common_util.h
+@@ -22,7 +22,7 @@
+ #ifdef MP_DEBUG
+ #define MP_INLINE
+ #else
+-#define MP_INLINE APR_INLINE
++#define MP_INLINE
+ #endif
+ 
+ #ifdef CYGWIN
diff --git a/www-apache/mod_perl/metadata.xml b/www-apache/mod_perl/metadata.xml
new file mode 100644
index 000000000000..28acd8c80937
--- /dev/null
+++ b/www-apache/mod_perl/metadata.xml
@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="person">
+		<email>idl0r@gentoo.org</email>
+		<name>Christian Ruppert</name>
+	</maintainer>
+	<maintainer type="project">
+		<email>perl@gentoo.org</email>
+		<name>Gentoo Perl Project</name>
+	</maintainer>
+	<use>
+		<flag name="ithreads">Build for use with thread-capable perl, needs same setting as in dev-lang/perl</flag>
+	</use>
+</pkgmetadata>
diff --git a/www-apache/mod_perl/mod_perl-2.0.10.ebuild b/www-apache/mod_perl/mod_perl-2.0.10.ebuild
new file mode 100644
index 000000000000..f83252b19f5f
--- /dev/null
+++ b/www-apache/mod_perl/mod_perl-2.0.10.ebuild
@@ -0,0 +1,137 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+inherit depend.apache apache-module perl-module eutils
+
+DESCRIPTION="An embedded Perl interpreter for Apache2"
+HOMEPAGE="https://perl.apache.org/ https://projects.apache.org/project.html?perl-mod_perl"
+SRC_URI="mirror://apache/perl/${P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="1"
+KEYWORDS="alpha amd64 ~arm ppc ppc64 x86"
+IUSE="debug ithreads test"
+
+SRC_TEST=do
+
+# Apache::Reload, Apache::SizeLimit, and Apache::Test are force-unbundled.
+# The minimum versions requested here are the bundled versions.
+
+# The test dependencies are from CPAN (Bundle::Apache2).
+
+# When all MPMs are disabled via useflags, the apache ebuild selects a
+# default one, which will likely need threading...
+
+RDEPEND="
+	dev-lang/perl[ithreads=]
+	>=dev-perl/Apache-Test-1.400.0
+	>=www-servers/apache-2.0.47
+	>=dev-libs/apr-util-1.4
+	!ithreads? ( www-servers/apache[-apache2_mpms_event,-apache2_mpms_worker,apache2_mpms_prefork] )
+"
+DEPEND="${RDEPEND}
+	dev-perl/Module-Build
+	test? (
+		>=dev-perl/CGI-3.110.0
+		dev-perl/Chatbot-Eliza
+		dev-perl/Devel-Symdump
+		dev-perl/HTML-Parser
+		dev-perl/IPC-Run3
+		dev-perl/libwww-perl
+		www-servers/apache[apache2_modules_version,-apache2_modules_unique_id]
+		!www-apache/mpm_itk
+	)
+"
+PDEPEND="
+	>=dev-perl/Apache-Reload-0.130.0
+	>=dev-perl/Apache-SizeLimit-0.970.0
+"
+
+APACHE2_MOD_FILE="${S}/src/modules/perl/mod_perl.so"
+APACHE2_MOD_CONF="2.0.3/75_${PN}"
+APACHE2_MOD_DEFINE="PERL"
+
+need_apache2
+
+PATCHES=(
+	"${FILESDIR}/${PN}"-2.0.1-sneak-tmpdir.patch  # seems to fix the make test problem
+	"${FILESDIR}/${PN}"-2.0.4-inline.patch        # 550244
+	"${FILESDIR}/${PN}"-2.0.10_rc1-bundled-Apache-Test.patch # 352724
+	"${FILESDIR}/${PN}"-2.0.10_rc1-Gentoo-not-Unix.patch
+)
+
+src_prepare() {
+	perl-module_src_prepare
+
+	# chainsaw unbundling
+	rm -rf Apache-{Test,Reload,SizeLimit}/ lib/Bundle/ || die
+}
+
+src_configure() {
+	local debug=$(usex debug 1 0)
+	local nothreads=$(usex ithreads 0 1)
+	myconf=(
+		MP_USE_DSO=1
+		MP_APXS=${APXS}
+		MP_APR_CONFIG=/usr/bin/apr-1-config
+		MP_TRACE=${debug}
+		MP_DEBUG=${debug}
+		MP_NO_THREADS=${nothreads}
+	)
+
+	perl-module_src_configure
+}
+
+src_test() {
+	# make test notes whether it is running as root, and drops
+	# privileges all the way to "nobody" if so, so we must adjust
+	# write permissions accordingly in this case.
+
+	# IF YOU SUDO TO EMERGE AND HAVE !env_reset set testing will fail!
+	if [[ "$(id -u)" == "0" ]]; then
+		chown nobody:nobody "${WORKDIR}" "${T}" || die
+	fi
+
+	# We force verbose tests for now to get meaningful bug reports.
+	MAKEOPTS+=" -j1"
+	TMPDIR="${T}" HOME="${T}/" TEST_VERBOSE=1 perl-module_src_test
+}
+
+src_install() {
+	apache-module_src_install
+
+	default
+
+	perl_delete_localpod
+	perl_delete_packlist
+
+	insinto "${APACHE_MODULES_CONFDIR}"
+	doins "${FILESDIR}"/2.0.3/apache2-mod_perl-startup.pl
+
+	# this is an attempt to get @INC in line with /usr/bin/perl.
+	# there is blib garbage in the mainstream one that can only be
+	# useful during internal testing, so we wait until here and then
+	# just go with a clean slate.  should be much easier to see what's
+	# happening and revert if problematic.
+
+	perl_set_version
+	sed -i \
+		-e "s,-I${S}/[^[:space:]\"\']\+[[:space:]]\?,,g" \
+		-e "s,-typemap[[:space:]]${S}/[^[:space:]\"\']\+[[:space:]]\?,,g" \
+		-e "s,${S}\(/[^[:space:]\"\']\+\)\?,/,g" \
+		"${D}/${VENDOR_ARCH}/Apache2/BuildConfig.pm" || die
+
+	local fname
+	for fname in $(find "${D}" -type f -not -name '*.so'); do
+		grep -q "\(${D}\|${S}\)" "${fname}" && ewarn "QA: File contains a temporary path ${fname}"
+		sed -i -e "s:\(${D}\|${S}\):/:g" ${fname} || die
+	done
+
+	perl_remove_temppath
+}
+
+pkg_postinst() {
+	apache-module_pkg_postinst
+}
diff --git a/www-apache/mod_qos/Manifest b/www-apache/mod_qos/Manifest
new file mode 100644
index 000000000000..ba611bb4f4f1
--- /dev/null
+++ b/www-apache/mod_qos/Manifest
@@ -0,0 +1,6 @@
+AUX 10_mod_qos.conf 97 SHA256 2fbbf5fc8da1fb4929c88f2a63db178a92057b0664c3e7d58b8b06189f5de781 SHA512 eafdbc3ae2f33a7e2bb55e59c311e79688c3ecabdd12247a5f68a9c00c46b84c709139f124cdccc5fd7b3d792b23a94ce37a8d27835d70c521ad6212d4e761c2 WHIRLPOOL fe183ff587f0c00e199772b51b5e042322abf7d552bef579cd59168c0c3af57340652ea3bb8c65db2648e8d557eee9d4244c51cce0e605875295029b9e4134fa
+DIST mod_qos-11.12.tar.gz 509530 SHA256 decbf82bb48568bd2fc5ca96792d294c3fbf5b950b338df8670237cc2144c6d5 SHA512 a9597a1b7ec38ec9ad492c79b797a807e180feb11a42cf7e206ca3cecf9c986eecc9979659a65fcc9ec0454ef8574dbdfc2c5abd862d8b3bc1065a93fbe0ccb7 WHIRLPOOL fabbe758c5fb6f069a4e510889f7fddf5eff23a0395e1976336c1a6d4fe411fe1c83f175dc65a0e6e9e47bd119eb1f195885f131229060fe32dc025ab0c0d256
+EBUILD mod_qos-11.12.ebuild 1015 SHA256 011729a429aa36ebf73a40450fe3f84382b52fbef62f7d3dda23b5486b6d8ef8 SHA512 b7b178f6d90ff4b2fa2bf705d2357cdf66985deccfa8da00b33f48c2b0d422483219798169b7b8027d74848ffe986fe1091dd30d8ab468f0eab00e773d723f98 WHIRLPOOL 9b5f9e669d2a7f4aa363cfbd95ac6e88f98954ba71842e0037b1ad7a23b884ae26f93536f5eac55917fef71814940c988e4ea1064d5366b97e7f5a76e57a3752
+MISC ChangeLog 2548 SHA256 aa86c63eb09e403c87b4858a5e08e143677694c5fc5aad279d847d04f9618ab0 SHA512 25438a360d9026049b1d94b61dfb9b69bbd8f8293b2fb6fb4e275ddc5686476830f8aeab1ed1ba715191b594daba0fa0be09da4a003a66f53fd474de89a69c00 WHIRLPOOL 9abed62cf6ec2ff498d37dfe5850a8ce93fa5ef466f83ce219bdd30ed7de519e1d5bc3b8c8fe8ec366d8d220e37a13abbbc4190c50101627bfba2aaf9f51f396
+MISC ChangeLog-2015 966 SHA256 fa76511a9e9daae3f83840fe2b97cf8cc8ccaf196170cb3720f40afd5b1a37a4 SHA512 48366b0d30475f14acdc0fbbaaab650b68e51bde51d87e82d38951b86d45d0312e7da29679f1c8c7dea7b34c59ae0bb1bdac4a2d90d2c260e84ba2dcf76dedec WHIRLPOOL 002b842d83686cf44151b6a46a2f283d9b8d74fdb80d22c5014d238c0f708f9d5748c194af960da3767c537f24a0285ac73d7f5a9a30e87c68b3acf5c7b79c03
+MISC metadata.xml 244 SHA256 9022021c900fe98298236a118e9973fb11b4af0f2be9de3a3add58780ac7fcbf SHA512 8757fe5e361f5e4214eaf304d5d9d57bc542f1eba248fe4dfc44310d95af160e8c04ad72723b3bf7afd3075ed2f6d58e4bd28643fff37fcd8d6e0134dc147dc7 WHIRLPOOL fea5bc2a47cace2c66637c9bc5525ad82c0746514e46d790122d875cae5452e41ccb214be1133932ee8062dcb3080e149ed6ccc1988d21c87ccd366cdb3b1fd3
diff --git a/www-apache/mod_qos/files/10_mod_qos.conf b/www-apache/mod_qos/files/10_mod_qos.conf
new file mode 100644
index 000000000000..4a8eeca1b6ee
--- /dev/null
+++ b/www-apache/mod_qos/files/10_mod_qos.conf
@@ -0,0 +1,5 @@
+<IfDefine QOS>
+LoadModule qos_module modules/mod_qos.so
+</IfDefine>
+
+# vim: ts=4 filetype=apache
diff --git a/www-apache/mod_qos/metadata.xml b/www-apache/mod_qos/metadata.xml
new file mode 100644
index 000000000000..232c098fae32
--- /dev/null
+++ b/www-apache/mod_qos/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<!-- maintainer-needed -->
+	<upstream>
+		<remote-id type="sourceforge">mod-qos</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/www-apache/mod_qos/mod_qos-11.12.ebuild b/www-apache/mod_qos/mod_qos-11.12.ebuild
new file mode 100644
index 000000000000..a813fc282317
--- /dev/null
+++ b/www-apache/mod_qos/mod_qos-11.12.ebuild
@@ -0,0 +1,54 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="5"
+inherit autotools apache-module
+
+DESCRIPTION="A QOS module for the apache webserver"
+HOMEPAGE="http://mod-qos.sourceforge.net/"
+SRC_URI="mirror://sourceforge/mod-qos/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+RDEPEND="
+	dev-libs/libpcre
+	dev-libs/openssl:0
+	media-libs/libpng:0=
+	sys-libs/zlib
+"
+DEPEND="${DEPEND}"
+
+APXS2_S="${S}/apache2"
+APACHE2_MOD_CONF="10_${PN}"
+APACHE2_MOD_DEFINE="QOS"
+DOCFILES="${S}/doc/*.txt ${S}/README.TXT"
+
+need_apache2
+
+src_prepare() {
+	cd "${S}/tools" && eautoreconf
+}
+
+src_configure() {
+	cd "${S}/tools" && econf
+}
+
+src_compile() {
+	apache-module_src_compile
+	emake -C "${S}/tools"
+}
+
+src_install() {
+	einfo "Installing Apache module ..."
+	cd "${S}/tools"
+	apache-module_src_install
+
+	einfo "Installing module utilities ..."
+	emake -C "${S}/tools" install DESTDIR="${D}"
+
+	# installing html documentation
+	dohtml -r -x *.txt "${S}/doc/"
+}
diff --git a/www-apache/mod_rpaf/Manifest b/www-apache/mod_rpaf/Manifest
new file mode 100644
index 000000000000..4b4911310a53
--- /dev/null
+++ b/www-apache/mod_rpaf/Manifest
@@ -0,0 +1,10 @@
+AUX 003_ipv6.patch 1261 SHA256 d5023fdaa08ceace05bae15953f07b028eac8a2c6805ddb09d290a8703078b16 SHA512 e1192403b39e442465f3c024e108014bf0045ea15800175f313acf045d817ea59e9b7e88b0c0177a6dd8069b12bd5c3a036528e7fd85cf74a4e3ad2285f36597 WHIRLPOOL bbcc0961d049e0c5ed69c377f57c7ba0debf9faeab29af41cbeca152565690324a468bd8a49e094e4d5ddaa3af1049cd225648502919622512136bf1880ae00f
+AUX 010_multiple_proxies.patch 1611 SHA256 3076ffa6dc38a9912db24e76a9e8a666257248980198f81ad9be5e5ee9430d28 SHA512 6c78bfa0129fcfd464e19ec4d28fb6960bf4ee662cde1207eeb49461e8a3cae0887b4680388167b97374eeaade0627db43ff5837efa259e5497846993bba232f WHIRLPOOL 55d610b9380cf42d87df1339423ece307ad046a8915a3d8d8c3f26ae6d4081c1f6b22a237c8a57d3edd6ba1bda7952514e16bf47d018ac73906cf2a08072671e
+AUX 011_apache2.4.patch 2833 SHA256 f48cf7c04bee38581c5a828a0660817a8c1de55fb00af4369a128e7a1b78bbb6 SHA512 a1e0805fe36f50b2f45e58c66fa9afc2f4583a563808560415c63dd46b92b9bcd885f4bd53c6cdad547c6db62d2bd5ee5c219beec123ade37afeb5eb9310607f WHIRLPOOL ce767242b9900845e93037f3623b6e2d1497736ad1a02d1afa418e386ba07c6f3c0c5a5afb8de43cf8fc9519035a16bc4d8b13e65d8908e0852c91a221ac8b58
+AUX 012_Add-missing-header-for-inet_addr.patch 326 SHA256 c057cecb720afca1275b2366bdb554b980d51a6c03120cb990d205af2c48f6fc SHA512 ca0153d63ca08a0504313da135c4ef7060f30144d2cf5a6a74ee19be05bfc6a914d50da319f66048cabc88bfdef098730c20bccf45df219bb6629bbae67edb94 WHIRLPOOL 8b327aea48697bb840fcfae811cd33cba41cc7269ca8c11d8cfe1b50993af8d7cc7dabcd5a64dcda776fb5528352d1f1c103334682aaa8d6626b47bfe8f7ed72
+AUX 10_mod_rpaf.conf 114 SHA256 36d2c4fbfc288d8a0ff78631aa1acd5e4b0d2bf3e737653332c45725051d6e7d SHA512 33c7f44fa372644ee8654778a4fac5056830a11c90b4ef8aaac17df1e34644fa07cef7f6db2135dcf047dafb99f302c19e288653028811f4f4306aa53f7c58ec WHIRLPOOL 9437acce17e839c737f513cc643c1d0e4b13b0c46970fafa9c60da44f350175fcf3f22ec938782594ae46ef71ed15f68be08a18e3dafa3387f88a794418d5e23
+DIST mod_rpaf-0.6.tar.gz 7695 SHA256 80f9dd1b0574747ef2c399335a88cf562491a7f0b940f26c684d065fe6c4c27d SHA512 1ad5af69cfe0e72cc609c081388e20e6a40cff1af7b47581b3d6958e5c7badf6580b2e14e5bd86482fe7cc7b60ca5045a2486c6f3f6e8ece7c142d38df990b4c WHIRLPOOL c0f9a8d9a561e963bf043efb64f99a8e87a7d1c704c78580c467321044abd9adda9b2c13437a4bbec8508920a18da801e1e6f4e19d03453aaf277215c074fb5a
+EBUILD mod_rpaf-0.6-r1.ebuild 540 SHA256 b7fb8ea6ba5ade6756429403486dfeedfb4f3d5cbc2b77b997d23e2de50706a5 SHA512 c526354b7f3829e875030a4f817ec9124b1b5e57d83477876116ef3d3140351da1522a2332273c90b90d9201ebd1e943338db46eb80de16251dcc0b7e1c84bca WHIRLPOOL c67d2c70fc8a41719b23a05d17bc4aac8d72223aa6c1c3f104aa40408c82d1631eef01554d17924d3542feb6969dfe30c410b908fcb3e6c3e78276439a0bb112
+MISC ChangeLog 3240 SHA256 83598a2ae27c09a908b5beb0a14bf005165cf7e22b4d7a2826fee1cecda58e9c SHA512 7a68684d2ab711209f436512759b57283f9a35cfa661daee108d4fbc1c777a4e804a985357baeaf01bdcf8b2c7dbcac5a63100b8812d88ee36344b83eb448e64 WHIRLPOOL 570953f8598abc97d3b6be8c8832d79a616aeb17beb511657cae3596e45563dd0537d81c94ccc8583ea03231a6a5a39f0afc9dff5a9e3da81f2c164c49ed3e1d
+MISC ChangeLog-2015 1413 SHA256 c731424a89b6c278fb39b2c363a0fe81eccfd48ec6fba139f93b648187b7b81d SHA512 add3640ec342d7881ff8eb42cca1489a37af56040facf6f620178fdb6bd36b10b9ee73f88e89e06df316104041d70335c1f34ada009f4c9b1a63b9a263022be8 WHIRLPOOL f36dd2d0c964f0d5795ae6236366e4b0d680cc5bb1ed397727b5a61255c5822eee3ff6e1817e6d71ed73477597c6e7e1377efc1fdb3aa73ac36d793e91dee058
+MISC metadata.xml 166 SHA256 2caff447f5bd2701d8456ada5cc633c41ef4373fa4bfeabeb73599d40bcc941b SHA512 a56648c974a1d14dd4c18237532773c72057a13ab90c58b5da04f185e3c12a8bd8d5c21fb06053507f31766291a82dc7d87b34cd65fd94cfe2af7295c813ef84 WHIRLPOOL 1ff70497eca6531f0e0614c72a19f4b8e5ff486a58d369f4f0b36308d1d6b01168f9da887740e3b9f536236be251d3fe05f904d27a9233a7cf613416ba882968
diff --git a/www-apache/mod_rpaf/files/003_ipv6.patch b/www-apache/mod_rpaf/files/003_ipv6.patch
new file mode 100644
index 000000000000..49554efe459a
--- /dev/null
+++ b/www-apache/mod_rpaf/files/003_ipv6.patch
@@ -0,0 +1,31 @@
+Description: ipv6 fixes
+Author: Piotr Roszatycki <dexter@debian.org>
+Reviewed-by: Sergey B Kirpichev <skirpichev@gmail.com>
+Bug-Debian: http://bugs.debian.org/726529
+
+---
+ mod_rpaf-2.0.c |    6 ++++++
+ 1 file changed, 6 insertions(+)
+
+--- a/mod_rpaf-2.0.c
++++ b/mod_rpaf-2.0.c
+@@ -72,6 +72,8 @@
+ #include "http_vhost.h"
+ #include "apr_strings.h"
+ 
++#include <arpa/inet.h>
++
+ module AP_MODULE_DECLARE_DATA rpaf_module;
+ 
+ typedef struct {
+@@ -185,6 +187,10 @@
+             apr_pool_cleanup_register(r->pool, (void *)rcr, rpaf_cleanup, apr_pool_cleanup_null);
+             r->connection->remote_ip = apr_pstrdup(r->connection->pool, ((char **)arr->elts)[((arr->nelts)-1)]);
+             r->connection->remote_addr->sa.sin.sin_addr.s_addr = apr_inet_addr(r->connection->remote_ip);
++            apr_sockaddr_t *tmpsa;
++            int ret = apr_sockaddr_info_get(&tmpsa, r->connection->remote_ip, APR_UNSPEC, r->connection->remote_addr->port, 0, r->connection->remote_addr->pool);
++            if (ret == APR_SUCCESS)
++                memcpy(r->connection->remote_addr, tmpsa, sizeof(apr_sockaddr_t));
+             if (cfg->sethostname) {
+                 const char *hostvalue;
+                 if (hostvalue = apr_table_get(r->headers_in, "X-Forwarded-Host")) {
diff --git a/www-apache/mod_rpaf/files/010_multiple_proxies.patch b/www-apache/mod_rpaf/files/010_multiple_proxies.patch
new file mode 100644
index 000000000000..2c9fae01bbe3
--- /dev/null
+++ b/www-apache/mod_rpaf/files/010_multiple_proxies.patch
@@ -0,0 +1,37 @@
+Description: Use the last value from the X-Forwarded-For header, which
+ is not in RPAFproxy_ips as the client IP, falling back to the first one
+ if they are all known proxies.
+Author: Dagfinn Ilmari Mannsåker <ilmari@ilmari.org>
+
+---
+ mod_rpaf-2.0.c |   12 +++++++++++-
+ 1 file changed, 11 insertions(+), 1 deletion(-)
+
+--- a/mod_rpaf-2.0.c
++++ b/mod_rpaf-2.0.c
+@@ -154,6 +154,16 @@
+     return APR_SUCCESS;
+ }
+ 
++static char* last_not_in_array(apr_array_header_t *forwarded_for,
++                               apr_array_header_t *proxy_ips) {
++    int i;
++    for (i = (forwarded_for->nelts)-1; i > 0; i--) {
++	if (!is_in_array(((char **)forwarded_for->elts)[i], proxy_ips))
++           break;
++    }
++    return ((char **)forwarded_for->elts)[i];
++}
++
+ static int change_remote_ip(request_rec *r) {
+     const char *fwdvalue;
+     char *val;
+@@ -185,7 +195,7 @@
+             rcr->old_ip = apr_pstrdup(r->connection->pool, r->connection->remote_ip);
+             rcr->r = r;
+             apr_pool_cleanup_register(r->pool, (void *)rcr, rpaf_cleanup, apr_pool_cleanup_null);
+-            r->connection->remote_ip = apr_pstrdup(r->connection->pool, ((char **)arr->elts)[((arr->nelts)-1)]);
++            r->connection->remote_ip = apr_pstrdup(r->connection->pool, last_not_in_array(arr, cfg->proxy_ips));
+             r->connection->remote_addr->sa.sin.sin_addr.s_addr = apr_inet_addr(r->connection->remote_ip);
+             apr_sockaddr_t *tmpsa;
+             int ret = apr_sockaddr_info_get(&tmpsa, r->connection->remote_ip, APR_UNSPEC, r->connection->remote_addr->port, 0, r->connection->remote_addr->pool);
diff --git a/www-apache/mod_rpaf/files/011_apache2.4.patch b/www-apache/mod_rpaf/files/011_apache2.4.patch
new file mode 100644
index 000000000000..1757e9f30a5a
--- /dev/null
+++ b/www-apache/mod_rpaf/files/011_apache2.4.patch
@@ -0,0 +1,51 @@
+Description: Apache 2.4 compatibility patch
+Author: Sergey B Kirpichev <skirpichev@gmail.com>
+Bug-Debian: http://bugs.debian.org/666792
+
+---
+ mod_rpaf-2.0.c |   16 ++++++++--------
+ 1 file changed, 8 insertions(+), 8 deletions(-)
+
+--- a/mod_rpaf-2.0.c
++++ b/mod_rpaf-2.0.c
+@@ -149,8 +149,8 @@
+ 
+ static apr_status_t rpaf_cleanup(void *data) {
+     rpaf_cleanup_rec *rcr = (rpaf_cleanup_rec *)data;
+-    rcr->r->connection->remote_ip   = apr_pstrdup(rcr->r->connection->pool, rcr->old_ip);
+-    rcr->r->connection->remote_addr->sa.sin.sin_addr.s_addr = apr_inet_addr(rcr->r->connection->remote_ip);
++    rcr->r->connection->client_ip   = apr_pstrdup(rcr->r->connection->pool, rcr->old_ip);
++    rcr->r->connection->client_addr->sa.sin.sin_addr.s_addr = apr_inet_addr(rcr->r->connection->client_ip);
+     return APR_SUCCESS;
+ }
+ 
+@@ -173,7 +173,7 @@
+     if (!cfg->enable)
+         return DECLINED;
+ 
+-    if (is_in_array(r->connection->remote_ip, cfg->proxy_ips) == 1) {
++    if (is_in_array(r->connection->client_ip, cfg->proxy_ips) == 1) {
+         /* check if cfg->headername is set and if it is use
+            that instead of X-Forwarded-For by default */
+         if (cfg->headername && (fwdvalue = apr_table_get(r->headers_in, cfg->headername))) {
+@@ -192,15 +192,15 @@
+                 if (*fwdvalue != '\0')
+                     ++fwdvalue;
+             }
+-            rcr->old_ip = apr_pstrdup(r->connection->pool, r->connection->remote_ip);
++            rcr->old_ip = apr_pstrdup(r->connection->pool, r->connection->client_ip);
+             rcr->r = r;
+             apr_pool_cleanup_register(r->pool, (void *)rcr, rpaf_cleanup, apr_pool_cleanup_null);
+-            r->connection->remote_ip = apr_pstrdup(r->connection->pool, last_not_in_array(arr, cfg->proxy_ips));
+-            r->connection->remote_addr->sa.sin.sin_addr.s_addr = apr_inet_addr(r->connection->remote_ip);
++            r->connection->client_ip = apr_pstrdup(r->connection->pool, last_not_in_array(arr, cfg->proxy_ips));
++            r->connection->client_addr->sa.sin.sin_addr.s_addr = apr_inet_addr(r->connection->client_ip);
+             apr_sockaddr_t *tmpsa;
+-            int ret = apr_sockaddr_info_get(&tmpsa, r->connection->remote_ip, APR_UNSPEC, r->connection->remote_addr->port, 0, r->connection->remote_addr->pool);
++            int ret = apr_sockaddr_info_get(&tmpsa, r->connection->client_ip, APR_UNSPEC, r->connection->client_addr->port, 0, r->connection->client_addr->pool);
+             if (ret == APR_SUCCESS)
+-                memcpy(r->connection->remote_addr, tmpsa, sizeof(apr_sockaddr_t));
++                memcpy(r->connection->client_addr, tmpsa, sizeof(apr_sockaddr_t));
+             if (cfg->sethostname) {
+                 const char *hostvalue;
+                 if (hostvalue = apr_table_get(r->headers_in, "X-Forwarded-Host")) {
diff --git a/www-apache/mod_rpaf/files/012_Add-missing-header-for-inet_addr.patch b/www-apache/mod_rpaf/files/012_Add-missing-header-for-inet_addr.patch
new file mode 100644
index 000000000000..b31f91db29af
--- /dev/null
+++ b/www-apache/mod_rpaf/files/012_Add-missing-header-for-inet_addr.patch
@@ -0,0 +1,17 @@
+Description: Add missing header for inet_addr
+Author: Sergey B Kirpichev <skirpichev@gmail.com>
+
+---
+ mod_rpaf-2.0.c |    1 +
+ 1 file changed, 1 insertion(+)
+
+--- a/mod_rpaf-2.0.c
++++ b/mod_rpaf-2.0.c
+@@ -64,6 +64,7 @@
+  * 
+  */ 
+ 
++#include <arpa/inet.h>
+ #include "httpd.h"
+ #include "http_config.h"
+ #include "http_core.h"
diff --git a/www-apache/mod_rpaf/files/10_mod_rpaf.conf b/www-apache/mod_rpaf/files/10_mod_rpaf.conf
new file mode 100644
index 000000000000..56c952ffaeb6
--- /dev/null
+++ b/www-apache/mod_rpaf/files/10_mod_rpaf.conf
@@ -0,0 +1,6 @@
+<IfDefine RPAF>
+LoadModule rpaf_module modules/mod_rpaf.so
+RPAFenable on
+</IfDefine>
+
+# vim: ts=4 filetype=apache
diff --git a/www-apache/mod_rpaf/metadata.xml b/www-apache/mod_rpaf/metadata.xml
new file mode 100644
index 000000000000..6f49eba8f496
--- /dev/null
+++ b/www-apache/mod_rpaf/metadata.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<!-- maintainer-needed -->
+</pkgmetadata>
diff --git a/www-apache/mod_rpaf/mod_rpaf-0.6-r1.ebuild b/www-apache/mod_rpaf/mod_rpaf-0.6-r1.ebuild
new file mode 100644
index 000000000000..703c870f07a4
--- /dev/null
+++ b/www-apache/mod_rpaf/mod_rpaf-0.6-r1.ebuild
@@ -0,0 +1,28 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+inherit apache-module eutils
+
+DESCRIPTION="Reverse proxy add forward module"
+HOMEPAGE="http://stderr.net/apache/rpaf/"
+SRC_URI="http://stderr.net/apache/rpaf/download/${P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="amd64 x86"
+IUSE=""
+
+DEPEND=""
+RDEPEND=""
+
+APACHE2_MOD_CONF="10_${PN}"
+APACHE2_MOD_DEFINE="RPAF"
+
+need_apache2_4
+
+src_prepare() {
+	# Debian patches
+	epatch "${FILESDIR}"/0*.patch
+	mv ${PN}-2.0.c ${PN}.c
+}
diff --git a/www-apache/mod_scgi/Manifest b/www-apache/mod_scgi/Manifest
new file mode 100644
index 000000000000..f476905645e9
--- /dev/null
+++ b/www-apache/mod_scgi/Manifest
@@ -0,0 +1,7 @@
+AUX 20_mod_scgi.conf 673 SHA256 38bd4f772746b5df479a0611dfc617bcd16c68f3d826201afe87459448b8defa SHA512 65d5a1fa064f8f2185be0ce58e58720c8661feacf4728be4a06d1c7a6e7cf390686bd281b88763e4b3d0e2d49111c52d7e05449515623efed654f22ad95fd91a WHIRLPOOL 38be9a5b3b9436971aae8eedaaeb161110c435d889ddb65b5670216f57ed517427c29278be05764461dd8af5fd4f6b9c2907064b2c4f29dd090f1f6785f73a19
+AUX mod_scgi-1.14-apache-2.4.patch 2021 SHA256 ce3a01152543d0d7f9f63528aad89b61ef8ce1b429d24fd1aca323fc2713ee65 SHA512 a9d9815395c82561c0849dfa2c8e7b6aa29c1be597d947800b4be84825d524edf65b4268d45ba6aaa0d949df14bc4362a3d87643fdb8ce0d05f851c2d43737d8 WHIRLPOOL 32c76d67c86acb0e9574964bac0b96d557072e1070d351aafd6334aa16995b3261c9f0a5a9a06f7ff36cc8424fe78e8b38e3521b3e4d84c0bb2cbbde552f522b
+DIST scgi-1.14.tar.gz 29406 SHA256 0cde41e4ae58ea666f17f6b1984e8ed8ebaff92cabac4b1b36f86bc47eb18e75 SHA512 148986aab3a5579b7dd7d15583990844149b799df32221b4d2c354b11361f79727087d63ddd54227d2aae937253997774e521606c7baea6b808b9efef025a01a WHIRLPOOL 969babed626fba1280f46eee7c620c9d42da1ffdabbf7752b849a26704f214773f07aae41849c873ba22f8bdc0c4c7f54455c130ec2992a943accfb328a183c5
+EBUILD mod_scgi-1.14-r1.ebuild 772 SHA256 911e253f7fe803d95712e8d8727490560a5bff0ca22507a02bf40b63ab815e49 SHA512 2ff9307666bd27cb8f7dd39316ed80a898871e896241c27fcc416800a753d1e831d71c042d1a97f573eae5a47b7b0b1b7b8d52efdd21da86f72bdca4b8f14967 WHIRLPOOL 60f17428bcf1893a1a803fafe80f4d2f40bb5717d377f26aee4e8d438ae9c3c6f67de7a69d16613b90fefecaef8a58171042a39fb048dc5448b365c3c988006e
+MISC ChangeLog 2819 SHA256 215cb7f4033edd0bca41b8accad79715d05e1fbad249a8beac6823eeaaa4bdd0 SHA512 ec0de2d632015cfdf76c7d0bf201b0eb2ac8012a9a9ff334bc606c99428cb27e0d533b2d24d3d182d0440106bc1aa9fa0f5e50c655c13dca81de44bb80fecd6b WHIRLPOOL c919cb8b3184a5798ddf4fee3b18f980a8de8f36f2a0e2086a92bbbe3d3d99532b61fb407fe28e23348ad47d334d4b102fe6698f246040e6d26f9d84fa8ddab6
+MISC ChangeLog-2015 4619 SHA256 957e38c5ec19fecf078ed3885ab97ba1a118ca215fc1ecc87bddfd5b6282b140 SHA512 f4229a19dde656fafa38819c04005d2929aefc7d77df2c1eff85cb607d7e659134332dbb86209d715e3ca5fa50930dea8969d6a5e4a1454cc43262b1a45608d9 WHIRLPOOL 0a6ccfad2b9a3422e19aabbb0d5c16a875fefa16beec0dd1d66e115e6a7eb2125d1a47ab4a0950c999a8f7419e98d653166a3a11d45e59b53e30a52780db8a1a
+MISC metadata.xml 166 SHA256 2caff447f5bd2701d8456ada5cc633c41ef4373fa4bfeabeb73599d40bcc941b SHA512 a56648c974a1d14dd4c18237532773c72057a13ab90c58b5da04f185e3c12a8bd8d5c21fb06053507f31766291a82dc7d87b34cd65fd94cfe2af7295c813ef84 WHIRLPOOL 1ff70497eca6531f0e0614c72a19f4b8e5ff486a58d369f4f0b36308d1d6b01168f9da887740e3b9f536236be251d3fe05f904d27a9233a7cf613416ba882968
diff --git a/www-apache/mod_scgi/files/20_mod_scgi.conf b/www-apache/mod_scgi/files/20_mod_scgi.conf
new file mode 100644
index 000000000000..1b7b5962748d
--- /dev/null
+++ b/www-apache/mod_scgi/files/20_mod_scgi.conf
@@ -0,0 +1,33 @@
+<IfDefine SCGI>
+LoadModule scgi_module modules/mod_scgi.so
+
+# Apache2 example
+#<Location "/dynamic">
+#	SetHandler scgi-handler
+#	SCGIServer localhost:4000
+#	SCGIHandler On
+#	Options -Multiviews
+#</Location>
+#<LocationMatch "^/(dynamic|login)($|/)">
+#	SetHandler scgi-handler
+#	SCGIServer localhost:4000
+#	SCGIHandler On
+#	Options -Multiviews
+#</Location>
+#<Location "/foo">
+#	SCGIServer localhost:4000
+#	SCGIHandler On
+#	Options -Multiviews
+#</Location>
+#<Location "/bar">
+#	SCGIServer localhost:4001
+#	SCGIHandler On
+#	SCGIServerTimeout 10
+#	Options -Multiviews
+#</Location>
+#<Location "/bar/images">
+#	SCGIHander Off
+#</Location>
+</IfDefine>
+
+# vim: ts=4 filetype=apache
diff --git a/www-apache/mod_scgi/files/mod_scgi-1.14-apache-2.4.patch b/www-apache/mod_scgi/files/mod_scgi-1.14-apache-2.4.patch
new file mode 100644
index 000000000000..8c1240b18c31
--- /dev/null
+++ b/www-apache/mod_scgi/files/mod_scgi-1.14-apache-2.4.patch
@@ -0,0 +1,49 @@
+--- a/apache2/mod_scgi.c
++++ b/apache2/mod_scgi.c
+@@ -135,16 +135,16 @@
+     return DECLINED;
+ }
+ 
+-static void log_err(const char *file, int line, request_rec *r,
++static void log_err(const char *file, int line, int index, request_rec *r,
+                     apr_status_t status, const char *msg)
+ {
+-    ap_log_rerror(file, line, APLOG_ERR, status, r, "scgi: %s", msg);
++    ap_log_rerror(file, line, index, APLOG_ERR, status, r, "scgi: %s", msg);
+ }
+ 
+-static void log_debug(const char *file, int line, request_rec *r, const
++static void log_debug(const char *file, int line, int index, request_rec *r, const
+                       char *msg)
+ {
+-    ap_log_rerror(file, line, APLOG_DEBUG, APR_SUCCESS, r, msg);
++    ap_log_rerror(file, line, index, APLOG_DEBUG, APR_SUCCESS, r, "%s", msg);
+ }
+ 
+ static char *http2env(apr_pool_t *p, const char *name)
+@@ -312,7 +312,7 @@
+     int i;
+     apr_status_t rv = 0;
+     apr_port_t  port = 0;
+-    GET_PORT(port, r->connection->remote_addr);
++    GET_PORT(port, r->useragent_addr);
+ 
+     log_debug(APLOG_MARK,r, "sending headers");
+     t = apr_table_make(r->pool, 40);
+@@ -324,14 +324,14 @@
+ 	    buf = "0";
+     add_header(t, "CONTENT_LENGTH",  buf);
+     add_header(t, "SCGI", SCGI_PROTOCOL_VERSION);
+-    add_header(t, "SERVER_SOFTWARE", ap_get_server_version());
++    add_header(t, "SERVER_SOFTWARE", ap_get_server_banner());
+     add_header(t, "SERVER_PROTOCOL", r->protocol);
+     add_header(t, "SERVER_NAME", ap_get_server_name(r));
+     add_header(t, "SERVER_ADMIN", r->server->server_admin);
+     add_header(t, "SERVER_ADDR", r->connection->local_ip);
+     add_header(t, "SERVER_PORT", apr_psprintf(r->pool, "%u",
+                                               ap_get_server_port(r)));
+-    add_header(t, "REMOTE_ADDR", r->connection->remote_ip);
++    add_header(t, "REMOTE_ADDR", r->useragent_ip);
+     add_header(t, "REMOTE_PORT", apr_psprintf(r->pool, "%d", port));
+     add_header(t, "REMOTE_USER", r->user);
+     add_header(t, "REQUEST_METHOD", r->method);
diff --git a/www-apache/mod_scgi/metadata.xml b/www-apache/mod_scgi/metadata.xml
new file mode 100644
index 000000000000..6f49eba8f496
--- /dev/null
+++ b/www-apache/mod_scgi/metadata.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<!-- maintainer-needed -->
+</pkgmetadata>
diff --git a/www-apache/mod_scgi/mod_scgi-1.14-r1.ebuild b/www-apache/mod_scgi/mod_scgi-1.14-r1.ebuild
new file mode 100644
index 000000000000..24560ce5468a
--- /dev/null
+++ b/www-apache/mod_scgi/mod_scgi-1.14-r1.ebuild
@@ -0,0 +1,32 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+inherit apache-module eutils
+
+DESCRIPTION="Apache module for a replacement of the CGI protocol, similar to FastCGI"
+HOMEPAGE="http://python.ca/scgi/ https://pypi.python.org/pypi/scgi"
+SRC_URI="http://python.ca/scgi/releases/scgi-${PV}.tar.gz"
+
+LICENSE="CNRI"
+SLOT="0"
+KEYWORDS="amd64 ~hppa ~ppc x86"
+IUSE=""
+
+DEPEND="~www-apps/scgi-${PV}"
+RDEPEND="${DEPEND}"
+
+S="${WORKDIR}/scgi-${PV}"
+
+APXS2_S="${S}/apache2"
+APACHE2_MOD_FILE="${S}/apache2/.libs/${PN}.so"
+APACHE2_MOD_CONF="20_mod_scgi"
+APACHE2_MOD_DEFINE="SCGI"
+
+DOCFILES="PKG-INFO LICENSE.txt CHANGES.txt apache2/README.txt"
+
+need_apache2_4
+
+src_prepare() {
+	epatch "${FILESDIR}"/${P}-apache-2.4.patch
+}
diff --git a/www-apache/mod_security/Manifest b/www-apache/mod_security/Manifest
new file mode 100644
index 000000000000..8b41eb4cb406
--- /dev/null
+++ b/www-apache/mod_security/Manifest
@@ -0,0 +1,9 @@
+AUX 79_mod_security.conf 729 SHA256 f02fd5ed8b0cc9284f1ffccc0bdb6dca0ccc64d3b671f48b31a9dea9efebc114 SHA512 2b99b28b58795dd45a76046609e7a4a6958ebd28c28c288cb7b732ec99191e218e6dd838a3c288220f267ad8c3b6004d1d6c6addac8df8be4c568a9f2fb54a92 WHIRLPOOL 7b1d5a449b2eb9c614afd5ce3453019e3843e1a0d6b2fe8507a08828a4de9655705cd45369729fd7f6a7b8e3462b8aaff39f9ca327fd5ae824150d5287d3bb32
+AUX modsecurity-2.7.conf 394 SHA256 dba21b2c25146392aa0f2df66ca994d1c82222df26a842879fc3ca6a9096ae60 SHA512 ab8c1ee6372249613f853654f115102c7951ea021f47389510bca6c5d1226e7aa9d90bb47649cf4ca62b8d8f926eba9f5c0b02321851ec2e8452de70dd4c1839 WHIRLPOOL b78ed54075fb9da19bd08dd4993d071285da01b66dda9820882b9bf437c1ff431cf3b68e25d744950316d5e07b1c060f200ab01d48a5d78d7d271ec8c7048634
+DIST modsecurity-2.9.1.tar.gz 4261212 SHA256 958cc5a7a7430f93fac0fd6f8b9aa92fc1801efce0cda797d6029d44080a9b24 SHA512 374733cbfc26e53d95b78c8f268a4e465d838163e9893fc24e33a9d272b114f1b287147bab6d0289575074cbbd94f48983e23fa59832cbcb32950046cea59269 WHIRLPOOL 5f41bebf032f8a269412d104b7632a06af4d4c495658c9cd1ebf69b82c10ce1bbcb34b9dd159a7b00e57348714a5e93ad3db19701dda51479accd3a9dc79a9cb
+DIST modsecurity-apache_2.7.7.tar.gz 1003835 SHA256 11e05cfa6b363c2844c6412a40ff16f0021e302152b38870fd1f2f44b204379b SHA512 859f72580b6acaae5db180f98ee32ad2cb0f3ef24321d0c2df20ddd9fcfbc6c09c98b672012dc4931a6fd14f3c21c38ed31ab8900940382fcb48b37f30005a7d WHIRLPOOL e70f09c6bf640733696e6c544b4e37702ab05b043bdf07266a081316620986e976d2dcf8c1552380e846132473718b3ae7f0cadd18953b08b22bef5de3a5b455
+EBUILD mod_security-2.7.7.ebuild 2400 SHA256 c25a7837fdbe6f9107870c43db1b8f11028aadb05aa13307efbffb1a98c85ca3 SHA512 66bc689874fd34b924ef902c72844e0e66f2faa3afac637e40cd8b8ff4c46a6f7ce3867c5892fd2126827b82cfd5d6694bd14fbb3d0acee1be6fa3784c52ea8b WHIRLPOOL d96f86ab19e8ef7eb04ec3f11ac5ef9a54e02b95242c222f82874fce243f8d595c1447a99f7997b88c27a49bedae2e596865534b6fd07ac6c6f9c7485ba9576b
+EBUILD mod_security-2.9.1-r1.ebuild 2773 SHA256 7f500d92fd19f8e6cb3277101b130ada63c674261c206412a1d439a10f56732c SHA512 55e682098d6c5775cf06de18d98e8548943c50bcecee15c0047ebb50c2896dee3318336fec305843a6be4046ce04bb1cb847e66479ba934b9d17a1edafd7d8a2 WHIRLPOOL a71f8fe65ef2ff9602bc515dbda955e605e73df83450b095ced1c0d388c44ff64f05692f023010c9f59ffe11f7fe2715f9d35216031d3e99edc8790777ea68e5
+MISC ChangeLog 3955 SHA256 f8da95a691b7e62d0f9b22a78a1d2441cd4b5cf6ddb8d2b8b69f97d58290084f SHA512 5e7aff6ed605bac8ddadc33b3fa6e3fcade3c367fe7e39ddbe6cbe65a88a86611b0558e48964a658858bcda8d68f9b1cc6266977e56c5bd854dadcf1bd1fcfe7 WHIRLPOOL f9cfb3292ab3908075e5ef88ba4d637d17aa2ca8aab25e479be286362410f53231610290a0fcd9f4cc6ca9c05d34ee46f98d126acf8fc945434f8d802f79eae1
+MISC ChangeLog-2015 23449 SHA256 d2cfe4edc5e928d7eb0ed7af25a3dfe7cc9beafd7ac6dada7ebc1d94e5889c60 SHA512 270abc3a1d6764943a8474b7f22a360e0e2914b97c7dc6e6b06006b7a38d86e802d33d7d676a242dc1dd5cc8bce6218be62a92e0db7858e047f46eac77b31816 WHIRLPOOL 5f41ed2138e8aa8193bad985f4f6677fe4fd9915d55db109ccd24ffe15ba2868454c103777a220e986344cd1605e9a48570c0cc620fdec6fa81f191badd93f2f
+MISC metadata.xml 982 SHA256 8bd4921e82ed6b5c7b488a0610f58f87939d0f01af9a016fbbd95152df1d6ae5 SHA512 a2a0c01efa1c1bf5193c0d41df0fd03f915bf53ffa51205d32cc76b633d1707a832b0177b0fc09dd88ea7e44b53caa1c03820c2e0934ced2411862674332a293 WHIRLPOOL 5b3f3e52531e31c476add6e8d4a871b80e56f41705ce8d435d2fc5d74a887591d46ad6ccf7bdd30a00bc01e48f90d22a8723ad3eecf8313411bf8f56510662a2
diff --git a/www-apache/mod_security/files/79_mod_security.conf b/www-apache/mod_security/files/79_mod_security.conf
new file mode 100644
index 000000000000..8c7e128571ed
--- /dev/null
+++ b/www-apache/mod_security/files/79_mod_security.conf
@@ -0,0 +1,19 @@
+<IfDefine SECURITY>
+  LoadModule security2_module modules/mod_security2.so
+
+  # These paths are Gentoo-specific, created by the ebuild.
+  SecDataDir /var/lib/modsecurity/data
+  SecTmpDir /var/lib/modsecurity/tmp
+  SecUploadDir /var/lib/modsecurity/upload
+
+  # A copy of upstream's modsecurity.conf-recommended is installed
+  # along with the documentation for mod_security. It contains many
+  # recommended settings that you should evaluate for your system.
+  # The full documentation for the available settings can be found
+  # in the mod_security reference manual, at
+  #
+  #   https://github.com/SpiderLabs/ModSecurity/wiki/Reference-Manual
+  #
+  # and in particular in the "Configuration Directives" setting.
+  #
+</IfDefine>
diff --git a/www-apache/mod_security/files/modsecurity-2.7.conf b/www-apache/mod_security/files/modsecurity-2.7.conf
new file mode 100644
index 000000000000..43508bca635f
--- /dev/null
+++ b/www-apache/mod_security/files/modsecurity-2.7.conf
@@ -0,0 +1,15 @@
+<IfDefine SECURITY>
+LoadModule security2_module modules/mod_security2.so
+
+# Enable looking up geolocation data from MaxMind's GeoIP database
+SecGeoLookupDb /usr/share/GeoIP/GeoIP.dat
+
+SecDataDir /var/cache/modsecurity
+
+# Define here your http:BL API key if any
+# see http://www.projecthoneypot.org/httpbl_api.php
+#SecHttpBlKey xxxxxxxx
+</IfDefine>
+
+# -*- apache -*-
+# vim: ts=4 filetype=apache
diff --git a/www-apache/mod_security/metadata.xml b/www-apache/mod_security/metadata.xml
new file mode 100644
index 000000000000..1a8e39a420e5
--- /dev/null
+++ b/www-apache/mod_security/metadata.xml
@@ -0,0 +1,34 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+  <use>
+    <flag name="fuzzyhash">
+      Support fuzzy hash computations (to detect malware, for example)
+      using the <pkg>app-crypt/ssdeep</pkg> package.
+    </flag>
+
+    <flag name="geoip">
+      Pull in <pkg>dev-libs/geoip</pkg> for use by the SecGeoLookupDb
+      directive.
+    </flag>
+
+    <flag name="jit">
+      Add support for the PCRE Just-in-Time optimisation, as enabled
+      by <pkg>dev-libs/libpcre</pkg> with jit USE flag enabled. Might
+      not be available on hardened systems.
+    </flag>
+
+    <flag name="json">
+      Suppose JSON in the request body parser through
+      <pkg>dev-libs/yajl</pkg>.
+    </flag>
+
+    <flag name="mlogc">
+      Build and install the ModSecurity Audit Log Collector (mlogc).
+    </flag>
+  </use>
+
+  <upstream>
+    <remote-id type="github">SpiderLabs/ModSecurity</remote-id>
+  </upstream>
+</pkgmetadata>
diff --git a/www-apache/mod_security/mod_security-2.7.7.ebuild b/www-apache/mod_security/mod_security-2.7.7.ebuild
new file mode 100644
index 000000000000..80d37c079687
--- /dev/null
+++ b/www-apache/mod_security/mod_security-2.7.7.ebuild
@@ -0,0 +1,96 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=4
+
+inherit apache-module
+
+MY_PN=modsecurity-apache
+MY_PV=${PV/_rc/-rc}
+MY_P=${MY_PN}_${MY_PV}
+
+DESCRIPTION="Web application firewall and Intrusion Detection System for Apache"
+HOMEPAGE="http://www.modsecurity.org/"
+SRC_URI="http://www.modsecurity.org/tarball/${PV}/${MY_P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="amd64 ppc sparc x86"
+IUSE="geoip curl lua jit"
+
+DEPEND=">=dev-libs/libxml2-2.7.8
+	dev-libs/libpcre[jit?]
+	lua? ( >=dev-lang/lua-5.1 )
+	curl? ( >=net-misc/curl-7.15.1 )
+	www-servers/apache[apache2_modules_unique_id]"
+RDEPEND="${DEPEND}
+	geoip? ( dev-libs/geoip )"
+PDEPEND=">=www-apache/modsecurity-crs-2.2.6-r1"
+
+S="${WORKDIR}/${MY_P}"
+
+APACHE2_MOD_FILE="apache2/.libs/${PN}2.so"
+APACHE2_MOD_DEFINE="SECURITY"
+
+# Tests require symbols only defined within the Apache binary.
+RESTRICT=test
+
+need_apache2
+
+src_prepare() {
+	cp "${FILESDIR}"/modsecurity-2.7.conf "${T}"/79_modsecurity.conf || die
+}
+
+src_configure() {
+	econf \
+		--enable-shared --disable-static \
+		--with-apxs="${APXS}" \
+		--enable-request-early \
+		$(use_enable curl mlogc) \
+		$(use_with lua) \
+		$(use_enable jit pcre-jit)
+}
+
+src_compile() {
+	if ! use geoip; then
+		sed -i -e '/SecGeoLookupDb/s:^:#:' \
+			"${T}"/79_modsecurity.conf || die
+	fi
+
+	emake
+}
+
+src_test() {
+	emake check
+}
+
+src_install() {
+	apache-module_src_install
+
+	# install manually rather than by using the APACHE2_MOD_CONF
+	# variable since we have to edit it to set things up properly.
+	insinto "${APACHE_MODULES_CONFDIR}"
+	doins "${T}"/79_modsecurity.conf
+
+	dodoc CHANGES NOTICE README.TXT README_WINDOWS.TXT
+
+	dohtml -r doc/*
+
+	keepdir /var/cache/modsecurity
+	fowners apache:apache /var/cache/modsecurity
+	fperms 0770 /var/cache/modsecurity
+}
+
+pkg_postinst() {
+	if [[ -f "${ROOT}"/etc/apache/modules.d/99_mod_security.conf ]]; then
+		ewarn "You still have the configuration file 99_mod_security.conf."
+		ewarn "Please make sure to remove that and keep only 79_modsecurity.conf."
+		ewarn ""
+	fi
+	elog "The base configuration file has been renamed 79_modsecurity.conf"
+	elog "so that you can put your own configuration as 90_modsecurity_local.conf or"
+	elog "equivalent."
+	elog ""
+	elog "That would be the correct place for site-global security rules."
+	elog "Note: 80_modsecurity_crs.conf is used by www-apache/modsecurity-crs"
+}
diff --git a/www-apache/mod_security/mod_security-2.9.1-r1.ebuild b/www-apache/mod_security/mod_security-2.9.1-r1.ebuild
new file mode 100644
index 000000000000..6dc8bf354d1c
--- /dev/null
+++ b/www-apache/mod_security/mod_security-2.9.1-r1.ebuild
@@ -0,0 +1,108 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+inherit apache-module
+
+MY_PN=modsecurity
+MY_P=${MY_PN}-${PV}
+
+DESCRIPTION="Application firewall and intrusion detection for Apache"
+HOMEPAGE="http://www.modsecurity.org/"
+SRC_URI="http://www.modsecurity.org/tarball/${PV}/${MY_P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="doc fuzzyhash geoip jit json lua mlogc"
+
+COMMON_DEPEND="dev-libs/apr
+	dev-libs/apr-util[openssl]
+	dev-libs/libxml2
+	dev-libs/libpcre[jit?]
+	fuzzyhash? ( app-crypt/ssdeep )
+	json? ( dev-libs/yajl )
+	lua? ( dev-lang/lua:0 )
+	mlogc? ( net-misc/curl )
+	www-servers/apache[apache2_modules_unique_id]"
+DEPEND="${COMMON_DEPEND}
+	doc? ( app-doc/doxygen )"
+RDEPEND="${COMMON_DEPEND}
+	geoip? ( dev-libs/geoip )
+	mlogc? ( dev-lang/perl )"
+PDEPEND=">=www-apache/modsecurity-crs-2.2.6-r1"
+
+S="${WORKDIR}/${MY_P}"
+
+APACHE2_MOD_FILE="apache2/.libs/${PN}2.so"
+APACHE2_MOD_CONF="79_${PN}"
+APACHE2_MOD_DEFINE="SECURITY"
+
+# Tests require symbols only defined within the Apache binary.
+RESTRICT=test
+
+need_apache2
+
+src_configure() {
+	econf --enable-shared \
+		  --disable-static \
+		  --with-apxs="${APXS}" \
+		  --enable-request-early \
+		  --with-pic \
+		  $(use_with fuzzyhash ssdeep) \
+		  $(use_with json yajl) \
+		  $(use_enable mlogc) \
+		  $(use_with lua) \
+		  $(use_enable lua lua-cache) \
+		  $(use_enable jit pcre-jit)
+}
+
+src_compile() {
+	default
+
+	# Building the docs is broken at the moment, see e.g.
+	# https://github.com/SpiderLabs/ModSecurity/issues/1322
+	if use doc; then
+		doxygen doc/doxygen-apache.conf || die 'failed to build documentation'
+	fi
+}
+
+src_install() {
+	apache-module_src_install
+
+	dodoc CHANGES README.TXT modsecurity.conf-recommended
+
+	if use doc; then
+		dodoc -r doc/apache/html
+	fi
+
+	if use mlogc; then
+		insinto /etc/
+		newins mlogc/mlogc-default.conf mlogc.conf
+		dobin mlogc/mlogc
+		dobin mlogc/mlogc-batch-load.pl
+		newdoc mlogc/INSTALL INSTALL-mlogc
+	fi
+
+	# Use /var/lib instead of /var/cache. This stuff is "persistent,"
+	# and isn't a cached copy of something that we can recreate.
+	# Bug 605496.
+	keepdir /var/lib/modsecurity
+	fowners apache:apache /var/lib/modsecurity
+	fperms 0750 /var/lib/modsecurity
+	for dir in data tmp upload; do
+		keepdir "/var/lib/modsecurity/${dir}"
+		fowners apache:apache "/var/lib/modsecurity/${dir}"
+		fperms 0750 "/var/lib/modsecurity/${dir}"
+	done
+}
+
+pkg_postinst() {
+	elog "The base configuration file has been renamed ${APACHE2_MOD_CONF}"
+	elog "so that you can put your own configuration in (for example)"
+	elog "90_modsecurity_local.conf."
+	elog ""
+	elog "That would be the correct place for site-global security rules."
+	elog "Note: 80_modsecurity_crs.conf is used by www-apache/modsecurity-crs"
+}
diff --git a/www-apache/mod_tidy/Manifest b/www-apache/mod_tidy/Manifest
new file mode 100644
index 000000000000..1c168960497e
--- /dev/null
+++ b/www-apache/mod_tidy/Manifest
@@ -0,0 +1,6 @@
+AUX 55_mod_tidy.conf 100 SHA256 5fe2c82d6ef68deb7b769b9645c594b61871f15d968dd8fd4745dd4207444fea SHA512 95a8fa23cb014ff3210e957b6bfa8316d94207b45378da590dc0cda396b57bed878b725f745e555fccc7a6664cf79b76f286a7f68112a1d0ff3c5561e1ac5db7 WHIRLPOOL 6329fbb05b93402d68ea9a44c122a0d7e79a93b829e6e0c8668b5c728fe44336c7fd194f83ba27f1c0b7bc8ad7c4af2897d68400b480fcc0c14a794430674ad0
+DIST mod_tidy-0.5.5.tar.gz 312340 SHA256 3c8d3ca0ac67974efc82040bde224068e9b3024e1a2521664716aa2618310392 SHA512 2e17292f457077fb6ac1f29c5a51050310dab8dddddf640c07b54e9e7d6a85544f437cdc3143950f625d68c8c076badc3512089ae0539351e1cdf51ba95ccc5c WHIRLPOOL 09cbabc5b77bc83f0492a6497fd19174b411d1fce57e5793d3c88f9ce0c8e15ad00665eeba6e8014bc83c644770f74cd03b7c2a663dbac5536f3d546dd409838
+EBUILD mod_tidy-0.5.5-r1.ebuild 662 SHA256 dbfae774b1003e531ecc29d7adf3788eb4a19310357f42e4c4c0a835e899f3fb SHA512 dc9fa80d0141169fbe37b5382fb0918ad580d9a92ad1ee116607b53b830eb23b41fd83dd9bf6e19c3716e4db35d751e255669491f27cb824938010cc12acf1dc WHIRLPOOL e7e8e605cce1b943dad802814b71e0b10fcd110dff9a66dec694ea052e9776ec37c7b9754daec83b86d011e366c0cafda9dd5e06f63063e5a0501b8b3e28929e
+MISC ChangeLog 3104 SHA256 3a7d83016d60fb0a1cb562673bc3a976d377e52a01ebb4308b7f2b2e0a4d6303 SHA512 701e6e327cdb8fd87d9eb98b76784d0d13dba5e8e15728cde9f8e5a7bd8aa360a9446478ff845e22a37abf4d5af9af430c0693512d7991fa8fa2d53e76a522cf WHIRLPOOL fefbc059728e1beffee549c6ccf48d9b989ab3515543f9acb2510d8adf91a3fbbdf94ee28e85ab8575b1e6d95b5f4d4ac4f0f9e1ccf228c553c8cd6187d7b47b
+MISC ChangeLog-2015 977 SHA256 f29d5fa025e146f11aa833256967771b4ff564744ef90f30ab7324173eb63228 SHA512 913ffcb095322cbdab516154bc892a1a12f4d98d998a6bd28b0651431975cb553265f7ad446f79603c42f54789133686ad7317cec54a8c47ebb083eac790ac09 WHIRLPOOL 82e7712b4249f1893c4022bb5ec381cd6deb1c362af68775681a064748cd2ccaab04815d47d10e16456f7e280108d7170a022e273401464ad2bbd24f0857930c
+MISC metadata.xml 245 SHA256 efa88c000c733dc109b39330f79f25c02798606cf2f99a0b3eb368db54d0d55a SHA512 a4e866edc66ea5d12194fe7f4e05e3fea37e6bf42fcb994d905362633638c87638327c36d8595255ca9e7d8e0a041b5ec09562aeeb39143f0982a9e90a79ecbb WHIRLPOOL 71665e83d94021408667316591efd52586b55d9155520a31ecc53a71752f436b9b8dc42fd865d45b17e7a2e228abb9deb65e930d41959e673c074e37565ee9f2
diff --git a/www-apache/mod_tidy/files/55_mod_tidy.conf b/www-apache/mod_tidy/files/55_mod_tidy.conf
new file mode 100644
index 000000000000..70984f71bd85
--- /dev/null
+++ b/www-apache/mod_tidy/files/55_mod_tidy.conf
@@ -0,0 +1,5 @@
+<IfDefine TIDY>
+LoadModule tidy_module modules/mod_tidy.so
+</IfDefine>
+
+# vim: ts=4 filetype=apache
diff --git a/www-apache/mod_tidy/metadata.xml b/www-apache/mod_tidy/metadata.xml
new file mode 100644
index 000000000000..790f04db721e
--- /dev/null
+++ b/www-apache/mod_tidy/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<!-- maintainer-needed -->
+	<upstream>
+		<remote-id type="sourceforge">mod-tidy</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/www-apache/mod_tidy/mod_tidy-0.5.5-r1.ebuild b/www-apache/mod_tidy/mod_tidy-0.5.5-r1.ebuild
new file mode 100644
index 000000000000..6a12889446d3
--- /dev/null
+++ b/www-apache/mod_tidy/mod_tidy-0.5.5-r1.ebuild
@@ -0,0 +1,37 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="2"
+
+inherit apache-module
+
+DESCRIPTION="TidyLib module to clean-up and pretty-print the webserver (X)HTML output"
+SRC_URI="http://mod-tidy.sourceforge.net/src/${P}.tar.gz"
+HOMEPAGE="http://mod-tidy.sourceforge.net/"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+APACHE2_MOD_CONF="55_${PN}"
+APACHE2_MOD_DEFINE="TIDY"
+
+DEPEND="app-text/htmltidy"
+RDEPEND="${DEPEND}"
+
+need_apache2
+
+DOCFILES="Changes INSTALL LICENSE README"
+
+src_prepare() {
+	rm -rf tidy/
+}
+
+src_configure() {
+	:
+}
+
+src_compile() {
+	${APXS} -c src/mod_tidy.c -ltidy
+}
diff --git a/www-apache/mod_umask/Manifest b/www-apache/mod_umask/Manifest
new file mode 100644
index 000000000000..e1680a3ca07e
--- /dev/null
+++ b/www-apache/mod_umask/Manifest
@@ -0,0 +1,6 @@
+AUX 47_mod_umask.conf 392 SHA256 48ea27b837e723eed02b3e6ec2afe4972253fc35c8cbfd0092978a81554d8019 SHA512 87141318828b1cd555f91c978f7b48f4196c38a8d1efe190a8d360d5253fa5b7e6a6acca38431897085124c0f4ad288affe3d3078cd434ea81eec3903f68496f WHIRLPOOL b9480a9cadf2c804b2728ed637844e59ea5bdc9750d0d8b3496e537fd05533f4a42641ccb273e03e3072bf721adc749df92b14d050b71fa452bfb19d82847b69
+DIST mod_umask-0.1.0.tar.bz2 182078 SHA256 2be142d562260c895de94600a56b13d8346174b5e2f8a4974adcef23249ec790 SHA512 804f4f28f3145d0290a5dada93a6d3822cb432456fdf35b2d4b5ca19b0d795d7060eff5b9ef97ca8c99581d6f5cdced06dacae532a803b0133f13298577473c3 WHIRLPOOL 3b931efb06a29df31ab14df6a6c9afeb79a2ad99c25f4740dd67a215946794938c50bd126a99d482136eb8dd48971e31a9c124df5a3b6b9c443444ff2918fc00
+EBUILD mod_umask-0.1.0.ebuild 496 SHA256 7e2341cd895282b917bab1223f3042c2b54faf30746a858b03a7c458b62e55e4 SHA512 2465f0fbc921c3e5562b994078e3625960353eabcc883464715359600287b1a40ccd86b69b69c67e45731c17c0c4e2a74f2bcba70a7bfcac67c9d93a9f7b749e WHIRLPOOL e3cf3bf6518136eda4e17825c5a3096e10a128edb4da817e0e3fe7cf4bbab855fba21c649b9a9aa0ac02dc994a8081c5f5b524ab5dcd85ee78c8a5134386fe76
+MISC ChangeLog 2556 SHA256 f16318f350fcc380dcea7e394662f468fe2cacb07be48a2caf64ca7779e867c8 SHA512 5337218ca8a4d1ec54b872578522c6ec5cfd9812188f0c541d575336e7355861e4d9aedc45d48975cacdc711e26fb9efeebb14e7c8272f8b8ef2ce744f5f3ddb WHIRLPOOL b37e0c986b58bb1cd1409a6642d1500e39fc238f37f70c0cdad33d4e429a11f588b45aa8a7dc95d0d6cf59c352649be63361d9f15d493201f8fd4759677d855b
+MISC ChangeLog-2015 1285 SHA256 a622c00d51df58bafbf91811df8050a4267492f10a5d7efec2abc5b5a160ceac SHA512 b32504381771b12ddb7898637d22b2f6ea527079bcb05e0250e88b2ad7eef0be22cdfcdb32e9c538e14c2c29c3326d4d97fa84b55c02474d2fd9d1ca9f8569e1 WHIRLPOOL 4e6944c2e6af99d2e2faeb93d59c0a7e8c0f4b31a1065c42d22ed4c16f8777107e29d724dcf85fef81423a595c4d26a84c14278d9998b4b6c9bc8705dfaa57f0
+MISC metadata.xml 166 SHA256 2caff447f5bd2701d8456ada5cc633c41ef4373fa4bfeabeb73599d40bcc941b SHA512 a56648c974a1d14dd4c18237532773c72057a13ab90c58b5da04f185e3c12a8bd8d5c21fb06053507f31766291a82dc7d87b34cd65fd94cfe2af7295c813ef84 WHIRLPOOL 1ff70497eca6531f0e0614c72a19f4b8e5ff486a58d369f4f0b36308d1d6b01168f9da887740e3b9f536236be251d3fe05f904d27a9233a7cf613416ba882968
diff --git a/www-apache/mod_umask/files/47_mod_umask.conf b/www-apache/mod_umask/files/47_mod_umask.conf
new file mode 100644
index 000000000000..aaa61d12aa9e
--- /dev/null
+++ b/www-apache/mod_umask/files/47_mod_umask.conf
@@ -0,0 +1,15 @@
+# PLEASE NOTE: consider this as an example configuration;
+# So, a more useful place would be, to use UMask directive
+# inside a subversion module driven virtual host, e.g.
+
+<IfDefine UMASK>
+LoadModule umask_module modules/mod_umask.so
+
+# This is default:
+# UMask 0022
+
+# This is usefull for group-write-access, such as used in subversion
+# UMask 0002
+</IfDefine>
+
+# vim: ts=4 filetype=apache
diff --git a/www-apache/mod_umask/metadata.xml b/www-apache/mod_umask/metadata.xml
new file mode 100644
index 000000000000..6f49eba8f496
--- /dev/null
+++ b/www-apache/mod_umask/metadata.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<!-- maintainer-needed -->
+</pkgmetadata>
diff --git a/www-apache/mod_umask/mod_umask-0.1.0.ebuild b/www-apache/mod_umask/mod_umask-0.1.0.ebuild
new file mode 100644
index 000000000000..12fda05f0383
--- /dev/null
+++ b/www-apache/mod_umask/mod_umask-0.1.0.ebuild
@@ -0,0 +1,21 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+inherit apache-module
+
+KEYWORDS="amd64 x86"
+
+DESCRIPTION="Sets the Unix umask of the Apache2 webserver process after it has started"
+HOMEPAGE="http://www.outoforder.cc/projects/apache/mod_umask/"
+SRC_URI="http://www.apache.org/~pquerna/modules/${P}.tar.bz2"
+LICENSE="Apache-2.0"
+SLOT="0"
+IUSE=""
+
+DEPEND=""
+RDEPEND=""
+
+APACHE2_MOD_CONF="47_${PN}"
+APACHE2_MOD_DEFINE="UMASK"
+
+need_apache2
diff --git a/www-apache/mod_vdbh/Manifest b/www-apache/mod_vdbh/Manifest
new file mode 100644
index 000000000000..5378ece2171c
--- /dev/null
+++ b/www-apache/mod_vdbh/Manifest
@@ -0,0 +1,6 @@
+AUX 21_mod_vdbh.conf 489 SHA256 c7f82d31bdc09f3b2777c5ace1807eeb72953517015da0b6504676d0d53ef230 SHA512 db6fe3fc7e76e5db30529f458ff326681151cd116ff3cb2bda036c6117765103a79cd6b66af46038ee8e22e83ff58524e74bbf1f25723595006159e057064f1b WHIRLPOOL 78721a47a542a1863d123070f75fb6e959eea7fb3f0064e2fbdca1c2bc029d537454524725c25f1d5e793ec9ecbecef37e14141ec5e4bbe1e199a1ad9baa70ff
+DIST mod_vdbh-1.0.3.tar.gz 8053 SHA256 ff034dc4a77d82085dad1b867af8d913034c476d7cc2bf3472e6ae38cef40225 SHA512 32039fca98bd106571db2f456c60a8420a67846125e3a042ba7e770817d62c224c834aed79d9cdd538116c46bdb9b7bc90be0b6832ecc8712572bc95280805cf WHIRLPOOL 4935c784ef006439f833b57758b932cb2ce3464f347608a9df751d512cb1f6fdb94c044d1e45e1e418691bd970d3a065038c819ee26371b14365bbc4a5687b7a
+EBUILD mod_vdbh-1.0.3-r1.ebuild 649 SHA256 dab181781a152e3c1c20a42ab8e62c0c7c49dd29663134b4c00d0a323486ee53 SHA512 2ab048e8b1622dfa53f9535e755f7e534d89a56aa79d66adb4a89961f1b0f872c6e1a48ca6801444a8f9406c67e2a1cc4bda9ce57c8be52ea77ea10222b25cc9 WHIRLPOOL 2f8922190f00c78926eea722e637ae7fda47996b98c15aebeb1863ac2e47984fd092314edbf15e24420aad7c2177fb41de84b6fa02abfc89dec87e5c5940682b
+MISC ChangeLog 2558 SHA256 a2de5f837e97f393eff528cdeba6a043d7c95857ba6d86add28145767e04aa72 SHA512 ff1877eb0babe9f835786292a7bbd3e4a2682cecf1847165c6eae5e9c4bc5df99ff80f29730e14c996c9eba505fb1087f1fdb85049c21b70bb0cef71c59b8dea WHIRLPOOL c839d391e60515643cad0e1d718e6a3db2e505a3817b06637797564b23886f566214324edee3f790c725115050366b7b87064d5c22ebfc331a82ae4e168f1d93
+MISC ChangeLog-2015 2731 SHA256 b73901f18d75a3b8392434abf243ea4b7ba6655730066057b4f3570f9e4b8087 SHA512 1debac644668b0e17ea71957c572d07c06f441f9a3c53db8f7ee21fcbaf2f3a8424705f7833c3ae2dfe66e3320df74750176286fcd1b4e3895d7ad63c689afa8 WHIRLPOOL e0d7ebb360ecbea25b3345949b1005d2fda8d78027124bc3d5400258cb150d70ec54ad3cf0bef9edbd8d95381faf9f6e65afb33057f642641aab0a81b6ddcdd6
+MISC metadata.xml 166 SHA256 2caff447f5bd2701d8456ada5cc633c41ef4373fa4bfeabeb73599d40bcc941b SHA512 a56648c974a1d14dd4c18237532773c72057a13ab90c58b5da04f185e3c12a8bd8d5c21fb06053507f31766291a82dc7d87b34cd65fd94cfe2af7295c813ef84 WHIRLPOOL 1ff70497eca6531f0e0614c72a19f4b8e5ff486a58d369f4f0b36308d1d6b01168f9da887740e3b9f536236be251d3fe05f904d27a9233a7cf613416ba882968
diff --git a/www-apache/mod_vdbh/files/21_mod_vdbh.conf b/www-apache/mod_vdbh/files/21_mod_vdbh.conf
new file mode 100644
index 000000000000..337e07bbecdb
--- /dev/null
+++ b/www-apache/mod_vdbh/files/21_mod_vdbh.conf
@@ -0,0 +1,18 @@
+<IfDefine VDBH>
+LoadModule vdbh_module modules/mod_vdbh.so
+
+#NameVirtualHost 206.9.161.29
+#<VirtualHost 206.9.161.29>
+#    vdbh On
+#    vdbh_CLIENT_COMPRESS On
+#    vdbh_MySQL_Database virtual_hosts
+#    vdbh_MySQL_Table virtual_hosts
+#    vdbh_MySQL_Host_Field server
+#    vdbh_MySQL_Path_Field path
+#    vdbh_MySQL_Environment_Field environment_variable
+#    vdbh_Default_Host julia.fractal.net
+#    vdbh_Declines .htpasswd *.txt
+#</VirtualHost>
+</IfDefine>
+
+# vim: ts=4 filetype=apache
diff --git a/www-apache/mod_vdbh/metadata.xml b/www-apache/mod_vdbh/metadata.xml
new file mode 100644
index 000000000000..6f49eba8f496
--- /dev/null
+++ b/www-apache/mod_vdbh/metadata.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<!-- maintainer-needed -->
+</pkgmetadata>
diff --git a/www-apache/mod_vdbh/mod_vdbh-1.0.3-r1.ebuild b/www-apache/mod_vdbh/mod_vdbh-1.0.3-r1.ebuild
new file mode 100644
index 000000000000..1493c9b76dae
--- /dev/null
+++ b/www-apache/mod_vdbh/mod_vdbh-1.0.3-r1.ebuild
@@ -0,0 +1,28 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+inherit apache-module
+
+KEYWORDS="ppc x86"
+
+DESCRIPTION="An Apache2 module for mass virtual hosting using a MySQL database"
+HOMEPAGE="http://www.synthemesc.com/mod_vdbh/"
+SRC_URI="http://www.synthemesc.com/downloads/${PN}/${P}.tar.gz"
+LICENSE="Apache-1.1"
+SLOT="0"
+IUSE=""
+
+S="${WORKDIR}/${PN}"
+
+DEPEND="virtual/mysql
+		>=sys-libs/zlib-1.1.4"
+RDEPEND="${DEPEND}"
+
+APXS2_ARGS="-DHAVE_STDDEF_H -I/usr/include/mysql -Wl,-lmysqlclient -c ${PN}.c"
+
+APACHE2_MOD_CONF="21_mod_vdbh"
+APACHE2_MOD_DEFINE="VDBH"
+
+DOCFILES="AUTHORS README"
+
+need_apache2
diff --git a/www-apache/mod_vhost_ldap/Manifest b/www-apache/mod_vhost_ldap/Manifest
new file mode 100644
index 000000000000..b859c89c6792
--- /dev/null
+++ b/www-apache/mod_vhost_ldap/Manifest
@@ -0,0 +1,6 @@
+AUX 99_mod_vhost_ldap.conf 274 SHA256 78d719363e3be8f17e83ef3af56fc5fb58e25a13d28e60c78ccddbcfee66fd46 SHA512 597fe675c63118477d8883cc53a7c21c287c0a6446392b2b96243256ebc0a9e30f758b0af5254d0be10cce91aea04bfe030cd6d8793121bebee2c445964e9885 WHIRLPOOL 94fb37d39e818296e26b1ed034cfdc52d1ec79b247ad6d8aa673bb65649dab1ccfcec3db379d273bf0c12d65a8d3e05e240bfa58d988989a8918e44237518f2d
+DIST mod_vhost_ldap-2.4.0.tar.xz 9628 SHA256 5f4394bb3b6ad8c1e380ef5a7ee3a45e8310d83beea98f228ca022f196e039d3 SHA512 b9715881ca704207fd852dfa2370dd71993bc85f390b353201aaf40c4252978e720abeda8b29b6c676f3cac66e50b67989825d7a6d3992829fbbfed725c75330 WHIRLPOOL 05dc93d086fbc90e95903dda3ec9b81ec2255667455cd09cf6fb96b3bb4e6e55a6da97f290b73f298242338e91dc378347dfea0b9e9d8d5ba493f90c2c0d2bf5
+EBUILD mod_vhost_ldap-2.4.0-r1.ebuild 1140 SHA256 04e577da25f1d0fc1a8baffb1edd776157af2332ff236710c32f2c2aa4d39d17 SHA512 eb9e749e8de39fe1d839f894857c9ec5ddef4e30e9e938778e01f8c3c906775b75e2ba813d87194000380634684d9831d02ec811e2521be7a870df797b255c63 WHIRLPOOL bd071c12efd43d5682f76b8b86af0c2903854964b6744f2a24bcc40c779bcf926fb7ae2052148e15502995f3f1bddf8da8c5d45406dfb45527964cff8c736c6c
+MISC ChangeLog 2858 SHA256 4c3dcc692eba4173c179aef18a961947311e56c2b932070e8dfc939d769ec42f SHA512 15169375df3195994b6638ed9aca2949df7f94d208a248a828ada3934bb2f811c2e01c90da465985c29b07108e0fde0e1a361cff3b8ecc3f739e7d96a8e54ff3 WHIRLPOOL f2ff843cc813b18470304a3a3b2dd2132947f8c52f66ce57df4458057f56a2aba2ddd01ab2ede0825c7068b21208dc2b93fb46edb282a169aa5f08afd8810e21
+MISC ChangeLog-2015 2249 SHA256 54f52b4c848cfb7458588f73cc80c5f2febc2a1ce566ee28a06f4b1eed9842f8 SHA512 c87ceee59a429bcf43a83a1c39eb047e39d015f16041f08dd3ac4845a04216743a53dc26eb86ad7c51296afb87465f313a2724898bf1187a442bcb916cbf09d6 WHIRLPOOL 729108282a6ee68bacdd23f0e0d13b5c51ade176b8d528388db96b29dd60ac50377f5eed074c00469d25c9472976fb7c3a330c136813c0eae2de1bdc3c11ec9e
+MISC metadata.xml 166 SHA256 2caff447f5bd2701d8456ada5cc633c41ef4373fa4bfeabeb73599d40bcc941b SHA512 a56648c974a1d14dd4c18237532773c72057a13ab90c58b5da04f185e3c12a8bd8d5c21fb06053507f31766291a82dc7d87b34cd65fd94cfe2af7295c813ef84 WHIRLPOOL 1ff70497eca6531f0e0614c72a19f4b8e5ff486a58d369f4f0b36308d1d6b01168f9da887740e3b9f536236be251d3fe05f904d27a9233a7cf613416ba882968
diff --git a/www-apache/mod_vhost_ldap/files/99_mod_vhost_ldap.conf b/www-apache/mod_vhost_ldap/files/99_mod_vhost_ldap.conf
new file mode 100644
index 000000000000..dd563150dcbc
--- /dev/null
+++ b/www-apache/mod_vhost_ldap/files/99_mod_vhost_ldap.conf
@@ -0,0 +1,10 @@
+<IfDefine VHOST_LDAP>
+LoadModule vhost_ldap_module modules/mod_vhost_ldap.so
+
+VhostLDAPEnabled on
+VhostLDAPUrl "ldap://127.0.0.1/ou=vhosts,ou=web,dc=localhost"
+VhostLdapBindDN "cn=admin,dc=localhost"
+VhostLDAPBindPassword "changeme"
+</IfDefine>
+
+# vim: ts=4 filetype=apache
diff --git a/www-apache/mod_vhost_ldap/metadata.xml b/www-apache/mod_vhost_ldap/metadata.xml
new file mode 100644
index 000000000000..6f49eba8f496
--- /dev/null
+++ b/www-apache/mod_vhost_ldap/metadata.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<!-- maintainer-needed -->
+</pkgmetadata>
diff --git a/www-apache/mod_vhost_ldap/mod_vhost_ldap-2.4.0-r1.ebuild b/www-apache/mod_vhost_ldap/mod_vhost_ldap-2.4.0-r1.ebuild
new file mode 100644
index 000000000000..ee9241f2d64a
--- /dev/null
+++ b/www-apache/mod_vhost_ldap/mod_vhost_ldap-2.4.0-r1.ebuild
@@ -0,0 +1,48 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+inherit apache-module
+
+DESCRIPTION="Store and configure Apache virtual hosts using LDAP"
+HOMEPAGE="http://modvhostldap.alioth.debian.org/"
+SRC_URI="https://dev.gentoo.org/~mjo/distfiles/${P}.tar.xz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+APACHE2_MOD_CONF="99_${PN}"
+APACHE2_MOD_DEFINE="VHOST_LDAP LDAP"
+
+DOCFILES="AUTHORS ChangeLog README"
+
+# We need apr-util[ldap] and apache to build, but the ldap module for
+# apache is only needed when we try to run the thing.
+DEPEND="dev-libs/apr-util[ldap]"
+RDEPEND="=www-servers/apache-2.4*[ldap]"
+
+need_apache2_4
+
+src_prepare() {
+	default
+
+	sed -i "s/MOD_VHOST_LDAP_VERSION/\"${PV}\"/g" "${PN}.c" || \
+		die "failed to sed version string"
+}
+
+src_install() {
+	apache-module_src_install
+	insinto /etc/openldap/schema
+	doins mod_vhost_ldap.schema
+}
+
+pkg_postinst() {
+	apache-module_pkg_postinst
+	einfo
+	einfo "Your LDAP server needs to include mod_vhost_ldap.schema and should"
+	einfo "also maintain indices on apacheServerName and apacheServerAlias."
+	einfo
+}
diff --git a/www-apache/mod_whatkilledus/Manifest b/www-apache/mod_whatkilledus/Manifest
new file mode 100644
index 000000000000..2d2aa0b4e29f
--- /dev/null
+++ b/www-apache/mod_whatkilledus/Manifest
@@ -0,0 +1,6 @@
+AUX 10_mod_whatkilledus.conf 169 SHA256 41ce586e0ffda1d02b0b7a57fd7de0c351d5cece85dd2541715bd7feb4a3d412 SHA512 2ee25a68b4a188060cf361591c9946bc36d75aefb43b6e91b42727fe1eace658bbb877c1c181d5e9677aea289154a84135cfdb7c3d501d9dd0f967c160b3bfa4 WHIRLPOOL cc0d476f34f954b92f98621c9c6fd3f0c6edbe6facf652c99e86313bf1e7725f0ef7f03f15974dcabdbe753dc5e21a11970dbc9b3bb19854fea6a1aeb1b1b112
+DIST wku_bt-2.01.zip 933169 SHA256 3033a07b284a67e519e3b2d09a255b9cd8ce5902d3d9971d4cf182dec75c7d27 SHA512 c1bde8a26b395fc5fc66cd83c9282a8c519f34d27bef628ec502cec4245a7d446300178c9c94a5c5c0eb817bb8dd146587607760f9c9e780986d6ec53f03fb4c WHIRLPOOL dc2fa4debac883909f084562ffa0d9ab9e7f60a76bd02ee0054a0258444165f6fa63490bfefeaa03fe476ca9abc1ba93e2ad60858ba3ee4611b227b48e49bf1f
+EBUILD mod_whatkilledus-2.01.ebuild 701 SHA256 8b2ad82eb0dfd9b84f4b15a56c8d294c365d8b0a41ecac0c33389b717097b7aa SHA512 2dbce07854740344cddc9ee03b8cb2a75c8db0c4a03114a2d4f54c86fad2e95235338eb1f07c39361d228876cc4c86c0454f68f73217cc06cd91aa1f8cf8fcea WHIRLPOOL af889d20f83524553f028833d7e73d432a1b35e3698adc3b9a0d63f7353a30ac734ab24ab57a5aae7c620ded895628e52e5f5afa4b4b677751890728bc92ccc3
+MISC ChangeLog 2608 SHA256 a90b682f758afa9104c4d71b7f3450d54c106e5361298a6de82894a8d8f20f79 SHA512 4a48e9a4c5629d0841a7e5449f82739df92b0e174d1faa4e0eace07238271e0063aaca8796380ad2640ce209d2be376a9d6864b85f0dcc5a0e58a8921d7cda3c WHIRLPOOL eafade92fc78d4b9965049f0a4751bae7790d0ba911f9a16d040bc0287374b4b06d3b369b5a78a47f412e82706881671a017a4bc629f124af4fb363838d3aacd
+MISC ChangeLog-2015 1431 SHA256 6ff152844cdcc9f19263828a9b3da323025208591fcf1a22727b57fc69dd851c SHA512 330955eab8b364e2cbfd8a090a34fa6d0c7306f3e80cf32259275108c52dca56d53cfa45eb74cc22a39fe02937c52fd4f2c89076c253c50e6ed17dee34c89cbe WHIRLPOOL 06bc243093a2b36d4650763f66bd34c862345b301dc4abad21d094c08c1d173ea6f87e6a11281756c44384102b2a4b96e06bc2374ec57416ca2165723f958093
+MISC metadata.xml 166 SHA256 2caff447f5bd2701d8456ada5cc633c41ef4373fa4bfeabeb73599d40bcc941b SHA512 a56648c974a1d14dd4c18237532773c72057a13ab90c58b5da04f185e3c12a8bd8d5c21fb06053507f31766291a82dc7d87b34cd65fd94cfe2af7295c813ef84 WHIRLPOOL 1ff70497eca6531f0e0614c72a19f4b8e5ff486a58d369f4f0b36308d1d6b01168f9da887740e3b9f536236be251d3fe05f904d27a9233a7cf613416ba882968
diff --git a/www-apache/mod_whatkilledus/files/10_mod_whatkilledus.conf b/www-apache/mod_whatkilledus/files/10_mod_whatkilledus.conf
new file mode 100644
index 000000000000..4d99d8af4523
--- /dev/null
+++ b/www-apache/mod_whatkilledus/files/10_mod_whatkilledus.conf
@@ -0,0 +1,5 @@
+<IfDefine WHATKILLEDUS>
+  LoadModule whatkilledus_module modules/mod_whatkilledus.so
+  EnableExceptionHook On
+  WKULogfile /var/log/apache2/whatkilledus.log
+</IfDefine>
diff --git a/www-apache/mod_whatkilledus/metadata.xml b/www-apache/mod_whatkilledus/metadata.xml
new file mode 100644
index 000000000000..6f49eba8f496
--- /dev/null
+++ b/www-apache/mod_whatkilledus/metadata.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<!-- maintainer-needed -->
+</pkgmetadata>
diff --git a/www-apache/mod_whatkilledus/mod_whatkilledus-2.01.ebuild b/www-apache/mod_whatkilledus/mod_whatkilledus-2.01.ebuild
new file mode 100644
index 000000000000..29a55422dc59
--- /dev/null
+++ b/www-apache/mod_whatkilledus/mod_whatkilledus-2.01.ebuild
@@ -0,0 +1,32 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+inherit apache-module depend.apache
+
+DESCRIPTION="Debug segmentation faults in Apache threads"
+HOMEPAGE="https://emptyhammock.com/projects/httpd/diag/"
+SRC_URI="https://emptyhammock.com/downloads/wku_bt-${PV}.zip"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+RDEPEND=">=www-apache/mod_backtrace-2.01
+	=www-servers/apache-2*[debug]"
+DEPEND="${RDEPEND}
+	app-arch/unzip"
+
+APACHE2_MOD_CONF="10_${PN}"
+APACHE2_MOD_DEFINE="BACKTRACE WHATKILLEDUS"
+
+need_apache2
+
+S="${WORKDIR}/wku_bt-${PV}"
+
+src_compile() {
+	APXS2_ARGS="-c ${PN}.c diag.c -ldl"
+	apache-module_src_compile
+}
diff --git a/www-apache/mod_wsgi/Manifest b/www-apache/mod_wsgi/Manifest
new file mode 100644
index 000000000000..439597ea320f
--- /dev/null
+++ b/www-apache/mod_wsgi/Manifest
@@ -0,0 +1,14 @@
+AUX 70_mod_wsgi.conf 100 SHA256 a4c1b49eb8c6d6609ad8ae8a9f8d6621f9f2bbc2c99addef3e2d6404ac364ed7 SHA512 6e0310d3f5dd8da4653c8502ad297ffe73c04e04c5fdd87721c407e839ba81ba4060394bcd1f06ef26d2d98cf007b585a382eb5f566345817999cd237adfa833 WHIRLPOOL 762b666fb53ea05456b6240a4b2d47a6b7249dac49c513fe746e214ddac7ec97ec5b84e975975c38bf529073aa79d6543c284eb79d5c845acb655fb1b0401330
+DIST mod_wsgi-4.4.21.tar.gz 541367 SHA256 69e0b83e6735d04e4b0b75472d178eaf3b935f4f83788f138a2610b67b635187 SHA512 b77523839e6d57b4d6920d8093d2f042c8de1fc965c64dfef425a1c909f7d08e6cce8e2c30cfc7b9956127bfc57233583ecf51a0cbd2c56c540e67c2e408480c WHIRLPOOL e19f5cae4608f8d481d9bb607fa667b0d8686f5f21275265a9ec0a48f16f9624e81ba0c59dc4b420c1afd9848c46a907c926bccbfeba30cb3967689e0922a6c6
+DIST mod_wsgi-4.5.11.tar.gz 676696 SHA256 10df952206fe33e28a2fc2450be328ed5842af9c4e8915aac7fa3c4de851662f SHA512 b3a3856620c7aa9f21f78be1e16f933acb17d2804660a21b9a2752ff3846e11aeb18c265918a10d33b902cf23d924a39f526157f2b57483881c087d68a777bca WHIRLPOOL da29639d19cf47e63967caabe5daaaa76c56f305686b1f35ec84f8fa254521d9de9ed73dda6bfdf321cb3ea21ef4a2f91ab86cb292b9e6fc6838a776a3b0cb43
+DIST mod_wsgi-4.5.13.tar.gz 679121 SHA256 6ff605a9cfcbb0fa18fe371ac6b78db0271d774f37c46c30209d001fd30ad5ce SHA512 94bf6ae0d76ece67682a8ca3b7f202bb08a1f3e09e42c33f52b561a57ac8265ca2f5431f839bfe731eb014f279b0d865fd007f14a4839c934d372390d24a44a2 WHIRLPOOL e7753755a696d888494d7a57ed9d0c2ff1ab79f848915cde3699043561d37e1e77552eaa60f177d40758fb61b06a5cbfb1a9b0acfafd50321670258d1229931c
+DIST mod_wsgi-4.5.17.tar.gz 680160 SHA256 a7a3268d657cb689081edffaffca510a672c6110afe83b42d88c3364176c763c SHA512 d40fb48b654bd49d36c4a249527c9190eb7aea2bd138c035ae304a48cb6e223aa34831a2eeec8aade9ac3bafe2493f35a2359caca1e8ec9dd6aff013693de973 WHIRLPOOL c0ef37e2377c179ea57574e99a694d3b6c2aa490ffb9ac706bf85df19c3f6daa96fbd8df80ac6cdff29945554025808ededd9ae6eb6c38fdd0ac72783d2d6ad9
+DIST mod_wsgi-4.5.7.tar.gz 666846 SHA256 8d84a7bc6983c776ca50ba8183b450cc6f75fd8cca8ae0bc9a582073f8e4eeec SHA512 99771eb21db8273bac399e9aae8c91598b1b2523259f04456d8f32466113ce044aad1162259afb8c872285e47f217ac7b8d3b38659720a6bb7772106d7b6d33c WHIRLPOOL 34ed4661709f7df3d5859cc17621b1aa2e1863afcb20ab6eb1514cf196f4bc0432e537c9cc7f1ba62c55f74595ad3599dd1d619c3e12a662690f512b5cd92062
+EBUILD mod_wsgi-4.4.21.ebuild 820 SHA256 488662eb934347fefebc4316f4ebf00b31ff7a354cfbcf888c6300cc026c8ac3 SHA512 bb1cd998f6452d1d76b8f4f2cee25e3dcc9238674dc75f65625589a7a077dba94d4cab145e5f1c94ba85290d0c85692af90896c04231bc30e6ae053969f76cd6 WHIRLPOOL 0bb4c6f040aec1bf6405d4719d2295be194899231e9659e4533c1a4b3553d9899022526f3b7769592b77139d18153cb6172e18ba886ea584dc73302aa7ea64ac
+EBUILD mod_wsgi-4.5.11.ebuild 833 SHA256 8857ba97a68942469912455000d6640a4458384ebfbf5454b7de2c9806fc2649 SHA512 209541b2273f89aa4c779d7ac8f3bf9465363991e61044bdd82a190905e6c947756515c14a7d60d210d8cf95f77cc81b30093648f4ef44dd3b14a01f089f5753 WHIRLPOOL 85d54e5c6aa8ea89af5f3fe38f90a60345db5229a038cbbbc49930910f13df8e50ad91eac025901c029012c85262862a59e8d8df9f53d1a5501914d42eb82c9b
+EBUILD mod_wsgi-4.5.13.ebuild 840 SHA256 9be9d794387fef5cb93f5900bcda04d22166f8ff4d87a8837ec18ea27a57326f SHA512 1cefc61081be474f07188379b81018e827832b0adfc669adc3a1682491d4a9cc090a549921b8af58f3056475614e39579c10e478543ef1a912fce523fdae2b42 WHIRLPOOL a9ca31423b68d29c236e8ccb5087ab08dbd0082748d103940265de36f580e93f74a48f4d3a563d7164742a9f37ba9903875417ed3e0339dde440948d25cc9328
+EBUILD mod_wsgi-4.5.17.ebuild 843 SHA256 320a6c7ed48fef7f4cd0e91ee35877fc04ae07d72bd397933f5ce144f6fc7fe6 SHA512 204bca9122b1f41ea9c99fa72a73f70e3d92d8ad19897b8254daf3a6ed20ed85b5b23db36c5a385ea6613afa9a481b8504d8b9c6a3bdd5e03fe75b6ef3c0c5c3 WHIRLPOOL 489126ed6869168bf59144baaafdc41a1d15c95dd7f3ffa7b8d28e60c399f4aea6699fb0457a6d8bd3da09888e3f143436fbb66872d5e2a595eb8394eada3986
+EBUILD mod_wsgi-4.5.7.ebuild 830 SHA256 6a37c87eda7c97707f0a735109fe73fc8af84624a076d8298c235a7f01dc544b SHA512 b6b4699f4b71e02e4acf078b145dead44b2560dbd9a203f1b85ef4c65b576d9a490105d8c997c30ae8ae320926a6ed895e7e7480894f2df6279ed33c61176d59 WHIRLPOOL 80920edc9affd76ade6e202c05f7ea10dd2cc69b162e045eeeef9f747ce62db3eea77149fdae81f37688654d25b442b2acd3df0aa8d00f9db8dceec2f73fb8f8
+MISC ChangeLog 5073 SHA256 1b66f797bbd12c0b37a4466db4394df6be7de9899c3abacbf152e70fdc8b0ac9 SHA512 ca05930222972024ea20582c33cae584c6cf7317fd699131b5654e79868d2b1897f5eceeb73312181634557c7b3f5473f0372b2cf4c93ba3353371093d049fd3 WHIRLPOOL 980174fddf9a6bd0254ecb6edfe6a820c074f070cd91acbceff622f60d19d8eb9c1fb364e9cf81871750306f5c5a8b87b19986bc860851a1f4ea0e48a51ae8e2
+MISC ChangeLog-2015 8327 SHA256 312a22e86a7a6b6ddc52f2b6bb45b53c671fe7e6bc3d31e0e0c899ebf788cb70 SHA512 0a6199e678f22139b22f717713736f1e0675954eae6ecfc46ca8ce843ccbaff05987c3273a8718e7f4fbc0e8642457cffc6c70b688b35077a34c2a45774ddc48 WHIRLPOOL 6441cdfdabf256c31b3afb927dbacc3ad103c54592e32233ab163bedbb1cc0e39a056bd2fd18b6873326075da9660631ba7f19a38f96958fc6c3760ccb0f88b5
+MISC metadata.xml 380 SHA256 ce759752438fb325731c3210d57853ae9eba7d1c816734c359323a04c7bb0980 SHA512 b62536a8a79d3d5198b6cbd7eb51be455a8c7de53add3810120edc1beee7d0684e09e43de355c5da7a61486c8764c4619c809d9fadde9e9502cb5c0b364d7b68 WHIRLPOOL 2b7e3d28581fdcc43b4617107f3c2d6d40166d93d7c7bf1b367208593f0db58d86c5f6b45e75af5a31627e6c632bc43be79e9751e0832b459e9bb35bb5f8177a
diff --git a/www-apache/mod_wsgi/files/70_mod_wsgi.conf b/www-apache/mod_wsgi/files/70_mod_wsgi.conf
new file mode 100644
index 000000000000..3fabc5967fca
--- /dev/null
+++ b/www-apache/mod_wsgi/files/70_mod_wsgi.conf
@@ -0,0 +1,5 @@
+<IfDefine WSGI>
+LoadModule wsgi_module modules/mod_wsgi.so
+</IfDefine>
+
+# vim: ts=4 filetype=apache
diff --git a/www-apache/mod_wsgi/metadata.xml b/www-apache/mod_wsgi/metadata.xml
new file mode 100644
index 000000000000..cc3a99b4d8ea
--- /dev/null
+++ b/www-apache/mod_wsgi/metadata.xml
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="person">
+		<email>djc@gentoo.org</email>
+		<name>Dirkjan Ochtman</name>
+	</maintainer>
+	<upstream>
+		<remote-id type="pypi">mod_wsgi</remote-id>
+		<remote-id type="github">GrahamDumpleton/mod_wsgi</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/www-apache/mod_wsgi/mod_wsgi-4.4.21.ebuild b/www-apache/mod_wsgi/mod_wsgi-4.4.21.ebuild
new file mode 100644
index 000000000000..5a81dbea9f54
--- /dev/null
+++ b/www-apache/mod_wsgi/mod_wsgi-4.4.21.ebuild
@@ -0,0 +1,38 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="5"
+
+PYTHON_COMPAT=( python2_7 python3_4 )
+PYTHON_REQ_USE="threads"
+
+inherit apache-module eutils python-single-r1
+
+DESCRIPTION="An Apache2 module for running Python WSGI applications"
+HOMEPAGE="https://github.com/GrahamDumpleton/mod_wsgi"
+SRC_URI="https://github.com/GrahamDumpleton/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="amd64 ppc x86"
+IUSE=""
+REQUIRED_USE="${PYTHON_REQUIRED_USE}"
+
+DEPEND=""
+RDEPEND="${PYTHON_DEPS}"
+
+APACHE2_MOD_CONF="70_${PN}"
+APACHE2_MOD_DEFINE="WSGI"
+APACHE2_MOD_FILE="${S}/src/server/.libs/${PN}.so"
+
+DOCFILES="README.rst"
+
+need_apache2
+
+src_configure() {
+	econf --with-apxs=${APXS} --with-python=${PYTHON}
+}
+
+src_compile() {
+	default
+}
diff --git a/www-apache/mod_wsgi/mod_wsgi-4.5.11.ebuild b/www-apache/mod_wsgi/mod_wsgi-4.5.11.ebuild
new file mode 100644
index 000000000000..28d193529602
--- /dev/null
+++ b/www-apache/mod_wsgi/mod_wsgi-4.5.11.ebuild
@@ -0,0 +1,38 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="5"
+
+PYTHON_COMPAT=( python2_7 python3_3 python3_4 )
+PYTHON_REQ_USE="threads"
+
+inherit apache-module eutils python-single-r1
+
+DESCRIPTION="An Apache2 module for running Python WSGI applications"
+HOMEPAGE="https://github.com/GrahamDumpleton/mod_wsgi"
+SRC_URI="https://github.com/GrahamDumpleton/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~x86"
+IUSE=""
+REQUIRED_USE="${PYTHON_REQUIRED_USE}"
+
+DEPEND=""
+RDEPEND="${PYTHON_DEPS}"
+
+APACHE2_MOD_CONF="70_${PN}"
+APACHE2_MOD_DEFINE="WSGI"
+APACHE2_MOD_FILE="${S}/src/server/.libs/${PN}.so"
+
+DOCFILES="README.rst"
+
+need_apache2
+
+src_configure() {
+	econf --with-apxs=${APXS} --with-python=${PYTHON}
+}
+
+src_compile() {
+	default
+}
diff --git a/www-apache/mod_wsgi/mod_wsgi-4.5.13.ebuild b/www-apache/mod_wsgi/mod_wsgi-4.5.13.ebuild
new file mode 100644
index 000000000000..132cfd806444
--- /dev/null
+++ b/www-apache/mod_wsgi/mod_wsgi-4.5.13.ebuild
@@ -0,0 +1,38 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="5"
+
+PYTHON_COMPAT=( python2_7 python3_{3,4,5,6} )
+PYTHON_REQ_USE="threads"
+
+inherit apache-module eutils python-single-r1
+
+DESCRIPTION="An Apache2 module for running Python WSGI applications"
+HOMEPAGE="https://github.com/GrahamDumpleton/mod_wsgi"
+SRC_URI="https://github.com/GrahamDumpleton/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="amd64 ~arm ~arm64 ppc x86"
+IUSE=""
+REQUIRED_USE="${PYTHON_REQUIRED_USE}"
+
+DEPEND=""
+RDEPEND="${PYTHON_DEPS}"
+
+APACHE2_MOD_CONF="70_${PN}"
+APACHE2_MOD_DEFINE="WSGI"
+APACHE2_MOD_FILE="${S}/src/server/.libs/${PN}.so"
+
+DOCFILES="README.rst"
+
+need_apache2
+
+src_configure() {
+	econf --with-apxs=${APXS} --with-python=${PYTHON}
+}
+
+src_compile() {
+	default
+}
diff --git a/www-apache/mod_wsgi/mod_wsgi-4.5.17.ebuild b/www-apache/mod_wsgi/mod_wsgi-4.5.17.ebuild
new file mode 100644
index 000000000000..0cea82a06698
--- /dev/null
+++ b/www-apache/mod_wsgi/mod_wsgi-4.5.17.ebuild
@@ -0,0 +1,38 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="5"
+
+PYTHON_COMPAT=( python2_7 python3_{3,4,5,6} )
+PYTHON_REQ_USE="threads"
+
+inherit apache-module eutils python-single-r1
+
+DESCRIPTION="An Apache2 module for running Python WSGI applications"
+HOMEPAGE="https://github.com/GrahamDumpleton/mod_wsgi"
+SRC_URI="https://github.com/GrahamDumpleton/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~x86"
+IUSE=""
+REQUIRED_USE="${PYTHON_REQUIRED_USE}"
+
+DEPEND=""
+RDEPEND="${PYTHON_DEPS}"
+
+APACHE2_MOD_CONF="70_${PN}"
+APACHE2_MOD_DEFINE="WSGI"
+APACHE2_MOD_FILE="${S}/src/server/.libs/${PN}.so"
+
+DOCFILES="README.rst"
+
+need_apache2
+
+src_configure() {
+	econf --with-apxs=${APXS} --with-python=${PYTHON}
+}
+
+src_compile() {
+	default
+}
diff --git a/www-apache/mod_wsgi/mod_wsgi-4.5.7.ebuild b/www-apache/mod_wsgi/mod_wsgi-4.5.7.ebuild
new file mode 100644
index 000000000000..921251693813
--- /dev/null
+++ b/www-apache/mod_wsgi/mod_wsgi-4.5.7.ebuild
@@ -0,0 +1,38 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="5"
+
+PYTHON_COMPAT=( python2_7 python3_3 python3_4 )
+PYTHON_REQ_USE="threads"
+
+inherit apache-module eutils python-single-r1
+
+DESCRIPTION="An Apache2 module for running Python WSGI applications"
+HOMEPAGE="https://github.com/GrahamDumpleton/mod_wsgi"
+SRC_URI="https://github.com/GrahamDumpleton/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="amd64 ppc x86"
+IUSE=""
+REQUIRED_USE="${PYTHON_REQUIRED_USE}"
+
+DEPEND=""
+RDEPEND="${PYTHON_DEPS}"
+
+APACHE2_MOD_CONF="70_${PN}"
+APACHE2_MOD_DEFINE="WSGI"
+APACHE2_MOD_FILE="${S}/src/server/.libs/${PN}.so"
+
+DOCFILES="README.rst"
+
+need_apache2
+
+src_configure() {
+	econf --with-apxs=${APXS} --with-python=${PYTHON}
+}
+
+src_compile() {
+	default
+}
diff --git a/www-apache/mod_xml2enc/Manifest b/www-apache/mod_xml2enc/Manifest
new file mode 100644
index 000000000000..e77077bd0e29
--- /dev/null
+++ b/www-apache/mod_xml2enc/Manifest
@@ -0,0 +1,10 @@
+AUX 26_mod_xml2enc.conf 109 SHA256 027820f0af876a0438f4aadcd8a2f85df7256b0468f63d4043565c4f341657ad SHA512 8d4e530b274ed4c363777bca83f3ec7dfe35d83d3ee6d35a9b3082a54f5f0ef208d46d8be801f409682ffe10c79c43eba32d7f0f0ca1246c6f9c63a7a761cef5 WHIRLPOOL 2224e8c6482de341b85edc50f6e5790ede65f65de16e921678b11aa62eb1571f242cfb2722769df61c6e589b7b641e62cccae6e5c38289385167ba412bb4d237
+DIST mod_xml2enc-1.0.4.c 22380 SHA256 54d2d82c54f60e73eaddb69c00d2fd7be1786c449d5c7bbe045b30e56d19ba24 SHA512 b38d81ff419e9c00e302eb555715181cf2157af2d15a15b86d34f948c0c2f55de237234a24140b9fc2c1d3d46d688c4e9c4ab74af34b451677224a30b1b08582 WHIRLPOOL 6c925558f56f3f4c934ab6b50f055bac15eaf09a837500aae900d9c451ab357bc53f0d1c44759f4eb66f5c17d91a46f64cd9467c7a50d2dd8aa6d812bc2340d2
+DIST mod_xml2enc-1.0.4.h 1479 SHA256 3a4106a2de484812b6c98aa0845333be83e5f659eebe37678986b8829ee3d4a9 SHA512 01961c3f788ad4a53c2c8f4d9ddebb0333e75b8589df0ab0eb80b53ce781fa5d34b7908d082feeedc7d8a8582a8b798af26b9af107423dad99b83df5c6d5e7d3 WHIRLPOOL 539350c39c7198240cd7eabd43c3bce26d15456064b6dd68757fa70001072b1161acd388913a7941f367e56dcb00cf01bcc442d8da206ce1b2d54cbc7bcd99bf
+DIST mod_xml2enc.c 22380 SHA256 54d2d82c54f60e73eaddb69c00d2fd7be1786c449d5c7bbe045b30e56d19ba24 SHA512 b38d81ff419e9c00e302eb555715181cf2157af2d15a15b86d34f948c0c2f55de237234a24140b9fc2c1d3d46d688c4e9c4ab74af34b451677224a30b1b08582 WHIRLPOOL 6c925558f56f3f4c934ab6b50f055bac15eaf09a837500aae900d9c451ab357bc53f0d1c44759f4eb66f5c17d91a46f64cd9467c7a50d2dd8aa6d812bc2340d2
+DIST mod_xml2enc.h 1479 SHA256 3a4106a2de484812b6c98aa0845333be83e5f659eebe37678986b8829ee3d4a9 SHA512 01961c3f788ad4a53c2c8f4d9ddebb0333e75b8589df0ab0eb80b53ce781fa5d34b7908d082feeedc7d8a8582a8b798af26b9af107423dad99b83df5c6d5e7d3 WHIRLPOOL 539350c39c7198240cd7eabd43c3bce26d15456064b6dd68757fa70001072b1161acd388913a7941f367e56dcb00cf01bcc442d8da206ce1b2d54cbc7bcd99bf
+EBUILD mod_xml2enc-1.0.3.ebuild 844 SHA256 9071b855b49859e450e764182048dc4b225c092a9fd34284811475ca1de1c01b SHA512 fbd8f87000808912065aec599067d70604b22ddeb8726f5046d4253ced4af6012f4f52d4eaa44035aebb3454d6590c5df6eef1351a7bf950401edeb72101cedc WHIRLPOOL 5400dc6937a66971b410cfac5fee780dc1ee9ab8ac2c912609cbda4a42eccea71af1c1463db33f1f525896087fa3388f14c81b78d4b97fb1b7c9c3fc17376b07
+EBUILD mod_xml2enc-1.0.4.ebuild 859 SHA256 da583c59e7cf66536c38060688657d7f11153373bb5dabf38ed8673e66f1bdd6 SHA512 c906f7efe89dff0ba73ef69c32e2ecbb8fa41b626b6078719257f529b3bccf560ab73a46cafc8c09b356b7407a6cd7fc4829f3d344d7ad326d970255da689be2 WHIRLPOOL caf119c7a70809182de7c7d49618dbf0df069d82332360c7884a4fb1d96cc22ded4405c0ec7568a5b07f2341aad5539f825f7f44e4de882bf109b2df01a300d9
+MISC ChangeLog 3729 SHA256 ed9fc9ff3f878d7627f09edddf316f11e67d4e57a96a3430f6303edf86c8abfb SHA512 a8dc8dc2a0f871188cf139300bd77f306ec09e76c404d6412fdcda63b1a97655ac1d99282c6e32ba28a0fb286cd66ba52f1442cb97e4d576bc4b54994cadb812 WHIRLPOOL ca8764ee2d04cc0c7e639dbd2aa79fc7d1398355a65a8f65f897bade12f0ba50d9c6c63676de1c2aa4859171363a063650762d9ec415aec129ed1ad9516cad6f
+MISC ChangeLog-2015 771 SHA256 bf1cb787c2c9fb2eb99ba0abb618c5bbda56ee32a86c7117a9a0287e7ddeceef SHA512 639d3579371e9b6298e6183094d1c8a18eb37c0b57645e19306a1ad1d2329c7ee68f625b955c6ee65ec4ee2049cf9531fea3601ff29885c4bea9bfe9514eaabb WHIRLPOOL b56d7daf32cfde5bfc9955bb50138f3e3856c5ab23857257c0270535fb79ddac9b8c5c3ba0eab38971b8752f73408547141fa1956e6f4434056d40e6d60d50cc
+MISC metadata.xml 446 SHA256 813c1bcec3786e01a62fe1587fcb188b400e160371904e93f70a8e4d56cd416b SHA512 53538ecb3c9dd60e1b61b11dab77d7178d818663e45d2dc4c7e0179e4387893d93cf9de32b973c73c466fe916d8562db604dfe57c1bd8a9546956e0d0c207006 WHIRLPOOL 297257923f0efd3b7dc356f3485a56c6ac760eced7d9d60d5b28918a9276338810dba4db944e90d4b25d05fca1df67ce7383c6631beafa2d2becd8171ff832b5
diff --git a/www-apache/mod_xml2enc/files/26_mod_xml2enc.conf b/www-apache/mod_xml2enc/files/26_mod_xml2enc.conf
new file mode 100644
index 000000000000..1bb394df8ea6
--- /dev/null
+++ b/www-apache/mod_xml2enc/files/26_mod_xml2enc.conf
@@ -0,0 +1,4 @@
+<IfDefine XML2ENC>
+LoadFile /usr/lib/libxml2.so
+LoadModule xml2enc_module modules/mod_xml2enc.so
+</IfDefine>
diff --git a/www-apache/mod_xml2enc/metadata.xml b/www-apache/mod_xml2enc/metadata.xml
new file mode 100644
index 000000000000..bf786649b98b
--- /dev/null
+++ b/www-apache/mod_xml2enc/metadata.xml
@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="person">
+		<email>russell@annunaki2k2.co.uk</email>
+		<name>Russell Knighton</name>
+		<description>Proxy maintainer - set to assignee on bugs</description>
+	</maintainer>
+	<maintainer type="project">
+		<email>proxy-maint@gentoo.org</email>
+		<name>Proxy Maintainers</name>
+	</maintainer>
+</pkgmetadata>
diff --git a/www-apache/mod_xml2enc/mod_xml2enc-1.0.3.ebuild b/www-apache/mod_xml2enc/mod_xml2enc-1.0.3.ebuild
new file mode 100644
index 000000000000..c726fea2219a
--- /dev/null
+++ b/www-apache/mod_xml2enc/mod_xml2enc-1.0.3.ebuild
@@ -0,0 +1,37 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+inherit apache-module
+
+DESCRIPTION="An Apache2 module to provide libxml2 encoding"
+HOMEPAGE="http://apache.webthing.com/mod_xml2enc/"
+SRC_URI="http://apache.webthing.com/svn/apache/filters/mod_xml2enc.h
+	http://apache.webthing.com/svn/apache/filters/mod_xml2enc.c"
+RESTRICT="mirror"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="amd64 x86"
+IUSE=""
+
+DEPEND="app-arch/bzip2
+	dev-libs/libxml2"
+RDEPEND="${DEPEND}"
+
+#APACHE2_MOD_CONF="27_${PN}"
+#APACHE2_MOD_DEFINE="XML2ENC"
+
+need_apache2
+
+S="${WORKDIR}"/${PN}
+
+src_unpack() {
+	mkdir "${WORKDIR}"/${PN}
+	cp "${DISTDIR}/mod_xml2enc.h" "${WORKDIR}"/${PN}
+	cp "${DISTDIR}/mod_xml2enc.c" "${WORKDIR}"/${PN}
+}
+
+src_compile() {
+	APXS2_ARGS="$(xml2-config --cflags) -c ${PN}.c"
+	apache-module_src_compile
+}
diff --git a/www-apache/mod_xml2enc/mod_xml2enc-1.0.4.ebuild b/www-apache/mod_xml2enc/mod_xml2enc-1.0.4.ebuild
new file mode 100644
index 000000000000..e992c4e38e7b
--- /dev/null
+++ b/www-apache/mod_xml2enc/mod_xml2enc-1.0.4.ebuild
@@ -0,0 +1,37 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+inherit apache-module
+
+DESCRIPTION="An Apache2 module to provide libxml2 encoding"
+HOMEPAGE="http://apache.webthing.com/mod_xml2enc/"
+SRC_URI="http://apache.webthing.com/svn/apache/filters/${PN}.h -> ${P}.h
+	http://apache.webthing.com/svn/apache/filters/${PN}.c -> ${P}.c"
+RESTRICT="mirror"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+DEPEND="dev-libs/libxml2"
+RDEPEND="${DEPEND}"
+
+APACHE2_MOD_CONF="26_${PN}"
+APACHE2_MOD_DEFINE="XML2ENC"
+
+need_apache2
+
+S="${WORKDIR}"/${PN}
+
+src_unpack() {
+	mkdir "${WORKDIR}"/${PN} || die
+	cp "${DISTDIR}/${P}.h" "${WORKDIR}/${PN}/${PN}.h" || die
+	cp "${DISTDIR}/${P}.c" "${WORKDIR}/${PN}/${PN}.c" || die
+}
+
+src_compile() {
+	APXS2_ARGS="$(xml2-config --cflags) -c ${PN}.c"
+	apache-module_src_compile
+}
diff --git a/www-apache/mod_xsendfile/Manifest b/www-apache/mod_xsendfile/Manifest
new file mode 100644
index 000000000000..4a6f48e7ee79
--- /dev/null
+++ b/www-apache/mod_xsendfile/Manifest
@@ -0,0 +1,6 @@
+AUX 50_mod_xsendfile.conf 451 SHA256 e8eeeeb07deb4930b773f130c6d54793e8ec402d6b9b411245a01ffef4e49f2b SHA512 b138d82adbf2a145ff5bef22750826eabe58daf94eabdfebd8d540be4b9b242a69b9ab9333e0ceb4da0cbad947978e7bf928978b6cf8560abe5695d6b533df3c WHIRLPOOL 2d63da848ec1847641745c5edd5551c71c6d97a2daf6f65a178727a242ccad8e620948d20c6b96d0b3ca4841ee64d33b1ae2c8a660646458fc6b424acba0d646
+DIST mod_xsendfile-1.0b1.tar.gz 14883 SHA256 4646d6dfa0d57b2a45a9881dcf932c065e712f68effe649e3c7903b16103f98b SHA512 96745a5c753af329cabc10b1551e199425abf28c058222e118e67c604a53cfebb4fd8e27558caa58269ca8b4ca805ac6c4a71654c8414331c095bd600a4b3914 WHIRLPOOL 7aa9294b02951c1f1c617d497f655fed15c7651c061622012b9a3482bb9f010dee809b63777262e2d3faca2934a3721c5e8128780dcdd6fe96d032ab03cdf846
+EBUILD mod_xsendfile-1.0_beta1.ebuild 590 SHA256 20c6b650e0d7f8d46d9ee7a20a98a8a06fcb3dbb4200ac9395529f66861e9d0a SHA512 4c77da0ee71dc05e89a50acbbe252fa1f9c37866a9ea608c59eba4dcc1f1570e163126fae694792943e92aa80bb0778f229f433c4793fba1a477f785ceb8e1e4 WHIRLPOOL 7e3654984b3221c3a551deb76d9e022cc1d4da813f6642fc50e09a078405d0a956c1f5c486612ed319784b83535d24595ad160062dc30303aaed5ce4227d8a47
+MISC ChangeLog 2636 SHA256 a44faea9d9bdd53cd9990528d2979ca81915d7708d560237a22f509741b17ca7 SHA512 d2e5fdbf1f350a3f578dec795637a49640768db5ce5865dd9be43c60cbfb58da260125015323d2e5fb86c27d8c19e77f837ba904b3a46fa5c3759d2bf179378c WHIRLPOOL fd82de0407c5027378d3dc9bf6770d428d176e55bf3f2b174d7dd69bc67c837520b8199dba37e77db7450cf3c2a75c44c58912800bcae32ce90054fc27f93b3b
+MISC ChangeLog-2015 2152 SHA256 92c2ac3637cce37f709d1fc9a35229eaba0ddaff7f22af760eec9cf4b9f37738 SHA512 e46aa234ee5f58759ae60fbadc35e04fb029004cc85ee7f35b1a42a63b5e939f8fb5d36550791ce9476010596c1e11ee6bc479bb3cee37537657c29a3be148cc WHIRLPOOL 481e446c98215cf8bec12168660aa60b332660918d3c31d44da371c619dbefe28e8f6708d5acd76be3ea5b5c3e644aa6e9734dfa85f23074ac61db52f5a95131
+MISC metadata.xml 249 SHA256 6a7a935465d2bcd2b2eb7db8821fdb718f5585aa3385dbc3cfe91a67343dd11b SHA512 c13d64a0d3034eeb4c9567f5e1236ecd6f3c3cbdec69b805627298cdb7050ae01a19a3cb075ec905de9497079a3e855bdccef2f37f65540b6ae184439f01cdae WHIRLPOOL 4106054754ff0cea93503e1b478447bfb853e8a33ba5b5aea25590239973d2b268ca8570696760feff44fe693b7bce246295d7129789d54343d77c0dfb15b082
diff --git a/www-apache/mod_xsendfile/files/50_mod_xsendfile.conf b/www-apache/mod_xsendfile/files/50_mod_xsendfile.conf
new file mode 100644
index 000000000000..eda65879a6ff
--- /dev/null
+++ b/www-apache/mod_xsendfile/files/50_mod_xsendfile.conf
@@ -0,0 +1,20 @@
+<IfDefine XSENDFILE>
+LoadModule xsendfile_module modules/mod_xsendfile.so
+
+# Enables or disables header processing
+# XSendFile on|off
+XSendFile on
+# Ignore script provided Etag headers
+# XSendFileIgnoreEtag on|off
+#
+# Ignore script provided LastModified headers
+# XSendFileIgnoreLastModified on|off
+#
+# White-list more paths
+# XSendFilePath absolute path
+#
+# XSendFilePath /var/infiniband_mount/shared/LUN1/
+#
+</IfDefine>
+
+# vim: ts=4 filetype=apache
diff --git a/www-apache/mod_xsendfile/metadata.xml b/www-apache/mod_xsendfile/metadata.xml
new file mode 100644
index 000000000000..ceeed1534bdd
--- /dev/null
+++ b/www-apache/mod_xsendfile/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="person">
+		<email>maksbotan@gentoo.org</email>
+		<name>Maxim Koltsov</name>
+	</maintainer>
+</pkgmetadata>
diff --git a/www-apache/mod_xsendfile/mod_xsendfile-1.0_beta1.ebuild b/www-apache/mod_xsendfile/mod_xsendfile-1.0_beta1.ebuild
new file mode 100644
index 000000000000..0467c9c43a25
--- /dev/null
+++ b/www-apache/mod_xsendfile/mod_xsendfile-1.0_beta1.ebuild
@@ -0,0 +1,27 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="4"
+
+inherit apache-module
+
+MY_PV="1.0b1"
+DESCRIPTION="Apache2 module that processes X-SENDFILE headers registered by the original output handler"
+HOMEPAGE="https://tn123.org/mod_xsendfile/"
+SRC_URI="https://tn123.org/mod_xsendfile/beta/${PN}-${MY_PV}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="amd64 sparc x86 ~amd64-linux"
+IUSE=""
+
+S=${WORKDIR}
+
+RDEPEND="${DEPEND}"
+
+APACHE2_MOD_CONF="50_${PN}"
+APACHE2_MOD_DEFINE="XSENDFILE"
+
+DOCFILES="docs/Readme.html"
+
+need_apache2
diff --git a/www-apache/modsec-flameeyes/Manifest b/www-apache/modsec-flameeyes/Manifest
new file mode 100644
index 000000000000..c881ada20131
--- /dev/null
+++ b/www-apache/modsec-flameeyes/Manifest
@@ -0,0 +1,6 @@
+DIST modsec-flameeyes-20130216.tar.gz 18716 SHA256 0434015d269eaa3d18af977c9c7db4600bf04331a50fd3a3541e4104cc345246 SHA512 196a8176da09340c5496a3056deb473c69721fdd6c891b6bec6dd5459063dbd61b00eb9559ba0e88413678633cd90496cb0e1b2828442635d31d68dc949013db WHIRLPOOL 84d36cb05e70aca0b2a80754245ea20ae84fa1f3cd2df62cc0630b6addf6353fcc769cdda2e0422f6b8f4f9035844bd81e670efde81c89035e01166595a5ac6b
+EBUILD modsec-flameeyes-20130216.ebuild 1271 SHA256 b47e7ef4c0a8a89a1607ac894beacec73645e95a0ee99479e768b4865538aaa3 SHA512 33032929bcf9bc2bb1d111bad93a0266fe0f4cf47da2f8ea37f8bfa655ca72324f4bd49c77c76ac4dc51dfb16c5bf84e6d70a9368633ca4285a367829feace38 WHIRLPOOL 88f22a61837edb1e873b2c1e2c132ed9385b516200b418a33252af156a2ab5d26a8469e9715b44be3f7acf593f9fa62e1cf32813556df2570c791c0943f83d4a
+EBUILD modsec-flameeyes-99999999.ebuild 1272 SHA256 329f314f89e5a989dc7982abc55dc601c1b097e6a6594ed144ba6b9e450e9df2 SHA512 526e24dbd129fb252babebe2d5337e0f6074bd7aaa6043da9734567031e23e970dca3ebc94f552334151db4471247486331a9b8bcb7da251313b05ea83705375 WHIRLPOOL ffe75ff39d1307f89453fe9a3ca9e56722025250b4fe099c848fcff2405bde8de72716c5ad071660fb123be81938e731624f95f924448ec553a58962a0c7f410
+MISC ChangeLog 2932 SHA256 5132060454d325f9b8a0fffdeaf6899d453141189556cb5408a0095f2bdf8d16 SHA512 7ea6f807a5b796e85bdff830ca4b88c6c1472407edabaa189187740efffb46b0cefd745f2a7f2bc3a8724b958e6b989254bc0cd36edb1b2883b285a57211977a WHIRLPOOL d90ce910b01098e81384cc1c6e14171a6094d159841cf580074e816421eb9edcf422a4ab5067c0373aae956a1f3136b043e07a1484208e7ad97987a624a1d5b5
+MISC ChangeLog-2015 524 SHA256 3270ebe503b26a0bff668dd2604ae1ff6e56497ac259118d93e748b00c7a3e3b SHA512 25b1ecd6080f74fab5f776722dc936230e9928498aaf4ad2f1d39575aeac2daee1ecd65ba3a5d39e1891b1d4934dcd77d651b9b9e57f98f35ed0955f97cd8892 WHIRLPOOL 5a139174516ebba396b786cab38f29af09dfca5ecc6cc8e829a8bf1fc6031a47b16df42199807c37bd50bf02ac5389d102bba8cd3d4412e2d86d2534714d347c
+MISC metadata.xml 234 SHA256 2f7f5996b579b70f71beb6e527dd912883b388537d5a968ff555222930384c7e SHA512 0ea11e0b02d3d383a585f18f2b835e34db1d73dc1c92f5b4fccf22196b85692036570873bd10540d60508fe126972aa628940a881e520e2d0320eccb4f4a0de3 WHIRLPOOL 1ae273eb25bea4d90c67da06313dcd79f7b94dade12aba0cf56367272014c5b629b7f76242a3669a43e37a3e8ee71306a25b6286bb6184dc195cd9fe7f356fdf
diff --git a/www-apache/modsec-flameeyes/metadata.xml b/www-apache/modsec-flameeyes/metadata.xml
new file mode 100644
index 000000000000..df248b69898d
--- /dev/null
+++ b/www-apache/modsec-flameeyes/metadata.xml
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+  <upstream>
+    <remote-id type="github">Flameeyes/modsec-flameeyes</remote-id>
+  </upstream>
+</pkgmetadata>
diff --git a/www-apache/modsec-flameeyes/modsec-flameeyes-20130216.ebuild b/www-apache/modsec-flameeyes/modsec-flameeyes-20130216.ebuild
new file mode 100644
index 000000000000..673802ff0da1
--- /dev/null
+++ b/www-apache/modsec-flameeyes/modsec-flameeyes-20130216.ebuild
@@ -0,0 +1,55 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+inherit readme.gentoo
+
+GITHUB_USER=Flameeyes
+GITHUB_PROJECT=${PN}
+
+EGIT_REPO_URI="https://github.com/${GITHUB_USER}/${GITHUB_PROJECT}.git"
+
+DESCRIPTION="Flameeyes's Ruleset for ModSecurity"
+HOMEPAGE="http://www.flameeyes.eu/projects/modsec"
+SRC_URI="https://github.com/${GITHUB_USER}/${GITHUB_PROJECT}/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="CC-BY-SA-3.0"
+SLOT="0"
+KEYWORDS="~amd64"
+
+RDEPEND=">=www-apache/mod_security-2.5.1"
+DEPEND=""
+
+RULESDIR=/etc/modsecurity/flameeyes
+
+DOC_CONTENTS="To enable the ruleset, define MODSEC_FLAMEEYES in
+/etc/conf.d/apache2.
+
+If you do not use www-apache/modsecurity-crs you want also to uncomment
+the init configuration file in /etc/apache2/modules/81_${PN}.conf."
+
+src_install() {
+	insinto "${RULESDIR}"
+	doins -r rules optional
+
+	dodoc README.md
+
+	cat - > "${T}/81_${PN}.conf" <<EOF
+<IfDefine MODSEC_FLAMEEYES>
+
+# Uncomment this if you don't use the CRS
+# Include /etc/modsecurity/flameeyes/optional/flameeyes_init.conf
+
+Include /etc/modsecurity/flameeyes/rules/*.conf
+
+# -*- apache -*-
+# vim: ts=4 filetype=apache
+
+EOF
+
+	insinto /etc/apache2/modules.d/
+	doins "${T}/81_${PN}.conf"
+
+	readme.gentoo_create_doc
+}
diff --git a/www-apache/modsec-flameeyes/modsec-flameeyes-99999999.ebuild b/www-apache/modsec-flameeyes/modsec-flameeyes-99999999.ebuild
new file mode 100644
index 000000000000..b8557517b9b3
--- /dev/null
+++ b/www-apache/modsec-flameeyes/modsec-flameeyes-99999999.ebuild
@@ -0,0 +1,55 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+inherit readme.gentoo git-2
+
+GITHUB_USER=Flameeyes
+GITHUB_PROJECT=${PN}
+
+EGIT_REPO_URI="https://github.com/${GITHUB_USER}/${GITHUB_PROJECT}.git"
+
+DESCRIPTION="Flameeyes's Ruleset for ModSecurity"
+HOMEPAGE="http://www.flameeyes.eu/projects/modsec"
+#SRC_URI="https://github.com/${GITHUB_USER}/${GITHUB_PROJECT}/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="CC-BY-SA-3.0"
+SLOT="0"
+KEYWORDS=""
+
+RDEPEND=">=www-apache/mod_security-2.5.1"
+DEPEND=""
+
+RULESDIR=/etc/modsecurity/flameeyes
+
+DOC_CONTENTS="To enable the ruleset, define MODSEC_FLAMEEYES in
+/etc/conf.d/apache2.
+
+If you do not use www-apache/modsecurity-crs you want also to uncomment
+the init configuration file in /etc/apache2/modules/81_${PN}.conf."
+
+src_install() {
+	insinto "${RULESDIR}"
+	doins -r rules optional
+
+	dodoc README.md
+
+	cat - > "${T}/81_${PN}.conf" <<EOF
+<IfDefine MODSEC_FLAMEEYES>
+
+# Uncomment this if you don't use the CRS
+# Include /etc/modsecurity/flameeyes/optional/flameeyes_init.conf
+
+Include /etc/modsecurity/flameeyes/rules/*.conf
+
+# -*- apache -*-
+# vim: ts=4 filetype=apache
+
+EOF
+
+	insinto /etc/apache2/modules.d/
+	doins "${T}/81_${PN}.conf"
+
+	readme.gentoo_create_doc
+}
diff --git a/www-apache/modsecurity-crs/Manifest b/www-apache/modsecurity-crs/Manifest
new file mode 100644
index 000000000000..d2505c91507b
--- /dev/null
+++ b/www-apache/modsecurity-crs/Manifest
@@ -0,0 +1,12 @@
+AUX 80_mod_security-crs.conf 289 SHA256 4fdcb7396f562af44133146c25a0af7bdd9aaa1014561fc6dfabfe78c391e4ca SHA512 e5b86164a68e15d67a294688c993799fca10928c1265cee04555becfb17fb516314471d8c4eaea1205ac1703890cedb4647d93ce75b0a2a1ab9a401a495465dc WHIRLPOOL 81c0a6831d2ded00e68e2cb9dc4a84da04a054df1652e031081c26c4b9b4d6c376d6ed6751e92f4c44855ce57725c9d65d8a7fe00e8b94e0caf797f1743edcbc
+DIST modsecurity-crs-2.2.6.tar.gz 291070 SHA256 1c837fc7ace28f732b5034c90a17635e31fe3c9a45425c079fd1fd6bae01b790 SHA512 0e6c2735814dd24ba2329bc756e382b0430937a703d492b2ac00f95af6598903961b43013e99cd49240fe6b7a5439a7b1b3e79c3b7a48828465252dafd586165 WHIRLPOOL d8c85f8e6db07ecbc5a9a680e843f485d87294c71ceeb84aa83e562441ea78db477f9850431ded67371fbe455438fb89fedb5d3070e524abebe53b3c9a039f72
+DIST modsecurity-crs-2.2.7.tar.gz 294137 SHA256 54bc74815d6e6c3b476aec673a48e3ce08ee82b76bfe941408efab757aa8a0f7 SHA512 d0d3dac1b391c8ab730cc16546c9508d93c85dd674b2750d12fff99c17e5575b36bea0cf00e06fdd20c2db5dfdbdc3fd7bbaa26502988617632acfde1ee88927 WHIRLPOOL fc72bdbd5c79dffa0b2c65893cb8cdab0708705ce48ca3d49115339a5b4ff8cbe7cc42bcb49abd966243a2e48cb2af290ea125c6de4b185eb8b1c20e7eb66057
+DIST modsecurity-crs-2.2.9.tar.gz 279898 SHA256 203669540abf864d40e892acf2ea02ec4ab47f9769747d28d79b6c2a501e3dfc SHA512 fc95cfff9d4ba9a4478c704e5d16e4054e514eb3ffb6343706840aad76607f997b4cc4b8b148adc5cb83743ea7996328d35b8556115de29d6a0e034b67591a09 WHIRLPOOL 8e741a5430905e061ba024e8ae2b5bd08ae19e6ae30d9ca8a0160c9f73afee7bfe57caf73ba7eecebc00e34141f5d46cb1378793a89c8c56966139c10f70c30a
+DIST modsecurity-crs-3.0.2.tar.gz 156751 SHA256 c1fd6b2c2ab8992357b588d9e615ae9e2c34e622206339d93a7817f0da50e67f SHA512 ae8fe9a0f00a57708c8680cb76882214e4f5ff647e13087aaf1bfc7382cefb38d2f3a88eb1f210031b553f56d3e44c12dbdc68f8b0d09fb4a9e2f15a70d885aa WHIRLPOOL 9282a709b0e933143ba80597d7d996b2f1a958ab01986e4a9ef0056f92ee5848e81c2548f20cbe5b1cb13379c0909fdfbd239c8712b1655ee7c8934132aaa74b
+EBUILD modsecurity-crs-2.2.6-r1.ebuild 4139 SHA256 99ba406013b371d379b23b85ba6bc47762a64eae0904b1dd6681996cb7b6a5c2 SHA512 d05973d37550531e6dcc6c73d2d1ae4e2ca874f87f3b6773be13a3a3e7afd1a790e7be7daf694b8a0a187e78e342dff54760bc028cdb2258c823e699fcb81db5 WHIRLPOOL 3d7a238b26d3bf61bfc7d85943cccee2385b7351be55f8c9775f5aefeaf9cb75a61396874581dda3f71fa53fa3da54ddc3b350b99e4ec04203fe1f9624de1450
+EBUILD modsecurity-crs-2.2.7.ebuild 4071 SHA256 b9e8e7da33381803e88181bd01e746dd067021ea367a9f478cafd6a1309afc30 SHA512 9e876a537185a2acf610bf0873ea9bbcd9c078884f5f4e3a6c40d71488417fa03993fe9fad309b72c1a5b7427d2c9e201e2a1e9dd0d56ff8343a5e4019f60a5f WHIRLPOOL 1b73fa278883516aa050be49abbd67f66d6558d603ae29b7e3981dcfa920b35f80fbc39b33f6cc0da125cad88542402f4cfb1258e943913543f7b8586675198c
+EBUILD modsecurity-crs-2.2.9.ebuild 4162 SHA256 b030b25f0c0535ae1a7862be80fbdff85a3ef746ba8a234f8378519392faacac SHA512 68d0bc9a0f02ee6451ea2efb47c6db7f950917a0beb8628aa43e6f11ae639fb8bb91b38becab4b4a9cbda9e7ca70a71ff8034180b85a2f20bbf49afce1c37278 WHIRLPOOL 53b332440696d503a2497cd03152453932002ad0f932c3a42f440336a347a88f972a2087f19e2c767494846fd7f3e9499a1aaabd39de594bb6c317de6ba33982
+EBUILD modsecurity-crs-3.0.2.ebuild 1452 SHA256 28da76572eba4dae96c9f4afbc4e5da4a10a02b6bb195bd98362c6061aea4e14 SHA512 8627119dcf5338c33e6c7ffa24c69ed43102252d71c511f0c2466785f50d45c794183957efaa49c32af54b2881415ebab561aaf169d7e0b0550802ba9c82dccc WHIRLPOOL 199fedff57ea0e423f83809d946f3b83f3057a972a8b334f61c88ca866e4b9b334b4b1302d7c0559cfa24b3e75192707d0f7f0e78b84e5e43f3929239e0a7d03
+MISC ChangeLog 2740 SHA256 5d4c0930c18495544a0af26ca4bbfc7616760dc07ea935323378c36fdc0550b5 SHA512 5d9f02cdf313271affd92efadf5c92d83ab3e378d3d6ee6b8db77c4ebdec9c4612d27e2d4077ff4d825ada14a96f8a162464fef2ae19f246dd8be42f5dbcf53d WHIRLPOOL 2bfd3ca4014d7e976ec6aedba9b4dc0496298f1700ad3832da325d2dc4817db3b7af887c0ec1032adb3c5971a958cfab243de79f4b1e985b9c35c62a24e92fd4
+MISC ChangeLog-2015 6123 SHA256 9565b4914708c5597bdd2d4fe548f640680489ab558e4cc5ee6c0380bb021b5c SHA512 2c41bd06d3711cfc683bae5371f895112b823781834d1a7da64ee28051b2c5db568ece351a09227120b50527cb1b8d44f1a12582bdcac0a9690e78e817985d00 WHIRLPOOL a0a6686ecb0bdf5bac43f31a8ea358cbeb0ccb6ce31207589f90c4ce0f8113357aba0ba5e0ea61a46c4557fb5d212d0ec0f446fc9efa4c16fb43817dd7a395b1
+MISC metadata.xml 240 SHA256 57fa8d351691a7ca9a37bfdbf6812aff39d28ded7f59adb8a8a3ad5f1062806e SHA512 f387811090c36052ca6dfd48c20af460ebb892738ecd449a5a213ecf7313dfc1cc6eb118e4d28ec24e26078995c4d291784f26b6afc1f822cf83ca5482bd7310 WHIRLPOOL 95eada281cf78384a55ef971b6ca0e02d51c6d946e2bc644ed20f4980c502e7d189799c46fec54a6eecf8c521a4c89911ee0ee1a5adf57cc0eea95e4baf62ad0
diff --git a/www-apache/modsecurity-crs/files/80_mod_security-crs.conf b/www-apache/modsecurity-crs/files/80_mod_security-crs.conf
new file mode 100644
index 000000000000..c6b767a3cf24
--- /dev/null
+++ b/www-apache/modsecurity-crs/files/80_mod_security-crs.conf
@@ -0,0 +1,8 @@
+<IfDefine SECURITY>
+  # Add your custom CRS configuration here. A copy of upstream's
+  # crs-setup.conf.example is includes with the documentation of
+  # modsecurity-crs.
+
+  # Include the rules AFTER your custom configuration.
+  Include /usr/share/modsecurity-crs/rules/*.conf
+</IfDefine>
diff --git a/www-apache/modsecurity-crs/metadata.xml b/www-apache/modsecurity-crs/metadata.xml
new file mode 100644
index 000000000000..f73da4e681d0
--- /dev/null
+++ b/www-apache/modsecurity-crs/metadata.xml
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+  <upstream>
+    <remote-id type="github">SpiderLabs/owasp-modsecurity-crs</remote-id>
+  </upstream>
+</pkgmetadata>
diff --git a/www-apache/modsecurity-crs/modsecurity-crs-2.2.6-r1.ebuild b/www-apache/modsecurity-crs/modsecurity-crs-2.2.6-r1.ebuild
new file mode 100644
index 000000000000..ca7ba53a426e
--- /dev/null
+++ b/www-apache/modsecurity-crs/modsecurity-crs-2.2.6-r1.ebuild
@@ -0,0 +1,136 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=4
+
+GITHUB_USER=SpiderLabs
+GITHUB_PROJECT=owasp-${PN}
+
+DESCRIPTION="Core Rule Set for ModSecurity"
+HOMEPAGE="http://www.owasp.org/index.php/Category:OWASP_ModSecurity_Core_Rule_Set_Project"
+SRC_URI="https://github.com/${GITHUB_USER}/${GITHUB_PROJECT}/tarball/v${PV} -> ${P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="amd64 ppc sparc x86"
+IUSE="lua geoip"
+
+RDEPEND=">=www-apache/mod_security-2.7[lua?,geoip?]"
+DEPEND=""
+
+S="${WORKDIR}/${P}"
+
+RULESDIR=/etc/modsecurity
+LUADIR=/usr/share/${PN}/lua
+
+src_unpack() {
+	default
+	mv "${WORKDIR}/${GITHUB_USER}-${GITHUB_PROJECT}-"* "${P}" || die
+}
+
+src_prepare() {
+	if ! use lua; then
+		# comment out this since it's in the same file as another one we want to keep
+		sed -i -e "/id:'96000[456]'/s:^:#:" \
+			experimental_rules/modsecurity_crs_61_ip_forensics.conf || die
+
+		# remove these that rely on the presence of the lua files
+		rm \
+			experimental_rules/modsecurity_crs_16_scanner_integration.conf \
+			experimental_rules/modsecurity_crs_40_appsensor_detection_point_2.1_request_exception.conf \
+			experimental_rules/modsecurity_crs_41_advanced_filters.conf \
+			experimental_rules/modsecurity_crs_55_response_profiling.conf \
+			experimental_rules/modsecurity_crs_56_pvi_checks.conf \
+			|| die
+	else
+		# fix up the path to the scripts; there seems to be no
+		# consistency at all on how the rules are loaded.
+		sed -i \
+			-e "s:/etc/apache2/modsecurity-crs/lua/:${LUADIR}/:" \
+			-e "s:profile_page_scripts.lua:${LUADIR}/\0:" \
+			-e "s:/usr/local/apache/conf/crs/lua/:${LUADIR}/:" \
+			-e "s:/usr/local/apache/conf/modsec_current/base_rules/:${LUADIR}/:" \
+			-e "s:/etc/apache2/modsecurity-crs/lua/:${LUADIR}/:" \
+			-e "s:\.\./lua/:${LUADIR}/:" \
+			*_rules/*.conf || die
+
+		# fix up the shebang on the scripts
+		sed -i -e "s:/opt/local/bin/lua:/usr/bin/lua:" \
+			lua/*.lua || die
+	fi
+
+	sed -i \
+		-e '/SecGeoLookupDb/s:^:#:' \
+		-e '/SecGeoLookupDb/a# Gentoo already defines it in 79_modsecurity.conf' \
+		experimental_rules/modsecurity_crs_61_ip_forensics.conf || die
+
+	if ! use geoip; then
+		if use lua; then
+			# only comment this out as the file is going to be used for other things
+			sed -i -e "/id:'960007'/,+1 s:^:#:" \
+				experimental_rules/modsecurity_crs_61_ip_forensics.conf || die
+		else
+			rm experimental_rules/modsecurity_crs_61_ip_forensics.conf || die
+		fi
+	fi
+}
+
+src_install() {
+	insinto "${RULESDIR}"
+	# slr_rules as of 2.2.6 have broken IDs that don't work with
+	# ModSecurity 2.7, but the rules require 2.7 to begin with.
+	doins -r base_rules optional_rules experimental_rules #slr_rules
+
+	insinto "${LUADIR}"
+	doins lua/*.lua
+
+	dodoc CHANGELOG README.md
+
+	(
+		cat - <<EOF
+<IfDefine SECURITY>
+EOF
+
+		cat modsecurity_crs_10_setup.conf.example
+
+		cat - <<EOF
+
+Include /etc/modsecurity/base_rules/*.conf
+
+# Include Trustwave SpiderLabs Research Team rules
+# Include /etc/modsecurity/slr_rules/*.conf
+# Not installed yet as of 2.2.6
+
+# Optionally use the other rules as well
+# Include /etc/modsecurity/optional_rules/*.conf
+# Include /etc/modsecurity/experimental_rules/*.conf
+</IfDefine>
+
+# -*- apache -*-
+# vim: ts=4 filetype=apache
+
+EOF
+	) > "${T}"/"80_${PN}.conf"
+
+	insinto /etc/apache2/modules.d/
+	doins "${T}"/"80_${PN}.conf"
+}
+
+pkg_postinst() {
+	elog
+	elog "If you want to enable further rules, check the following directories:"
+	elog "	${RULESDIR}/optional_rules"
+	elog "	${RULESDIR}/experimental_rules"
+	elog ""
+	elog "Starting from version 2.0.9, the default for the Core Rule Set is again to block"
+	elog "when rules hit. If you wish to go back to the 2.0.8 method of anomaly scoring, you"
+	elog "should change 80_${PN}.conf so that you have these settings enabled:"
+	elog ""
+	elog "    #SecDefaultAction \"phase:2,deny,log\""
+	elog "    SecAction \"phase:1,t:none,nolog,pass,setvar:tx.anomaly_score_blocking=on\""
+	elog ""
+	elog "Starting from version 2.1.2 rules are installed, for consistency, under"
+	elog "/etc/modsecurity, and can be configured with the following file:"
+	elog "  /etc/apache2/modules.d/80_${PN}.conf"
+	elog ""
+}
diff --git a/www-apache/modsecurity-crs/modsecurity-crs-2.2.7.ebuild b/www-apache/modsecurity-crs/modsecurity-crs-2.2.7.ebuild
new file mode 100644
index 000000000000..ec65336cc7b3
--- /dev/null
+++ b/www-apache/modsecurity-crs/modsecurity-crs-2.2.7.ebuild
@@ -0,0 +1,131 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+GITHUB_USER=SpiderLabs
+GITHUB_PROJECT=owasp-${PN}
+
+DESCRIPTION="Core Rule Set for ModSecurity"
+HOMEPAGE="http://www.owasp.org/index.php/Category:OWASP_ModSecurity_Core_Rule_Set_Project"
+SRC_URI="https://github.com/${GITHUB_USER}/${GITHUB_PROJECT}/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="amd64 ppc sparc x86"
+IUSE="lua geoip"
+
+RDEPEND=">=www-apache/mod_security-2.7[lua?,geoip?]"
+DEPEND=""
+
+S="${WORKDIR}/${GITHUB_PROJECT}-${PV}"
+
+RULESDIR=/etc/modsecurity
+LUADIR=/usr/share/${PN}/lua
+
+src_prepare() {
+	if ! use lua; then
+		# comment out this since it's in the same file as another one we want to keep
+		sed -i -e "/id:'96000[456]'/s:^:#:" \
+			experimental_rules/modsecurity_crs_61_ip_forensics.conf || die
+
+		# remove these that rely on the presence of the lua files
+		rm \
+			experimental_rules/modsecurity_crs_16_scanner_integration.conf \
+			experimental_rules/modsecurity_crs_40_appsensor_detection_point_2.1_request_exception.conf \
+			experimental_rules/modsecurity_crs_41_advanced_filters.conf \
+			experimental_rules/modsecurity_crs_55_response_profiling.conf \
+			experimental_rules/modsecurity_crs_56_pvi_checks.conf \
+			|| die
+	else
+		# fix up the path to the scripts; there seems to be no
+		# consistency at all on how the rules are loaded.
+		sed -i \
+			-e "s:/etc/apache2/modsecurity-crs/lua/:${LUADIR}/:" \
+			-e "s:profile_page_scripts.lua:${LUADIR}/\0:" \
+			-e "s:/usr/local/apache/conf/crs/lua/:${LUADIR}/:" \
+			-e "s:/usr/local/apache/conf/modsec_current/base_rules/:${LUADIR}/:" \
+			-e "s:/etc/apache2/modsecurity-crs/lua/:${LUADIR}/:" \
+			-e "s:\.\./lua/:${LUADIR}/:" \
+			*_rules/*.conf || die
+
+		# fix up the shebang on the scripts
+		sed -i -e "s:/opt/local/bin/lua:/usr/bin/lua:" \
+			lua/*.lua || die
+	fi
+
+	sed -i \
+		-e '/SecGeoLookupDb/s:^:#:' \
+		-e '/SecGeoLookupDb/a# Gentoo already defines it in 79_modsecurity.conf' \
+		experimental_rules/modsecurity_crs_61_ip_forensics.conf || die
+
+	if ! use geoip; then
+		if use lua; then
+			# only comment this out as the file is going to be used for other things
+			sed -i -e "/id:'960007'/,+1 s:^:#:" \
+				experimental_rules/modsecurity_crs_61_ip_forensics.conf || die
+		else
+			rm experimental_rules/modsecurity_crs_61_ip_forensics.conf || die
+		fi
+	fi
+}
+
+src_install() {
+	insinto "${RULESDIR}"
+	# slr_rules as of 2.2.6 have broken IDs that don't work with
+	# ModSecurity 2.7, but the rules require 2.7 to begin with.
+	doins -r base_rules optional_rules experimental_rules #slr_rules
+
+	insinto "${LUADIR}"
+	doins lua/*.lua
+
+	dodoc CHANGELOG README.md
+
+	(
+		cat - <<EOF
+<IfDefine SECURITY>
+EOF
+
+		cat modsecurity_crs_10_setup.conf.example
+
+		cat - <<EOF
+
+Include /etc/modsecurity/base_rules/*.conf
+
+# Include Trustwave SpiderLabs Research Team rules
+# Include /etc/modsecurity/slr_rules/*.conf
+# Not installed yet as of 2.2.6
+
+# Optionally use the other rules as well
+# Include /etc/modsecurity/optional_rules/*.conf
+# Include /etc/modsecurity/experimental_rules/*.conf
+</IfDefine>
+
+# -*- apache -*-
+# vim: ts=4 filetype=apache
+
+EOF
+	) > "${T}"/"80_${PN}.conf"
+
+	insinto /etc/apache2/modules.d/
+	doins "${T}"/"80_${PN}.conf"
+}
+
+pkg_postinst() {
+	elog
+	elog "If you want to enable further rules, check the following directories:"
+	elog "	${RULESDIR}/optional_rules"
+	elog "	${RULESDIR}/experimental_rules"
+	elog ""
+	elog "Starting from version 2.0.9, the default for the Core Rule Set is again to block"
+	elog "when rules hit. If you wish to go back to the 2.0.8 method of anomaly scoring, you"
+	elog "should change 80_${PN}.conf so that you have these settings enabled:"
+	elog ""
+	elog "    #SecDefaultAction \"phase:2,deny,log\""
+	elog "    SecAction \"phase:1,t:none,nolog,pass,setvar:tx.anomaly_score_blocking=on\""
+	elog ""
+	elog "Starting from version 2.1.2 rules are installed, for consistency, under"
+	elog "/etc/modsecurity, and can be configured with the following file:"
+	elog "  /etc/apache2/modules.d/80_${PN}.conf"
+	elog ""
+}
diff --git a/www-apache/modsecurity-crs/modsecurity-crs-2.2.9.ebuild b/www-apache/modsecurity-crs/modsecurity-crs-2.2.9.ebuild
new file mode 100644
index 000000000000..7a435d3f663b
--- /dev/null
+++ b/www-apache/modsecurity-crs/modsecurity-crs-2.2.9.ebuild
@@ -0,0 +1,135 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+GITHUB_USER=SpiderLabs
+GITHUB_PROJECT=owasp-${PN}
+
+DESCRIPTION="Core Rule Set for ModSecurity"
+HOMEPAGE="http://www.owasp.org/index.php/Category:OWASP_ModSecurity_Core_Rule_Set_Project"
+SRC_URI="https://github.com/${GITHUB_USER}/${GITHUB_PROJECT}/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~sparc ~x86"
+IUSE="lua geoip"
+
+RDEPEND=">=www-apache/mod_security-2.7[lua?,geoip?]"
+DEPEND=""
+
+S="${WORKDIR}/${GITHUB_PROJECT}-${PV}"
+
+RULESDIR=/etc/modsecurity
+LUADIR=/usr/share/${PN}/lua
+
+src_prepare() {
+	if ! use lua; then
+		# comment out this since it's in the same file as another one we want to keep
+		sed -i -e "/id:'900036'/s:^:#:" \
+			experimental_rules/modsecurity_crs_61_ip_forensics.conf || die
+
+		# remove these that rely on the presence of the lua files
+		rm \
+			experimental_rules/modsecurity_crs_16_scanner_integration.conf \
+			experimental_rules/modsecurity_crs_40_appsensor_detection_point_2.0_setup.conf \
+			experimental_rules/modsecurity_crs_40_appsensor_detection_point_2.1_request_exception.conf \
+			experimental_rules/modsecurity_crs_48_bayes_analysis.conf \
+			experimental_rules/modsecurity_crs_55_response_profiling.conf \
+			experimental_rules/modsecurity_crs_56_pvi_checks.conf \
+			|| die
+	else
+		# fix up the path to the scripts; there seems to be no
+		# consistency at all on how the rules are loaded.
+		sed -i \
+			-e "s:/etc/apache2/modsecurity-crs/lua/:${LUADIR}/:" \
+			-e "s:profile_page_scripts.lua:${LUADIR}/\0:" \
+			-e "s:/usr/local/apache/conf/crs/lua/:${LUADIR}/:" \
+			-e "s:/usr/local/apache/conf/modsec_current/base_rules/:${LUADIR}/:" \
+			-e "s:/etc/apache2/modsecurity-crs/lua/:${LUADIR}/:" \
+			-e "s:\.\./lua/:${LUADIR}/:" \
+			*_rules/*.conf || die
+
+		# fix up the shebang on the scripts
+		sed -i -e "s:/opt/local/bin/lua:/usr/bin/lua:" \
+			lua/*.lua || die
+	fi
+
+	sed -i \
+		-e '/SecGeoLookupDb/s:^:#:' \
+		-e '/SecGeoLookupDb/a# Gentoo already defines it in 79_modsecurity.conf' \
+		experimental_rules/modsecurity_crs_61_ip_forensics.conf \
+		experimental_rules/modsecurity_crs_11_proxy_abuse.conf || die
+
+	if ! use geoip; then
+		rm  experimental_rules/modsecurity_crs_11_proxy_abuse.conf
+
+		if use lua; then
+			# only comment this out as the file is going to be used for other things
+			sed -i -e "/id:'900039'/,+1 s:^:#:" \
+				experimental_rules/modsecurity_crs_61_ip_forensics.conf || die
+		else
+			rm experimental_rules/modsecurity_crs_61_ip_forensics.conf || die
+		fi
+	fi
+
+	eapply_user
+}
+
+src_install() {
+	insinto "${RULESDIR}"
+	doins -r base_rules optional_rules experimental_rules slr_rules
+
+	insinto "${LUADIR}"
+	doins lua/*.lua
+
+	dodoc CHANGES README.md
+
+	(
+		cat - <<EOF
+<IfDefine SECURITY>
+EOF
+
+		cat modsecurity_crs_10_setup.conf.example
+
+		cat - <<EOF
+
+Include /etc/modsecurity/base_rules/*.conf
+
+# Include Trustwave SpiderLabs Research Team rules
+# Include /etc/modsecurity/slr_rules/*.conf
+# Not installed yet as of 2.2.6
+
+# Optionally use the other rules as well
+# Include /etc/modsecurity/optional_rules/*.conf
+# Include /etc/modsecurity/experimental_rules/*.conf
+</IfDefine>
+
+# -*- apache -*-
+# vim: ts=4 filetype=apache
+
+EOF
+	) > "${T}"/"80_${PN}.conf"
+
+	insinto /etc/apache2/modules.d/
+	doins "${T}"/"80_${PN}.conf"
+}
+
+pkg_postinst() {
+	elog
+	elog "If you want to enable further rules, check the following directories:"
+	elog "	${RULESDIR}/optional_rules"
+	elog "	${RULESDIR}/experimental_rules"
+	elog ""
+	elog "Starting from version 2.0.9, the default for the Core Rule Set is again to block"
+	elog "when rules hit. If you wish to go back to the 2.0.8 method of anomaly scoring, you"
+	elog "should change 80_${PN}.conf so that you have these settings enabled:"
+	elog ""
+	elog "    #SecDefaultAction \"phase:2,deny,log\""
+	elog "    SecAction \"phase:1,t:none,nolog,pass,setvar:tx.anomaly_score_blocking=on\""
+	elog ""
+	elog "Starting from version 2.1.2 rules are installed, for consistency, under"
+	elog "/etc/modsecurity, and can be configured with the following file:"
+	elog "  /etc/apache2/modules.d/80_${PN}.conf"
+	elog ""
+}
diff --git a/www-apache/modsecurity-crs/modsecurity-crs-3.0.2.ebuild b/www-apache/modsecurity-crs/modsecurity-crs-3.0.2.ebuild
new file mode 100644
index 000000000000..77271b211900
--- /dev/null
+++ b/www-apache/modsecurity-crs/modsecurity-crs-3.0.2.ebuild
@@ -0,0 +1,52 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+DESCRIPTION="Core Rule Set for ModSecurity"
+HOMEPAGE="https://modsecurity.org/crs/"
+SRC_URI="https://github.com/SpiderLabs/owasp-${PN}/archive/v${PV}.tar.gz
+	-> ${P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+DEPEND=""
+RDEPEND=">=www-apache/mod_security-2.9.1"
+
+S="${WORKDIR}/owasp-${P}"
+
+src_install() {
+	insinto "/usr/share/${PN}"
+	doins -r rules
+
+	dodoc CHANGES CONTRIBUTORS KNOWN_BUGS README.md crs-setup.conf.example \
+		  id_renumbering/{IDNUMBERING,IdNumbering.csv}
+
+	# I don't think it's worth pulling in apache-module.eclass just for
+	# this path...
+	insinto /etc/apache2/modules.d
+	doins "${FILESDIR}/80_mod_security-crs.conf"
+}
+
+pkg_postinst() {
+	einfo "The CRS configuration file has been installed to"
+	einfo
+	einfo "  ${ROOT}etc/apache2/modules.d/80_mod_security-crs.conf"
+	einfo
+	einfo "The CRS rules have been renumbered as of version 3.0.0."
+	einfo "If your configuration refers to any rules based on their"
+	einfo "number, then you will need to update your configuration"
+	einfo "to reflect the new numbering system. You can find more"
+	einfo "information in"
+	einfo
+	einfo "  ${ROOT}usr/share/doc/${PF}/IDNUMBERING"
+	einfo
+	einfo "and a CSV file containing the old -> new rule number"
+	einfo "mapping was installed as"
+	einfo
+	einfo "  ${ROOT}usr/share/doc/${PF}/IdNumbering.csv"
+	einfo
+}
diff --git a/www-apache/mpm_itk/Manifest b/www-apache/mpm_itk/Manifest
new file mode 100644
index 000000000000..2fe8141a7f2a
--- /dev/null
+++ b/www-apache/mpm_itk/Manifest
@@ -0,0 +1,6 @@
+AUX 00_mpm_itk.conf 130 SHA256 b79114947e786e190e261b0885aa8b35f41566020543a1e1869b66f43ae7acd4 SHA512 ac997b764631d90e4bbf37d3ccaaad55d555e8829c25a5feb5c018ac4505328692d7e781d15a6ada861320726a423af75d870428834e103092e65b4874593980 WHIRLPOOL db514919c753fe7979251facf423a4bb084f6a0cdc41359f188789834b9dfec0224ee09a51f8475a22e217d3762669f800bab7e2d415adefa4e8162eec292155
+DIST mpm-itk-2.4.7-04.tar.gz 45843 SHA256 609f83e8995416c5491348e07139f26046a579db20cf8488ebf75d314668efcf SHA512 4c6f02bbe3aa4e1af2e912b6a49751dedf976901484b4f55ff67757c2f40077a330e41bcfbe1cb433a8ec8870055b0533658e85042887aa94ccf14638eade178 WHIRLPOOL a91325d7eaed4cb011207de59161c7879748afec2d34b102b88558c4d78e9c6cad8165e7d112345667891bf424cd066861f8369361045d5da2b60b9859107407
+EBUILD mpm_itk-2.4.7_p4-r1.ebuild 1228 SHA256 9c251ef517824f1887bf3225c30186097e149a51d7912fd258e8c107b46d61a9 SHA512 5b5327dbd6363b461f04b6e063958aee5f062725edfad5df4422e38ea7c3480324d456e6b1d68b0e6e6a18c8f085f21bfa1f9b1f6ff876824689760afdebf9f6 WHIRLPOOL ddbcf57c7d319acbd659c5dfc9ed8bb51786531e5db441cb7014adfb89ba62482eed99c1d5cc50b89e2eb35fc7d1a2cb7242880363eb97ed6ded804cf4e3e3fd
+MISC ChangeLog 3874 SHA256 c529f4b291733be24782eb56f3407a3718f9757e36e7de65e0ec2bdb21c5c430 SHA512 6c622fdb422e52edcbdfab0ea4b82c4f3c3453226837a4fe256262be0d3e607036fa241930b131045952b461ab91a90cb09e0a6ade1291df09588f4286c0dbdf WHIRLPOOL e0d04aff190cf89df6ab8138901d0f5d5dcdc445baa3acdf7b1883e227a44cc5ca55c6a37cebb3b56b9794abd919e96869a11911bbb1d210e7637b65be99f187
+MISC ChangeLog-2015 553 SHA256 996077bd79a3ae881b11593b0debd352ee5f8e5da894e7444c96f3addb075215 SHA512 f377b97c3cd4e9edc95bfa21a15ab1bfe7a1950b615691b9cc7971a4e4a84a648835810ce7ce345f6214ad49668a918ee1d3c5944d0572b569a08862d3d83daa WHIRLPOOL 0f9c745fb6b7d272dce24dd1bbe33a68a3177e91fc1e5e7aef369b6d4017e47c3d7b4be140b5a1538c16f3352ab1b4e799933f39ba6503540ceb29d6e15a9036
+MISC metadata.xml 218 SHA256 93a599cac7ecef893a709a1e12d79df2efd42fbd67454b2813e6bd5b4c2414bd SHA512 e143c766598413b2b305475039473345bf7e007d6cb4934dd205384c0a3df9451e780a4294c56126103a883bb904d9a02e06c082176b19a4e388020438d71bcd WHIRLPOOL 6663108ea6329cf7e7741a7f32ab07ea2fe3c8e522f0394ea8b1d4e9fb22d83f11b39d2e0620fde62f5883a688aa614926b4c1de059b47ab22dbb6bf52eea58d
diff --git a/www-apache/mpm_itk/files/00_mpm_itk.conf b/www-apache/mpm_itk/files/00_mpm_itk.conf
new file mode 100644
index 000000000000..bb77e57aec6c
--- /dev/null
+++ b/www-apache/mpm_itk/files/00_mpm_itk.conf
@@ -0,0 +1,5 @@
+<IfDefine MPM_ITK>
+  LoadModule mpm_itk_module modules/mpm_itk.so
+  LimitUIDRange 1000 2000
+  LimitGIDRange 1000 2000
+</IfDefine>
diff --git a/www-apache/mpm_itk/metadata.xml b/www-apache/mpm_itk/metadata.xml
new file mode 100644
index 000000000000..a0128bcd9ef0
--- /dev/null
+++ b/www-apache/mpm_itk/metadata.xml
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+  <maintainer type="person">
+    <email>mjo@gentoo.org</email>
+  </maintainer>
+</pkgmetadata>
diff --git a/www-apache/mpm_itk/mpm_itk-2.4.7_p4-r1.ebuild b/www-apache/mpm_itk/mpm_itk-2.4.7_p4-r1.ebuild
new file mode 100644
index 000000000000..7c684962d236
--- /dev/null
+++ b/www-apache/mpm_itk/mpm_itk-2.4.7_p4-r1.ebuild
@@ -0,0 +1,50 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+inherit apache-module linux-info
+
+MY_PN=${PN/_/-}
+MY_PV=${PV/_p/-0}
+MY_P=${MY_PN}-${MY_PV}
+
+DESCRIPTION="Run virtual hosts under separate users/groups"
+HOMEPAGE="http://mpm-itk.sesse.net/"
+SRC_URI="http://mpm-itk.sesse.net/${MY_P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="amd64 x86"
+IUSE=""
+
+S="${WORKDIR}/${MY_P}"
+
+# The libcap dependency is automagic, so we require it
+# unconditionally. Reported upstream at,
+#
+# http://lists.err.no/pipermail/mpm-itk/2014-May/000808.html
+#
+#
+# The -threads USE dependency is only reliable as long as we don't
+# support building more than one MPM. See bug #511658.
+#
+DEPEND="sys-libs/libcap
+	>=www-servers/apache-2.4.7[-threads]"
+RDEPEND="${DEPEND}"
+
+APACHE2_MOD_CONF="00_${PN}"
+APACHE2_MOD_DEFINE="MPM_ITK"
+APXS2_ARGS="-c ${PN}.c seccomp.c -lcap"
+need_apache2_4
+
+pkg_setup() {
+	CONFIG_CHECK="~SECCOMP"
+	linux-info_pkg_setup
+
+	local minkv="3.5"
+	if kernel_is -lt ${minkv//./ }; then
+		ewarn "A kernel newer than ${minkv} (with seccomp v2) is needed"
+		ewarn "for LimitUIDRange and LimitGIDRange which we include by"
+		ewarn "default in ${APACHE2_MOD_CONF}.conf."
+	fi
+}
diff --git a/www-apache/passenger/Manifest b/www-apache/passenger/Manifest
new file mode 100644
index 000000000000..3c849c81fa4f
--- /dev/null
+++ b/www-apache/passenger/Manifest
@@ -0,0 +1,14 @@
+AUX 30_mod_passenger-5.0.0.conf 2737 SHA256 c5cd9c6b0a6616c9934a1c1fc9952036a6b4adcd9049e11f5614157f786c736d SHA512 847aa6d0ebb2e4ceaa744fdddf72f22613aeb76df38a36fb3c8b16803222cec116e6d5c23d2173beffd5889ebb8ba0247ffd3b9e900a70d78c2236f00c1a5d4d WHIRLPOOL b7ad6e2cfd1677469c67d8c47e2b53f3087a84477beb4a29d10f71196c7f73590964add0316c97e791ed4e9bf03020d586a118da5c0ba499bb9b5547bf30b6d9
+AUX passenger-5.0.20-gentoo.patch 1057 SHA256 89b0070eeeb91ac79705694903a6145a97e87a60dbaaf35945c60da3645878db SHA512 c5022f3305b413954c75a280fea8b6a59c20a366746d17cdfa100dd7a0b3e4ea051af4c291eca0e71611dedd597903b25e893e7a382a9ee2415657bd55e91779 WHIRLPOOL 38b97ff42d558b9c43581f562dfe2d18b18cc55f5b6bd55912127569f2510462bf1b8f785d90f685f953e848a5b44838487b3f09e57fc24cad436ae331b2eb89
+AUX passenger-5.1.1-isnan.patch 1155 SHA256 52e8c304c841d31b673b1993bfc5a56d6c75db34d84cba6f87a622fe7f0e41c5 SHA512 a80a9a229f1eeb34780236d0b2418fe5d2f57b9ae8c3c4ccdec729806f4afad8979de4ab3ea0834cdb76218192825ee4bfaf02b48f3bda240c2db441bcc870d9 WHIRLPOOL 31cf3615ee67ee60639dbc0e8c4f51faf4c621b816c0bcb2b85b6c61f896ae087640a8dfce175a7a6e6cefafbac9c9345610f737e31c23e7bf1b0f1b1d03c431
+DIST passenger-5.1.2.tar.gz 5646103 SHA256 7fb03a54650ef5e508895c9e45bc2d8151f6c4811ea6797e81f017fedddfdbab SHA512 88a77c749857a8538ea268f793d2708fa29b8891d2c3197577155f81cb66aa04919c25e713d4f00692051ad385eebaa94729cd30baa68edcf3d17c23bae0acdd WHIRLPOOL 8f115162e2a7c43af20cef1d689290c8a523cce10f617500eeb50ab6a226c203a404fc7ce53fd0e21e63276aa359c5d64b685318be36f79ce165ff598bac8766
+DIST passenger-5.1.6.tar.gz 5215694 SHA256 e897cc5f0ec6446bfdc226404dca4bd29f7418ae92010c389661b9f024a3cf24 SHA512 71d301d2501863951157f55df30ac89f6f9d98e79b554a5ca05ca9a306041ecd8cdc92056220cf6dc9ad02972a102bfc990e3b06f887d27496a8ecbd58e109fa WHIRLPOOL fe6872d0c11803fd0d8875002f37425edc54327709daaa56518ace0ef9f5046836592298ca80ce4929a29e6c0a0adcb237b57a19cd0d73ac096992e742e2a8b5
+DIST passenger-5.1.7.tar.gz 5218093 SHA256 2b40a00a3fdc90a6acf784319f60fd53549f036ffc99fcbb23a0658cb7e2b215 SHA512 f1f67f7912dd3d58ee46c32d1d0584eeb90e95fd5a36bddff62c28674560f1495926a867b20d12a3867d1e81f13c480ed596ba81f78f6241c511b12fcac1de4c WHIRLPOOL 12c1acee83255b19964f505c6238432971d7a80d7937fcfac75cd0645b8626d993365472ca7e622b21fc8144f37f1286e1b58fdfa71836bcd791467416013349
+DIST passenger-5.1.8.tar.gz 5234529 SHA256 fef10e4a34c3faa48306c21c0789ee4d4d56fc0e30205cc470a91b486b7a4a7d SHA512 5baf287e1f2a751409bba99671de2c41656033dc29132b2d964457405284105343fde4c2233c921d7e35794a47eedbf33e3840119a908741b1ed9e6fdc99ec2c WHIRLPOOL 6513b71aadddc9ec5ff4b4c617256a62f1c977b7d0f098982808851afc7703bd4ceed843cf309d07b239dbae97ed4beacaa2130a5dd325b17714df59f3b1f9ee
+EBUILD passenger-5.1.2.ebuild 3802 SHA256 4e68673b6e194126a37eb8acbb207a91e60219c4a2edfd635dd4508e652c9e9e SHA512 8f8ccf842182cff920f7956e3934e35154bd6235991e50e90bd1629b4f33caa4d480072eddbbc2ad335706bed0f5258ad4de0755beb0c2c89fbf11afcecebc47 WHIRLPOOL 5014b02757779a5cfdc5061ba8d8d5b588ed1e7048ea4b604c3c1a94bd572ab3b8f7c5c775c20dafd87400c305998a7c412bd8c6190e01ea003491058b9eaeb8
+EBUILD passenger-5.1.6.ebuild 3833 SHA256 228c9dbb2b64272213095f96ae7e20b33d643b0a0cde8b6996915f1faf3da95f SHA512 8f384e47cc1efa7c4dabe6dcc42fddd66a2498df22933d4e65fbed124540edb2210f8c0113ae4c2acd3f4d1066fb5eb8bb710f4a23065ef1db6003b48a80ecb6 WHIRLPOOL 1a45c0119c33f5d42c65083adb771d8bfae44daf300269d0734fcfc073e0dd1e665d69708e7f8757e3edb5ad9d500ee6b0d41d6ecdea8114ada29ff7ab1744e4
+EBUILD passenger-5.1.7.ebuild 3834 SHA256 fedb34c679d0f9d9fa450d24c4e8e946b3bf4a9f587e972b4c804bf726f03753 SHA512 e851aae9ff80c75e303dffe7b3ad91a7eecc8a1f2fa706033e5dd919e18f717cf3176c8486aaa783c2b6f6d8fe1aeb94398f4c7ce21e2ce65fddaac0bed86400 WHIRLPOOL a0796aea70300ceb196033367e895e33ea3f60aee258b3d0ef7d710b7d8e1f8cbc1e8f2bb97261d4869dd436567ebb555b622adf0a5dfd3fdbf8cc56bf8c67d8
+EBUILD passenger-5.1.8.ebuild 3827 SHA256 d178ed339b1f895be1457753801d0dd838345ea485f8ab2e1b2227d59b34f542 SHA512 9a6153f12d67e13280b6539dc7f9bc6614a8c793f9484e2df3ed3c4793c37fe6dc7e48f7aca5cad85e2e9abd74455cc2d58010e22ff8a44e3c277e7872d58206 WHIRLPOOL 3cef97673ba0a6d95375368aecc7d7a577d26e2dcadaf781bb421d617fabd8ac5c99a9facc1656afe919f9804401d43db0d253101486c9bfd5d9b15805c1db9d
+MISC ChangeLog 8584 SHA256 923aa06ccf1db42d903c7fd6922f2f1c42d10cd7c4080da6e207fa0af2c69f74 SHA512 efd75c05d7bc141a2ab9634c6b5008071aeb30c7a82dfe4d3ab88d0553852961339be038744c43cc853d5274551c5bb177372bd0b4cab0ed851553da9a04e8bd WHIRLPOOL 6223af82e55988e8b8e666abb1abb3027cb901f86010f5b2e47a6c215cf79d33b540660bb731638f6896ca00feb5c8e5438c9307621f22e06251bca34fa03504
+MISC ChangeLog-2015 17351 SHA256 25abdadae21e308556904475d3a8f0c70274497eb69d917deb0aeb9c0aeed02f SHA512 185db00f89b00e3a6dcd01979266068e3632250b1cd68de5468c759a33bc0f10ddfca36cce4326e693354471b6a485445905abafedc89c8aca6aac18276acd5c WHIRLPOOL f7acd8802839c1d473820c1fde1025e86be2090db5da7ae0392545d298d97d33205b0a7d1ea1e71a7c2eea6026a908bb0fcd281f3c5a53985c03c3bdc325d8ef
+MISC metadata.xml 330 SHA256 14373e1dec97edf9d5ce98d31c443c436c7d62832007d1227a0687b217bd03f7 SHA512 5ea7e5026084dedcd363bb79076763cca7d66bb08411d5e2dc56ade23bfdbd522a8db13db9c0b8f50163f130f28c784b622d9639cb3dd33aa810dda3d2577db8 WHIRLPOOL 66281cf13b062809a9a3b3015b7ac2c33c7760d74cdc9c4b6f29fa3a7be240112f062cc8ec708ad74e9637793ba940200600e1517b3b2dc71e11e61ae3cd0b2b
diff --git a/www-apache/passenger/files/30_mod_passenger-5.0.0.conf b/www-apache/passenger/files/30_mod_passenger-5.0.0.conf
new file mode 100644
index 000000000000..f218b59ca412
--- /dev/null
+++ b/www-apache/passenger/files/30_mod_passenger-5.0.0.conf
@@ -0,0 +1,63 @@
+<IfDefine PASSENGER>
+LoadModule passenger_module modules/mod_passenger.so
+
+# The location to the Phusion Passenger root directory. This configuration
+# option is essential to Phusion Passenger. The correct value is given by the
+# installer, and should usually not be changed manually.
+PassengerRoot /usr/lib/ruby/vendor_ruby/phusion_passenger/locations.ini
+
+# This option allows one to specify how much information Phusion Passenger
+# should write to the Apache error log file. A higher log level value means
+# that more information will be logged.
+#
+# Possible values are:
+#
+#    0: Show only errors and warnings.
+#    1: Show the most important debugging information. This might be useful for
+#       system administrators who are trying to figure out the cause of a
+#       problem.
+#    2: Show more debugging information. This is typically only useful for
+#       developers.
+#    3: Show even more debugging information.
+PassengerLogLevel 0
+
+# This option specifies the default global version of Ruby to use.
+PassengerDefaultRuby /usr/bin/ruby
+
+# This option allows one to specify the Ruby interpreter to use for
+# specific instances.
+# PassengerRuby /usr/bin/ruby
+
+# The maximum number of Ruby on Rails application instances that may be
+# simultaneously active. A larger number results in higher memory usage, but
+# improved ability to handle concurrent HTTP clients.
+PassengerMaxPoolSize 20
+
+# The maximum number of seconds that a Ruby on Rails application instance may
+# be idle. That is, if an application instance hasn't done anything after the
+# given number of seconds, then it will be shutdown in order to conserve
+# memory.
+PassengerPoolIdleTime 120
+
+# The maximum number of application instances that may be simultaneously active
+# for a single application. This helps to make sure that a single application
+# will not occupy all available slots in the application pool.
+#
+# This value must be less than PassengerMaxPoolSize. A value of 0 means that
+# there is no limit placed on the number of instances a single application may
+# use, i.e. only the global limit of PassengerMaxPoolSize will be enforced.
+PassengerMaxInstancesPerApp 0
+
+# When the PassengerUserSwitching option is enabled a Rails application is started
+# as the owner of the file config/environment.rb. So if
+# /home/webapps/foo/config/environment.rb is owned by joe, then Passenger will
+# launch the corresponding Rails application as joe as well.
+PassengerUserSwitching On
+
+# Under no circumstances will Rails applications be run as root. If
+# environment.rb is owned by root or by an unknown user, then the Rails
+# application will run as the user specified by PassengerDefaultUser.
+PassengerDefaultUser apache
+</IfDefine>
+
+# vim: ts=4 filetype=apache
diff --git a/www-apache/passenger/files/passenger-5.0.20-gentoo.patch b/www-apache/passenger/files/passenger-5.0.20-gentoo.patch
new file mode 100644
index 000000000000..a9fe95f6b25b
--- /dev/null
+++ b/www-apache/passenger/files/passenger-5.0.20-gentoo.patch
@@ -0,0 +1,30 @@
+--- build/packaging.rb.~1~	2013-10-27 00:00:00.000000000 +0200
++++ build/packaging.rb	2015-09-28 07:44:04.584236386 +0200
+@@ -575,7 +575,7 @@
+   psg_ruby       = ENV['RUBY'] || "#{fs_bindir}/ruby"
+   psg_free_ruby  = ENV['FREE_RUBY'] || "/usr/bin/env ruby"
+ 
+-  fakeroot = "pkg/fakeroot"
++  fakeroot = ENV['DISTDIR']
+   fake_rubylibdir = "#{fakeroot}#{psg_rubylibdir}"
+   fake_nodelibdir = "#{fakeroot}#{psg_nodelibdir}"
+   fake_libdir     = "#{fakeroot}#{psg_libdir}"
+@@ -593,7 +593,6 @@
+ 
+   packaging_method = ENV['NATIVE_PACKAGING_METHOD'] || ENV['PACKAGING_METHOD'] || "deb"
+ 
+-  sh "rm -rf #{fakeroot}"
+   sh "mkdir -p #{fakeroot}"
+ 
+   # Ruby sources
+@@ -690,10 +689,6 @@
+     change_shebang("#{fake_sbindir}/#{exe}", shebang)
+   end
+ 
+-  # Apache 2 module
+-  sh "mkdir -p #{File.dirname(fake_apache2_module_path)}"
+-  sh "cp #{APACHE2_TARGET} #{fake_apache2_module_path}"
+-
+   # Ruby extension sources
+   sh "mkdir -p #{fake_ruby_extension_source_dir}"
+   sh "cp -R #{PhusionPassenger.ruby_extension_source_dir}/* #{fake_ruby_extension_source_dir}"
diff --git a/www-apache/passenger/files/passenger-5.1.1-isnan.patch b/www-apache/passenger/files/passenger-5.1.1-isnan.patch
new file mode 100644
index 000000000000..02f7fe76df06
--- /dev/null
+++ b/www-apache/passenger/files/passenger-5.1.1-isnan.patch
@@ -0,0 +1,14 @@
+diff -uNr passenger-5.1.1.orig/src/cxx_supportlib/vendor-modified/boost/math/special_functions/fpclassify.hpp passenger-5.1.1/src/cxx_supportlib/vendor-modified/boost/math/special_functions/fpclassify.hpp
+--- passenger-5.1.1.orig/src/cxx_supportlib/vendor-modified/boost/math/special_functions/fpclassify.hpp	2013-10-26 15:00:00.000000000 -0700
++++ passenger-5.1.1/src/cxx_supportlib/vendor-modified/boost/math/special_functions/fpclassify.hpp	2017-01-12 19:21:39.696285758 -0800
+@@ -134,8 +134,8 @@
+ inline bool is_nan_helper(__float128 f, const boost::true_type&) { return ::isnanq(f); }
+ inline bool is_nan_helper(__float128 f, const boost::false_type&) { return ::isnanq(f); }
+ #else
+-inline bool is_nan_helper(__float128 f, const boost::true_type&) { return ::isnan(static_cast<double>(f)); }
+-inline bool is_nan_helper(__float128 f, const boost::false_type&) { return ::isnan(static_cast<double>(f)); }
++inline bool is_nan_helper(__float128 f, const boost::true_type&) { return std::isnan(static_cast<double>(f)); }
++inline bool is_nan_helper(__float128 f, const boost::false_type&) { return std::isnan(static_cast<double>(f)); }
+ #endif
+ #endif
+ }
diff --git a/www-apache/passenger/metadata.xml b/www-apache/passenger/metadata.xml
new file mode 100644
index 000000000000..9a8bc537e0e5
--- /dev/null
+++ b/www-apache/passenger/metadata.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="person">
+		<email>graaff@gentoo.org</email>
+	</maintainer>
+	<maintainer type="project">
+		<email>ruby@gentoo.org</email>
+		<name>Gentoo Ruby Project</name>
+	</maintainer>
+	</pkgmetadata>
diff --git a/www-apache/passenger/passenger-5.1.2.ebuild b/www-apache/passenger/passenger-5.1.2.ebuild
new file mode 100644
index 000000000000..6ea838a5241f
--- /dev/null
+++ b/www-apache/passenger/passenger-5.1.2.ebuild
@@ -0,0 +1,118 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+USE_RUBY="ruby21 ruby22 ruby23"
+
+inherit apache-module flag-o-matic multilib ruby-ng toolchain-funcs
+
+DESCRIPTION="Passenger makes deployment of Ruby on Rails applications a breeze"
+HOMEPAGE="https://www.phusionpassenger.com/"
+SRC_URI="https://s3.amazonaws.com/phusion-passenger/releases/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="amd64 x86"
+IUSE="debug"
+
+ruby_add_bdepend "dev-ruby/rake"
+
+ruby_add_rdepend "
+	>=dev-ruby/rack-1.0.0:*
+	>=dev-ruby/rake-0.8.1"
+
+# libev is bundled but with adapations that do not seem to be accepted
+# upstream, so we must use the bundled version :-(
+CDEPEND="
+	>=dev-libs/libuv-1.8.0
+	net-misc/curl[ssl]
+	www-servers/apache[apache2_modules_unixd(+)]"
+
+RDEPEND="${RDEPEND} ${CDEPEND}"
+DEPEND="${DEPEND} ${CDEPEND}"
+
+APACHE2_MOD_CONF="30_mod_${PN}-5.0.0 30_mod_${PN}"
+APACHE2_MOD_DEFINE="PASSENGER"
+
+need_apache2
+
+pkg_setup() {
+	use debug && append-flags -DPASSENGER_DEBUG
+}
+
+all_ruby_prepare() {
+	epatch "${FILESDIR}"/${PN}-5.0.20-gentoo.patch
+	epatch "${FILESDIR}"/${PN}-5.1.1-isnan.patch
+
+	# Change these with sed instead of a patch so that we can easily use
+	# the toolchain-funcs methods.
+	sed -i -e "/^CC/ s/=.*$/= '$(tc-getCC)'/" \
+		-e "/^CXX\s/ s/=.*$/= '$(tc-getCXX)'/" \
+		-e 's/PlatformInfo.debugging_cflags//' build/basics.rb || die
+
+	# Avoid fixed debugging CFLAGs.
+	sed -e '/debugging_cflags/areturn ""' -i src/ruby_supportlib/phusion_passenger/platform_info/compiler.rb || die
+
+	# Use sed here so that we can dynamically set the documentation directory.
+	sed -i -e "s:/usr/share/doc/passenger:/usr/share/doc/${P}:" \
+		-e "s:/usr/lib/apache2/modules/mod_passenger.so:${APACHE_MODULESDIR}/mod_passenger.so:" \
+		-e "s:/usr/lib/phusion-passenger/agents:/usr/libexec/phusion-passenger/agents:" \
+		src/ruby_supportlib/phusion_passenger.rb || die
+	sed -i -e "s:/usr/lib/phusion-passenger/agents:/usr/libexec/phusion-passenger/agents:" src/cxx_supportlib/ResourceLocator.h || die
+
+	# Don't install a tool that won't work in our setup.
+	sed -i -e '/passenger-install-apache2-module/d' src/ruby_supportlib/phusion_passenger/packaging.rb || die
+	rm -f bin/passenger-install-apache2-module || die "Unable to remove unneeded install script."
+
+	# Make sure we use the system-provided version where possible
+	rm -rf src/cxx_supportlib/vendor-copy/libuv || die "Unable to remove vendored code."
+
+	# Avoid building documentation to avoid a dependency on mizuho.
+	#sed -i -e 's/, :doc//' build/packaging.rb || die
+	touch doc/*.html || die
+
+	# Fix hard-coded use of AR
+	sed -i -e "s/ar cru/"$(tc-getAR)" cru/" build/support/cplusplus.rb || die
+}
+
+all_ruby_compile() {
+	V=1 EXTRA_LDFLAGS="${LDFLAGS}" \
+	APXS2="${APXS}" \
+	HTTPD="${APACHE_BIN}" \
+	FS_LIBDIR='/usr/'$(get_libdir) \
+	USE_VENDORED_LIBUV="no" LIBUV_LIBS="-luv" \
+	ruby -S rake apache2 || die "rake failed"
+}
+
+each_ruby_compile() {
+	append-flags -fno-strict-aliasing
+
+	V=1 EXTRA_LDFLAGS="${LDFLAGS}" \
+	APXS2="${APXS}" \
+	HTTPD="${APACHE_BIN}" \
+	FS_LIBDIR='/usr/'$(get_libdir) \
+	USE_VENDORED_LIBUV="no" LIBUV_LIBS="-luv" \
+	${RUBY} -S rake native_support || die "rake failed"
+}
+
+all_ruby_install() {
+	APACHE2_MOD_FILE="${S}/buildout/apache2/mod_${PN}.so"
+	apache-module_src_install
+
+	# Patch in the correct libdir
+	sed -i -e 's:/usr/lib/:/usr/'$(get_libdir)'/:' "${D}${APACHE_MODULES_CONFDIR}/30_mod_${PN}.conf" || die
+
+	dodoc CHANGELOG README.md
+}
+
+each_ruby_install() {
+	DISTDIR="${D}" \
+	RUBYLIBDIR="$(ruby_rbconfig_value vendordir)" \
+	RUBYARCHDIR="$(ruby_rbconfig_value archdir)" \
+	APXS2="${APXS}" \
+	HTTPD="${APACHE_BIN}" \
+	FS_LIBDIR='/usr/'$(get_libdir) \
+	EXTRA_LDFLAGS="${LDFLAGS}" \
+	USE_VENDORED_LIBUV="no" LIBUV_LIBS="-luv" \
+	${RUBY} -S rake fakeroot || die "rake failed"
+}
diff --git a/www-apache/passenger/passenger-5.1.6.ebuild b/www-apache/passenger/passenger-5.1.6.ebuild
new file mode 100644
index 000000000000..9d65e0a1e95f
--- /dev/null
+++ b/www-apache/passenger/passenger-5.1.6.ebuild
@@ -0,0 +1,122 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+USE_RUBY="ruby21 ruby22 ruby23 ruby24"
+
+inherit apache-module flag-o-matic multilib ruby-ng toolchain-funcs
+
+DESCRIPTION="Passenger makes deployment of Ruby on Rails applications a breeze"
+HOMEPAGE="https://www.phusionpassenger.com/"
+SRC_URI="https://s3.amazonaws.com/phusion-passenger/releases/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="amd64 ~x86"
+IUSE="apache2 debug"
+
+ruby_add_bdepend "dev-ruby/rake"
+
+ruby_add_rdepend "
+	>=dev-ruby/rack-1.0.0:*
+	>=dev-ruby/rake-0.8.1"
+
+# libev is bundled but with adapations that do not seem to be accepted
+# upstream, so we must use the bundled version :-(
+CDEPEND="
+	>=dev-libs/libuv-1.8.0
+	net-misc/curl[ssl]
+	apache2? ( www-servers/apache[apache2_modules_unixd(+)] )"
+
+RDEPEND="${RDEPEND} ${CDEPEND}"
+DEPEND="${DEPEND} ${CDEPEND}"
+
+APACHE2_MOD_CONF="30_mod_${PN}-5.0.0 30_mod_${PN}"
+APACHE2_MOD_DEFINE="PASSENGER"
+
+want_apache2
+
+pkg_setup() {
+	use debug && append-flags -DPASSENGER_DEBUG
+	depend.apache_pkg_setup
+}
+
+all_ruby_prepare() {
+	epatch "${FILESDIR}"/${PN}-5.0.20-gentoo.patch
+	epatch "${FILESDIR}"/${PN}-5.1.1-isnan.patch
+
+	# Change these with sed instead of a patch so that we can easily use
+	# the toolchain-funcs methods.
+	sed -i -e "/^CC/ s/=.*$/= '$(tc-getCC)'/" \
+		-e "/^CXX\s/ s/=.*$/= '$(tc-getCXX)'/" \
+		-e 's/PlatformInfo.debugging_cflags//' build/basics.rb || die
+
+	# Avoid fixed debugging CFLAGs.
+	sed -e '/debugging_cflags/areturn ""' -i src/ruby_supportlib/phusion_passenger/platform_info/compiler.rb || die
+
+	# Use sed here so that we can dynamically set the documentation directory.
+	sed -i -e "s:/usr/share/doc/passenger:/usr/share/doc/${P}:" \
+		-e "s:/usr/lib/phusion-passenger/agents:/usr/libexec/phusion-passenger/agents:" \
+		src/ruby_supportlib/phusion_passenger.rb || die
+	sed -i -e "s:/usr/lib/phusion-passenger/agents:/usr/libexec/phusion-passenger/agents:" src/cxx_supportlib/ResourceLocator.h || die
+
+	# Don't install a tool that won't work in our setup.
+	sed -i -e '/passenger-install-apache2-module/d' src/ruby_supportlib/phusion_passenger/packaging.rb || die
+	rm -f bin/passenger-install-apache2-module || die "Unable to remove unneeded install script."
+
+	# Make sure we use the system-provided version where possible
+	rm -rf src/cxx_supportlib/vendor-copy/libuv || die "Unable to remove vendored code."
+
+	# Avoid building documentation to avoid a dependency on mizuho.
+	#sed -i -e 's/, :doc//' build/packaging.rb || die
+	touch doc/*.html || die
+
+	# Fix hard-coded use of AR
+	sed -i -e "s/ar cru/"$(tc-getAR)" cru/" build/support/cplusplus.rb || die
+}
+
+all_ruby_compile() {
+	if use apache2 ; then
+		V=1 EXTRA_LDFLAGS="${LDFLAGS}" \
+		 APXS2="${APXS}" \
+		 HTTPD="${APACHE_BIN}" \
+		 FS_LIBDIR='/usr/'$(get_libdir) \
+		 USE_VENDORED_LIBUV="no" LIBUV_LIBS="-luv" \
+		 ruby -S rake apache2 || die "rake failed"
+	fi
+}
+
+each_ruby_compile() {
+	append-flags -fno-strict-aliasing
+
+	V=1 EXTRA_LDFLAGS="${LDFLAGS}" \
+	APXS2="${APXS}" \
+	HTTPD="${APACHE_BIN}" \
+	FS_LIBDIR='/usr/'$(get_libdir) \
+	USE_VENDORED_LIBUV="no" LIBUV_LIBS="-luv" \
+	${RUBY} -S rake native_support || die "rake failed"
+}
+
+all_ruby_install() {
+	if use apache2 ; then
+		APACHE2_MOD_FILE="${S}/buildout/apache2/mod_${PN}.so"
+		apache-module_src_install
+
+		# Patch in the correct libdir
+		sed -i -e 's:/usr/lib/:/usr/'$(get_libdir)'/:' "${D}${APACHE_MODULES_CONFDIR}/30_mod_${PN}.conf" || die
+	fi
+
+	dodoc CHANGELOG README.md
+}
+
+each_ruby_install() {
+	DISTDIR="${D}" \
+	RUBYLIBDIR="$(ruby_rbconfig_value vendordir)" \
+	RUBYARCHDIR="$(ruby_rbconfig_value archdir)" \
+	APXS2="${APXS}" \
+	HTTPD="${APACHE_BIN}" \
+	FS_LIBDIR='/usr/'$(get_libdir) \
+	EXTRA_LDFLAGS="${LDFLAGS}" \
+	USE_VENDORED_LIBUV="no" LIBUV_LIBS="-luv" \
+	${RUBY} -S rake fakeroot || die "rake failed"
+}
diff --git a/www-apache/passenger/passenger-5.1.7.ebuild b/www-apache/passenger/passenger-5.1.7.ebuild
new file mode 100644
index 000000000000..3dc6b74b68bd
--- /dev/null
+++ b/www-apache/passenger/passenger-5.1.7.ebuild
@@ -0,0 +1,122 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+USE_RUBY="ruby21 ruby22 ruby23 ruby24"
+
+inherit apache-module flag-o-matic multilib ruby-ng toolchain-funcs
+
+DESCRIPTION="Passenger makes deployment of Ruby on Rails applications a breeze"
+HOMEPAGE="https://www.phusionpassenger.com/"
+SRC_URI="https://s3.amazonaws.com/phusion-passenger/releases/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="apache2 debug"
+
+ruby_add_bdepend "dev-ruby/rake"
+
+ruby_add_rdepend "
+	>=dev-ruby/rack-1.0.0:*
+	>=dev-ruby/rake-0.8.1"
+
+# libev is bundled but with adapations that do not seem to be accepted
+# upstream, so we must use the bundled version :-(
+CDEPEND="
+	>=dev-libs/libuv-1.8.0
+	net-misc/curl[ssl]
+	apache2? ( www-servers/apache[apache2_modules_unixd(+)] )"
+
+RDEPEND="${RDEPEND} ${CDEPEND}"
+DEPEND="${DEPEND} ${CDEPEND}"
+
+APACHE2_MOD_CONF="30_mod_${PN}-5.0.0 30_mod_${PN}"
+APACHE2_MOD_DEFINE="PASSENGER"
+
+want_apache2
+
+pkg_setup() {
+	use debug && append-flags -DPASSENGER_DEBUG
+	depend.apache_pkg_setup
+}
+
+all_ruby_prepare() {
+	epatch "${FILESDIR}"/${PN}-5.0.20-gentoo.patch
+	epatch "${FILESDIR}"/${PN}-5.1.1-isnan.patch
+
+	# Change these with sed instead of a patch so that we can easily use
+	# the toolchain-funcs methods.
+	sed -i -e "/^CC/ s/=.*$/= '$(tc-getCC)'/" \
+		-e "/^CXX\s/ s/=.*$/= '$(tc-getCXX)'/" \
+		-e 's/PlatformInfo.debugging_cflags//' build/basics.rb || die
+
+	# Avoid fixed debugging CFLAGs.
+	sed -e '/debugging_cflags/areturn ""' -i src/ruby_supportlib/phusion_passenger/platform_info/compiler.rb || die
+
+	# Use sed here so that we can dynamically set the documentation directory.
+	sed -i -e "s:/usr/share/doc/passenger:/usr/share/doc/${P}:" \
+		-e "s:/usr/lib/phusion-passenger/agents:/usr/libexec/phusion-passenger/agents:" \
+		src/ruby_supportlib/phusion_passenger.rb || die
+	sed -i -e "s:/usr/lib/phusion-passenger/agents:/usr/libexec/phusion-passenger/agents:" src/cxx_supportlib/ResourceLocator.h || die
+
+	# Don't install a tool that won't work in our setup.
+	sed -i -e '/passenger-install-apache2-module/d' src/ruby_supportlib/phusion_passenger/packaging.rb || die
+	rm -f bin/passenger-install-apache2-module || die "Unable to remove unneeded install script."
+
+	# Make sure we use the system-provided version where possible
+	rm -rf src/cxx_supportlib/vendor-copy/libuv || die "Unable to remove vendored code."
+
+	# Avoid building documentation to avoid a dependency on mizuho.
+	#sed -i -e 's/, :doc//' build/packaging.rb || die
+	touch doc/*.html || die
+
+	# Fix hard-coded use of AR
+	sed -i -e "s/ar cru/"$(tc-getAR)" cru/" build/support/cplusplus.rb || die
+}
+
+all_ruby_compile() {
+	if use apache2 ; then
+		V=1 EXTRA_LDFLAGS="${LDFLAGS}" \
+		 APXS2="${APXS}" \
+		 HTTPD="${APACHE_BIN}" \
+		 FS_LIBDIR='/usr/'$(get_libdir) \
+		 USE_VENDORED_LIBUV="no" LIBUV_LIBS="-luv" \
+		 ruby -S rake apache2 || die "rake failed"
+	fi
+}
+
+each_ruby_compile() {
+	append-flags -fno-strict-aliasing
+
+	V=1 EXTRA_LDFLAGS="${LDFLAGS}" \
+	APXS2="${APXS}" \
+	HTTPD="${APACHE_BIN}" \
+	FS_LIBDIR='/usr/'$(get_libdir) \
+	USE_VENDORED_LIBUV="no" LIBUV_LIBS="-luv" \
+	${RUBY} -S rake native_support || die "rake failed"
+}
+
+all_ruby_install() {
+	if use apache2 ; then
+		APACHE2_MOD_FILE="${S}/buildout/apache2/mod_${PN}.so"
+		apache-module_src_install
+
+		# Patch in the correct libdir
+		sed -i -e 's:/usr/lib/:/usr/'$(get_libdir)'/:' "${D}${APACHE_MODULES_CONFDIR}/30_mod_${PN}.conf" || die
+	fi
+
+	dodoc CHANGELOG README.md
+}
+
+each_ruby_install() {
+	DISTDIR="${D}" \
+	RUBYLIBDIR="$(ruby_rbconfig_value vendordir)" \
+	RUBYARCHDIR="$(ruby_rbconfig_value archdir)" \
+	APXS2="${APXS}" \
+	HTTPD="${APACHE_BIN}" \
+	FS_LIBDIR='/usr/'$(get_libdir) \
+	EXTRA_LDFLAGS="${LDFLAGS}" \
+	USE_VENDORED_LIBUV="no" LIBUV_LIBS="-luv" \
+	${RUBY} -S rake fakeroot || die "rake failed"
+}
diff --git a/www-apache/passenger/passenger-5.1.8.ebuild b/www-apache/passenger/passenger-5.1.8.ebuild
new file mode 100644
index 000000000000..2649ae2a9bab
--- /dev/null
+++ b/www-apache/passenger/passenger-5.1.8.ebuild
@@ -0,0 +1,122 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+USE_RUBY="ruby22 ruby23 ruby24"
+
+inherit apache-module flag-o-matic multilib ruby-ng toolchain-funcs
+
+DESCRIPTION="Passenger makes deployment of Ruby on Rails applications a breeze"
+HOMEPAGE="https://www.phusionpassenger.com/"
+SRC_URI="https://s3.amazonaws.com/phusion-passenger/releases/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="apache2 debug"
+
+ruby_add_bdepend "dev-ruby/rake"
+
+ruby_add_rdepend "
+	>=dev-ruby/rack-1.0.0:*
+	>=dev-ruby/rake-0.8.1"
+
+# libev is bundled but with adapations that do not seem to be accepted
+# upstream, so we must use the bundled version :-(
+CDEPEND="
+	>=dev-libs/libuv-1.8.0
+	net-misc/curl[ssl]
+	apache2? ( www-servers/apache[apache2_modules_unixd(+)] )"
+
+RDEPEND="${RDEPEND} ${CDEPEND}"
+DEPEND="${DEPEND} ${CDEPEND}"
+
+APACHE2_MOD_CONF="30_mod_${PN}-5.0.0 30_mod_${PN}"
+APACHE2_MOD_DEFINE="PASSENGER"
+
+want_apache2
+
+pkg_setup() {
+	use debug && append-flags -DPASSENGER_DEBUG
+	depend.apache_pkg_setup
+}
+
+all_ruby_prepare() {
+	epatch "${FILESDIR}"/${PN}-5.0.20-gentoo.patch
+	epatch "${FILESDIR}"/${PN}-5.1.1-isnan.patch
+
+	# Change these with sed instead of a patch so that we can easily use
+	# the toolchain-funcs methods.
+	sed -i -e "/^CC/ s/=.*$/= '$(tc-getCC)'/" \
+		-e "/^CXX\s/ s/=.*$/= '$(tc-getCXX)'/" \
+		-e 's/PlatformInfo.debugging_cflags//' build/basics.rb || die
+
+	# Avoid fixed debugging CFLAGs.
+	sed -e '/debugging_cflags/areturn ""' -i src/ruby_supportlib/phusion_passenger/platform_info/compiler.rb || die
+
+	# Use sed here so that we can dynamically set the documentation directory.
+	sed -i -e "s:/usr/share/doc/passenger:/usr/share/doc/${P}:" \
+		-e "s:/usr/lib/phusion-passenger/agents:/usr/libexec/phusion-passenger/agents:" \
+		src/ruby_supportlib/phusion_passenger.rb || die
+	sed -i -e "s:/usr/lib/phusion-passenger/agents:/usr/libexec/phusion-passenger/agents:" src/cxx_supportlib/ResourceLocator.h || die
+
+	# Don't install a tool that won't work in our setup.
+	sed -i -e '/passenger-install-apache2-module/d' src/ruby_supportlib/phusion_passenger/packaging.rb || die
+	rm -f bin/passenger-install-apache2-module || die "Unable to remove unneeded install script."
+
+	# Make sure we use the system-provided version where possible
+	rm -rf src/cxx_supportlib/vendor-copy/libuv || die "Unable to remove vendored code."
+
+	# Avoid building documentation to avoid a dependency on mizuho.
+	#sed -i -e 's/, :doc//' build/packaging.rb || die
+	touch doc/*.html || die
+
+	# Fix hard-coded use of AR
+	sed -i -e "s/ar cru/"$(tc-getAR)" cru/" build/support/cplusplus.rb || die
+}
+
+all_ruby_compile() {
+	if use apache2 ; then
+		V=1 EXTRA_LDFLAGS="${LDFLAGS}" \
+		 APXS2="${APXS}" \
+		 HTTPD="${APACHE_BIN}" \
+		 FS_LIBDIR='/usr/'$(get_libdir) \
+		 USE_VENDORED_LIBUV="no" LIBUV_LIBS="-luv" \
+		 ruby -S rake apache2 || die "rake failed"
+	fi
+}
+
+each_ruby_compile() {
+	append-flags -fno-strict-aliasing
+
+	V=1 EXTRA_LDFLAGS="${LDFLAGS}" \
+	APXS2="${APXS}" \
+	HTTPD="${APACHE_BIN}" \
+	FS_LIBDIR='/usr/'$(get_libdir) \
+	USE_VENDORED_LIBUV="no" LIBUV_LIBS="-luv" \
+	${RUBY} -S rake native_support || die "rake failed"
+}
+
+all_ruby_install() {
+	if use apache2 ; then
+		APACHE2_MOD_FILE="${S}/buildout/apache2/mod_${PN}.so"
+		apache-module_src_install
+
+		# Patch in the correct libdir
+		sed -i -e 's:/usr/lib/:/usr/'$(get_libdir)'/:' "${D}${APACHE_MODULES_CONFDIR}/30_mod_${PN}.conf" || die
+	fi
+
+	dodoc CHANGELOG README.md
+}
+
+each_ruby_install() {
+	DISTDIR="${D}" \
+	RUBYLIBDIR="$(ruby_rbconfig_value vendordir)" \
+	RUBYARCHDIR="$(ruby_rbconfig_value archdir)" \
+	APXS2="${APXS}" \
+	HTTPD="${APACHE_BIN}" \
+	FS_LIBDIR='/usr/'$(get_libdir) \
+	EXTRA_LDFLAGS="${LDFLAGS}" \
+	USE_VENDORED_LIBUV="no" LIBUV_LIBS="-luv" \
+	${RUBY} -S rake fakeroot || die "rake failed"
+}
diff --git a/www-apache/pwauth/Manifest b/www-apache/pwauth/Manifest
new file mode 100644
index 000000000000..346be50ff7e5
--- /dev/null
+++ b/www-apache/pwauth/Manifest
@@ -0,0 +1,9 @@
+AUX pwauth-2.3.10-config.patch 1138 SHA256 074c4e6626b695c407862c206c64ae2b008724e0e89a7d5a0e2d6abbde4c2bce SHA512 54fc2be85259c4759017a1d9bb625e2327488f6c21876daf28ef039466d3dd3fd0322cd7fa939201f74bcf9a1e1399b234ad1e92dd9b32d10cf80e299c7df69e WHIRLPOOL e2768119b8de6c3db0496a0032bc67b09f562d97caeaedd92e249d6e452da1ec24d1f3196ce16248062818dfddcbb4d7d5ae20c64afc94307ba83dae3b28aefb
+AUX pwauth-2.3.10-makefile.patch 1468 SHA256 187f578a51d9a5bad5fd33540b95709319bddd8971dc90bad567c20013ac6d4f SHA512 59af2f921f443f8bbb872cb38d2d073cc80509295a9d643859b1fb1e71bffb9795688461f15bb77ab87f7f113df56638eb0ae4bf2b59ab860fc11aef4dc2a08c WHIRLPOOL d327f5aeb146dbaef0e1f3cef3595954a40444283fcf56f3df25db88785a33d376d2c6a8d3e511050db3d5656c4fb3322eab358a6ff260eb988130925ce3df2e
+AUX pwauth-strchr.patch 272 SHA256 40ea7e48ad9d2f1c01fb81e4fc7670afdc14fbda4d82498f8bbaefd8ccc971a4 SHA512 2717de2fd77bea0f2fbba2462b6a252cdb4acfd1e6a61cd3208cda4d283ed719b2f7f0c31090d5e0cde06aa8b6005e0fd78a660554827f0c65bfa8cd3af1e8f8 WHIRLPOOL 364cd5a18343f5bf5098708a0c920d6e3b9bf6adf8e5768f0fab2517c332dbb7ba6fcea6b3b5e7efbb594c1d2d45a269afab134476407c84acd9c57f124311c0
+AUX pwauth.pam-include 174 SHA256 351e55f39d90a4b25369b99fe0444fc6e9eb607fabedf70c8c43cd6192f75067 SHA512 0169ddc1945230570491c5a3e6d21ba521d2b44dde35ff84d5c4def07b7f09c51ddb99c03f401a02a4f913036e1cd8babdfbc38cd5eaa27cccd5c3618cbe17cd WHIRLPOOL 896ed3f78a0adf2dd3e7d67701ae2afed8d61bc100ad80490474b2a39345d2772ac653ce7cba280f6cbe5a1747aa004d073c65917e67b101ae66be5ad194c21a
+DIST pwauth-2.3.10.tar.gz 23825 SHA256 267813acccc58d407b735ebfd32ee7ec52726379d0aa3670731d2ea4c9d85906 SHA512 a2f02f2c8b61d87cc0c034952e17f187bbc358506052a31107ccd38a938d59862f0ee18362c84984c900d2986bb35abbbd5877d4cf973a0215a6ec3656a23bff WHIRLPOOL 694fa855c2129c13fa18869bb58eef4a0ca6261e7aa84bf454a567270ae129929aada49474a372b082b9ee1d30c0af83cc44e2351be49eb70b123d5f977f6c8f
+EBUILD pwauth-2.3.10.ebuild 1914 SHA256 617d7a8cab7851b4d8403897f5cb2fa609191e1daadd0f7da3fe55556f5ca6ed SHA512 da19048a6f783c9cd088a839c6eb62737bfaa5a096494c80598c05b7a6bef564cda31e81865c957f80252600454750be70d6750458f179cb8edd46892d1e18f7 WHIRLPOOL 4553d19bc4036aaf105e58ff16e69da9c0e3e567eb25b1500fd689f50c3387385fed903cde5c7990616734c7900aaca0d5365008bc6b06d68c6c6da509a33005
+MISC ChangeLog 3285 SHA256 cbd0a5fea279ccd4f74b025dbe4145720585bce81bccf3df9e772b7a92d04d51 SHA512 174a8cb5d0b2034cc4ceef7d1814da55aa17e7c600b02bf84ea69836f0606e614766e68f904eee76509d5a61d20640b2b35223af21c202bf2d03f2361710df0e WHIRLPOOL 46d8a9ed471755631da8a3296f104d1c3d60a1b543b93593441266bf8dc05ecd37dfec289a481a837313ca8ffacd7407faed1745437df0f5ce01cf97fd86d244
+MISC ChangeLog-2015 2782 SHA256 6c3faf4800b2766759bb92a34d460abd379672539a8d7b02d6407968b185d49f SHA512 4b61ba429dc30e23cc5b491ad3d8bbdaba536bdf78c4e52bb86e9c67ffe3279d7c0c9e39e71cfeb592da5672890f26f098586f9e3d104facbc7983f8fce0e540 WHIRLPOOL d4be747e68b07e74251bd8cdf8aca06d92f9eb547e56b8d50b8e028bb7c6947e55f874a5b9f77e441c686232f115b139d57ed5ff94614188d47569f6bb120f7b
+MISC metadata.xml 502 SHA256 3c01094972d48b5cd70e100e38b9947a974f73e18620a669ca11e585348129c2 SHA512 57990b021af7f99ad2dfcff6ee111acac263f8624d385b302f455c16d24ebb0dbe95b4e6caad36e10938b79666d2ec23ac1e642919af83c934cce479b1fb54f1 WHIRLPOOL 851e4c615e733212d6978f019b706dd80406f647e0a8ef7697b446213cac854b115102f521651d21f17ed354bdcae3b7d914627a10078fc44918483ca2d072f7
diff --git a/www-apache/pwauth/files/pwauth-2.3.10-config.patch b/www-apache/pwauth/files/pwauth-2.3.10-config.patch
new file mode 100644
index 000000000000..03ae3b876d99
--- /dev/null
+++ b/www-apache/pwauth/files/pwauth-2.3.10-config.patch
@@ -0,0 +1,38 @@
+--- config.h.orig	2013-01-01 19:33:54.053978814 +0400
++++ config.h	2013-01-01 19:35:09.764049695 +0400
+@@ -112,7 +112,7 @@
+ 
+ /* #define SHADOW_NONE		/**/
+ /* #define SHADOW_BSD		/* FreeBSD, NetBSD, OpenBSD, BSDI, OS X */
+-#define SHADOW_SUN		/* Linux, Solaris, IRIX */
++/* #define SHADOW_SUN		/* Linux, Solaris, IRIX */
+ /* #define SHADOW_JFH		/**/
+ /* #define SHADOW_MDW		/**/
+ /* #define SHADOW_AIX		/* AIX */
+@@ -245,7 +245,7 @@
+  * to change the uid list.
+  */
+ 
+-#define SERVER_UIDS 30		/* user "wwwrun" on the author's system */
++/* #define SERVER_UIDS 81		/* user "nobody" */
+ 
+ 
+ /* If MIN_UNIX_UID is defined to an integer, logins with uid numbers less than
+@@ -257,7 +257,7 @@
+  * given value will be accepted).
+  */
+ 
+-#define MIN_UNIX_UID 500	/**/
++/* #define MIN_UNIX_UID 500	/**/
+ 
+ 
+ /* If IGNORE_CASE is defined, the login given is checked in two different
+@@ -285,7 +285,7 @@
+  * SLEEP_LOCK.  SLEEP_TIME defaults to 2 seconds if not defined.
+  */
+ 
+-#define SLEEP_LOCK "/var/run/pwauth.lock"
++#define SLEEP_LOCK "/var/lock/pwauth.lock"
+ 
+ 
+ /* If ENV_METHOD is defined, pwauth expects mod_auth_external to be configured
diff --git a/www-apache/pwauth/files/pwauth-2.3.10-makefile.patch b/www-apache/pwauth/files/pwauth-2.3.10-makefile.patch
new file mode 100644
index 000000000000..a211a06b7231
--- /dev/null
+++ b/www-apache/pwauth/files/pwauth-2.3.10-makefile.patch
@@ -0,0 +1,42 @@
+--- Makefile.orig	2013-01-01 20:19:30.061522843 +0400
++++ Makefile	2013-01-01 20:20:00.356551208 +0400
+@@ -2,19 +2,7 @@
+ # system.  Most of the configurable stuff is in config.h
+ #
+ #   CC=       an ansi-C compiler.  If "cc" doesn't work, try "gcc".
+-#   LIB=      libraries to link in.  -lcrypt, -lshadow, -lpam sometimes needed.
+-#   LOCALFLAGS=   compiler flags.  Usually -g, -O, and stuff like that.
+-
+-# Settings for author's system (Redhat 6.1)
+-CC=gcc
+-LIB= -lcrypt
+-LOCALFLAGS= -g 
+-
+-# For PAM on Redhat Linux
+-# LIB=-lpam -ldl
+-
+-# For PAM on Solaris or OS X
+-# LIB=-lpam
++#   LIBS=  libraries to link in.  -lcrypt, -lshadow, -lpam sometimes needed.
+ 
+ # -------------------- No User Servicable Parts Below -----------------------
+ 
+@@ -25,16 +13,14 @@
+ 
+ .PHONY: clean distclean
+ 
+-CFLAGS= $(LOCALFLAGS)
+-
+ pwauth: main.o auth_aix.o auth_bsd.o auth_hpux.o auth_mdw.o auth_openbsd.o \
+ 	auth_pam.o auth_sun.o fail_log.o lastlog.o nologin.o snooze.o
+ 	$(CC) -o pwauth $(CFLAGS) main.o auth_aix.o auth_bsd.o auth_hpux.o \
+ 		auth_mdw.o auth_openbsd.o auth_pam.o auth_sun.o fail_log.o \
+-		lastlog.o nologin.o snooze.o $(LIB)
++		lastlog.o nologin.o snooze.o $(LDFLAGS) $(LIBS)
+ 
+ checkfaillog: checkfaillog.o fail_check.o
+-	$(CC) -o checkfaillog $(CFLAGS) checkfaillog.o fail_check.o $(LIB)
++	$(CC) -o checkfaillog $(CFLAGS) checkfaillog.o fail_check.o $(LDFLAGS) $(LIBS)
+ 
+ main.o: main.c config.h pwauth.h fail_log.h
+ auth_aix.o: auth_aix.c config.h pwauth.h
diff --git a/www-apache/pwauth/files/pwauth-strchr.patch b/www-apache/pwauth/files/pwauth-strchr.patch
new file mode 100644
index 000000000000..0c5d6581c96b
--- /dev/null
+++ b/www-apache/pwauth/files/pwauth-strchr.patch
@@ -0,0 +1,11 @@
+--- main.c.orig	2013-01-01 19:45:32.389626661 +0400
++++ main.c	2013-01-01 19:45:50.524643637 +0400
+@@ -48,7 +48,7 @@
+     char *login, *passwd;
+ #else
+     char login[BFSZ+1], passwd[BFSZ+1];
+-    char *c, *strchr();
++    char *c;
+ #endif
+     int uid,i;
+     int status;
diff --git a/www-apache/pwauth/files/pwauth.pam-include b/www-apache/pwauth/files/pwauth.pam-include
new file mode 100644
index 000000000000..7f4f041b28ac
--- /dev/null
+++ b/www-apache/pwauth/files/pwauth.pam-include
@@ -0,0 +1,6 @@
+#%PAM-1.0
+auth       required		pam_nologin.so
+auth       include		system-auth
+account    include		system-auth
+password   include		system-auth
+session    include		system-auth
diff --git a/www-apache/pwauth/metadata.xml b/www-apache/pwauth/metadata.xml
new file mode 100644
index 000000000000..9fe5ac7f61ed
--- /dev/null
+++ b/www-apache/pwauth/metadata.xml
@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<!-- maintainer-needed -->
+	<use>
+		<flag name="domain-aware">Ignore leading domain names in username
+			(Windows compat)</flag>
+		<flag name="faillog">Log failed login attempts</flag>
+		<flag name="ignore-case">Ignore string case in username (mostly Windows
+			compat)</flag>
+	</use>
+	<upstream>
+		<remote-id type="github">phokz/pwauth</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/www-apache/pwauth/pwauth-2.3.10.ebuild b/www-apache/pwauth/pwauth-2.3.10.ebuild
new file mode 100644
index 000000000000..8bd3806e64a3
--- /dev/null
+++ b/www-apache/pwauth/pwauth-2.3.10.ebuild
@@ -0,0 +1,72 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+inherit base flag-o-matic pam toolchain-funcs
+
+DESCRIPTION="A Unix Web Authenticator"
+HOMEPAGE="https://github.com/phokz/pwauth/tree/master/pwauth"
+SRC_URI="https://pwauth.googlecode.com/files/${P}.tar.gz"
+
+LICENSE="Apache-1.1"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~x86"
+IUSE="faillog pam ignore-case domain-aware"
+
+DEPEND="pam? ( virtual/pam )"
+RDEPEND="${DEPEND}"
+
+PATCHES=(
+	"${FILESDIR}/${P}-config.patch"
+	"${FILESDIR}/${P}-makefile.patch"
+	"${FILESDIR}/${PN}-strchr.patch"
+)
+
+pkg_setup() {
+	einfo "You can configure various build time options with ENV variables:"
+	einfo
+	einfo "    PWAUTH_FAILLOG      Path to logfile for login failures"
+	einfo "                        (default: /var/log/pwauth.log)"
+	einfo "    PWAUTH_SERVERUIDS   Comma seperated list of UIDs allowed to run pwauth"
+	einfo "                        (default: 81)"
+	einfo "    PWAUTH_MINUID       Minimum UID for which authentication will succeed"
+	einfo "                        (default: 1000)"
+	einfo
+
+	PWAUTH_FAILLOG="${PWAUTH_FAILLOG:-/var/log/pwauth.log}"
+	PWAUTH_SERVERUIDS="${PWAUTH_SERVERUIDS:-81}"
+	PWAUTH_MINUID="${PWAUTH_MINUID:-1000}"
+
+	append-cflags "-DSERVER_UIDS=${PWAUTH_SERVERUIDS}"
+	append-cflags "-DMIN_UNIX_UID=${PWAUTH_MINUID}"
+
+	if use faillog; then
+		append-cflags -DFAILLOG_PWAUTH
+		append-cflags "-DPATH_FAILLOG=\"\\\"${PWAUTH_FAILLOG}\\\"\""
+	fi
+
+	if use pam; then
+		append-cflags -DPAM
+		append-libs pam
+	else
+		append-cflags -DSHADOW_SUN
+		append-libs crypt
+	fi
+
+	use ignore-case && append-cflags -DIGNORE_CASE
+	use domain-aware && append-cflags -DOMAIN_AWARE
+}
+
+src_compile() {
+	emake CC="$(tc-getCC)" CFLAGS="${CFLAGS}"
+}
+
+src_install() {
+	dosbin pwauth unixgroup
+	fperms 4755 /usr/sbin/pwauth
+
+	use pam && newpamd "${FILESDIR}"/pwauth.pam-include pwauth
+
+	dodoc CHANGES FORM_AUTH INSTALL README
+}
author	V3n3RiX <venerix@redcorelinux.org>	2017-10-09 18:53:29 +0100
committer	V3n3RiX <venerix@redcorelinux.org>	2017-10-09 18:53:29 +0100
commit	4f2d7949f03e1c198bc888f2d05f421d35c57e21 (patch)
tree	ba5f07bf3f9d22d82e54a462313f5d244036c768 /www-apache