[gentoo-commits] gentoo-x86 commit in www-apache/passenger: ChangeLog passenger-3.0.12.ebuild

[gentoo-commits] gentoo-x86 commit in www-apache/passenger: ChangeLog passenger-3.0.12.ebuild

[Hans de Graaff (graaff)]

graaff      12/04/14 06:10:22

  Modified:             ChangeLog
  Added:                passenger-3.0.12.ebuild
  Log:
  Version bump.
  
  (Portage version: 2.1.10.49/cvs/Linux x86_64)

Revision  Changes    Path
1.42                 www-apache/passenger/ChangeLog

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/www-apache/passenger/ChangeLog?rev=1.42&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/www-apache/passenger/ChangeLog?rev=1.42&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/www-apache/passenger/ChangeLog?r1=1.41&r2=1.42

Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/www-apache/passenger/ChangeLog,v
retrieving revision 1.41
retrieving revision 1.42
diff -u -r1.41 -r1.42
--- ChangeLog	3 Apr 2012 17:11:12 -0000	1.41
+++ ChangeLog	14 Apr 2012 06:10:22 -0000	1.42
@@ -1,6 +1,12 @@
 # ChangeLog for www-apache/passenger
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/www-apache/passenger/ChangeLog,v 1.41 2012/04/03 17:11:12 graaff Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-apache/passenger/ChangeLog,v 1.42 2012/04/14 06:10:22 graaff Exp $
+
+*passenger-3.0.12 (14 Apr 2012)
+
+  14 Apr 2012; Hans de Graaff <graaff@gentoo.org> +passenger-3.0.12.ebuild,
+  +files/passenger-3.0.12-ldflags.patch:
+  Version bump.
 
   03 Apr 2012; Hans de Graaff <graaff@gentoo.org> -passenger-3.0.8.ebuild,
   -passenger-3.0.9.ebuild:



1.1                  www-apache/passenger/passenger-3.0.12.ebuild

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/www-apache/passenger/passenger-3.0.12.ebuild?rev=1.1&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/www-apache/passenger/passenger-3.0.12.ebuild?rev=1.1&content-type=text/plain

Index: passenger-3.0.12.ebuild
===================================================================
# 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.12.ebuild,v 1.1 2012/04/14 06:10:22 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."
}

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
}

[gentoo-commits] gentoo-x86 commit in www-apache/passenger: ChangeLog passenger-3.0.12.ebuild

[Hans de Graaff (graaff)]

graaff      12/04/27 10:50:11

  Modified:             ChangeLog passenger-3.0.12.ebuild
  Log:
  Fix automagic use of asciidoc with USE=-doc, bug 413469.
  
  (Portage version: 2.1.10.49/cvs/Linux x86_64)

Revision  Changes    Path
1.46                 www-apache/passenger/ChangeLog

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/www-apache/passenger/ChangeLog?rev=1.46&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/www-apache/passenger/ChangeLog?rev=1.46&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/www-apache/passenger/ChangeLog?r1=1.45&r2=1.46

Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/www-apache/passenger/ChangeLog,v
retrieving revision 1.45
retrieving revision 1.46
diff -u -r1.45 -r1.46
--- ChangeLog	19 Apr 2012 11:51:28 -0000	1.45
+++ ChangeLog	27 Apr 2012 10:50:11 -0000	1.46
@@ -1,6 +1,9 @@
 # ChangeLog for www-apache/passenger
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/www-apache/passenger/ChangeLog,v 1.45 2012/04/19 11:51:28 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-apache/passenger/ChangeLog,v 1.46 2012/04/27 10:50:11 graaff Exp $
+
+  27 Apr 2012; Hans de Graaff <graaff@gentoo.org> passenger-3.0.12.ebuild:
+  Fix automagic use of asciidoc with USE=-doc, bug 413469.
 
   19 Apr 2012; Agostino Sarubbo <ago@gentoo.org> passenger-3.0.7.ebuild:
   Stable for amd64, wrt bug #410409



1.2                  www-apache/passenger/passenger-3.0.12.ebuild

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/www-apache/passenger/passenger-3.0.12.ebuild?rev=1.2&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/www-apache/passenger/passenger-3.0.12.ebuild?rev=1.2&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/www-apache/passenger/passenger-3.0.12.ebuild?r1=1.1&r2=1.2

Index: passenger-3.0.12.ebuild
===================================================================
RCS file: /var/cvsroot/gentoo-x86/www-apache/passenger/passenger-3.0.12.ebuild,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- passenger-3.0.12.ebuild	14 Apr 2012 06:10:22 -0000	1.1
+++ passenger-3.0.12.ebuild	27 Apr 2012 10:50:11 -0000	1.2
@@ -1,6 +1,6 @@
 # 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.12.ebuild,v 1.1 2012/04/14 06:10:22 graaff Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-apache/passenger/passenger-3.0.12.ebuild,v 1.2 2012/04/27 10:50:11 graaff Exp $
 
 EAPI=4
 USE_RUBY="ruby18 ruby19"
@@ -61,6 +61,9 @@
 
 	# 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() {