[gentoo-commits] repo/gentoo:master commit in: www-apache/passenger/

[Hans de Graaff]

commit:     be44be1fa238d4d0be883714fe5f099d816d71a1
Author:     Hans de Graaff <graaff <AT> gentoo <DOT> org>
AuthorDate: Sun May  8 07:48:02 2022 +0000
Commit:     Hans de Graaff <graaff <AT> gentoo <DOT> org>
CommitDate: Sun May  8 08:00:10 2022 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=be44be1f

www-apache/passenger: drop 6.0.8, 6.0.12

Signed-off-by: Hans de Graaff <graaff <AT> gentoo.org>

 www-apache/passenger/Manifest                |   2 -
 www-apache/passenger/passenger-6.0.12.ebuild | 126 --------------------------
 www-apache/passenger/passenger-6.0.8.ebuild  | 130 ---------------------------
 3 files changed, 258 deletions(-)

diff --git a/www-apache/passenger/Manifest b/www-apache/passenger/Manifest
index ff782be6ad70..1d8922dad851 100644
--- a/www-apache/passenger/Manifest
+++ b/www-apache/passenger/Manifest
@@ -1,4 +1,2 @@
 DIST passenger-6.0.11.tar.gz 8183414 BLAKE2B 9767c3f198d7a779dfefed1d1a2ab07e3dda964a61718475470266e3b4448a45d2c5e7416a2e148afa66241f74e91e98ccbec7f2a08f5d4d1e2eff2ac7de5f63 SHA512 977d8adb261c17d5f21115703b9b18c4d3bfc17f998fb880d3a28f68392db2f9e6a2cb7612211f08bc913fd2f417cb2b689fcab2317707e17e8ddea6aeb967d2
-DIST passenger-6.0.12.tar.gz 8234023 BLAKE2B fd045160b8ce457ca4e136431b6caaa2e97628b73be77883f6aaae4d5352f7d4ea1827dd1c3cac4c35140bb85789533d53bf8331eadd22abca88b0c07e85e4c2 SHA512 eee627e2ca8ac6f0bdab33e3670dc27933f29b021a232026ae6b30cec6134e8f58a92bf8223001820eb08817f475956a19069177901110ec8d67c1e87004e25b
 DIST passenger-6.0.13.tar.gz 8216169 BLAKE2B 592b65ccfd7a043a6fcc1ea8061da3acaafd773caa2b5270e39906ee7f07cf3fb45654c5864eef53687d10c3079003a7ba8d3e8dfba50616b43516e1d457ce11 SHA512 25867f7bb7b7b09def800969884f5c3a2a5cf9dbb20817e02121a471e2eb6fb1e93d8ca3a4b103c5d17d6a61e33bf8edc29f54d496118b88c25147de85629d88
-DIST passenger-6.0.8.tar.gz 7567855 BLAKE2B ea8577c07a57eaea4e3b2b236808c9e54badb35368e948132af04220026b2676a71d066625a64cd98ce35118ae613bcbca8a0a1f8e0bc2a8d321c1165dec72f5 SHA512 ad35bee4a1c855b8f5401ab44e2a9b0cf3281e7fb1d8e09c8b12c54a465545d43285301c7d0fe16914e3c0fd5407d0d5cef31bb296f850d787903e6e006b368f

diff --git a/www-apache/passenger/passenger-6.0.12.ebuild b/www-apache/passenger/passenger-6.0.12.ebuild
deleted file mode 100644
index ace4e92b8d8c..000000000000
--- a/www-apache/passenger/passenger-6.0.12.ebuild
+++ /dev/null
@@ -1,126 +0,0 @@
-# Copyright 1999-2021 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 multilib 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"
-
-LICENSE="GPL-2"
-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.8.ebuild b/www-apache/passenger/passenger-6.0.8.ebuild
deleted file mode 100644
index 4d290110e58a..000000000000
--- a/www-apache/passenger/passenger-6.0.8.ebuild
+++ /dev/null
@@ -1,130 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-USE_RUBY="ruby25 ruby26 ruby27 ruby30"
-
-inherit apache-module flag-o-matic multilib 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"
-
-LICENSE="GPL-2"
-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
-	eapply "${FILESDIR}"/${PN}-5.1.1-isnan.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."
-
-	# Avoid building documentation to avoid a dependency on mizuho.
-	#sed -i -e 's/, :doc//' build/packaging.rb || die
-	touch doc/*.html || die
-
-	# 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
-}
-
-each_ruby_install() {
-	DISTDIR="${D}" \
-	RUBYLIBDIR="$(ruby_rbconfig_value vendordir)" \
-	RUBYARCHDIR="$(ruby_rbconfig_value archdir)" \
-	APXS2="${APXS}" \
-	HTTPD="${APACHE_BIN}" \
-	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"
-}