From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id 655B91382C5 for ; Sun, 13 May 2018 05:47:29 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 45925E085B; Sun, 13 May 2018 05:47:28 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [IPv6:2001:470:ea4a:1:5054:ff:fec7:86e4]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 0D219E085B for ; Sun, 13 May 2018 05:47:27 +0000 (UTC) Received: from oystercatcher.gentoo.org (unknown [IPv6:2a01:4f8:202:4333:225:90ff:fed9:fc84]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 343BD335C95 for ; Sun, 13 May 2018 05:47:26 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id DDE7128C for ; Sun, 13 May 2018 05:47:24 +0000 (UTC) From: "Hans de Graaff" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Hans de Graaff" Message-ID: <1526190113.e07db03259ab8df02efb1bc20f9c4179b76acc5e.graaff@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: www-apache/passenger/ X-VCS-Repository: repo/gentoo X-VCS-Files: www-apache/passenger/Manifest www-apache/passenger/passenger-5.3.0.ebuild X-VCS-Directories: www-apache/passenger/ X-VCS-Committer: graaff X-VCS-Committer-Name: Hans de Graaff X-VCS-Revision: e07db03259ab8df02efb1bc20f9c4179b76acc5e X-VCS-Branch: master Date: Sun, 13 May 2018 05:47:24 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Archives-Salt: 60e3569e-98a3-42c7-9693-8c3cc5f67e12 X-Archives-Hash: 519af75e7968151868fe0bf78ed3e5ca commit: e07db03259ab8df02efb1bc20f9c4179b76acc5e Author: Hans de Graaff gentoo org> AuthorDate: Sun May 13 05:41:53 2018 +0000 Commit: Hans de Graaff gentoo org> CommitDate: Sun May 13 05:41:53 2018 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e07db032 www-apache/passenger: add 5.3.0 Package-Manager: Portage-2.3.24, Repoman-2.3.6 www-apache/passenger/Manifest | 1 + www-apache/passenger/passenger-5.3.0.ebuild | 127 ++++++++++++++++++++++++++++ 2 files changed, 128 insertions(+) diff --git a/www-apache/passenger/Manifest b/www-apache/passenger/Manifest index 98cf5651c8f..50da1e05f90 100644 --- a/www-apache/passenger/Manifest +++ b/www-apache/passenger/Manifest @@ -2,3 +2,4 @@ DIST passenger-5.1.12.tar.gz 4245993 BLAKE2B 4f5808bcb373a85fbe2e160d9bd993fdff3 DIST passenger-5.2.1.tar.gz 4978302 BLAKE2B 622f831e0b3e1a950f3dabc69b13c304896506d70341dafac0df4074450cea2b2c33a1c60b39efe8600a3cac32c6782f28599de85e1856a785896ada27f2f9c4 SHA512 8223fe0f7c04de9b079e8748d22679b7253599a5ef070cfd63b829c7ec7c4375528bc186d136ab2602d07a9a36fac4bc53b30c775e433641dfa80ab67f326848 DIST passenger-5.2.2.tar.gz 6955357 BLAKE2B 4bf0f7185bafc5927ff82b3c2f171671266a4c6d0077b24b2efb439524618e67742ce0c67098cfa2457e3d17f4f3bf685736c3599dc10eca52c0cd00b79911a8 SHA512 c7a5a1cb686119846f9da16d6506bc689c64d20bdfa710a1e677374659759a10eb8540baf9c50c77a94a0c8ab748af3e4731bc7ccf6e402fd0a9d2d3ccb183bf DIST passenger-5.2.3.tar.gz 6956101 BLAKE2B c2c5448f330e0bd90b5378e9868c18999263428df0a396595f4793979d3961282743b04eaec78b2cf5a0ebdb6a8183b798c2ae244b8a033edf14f5b8837225ca SHA512 fcd2244a30ce633f83448ff2fe3eea4d2215aa061aaf66de2dcd27f0b440b782d051f0f1ca49d6db673871e31518dc95cc6ffbd48a020f8ffe927d3b5969ef97 +DIST passenger-5.3.0.tar.gz 7033231 BLAKE2B 5cfbd86153e0715b7ac2082ec56dda1e104fd297912dfdd9d8313fd95cb3e52c47360001dfabcc2e88e7cb4f357813fd9e7f51d4ebf94a607183eccbe9b158d1 SHA512 4e3516c21776b9451301f134ffc34ac2dc77f2462329c2655fd3348317fdf0e4f8c6720fd1e676693006b31722c198443219848b04b7a08deaf7ef088052b1eb diff --git a/www-apache/passenger/passenger-5.3.0.ebuild b/www-apache/passenger/passenger-5.3.0.ebuild new file mode 100644 index 00000000000..f9a24bd885d --- /dev/null +++ b/www-apache/passenger/passenger-5.3.0.ebuild @@ -0,0 +1,127 @@ +# Copyright 1999-2018 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 + +EAPI=6 +USE_RUBY="ruby23 ruby24 ruby25" + +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 ~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() { + epatch "${FILESDIR}"/${PN}-5.1.11-gentoo.patch + epatch "${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" \ + 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" \ + ${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" \ + ${RUBY} -S rake fakeroot || die "rake failed" +}