Cleanup.

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

diff --git a/www-apache/passenger/ChangeLog b/www-apache/passenger/ChangeLog
index 49b1671a519e0df9fc933a4107d2a1aab1d2e5c5..b7e64d05bfdd0178795d0841afeabc43788b53d7 100644 (file)
--- a/www-apache/passenger/ChangeLog
+++ b/www-apache/passenger/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for www-apache/passenger
 # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/www-apache/passenger/ChangeLog,v 1.108 2015/03/02 19:48:12 graaff Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-apache/passenger/ChangeLog,v 1.109 2015/03/14 05:36:17 graaff Exp $
+
+  14 Mar 2015; Hans de Graaff <graaff@gentoo.org> -passenger-3.0.21-r1.ebuild:
+  Cleanup.
 
 *passenger-4.0.59 (02 Mar 2015)
 

diff --git a/www-apache/passenger/Manifest b/www-apache/passenger/Manifest
index b814c0a6c3bc128bae7c7763ed0cd36e6ae60069..4fcb5003177bbfbf37d3780d6549943a9f2ba36c 100644 (file)
--- a/www-apache/passenger/Manifest
+++ b/www-apache/passenger/Manifest
@@ -15,22 +15,20 @@ AUX passenger-4.0.18-gentoo.patch 1682 SHA256 1331a98ed68ed60fb0d49ccbfafc22a755
 AUX passenger-4.0.21-gentoo.patch 1759 SHA256 86070ab8259af80eee024162340fbf53a246b69bf04bd1309e3275323f856bec SHA512 b9dd7932a1c59de80ba2e30d4487ea69df750393b05bbfe32ad1c616afc1e10e04c1d62a6e6c847f87ca22c4abf51c853e9dd55f209bb05106065794ac0389a1 WHIRLPOOL 1735a410352654784fbbb3942fffa88ee9896400b92b0651c062990c8cd614686432ce264092ef6460d217d69b1fc16cee34ffcb7a5362a5aa385cf14e418f54
 AUX passenger-4.0.33-gentoo.patch 1066 SHA256 f1eb0799b3b1dfbc35985aed4b4f972d7ab92b354d8f77d9fd6d9e1a7397603a SHA512 d2060b54e10ca75bf4876b6d6076e64fb182f6d07f3609893a71bc62f564d37016edffc6d5eab684864ecb15717c7e18116c94c763cf105203c76031df5b2a70 WHIRLPOOL 3f8db66d1d408dcd552ea7657058050676f6d430a7a07fef012cd28e272dfaf5f4d6f612033958d4904489f7a0bfebb9fee2f2de1a6dcd7ae335cc08b4026991
 AUX passenger-4.0.49-gentoo.patch 1062 SHA256 bbba30cbb674a91f02b6cee7405d09b9a3ca0f5f1b2ffebc29dfce0b8c3c165a SHA512 7e06cf7901348ddd5279a5f8a494c771f5f889f03c855d49a686d4cf91ea921140f7cca33026a9b8dbe131477e62f757fcccaf766a47d466a9dc1cc26699b887 WHIRLPOOL bb8307fe7fc981806f93685d396462d094f4d5135c859e28d3c1c6e5174ea7281a65161f4e5bd3ebcb7cfd56159637211cb701ef46d39363fe656dd4b0128ce6
-DIST passenger-3.0.21.tar.gz 2657475 SHA256 82a79a2ff6803e1669ebf806ab320180990ddc096e3d30977ad1c86081b594a5 SHA512 4e92fe8cc679776531a73525ac0dd99612096c1370b4019dcda54aa928cbf6ba17c024124286342209a2b9d1ec9cb22d3783fc6bedc85cb9a0d0fb7561995eec WHIRLPOOL 11f9a5655e7ebcfd9f4a03a63d077126a0766ed7ad92e24494c3515202603782d3a8c999b4662004577d3463de68c040d783d9f93c01f95aa935289c0628780d
 DIST passenger-4.0.41.tar.gz 4060645 SHA256 7b1857e02280066d4be9123a1c13ead1eba280e60e3eba7b4f0e16279fd71259 SHA512 a65c1a2b3ef14d9ea03f0dab0588f96dc3edcc9752cc00d7ea9f8b5839d000e9a993dc9ce93cf9f3a94a7565aae338835041efbaf5272506e4adabf393078fd0 WHIRLPOOL def6f3ac303895f9d807a5a559f6debe682a5a7e661abaac4fc5cfaf5d56d968b9059e47e1966f56039a91c47230b1fdda98df2fb36f4cdad3627f2edb5fc1fe
 DIST passenger-4.0.53.tar.gz 4447609 SHA256 0b8d256cd930f93cfe723392aaa12fa3f9d5ddfddc82bbb7ab287673d029e101 SHA512 45919317c42da898783a22095fe75ed26f9142d227a25f5546f16861ce8c3ecfe2d804a845d389a00019df914cafd7625dc4e8fb31bc2f4ede5ecf41ce69c2a7 WHIRLPOOL fd205aefdec95eee82165d5a65e3dcf112544784549aa51d8a52703b51242120583e64837604ba31957e2cc98fb85a164f9ee19c367980869e0ff0159759c492
 DIST passenger-4.0.56.tar.gz 4520584 SHA256 d09de65d7ac2598f9d383bbaf27c0cbb1c46a9556397a18c8c0e3bee08f3e645 SHA512 a778cd2a2b6c2d6cf9d32e74e5d96414b2cfceb8f7ad918e12a8c5a65b08b5db1e3b96d8cc2353c1fd6bd309179faf48bf303ed536a2d85a8517c3fa8ee1d1d9 WHIRLPOOL 44efd0c011a057b32444e74ed26be77e0fcf4e11fe092023a12d9c415a337e69bf716e35af050bfaf117f754498c9a6da7df646a5decffe56b0290b2f1d5970c
 DIST passenger-4.0.59.tar.gz 4521206 SHA256 8b4756564a5133dc97425883d15d1ba1c9f6566c79e92794dc3e1f5b749238ae SHA512 d29400c71cf9530b41ce8b8d4cf94007e4d77fb4ceff290786506d6b9dfbab790f18423dc5dcd71aef07147ba2610c2982f7ca733a8e491de6a0cb3704c54bfb WHIRLPOOL 4683d19813ecbb284ec3eb9681c6c1a1b84f256f0262e6c2b1941df5872031a30da1396cb22fa1cfbad2f53f8971131ed0418c2ef4c20160a3d67f151d54208a
-EBUILD passenger-3.0.21-r1.ebuild 3121 SHA256 62925e40e503fb4dc786bad538b7d241e8b3a4067bb06dd08a699e1e48c081ca SHA512 6678ea9b714c80c622074edd3f63d40cc5e57e7f68a479f9615b81271c1aaa33dc20bdcb047b0f122397effb68e1ea22b5fd2288bd47b69fc1e6006c753fe9cf WHIRLPOOL 29a97b40041cdc4cea999c0cc1f49debd0a41fb7be4322eabfb456df455b9ca8c5ca9b55c496b4efd771544432cda82811c73fe86036f68ecd7668f298b94cda
 EBUILD passenger-4.0.41.ebuild 3662 SHA256 f9ca21e4467e35cd05ece5b30abc9d4ef5ea426d20de68544e7573d9299cce1e SHA512 a4f3791de69faffa71480da47b575a914cdeb71ac2366d2522f0c437b8ee77c12ff53589b9e9a14a7a60ab048def42d8165af51bcacb30fcab9203501b65da63 WHIRLPOOL d79a21f84347a9abb081e90ca2f63974793b348d2b2ee2c05fd9bf2b450bea902a508e80c49601ee8286064fc2504c04967dc0ae6e39a116354dd16ae6f210f3
 EBUILD passenger-4.0.53.ebuild 3821 SHA256 59cf3f9bb2ec61eefdcb41f765eb2f98cba9aae3baa2120512f853738e6e52d9 SHA512 e5389588be6231a4dbe03576da4ca01b089ba61ea51f9c5fc819071cf95f547bc27582a35069b6dfd3c494b750e07127f97af246d682ca11ed42332d91a241c1 WHIRLPOOL b7fd8d7abf0f012ebf91c48bc9efc3fb301bf1a72160b1382536fd6783a0ee226415e2694f6c4310434c4927593de2b80bd3a2cfa2a020b2e2e70d7d895641f1
 EBUILD passenger-4.0.56.ebuild 3689 SHA256 b832cfa0b93796dc3ce57801b6c221359417e72e6ae835dffecd62866011d328 SHA512 6f7d5de657ef753004e8842ef4c6573ad031ad0aa6939261233c8fdd4b57cf7b8a1427eb4100f3f73e243a832d90adea1a35aabd0d1ca7752c30b50503e0ee27 WHIRLPOOL f2d5c2c2d21bf06f0a97f7621a4d023158772ca21376e8a7a0ec78e4579697c8d9988ab43526a8a16c46019c1dd2c8637303bd80bd82d6a8d79e9afff65cf419
 EBUILD passenger-4.0.59.ebuild 3696 SHA256 f7bce81db6215280765ab7703d32915388917526e7b7ec49ba0f1c423690f5ce SHA512 d9ddb0400f08664d9d5faf28c972cf7e689fe48a09bce11aed39eb4f69f49a3147304770d5662381fea3fa09a588b4167b97d11a75cb3e2749d74de78ca0a512 WHIRLPOOL 1bd9cac71c50c7ac62d83aaa2c6b574a8b4bc2ce44693a017800381ae06a45e35587d9bb2e130ff3654d2bf246290222ab7059d0ca18b29453d23cd5c6b24256
-MISC ChangeLog 16454 SHA256 d1e1abd2d068d6179cf8af5002f5bf0349782af1e1ab1b4859bb0b64da9b8246 SHA512 30075d3588dd935d5f884a0149cbbfb2d3a8e7a5ff183a6514d217c5a540e0506d05a562fcb48f7702d37c74668d0234291b2aae2e9838d9866aa90fda133362 WHIRLPOOL a08d85478165a749eb320837fbc926c2560e1c23bfd33a1390d129e95eb8f2660d0e85237498e5b96bc1584d6c49329cf8c1b24041fa64e90c40dd6517f544c9
+MISC ChangeLog 16545 SHA256 374be45d29cc3c766e6977226eec236e17432689aa940acd663848a52754ce6d SHA512 0cb98660f361632d3c2745a0a6e9d202e33247d04c68affbefc7394bb8b4a901e3688d1c79cd3e2e8e6c0729963b24f8606c9b84dc25106dba92aee2fc69ebe7 WHIRLPOOL a47665a3dc6d70e748bcba71f74bc9c6d870fed588473032d8a454e5058f7e4c8b6e3de94f67b43bd9b9fff502c4538a5f89c2f12bad27458e4d94675e554a51
 MISC metadata.xml 300 SHA256 587c979e6c7d5d5755ee3b7861a7b35038abf4c64633526eef338db1f6477c94 SHA512 fda4f74b7e039c72a54389253a980fcda052d25efe2d43f6cf3d54c67bcfaa20adf9fe74c292bf4774ce2621dd321c2e9f282c7c081e0145cc633de263cf6f4d WHIRLPOOL 8137bbdf332c5394440f888334cd32c0d2a23b12d6c46ae38c7bf74eebad100a25d5000f137a41baf449b607e5ea03688f311268982480ef5d3fe5ac757f76aa
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2
 
-iF4EAREIAAYFAlT0vn0ACgkQiIP6VqMIqNcLIAD9HmermUWl+oWYZ/Le2rE35q50
-MSH4VBSK+rvf+a4VhjcBAIDjBHorj8gbRjyo8sxjsnepf+fRJFZL1IGzE6I0Eqm7
-=8c/U
+iF4EAREIAAYFAlUDyNIACgkQiIP6VqMIqNe9wgD9ENBfkSFBiMu0WoqxvYBAM4yx
+TFquB++FAZA4ixGXN/UA+wWdtBQa3FZGYf4R/N611dcg6cMrEFPcREfuoDxhZVfa
+=b9uS
 -----END PGP SIGNATURE-----

diff --git a/www-apache/passenger/passenger-3.0.21-r1.ebuild b/www-apache/passenger/passenger-3.0.21-r1.ebuild
deleted file mode 100644 (file)
index c19bdf4..0000000
--- a/www-apache/passenger/passenger-3.0.21-r1.ebuild
+++ /dev/null
@@ -1,96 +0,0 @@
-# Copyright 1999-2014 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-r1.ebuild,v 1.5 2014/05/04 18:30:08 flameeyes Exp $
-
-EAPI=5
-USE_RUBY="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"
-
-CDEPEND=">=dev-libs/libev-3.90 net-misc/curl[ssl]
-       www-servers/apache[apache2_modules_unixd(+)]"
-
-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"
-
-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
-       epatch "${FILESDIR}"/${P}-temp-file-usage.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
-
-       # The gempackagetask does not work with rubygems 2.0, but we don't
-       # need it the changed builder component.
-       sed -i -e '/rubygems\/builder/ s:^:#:' build/gempackagetask.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
-}