commit: 6885b80f6e62dfb3fca24dba255b246f66668a19 Author: Hans de Graaff <graaff <AT> gentoo <DOT> org> AuthorDate: Sat Aug 19 07:41:44 2017 +0000 Commit: Hans de Graaff <graaff <AT> gentoo <DOT> org> CommitDate: Sat Aug 19 07:43:46 2017 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=6885b80f
www-apache/passenger: cleanup Package-Manager: Portage-2.3.6, Repoman-2.3.2 www-apache/passenger/Manifest | 2 - www-apache/passenger/passenger-5.1.4-r1.ebuild | 122 ------------------------- www-apache/passenger/passenger-5.1.5.ebuild | 122 ------------------------- 3 files changed, 246 deletions(-) diff --git a/www-apache/passenger/Manifest b/www-apache/passenger/Manifest index 5366be7ae35..112f6045b40 100644 --- a/www-apache/passenger/Manifest +++ b/www-apache/passenger/Manifest @@ -1,5 +1,3 @@ DIST passenger-5.1.2.tar.gz 5646103 SHA256 7fb03a54650ef5e508895c9e45bc2d8151f6c4811ea6797e81f017fedddfdbab SHA512 88a77c749857a8538ea268f793d2708fa29b8891d2c3197577155f81cb66aa04919c25e713d4f00692051ad385eebaa94729cd30baa68edcf3d17c23bae0acdd WHIRLPOOL 8f115162e2a7c43af20cef1d689290c8a523cce10f617500eeb50ab6a226c203a404fc7ce53fd0e21e63276aa359c5d64b685318be36f79ce165ff598bac8766 -DIST passenger-5.1.4.tar.gz 5403636 SHA256 6e8460143fff88c7ae833b43ff5389c0b0d2654ee38ab1ac62e24a3814416de0 SHA512 c15df4ff59d21ec57361b5290106455a0e5b0aa1dc2b8442f06749426b81de0986e9826b9ca66f5e4f6536096c1ec201321e5d54200ead1fc2e67f3736ecb52c WHIRLPOOL 9311d5cea73df891b151512e81adf27f1fb98411944b23adedc43c0fa2b4e9fa78a778113e1cfb398aeaea580492b2444bd1a7b9d5d2704e0be514a120bb3ea1 -DIST passenger-5.1.5.tar.gz 5126337 SHA256 ea4139d2f0d9f7aa6488be966ffbfe602f80764a47b7077892d92324bff5eb47 SHA512 81a434015f4e4693bb9053449e614c235969d1604a09b7938725b796e9684dbdae4b317e068f03c118a2e8a4dfe80b88f91ef6008241e381978bd95d65d6e535 WHIRLPOOL 33481e7fdc280d9ba344b6d2a34778c21ae7b60f9da7264299f5537b848be7f1789835d996048cfa8e7bd23befd209bf2fe28dc865fc0e66bc6e8627e0a66fad DIST passenger-5.1.6.tar.gz 5215694 SHA256 e897cc5f0ec6446bfdc226404dca4bd29f7418ae92010c389661b9f024a3cf24 SHA512 71d301d2501863951157f55df30ac89f6f9d98e79b554a5ca05ca9a306041ecd8cdc92056220cf6dc9ad02972a102bfc990e3b06f887d27496a8ecbd58e109fa WHIRLPOOL fe6872d0c11803fd0d8875002f37425edc54327709daaa56518ace0ef9f5046836592298ca80ce4929a29e6c0a0adcb237b57a19cd0d73ac096992e742e2a8b5 DIST passenger-5.1.7.tar.gz 5218093 SHA256 2b40a00a3fdc90a6acf784319f60fd53549f036ffc99fcbb23a0658cb7e2b215 SHA512 f1f67f7912dd3d58ee46c32d1d0584eeb90e95fd5a36bddff62c28674560f1495926a867b20d12a3867d1e81f13c480ed596ba81f78f6241c511b12fcac1de4c WHIRLPOOL 12c1acee83255b19964f505c6238432971d7a80d7937fcfac75cd0645b8626d993365472ca7e622b21fc8144f37f1286e1b58fdfa71836bcd791467416013349 diff --git a/www-apache/passenger/passenger-5.1.4-r1.ebuild b/www-apache/passenger/passenger-5.1.4-r1.ebuild deleted file mode 100644 index 3dc6b74b68b..00000000000 --- a/www-apache/passenger/passenger-5.1.4-r1.ebuild +++ /dev/null @@ -1,122 +0,0 @@ -# Copyright 1999-2017 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 -USE_RUBY="ruby21 ruby22 ruby23 ruby24" - -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.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/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() { - 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" -} diff --git a/www-apache/passenger/passenger-5.1.5.ebuild b/www-apache/passenger/passenger-5.1.5.ebuild deleted file mode 100644 index 3dc6b74b68b..00000000000 --- a/www-apache/passenger/passenger-5.1.5.ebuild +++ /dev/null @@ -1,122 +0,0 @@ -# Copyright 1999-2017 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 -USE_RUBY="ruby21 ruby22 ruby23 ruby24" - -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.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/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() { - 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" -}
