Version bump.

Package-Manager: portage-2.1.6.11/cvs/Linux x86_64

4 files changed, 115 insertions, 6 deletions

diff --git a/www-apache/passenger/ChangeLog b/www-apache/passenger/ChangeLog
index 5f8e55d6494f..d9467d8964da 100644
--- a/www-apache/passenger/ChangeLog
+++ b/www-apache/passenger/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for www-apache/passenger
 # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/www-apache/passenger/ChangeLog,v 1.7 2009/03/15 14:36:08 a3li Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-apache/passenger/ChangeLog,v 1.8 2009/05/19 10:04:40 graaff Exp $
+
+*passenger-2.2.2 (19 May 2009)
+
+  19 May 2009; Hans de Graaff <graaff@gentoo.org> +files/2.2.2-gentoo.patch,
+  +passenger-2.2.2.ebuild:
+  Version bump.
 
 *passenger-2.1.2 (15 Mar 2009)
 
diff --git a/www-apache/passenger/Manifest b/www-apache/passenger/Manifest
index 0647ce65a2f8..6e45d532b4ff 100644
--- a/www-apache/passenger/Manifest
+++ b/www-apache/passenger/Manifest
@@ -4,6 +4,7 @@ Hash: SHA1
 AUX 1.0.5-gentoo.patch 3658 RMD160 448b31ea9a8ef8dbf24e64ccbe425c76941e4a4c SHA1 fe875ef07f07127e8d8781b3379b9af895948df9 SHA256 16a96e13f756762eb71e0fa92f11d335620a8ffba8b12bbdbeaf8b0484760e34
 AUX 2.0.1-gentoo.patch 2152 RMD160 ecb1691c26d50ed2a7ff2877003db9b2d8b0f9c2 SHA1 42873c6c22471e5614d658b2c99be7679ff929e7 SHA256 9863ceedfdd30feb74429aa844637e14a46c1d7700719a30af82316f15e163fd
 AUX 2.1.2-gentoo.patch 1678 RMD160 24e42c01a88c83e6c6d5d914d18f9904d7366d3c SHA1 715ea4ba8c506e7b82843777175fc85e92112fd7 SHA256 08cbbefaf16f4418e364d5381b9de37d71809655747b4bc98634568c4e668b60
+AUX 2.2.2-gentoo.patch 1617 RMD160 bb019e88f04a8f04c9c0dfa6ef1d3f908fc5ffcc SHA1 b4bc124dcd2c537f65a39b9879ac35a0ec310d34 SHA256 d90394f0742131f32dc42a9619305b2712bed3967b78d56480447500d190b8ea
 AUX 30_mod_passenger-2.0.1.conf 2697 RMD160 2a04e5087b97e07360d59812c6571d8123ad9c64 SHA1 4bb2c583782de3c1ed9f46c5ec5e20244b242ea1 SHA256 f39b8349cd0f9a80bf15182d562e56071ed95f22272cfa0c7fd37045d6e2ded9
 AUX 30_mod_passenger.conf 1602 RMD160 0b50a86b3e79884ab18cd85f398c1fe9bac5d6ff SHA1 3343f8f65edb48e084ff847f8ed7d571fb5e14f4 SHA256 12ba5a6090dd3e660bef69c5c69bac6255d2237fc04f6ec6ecac53dc5dacca26
 DIST passenger-1.0.5.tar.gz 1689058 RMD160 4a1045804945db04a5a6ea85415082fa26edcebf SHA1 2277729c296b9fe9d83482c528d3b8dbdc714cec SHA256 4b41b1a0a9d59acd310f3730dae0dfe3a96de17825c6bb325e2cc93eb731e510
@@ -11,17 +12,19 @@ DIST passenger-2.0.1.tar.gz 1436825 RMD160 900701eeac7d7d37d9f7e745fc0930d58c0a8
 DIST passenger-2.0.3.tar.gz 1199926 RMD160 0f466bd50e94d294f2db152993dbeda708d9d9cd SHA1 0c392b043a505cdc686d934959cb35394e2f2217 SHA256 63724a68f16cb2dc18c18ec476020df149a87da3474e52c4300bb2970eda0321
 DIST passenger-2.0.6.tar.gz 1455558 RMD160 903a5d84dbab437517f986d88f12ec0c0fc762f3 SHA1 fa016c72c0d1f62f31ab2d88ebff4d201767a425 SHA256 d33567f2a826e2480b91878e0d8edcacfa1ae0fd8db946a89084c1e815aa94ac
 DIST passenger-2.1.2.tar.gz 1759974 RMD160 823f8188c2b4cef1e8804983a07a327362374a69 SHA1 51c52435ed8c2fa751dca7c625e97e58985b6c80 SHA256 9d5a766584d98194a0ae0a9025802729db553b1b4a54f80ba6da75fa0bc9cf67
+DIST passenger-2.2.2.tar.gz 1693895 RMD160 e83f9c82454cfdcf1e7a1d6e6bfdfdf9317ce0e6 SHA1 e3f17bceeacd5c943b4ed719eaabb0107e82441f SHA256 8eb7e36898787dce4e49c4b6550d42522b79193849b420fa333869318f8fb57e
 EBUILD passenger-1.0.5.ebuild 1564 RMD160 f8497b1ba9a0ed65ab69bf54e3b1e8192847eb54 SHA1 2388c081e92c2c7298416412294330e5516a1bdd SHA256 a516d7d12ec9f6d95b8438aee06db799206ae02622c19cb0661f738004172b08
 EBUILD passenger-2.0.1.ebuild 1241 RMD160 ac4f616b7676b0e6eb3d30586758c8972b4f9408 SHA1 e2896515c29dd7a0b08b1547ee856afe47470439 SHA256 ef3a3c46edc59222c9b9b9796cdde553cd619bc326413f8d0d3de5709e886998
 EBUILD passenger-2.0.3.ebuild 1384 RMD160 d4522172dfc5746661059bd41a4b0937a59cb586 SHA1 a90683803708ef8dd5b736f0b3515be8bd40084c SHA256 fb6e99ebc294fb9426f18a18ef82b071bdb976519c27e1072b3845d5161197d3
 EBUILD passenger-2.0.6.ebuild 1383 RMD160 ccb34e4f210bb6cd2deaf124254e936bd23b6b82 SHA1 5ecedc01a6a1e80af23afca6bac3d6815e3cd226 SHA256 8910df2dc348796a1bb8120822c3ee2ed3683ad3519aba1ea8c6bcc01715c55c
 EBUILD passenger-2.1.2.ebuild 1382 RMD160 5a3dfbbe2379d7e2df0516a9465bce58d1a99eb0 SHA1 d8766bd48fdd5d353f5bc8902ed2c2c27ac7afda SHA256 18024b5afdc3b607925bcce5de7c8ac37479dcef9513dd0a31b4fa0c010489c6
-MISC ChangeLog 1345 RMD160 852256f359200b07258d28f15757c2efbc4d8cdc SHA1 71d7170f26fe94e03730d651a25bb1b1e2ef62b8 SHA256 6dd4cea48e04d4452cd3668ee7e999cb9360d098344b9319b0dc8302ebd3025c
+EBUILD passenger-2.2.2.ebuild 1360 RMD160 242719c7f2823804c6309cd7f47ce0d514cc78a0 SHA1 e9a2b8a991274ff77012fc55e78810ddb4743520 SHA256 da80bb3b2f1254b7a191a3fcc3dafa91133581ee461b8c5eca43faee1adf85ba
+MISC ChangeLog 1500 RMD160 96b2846e9b6fc4ec53617a5d6bc69628e6933dfe SHA1 aa81bb1fb23fcc4cf58ca2ac0a13ec429abbbacd SHA256 ca6bd1b5f03117fa8ebf43f930ca7f0f8b3040f0b6e1be016a292ff04d6afe4d
 MISC metadata.xml 179 RMD160 046a67d39c9a5784800b120b3da44d67caa1f0af SHA1 31e15b20d55994a9989fff90a20847c1e76db2cb SHA256 d07e5a69f0aaee3b23884e0e414fad4aba70b9f4a115d2649714b8f1bd99d9fe
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.10 (GNU/Linux)
+Version: GnuPG v2.0.11 (GNU/Linux)
 
-iEYEARECAAYFAkm9EmEACgkQk3qunHEll7OJnACgg2Ng/Xc7zzD2ALTEv655bzpR
-zQAAnA2ScvtZR1LhH9ph9lqZlwa/2VCo
-=xLfv
+iEYEARECAAYFAkoShEQACgkQqj4ysMWt/vv8IACg75w8Na2PvPkWTa3Bh37hSiMR
+zrcAoNITGhbRurJ31ifmJgeFx411d1Ds
+=E8Zh
 -----END PGP SIGNATURE-----
diff --git a/www-apache/passenger/files/2.2.2-gentoo.patch b/www-apache/passenger/files/2.2.2-gentoo.patch
new file mode 100644
index 000000000000..cd51913b9099
--- /dev/null
+++ b/www-apache/passenger/files/2.2.2-gentoo.patch
@@ -0,0 +1,42 @@
+--- Rakefile.~1~	2009-05-19 11:48:28.236986307 +0200
++++ Rakefile	2009-05-19 11:50:53.000000000 +0200
+@@ -38,11 +38,7 @@
+ 
+ CXX = "g++"
+ LIBEXT = PlatformInfo.library_extension
+-if OPTIMIZE
+-	OPTIMIZATION_FLAGS = "#{PlatformInfo.debugging_cflags} -O2 -DBOOST_DISABLE_ASSERTS"
+-else
+-	OPTIMIZATION_FLAGS = "#{PlatformInfo.debugging_cflags} -DPASSENGER_DEBUG -DBOOST_DISABLE_ASSERTS"
+-end
++OPTIMIZATION_FLAGS = "#{ENV['CXXFLAGS']} -DNDEBUG"
+ 
+ # Extra compiler flags that should always be passed to the C/C++ compiler.
+ # Should be included last in the command string.
+@@ -733,15 +729,15 @@
+ task :fakeroot => [:apache2, :native_support, :doc] do
+ 	require 'rbconfig'
+ 	include Config
+-	fakeroot = "pkg/fakeroot"
++	fakeroot = ENV['DISTDIR']
+ 
+ 	# We don't use CONFIG['archdir'] and the like because we want
+ 	# the files to be installed to /usr, and the Ruby interpreter
+ 	# on the packaging machine might be in /usr/local.
+-	libdir = "#{fakeroot}/usr/lib/ruby/#{CONFIG['ruby_version']}"
++  libdir = "#{fakeroot}/#{CONFIG['sitedir']}/#{CONFIG['ruby_version']}"
+ 	extdir = "#{libdir}/#{CONFIG['arch']}"
+ 	bindir = "#{fakeroot}/usr/bin"
+-	docdir = "#{fakeroot}/usr/share/doc/phusion_passenger"
++  docdir = "#{fakeroot}/usr/share/doc/passenger-#{PACKAGE_VERSION}"
+ 	libexecdir = "#{fakeroot}/usr/lib/phusion_passenger"
+ 	
+ 	sh "rm -rf #{fakeroot}"
+@@ -757,7 +753,6 @@
+ 	sh "cp bin/* #{bindir}/"
+ 	
+ 	sh "mkdir -p #{libexecdir}"
+-	sh "cp ext/apache2/mod_passenger.so #{libexecdir}/"
+ 	sh "mv #{fakeroot}/usr/bin/passenger-spawn-server #{libexecdir}/"
+ 	sh "cp ext/apache2/ApplicationPoolServerExecutable #{libexecdir}/"
+ 	
diff --git a/www-apache/passenger/passenger-2.2.2.ebuild b/www-apache/passenger/passenger-2.2.2.ebuild
new file mode 100644
index 000000000000..dd98bf7ff361
--- /dev/null
+++ b/www-apache/passenger/passenger-2.2.2.ebuild
@@ -0,0 +1,58 @@
+# Copyright 1999-2009 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/www-apache/passenger/passenger-2.2.2.ebuild,v 1.1 2009/05/19 10:04:40 graaff Exp $
+
+inherit apache-module flag-o-matic ruby
+
+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"
+
+CDEPEND=">=dev-lang/ruby-1.8.5
+	>=dev-ruby/rubygems-0.9.0
+	>=dev-ruby/rake-0.8.1
+	>=dev-ruby/fastthread-1.0.1
+	>=dev-ruby/rails-1.2.0"
+DEPEND="${CDEPEND}
+	doc? ( app-doc/doxygen )"
+RDEPEND="${CDEPEND}"
+
+APACHE2_MOD_FILE="${S}/ext/apache2/mod_${PN}.so"
+APACHE2_MOD_CONF="30_mod_${PN}-2.0.1 30_mod_${PN}"
+APACHE2_MOD_DEFINE="PASSENGER"
+
+need_apache2_2
+
+pkg_setup() {
+	use debug && append-flags -DPASSENGER_DEBUG
+}
+
+src_unpack() {
+	unpack ${A}
+	cd "${S}"
+	epatch "${FILESDIR}"/${PV}-gentoo.patch
+	rm -f bin/passenger-install-apache2-module
+	sed -i -e '473s/, :doc//' Rakefile
+}
+
+src_compile() {
+	APXS2="${APXS}" \
+	HTTPD="${APACHE_BIN}" \
+	rake apache2 native_support || die "rake failed"
+
+	if use doc; then
+		rake doc || die "rake doc failed"
+	fi
+}
+
+src_install() {
+	DISTDIR="${D}" \
+	rake fakeroot || die "rake failed"
+
+	apache-module_src_install
+}