Revert "gentoo auto-resync : 14:06:2023 - 15:13:45"

This reverts commit b9e8f3cc44aed3b6da71c7510c6287bf7bbbc66b.

5 files changed, 2 insertions, 132 deletions

diff --git a/www-apache/Manifest.gz b/www-apache/Manifest.gz
index 6530fa702de7..9ca892187ccd 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 e7d4d41ac079..c5abb469fcc9 100644
--- a/www-apache/mod_h2/Manifest
+++ b/www-apache/mod_h2/Manifest
@@ -1,5 +1,5 @@
 AUX mod_http2.conf 154 BLAKE2B b7d38cff9c5b4248d43aa1be55ec4b90fa197213ddd2a8ac3409f69f8e31a7e0a8eb14aab4f2abe1d7ec833896d950d3878020e05100f83ae63a3823b0e91b9d SHA512 85b20350c8abb947c91e2cb462d4cd62f502e6eede3bddd5c10502b61a24396bec57c15d4419d31d4afc857053c1fb2606392023527b7eceea0b10978ce170e5
-DIST mod_h2-2.0.19.tar.gz 798975 BLAKE2B 5cb0e5d247db93375e9240b144b2e156720cc5beb15e1720c7c30b46eda0e7021371b9194f78a6aed97b53dbd6c9338ce3e612c13e8ff71f9b16bf9c610fc9dd SHA512 eec50f6c71ab15d918749845e1491b199e31ae4d9baa2821c572dc9f8d6d5ad5b751409f06040a76c94574b174b952b30c9d982e6706e1dddda6974833c3915a
-EBUILD mod_h2-2.0.19.ebuild 935 BLAKE2B ea2fa2f0ebb4ec0c0027d0d8f69550b8a5dcd57d31bd2266f54954318c3f0f387c81e2e8d284d8a4d41bed37900fe5bed6ecb2261afbd972d76bdbef3359aaf3 SHA512 ba5334a50f8e2639b7fe797026457df3ca276704d9eae3d7ff3e47d47224136dcde86e0535442119f983bbef22d103686679cdd6996f747ec66c6c9d0fbb257a
+DIST mod_h2-2.0.18.tar.gz 798216 BLAKE2B f57116608da33a73f0e8811a78318234afaed69dea479503bd022096748d8604b744255b406b5025ed9a4bbbb78175b8c9c44a78af538d749bad46c0f8b141b6 SHA512 6e44a27722977e2ff9339a51557644072c3b154134b8273519b8f0de29759e9a7c982e92f66c9746bd34818b86089ae19f62980816853b576c8fb71b1ec5ea2d
+EBUILD mod_h2-2.0.18.ebuild 935 BLAKE2B ea2fa2f0ebb4ec0c0027d0d8f69550b8a5dcd57d31bd2266f54954318c3f0f387c81e2e8d284d8a4d41bed37900fe5bed6ecb2261afbd972d76bdbef3359aaf3 SHA512 ba5334a50f8e2639b7fe797026457df3ca276704d9eae3d7ff3e47d47224136dcde86e0535442119f983bbef22d103686679cdd6996f747ec66c6c9d0fbb257a
 EBUILD mod_h2-9999.ebuild 935 BLAKE2B 6523bf0f4b1a12a823a7a1458046151b7ea52e4e68396307c16c095d9f17201fb93e3dfe94cfb1f72b798ea5eb978d3506e89a647da3a071073f8c4458c83ea7 SHA512 fac393c1667d1c161ea2255f08185975f5863165485184835e9aa4da497074c288783fdd66b60dab0bf95364e1e58744614951bff4f59c2c81ef4a70abc7b25b
 MISC metadata.xml 326 BLAKE2B 200b47b41409bd7167132c55b5e77b5efa2ec18859520ea38d61a625a6e68bbb1cb0095dda3fd7d273e17114e7cc0ff2fe5c1bbb66ea3a90b4796490fc04a2e8 SHA512 6d45faf84382555d53dc9f38f8d7a23454d763025bbb345f51bece78b36287372d86e173c894038839092adce210e444389b8c41644f44bce0c912880d788080
diff --git a/www-apache/mod_h2/mod_h2-2.0.19.ebuild b/www-apache/mod_h2/mod_h2-2.0.18.ebuild
index 5ba43634b8e0..5ba43634b8e0 100644
--- a/www-apache/mod_h2/mod_h2-2.0.19.ebuild
+++ b/www-apache/mod_h2/mod_h2-2.0.18.ebuild
diff --git a/www-apache/passenger/Manifest b/www-apache/passenger/Manifest
index 637d83d3a57a..7399b05ede73 100644
--- a/www-apache/passenger/Manifest
+++ b/www-apache/passenger/Manifest
@@ -3,9 +3,7 @@ AUX passenger-5.1.11-gentoo.patch 1068 BLAKE2B 635bc4c4a2313dc00a038cb9c871b5b2f
 DIST passenger-6.0.15.tar.gz 8379463 BLAKE2B 0bf2a319072671660aae8651fb0253dd0221bce55e3bdfc832ba2f1972e7dbdeee6e9ef9b13bf9a90de20a1c1a4dbeaabf138ed71a0009b0d336e672aeb1573d SHA512 b5af050bc16624542b36433b1d23bba243892cf82b10fdee19c92174b916ea2fffff7f98a5cfcf26bc358b9f29c2c9612c29134c290531c5ce13103e52045fdc
 DIST passenger-6.0.16.tar.gz 8378384 BLAKE2B ae435df097b4692f62bc83c006a2abe8103e984bae50a27d3d1faf2114c8aef5b918882b4d8999d565335046ade3c06a177d26efa0bace8d961d84376fa79da1 SHA512 6fa071c32e5ddc615e40975d1b859a9426a10ebd1d4b14adc8a759da76fca58f473bce0a7ed77e23a4ac220f74a50089bc92ebc2cb7190751c54bc5dbf845217
 DIST passenger-6.0.17.tar.gz 8422867 BLAKE2B 3ffc7dff50289efa4fdee5cb05254661f57ab5478138822d61f7821cfc6319d881827eb982b30c336bd0294c23e5a57ea81a609d4df6fbb0da0fd844f8148973 SHA512 00c972de84bf0aa6623cf805bdd9c41c8341e984f2a4e1675c9c5e981b369cf69c083bbc421f5d3a2dcecd3b47ba5402ba6d9c7c8ee51dd1b0310395c01888fa
-DIST passenger-6.0.18.tar.gz 8424409 BLAKE2B 50f3639d0233892c85b97383689599c08457642fbfd1d968b67dddee896eb1377ffc40ce8049a2c3ae4a1a6d3673bdc2fef8de9125efa0386722103f9c4ed1ba SHA512 4c9e43d0907e83f82b2ae1bdc882648f5b3c1b54ffe029590a259c191f57b752dc3196332d0bb68319d50d656192e59df0ed9647f1c7fe3fdc13477a9c0b829b
 EBUILD passenger-6.0.15.ebuild 4019 BLAKE2B f0f3265c436b602b24f526c3ab7a63b4667608ddee000fd0364a9e217a48a2ff313e36c76c48d197f8394745ae36d0ee5094d7f219ac86815940cc4f2e5f7bfd SHA512 8c839d2294fb525ef456095cf3dfc1592e65b64a7be715ff7b143fee5418de786fa795254c48f29a62c745061cc29e28aaef4ae6a676cf2a82a36e37145c3614
 EBUILD passenger-6.0.16.ebuild 4025 BLAKE2B cbd7d7c2a6e46f0211cb477f4e1702c30d97dd0fc59d69db3d0e0d7eb95ab9d09468349e750457f6c775aa4286fe8cc1c2988de9cc2b11574fc8ce413abc5a87 SHA512 1f59c7781e6b69b16253481314ba3ccd1914cfc49d40192d9ba14ea8cbb06cb96323476254dc3535fab1d67c7e3912ca7dd5f918e9b4223c9431a90097033136
 EBUILD passenger-6.0.17.ebuild 4023 BLAKE2B 1d9d36a759558b82d2cacfe0eb385f43a85e71b5d12da044bc32ffd7b4fc9dacddf90fa7dc2aa80fb41be5afa6f06d9501b7e8b52f905ca26faf82331ee7f3e2 SHA512 4b4abf6951b95ca5edbe4a7754d70f70866d6e6bc6c851b77bd8e90bbf96c3c73a399dde6dda91e9f098266a480c3d7e8d9ea3e4c3b19c16f79896a9b40632e0
-EBUILD passenger-6.0.18.ebuild 4025 BLAKE2B 4e800f3e0789bea6caaf5258c6d0b8d518914d496e07447e26533501c6638fb98d0d082580a4747301f57a1e61de8cb03d124b0c8f2d6d679b150080b93b1cc7 SHA512 91f3f77dac800478ba8a957825133cc665a6a811bd27a3d50c276ac8200f347042738cd68747e1ba90ff546c2fb2b31f472695355c788533341ddef792f4ac06
 MISC metadata.xml 331 BLAKE2B 5cc7b65a8ac511e9065cdb9fc6f4a04923029f718f02ba0da718c798e0bb3a554a8da7f05e639daa88c2fec34888e6e1316ccab4a44a0d99b616354006e7c762 SHA512 95f21209228559e1b775f8b44c49e1d311a6c2955ba26fb24fb72bf64afd42048d9d0186828be8b733963b4aec245f5abc4540c1ca8baa14ee59b2fba0c33086
diff --git a/www-apache/passenger/passenger-6.0.18.ebuild b/www-apache/passenger/passenger-6.0.18.ebuild
deleted file mode 100644
index d0e7d648bbcd..000000000000
--- a/www-apache/passenger/passenger-6.0.18.ebuild
+++ /dev/null
@@ -1,128 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-USE_RUBY="ruby30 ruby31 ruby32"
-
-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"
-}