summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorHans de Graaff <graaff@gentoo.org>2010-08-11 12:02:26 +0000
committerHans de Graaff <graaff@gentoo.org>2010-08-11 12:02:26 +0000
commitfe95b3a7c258d7349489aa8a7b9abd9771e35d01 (patch)
tree1bce7db4b08384d0b559c3e3c28001767e12f2ea /dev-ruby/radiant
parentRemove gdu mask on gvfs. (diff)
downloadhistorical-fe95b3a7c258d7349489aa8a7b9abd9771e35d01.tar.gz
historical-fe95b3a7c258d7349489aa8a7b9abd9771e35d01.tar.bz2
historical-fe95b3a7c258d7349489aa8a7b9abd9771e35d01.zip
Fix radiant paths for unbundled rails, thanks to Daniel Bahrdt in bug 332119. Further fixes to make the generator work in this case.
Package-Manager: portage-2.1.8.3/cvs/Linux x86_64
Diffstat (limited to 'dev-ruby/radiant')
-rw-r--r--dev-ruby/radiant/ChangeLog9
-rw-r--r--dev-ruby/radiant/Manifest10
-rw-r--r--dev-ruby/radiant/files/radiant-0.9.1-unbundled.patch20
-rw-r--r--dev-ruby/radiant/radiant-0.9.1-r2.ebuild50
4 files changed, 84 insertions, 5 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/Manifest b/dev-ruby/radiant/Manifest
index 84a6d6caa1b4..5df8668a53f1 100644
--- a/dev-ruby/radiant/Manifest
+++ b/dev-ruby/radiant/Manifest
@@ -2,19 +2,21 @@
Hash: SHA256
AUX radiant-0.8.2-migration.patch 1071 RMD160 5a4f44cfd6aa8fb46d77f2d877d0fb86b011e72f SHA1 0eafeb27042f4bbce392cd4668e2303b6f64f2e2 SHA256 d849b3878ca8e101380bcb8675c4f9ab6c88ff3101dc4c624922d53f299273f2
+AUX radiant-0.9.1-unbundled.patch 487 RMD160 e36e4aee56b87dcb3b5336b762ef01a2cbbda3ac SHA1 089c1a9f7e73460cb390854ccba4f1866237115c SHA256 2edcb69afe3958ad7e7984100e954e9f22faa3d7569155baa7ac512f33624abb
DIST radiant-0.8.1.gem 3906048 RMD160 4730b37abf790de1d0514a3de612c781af03b595 SHA1 0a0374ed26fee9242878fc6ccd34d84cf6d2a868 SHA256 2afe851c05d863bff2d0379a13e80ce433fa1adc86337dca72328dbe16a00ade
DIST radiant-0.8.2.gem 6316544 RMD160 5df88e7eaaa43575c37aa5731cd887eed56e33af SHA1 299973067ef9076b4f32119effba36724c1cd832 SHA256 b39dd89e3fead2d6be69e115c89bc1ac0f95aa72b5d4e05f0c64665627044e13
DIST radiant-0.9.1.gem 5289984 RMD160 7cce0e4032b5fa099df1651a45e9e2b7fca20400 SHA1 e37056ea9e5e629e15e2db66109907ff151053b9 SHA256 f288f3d00eef84531b507430d1ea8385c42b7c19c1de4eca88741c98637d7a34
EBUILD radiant-0.8.1.ebuild 514 RMD160 2092cd553c3a43e18ba2cd71c6782f24c82e1da6 SHA1 94841f0eaf5aab67421cac571e8b833d9dd41865 SHA256 e41f7e221bf655e6e629c0f35b8aaee2607846f5bbb3c2ad43fd6565b7c9a698
EBUILD radiant-0.8.2-r1.ebuild 1481 RMD160 581fadb3a59ee83f32367005d778a90d757ffc81 SHA1 d4a1da3ba474f9cab4d38c6feee63422d7600ca2 SHA256 b581694fdff71ddefea026d622c7e1b786714a424ec4dbde0fdff93b09871010
EBUILD radiant-0.8.2.ebuild 514 RMD160 26f5e33bdc383d0530b7d31fae2cbebe0743cb2b SHA1 14d0b12f4693fb229657c5cb6bb46498eb117e80 SHA256 e04ab45b6dbd27e9b1c7b98a7b9a074e8317cf4e1ef4e291972720af78c451d3
+EBUILD radiant-0.9.1-r2.ebuild 1591 RMD160 059caa1818d1491e7e655c147af7e674532de8d9 SHA1 7f01425af0e99374d94041cfab3bfdea96379e58 SHA256 f444ac56cda0282911fd25a85b7d9a57df91018bd03af9f8b1f77c8b5e5ce97d
EBUILD radiant-0.9.1.ebuild 1409 RMD160 b54c45010356e19dfd0e0544c414bf46413f8f31 SHA1 026e4beea367bcb4e6c31a4c06503415cdc22415 SHA256 ca3d3ea57f605f81326d5ddd3eeb9471dfceafdf8d27cf9d7dc721197ea147f8
-MISC ChangeLog 3046 RMD160 14ea00dd53af1e248ca98078b4041523e2270a28 SHA1 5c0058b921ef95df1b809ecda191d3269a0816b4 SHA256 a4245c8d942a5052124031956f53be6e31da7e0951619d5b6f4a328101aea14e
+MISC ChangeLog 3333 RMD160 333385bcffb5bfe92398cafd4fdbfd545289deee SHA1 c236f4c09ad36d46d907a2e8344ebdbed7501b8d SHA256 6f8589cc8a1d4c9c2b60f21a633cacc605a35e20f7f1532f75f921171c22ebd0
MISC metadata.xml 158 RMD160 097f8145a9994f98be4971b43b23b9e5e8bccb66 SHA1 7ac646714b1ab83fda98f3ccdd8b48a31c148b27 SHA256 70b396ab3c7a63a81cb895b7728bd9eccdc9770afdb9919f2c54694b685f7032
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v2.0.15 (GNU/Linux)
-iF4EAREIAAYFAkxRfTkACgkQZihJkut28Stf2AD/VvEqFg5LlaxAP0gdZPeCxbGA
-hvXyppuA9pLPtoaeIToA/iphqzISkM3dMFzRtYBk/oLcp8SiNRmUGGHBtYuVUB9F
-=bfHg
+iF4EAREIAAYFAkxikV0ACgkQZihJkut28SuVEAEA1LdrnpXAKR4aTBj85kkgsf5e
+ARYemgQ/1ZRkKCDZG1UA/iS+P7vOeItfWzXQkKjOVTM4zbstFmnv1DLTRyGsRdas
+=puqR
-----END PGP SIGNATURE-----
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."
+}