gentoo resync : 16.06.2018

3 files changed, 129 insertions, 0 deletions

diff --git a/www-apache/Manifest.gz b/www-apache/Manifest.gz
index 1b1b4a1ff022..e33230ff8f55 100644
--- a/www-apache/Manifest.gz
+++ b/www-apache/Manifest.gz
diff --git a/www-apache/passenger/Manifest b/www-apache/passenger/Manifest
index 61be38ea591b..b6786ca40490 100644
--- a/www-apache/passenger/Manifest
+++ b/www-apache/passenger/Manifest
@@ -4,7 +4,9 @@ AUX passenger-5.1.11-gentoo.patch 1064 BLAKE2B f62d689d7425e11609917506b1c19e15f
 DIST passenger-5.1.12.tar.gz 4245993 BLAKE2B 4f5808bcb373a85fbe2e160d9bd993fdff32a78f5083f5b5ff38112a4d3ca906a18a241cef6744350c0f33ef357dfda7a2cd5af875223a082a19b4e99cba4aeb SHA512 7ecdf0be306a3c4b842c8497861dbc072fc87f5601840678fe1125b77d50e683003b49616397d39b34705c967f604f5193be173c52a9c5ab235ef4e6e43f2f4a
 DIST passenger-5.2.3.tar.gz 6956101 BLAKE2B c2c5448f330e0bd90b5378e9868c18999263428df0a396595f4793979d3961282743b04eaec78b2cf5a0ebdb6a8183b798c2ae244b8a033edf14f5b8837225ca SHA512 fcd2244a30ce633f83448ff2fe3eea4d2215aa061aaf66de2dcd27f0b440b782d051f0f1ca49d6db673871e31518dc95cc6ffbd48a020f8ffe927d3b5969ef97
 DIST passenger-5.3.1.tar.gz 7033258 BLAKE2B 74269e06fefdc597344ddd5f11fb800df9beba7f59bfb3d0b43069f941d82db09cc6129bafdefd2175bf231ed496e7eb0298e500b27129da1ee07a04d054a8ad SHA512 973338f934a1fc484058cf15748695129ab7ddb8c0d4d8527100fefd111a0b794d60b2e59f8f494c4ef5703c72c7ebfeef5539ed9b4a6e736114e2077e83ccdd
+DIST passenger-5.3.2.tar.gz 7039759 BLAKE2B be10b368530b8560d7d93664bbf91711ace0cadb0d1e15a978c0a52311a626ea2e1c6d05e507ef488b384e4a7ccc4b02da35bd5bd5878788b036401e06a33b5f SHA512 97900a0e0de67cc3c3770c291c85c6fe937fceab5632c9832bc5c461d3b4e586a47c9733a1a50a805834f591e5af90651789ed74bf74e0eed4d6ce8084c51967
 EBUILD passenger-5.1.12.ebuild 3980 BLAKE2B 53fb3918d8368e51347ec18fa073916e79952ff432e279ab2007523a87bd1012f5833e354ecbc57e6595a4f0fdf0ef5288fe8141fa4e3c67494ef37e57171ef8 SHA512 09185eead6e3b933713f2b1538ae55bae0ed6457bc723f52cad69948c3c7cca3b3091b2fbf4ac71f5d57c3437db03392b67b0a5560e953e3339aebec5cc1cefc
 EBUILD passenger-5.2.3.ebuild 3982 BLAKE2B dee480b9113b7c5bbe7e739d270033b207eef046ef8b929b68d05d934a800f7595bc036411322c2af605798c28390bfade42e9bdbee22ec0909129c0ddcc0051 SHA512 331ef6f0de2fb54632564b2c161287a0a9164d44c809b26015a2b25221cb6fcc0147577212897ffa7be871e55bb57c2b51aba045a39f41ea4a08cae6ff9eeb99
 EBUILD passenger-5.3.1.ebuild 3982 BLAKE2B 89e14bf8db6ed5f52a9b7ac08ca58977e1b7d8afd492bbfd67dec1174046c030168cbc2462db0e8eefdb90c1f11f64c311b75dfc5988d2259f09f65536454912 SHA512 2fb7572a1c84e6d28a73ec33da00dfdf484bc8152018d5a713b096631e704b4b32947cb901809adf5ad46ba9a765dd410f1ab251fc0c78ebeb0b4ef3a60f7c05
+EBUILD passenger-5.3.2.ebuild 3982 BLAKE2B 89e14bf8db6ed5f52a9b7ac08ca58977e1b7d8afd492bbfd67dec1174046c030168cbc2462db0e8eefdb90c1f11f64c311b75dfc5988d2259f09f65536454912 SHA512 2fb7572a1c84e6d28a73ec33da00dfdf484bc8152018d5a713b096631e704b4b32947cb901809adf5ad46ba9a765dd410f1ab251fc0c78ebeb0b4ef3a60f7c05
 MISC metadata.xml 330 BLAKE2B 80067f262ce3e04098eaab92ec2420a879014d624fa6c230f57daf871ac33b77fcd786868ec508236c62623f2c81dc86573875a42993604896745524d7220fc7 SHA512 5ea7e5026084dedcd363bb79076763cca7d66bb08411d5e2dc56ade23bfdbd522a8db13db9c0b8f50163f130f28c784b622d9639cb3dd33aa810dda3d2577db8
diff --git a/www-apache/passenger/passenger-5.3.2.ebuild b/www-apache/passenger/passenger-5.3.2.ebuild
new file mode 100644
index 000000000000..7a2b4ba69962
--- /dev/null
+++ b/www-apache/passenger/passenger-5.3.2.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
+	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" \
+		 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"
+}