gentoo auto-resync : 23:12:2022 - 13:59:28

3 files changed, 132 insertions, 2 deletions

diff --git a/www-apache/passenger/Manifest b/www-apache/passenger/Manifest
index c0932e8d0050..1bbb2b31efed 100644
--- a/www-apache/passenger/Manifest
+++ b/www-apache/passenger/Manifest
@@ -3,7 +3,9 @@ AUX passenger-5.1.11-gentoo.patch 1068 BLAKE2B 635bc4c4a2313dc00a038cb9c871b5b2f
 DIST passenger-6.0.11.tar.gz 8183414 BLAKE2B 9767c3f198d7a779dfefed1d1a2ab07e3dda964a61718475470266e3b4448a45d2c5e7416a2e148afa66241f74e91e98ccbec7f2a08f5d4d1e2eff2ac7de5f63 SHA512 977d8adb261c17d5f21115703b9b18c4d3bfc17f998fb880d3a28f68392db2f9e6a2cb7612211f08bc913fd2f417cb2b689fcab2317707e17e8ddea6aeb967d2
 DIST passenger-6.0.14.tar.gz 8216590 BLAKE2B 33fa27e05ae0c5e65e3fec3cd791eee799ebc71f2b2bcfd06c6dde530c1063c87f01a0249b57443f47745b376cc596f58b66f5790b0cb2ed70df8940b6faa92d SHA512 57189e1b78ff9dda38c37d07908cae20db1c856fb4279e54706d0efd2d1d140ff7af8ed9357c4de1360364d3809e376da152f8a18050dcf657850f276d9ce70c
 DIST passenger-6.0.15.tar.gz 8379463 BLAKE2B 0bf2a319072671660aae8651fb0253dd0221bce55e3bdfc832ba2f1972e7dbdeee6e9ef9b13bf9a90de20a1c1a4dbeaabf138ed71a0009b0d336e672aeb1573d SHA512 b5af050bc16624542b36433b1d23bba243892cf82b10fdee19c92174b916ea2fffff7f98a5cfcf26bc358b9f29c2c9612c29134c290531c5ce13103e52045fdc
+DIST passenger-6.0.16.tar.gz 8378384 BLAKE2B ae435df097b4692f62bc83c006a2abe8103e984bae50a27d3d1faf2114c8aef5b918882b4d8999d565335046ade3c06a177d26efa0bace8d961d84376fa79da1 SHA512 6fa071c32e5ddc615e40975d1b859a9426a10ebd1d4b14adc8a759da76fca58f473bce0a7ed77e23a4ac220f74a50089bc92ebc2cb7190751c54bc5dbf845217
 EBUILD passenger-6.0.11.ebuild 3937 BLAKE2B 38225fdc2ed6b7508017871093c41b1078b4a67b14b0b3c7e8fc8badb39157fe0d9a85cbfb91335178645d29c6e7ce0a49cbe1ec3f91deb713df8e65327b51f6 SHA512 bbbfd0ce8483d603d3539351c06f311efa42652fdb4462503c8136c74c9a7de273feec4bde5430c141d4fd150380c53738999729eea994cec2ee595e8667a3d7
 EBUILD passenger-6.0.14.ebuild 4028 BLAKE2B 56ae8d23c31cc509fd12a67f6601685f1012268fa7b287a104ee7c7fce9dce7d23af8c4847067253df7f09722282f29fef324263b1ef10608bd9dae67f5f978a SHA512 6c5baef52b4da0a3df3596805cc67f0be8e060013dc1fafbb97ee733f88aac6315dfb506b81d5a6b0ab3e1cb1c8291fce5f93235590016f5c9b86c78e6d9ae09
-EBUILD passenger-6.0.15.ebuild 4021 BLAKE2B 7852f799d1aa5524a7aaa3a2b9de5f239ef174a87ea8cf73c29acd8a0d9bb4567bfad5745adbe6404444413fd7b0ae57105f24f745cce07bd34c750a614e9c72 SHA512 a8d372aed2ef6b9f07e8181997a0e81f7f8c1ca996662f4752badf69d06b72d5722216c9c8e0f8c7c930160510fb5373c2150ad2eae6c3a51f601c2f090462fd
+EBUILD passenger-6.0.15.ebuild 4019 BLAKE2B f0f3265c436b602b24f526c3ab7a63b4667608ddee000fd0364a9e217a48a2ff313e36c76c48d197f8394745ae36d0ee5094d7f219ac86815940cc4f2e5f7bfd SHA512 8c839d2294fb525ef456095cf3dfc1592e65b64a7be715ff7b143fee5418de786fa795254c48f29a62c745061cc29e28aaef4ae6a676cf2a82a36e37145c3614
+EBUILD passenger-6.0.16.ebuild 4025 BLAKE2B cbd7d7c2a6e46f0211cb477f4e1702c30d97dd0fc59d69db3d0e0d7eb95ab9d09468349e750457f6c775aa4286fe8cc1c2988de9cc2b11574fc8ce413abc5a87 SHA512 1f59c7781e6b69b16253481314ba3ccd1914cfc49d40192d9ba14ea8cbb06cb96323476254dc3535fab1d67c7e3912ca7dd5f918e9b4223c9431a90097033136
 MISC metadata.xml 331 BLAKE2B 5cc7b65a8ac511e9065cdb9fc6f4a04923029f718f02ba0da718c798e0bb3a554a8da7f05e639daa88c2fec34888e6e1316ccab4a44a0d99b616354006e7c762 SHA512 95f21209228559e1b775f8b44c49e1d311a6c2955ba26fb24fb72bf64afd42048d9d0186828be8b733963b4aec245f5abc4540c1ca8baa14ee59b2fba0c33086
diff --git a/www-apache/passenger/passenger-6.0.15.ebuild b/www-apache/passenger/passenger-6.0.15.ebuild
index c489bed09e1f..c3abda835c9d 100644
--- a/www-apache/passenger/passenger-6.0.15.ebuild
+++ b/www-apache/passenger/passenger-6.0.15.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 ~ppc ~ppc64 ~x86"
+KEYWORDS="amd64 ~ppc ~ppc64 x86"
 IUSE="apache2 debug"
 
 ruby_add_bdepend "dev-ruby/rake"
diff --git a/www-apache/passenger/passenger-6.0.16.ebuild b/www-apache/passenger/passenger-6.0.16.ebuild
new file mode 100644
index 000000000000..81b1706a8140
--- /dev/null
+++ b/www-apache/passenger/passenger-6.0.16.ebuild
@@ -0,0 +1,128 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+USE_RUBY="ruby27 ruby30 ruby31"
+
+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 ~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 -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
+	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"
+}