gentoo resync : 25.09.2019

6 files changed, 136 insertions, 7 deletions

diff --git a/www-apache/Manifest.gz b/www-apache/Manifest.gz
index 08bc34203c86..31ee00a282ad 100644
--- a/www-apache/Manifest.gz
+++ b/www-apache/Manifest.gz
diff --git a/www-apache/mod_extract_forwarded/Manifest b/www-apache/mod_extract_forwarded/Manifest
index 9b9855a55538..d223edb99259 100644
--- a/www-apache/mod_extract_forwarded/Manifest
+++ b/www-apache/mod_extract_forwarded/Manifest
@@ -1,4 +1,4 @@
 AUX 98_mod_extract_forwarded.conf 197 BLAKE2B b78103878b2b6a3009474b73ab74799b28edcd7f822fe022347afa10e8981e01d9437c50f39235bf0895bc6466a3c6935a3a96c262eeb543b538c33bd0b5b921 SHA512 197199ea86b5d1c3f50c57c0f9c4b31f14d2138d62e02de33a18e1b04f8c10f27568786a8168b113e5469727fc427005f225dad057a7875f0db737273ea567f3
 DIST mod_extract_forwarded-2.0.3_pre2015052015.tar.xz 13548 BLAKE2B dd156fc09d0074f83e2b06f3faf546a924cfc81c6906ab884832fbfe4526eb70571e6694f557e111496ed2345c7bfc3f14e7e59e9367483d2069ca5053d26bab SHA512 26cfde6343885eea964dcd96ce9bc5952bfb9b5b27b093abd71358a26548c1361e37449d2f38a68aa0bac0bc43e465d65d6fbfaf91598b94ced2e65b861a14db
-EBUILD mod_extract_forwarded-2.0.3_pre2015052015.ebuild 797 BLAKE2B e788e767187481dbb71ed80e6aba8ae5cc8436e4f76911d3f643a94edcd8b0b2e9856ca1b792988ba0a76f3050cf2f0d6c1829b5a95549f025fd439884f8a6c1 SHA512 b8a57a4351a1b4985f7bcdc0ba78fd86256d4fc4818c164b4c1d0386e27eb62e4c0856ed05a6e9c9d30db5a46b8f0514e5b06cbebb4cf689094bb309c8521666
-MISC metadata.xml 255 BLAKE2B 61f61c2e5d4e79266556f6587113eafce2dafcde4c8008032bc65d78f429f8321da7523cdfbb9d7adc4744bf6667778e2588fe723b24e7cca524e8ebe555aa79 SHA512 872ec5f38b8d42f79ec992590a584ea855abdc6e4a5aad7f0ff60ae63a91de047e7770e17d92cc3bda7cfa421bda2872ff3c3c7c686892a2bd40430571658308
+EBUILD mod_extract_forwarded-2.0.3_pre2015052015.ebuild 794 BLAKE2B d161f4fb76309194edc4ffb66af9b4e4374c0444af83f02fc621b005e7406027b9ca61321fa6a6ff93a93155fa4440ef5644e218ddd0239e2b8feae5f1a1744c SHA512 dad3112c2cf74c5d352b7b0de60dfe05b1e562d718ccc9d98d79b947ac2e609e6068713ff74bd163379f70ee7df0f7732e68cdd1e5ad200e846a325ff1e222c8
+MISC metadata.xml 255 BLAKE2B 1df732a2fa226ce9ce5423c0a5b1c635f878e0e9abf1d343fcb2447fbabccf736d7ad835749d33afd7a8c0961794ab30ca1f363ee5b366bbb552300924b0bf18 SHA512 ff945e35264aeccad178d7c9dc5f1d5f96c87ab7fc291860831a0514a869b501e8a22f0bcd76683f12c2f65cb47ce10fb7752346fbb3bffeedd9c05a70704322
diff --git a/www-apache/mod_extract_forwarded/metadata.xml b/www-apache/mod_extract_forwarded/metadata.xml
index cd3828aea5dc..f30b35246ca7 100644
--- a/www-apache/mod_extract_forwarded/metadata.xml
+++ b/www-apache/mod_extract_forwarded/metadata.xml
@@ -3,6 +3,6 @@
 <pkgmetadata>
 <!-- maintainer-needed -->
 <use>
-		<flag name="mod_proxy">Enable support for Apache's internal proxy</flag>
+		<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
index 284bedb2db25..24703f93f876 100644
--- 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
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
@@ -12,10 +12,10 @@ SRC_URI="https://dev.gentoo.org/~pacho/maintainer-needed/${P}.tar.xz"
 LICENSE="Apache-1.1"
 SLOT="0"
 KEYWORDS="amd64 x86"
-IUSE="mod_proxy"
+IUSE="mod-proxy"
 
 DEPEND=""
-RDEPEND="mod_proxy? ( www-servers/apache[apache2_modules_proxy_connect] )"
+RDEPEND="mod-proxy? ( www-servers/apache[apache2_modules_proxy_connect] )"
 
 APACHE2_MOD_CONF="98_${PN}"
 APACHE2_MOD_DEFINE="EXTRACT_FORWARDED"
@@ -23,7 +23,7 @@ APACHE2_MOD_DEFINE="EXTRACT_FORWARDED"
 need_apache2_4
 
 src_prepare() {
-	if ! use mod_proxy; then
+	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/passenger/Manifest b/www-apache/passenger/Manifest
index af4782090b3e..fd956a21ce5f 100644
--- a/www-apache/passenger/Manifest
+++ b/www-apache/passenger/Manifest
@@ -4,7 +4,9 @@ AUX passenger-5.1.11-gentoo.patch 1068 BLAKE2B 635bc4c4a2313dc00a038cb9c871b5b2f
 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
+DIST passenger-6.0.4.tar.gz 7347803 BLAKE2B 2e367b8dd0ace6a2773de92b3237821625190f2ae52fd11a1a3c47230d24affe1f9d161ef0346210cc91a21ae3a58f40f796063796399da0d133d6b0a261f52c SHA512 dd3398bece50c9da6029a5a9d98de2bed2e33a92f49fc776fe2b8f80f4a47e36d8a716c12f2f74d9611de5aa04981ddf680fc29a37f5b1860731a6f6e8390c81
 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
+EBUILD passenger-6.0.4.ebuild 3979 BLAKE2B 9ed1cd575c59b2c897b183c81e863685ab1ab992527f0267f3709f31e332ecc373b780593bc7cd0469f252b870159a21eee041d7b22d76601a2f0936d0472da0 SHA512 394ba8a643d00912031cfc1b2169d2cfca29d374ed10195eda3340b4f995cd0a3da08d2c98122ae86e9d78b72b549b1af9a08ac8934d5223faa0c8cf417db17a
 MISC metadata.xml 330 BLAKE2B 80067f262ce3e04098eaab92ec2420a879014d624fa6c230f57daf871ac33b77fcd786868ec508236c62623f2c81dc86573875a42993604896745524d7220fc7 SHA512 5ea7e5026084dedcd363bb79076763cca7d66bb08411d5e2dc56ade23bfdbd522a8db13db9c0b8f50163f130f28c784b622d9639cb3dd33aa810dda3d2577db8
diff --git a/www-apache/passenger/passenger-6.0.4.ebuild b/www-apache/passenger/passenger-6.0.4.ebuild
new file mode 100644
index 000000000000..cca1985ecf44
--- /dev/null
+++ b/www-apache/passenger/passenger-6.0.4.ebuild
@@ -0,0 +1,127 @@
+# 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"
+}