From 792e307954fd3b5b12c968741d76ea7cfe5206e4 Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Wed, 14 Aug 2024 12:22:16 +0100 Subject: gentoo auto-resync : 14:08:2024 - 12:22:16 --- www-apache/Manifest.gz | Bin 5578 -> 5576 bytes www-apache/passenger/Manifest | 2 +- www-apache/passenger/passenger-6.0.23.ebuild | 15 ++++++--------- 3 files changed, 7 insertions(+), 10 deletions(-) (limited to 'www-apache') diff --git a/www-apache/Manifest.gz b/www-apache/Manifest.gz index 978a8991b52d..de79d11c10d3 100644 Binary files a/www-apache/Manifest.gz and b/www-apache/Manifest.gz differ diff --git a/www-apache/passenger/Manifest b/www-apache/passenger/Manifest index 262439dbd415..5a891a882ad2 100644 --- a/www-apache/passenger/Manifest +++ b/www-apache/passenger/Manifest @@ -5,5 +5,5 @@ DIST passenger-6.0.22.tar.gz 8296503 BLAKE2B 0e9440134ead3c909570f1fde54e332dd1b 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 4035 BLAKE2B 4b006ea98dcb69baae7aa757ce3c10a4ef89b5836e0f6a1d57c22c074435f5bc0f136872c453013faf8fb9c71726546c45cc26fbb9c001e63b846d8bf16906c1 SHA512 4be03e3bec258405cfbbbf8a8fa2006ca13694afcac6e31512d4fd344ccf3ae5c2cad3b93a7119733e814654606f6a5dcb090f3901615046c57d1b8da0a9f352 -EBUILD passenger-6.0.23.ebuild 4037 BLAKE2B 011ddae946f9313462c25a7e9b0c044dcfdfb96d6693400da96f11333faf5a276e2e49b1082bec1996c46e607b4e0301772f62f3cfa62578aca76ece901ec25a SHA512 5c341279b8f222d8ab48d89722da467358d81336045069bbb87defd2e02c92b49678fcb79932676e9c7e047a4a64abbbcf8f736f1ef062180d83e20f19fe0fda +EBUILD passenger-6.0.23.ebuild 3847 BLAKE2B 86524a76df90169236620057abc80055f59c45c3c8c95e53d2e5fdc7493db37ddcb0b1ceb93bb6b6c8628305b68cd9a4d0e7568781884551b490cb4c3eddd581 SHA512 fcfeaf97d8ff36f8c4f18672a30eb7ffec3313f405e457da2c1943c663f881345b056f11b9f8183fadaad1aa8148e9bcf8a17c7a20f4e31c57800ef1ead55c8d MISC metadata.xml 331 BLAKE2B 5cc7b65a8ac511e9065cdb9fc6f4a04923029f718f02ba0da718c798e0bb3a554a8da7f05e639daa88c2fec34888e6e1316ccab4a44a0d99b616354006e7c762 SHA512 95f21209228559e1b775f8b44c49e1d311a6c2955ba26fb24fb72bf64afd42048d9d0186828be8b733963b4aec245f5abc4540c1ca8baa14ee59b2fba0c33086 diff --git a/www-apache/passenger/passenger-6.0.23.ebuild b/www-apache/passenger/passenger-6.0.23.ebuild index 0c0ad6d0d23f..8bbe3af9b847 100644 --- a/www-apache/passenger/passenger-6.0.23.ebuild +++ b/www-apache/passenger/passenger-6.0.23.ebuild @@ -45,14 +45,9 @@ 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 + 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}:" \ @@ -68,8 +63,10 @@ all_ruby_prepare() { # 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 + # 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 -- cgit v1.2.3