From 0f558761aa2dee1017b4751e4017205e015a9560 Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Wed, 29 Jun 2022 12:04:12 +0100 Subject: gentoo resync : 29.12.2022 --- www-apache/passenger/Manifest | 5 +- .../passenger/files/passenger-5.1.1-isnan.patch | 14 --- www-apache/passenger/passenger-6.0.13.ebuild | 127 --------------------- www-apache/passenger/passenger-6.0.14.ebuild | 127 +++++++++++++++++++++ 4 files changed, 129 insertions(+), 144 deletions(-) delete mode 100644 www-apache/passenger/files/passenger-5.1.1-isnan.patch delete mode 100644 www-apache/passenger/passenger-6.0.13.ebuild create mode 100644 www-apache/passenger/passenger-6.0.14.ebuild (limited to 'www-apache/passenger') diff --git a/www-apache/passenger/Manifest b/www-apache/passenger/Manifest index da0508398fa6..45e3f7abab65 100644 --- a/www-apache/passenger/Manifest +++ b/www-apache/passenger/Manifest @@ -1,8 +1,7 @@ AUX 30_mod_passenger-5.0.0.conf 2737 BLAKE2B 781ffa4831313356b6caa493fc94a784f6b0245c2c37c27cc69eeba9be62c8b626b8fdf26c18ddffe0a06743abf1d529318f46c0091f64370f2a9d82f1b54116 SHA512 847aa6d0ebb2e4ceaa744fdddf72f22613aeb76df38a36fb3c8b16803222cec116e6d5c23d2173beffd5889ebb8ba0247ffd3b9e900a70d78c2236f00c1a5d4d -AUX passenger-5.1.1-isnan.patch 1155 BLAKE2B bb11276f94f4be93a7ef089e09079d36971ca028df4f8962e4220880361b96c3640475ac537f62d5e7ad198fdfb477fe15f34dbd86db4143b24246d11278eb58 SHA512 a80a9a229f1eeb34780236d0b2418fe5d2f57b9ae8c3c4ccdec729806f4afad8979de4ab3ea0834cdb76218192825ee4bfaf02b48f3bda240c2db441bcc870d9 AUX passenger-5.1.11-gentoo.patch 1068 BLAKE2B 635bc4c4a2313dc00a038cb9c871b5b2f0163f320d4f4d1bbd9d34ec34ec81f2fd2e7d9ea6f3d03c4a611f13095c4ad414ba7c0920064f8408837a2600d2d2e9 SHA512 c75442ac0403131e5fdbe76ec52acdcffcb6947af81ce79e003ebbb9e97d25a855651bd62c0aad66dd22d8cd4dff2221fc84b0ce74da3908f06f272c8b133c2d DIST passenger-6.0.11.tar.gz 8183414 BLAKE2B 9767c3f198d7a779dfefed1d1a2ab07e3dda964a61718475470266e3b4448a45d2c5e7416a2e148afa66241f74e91e98ccbec7f2a08f5d4d1e2eff2ac7de5f63 SHA512 977d8adb261c17d5f21115703b9b18c4d3bfc17f998fb880d3a28f68392db2f9e6a2cb7612211f08bc913fd2f417cb2b689fcab2317707e17e8ddea6aeb967d2 -DIST passenger-6.0.13.tar.gz 8216169 BLAKE2B 592b65ccfd7a043a6fcc1ea8061da3acaafd773caa2b5270e39906ee7f07cf3fb45654c5864eef53687d10c3079003a7ba8d3e8dfba50616b43516e1d457ce11 SHA512 25867f7bb7b7b09def800969884f5c3a2a5cf9dbb20817e02121a471e2eb6fb1e93d8ca3a4b103c5d17d6a61e33bf8edc29f54d496118b88c25147de85629d88 +DIST passenger-6.0.14.tar.gz 8216590 BLAKE2B 33fa27e05ae0c5e65e3fec3cd791eee799ebc71f2b2bcfd06c6dde530c1063c87f01a0249b57443f47745b376cc596f58b66f5790b0cb2ed70df8940b6faa92d SHA512 57189e1b78ff9dda38c37d07908cae20db1c856fb4279e54706d0efd2d1d140ff7af8ed9357c4de1360364d3809e376da152f8a18050dcf657850f276d9ce70c EBUILD passenger-6.0.11.ebuild 3937 BLAKE2B 38225fdc2ed6b7508017871093c41b1078b4a67b14b0b3c7e8fc8badb39157fe0d9a85cbfb91335178645d29c6e7ce0a49cbe1ec3f91deb713df8e65327b51f6 SHA512 bbbfd0ce8483d603d3539351c06f311efa42652fdb4462503c8136c74c9a7de273feec4bde5430c141d4fd150380c53738999729eea994cec2ee595e8667a3d7 -EBUILD passenger-6.0.13.ebuild 4021 BLAKE2B e08908037a90ceba1cad877b4a77fad19ab7c5b970a64b20ab2d6ec736bcf8b2ef86eaf08c500241f168644be36028e27c1544d04d9c83b7e150f66040d135a4 SHA512 d28e2ffb9c2cd0ad53647b4c1f28c7016255dfafe8bf61395a1161e7dbe7f96b5a1b08cb0335f97b345e7cbec7396235a86ac72a6e7ccbb4b874b42f43d32a5b +EBUILD passenger-6.0.14.ebuild 4028 BLAKE2B 56ae8d23c31cc509fd12a67f6601685f1012268fa7b287a104ee7c7fce9dce7d23af8c4847067253df7f09722282f29fef324263b1ef10608bd9dae67f5f978a SHA512 6c5baef52b4da0a3df3596805cc67f0be8e060013dc1fafbb97ee733f88aac6315dfb506b81d5a6b0ab3e1cb1c8291fce5f93235590016f5c9b86c78e6d9ae09 MISC metadata.xml 331 BLAKE2B 5cc7b65a8ac511e9065cdb9fc6f4a04923029f718f02ba0da718c798e0bb3a554a8da7f05e639daa88c2fec34888e6e1316ccab4a44a0d99b616354006e7c762 SHA512 95f21209228559e1b775f8b44c49e1d311a6c2955ba26fb24fb72bf64afd42048d9d0186828be8b733963b4aec245f5abc4540c1ca8baa14ee59b2fba0c33086 diff --git a/www-apache/passenger/files/passenger-5.1.1-isnan.patch b/www-apache/passenger/files/passenger-5.1.1-isnan.patch deleted file mode 100644 index 02f7fe76df06..000000000000 --- a/www-apache/passenger/files/passenger-5.1.1-isnan.patch +++ /dev/null @@ -1,14 +0,0 @@ -diff -uNr passenger-5.1.1.orig/src/cxx_supportlib/vendor-modified/boost/math/special_functions/fpclassify.hpp passenger-5.1.1/src/cxx_supportlib/vendor-modified/boost/math/special_functions/fpclassify.hpp ---- passenger-5.1.1.orig/src/cxx_supportlib/vendor-modified/boost/math/special_functions/fpclassify.hpp 2013-10-26 15:00:00.000000000 -0700 -+++ passenger-5.1.1/src/cxx_supportlib/vendor-modified/boost/math/special_functions/fpclassify.hpp 2017-01-12 19:21:39.696285758 -0800 -@@ -134,8 +134,8 @@ - inline bool is_nan_helper(__float128 f, const boost::true_type&) { return ::isnanq(f); } - inline bool is_nan_helper(__float128 f, const boost::false_type&) { return ::isnanq(f); } - #else --inline bool is_nan_helper(__float128 f, const boost::true_type&) { return ::isnan(static_cast(f)); } --inline bool is_nan_helper(__float128 f, const boost::false_type&) { return ::isnan(static_cast(f)); } -+inline bool is_nan_helper(__float128 f, const boost::true_type&) { return std::isnan(static_cast(f)); } -+inline bool is_nan_helper(__float128 f, const boost::false_type&) { return std::isnan(static_cast(f)); } - #endif - #endif - } diff --git a/www-apache/passenger/passenger-6.0.13.ebuild b/www-apache/passenger/passenger-6.0.13.ebuild deleted file mode 100644 index eeae56538f93..000000000000 --- a/www-apache/passenger/passenger-6.0.13.ebuild +++ /dev/null @@ -1,127 +0,0 @@ -# Copyright 1999-2022 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 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 -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" -} diff --git a/www-apache/passenger/passenger-6.0.14.ebuild b/www-apache/passenger/passenger-6.0.14.ebuild new file mode 100644 index 000000000000..bd5e5c4851b9 --- /dev/null +++ b/www-apache/passenger/passenger-6.0.14.ebuild @@ -0,0 +1,127 @@ +# Copyright 1999-2022 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 +USE_RUBY="ruby26 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 -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" +} -- cgit v1.2.3