gentoo resync : 26.11.2017

3 files changed, 17 insertions, 134 deletions

diff --git a/www-apache/passenger/Manifest b/www-apache/passenger/Manifest
index d15ee4857118..f2ca2338b3c6 100644
--- a/www-apache/passenger/Manifest
+++ b/www-apache/passenger/Manifest
@@ -1,15 +1,11 @@
-AUX 30_mod_passenger-5.0.0.conf 2737 SHA256 c5cd9c6b0a6616c9934a1c1fc9952036a6b4adcd9049e11f5614157f786c736d SHA512 847aa6d0ebb2e4ceaa744fdddf72f22613aeb76df38a36fb3c8b16803222cec116e6d5c23d2173beffd5889ebb8ba0247ffd3b9e900a70d78c2236f00c1a5d4d WHIRLPOOL b7ad6e2cfd1677469c67d8c47e2b53f3087a84477beb4a29d10f71196c7f73590964add0316c97e791ed4e9bf03020d586a118da5c0ba499bb9b5547bf30b6d9
-AUX passenger-5.0.20-gentoo.patch 1057 SHA256 89b0070eeeb91ac79705694903a6145a97e87a60dbaaf35945c60da3645878db SHA512 c5022f3305b413954c75a280fea8b6a59c20a366746d17cdfa100dd7a0b3e4ea051af4c291eca0e71611dedd597903b25e893e7a382a9ee2415657bd55e91779 WHIRLPOOL 38b97ff42d558b9c43581f562dfe2d18b18cc55f5b6bd55912127569f2510462bf1b8f785d90f685f953e848a5b44838487b3f09e57fc24cad436ae331b2eb89
-AUX passenger-5.1.1-isnan.patch 1155 SHA256 52e8c304c841d31b673b1993bfc5a56d6c75db34d84cba6f87a622fe7f0e41c5 SHA512 a80a9a229f1eeb34780236d0b2418fe5d2f57b9ae8c3c4ccdec729806f4afad8979de4ab3ea0834cdb76218192825ee4bfaf02b48f3bda240c2db441bcc870d9 WHIRLPOOL 31cf3615ee67ee60639dbc0e8c4f51faf4c621b816c0bcb2b85b6c61f896ae087640a8dfce175a7a6e6cefafbac9c9345610f737e31c23e7bf1b0f1b1d03c431
-AUX passenger-5.1.11-gentoo.patch 1064 SHA256 6c259660b7e8b8e738a6d5630cf35186d786695b981b26ec4edfd5a5dce9c66f SHA512 7aa098e4c2d4958deaf1369c0570e5f0c5661739047982d428555e5136dc9d5414ce575b3236b30223f14178dd2a4262f62f129d1d383f5c0c78312e80634670 WHIRLPOOL 9dc733547a57d8eec4bbb9d3d751d9f6185e12ca7d063cdd4ed7b9f1a0fcf66f68a11e54c7d0103f5ca6a926568070f6cd2c5fdde59b66dc0cf46f12a9333e71
-DIST passenger-5.1.11.tar.gz 4243340 SHA256 26fc56b2f6d27ed58b948d9601a17a4f61e98fd16349bcb46f3ecebcac3177dd SHA512 7dce496916533f2fcd5cb5931d79308da8adda300a8b8603ce90b92645e69a1283d147976b5aa3408f86ccb71f9e5849bfb68e58a806a8a58529cadda557bccb WHIRLPOOL 071e3a0d1c23f1ac58f0ff93e48357f51aa538e9a76ae4fb115a3cb9ddb0a3eeb5dd6b2a8430bb76acc7cd4158be1d0fe4d640a2402d42a06a632fa87d84fa85
-DIST passenger-5.1.2.tar.gz 5646103 SHA256 7fb03a54650ef5e508895c9e45bc2d8151f6c4811ea6797e81f017fedddfdbab SHA512 88a77c749857a8538ea268f793d2708fa29b8891d2c3197577155f81cb66aa04919c25e713d4f00692051ad385eebaa94729cd30baa68edcf3d17c23bae0acdd WHIRLPOOL 8f115162e2a7c43af20cef1d689290c8a523cce10f617500eeb50ab6a226c203a404fc7ce53fd0e21e63276aa359c5d64b685318be36f79ce165ff598bac8766
-DIST passenger-5.1.6.tar.gz 5215694 SHA256 e897cc5f0ec6446bfdc226404dca4bd29f7418ae92010c389661b9f024a3cf24 SHA512 71d301d2501863951157f55df30ac89f6f9d98e79b554a5ca05ca9a306041ecd8cdc92056220cf6dc9ad02972a102bfc990e3b06f887d27496a8ecbd58e109fa WHIRLPOOL fe6872d0c11803fd0d8875002f37425edc54327709daaa56518ace0ef9f5046836592298ca80ce4929a29e6c0a0adcb237b57a19cd0d73ac096992e742e2a8b5
-DIST passenger-5.1.8.tar.gz 5234529 SHA256 fef10e4a34c3faa48306c21c0789ee4d4d56fc0e30205cc470a91b486b7a4a7d SHA512 5baf287e1f2a751409bba99671de2c41656033dc29132b2d964457405284105343fde4c2233c921d7e35794a47eedbf33e3840119a908741b1ed9e6fdc99ec2c WHIRLPOOL 6513b71aadddc9ec5ff4b4c617256a62f1c977b7d0f098982808851afc7703bd4ceed843cf309d07b239dbae97ed4beacaa2130a5dd325b17714df59f3b1f9ee
-EBUILD passenger-5.1.11.ebuild 3980 SHA256 9677c2c41cd6f6ec32e187a5fbef602f40909a35ff86b356270cf037d48e6d5f SHA512 3ee83e353f2a8e645b4e499b945deb2ad518ab620715ed7d6ed0fb69ac8571c1c63383ebf4e44514e9a420a8ac6739c1120b3af688c397260ee3aae94eb542f4 WHIRLPOOL 265d93f494a099c767313cc68d7e674dd943e567d20e34a98c86bbecfceffdfd84ef8400c033a9056b229ed83feea23241c54f426e86c67a655142001646b6bc
-EBUILD passenger-5.1.2.ebuild 3802 SHA256 4e68673b6e194126a37eb8acbb207a91e60219c4a2edfd635dd4508e652c9e9e SHA512 8f8ccf842182cff920f7956e3934e35154bd6235991e50e90bd1629b4f33caa4d480072eddbbc2ad335706bed0f5258ad4de0755beb0c2c89fbf11afcecebc47 WHIRLPOOL 5014b02757779a5cfdc5061ba8d8d5b588ed1e7048ea4b604c3c1a94bd572ab3b8f7c5c775c20dafd87400c305998a7c412bd8c6190e01ea003491058b9eaeb8
-EBUILD passenger-5.1.6.ebuild 3833 SHA256 228c9dbb2b64272213095f96ae7e20b33d643b0a0cde8b6996915f1faf3da95f SHA512 8f384e47cc1efa7c4dabe6dcc42fddd66a2498df22933d4e65fbed124540edb2210f8c0113ae4c2acd3f4d1066fb5eb8bb710f4a23065ef1db6003b48a80ecb6 WHIRLPOOL 1a45c0119c33f5d42c65083adb771d8bfae44daf300269d0734fcfc073e0dd1e665d69708e7f8757e3edb5ad9d500ee6b0d41d6ecdea8114ada29ff7ab1744e4
-EBUILD passenger-5.1.8.ebuild 3827 SHA256 d178ed339b1f895be1457753801d0dd838345ea485f8ab2e1b2227d59b34f542 SHA512 9a6153f12d67e13280b6539dc7f9bc6614a8c793f9484e2df3ed3c4793c37fe6dc7e48f7aca5cad85e2e9abd74455cc2d58010e22ff8a44e3c277e7872d58206 WHIRLPOOL 3cef97673ba0a6d95375368aecc7d7a577d26e2dcadaf781bb421d617fabd8ac5c99a9facc1656afe919f9804401d43db0d253101486c9bfd5d9b15805c1db9d
-MISC ChangeLog 8584 SHA256 923aa06ccf1db42d903c7fd6922f2f1c42d10cd7c4080da6e207fa0af2c69f74 SHA512 efd75c05d7bc141a2ab9634c6b5008071aeb30c7a82dfe4d3ab88d0553852961339be038744c43cc853d5274551c5bb177372bd0b4cab0ed851553da9a04e8bd WHIRLPOOL 6223af82e55988e8b8e666abb1abb3027cb901f86010f5b2e47a6c215cf79d33b540660bb731638f6896ca00feb5c8e5438c9307621f22e06251bca34fa03504
-MISC ChangeLog-2015 17351 SHA256 25abdadae21e308556904475d3a8f0c70274497eb69d917deb0aeb9c0aeed02f SHA512 185db00f89b00e3a6dcd01979266068e3632250b1cd68de5468c759a33bc0f10ddfca36cce4326e693354471b6a485445905abafedc89c8aca6aac18276acd5c WHIRLPOOL f7acd8802839c1d473820c1fde1025e86be2090db5da7ae0392545d298d97d33205b0a7d1ea1e71a7c2eea6026a908bb0fcd281f3c5a53985c03c3bdc325d8ef
-MISC metadata.xml 330 SHA256 14373e1dec97edf9d5ce98d31c443c436c7d62832007d1227a0687b217bd03f7 SHA512 5ea7e5026084dedcd363bb79076763cca7d66bb08411d5e2dc56ade23bfdbd522a8db13db9c0b8f50163f130f28c784b622d9639cb3dd33aa810dda3d2577db8 WHIRLPOOL 66281cf13b062809a9a3b3015b7ac2c33c7760d74cdc9c4b6f29fa3a7be240112f062cc8ec708ad74e9637793ba940200600e1517b3b2dc71e11e61ae3cd0b2b
+AUX 30_mod_passenger-5.0.0.conf 2737 BLAKE2B 781ffa4831313356b6caa493fc94a784f6b0245c2c37c27cc69eeba9be62c8b626b8fdf26c18ddffe0a06743abf1d529318f46c0091f64370f2a9d82f1b54116 SHA512 847aa6d0ebb2e4ceaa744fdddf72f22613aeb76df38a36fb3c8b16803222cec116e6d5c23d2173beffd5889ebb8ba0247ffd3b9e900a70d78c2236f00c1a5d4d
+AUX passenger-5.0.20-gentoo.patch 1057 BLAKE2B 9b74f818afa38258d6a2afc062d45dd0d0e4e9418db227f3a9af4e16afdecb7de16612b6c36bf29d80133335110ed23162b7a19230fcaf50c702a57df9eefc32 SHA512 c5022f3305b413954c75a280fea8b6a59c20a366746d17cdfa100dd7a0b3e4ea051af4c291eca0e71611dedd597903b25e893e7a382a9ee2415657bd55e91779
+AUX passenger-5.1.1-isnan.patch 1155 BLAKE2B bb11276f94f4be93a7ef089e09079d36971ca028df4f8962e4220880361b96c3640475ac537f62d5e7ad198fdfb477fe15f34dbd86db4143b24246d11278eb58 SHA512 a80a9a229f1eeb34780236d0b2418fe5d2f57b9ae8c3c4ccdec729806f4afad8979de4ab3ea0834cdb76218192825ee4bfaf02b48f3bda240c2db441bcc870d9
+AUX passenger-5.1.11-gentoo.patch 1064 BLAKE2B f62d689d7425e11609917506b1c19e15f9eebd5255c3b16f89d98ed44493af7dd0b7e5576430b2c603af29f51ea1ee2c82c34b83d6042c0419db2069740183e2 SHA512 7aa098e4c2d4958deaf1369c0570e5f0c5661739047982d428555e5136dc9d5414ce575b3236b30223f14178dd2a4262f62f129d1d383f5c0c78312e80634670
+DIST passenger-5.1.11.tar.gz 4243340 BLAKE2B 25c6cc0016c4078962466716f16a2d084d4e59528153bbe09dae70c4935941cabc456062e0004f7640074f163e53aa6f95e44fc7b99136292db5e3c9bb9fe554 SHA512 7dce496916533f2fcd5cb5931d79308da8adda300a8b8603ce90b92645e69a1283d147976b5aa3408f86ccb71f9e5849bfb68e58a806a8a58529cadda557bccb
+DIST passenger-5.1.12.tar.gz 4245993 BLAKE2B 4f5808bcb373a85fbe2e160d9bd993fdff32a78f5083f5b5ff38112a4d3ca906a18a241cef6744350c0f33ef357dfda7a2cd5af875223a082a19b4e99cba4aeb SHA512 7ecdf0be306a3c4b842c8497861dbc072fc87f5601840678fe1125b77d50e683003b49616397d39b34705c967f604f5193be173c52a9c5ab235ef4e6e43f2f4a
+DIST passenger-5.1.6.tar.gz 5215694 BLAKE2B 6a7408b5a2ec877a8689c5f3e7fe8b1b037446ac6bb7a3a4a4831bf2cb00d2fa3206e1acb52fda99d0383afa75354feaf0ff91c8ca210382c39f482ba86ba642 SHA512 71d301d2501863951157f55df30ac89f6f9d98e79b554a5ca05ca9a306041ecd8cdc92056220cf6dc9ad02972a102bfc990e3b06f887d27496a8ecbd58e109fa
+EBUILD passenger-5.1.11.ebuild 3980 BLAKE2B af2fdba8ec82519a2008563d4b3a9ffb6cb7b73df1c34aacd7cf11240a0d99ecd9f4212bbea32f5c2e5d3f0237e1106eebe5389cf40491e7a8f0edfe0711783b SHA512 3ee83e353f2a8e645b4e499b945deb2ad518ab620715ed7d6ed0fb69ac8571c1c63383ebf4e44514e9a420a8ac6739c1120b3af688c397260ee3aae94eb542f4
+EBUILD passenger-5.1.12.ebuild 3982 BLAKE2B 56f00e6cf61a3fa4488eb23a31bf372a1452ad6946ca6e625f5b7beeb4727e2c42e5f02894da2d37367a1ca56fea02c61f5d256cb24100b940788e8271ca05d8 SHA512 c3ded6ac19b039183cc4b3d9468b706b3a2aca2e4fc2e022d2b4cd1260a142eaa938a6d67a5eb636832d3cd9a77590d1e116a7daddd8e7c69526b22afc1d264d
+EBUILD passenger-5.1.6.ebuild 3833 BLAKE2B 6c253315a9d408a1dfbe8c07b5dfd9720d0cc5ef2f8ff62f47b5fc1db60aca61bc9d01ad138f3b7d9cce2b3b94ca4f06ccccbd2aa34c51757771d5a04985ed60 SHA512 8f384e47cc1efa7c4dabe6dcc42fddd66a2498df22933d4e65fbed124540edb2210f8c0113ae4c2acd3f4d1066fb5eb8bb710f4a23065ef1db6003b48a80ecb6
+MISC metadata.xml 330 BLAKE2B 80067f262ce3e04098eaab92ec2420a879014d624fa6c230f57daf871ac33b77fcd786868ec508236c62623f2c81dc86573875a42993604896745524d7220fc7 SHA512 5ea7e5026084dedcd363bb79076763cca7d66bb08411d5e2dc56ade23bfdbd522a8db13db9c0b8f50163f130f28c784b622d9639cb3dd33aa810dda3d2577db8
diff --git a/www-apache/passenger/passenger-5.1.8.ebuild b/www-apache/passenger/passenger-5.1.12.ebuild
index 2649ae2a9bab..8e51ddcea35a 100644
--- a/www-apache/passenger/passenger-5.1.8.ebuild
+++ b/www-apache/passenger/passenger-5.1.12.ebuild
@@ -42,7 +42,7 @@ pkg_setup() {
 }
 
 all_ruby_prepare() {
-	epatch "${FILESDIR}"/${PN}-5.0.20-gentoo.patch
+	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
@@ -73,6 +73,11 @@ all_ruby_prepare() {
 
 	# 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() {
diff --git a/www-apache/passenger/passenger-5.1.2.ebuild b/www-apache/passenger/passenger-5.1.2.ebuild
deleted file mode 100644
index 6ea838a5241f..000000000000
--- a/www-apache/passenger/passenger-5.1.2.ebuild
+++ /dev/null
@@ -1,118 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-USE_RUBY="ruby21 ruby22 ruby23"
-
-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="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]
-	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"
-
-need_apache2
-
-pkg_setup() {
-	use debug && append-flags -DPASSENGER_DEBUG
-}
-
-all_ruby_prepare() {
-	epatch "${FILESDIR}"/${PN}-5.0.20-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/apache2/modules/mod_passenger.so:${APACHE_MODULESDIR}/mod_passenger.so:" \
-		-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
-}
-
-all_ruby_compile() {
-	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"
-}
-
-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() {
-	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
-
-	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"
-}