Cleanup.

(Portage version: 2.2.7/cvs/Linux x86_64, signed Manifest commit with key 0x8883FA56A308A8D7!)

3 files changed, 5 insertions, 203 deletions

diff --git a/www-apache/passenger/ChangeLog b/www-apache/passenger/ChangeLog
index 1e5c94858d6f..138492401f4a 100644
--- a/www-apache/passenger/ChangeLog
+++ b/www-apache/passenger/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for www-apache/passenger
 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/www-apache/passenger/ChangeLog,v 1.79 2013/12/06 06:00:29 graaff Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-apache/passenger/ChangeLog,v 1.80 2013/12/06 06:01:41 graaff Exp $
+
+  06 Dec 2013; Hans de Graaff <graaff@gentoo.org> -passenger-3.0.21.ebuild,
+  -passenger-4.0.21.ebuild:
+  Cleanup.
 
 *passenger-4.0.27 (06 Dec 2013)
 
diff --git a/www-apache/passenger/passenger-3.0.21.ebuild b/www-apache/passenger/passenger-3.0.21.ebuild
deleted file mode 100644
index 1fa665debac6..000000000000
--- a/www-apache/passenger/passenger-3.0.21.ebuild
+++ /dev/null
@@ -1,95 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/www-apache/passenger/passenger-3.0.21.ebuild,v 1.3 2013/08/07 13:35:20 ago Exp $
-
-EAPI=5
-USE_RUBY="ruby18 ruby19"
-
-inherit apache-module flag-o-matic ruby-ng toolchain-funcs
-
-DESCRIPTION="Passenger (a.k.a. mod_rails) makes deployment of Ruby on Rails applications a breeze"
-HOMEPAGE="http://modrails.com/"
-SRC_URI="mirror://rubyforge/${PN}/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE="debug doc"
-
-ruby_add_bdepend "dev-ruby/rake"
-
-ruby_add_rdepend "
-	>=dev-ruby/daemon_controller-1.0.0
-	>=dev-ruby/rack-1.0.0"
-
-USE_RUBY="ruby18" ruby_add_rdepend ">=dev-ruby/fastthread-1.0.1"
-
-CDEPEND=">=dev-libs/libev-3.90 net-misc/curl[ssl]"
-
-RDEPEND="${RDEPEND} ${CDEPEND}"
-DEPEND="${DEPEND} ${CDEPEND}
-	doc? ( >=app-text/asciidoc-8.6.5[highlight] )"
-
-APACHE2_MOD_CONF="30_mod_${PN}-2.0.1 30_mod_${PN}"
-APACHE2_MOD_DEFINE="PASSENGER"
-
-REQUIRED_USE+=" ruby_targets_ruby18? ( !ruby_targets_ruby19 )
-	ruby_targets_ruby19? ( !ruby_targets_ruby18 )"
-
-need_apache2
-
-pkg_setup() {
-	use debug && append-flags -DPASSENGER_DEBUG
-}
-
-all_ruby_prepare() {
-	epatch "${FILESDIR}"/${PN}-3.0.8-gentoo.patch
-	epatch "${FILESDIR}"/${PN}-3.0.12-ldflags.patch
-
-	# Change these with sed instead of a patch so that we can easily use
-	# the toolchain-funcs methods.
-	sed -i -e "s/gcc/$(tc-getCC)/" -e "s/g++/$(tc-getCXX)/" build/config.rb || die
-
-	# Use sed here so that we can dynamically set the documentation directory.
-	sed -i -e "s:/usr/share/doc/phusion-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:" \
-		lib/phusion_passenger.rb || die
-	sed -i -e "s:/usr/lib/phusion-passenger/agents:/usr/libexec/phusion-passenger/agents:" ext/common/ResourceLocator.h || die
-
-	# Don't install a tool that won't work in our setup.
-	sed -i -e '/passenger-install-apache2-module/d' lib/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.
-	rm -rf ext/libev || die "Unable to remove vendored libev."
-
-	# fix automagic use of asciidoc, bug 413469
-	sed -i -e '/fakeroot/ s/+ Packaging::ASCII_DOCS//' build/packaging.rb || die
-}
-
-each_ruby_compile() {
-	append-flags -fno-strict-aliasing
-
-	APXS2="${APXS}" \
-	HTTPD="${APACHE_BIN}" \
-	USE_VENDORED_LIBEV="no" LIBEV_LIBS="-lev" \
-	rake apache2 native_support || die "rake failed"
-
-	if use doc; then
-		rake doc || die "rake doc failed"
-	fi
-}
-
-each_ruby_install() {
-	DISTDIR="${D}" \
-	APXS2="${APXS}" \
-	HTTPD="${APACHE_BIN}" \
-	USE_VENDORED_LIBEV="no" LIBEV_LIBS="-lev" \
-	rake fakeroot || die "rake failed"
-
-	# TODO: this will create a mess when multiple RUBY_TARGETS have been
-	# selected.
-	APACHE2_MOD_FILE="${S}/ext/apache2/mod_${PN}.so"
-	apache-module_src_install
-}
diff --git a/www-apache/passenger/passenger-4.0.21.ebuild b/www-apache/passenger/passenger-4.0.21.ebuild
deleted file mode 100644
index e580e1056d23..000000000000
--- a/www-apache/passenger/passenger-4.0.21.ebuild
+++ /dev/null
@@ -1,107 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/www-apache/passenger/passenger-4.0.21.ebuild,v 1.1 2013/10/23 17:28:37 graaff Exp $
-
-EAPI=5
-USE_RUBY="ruby18 ruby19 ruby20"
-
-inherit apache-module flag-o-matic multilib ruby-ng toolchain-funcs
-
-DESCRIPTION="Passenger (a.k.a. mod_rails) makes deployment of Ruby on Rails applications a breeze"
-HOMEPAGE="http://modrails.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/daemon_controller-1.1.0
-	>=dev-ruby/rack-1.0.0"
-
-CDEPEND=">=dev-libs/libev-4.11 net-misc/curl[ssl]"
-
-RDEPEND="${RDEPEND} ${CDEPEND}"
-DEPEND="${DEPEND} ${CDEPEND}"
-
-APACHE2_MOD_CONF="30_mod_${PN}-4.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}-${PV}-gentoo.patch
-
-	# Change these with sed instead of a patch so that we can easily use
-	# the toolchain-funcs methods.
-	sed -i -e "s/gcc/$(tc-getCC)/" \
-		-e "s/g++/$(tc-getCXX)/" \
-		-e 's/PlatformInfo.debugging_cflags//' build/basics.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:" \
-		lib/phusion_passenger.rb || die
-	sed -i -e "s:/usr/lib/phusion-passenger/agents:/usr/libexec/phusion-passenger/agents:" ext/common/ResourceLocator.h || die
-
-	# Don't install a tool that won't work in our setup.
-	sed -i -e '/passenger-install-apache2-module/d' lib/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.
-	rm -rf ext/libev || die "Unable to remove vendored libev."
-
-	# Avoid building documentation to avoid a dependency on mizuho.
-	#sed -i -e 's/, :doc//' build/packaging.rb || die
-	touch doc/*.html || die
-
-	# Use the correct arch-specific lib directory
-	sed -i -e 's:/usr/lib/:/usr/'$(get_libdir)'/:' build/packaging.rb || die
-}
-
-all_ruby_compile() {
-	V=1 EXTRA_LDFLAGS="${LDFLAGS}" \
-	APXS2="${APXS}" \
-	HTTPD="${APACHE_BIN}" \
-	USE_VENDORED_LIBEV="no" LIBEV_LIBS="-lev" \
-	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}" \
-	USE_VENDORED_LIBEV="no" LIBEV_LIBS="-lev" \
-	${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
-}
-
-each_ruby_install() {
-	DISTDIR="${D}" \
-	APXS2="${APXS}" \
-	HTTPD="${APACHE_BIN}" \
-	USE_VENDORED_LIBEV="no" LIBEV_LIBS="-lev" \
-	${RUBY} -S rake fakeroot || die "rake failed"
-}
-
-pkg_postint() {
-	einfo "The apache module is compiled for the currently eselected ruby."
-	einfo" If you eselect another ruby you must recompile passenger as well."
-}