Fix radiant paths for unbundled rails, thanks to Daniel Bahrdt in bug 332119. Further fixes to make the generator work in this case.

(Portage version: 2.1.8.3/cvs/Linux x86_64)

3 files changed, 78 insertions, 1 deletions

diff --git a/dev-ruby/radiant/ChangeLog b/dev-ruby/radiant/ChangeLog
index 64d5b2b87fe8..4c4c46cfe3b8 100644
--- a/dev-ruby/radiant/ChangeLog
+++ b/dev-ruby/radiant/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for dev-ruby/radiant
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-ruby/radiant/ChangeLog,v 1.18 2010/07/29 13:05:24 graaff Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-ruby/radiant/ChangeLog,v 1.19 2010/08/11 12:02:26 graaff Exp $
+
+*radiant-0.9.1-r2 (11 Aug 2010)
+
+  11 Aug 2010; Hans de Graaff <graaff@gentoo.org> +radiant-0.9.1-r2.ebuild,
+  +files/radiant-0.9.1-unbundled.patch:
+  Fix radiant paths for unbundled rails, thanks to Daniel Bahrdt in bug
+  332119. Further fixes to make the generator work in this case.
 
 *radiant-0.9.1 (29 Jul 2010)
 
diff --git a/dev-ruby/radiant/files/radiant-0.9.1-unbundled.patch b/dev-ruby/radiant/files/radiant-0.9.1-unbundled.patch
new file mode 100644
index 000000000000..9d9053097426
--- /dev/null
+++ b/dev-ruby/radiant/files/radiant-0.9.1-unbundled.patch
@@ -0,0 +1,20 @@
+--- bin/radiant.orig	2010-08-11 13:46:51.021730420 +0200
++++ bin/radiant	2010-08-11 13:47:11.678230437 +0200
+@@ -4,7 +4,7 @@
+ 
+ $LOAD_PATH << File.join(File.dirname(__FILE__), '..')
+ 
+-require 'lib/ruby_version_check'
++require 'ruby_version_check'
+ Signal.trap("INT") { puts; exit }
+ 
+ require 'lib/radiant'
+@@ -15,7 +15,7 @@
+ 
+ app_path = ARGV.first
+ 
+-require 'lib/rails_generator'
++require 'rails_generator'
+ require 'rails_generator/scripts/generate'
+ 
+ class Rails::Generator::Base
diff --git a/dev-ruby/radiant/radiant-0.9.1-r2.ebuild b/dev-ruby/radiant/radiant-0.9.1-r2.ebuild
new file mode 100644
index 000000000000..d4ffe2bcaafa
--- /dev/null
+++ b/dev-ruby/radiant/radiant-0.9.1-r2.ebuild
@@ -0,0 +1,50 @@
+# Copyright 1999-2010 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-ruby/radiant/radiant-0.9.1-r2.ebuild,v 1.1 2010/08/11 12:02:26 graaff Exp $
+
+EAPI="2"
+USE_RUBY="ruby18"
+
+RUBY_FAKEGEM_TASK_DOC=""
+RUBY_FAKEGEM_TASK_TEST="spec cucumber"
+RUBY_FAKEGEM_EXTRADOC="CHANGELOG CONTRIBUTORS README"
+
+# All these files are needed because the generator expect to install them.
+RUBY_FAKEGEM_EXTRAINSTALL="CHANGELOG CONTRIBUTORS INSTALL LICENSE README Rakefile app config db log public script vendor"
+
+inherit ruby-fakegem
+
+DESCRIPTION="A no-fluff, open source content management system"
+HOMEPAGE="http://radiantcms.org/"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+# Testing depends on a working database and a bundled version of Rails 2.3.8
+# Needs more work later.
+RESTRICT="test"
+
+#ruby_add_bdepend "test? ( dev-db/sqlite3-ruby  dev-ruby/rspec dev-util/cucumber )"
+
+ruby_add_rdepend ">=dev-ruby/redcloth-4.0.0
+	>=dev-ruby/rack-1.1.0
+	=dev-ruby/rails-2.3*
+	>=dev-ruby/highline-1.5.1
+	>=dev-ruby/radius-0.5.1
+	=dev-ruby/will_paginate-2.3*"
+
+# Remove code from vendor that we support as an external dependency.
+all_ruby_prepare() {
+	epatch "${FILESDIR}/${P}-unbundled.patch"
+
+	rm -rf vendor/{highline,radius,rails,redcloth} || die "Unable to remove vendored code."
+}
+
+each_ruby_test() {
+	cp config/database.sqlite.yml config/database.yml || die "Unable to provide database.yml for testing."
+	${RUBY} -S rake db:migrate
+	each_fakegem_test
+	rm config/database.yml || die "Unable to remove testing database.yml."
+}