commit:     29d4892d046ddf2caf6486a0d69a61a1471911c8
Author:     Hans de Graaff <graaff <AT> gentoo <DOT> org>
AuthorDate: Sun Apr 10 06:49:57 2016 +0000
Commit:     Hans de Graaff <graaff <AT> gentoo <DOT> org>
CommitDate: Sun Apr 10 06:53:43 2016 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=29d4892d

www-apache/passenger: cleanup

Package-Manager: portage-2.2.26

 www-apache/passenger/Manifest                |   2 -
 www-apache/passenger/passenger-5.0.24.ebuild | 118 ---------------------------
 www-apache/passenger/passenger-5.0.25.ebuild | 118 ---------------------------
 3 files changed, 238 deletions(-)

diff --git a/www-apache/passenger/Manifest b/www-apache/passenger/Manifest
index 9da65d1..0329adb 100644
--- a/www-apache/passenger/Manifest
+++ b/www-apache/passenger/Manifest
@@ -1,5 +1,3 @@
 DIST passenger-4.0.60.tar.gz 5271049 SHA256 
bbb8c18cc371441ce4ee9a4de4d124b6ec5e6af6e95a472b93a72d0357dc88fe SHA512 
144df1e5e3dfbf9f9fa13d959c0324760b01c5e86b3f8e52c3d7d9c32eec916a35cc5c52a8c7a5ab9ed1ccee4d7efc9f77fc9940ad1515937a7bfe964753b219
 WHIRLPOOL 
c8f3993b2745eb577c2eddbca2fd280e7db56adbeb4f72ba4b29770d95b991a8012243d1a9bd19aa59a28cfb9326117d649f70cf6d406a4e53acd1e40deb5b57
-DIST passenger-5.0.24.tar.gz 5415880 SHA256 
06b9cdd18c1ef283628b753815ae1c6eaf764f212fd8d439d7035c9257288f79 SHA512 
6b405881b7f9127f4bb093d7113e8ef6b4640ad33c27e1b1c5b860f2e2a5ec8bd4257c1d765a8a765712635c67e2e122cd6230b64186915facd98e14af5a3bce
 WHIRLPOOL 
76382d058b8364d67821ab5839623a96587e4e07eb19452a2163c3c0402e64410f6b08797bd8177cbf826e59b41360383520aeed98a7baf003db715c0d7d2eca
-DIST passenger-5.0.25.tar.gz 5302902 SHA256 
2a5531cd714a997a09a6105fbea8fb7dd27d168f7076a4db093842e2402c65ca SHA512 
6bc7b34f08c4928c566a49d98289041c1663387556fe1e38b50dcad2fdd762fa12fd9afe48b9042942e5694cdd41e3d54f00d692d8eebd2948a406a9019c174d
 WHIRLPOOL 
63ec49320d527f910ec410b3f47ef91e428d07d3c12cf5588445bc4b583992ad0bcf4e4d55a79dedea3711142d110d9c5c4f9b8ba1a7af4050418d6692200c30
 DIST passenger-5.0.26.tar.gz 5321762 SHA256 
de3b63b65ff27d193096361a330d9db1dc07076c1ba9be5ecee90322d91dbbc9 SHA512 
4910dfaa7fb431920336a914525a80ea36c6e1edb77608ee2728df2cb8fc17e93dd46f72f77d2167f792c28c78a3474496297a96540068d9d9609f8c4a42fee4
 WHIRLPOOL 
fd033b386a0a51b1403717bd49c2f7ef44dc153384f7d855b92d7f4851a25228fdc80bfd0839c4fbf6c6276eec7a2ce298340600d91976d85e9c0cd4b0fa8327
 DIST passenger-5.0.27.tar.gz 5568686 SHA256 
41f27a218a4beba7d251a4fb21819f87ecf37c2cea09aa3c01e40d7dc2b2532d SHA512 
a89d84ce00faadda5fb0ce6eec516f0f0bdd91b1747e5cea747d14cd7fa919cadd595685f6a40b38e1bfc25183a32f5251ab3356237437acd2a1f08cc080476d
 WHIRLPOOL 
a327edfe14ac278e0942301270f14a0aaf5f3649a2a9c36ee6bca6fde12ebe8b227083b34f3211a5d11c5bade3bbe86892dbfa34c2e6a31939f507dceaccebdd

diff --git a/www-apache/passenger/passenger-5.0.24.ebuild 
b/www-apache/passenger/passenger-5.0.24.ebuild
deleted file mode 100644
index dd31905..0000000
--- a/www-apache/passenger/passenger-5.0.24.ebuild
+++ /dev/null
@@ -1,118 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-USE_RUBY="ruby20 ruby21 ruby22"
-
-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="http://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.5.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
-
-       # 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/cplusplus_support.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"
-}

diff --git a/www-apache/passenger/passenger-5.0.25.ebuild 
b/www-apache/passenger/passenger-5.0.25.ebuild
deleted file mode 100644
index dd31905..0000000
--- a/www-apache/passenger/passenger-5.0.25.ebuild
+++ /dev/null
@@ -1,118 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-USE_RUBY="ruby20 ruby21 ruby22"
-
-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="http://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.5.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
-
-       # 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/cplusplus_support.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"
-}

Reply via email to