Remove Ruby 1.9 and REE18 support from 4.2.3 so we can ask stable; add new revision with those two, and a patch for Ruby 1.9.2 support.

Package-Manager: portage-2.2_rc67/cvs/Linux x86_64

4 files changed, 86 insertions, 9 deletions

diff --git a/dev-ruby/redcloth/ChangeLog b/dev-ruby/redcloth/ChangeLog
index 8bb29994a6a7..0232402c042f 100644
--- a/dev-ruby/redcloth/ChangeLog
+++ b/dev-ruby/redcloth/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for dev-ruby/redcloth
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-ruby/redcloth/ChangeLog,v 1.45 2010/05/23 10:20:35 a3li Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-ruby/redcloth/ChangeLog,v 1.46 2010/07/29 09:31:06 flameeyes Exp $
+
+*redcloth-4.2.3-r1 (29 Jul 2010)
+
+  29 Jul 2010; Diego E. Pettenò <flameeyes@gentoo.org>
+  redcloth-4.2.3.ebuild, +redcloth-4.2.3-r1.ebuild:
+  Remove Ruby 1.9 and REE18 support from 4.2.3 so we can ask stable; add new
+  revision with those two, and a patch for Ruby 1.9.2 support.
 
   23 May 2010; Alex Legler <a3li@gentoo.org> redcloth-4.2.3.ebuild:
   Add REE18 support
diff --git a/dev-ruby/redcloth/Manifest b/dev-ruby/redcloth/Manifest
index dc5d79b850c3..a55d9cbca957 100644
--- a/dev-ruby/redcloth/Manifest
+++ b/dev-ruby/redcloth/Manifest
@@ -4,14 +4,16 @@ Hash: SHA1
 AUX redcloth-4.2.3-gentoo.patch 548 RMD160 8e9aa63178d0e15b1e42bab01fae5b188e0549e8 SHA1 98607f4ced2b5da2bba0de050cac7275e4d4f8fb SHA256 41c88d2889457213f5f8141362188c400134798a56e04411cc0d0281b6a3b22a
 DIST RedCloth-4.1.9.gem 282624 RMD160 7ab36b02e02dde716f953a9a058beadf2467e3c7 SHA1 0d47a2b72b160bc7c94a0cab4d8e96702aee3e61 SHA256 c941749edf68eec58143eab251573f3a287921864ec2d3e1dd9820a029c5af4f
 DIST RedCloth-git-4.2.3.tgz 106441 RMD160 705b5408fd5d0460ce633cb576424024d1c8b3cb SHA1 e1e80979cc055891b498207fcc46fd1f3645eaad SHA256 389818fa439d7cde9ad121bc344e6acde0b010ea856f769d68d007db57ead035
+DIST redcloth-4.2.3+ruby-1.9.2.patch.bz2 1536 RMD160 cb5d7e37521602fac8062ac37533b19c7d774895 SHA1 26067bb3f2b291534911003bdff2b7760b70945d SHA256 18041f29a40bbac2a968307aa37a570a229a945f6e56575a9441da27b657342f
 EBUILD redcloth-4.1.9.ebuild 531 RMD160 d391ba5a90396c35495c5013956c8d5e8aa1e38d SHA1 b2aec0614cb9a9e6cf0537a2a77e34130b3ee722 SHA256 a0a8ae3a4698462342de39c6796c8adf9c3d29356ce3bb4759b5253e7a96563d
-EBUILD redcloth-4.2.3.ebuild 1611 RMD160 87a70cc6345a7b0352acd4f34a6cc453f34a9e83 SHA1 e569da5f489deddbc3afe764bdc082e3b0342f85 SHA256 f6daac58f5e55afc8c0a894875f1d3c5afb19582609d90bf3d746236ed2818c3
-MISC ChangeLog 6211 RMD160 662a781cbff4585a1fab3ffaa0ff8b4791c738b3 SHA1 ad0f1e8bb6d41781b37fde0e59c6bef254269523 SHA256 52c173f6b21b7f103d536cb602c0954ddaf4af333205dcb916ee4946946c8648
+EBUILD redcloth-4.2.3-r1.ebuild 1720 RMD160 92737d79c5e73e1c2d1a01774ca10141779b1085 SHA1 41b7489b19d42fb04de4cd16fed458d15034d7e9 SHA256 5ede58abdfbe54cb014fa2dbe11a449acdfd5a95446089dafd0c15dee9ebae45
+EBUILD redcloth-4.2.3.ebuild 1603 RMD160 8a594d24c0b8a042ec4c36c1776155445ea35fe6 SHA1 be45aaa43d1ae3eadd23dec6ee53fcbacdf7aeae SHA256 82ce80e12862b3a1e5075646f99acd8a84f9ac6833e89b65d52e88d5d2a258ae
+MISC ChangeLog 6499 RMD160 3923403e91bd249c45aab73a777138ae1b48cc99 SHA1 be49b617aefd90e0b05a9f799d92d78f77ca52d0 SHA256 e90aaab860d85b100009abb538f1b563f05330435152e61a935ceac67f73c3ae
 MISC metadata.xml 158 RMD160 097f8145a9994f98be4971b43b23b9e5e8bccb66 SHA1 7ac646714b1ab83fda98f3ccdd8b48a31c148b27 SHA256 70b396ab3c7a63a81cb895b7728bd9eccdc9770afdb9919f2c54694b685f7032
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.15 (GNU/Linux)
+Version: GnuPG v2.0.16 (GNU/Linux)
 
-iEYEARECAAYFAkv5AXoACgkQ+tgfDpkAy6DDAACfTmvRf82vw5WsqgrRKB6H5Tzb
-1SMAoIALsEBzlx7xJUundOeColSTOo8D
-=5k3/
+iEYEARECAAYFAkxRSnAACgkQAiZjviIA2Xj+5wCguR+DNSleEghwMpNa3lYi4vvv
+TsgAoLkpz1cscwnOxAogXOlmop3qvl+P
+=11CW
 -----END PGP SIGNATURE-----
diff --git a/dev-ruby/redcloth/redcloth-4.2.3-r1.ebuild b/dev-ruby/redcloth/redcloth-4.2.3-r1.ebuild
new file mode 100644
index 000000000000..c2167fd11935
--- /dev/null
+++ b/dev-ruby/redcloth/redcloth-4.2.3-r1.ebuild
@@ -0,0 +1,68 @@
+# Copyright 1999-2010 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-ruby/redcloth/redcloth-4.2.3-r1.ebuild,v 1.1 2010/07/29 09:31:06 flameeyes Exp $
+
+EAPI=2
+
+# jruby → tests still fail with UTF-8 characters
+USE_RUBY="ruby18 ree18 ruby19"
+
+RUBY_FAKEGEM_NAME="RedCloth"
+
+RUBY_FAKEGEM_TASK_TEST="spec"
+RUBY_FAKEGEM_TASK_DOC="docs"
+
+RUBY_FAKEGEM_DOCDIR="doc"
+
+RUBY_FAKEGEM_EXTRADOC="README CHANGELOG"
+
+RUBY_FAKEGEM_REQUIRE_PATHS="lib/case_sensitive_require"
+
+inherit ruby-fakegem versionator
+
+DESCRIPTION="A module for using Textile in Ruby"
+HOMEPAGE="http://redcloth.org/"
+
+SRC_URI="http://github.com/jgarber/redcloth/tarball/RELEASE_$(replace_all_version_separators _) -> ${RUBY_FAKEGEM_NAME}-git-${PV}.tgz
+	http://dev.gentoo.org/~flameeyes/patches/${PN}/${P}+ruby-1.9.2.patch.bz2"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos"
+IUSE=""
+
+DEPEND="$DEPEND
+	dev-util/ragel"
+RDEPEND="$RDEPEND"
+
+S="${WORKDIR}/jgarber-${PN}-*"
+
+ruby_add_bdepend "
+	dev-ruby/rake
+	>=dev-ruby/echoe-3.0.1
+	test? (
+		dev-ruby/rspec
+		dev-ruby/diff-lcs
+	)"
+
+RUBY_PATCHES=(
+	"${FILESDIR}"/${P}-gentoo.patch
+	"${DISTDIR}"/${P}+ruby-1.9.2.patch.bz2
+)
+
+pkg_setup() {
+	# Export the VERBOSE variable to avoid remapping of stdout and
+	# stderr, and that breaks because of bad interactions between
+	# echoe, Ruby and Gentoo.
+	export VERBOSE=1
+}
+
+each_ruby_compile() {
+	# We cannot run this manually easily, because Ragel re-generation
+	# is a mess
+	${RUBY} -S rake compile || die "rake compile failed"
+}
+
+each_ruby_test() {
+	find spec -name '*_spec.rb' -print0 | xargs -0 ${RUBY} -I lib -S spec -Du -fs
+}
diff --git a/dev-ruby/redcloth/redcloth-4.2.3.ebuild b/dev-ruby/redcloth/redcloth-4.2.3.ebuild
index fe308116281b..c7176c027577 100644
--- a/dev-ruby/redcloth/redcloth-4.2.3.ebuild
+++ b/dev-ruby/redcloth/redcloth-4.2.3.ebuild
@@ -1,11 +1,11 @@
 # Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-ruby/redcloth/redcloth-4.2.3.ebuild,v 1.3 2010/05/23 10:20:35 a3li Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-ruby/redcloth/redcloth-4.2.3.ebuild,v 1.4 2010/07/29 09:31:06 flameeyes Exp $
 
 EAPI=2
 
 # jruby → tests still fail with UTF-8 characters
-USE_RUBY="ruby18 ree18 ruby19"
+USE_RUBY="ruby18"
 
 RUBY_FAKEGEM_NAME="RedCloth"