Cleanup.

Package-Manager: portage-2.2.7/cvs/Linux x86_64
Manifest-Sign-Key: 0x8883FA56A308A8D7!

4 files changed, 9 insertions, 210 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/Manifest b/www-apache/passenger/Manifest
index 321c60e7f535..cd134ce4ed8d 100644
--- a/www-apache/passenger/Manifest
+++ b/www-apache/passenger/Manifest
@@ -14,20 +14,17 @@ AUX passenger-4.0.10-gentoo.patch 2131 SHA256 113e75b58164f05f901430ed4f426b7302
 AUX passenger-4.0.18-gentoo.patch 1682 SHA256 1331a98ed68ed60fb0d49ccbfafc22a755c7d8fa0fcb8aeeec2d52d3d036ed93 SHA512 0e33ff52262976a282800359b5790a4109664f5cc081df893b2f4fb9687aeb97e1419c36d21a89f497faa354fcacbf7336492e8d1cac7ddf7b58234b8f4fa15f WHIRLPOOL f5a00b3d67a5280c43ad9fbad0eeb81df873650a2d794d820043b2f46dbed6a8392924009d713d43d9100c2aa5f9f2398afaa83738f93e79f27c6bd9952d4a14
 AUX passenger-4.0.21-gentoo.patch 1759 SHA256 86070ab8259af80eee024162340fbf53a246b69bf04bd1309e3275323f856bec SHA512 b9dd7932a1c59de80ba2e30d4487ea69df750393b05bbfe32ad1c616afc1e10e04c1d62a6e6c847f87ca22c4abf51c853e9dd55f209bb05106065794ac0389a1 WHIRLPOOL 1735a410352654784fbbb3942fffa88ee9896400b92b0651c062990c8cd614686432ce264092ef6460d217d69b1fc16cee34ffcb7a5362a5aa385cf14e418f54
 DIST passenger-3.0.21.tar.gz 2657475 SHA256 82a79a2ff6803e1669ebf806ab320180990ddc096e3d30977ad1c86081b594a5 SHA512 4e92fe8cc679776531a73525ac0dd99612096c1370b4019dcda54aa928cbf6ba17c024124286342209a2b9d1ec9cb22d3783fc6bedc85cb9a0d0fb7561995eec WHIRLPOOL 11f9a5655e7ebcfd9f4a03a63d077126a0766ed7ad92e24494c3515202603782d3a8c999b4662004577d3463de68c040d783d9f93c01f95aa935289c0628780d
-DIST passenger-4.0.21.tar.gz 4122298 SHA256 3cc7db6de66e8974b5246d7ba0676f5cd3b4dfb257d5f545556ecf046a4a4dc2 SHA512 65460dfa6e61b53e3b2c6f271d56d43f7460f7e1b981a32d8546dcbb62a6f56d0b68e2bdc7bc7292f7ab5418f2f6dcf856606312f85a755d4a904d0700fa1263 WHIRLPOOL d10caa788128afd38eec53495975b2f6226b27504b81b262cd89cb9e4d3f034c738e409bab6cc2e18a4cd89ea0d49ee7a057f95914ed6f3f6ad7a71864a524f6
 DIST passenger-4.0.23.tar.gz 4128960 SHA256 4654c53f0442d3ed440a9cb428bca7dbcc7d3e8cec9ff835f91bff3e62b66439 SHA512 090b1477adf044a7dfe06c21c83fdccf27bd64f9a62de53ac47f52a8cd77cc1064c6c0c862bd6004ef81d7b202f30668bc8017db707ace31e613f7d581f02563 WHIRLPOOL 8a08b59794e887db7ca58048acdf38aa944101a7c713c2910af7e339cf678d6c8dbe6308645ee912bc41235be122718a692eeaeeac2abed2af52c582dbeeafcb
 DIST passenger-4.0.27.tar.gz 4142870 SHA256 b0e8ba5e78e7b5f941c9c6236f9139b98a028313c8d453e65057828c2e6a82b4 SHA512 79beb1a154be578a43f1a7793d0e6443c7eec77c47f74c2b241124eec81ef76d9227d2e4986ac88c546e74206211d8deb3fd4cfa42378db5134228d1aa5ece69 WHIRLPOOL f200d75fdd5f6406db026cff259975a1858f5fd60bb43582aa15711576e427bfec76c6b8988f31b12ff9f1e49f65c7fcb7a172308a9eb52ca0de4cf180ba5de8
 EBUILD passenger-3.0.21-r1.ebuild 3253 SHA256 19b231560cbfe3b4a4bc8303fab0da874927a5f30ad897187fe4028cfaa76bf6 SHA512 4ae46a34d9aa5b5756949380bc6a8a2ebd475852052c374059ec072a5e03c97724a13fbdb9e0b40cadff438c527c8034b3c5293e9c165b4a0360f6190ec5562c WHIRLPOOL f9b99a8e94a842ff2b61eb3b7f57d4d3b264072b95c73c64dcca9482e6c9013396be0ea4310bfa804e07f171340af7df8289c0eee50bc6ed840ce41a7d61292f
-EBUILD passenger-3.0.21.ebuild 3019 SHA256 f198094111a2b47de8e1f17404c3d2daba1d72f131604e2fd92f3405f3cf0d2a SHA512 5b3342d72d3432451547cc51e1476c60820747bf2fa66a31b9bcd37fbe8dd365eed6d609c519f2541a5ba00795c4c9c32d6f4d7ea04a955bca3317060a12f351 WHIRLPOOL dc6e7f0e2ff9ad20b0b38050449cfb23cd8b01b5f427ce286d24c04620af5c7f5ed7c1bfc0d39659f5f9978987a19a25c33ed200f30dfc9790ee291de6fa3889
-EBUILD passenger-4.0.21.ebuild 3396 SHA256 f5271cb4ef23cdd6ccde234b80617c47e33de824966479eca83bfbfab7f490de SHA512 4092647f538fe2ec1748780da86a56caa299df9ccbcd5f7635136bd0cb14f84c3f98d22336d92216bcb4dfde1434f2c8b912c4547044379de577f3e58ac884f7 WHIRLPOOL b44eeaab10e88bcaae6d0565abf99598381ed66d090eb83fe3f681dc257d15dfb1e7d4132b4e46b86bcc83813fe2465a24d3ed5eeac040b4e7c4102dc0ec3aa9
 EBUILD passenger-4.0.23.ebuild 3531 SHA256 14ab688cc5efdb5c1c62d2f5005808c67a2a69bc1f526480530980ae4d81d332 SHA512 032f8765e341ad023de7102e4dc40ad413b94ed27b5e64b467afca4253c920908e72ffb3d11d514a6e1bd5609d7c820036e620962541f669c53d4dbf362c9e86 WHIRLPOOL 187ba040217e99b5887b260bea177ebd66ab6281dc2fd93987b8ed8455bc36cf21cddd886cf638951464a7d61d5f1bcb69c519ccf040ddfa06ef3e1af0a1caa1
 EBUILD passenger-4.0.27.ebuild 3531 SHA256 3a47829bb6d9b61d57741cd9f5b74f9290bfd7aca31485cb45117a26e8e31d5e SHA512 20093dec3bc4b275820626a5689ef5df9d95f4bcffe89d67e734522eb2194099e0a915f394bcb479fc9e0fb6c7c54b2e195ebd9f85711a74879e22b3f1bd94c6 WHIRLPOOL ec9622df975e91dd217e7ec5ad8e4f9c3b033dd1aeb110eef7b4648c3e5bca1f62758f45f4aae8ba54c1710317ad1ae7d0a500271e4e26bfe49d2a0aeaf23062
-MISC ChangeLog 12473 SHA256 cc55087d06573a0eda05e0616aded42d1af0b216c111d0717a92a9f6847d02fe SHA512 0b623b2c0b8e846e75bb70e41b8a3094a28a1cfa147015a9e35f6646bbecec00de879c6e3134411989a3f2b081107d0507d78e42758e473d65d3eec24e754392 WHIRLPOOL 9403f585e01a142fe57960f796071aa711247e97aae41d36d4f372352a169f934aff879aafb2171f2012b96a14781b3f73c00f658d0312148dae0d031c61e38a
+MISC ChangeLog 12589 SHA256 9ae70d9f4d455b481d71df1d15d3fc189f68271822720e4d5750f8db9c8b8eed SHA512 89b44c55bb4db6f332cbe2087157d786ba83c6b7bc0328a4bf396f937cf17d0f07ae58b1e8d5d8ef822695d29ef70ea34f7f69700ad0111054019110dfe32bbb WHIRLPOOL d2b526f2e3b6e86045d5e06792e97de5222808a659662c0e19f2122a40634289d123a4f02a81e8d5331449880cf700a3596d17310def2394d3116c383969d3a8
 MISC metadata.xml 300 SHA256 587c979e6c7d5d5755ee3b7861a7b35038abf4c64633526eef338db1f6477c94 SHA512 fda4f74b7e039c72a54389253a980fcda052d25efe2d43f6cf3d54c67bcfaa20adf9fe74c292bf4774ce2621dd321c2e9f282c7c081e0145cc633de263cf6f4d WHIRLPOOL 8137bbdf332c5394440f888334cd32c0d2a23b12d6c46ae38c7bf74eebad100a25d5000f137a41baf449b607e5ea03688f311268982480ef5d3fe5ac757f76aa
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.22 (GNU/Linux)
 
-iF4EAREIAAYFAlKhaAIACgkQiIP6VqMIqNeKOAD7Bc8oPNFC77674esGQlwL7e/0
-2dZisopSC/Us6t/W9DAA/RkP10IZjyxKGkJryjFRpSkvvBSwuMEjFoiN7Ql8fKZ2
-=b9aE
+iF4EAREIAAYFAlKhaEYACgkQiIP6VqMIqNeUngD/Xe1TD3bShBv4N6+LFJTjMPAO
+VRp6hRz9hf0JXQd8WK0BAIQJRVo5G3GsR6siC0pRacxwHcj4TtMgJIJ+x6pZg8KB
+=Pz12
 -----END PGP SIGNATURE-----
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."
-}