From f94f0c1d7f8c6c6a03d7d9a00196f28085774ed8 Mon Sep 17 00:00:00 2001 From: Hans de Graaff Date: Sat, 8 Oct 2011 14:52:39 +0000 Subject: [PATCH] Remove broken rspec dependency. Insstead remove the need to have it installed for building. It is no longer possible to build documentation. Fix rspec invocation to actually work and make it simpler. Fixes bug 384641 amongst other things. Package-Manager: portage-2.1.10.11/cvs/Linux x86_64 --- dev-ruby/redcloth/ChangeLog | 8 +++++++- dev-ruby/redcloth/Manifest | 12 ++++++------ dev-ruby/redcloth/redcloth-4.2.8.ebuild | 11 +++++------ 3 files changed, 18 insertions(+), 13 deletions(-) diff --git a/dev-ruby/redcloth/ChangeLog b/dev-ruby/redcloth/ChangeLog index 25fbb8370e6c..cbc14a1360d0 100644 --- a/dev-ruby/redcloth/ChangeLog +++ b/dev-ruby/redcloth/ChangeLog @@ -1,6 +1,12 @@ # ChangeLog for dev-ruby/redcloth # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/dev-ruby/redcloth/ChangeLog,v 1.64 2011/10/03 20:01:58 jer Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-ruby/redcloth/ChangeLog,v 1.65 2011/10/08 14:52:39 graaff Exp $ + + 08 Oct 2011; Hans de Graaff redcloth-4.2.8.ebuild: + Remove broken rspec dependency. Insstead remove the need to have it installed + for building. It is no longer possible to build documentation. Fix rspec + invocation to actually work and make it simpler. Fixes bug 384641 amongst + other things. 03 Oct 2011; Jeroen Roovers redcloth-4.2.3-r1.ebuild: Stable for HPPA (bug #385149). diff --git a/dev-ruby/redcloth/Manifest b/dev-ruby/redcloth/Manifest index 3e7c765f6f4e..a38e6440f5fa 100644 --- a/dev-ruby/redcloth/Manifest +++ b/dev-ruby/redcloth/Manifest @@ -1,5 +1,5 @@ -----BEGIN PGP SIGNED MESSAGE----- -Hash: SHA1 +Hash: SHA256 AUX redcloth-4.2.3-gentoo.patch 548 RMD160 8e9aa63178d0e15b1e42bab01fae5b188e0549e8 SHA1 98607f4ced2b5da2bba0de050cac7275e4d4f8fb SHA256 41c88d2889457213f5f8141362188c400134798a56e04411cc0d0281b6a3b22a DIST RedCloth-git-4.2.3.tgz 106441 RMD160 705b5408fd5d0460ce633cb576424024d1c8b3cb SHA1 e1e80979cc055891b498207fcc46fd1f3645eaad SHA256 389818fa439d7cde9ad121bc344e6acde0b010ea856f769d68d007db57ead035 @@ -8,13 +8,13 @@ DIST redcloth-4.2.3+ruby-1.9.2.patch.bz2 1536 RMD160 cb5d7e37521602fac8062ac3753 EBUILD redcloth-4.2.3-r1.ebuild 1841 RMD160 83f6380e4e0f27510c6754624594f9de752639c9 SHA1 0d0cddb30be03171c2d3a40b7986d7a60885e0b3 SHA256 676e10221e91c1168d2a90cef02f285abaec7af8e04628261492790ab0e0d0a5 EBUILD redcloth-4.2.3-r2.ebuild 1855 RMD160 0c7b1f4aa2385b097752d9ae375347894e4ff6d4 SHA1 0668b70d8477ab7637370a3083b228dab0fb4843 SHA256 79c9307b5950fc85a7b581556021047ee07a62e4eca3a43298407a2762466611 EBUILD redcloth-4.2.3.ebuild 1598 RMD160 5fc8a90ada87a2956dcb0c353d2536c8ef6b6968 SHA1 e907c8d275f70d3a292c14ebca386d630a300fe8 SHA256 ee9bb86239515f9fc496828446b959d08e10ccd98049ba487e33769b242c14c9 -EBUILD redcloth-4.2.8.ebuild 1869 RMD160 530d233dcfafbc6904ab994459cb8e9e3de2cbca SHA1 c784c34ae9a6e60b05f0d4d2f5ee5c67e71dd696 SHA256 f6d3ea018bcd77c2aed9df8e3a63522d8843525c268b8479e85b8626dd027b36 -MISC ChangeLog 8612 RMD160 504bcc7b9a0662ca16411d9f368522fd7aa47d96 SHA1 4afade50ebdebea401229c15d2993c373eacdcfd SHA256 23d8d2868bc793e034b37e776f3eb9914904e30ef35d6cbc144ed45063227a78 +EBUILD redcloth-4.2.8.ebuild 1811 RMD160 ac22d38400152cb3c3bd95f244788cb3b64fe3c8 SHA1 bd9036b6a5ca538163cf87c8fef157261ff0f843 SHA256 29e62b705dfeac644a3f848ccdc8461ccfb7f2ddf025a5e965b94372322813a9 +MISC ChangeLog 8936 RMD160 9300aed7cb126a9eae7b4e253b479104895e31aa SHA1 b4454156820370657eeefaaea7baccfc511ade14 SHA256 0d9af562bd2d06c792cca6a94684e277aed3eeca2d3bad665e723b2300cf231d MISC metadata.xml 158 RMD160 097f8145a9994f98be4971b43b23b9e5e8bccb66 SHA1 7ac646714b1ab83fda98f3ccdd8b48a31c148b27 SHA256 70b396ab3c7a63a81cb895b7728bd9eccdc9770afdb9919f2c54694b685f7032 -----BEGIN PGP SIGNATURE----- Version: GnuPG v2.0.17 (GNU/Linux) -iEYEARECAAYFAk6KFLsACgkQVWmRsqeSphOrRgCeN8o479qRusyi8bzmcMysaqK9 -SogAnjiK3MqlvWYaF1xzZbFjNPmbh9Nl -=6wKX +iF4EAREIAAYFAk6QY8IACgkQiIP6VqMIqNfmngD+NUY8CjqBfCmx4xJdY7a8zhCG +EdFlv+2sv+0ZmPexX3gA/2eaVoqbJb4A+W2fDHzU/RcpT5euJ9QZ+xllccRNrwFz +=rI81 -----END PGP SIGNATURE----- diff --git a/dev-ruby/redcloth/redcloth-4.2.8.ebuild b/dev-ruby/redcloth/redcloth-4.2.8.ebuild index dabd58580418..f27d7bd412d6 100644 --- a/dev-ruby/redcloth/redcloth-4.2.8.ebuild +++ b/dev-ruby/redcloth/redcloth-4.2.8.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2011 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/dev-ruby/redcloth/redcloth-4.2.8.ebuild,v 1.2 2011/10/01 02:57:39 robbat2 Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-ruby/redcloth/redcloth-4.2.8.ebuild,v 1.3 2011/10/08 14:52:39 graaff Exp $ EAPI=4 @@ -11,7 +11,7 @@ USE_RUBY="ruby18 ree18 ruby19" RUBY_FAKEGEM_NAME="RedCloth" RUBY_FAKEGEM_TASK_TEST="spec" -RUBY_FAKEGEM_TASK_DOC="docs" +RUBY_FAKEGEM_TASK_DOC="" RUBY_FAKEGEM_DOCDIR="doc" @@ -34,8 +34,7 @@ KEYWORDS="~amd64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~pp IUSE="" DEPEND="$DEPEND - dev-util/ragel - dev-ruby/rspec" + dev-util/ragel" RDEPEND="$RDEPEND" ruby_add_bdepend " @@ -57,7 +56,7 @@ pkg_setup() { all_ruby_prepare() { sed -i -e '/[Bb]undler/d' Rakefile ${PN}.gemspec || die - rm tasks/{release,gems}.rake || die + rm tasks/{release,gems,rspec}.rake || die } each_ruby_compile() { @@ -67,5 +66,5 @@ each_ruby_compile() { } each_ruby_test() { - find spec -name '*_spec.rb' -print0 | xargs -0 ${RUBY} -I lib -S rspec -Du -fs + ${RUBY} -I lib -S rspec spec || die } -- 2.26.2