Revert "gentoo resync : 13.09.2019"

This reverts commit a1392efe64137262023d92492396ca9156d22396.

7 files changed, 31 insertions, 132 deletions

diff --git a/www-apache/Manifest.gz b/www-apache/Manifest.gz
index 08bc34203c86..b1900e69949f 100644
--- a/www-apache/Manifest.gz
+++ b/www-apache/Manifest.gz
diff --git a/www-apache/mod_diagnostics/Manifest b/www-apache/mod_diagnostics/Manifest
index f95084846025..66b7578a46e2 100644
--- a/www-apache/mod_diagnostics/Manifest
+++ b/www-apache/mod_diagnostics/Manifest
@@ -1,4 +1,4 @@
 AUX 20_mod_diagnostics.conf 127 BLAKE2B 2eae27eaf774568cd7dcd7fa2fbc3a383df171c5109d348082a20f20609e2927fa76644c360aa50aa4f8ee084d3f93fbaefed7478fbd0889b31e1b1fb367f125 SHA512 ab19ed00552ac8424b773aea82b6760936cb1574e7dd43adc980c71fe6649419d8de6948a55c33b848ffa62cddff9680b202b7e1911f8448760d8b9f82b48692
 DIST mod_diagnostics-0.0.1.c 6373 BLAKE2B 4cc76a6abaef0eadfa6f6e1ba2d5c6852b6d73da0d17593b676e5112b855d9357754aef79b1a84bcfc279f7cf6056c84da8b6881bdac0ac822403d4e71852dd7 SHA512 b6f6498f70e37279508ca732aa3bbeb7180175ac35f16cfb88fa2c7558edec64b1cc3659b4516909888119f7984d51a98cadc9ef07480fdff5eac72174e8835b
-EBUILD mod_diagnostics-0.0.1.ebuild 599 BLAKE2B ae6a60ebfa4cf51add9be82f637a14235f52f67a04b26bef56a8f07340e758a9d6ec7de089f6a69abe5cfd1a5b257d4dce47df0b75def2f9a5d7ebf267ee6a63 SHA512 3c93760c91a4498c9735b531cf7c018c47148297e068995d8ec9d0a0a5297289e35aad7b092ffe2073000d5abacc2a440568b264d87c4e5951696e717884af4e
+EBUILD mod_diagnostics-0.0.1.ebuild 597 BLAKE2B e780cbc10bbc3475eb80d94e1b907b4fe1e4845eb1906d3671d2d02cd7b0051b439c69072f8279c349954769d2d55f4f266c96b004207d02dee9cb8d38cc17d4 SHA512 2b14de257075ce80b04c184eafd57411a97570cffe416fc10b9ef08fa20f1156c700a4df43b476519674422b97101d4260264e09bb2244c2a4dc34c4e7f13d02
 MISC metadata.xml 166 BLAKE2B c254f1fb642881aba57637be14fb0a89b10384f91a128feaec3a8c870d76efc2cbacb92caccc0dee2dd19a5ac5eaf8643080dafa05c4e2ac96a68568927e5afd SHA512 a56648c974a1d14dd4c18237532773c72057a13ab90c58b5da04f185e3c12a8bd8d5c21fb06053507f31766291a82dc7d87b34cd65fd94cfe2af7295c813ef84
diff --git a/www-apache/mod_diagnostics/mod_diagnostics-0.0.1.ebuild b/www-apache/mod_diagnostics/mod_diagnostics-0.0.1.ebuild
index a76bbf3ee643..a46688424551 100644
--- a/www-apache/mod_diagnostics/mod_diagnostics-0.0.1.ebuild
+++ b/www-apache/mod_diagnostics/mod_diagnostics-0.0.1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=0
@@ -10,7 +10,7 @@ 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="Apache-1.1"
+LICENSE="GPL-2"
 SLOT="0"
 IUSE=""
 
diff --git a/www-apache/mod_limitipconn/Manifest b/www-apache/mod_limitipconn/Manifest
index a80600fbd0a9..6bfe4108ce68 100644
--- a/www-apache/mod_limitipconn/Manifest
+++ b/www-apache/mod_limitipconn/Manifest
@@ -1,4 +1,5 @@
 AUX 27_mod_limitipconn.conf 554 BLAKE2B 2bd5e2224a19d2b5a18b64224db41e232ed2c9028fdcaa751251e29d9990e1006b0ca25d09682f1a108d176a5898d2460bb26dc92816dd79530706434ac1adb6 SHA512 7ded8b48b769529a8fcb6b25855d31ef82cf3de423a75ae5e986974ba2c21643adff235ec9bfcde1955513d10fc3fc9dde172ddb9fb43626eb625bed96936c3d
 DIST mod_limitipconn-0.24.tar.bz2 10150 BLAKE2B 0715a0494f6d434217093625f10b5b723de3823c88c82fe2ffa22972b2496abae0924fc7b5d773568af125dc92466e8ab84e3e86acde7756c9535b244e729e88 SHA512 caf1337231ac83ef57938b0f89769afcf309a4a09a0a2c3fb171e49f038d42a5859dfdac06b2c7766f05d9431132b8752aa8ad5164794c89638eb90f392e827f
 EBUILD mod_limitipconn-0.24-r3.ebuild 563 BLAKE2B d703559d5b77d66386af7c1b39329a614ab5157696b890ed04e12d6886d23abd61180a2fc4f11c670cf9fd00af43ee72f6bcc9c4fc34e4f2162907380690954e SHA512 bb08f2755a05ff01588a20656edd41b344e85cd8dca8977c934ef1ecfaf316ed3931e55f510fdd2d51d1beb5bf4828d5b6ad19ebed0a005bd765b1d38709c78b
+EBUILD mod_limitipconn-0.24.ebuild 550 BLAKE2B 7b856fc0b40c3a585e982423bc8bda2228735eb000389f486915d62ba27cc51b7678eb50cb8b07a95830e516e752af0372630f6ae04a19622b942f56195ed88e SHA512 68bcab646ac732ced0ed6309a36db46f57d64b2a6b6ceacfaae351c654f694776f96d9420d61108e63f3e3570b2cf81d3f4552ee55497c9adeead5d4cb180ac9
 MISC metadata.xml 358 BLAKE2B 557957d79622c5cee28e1c29cf2b72a812814427f198e5795af545a705848766278b04d6d7f650dac7e7374e82456208716cf2223b562707d5870a0020dfe973 SHA512 89dd1558e063150565f346d3b844bb6534bf49fb65c0f32208c620df671c9482d42b8f50c93de34d1d5f290c9e5bb4109d8a818edf994871c5428f7b3a387930
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..be774423dee3
--- /dev/null
+++ b/www-apache/mod_limitipconn/mod_limitipconn-0.24.ebuild
@@ -0,0 +1,27 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=0
+
+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/passenger/Manifest b/www-apache/passenger/Manifest
index af4782090b3e..0774078660e3 100644
--- a/www-apache/passenger/Manifest
+++ b/www-apache/passenger/Manifest
@@ -3,8 +3,6 @@ AUX passenger-5.1.1-isnan.patch 1155 BLAKE2B bb11276f94f4be93a7ef089e09079d36971
 AUX passenger-5.1.11-gentoo.patch 1068 BLAKE2B 635bc4c4a2313dc00a038cb9c871b5b2f0163f320d4f4d1bbd9d34ec34ec81f2fd2e7d9ea6f3d03c4a611f13095c4ad414ba7c0920064f8408837a2600d2d2e9 SHA512 c75442ac0403131e5fdbe76ec52acdcffcb6947af81ce79e003ebbb9e97d25a855651bd62c0aad66dd22d8cd4dff2221fc84b0ce74da3908f06f272c8b133c2d
 DIST passenger-5.3.7.tar.gz 7195477 BLAKE2B 43a2384574316f6c8472f326389e8c1feed769e78d66c20e63f6d2679b1ac1b20a9122612c98e3006520e6f24c5883addd93ef11e8f0385759ee0c9e9299b7ad SHA512 bbef4881e0e0c698b29b10ff8a7afbc001c31d14fb80ffa27ed6867a92ad23712319733e6162be1f7720ebda421630af2f258f8167fa73c7b5ea594bc8247158
 DIST passenger-6.0.2.tar.gz 7204982 BLAKE2B 056f85f88e49ca7dcfe37d1d1003beaa5325259a130b44aa60a319d36987c901b0a8a188998d38b68f3d396a71df0db8b8fc9562e58327b61a712dc39fb7ce1e SHA512 05a1c598588ad96864ef81ff8bc45535b3cb35c0f4840f16b93d39c0ece94378e806d967190a3d69b28b37d463624955bb45970459cf8febb258d8fd135e97f2
-DIST passenger-6.0.3.tar.gz 7347651 BLAKE2B 8f4b95d5f80cae2be05a57a5f125cc37241c9c4e0308ee09ec5b830a7ab5a3055408f043934f21723ac0d247f4d6d11c0f001b964c673efa791d1571aad75357 SHA512 0421255dbaa3992dea9d965ceec9fc9ffb3cf7d1a15f3f9837638e94bc3145e2e8eadeef94069cb8d9d759adeda308d92031f88cfc475b3b13c10b5088087a56
 EBUILD passenger-5.3.7.ebuild 3977 BLAKE2B da5ac9a4676d2ae1cd238be73803583619f2b0c5711761790a399cb19633f3f760de25dd7e04ad76a89cf2a7420fc74a60d150fc2fb2a25eff7aa7a8c6e60a5c SHA512 b6a6df0c2a3c0502632e6bb65511e9df1e468b013bbc56dbb430055e6dcca3dcf773f09fa108f9d993c1bddd5a2c41fd29cce889bc5a0985888b5cecc15bade2
 EBUILD passenger-6.0.2.ebuild 3984 BLAKE2B c5510d888f52ea09bc94d630804dfddcaa19ba8a504280fa38e3283cf3b03e18e8aa6e320f76b1a7b127fa4e1530b52eecd27e7e6977dec03bd2935a775e6f55 SHA512 2040af42ca47efe8ed3b51e8c5a2d3cf96cc840bb4c9e0e8cfcda06c150947a8a6bde5563ed3da8bd27b0374f334980802c84d2737c934c78c27fc320bd0b663
-EBUILD passenger-6.0.3.ebuild 3979 BLAKE2B 9ed1cd575c59b2c897b183c81e863685ab1ab992527f0267f3709f31e332ecc373b780593bc7cd0469f252b870159a21eee041d7b22d76601a2f0936d0472da0 SHA512 394ba8a643d00912031cfc1b2169d2cfca29d374ed10195eda3340b4f995cd0a3da08d2c98122ae86e9d78b72b549b1af9a08ac8934d5223faa0c8cf417db17a
 MISC metadata.xml 330 BLAKE2B 80067f262ce3e04098eaab92ec2420a879014d624fa6c230f57daf871ac33b77fcd786868ec508236c62623f2c81dc86573875a42993604896745524d7220fc7 SHA512 5ea7e5026084dedcd363bb79076763cca7d66bb08411d5e2dc56ade23bfdbd522a8db13db9c0b8f50163f130f28c784b622d9639cb3dd33aa810dda3d2577db8
diff --git a/www-apache/passenger/passenger-6.0.3.ebuild b/www-apache/passenger/passenger-6.0.3.ebuild
deleted file mode 100644
index cca1985ecf44..000000000000
--- a/www-apache/passenger/passenger-6.0.3.ebuild
+++ /dev/null
@@ -1,127 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-USE_RUBY="ruby24 ruby25 ruby26"
-
-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() {
-	eapply "${FILESDIR}"/${PN}-5.1.11-gentoo.patch
-	eapply "${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
-
-	# Make sure apache support is not attempted with -apache2
-	if ! use apache2 ; then
-		sed -i -e '/fakeroot/ s/:apache2, //' build/packaging.rb || die
-	fi
-}
-
-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"
-}