3 files changed, 129 insertions, 2 deletions
diff --git a/www-apache/passenger/Manifest b/www-apache/passenger/Manifest
index 3f9b3f7d62a2..ce9ed0b8df5a 100644
--- a/www-apache/passenger/Manifest
+++ b/www-apache/passenger/Manifest
@@ -2,6 +2,8 @@ AUX 30_mod_passenger-5.0.0.conf 2737 BLAKE2B 781ffa4831313356b6caa493fc94a784f6b
 AUX passenger-5.1.11-gentoo.patch 1068 BLAKE2B 635bc4c4a2313dc00a038cb9c871b5b2f0163f320d4f4d1bbd9d34ec34ec81f2fd2e7d9ea6f3d03c4a611f13095c4ad414ba7c0920064f8408837a2600d2d2e9 SHA512 c75442ac0403131e5fdbe76ec52acdcffcb6947af81ce79e003ebbb9e97d25a855651bd62c0aad66dd22d8cd4dff2221fc84b0ce74da3908f06f272c8b133c2d
 DIST passenger-6.0.20.tar.gz 8476308 BLAKE2B dc1ac3a1e2be1a9138594d68cf23fc0a73b6b0aca0550c022de56bc156825b3627de741128f163871c89747f178fb26fc41533962ba83ef2659ca71793c0fa62 SHA512 b46864cd7fa83fe39a2a4f42d581660c9a521b96942604b56caa567adff272bb092e82a46a6817a7b68be4830ad1015c9af4429a6d5b26edfe9c3e3884046559
 DIST passenger-6.0.22.tar.gz 8296503 BLAKE2B 0e9440134ead3c909570f1fde54e332dd1b017dbc140e1c0b6f1bc73462f01ab4ce36a19a44fc89bbc1d5a93f0faa6cb2e10dc2425722b9b17a4ebe4a5102ded SHA512 85c07386f36677063d32214cce780933d19a3893d15c15efc6c7333dce8046e368218ae9a6aa4d814abdfcfa7da823ae86badfd2c6e6252d4da4f20cd468cdd8
+DIST passenger-6.0.23.tar.gz 8298217 BLAKE2B ec247509656fcce61c4045cf5c08cee4faa1c02e9503c2aaa670ca6c2075e3593d3b82e58b499cb102849a7e8107962c46eaefec6dbce53e95c246bbeaf354a0 SHA512 5e01596bd658dad94b2281ad1efd5cb4624268021d4347cd911c14824e11e15125032b1793c2aa82e879cf07f93473fe78d9fc6a1f2b6f5fc0dcc12a84a5ea45
 EBUILD passenger-6.0.20.ebuild 4035 BLAKE2B 4b006ea98dcb69baae7aa757ce3c10a4ef89b5836e0f6a1d57c22c074435f5bc0f136872c453013faf8fb9c71726546c45cc26fbb9c001e63b846d8bf16906c1 SHA512 4be03e3bec258405cfbbbf8a8fa2006ca13694afcac6e31512d4fd344ccf3ae5c2cad3b93a7119733e814654606f6a5dcb090f3901615046c57d1b8da0a9f352
-EBUILD passenger-6.0.22.ebuild 4037 BLAKE2B 011ddae946f9313462c25a7e9b0c044dcfdfb96d6693400da96f11333faf5a276e2e49b1082bec1996c46e607b4e0301772f62f3cfa62578aca76ece901ec25a SHA512 5c341279b8f222d8ab48d89722da467358d81336045069bbb87defd2e02c92b49678fcb79932676e9c7e047a4a64abbbcf8f736f1ef062180d83e20f19fe0fda
+EBUILD passenger-6.0.22.ebuild 4035 BLAKE2B 4b006ea98dcb69baae7aa757ce3c10a4ef89b5836e0f6a1d57c22c074435f5bc0f136872c453013faf8fb9c71726546c45cc26fbb9c001e63b846d8bf16906c1 SHA512 4be03e3bec258405cfbbbf8a8fa2006ca13694afcac6e31512d4fd344ccf3ae5c2cad3b93a7119733e814654606f6a5dcb090f3901615046c57d1b8da0a9f352
+EBUILD passenger-6.0.23.ebuild 3845 BLAKE2B 156901cefc349dd04ff1801efacb7a8c6bf31eb23199daf864616b596ec9668dc0e1d8b69f4d6b4a51ed2ed709b6aaeeaf2ea81cbc5044f9565c942ea3cc1bd7 SHA512 493722c14f5510b99649627fb9e271dffdcabfaf60c18b3f34c5aafe57231f42a57f399119bfee0fac2fdafe886d5ca896bf9a80f8a43ba4cbbe3e9e57da1190
 MISC metadata.xml 331 BLAKE2B 5cc7b65a8ac511e9065cdb9fc6f4a04923029f718f02ba0da718c798e0bb3a554a8da7f05e639daa88c2fec34888e6e1316ccab4a44a0d99b616354006e7c762 SHA512 95f21209228559e1b775f8b44c49e1d311a6c2955ba26fb24fb72bf64afd42048d9d0186828be8b733963b4aec245f5abc4540c1ca8baa14ee59b2fba0c33086
diff --git a/www-apache/passenger/passenger-6.0.22.ebuild b/www-apache/passenger/passenger-6.0.22.ebuild
index 0c0ad6d0d23f..be4bb51c3197 100644
--- a/www-apache/passenger/passenger-6.0.22.ebuild
+++ b/www-apache/passenger/passenger-6.0.22.ebuild
@@ -13,7 +13,7 @@ SRC_URI="https://s3.amazonaws.com/phusion-passenger/releases/${P}.tar.gz"
 # Passenger is licensed MIT, but vendored code licenses should also be taken into account.
 LICENSE="Boost-1.0 MIT BSD"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86"
+KEYWORDS="amd64 ~arm ~arm64 ~ppc ~ppc64 x86"
 IUSE="apache2 debug"
 
 ruby_add_bdepend "dev-ruby/rake"
diff --git a/www-apache/passenger/passenger-6.0.23.ebuild b/www-apache/passenger/passenger-6.0.23.ebuild
new file mode 100644
index 000000000000..9aa739548a85
--- /dev/null
+++ b/www-apache/passenger/passenger-6.0.23.ebuild
@@ -0,0 +1,125 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+USE_RUBY="ruby31 ruby32 ruby33"
+
+inherit apache-module flag-o-matic 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"
+
+# Passenger is licensed MIT, but vendored code licenses should also be taken into account.
+LICENSE="Boost-1.0 MIT BSD"
+SLOT="0"
+KEYWORDS="amd64 ~arm ~arm64 ~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
+
+	# Avoid fixed debugging CFLAGs.
+	sed -e '/debugging_\(c\|cxx\)flags/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 -e "s:/usr/lib/phusion-passenger/agents:/usr/libexec/phusion-passenger/agents:" \
+		-i 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 and RANLIB
+	sed -e "s/ar cru/"$(tc-getAR)" cru/" \
+		-e "s/ranlib/"$(tc-getRANLIB)"/" \
+		-i 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"
+}