gentoo resync : 24.07.2021

5 files changed, 178 insertions, 0 deletions

diff --git a/www-apache/Manifest.gz b/www-apache/Manifest.gz
index ef50a92b1cb8..2f3f3c595ecd 100644
--- a/www-apache/Manifest.gz
+++ b/www-apache/Manifest.gz
diff --git a/www-apache/mod_h2/Manifest b/www-apache/mod_h2/Manifest
index 601ec2dd3fe0..af8cb919442f 100644
--- a/www-apache/mod_h2/Manifest
+++ b/www-apache/mod_h2/Manifest
@@ -6,6 +6,7 @@ DIST mod_h2-1.15.19.tar.gz 708753 BLAKE2B 9193e9b307ead341e90dffe4547de444a3f473
 DIST mod_h2-1.15.20.tar.gz 707590 BLAKE2B 245b21d55c5659ed4ada3bfa5ec369ca3154e629820980caa1badefeca05399a31fb4f94594068607af20a6936e8ac2439b23e31ddcb9db8d4bb2c907400a152 SHA512 3492b24fdcb6371a5734b85253d800baa6f1650ae3c6b4d08539ec5436cbaaee2ed41fa9515fa36a94c281048f08970b20ccb6373077251a475f6831aaae8524
 DIST mod_h2-1.15.21.tar.gz 720305 BLAKE2B 9abe84867a383b9dd9e0841403544abc94c95ddc9a735bdcfb420d5a14ddb7e6ff5832455659b62ed5e9c865f9c467970d1863510a4fa63c655242cdc83a54b6 SHA512 bf0ab88e07c59c38189f7c670512ff01abdf6110d05a344182c557724028734edf68eea5227ac9b5c400810621ae1d30efac2394a369fbf6ef9558e2b3bcd17c
 DIST mod_h2-1.15.22.tar.gz 721713 BLAKE2B 59449f23b84cb3c0bb3a211af6c57bb6e5e77767466657addaa6cafd6cad96d7030f43785e98123af15c18fdf6ce3ec416d6e885661998d46962be5abf059159 SHA512 cc201edea4152ac8d82232a5e50f1ed6d4e358f04338d43dbdeb7cdd4f338dd8734b6f8b8febe0c9a8f2b67288d2db4bf12915f60c28935885b30b767a9043a1
+DIST mod_h2-1.15.23.tar.gz 721889 BLAKE2B 79f68d7d2bfb08886eb6cef22ce7b20961f2ff4c6045766c0abd296f389a85e0deafbbbae8465cedcc156e97a6f495cf50b2edb1170976509f72f3d2aff02036 SHA512 5358efd2de03efa89719b0714d674bf143f8331e52c78c10fd1a2a9c282a7932f9b8366a63006fce7d35e3d66a83d7083b8af577ab5bbeacfc240f703552071f
 EBUILD mod_h2-1.15.16.ebuild 906 BLAKE2B 44c639cd50046513e665f4ff290fa25c6760aa2d67d3048e1c0903968e3b3b2dd9cba9dc77b38e26a6fdfd1daf69ef1b95f449aefc517662669d074c6463ce56 SHA512 a09a819ec27d717ff0c6682c9c5ad301427ad032ef96c9c3b044c78de57d596a10c1da90e92ef4163d29a0636af33417e59b9e309faa81a6083e05044e2d093f
 EBUILD mod_h2-1.15.17.ebuild 906 BLAKE2B bbb32c5992643aa1994328bd7455ff77b1c4615f6f1c17486a24916825db517078173e832cbc95f8de887e841fb6a786e85f260023876c823f15d5afbb45b6e9 SHA512 0ddcea76dc5ba38b97059adf932e4bbcc6bdf2fa28ecae2faaa32396b40c2304179f36fd74b46a58c68ab86f950c278bbd9cbbbee04d44c9c19566ba4f4968ac
 EBUILD mod_h2-1.15.18.ebuild 906 BLAKE2B bbb32c5992643aa1994328bd7455ff77b1c4615f6f1c17486a24916825db517078173e832cbc95f8de887e841fb6a786e85f260023876c823f15d5afbb45b6e9 SHA512 0ddcea76dc5ba38b97059adf932e4bbcc6bdf2fa28ecae2faaa32396b40c2304179f36fd74b46a58c68ab86f950c278bbd9cbbbee04d44c9c19566ba4f4968ac
@@ -13,5 +14,6 @@ EBUILD mod_h2-1.15.19.ebuild 906 BLAKE2B bbb32c5992643aa1994328bd7455ff77b1c4615
 EBUILD mod_h2-1.15.20.ebuild 906 BLAKE2B 0afa52d4985b12687f6ea8bcc44775175a95f0455cd03f1f4cacd5c02521504c36f68ceb5d690487238159dade31af25bd4d9ba04e48efb9b6cad64b1b8760b8 SHA512 91c6baf5f08a05f8df527d7515b8de585aad3b8c473f865042847529989aa92919b8f4d977bad022553a49e8be43838bc1a08cb555956625493c54d8e1d3e946
 EBUILD mod_h2-1.15.21.ebuild 1024 BLAKE2B 4ae8408022edd8f0cea2abfdd3c7b7e7833f915c6165d34cf61ee979252deb78249cf270c370e968236d3a1e9ac01d39366da8f61524e9f280fc021141257e7d SHA512 dc7ac717d8367c51b4d02afc16490ec98779a81dbb1cacd1f4974c857fd6b27e4a218c49854fad626ee4d99eb4464e6f61b674c7de09b8f6dffcb094d0d91736
 EBUILD mod_h2-1.15.22.ebuild 906 BLAKE2B 0afa52d4985b12687f6ea8bcc44775175a95f0455cd03f1f4cacd5c02521504c36f68ceb5d690487238159dade31af25bd4d9ba04e48efb9b6cad64b1b8760b8 SHA512 91c6baf5f08a05f8df527d7515b8de585aad3b8c473f865042847529989aa92919b8f4d977bad022553a49e8be43838bc1a08cb555956625493c54d8e1d3e946
+EBUILD mod_h2-1.15.23.ebuild 906 BLAKE2B 0afa52d4985b12687f6ea8bcc44775175a95f0455cd03f1f4cacd5c02521504c36f68ceb5d690487238159dade31af25bd4d9ba04e48efb9b6cad64b1b8760b8 SHA512 91c6baf5f08a05f8df527d7515b8de585aad3b8c473f865042847529989aa92919b8f4d977bad022553a49e8be43838bc1a08cb555956625493c54d8e1d3e946
 EBUILD mod_h2-9999.ebuild 906 BLAKE2B 0afa52d4985b12687f6ea8bcc44775175a95f0455cd03f1f4cacd5c02521504c36f68ceb5d690487238159dade31af25bd4d9ba04e48efb9b6cad64b1b8760b8 SHA512 91c6baf5f08a05f8df527d7515b8de585aad3b8c473f865042847529989aa92919b8f4d977bad022553a49e8be43838bc1a08cb555956625493c54d8e1d3e946
 MISC metadata.xml 325 BLAKE2B 4154e88a0c1eb61e74e41ca0b86a2746d6fa8f0e573c5c8c36a9acc0306306804ce6c9b83834b67ae99476468f9143273f977bf868e06d1bc4b5022dd08b2722 SHA512 8dd16aa1fbf71b64c679cba7dc5759fb51410690fd6e6b77416d3604ea746a00516283510a0b24971aa0f5c08359eba6f5d96fab2f8eebdda7f2ebd8f428a04f
diff --git a/www-apache/mod_h2/mod_h2-1.15.23.ebuild b/www-apache/mod_h2/mod_h2-1.15.23.ebuild
new file mode 100644
index 000000000000..9d7e1b600b10
--- /dev/null
+++ b/www-apache/mod_h2/mod_h2-1.15.23.ebuild
@@ -0,0 +1,49 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="6"
+
+inherit apache-module autotools
+
+MY_P="${PN/h2/http2}-${PV}"
+
+if [[ ${PV} == 9999 ]] ; then
+	EGIT_REPO_URI="https://github.com/icing/mod_h2.git"
+	inherit git-r3
+else
+	S="${WORKDIR}/${MY_P}"
+	SRC_URI="https://github.com/icing/mod_h2/archive/v${PV}.tar.gz -> ${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.48[-apache2_modules_http2,ssl?]"
+DEPEND="${RDEPEND}"
+
+S="${WORKDIR}/${P}"
+
+need_apache2_4
+
+src_prepare() {
+	default
+	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/passenger/Manifest b/www-apache/passenger/Manifest
index 62f59d054015..16e94378fec1 100644
--- a/www-apache/passenger/Manifest
+++ b/www-apache/passenger/Manifest
@@ -4,6 +4,7 @@ AUX passenger-5.1.11-gentoo.patch 1068 BLAKE2B 635bc4c4a2313dc00a038cb9c871b5b2f
 DIST passenger-6.0.10.tar.gz 8178910 BLAKE2B 9c7b8e05130e7242cb13986b97582786d77c2d5341620bd3594f428ecf26bf983262ad92b7b8a21666bfa262de0f4d148cef56de2015c0e2b42a3d7d87db2b43 SHA512 5ef2170cb9e55de37cc2b561f2f5c6a6406c71d70b248078ac5086d9d6e9ba90efcf223f1ed6b14774c8eb008d7cb6e98f3d5f8a088126ea697638a8dce6741c
 DIST passenger-6.0.8.tar.gz 7567855 BLAKE2B ea8577c07a57eaea4e3b2b236808c9e54badb35368e948132af04220026b2676a71d066625a64cd98ce35118ae613bcbca8a0a1f8e0bc2a8d321c1165dec72f5 SHA512 ad35bee4a1c855b8f5401ab44e2a9b0cf3281e7fb1d8e09c8b12c54a465545d43285301c7d0fe16914e3c0fd5407d0d5cef31bb296f850d787903e6e006b368f
 DIST passenger-6.0.9.tar.gz 8180342 BLAKE2B 41bdfe06fe3dd94cbcbe44b8a9e2945447662a00b082c94d84196c13ec597c8aa6f5b34ff7855d06a983a27673c6e5c65426dfee20bcd601cea03cc2035a9da0 SHA512 fbb7a5a9e222672ea2db13f92de0710b84cde530d67633ad31265a1e34bf8a79f006a9db35eec45200d61c1084f0846275a06b55c717cf35ccdc7a8e878d37b4
+EBUILD passenger-6.0.10-r1.ebuild 3927 BLAKE2B d90e5ed563016960f6d234ef95be2b02b435c8d584de8b6cfdd4abd1b2cc85f8113ab9c6c4f18249126b110c3d1d4f4d07ed5897868bce245225f73975edfdaf SHA512 e915cd09d488a3f52f23503d1754c5ef9a0811847a892125da2120bf06136526bfa50aa004b584b0523b667e8a101eea2dc4931f748ea349bf7f81f304eb6a1e
 EBUILD passenger-6.0.10.ebuild 4025 BLAKE2B 0689d1e5588c8de1de39522b958e7504b45a7d250e76a4343594cafbe3509f63c74827c5dbfab5e1c908ce1374cab25054ff68ab1acbc1d868bd07fe54412936 SHA512 415c10f66957e2a12a720b8f3672278d128491a1f4b7b93b69482ea4d8bb6044b5ce713dbadae4ed3f6b389f75cd527ba2a5cff811aa72a93573fb0c56435f9d
 EBUILD passenger-6.0.8.ebuild 4076 BLAKE2B c715fd27326957b5398514c2288562ab600628cf00d37c7bd8309859587ae3d7a5da6f3d9e5ba339bd0c44c2ec67afeefa080399591eb4ae4616599bb70c8665 SHA512 ab6c553a6a1850915e70228e31f48867fe6e825089a350a7cfa30eab7bf04db3258e9848ff62012a925dc714e8fe0b2612deef577e50d0315b357a2aa9a96fc6
 EBUILD passenger-6.0.9.ebuild 4032 BLAKE2B 323cef5a46100ef17eac571e87047e2458aa5f20796f6f1f40930bb87ce8f586724ac4971759623c888106eacaedffb7a814f0a662f32534be5f481cf38b754d SHA512 4aeaa508c085c0a2478c72301f9d0da0183445864b0af6242ae889615e1ff30889488d368aac77d6cf1af4042757e17b10de1ae66a8519dda01f85994405591e
diff --git a/www-apache/passenger/passenger-6.0.10-r1.ebuild b/www-apache/passenger/passenger-6.0.10-r1.ebuild
new file mode 100644
index 000000000000..ace4e92b8d8c
--- /dev/null
+++ b/www-apache/passenger/passenger-6.0.10-r1.ebuild
@@ -0,0 +1,126 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+USE_RUBY="ruby26 ruby27 ruby30"
+
+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 ~ppc ~ppc64 ~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
+
+	# 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."
+
+	# 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" \
+		 RANLIB=$(tc-getRANLIB) \
+		 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" \
+	RANLIB=$(tc-getRANLIB) \
+	${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 doc/*.md
+}
+
+each_ruby_install() {
+	DISTDIR="${D}" \
+	RUBYLIBDIR="$(ruby_rbconfig_value vendordir)" \
+	RUBYARCHDIR="$(ruby_rbconfig_value archdir)" \
+	APXS2="${APXS}" \
+	HTTPD="${APACHE_BIN}" \
+	FS_DOCDIR="/usr/share/doc/${P}" \
+	FS_LIBDIR='/usr/'$(get_libdir) \
+	EXTRA_LDFLAGS="${LDFLAGS}" \
+	USE_VENDORED_LIBUV="no" LIBUV_LIBS="-luv" \
+	RANLIB=$(tc-getRANLIB) \
+	${RUBY} -S rake fakeroot || die "rake failed"
+}