Cleanup.

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

4 files changed, 9 insertions, 195 deletions

diff --git a/www-apache/passenger/ChangeLog b/www-apache/passenger/ChangeLog
index 22c74028fda7..1f2b839aa2e7 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.60 2013/01/01 18:43:00 nativemad Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-apache/passenger/ChangeLog,v 1.61 2013/01/19 10:28:34 graaff Exp $
+
+  19 Jan 2013; Hans de Graaff <graaff@gentoo.org> -passenger-3.0.13.ebuild,
+  -passenger-3.0.14.ebuild:
+  Cleanup.
 
   02 Jan 2013; Andreas Schuerch <nativemad@gentoo.org> passenger-3.0.17.ebuild:
   x86 stable, see bug 440098
diff --git a/www-apache/passenger/Manifest b/www-apache/passenger/Manifest
index ad2ddb60644f..97332b3d9932 100644
--- a/www-apache/passenger/Manifest
+++ b/www-apache/passenger/Manifest
@@ -9,24 +9,20 @@ AUX passenger-3.0.0-ldflags.patch 572 SHA256 22b7c85b2c3e0fb2c0275e0a63308cf65aa
 AUX passenger-3.0.12-ldflags.patch 414 SHA256 b17694c0a148980e39e60d5582b3e6ee313b63858d4aa827afe71ba1e7c7790e SHA512 b23014f7fcc708f266a1460fc93565a449e0493ab546b4bb4e457a53dcdc1fb91abd29e8825a0f65c30d2dca57cb9ce455b66e3386559f1c490c48cedd586e7b WHIRLPOOL b06595f84feb1dfce5aaaa1f190681004eb3925dabe60aa1cd1a5895e20a9b6325b82a258ad0c3019a0d612f6448803b0ddd6a89ffa636c186b046be0bf2871c
 AUX passenger-3.0.8-gentoo.patch 1746 SHA256 d639c675c7d2c3c23001f33513d0758a33e7cdb88406a311608be2f47f746f2e SHA512 bef5911e4f574cd96e67f008517d082ca3dea3e59c3586aaf170fb472f406b4f73a1c583ace527f0f5ab2d0de4cb50c8e9aa4b995eeec4066ea26da93f4a8bc6 WHIRLPOOL 6ca98d8caa9e5ad40edad2c8198c1d1f7c5174c4017bed2bdfe6abdaf8c4f11736b9707f9b11d753e243150458c79bf2915ae4adc46d6dbe7ab6564d99ba7629
 DIST passenger-2.2.15.tar.gz 2128473 SHA256 95a9f61070d268ecaa311539d8e28b348765ca0e1528665ef928fc4b4bcc1436 SHA512 a82f7d39d0a1053fd4b63c7d1464db54d229d0b42b326afc11dddef680938f522ba20b3bbd39ebb0241407b669dcdb7478c58420ca2f2225a9b2daa03ce8c17e WHIRLPOOL 0755d39c7d5abe804c7b47fba1fe8c309f1ce6cf8f3d4c419694559538842d9b2be69bbe79a2635c86de70dc8c286d6c9f53b1f3ee44963dea24cf3502337d1d
-DIST passenger-3.0.13.tar.gz 2654448 SHA256 87d5299dd41cb9592bf459d8e4526090a9b37170af9c50c043a20fd43fb09b72 SHA512 70baa691fd8833d3354a2d68824a0fe6455740cfa75d669e7d1a15389889395f2dcfc13d25f15c804cc1114ae26bbf3f66557ab59b1804eb1df333dc456ed07e WHIRLPOOL 0a5062051297e994ace166d45d65b99ae1dc6f1b739b781d9926cdf522a97ec99f6789012ae9572916d61878c43b3805bf4ca7d9267bbfb6e52d097a09547a95
-DIST passenger-3.0.14.tar.gz 2654651 SHA256 f9af8d0a39a5bd19698abd7c4e8e1be18dd7c628affd985a49979c098e3427d7 SHA512 9f8d6223336209f405eaa64a8d0e96c65a3b6ada371bcb6538a6805149d4336250d24465ad33b6b6b32b662feee4ae144237452b368262818ac94a5175574138 WHIRLPOOL 7992e02e2f0d9ec32091f7624f609e08643d147d6ae1a674a772cff1239b78532300f6b0b585f1b5691436a5673a9bb05dbe5cf512ca3908a1760fbbfb6b4bed
 DIST passenger-3.0.17.tar.gz 2667619 SHA256 3f1380cdf8342fd3b0df344b4b95e5f7810114dd331e56ca1900eda1f5747f01 SHA512 485a2e9893c81989cd89aae2d4922da4a0391b26687286f56c9b5d2b9b1e8e8e0607376895e7a44f7073743c1ea9f7de335420407145a39b1ab275e01bc77466 WHIRLPOOL e168e599d84d841ef4655905512f4b2e17e07d396793b7ea574cc587df634f4853635b8e9f3c8fefa33a74d6fb952be03284696b0fabeb39cd887b8eaf486cd2
 DIST passenger-3.0.18.tar.gz 2669419 SHA256 ac96993dc085b0384ca8802d392e19ce68d20057bf2ba7fbb7cc84a13826eedd SHA512 6f0c67cac39cb4855a3e3444ee0dc16e9f88b7e2842d92394978cf5dd2e24e4de8dbaf8f2dc640688f3a66c510a9405c7968dc180822b4b0029a5d240b0bd370 WHIRLPOOL f6f2a31cddb2d95a113ff89e9ad458b5551e84730eebc215b554ba3f045e5fed13e438892cdddb954701fd410f6b03e83086742cb0a11db472df730c6fbcb41b
 DIST passenger-3.0.7.tar.gz 2830376 SHA256 021972c7f4fecd80042e7fc1d8f19ee3008a5491a3b1d34958b2b7ed42bddc85 SHA512 44e63770edbbdfc275933e707b32f646bba4b3060b5a509c02e7aabdb658af92cf2e3e841ac7335b1eb5b9b0049522ee17f314fee53376c5ed0e4012c4708045 WHIRLPOOL 74efe292fbeb1f1267aa46f1393ba7d9cf7c352ea6895f2bb4c3624a358bd131f726bfae247eafbc5a4a788905103eab3a02af69b8ab23aae54b4d996a8a54a0
 EBUILD passenger-2.2.15-r1.ebuild 1372 SHA256 5de33fbcfc3ab8c09f885fa7a15669cc37b942f4df58b55fc831818ad6206a22 SHA512 da9358bd38247437860aba55b8ab26c515c337298ff5ab69a066047d961db978576bcfde9ec4316ab6714c9748d838281b6df773c307cc55b66d1cc849ae0b8e WHIRLPOOL 0dbe621e85f8d3ad6fcaa9163cd593c8e82799582544f95b65218ba72ae0163c1b6eb45e575f4ed40d6e1df145f3a4aca1131c77e85c04b61cf3095784eb6ad2
 EBUILD passenger-2.2.15.ebuild 1310 SHA256 adfb99efd637dd1f9f6b7d87c751f86de68048349cb602b6a137aecb7794f016 SHA512 a928a41badb0cb122bd38476b1176b89dcabae27e3cc1907247086a27bf3b12252962f2b11f5f9f88d502a1a7204d394abd12d9bc2b01a4fce9cd2f8b898ee68 WHIRLPOOL 44db92c92505b434faf9488ffeb6bd715de02d51270b25afcbe40c5f1ef306856143b71ecc296dfa6cae28d4d9158577e1230e29732893dd62e9a03eb502a5f3
-EBUILD passenger-3.0.13.ebuild 2992 SHA256 ab74db4e9c0c03ed950f3d7aa634bcf9391f0f12f1ab27ed1e5245393873248a SHA512 ead232f4533654f6754e2d743bf89b7292c763bb862c5c117b1b1281a6e9f8f5efda8b0be6534c4770c0e1beecc0ef80e9e90081f2499a6d1ca2d65f7caed1eb WHIRLPOOL da4b9362fd21cfa910e4942b8bc1fc8ecc9a461d4bc1f36e7f42cf072381e10ab73e212e416deda837fb73bcaa9821f5196019818fef73f8eb4e1e7b36bbf93a
-EBUILD passenger-3.0.14.ebuild 2990 SHA256 ba4f20503f3469702bfc2b7750e85ac1c0d79d2a8586c3fbb066a73e10384937 SHA512 d2736867281b5296ee1fd6491414b1ec561349de3a258407155b946b335addfc16b4dca013269c984730d5e5892205139e9ae7a63117f005ae374ecccb2ee9f0 WHIRLPOOL 7e2b8b8413f1031c22e03e148e2b72546a7feddd34cf92b4888dd5d603d3f1fb9057ca3779d868d6e3f8d36c9411973547f42d3b7abd01c6f897b37c7edc6407
 EBUILD passenger-3.0.17.ebuild 3025 SHA256 af7a3fee5eb186cdc763e60d8eeb5a73a9dcf3e7ff72d4c019974257cbf046af SHA512 c4c398465fdccd78453d84916baa600e98141f4ff31bed6e1784c8f621e5657d5c71f4fe02c711640b069d2006afa7fb26bf4188971ec98f28f88924a8b3f892 WHIRLPOOL d9dda4ba8b783667ea3c5b1edea5c95b444c435d6305be5b2b59a08fa50c4bf4958a67fe6e280b5607be5c5c622273acaab7558ba4ddd7d1e7d145f8023e8554
 EBUILD passenger-3.0.18.ebuild 3025 SHA256 3393cbf1413381dc5f2516617808bbe93c96639397adfa37d5e5a4917a2c9e07 SHA512 34f3d880d5fe81219546eedeb6fb0922a0157dc3e1f4bf09c5a5b4bbf0fa338b0f1b0b017e7b1f354a72b832b6a61a652b17fb4b260f856f1494663042f7bdf7 WHIRLPOOL 94d3b947a71643afb51461a7a87ec8797b9f9a28d6f4a8bed25daa2d516449fbaf0361b3630a2c99b17bac58b6c8275f3ab1e2de9b3e1bc5a4319660f8194917
 EBUILD passenger-3.0.7.ebuild 2506 SHA256 a5ec450770867f3d4981f6ba77ea95e91cd6ae22a419a42a471360a1a30083d9 SHA512 ee22c70431161e24c8803088b8dff45ed28fc077f78fe4dc90c9761f48b0fb4feb57ac35389b34971a597a9860457c3aae2f511ebeeb085c799a75f854fb8beb WHIRLPOOL 727f17ddb64a16b02c0783a657184a8a12f30fa00dc3c513797b96214cefe0ad8ccf419762757d2c2729e6a7785aa0bf58d2235d290999e72ce1ccc668d78fb3
-MISC ChangeLog 9709 SHA256 f8c63a4f6758aab288d113dc5e387feaa0e16cf5ae11e8c81df655a9d5c53693 SHA512 fc5828265667e8441c61dbb2847509824b6baa51f218765bddffec9f3e51c7398c270b245cbb3937c3924026eb9c29cb8ca21012bb795c457efa83abd318b1b4 WHIRLPOOL 10d2b723e1ec2a165d029b2d5a8773add160ecd72e89d8ccf6ae1eddea177934a13507f0f666e1f63b860a2f7f61a98efbc21f8115310fb0ae4e8cc4ae7b1ade
+MISC ChangeLog 9822 SHA256 c87160dce5c31f9d5c3051b479132c9f1184954bc8830901938e8dbd2e1efbc3 SHA512 8ce117f716c9e679cd980252c33281d9e9a55da2735904b919368e096f84dcc2be9480971ad3e121c0941fc968d8ea7c0d8f079e514920b557ed9e27365fc818 WHIRLPOOL f6093fff85e8daa372e22ea1ac4a6cdeac7da53cc27c566e7154cf4d0a1616fdeabd6b6639eefd9950f05c0e12f11a6797bcc762f81e29768b9f985d80fedb54
 MISC metadata.xml 235 SHA256 426d2ea49777c4552d4d17e05c35cb094f22210fc91574ed3f282ded828fecb1 SHA512 b5127ae32b50e1b3fc0e0f4cd13914e8bb625084c19156194027fe7b4687015768d05c2b28fac3fe0b588c6503bb13b48629d82ab321dff3b614df8eb6250921 WHIRLPOOL e5ae624478bfd2f882ca1dc4b3802910a04031e3612630b90a654b223a590b1b0b3b208dc788f5347e0d0c42c8559a23c94274907cbd8b0b1b06ba4f6e1012d2
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.19 (GNU/Linux)
 
-iEYEAREIAAYFAlDjnNAACgkQakKUmsHeVLLKxQCeNyvlb1P8NN3VSlVsEFZs4Hsf
-7kcAnRGVS39WkTKecwKU75xoQ3x0G1Yf
-=UdQP
+iF4EAREIAAYFAlD6dVMACgkQiIP6VqMIqNeABAD/S2CPj3+HDxOJv6qRE8DBjht6
+PiIm2owtoZa1VK28kY8A/3KovwHmsHeZMWTtWfBeGzfD7sTFLPj9fTT9w0Hiiag/
+=BciF
 -----END PGP SIGNATURE-----
diff --git a/www-apache/passenger/passenger-3.0.13.ebuild b/www-apache/passenger/passenger-3.0.13.ebuild
deleted file mode 100644
index 8ad29ccc12f7..000000000000
--- a/www-apache/passenger/passenger-3.0.13.ebuild
+++ /dev/null
@@ -1,93 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/www-apache/passenger/passenger-3.0.13.ebuild,v 1.1 2012/06/15 05:54:33 graaff Exp $
-
-EAPI=4
-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_rdepend "
-	>=dev-ruby/daemon_controller-0.2.5
-	>=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_2
-
-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-3.0.14.ebuild b/www-apache/passenger/passenger-3.0.14.ebuild
deleted file mode 100644
index d4cb6fd2adb6..000000000000
--- a/www-apache/passenger/passenger-3.0.14.ebuild
+++ /dev/null
@@ -1,93 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/www-apache/passenger/passenger-3.0.14.ebuild,v 1.2 2012/08/07 17:11:50 graaff Exp $
-
-EAPI=4
-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_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
-}