Gentoo Archives: gentoo-commits

From: "Hans de Graaff (graaff)" <graaff@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] gentoo-x86 commit in dev-ruby/ruby_parser: ChangeLog ruby_parser-2.3.1-r1.ebuild ruby_parser-3.1.3.ebuild
Date: Fri, 31 May 2013 18:14:56
Message-Id: 20130531181448.6DB462171D@flycatcher.gentoo.org
graaff      13/05/31 18:14:48

  Modified:             ChangeLog ruby_parser-3.1.3.ebuild
  Added:                ruby_parser-2.3.1-r1.ebuild
  Log:
  Revision bump to avoid installing the ruby_parse binary and thus create a file collision between slots.
  
  (Portage version: 2.1.11.62/cvs/Linux x86_64, signed Manifest commit with key 0x8883FA56A308A8D7!)

Revision  Changes    Path
1.43                 dev-ruby/ruby_parser/ChangeLog

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-ruby/ruby_parser/ChangeLog?rev=1.43&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-ruby/ruby_parser/ChangeLog?rev=1.43&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-ruby/ruby_parser/ChangeLog?r1=1.42&r2=1.43

Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/dev-ruby/ruby_parser/ChangeLog,v
retrieving revision 1.42
retrieving revision 1.43
diff -u -r1.42 -r1.43
--- ChangeLog	31 May 2013 17:57:16 -0000	1.42
+++ ChangeLog	31 May 2013 18:14:48 -0000	1.43
@@ -1,6 +1,13 @@
 # ChangeLog for dev-ruby/ruby_parser
 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-ruby/ruby_parser/ChangeLog,v 1.42 2013/05/31 17:57:16 graaff Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-ruby/ruby_parser/ChangeLog,v 1.43 2013/05/31 18:14:48 graaff Exp $
+
+*ruby_parser-2.3.1-r1 (31 May 2013)
+
+  31 May 2013; Hans de Graaff <graaff@g.o> +ruby_parser-2.3.1-r1.ebuild,
+  ruby_parser-3.1.3.ebuild:
+  Revision bump to avoid installing the ruby_parse binary and thus create a
+  file collision between slots.
 
   31 May 2013; Hans de Graaff <graaff@g.o> ruby_parser-3.1.3.ebuild:
   Add ~arm keyword.



1.3                  dev-ruby/ruby_parser/ruby_parser-3.1.3.ebuild

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-ruby/ruby_parser/ruby_parser-3.1.3.ebuild?rev=1.3&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-ruby/ruby_parser/ruby_parser-3.1.3.ebuild?rev=1.3&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-ruby/ruby_parser/ruby_parser-3.1.3.ebuild?r1=1.2&r2=1.3

Index: ruby_parser-3.1.3.ebuild
===================================================================
RCS file: /var/cvsroot/gentoo-x86/dev-ruby/ruby_parser/ruby_parser-3.1.3.ebuild,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- ruby_parser-3.1.3.ebuild	31 May 2013 17:57:16 -0000	1.2
+++ ruby_parser-3.1.3.ebuild	31 May 2013 18:14:48 -0000	1.3
@@ -1,6 +1,6 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-ruby/ruby_parser/ruby_parser-3.1.3.ebuild,v 1.2 2013/05/31 17:57:16 graaff Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-ruby/ruby_parser/ruby_parser-3.1.3.ebuild,v 1.3 2013/05/31 18:14:48 graaff Exp $
 
 EAPI=5
 
@@ -20,7 +20,8 @@
 KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE=""
 
-ruby_add_rdepend ">=dev-ruby/sexp_processor-4.1:4"
+ruby_add_rdepend ">=dev-ruby/sexp_processor-4.1:4
+	!<dev-ruby/ruby_parser-2.3.1-r1"
 
 ruby_add_bdepend "doc? ( >=dev-ruby/hoe-2.9.1 )"
 ruby_add_bdepend "test? ( >=dev-ruby/minitest-4.3 )"



1.1                  dev-ruby/ruby_parser/ruby_parser-2.3.1-r1.ebuild

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-ruby/ruby_parser/ruby_parser-2.3.1-r1.ebuild?rev=1.1&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-ruby/ruby_parser/ruby_parser-2.3.1-r1.ebuild?rev=1.1&content-type=text/plain

Index: ruby_parser-2.3.1-r1.ebuild
===================================================================
# Copyright 1999-2013 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Header: /var/cvsroot/gentoo-x86/dev-ruby/ruby_parser/ruby_parser-2.3.1-r1.ebuild,v 1.1 2013/05/31 18:14:48 graaff Exp $

EAPI=2

USE_RUBY="ruby18 ruby19 jruby"

RUBY_FAKEGEM_TASK_DOC="docs"
RUBY_FAKEGEM_DOCDIR="doc"
RUBY_FAKEGEM_EXTRADOC="README.txt History.txt"

RUBY_FAKEGEM_BINWRAP=""

inherit ruby-fakegem

DESCRIPTION="A ruby parser written in pure ruby."
HOMEPAGE="http://parsetree.rubyforge.org/"

LICENSE="MIT"
SLOT="0"
KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
IUSE=""

# Restrict tests because the test case does not load the right version
# of sexp_processor.
RESTRICT="test"

# The sexp-processor dependency is needed to make tests pass for ruby 1.9.
ruby_add_rdepend ">=dev-ruby/sexp_processor-3.0.9"
ruby_add_bdepend "doc? ( >=dev-ruby/hoe-2.9.1 )"
ruby_add_bdepend "test? ( virtual/ruby-test-unit >=dev-ruby/sexp_processor-3.0.6 )"

all_ruby_prepare() {
	# Remove reference to perforce method that is not in a released
	# version of hoe-seattlerb.
	sed -i -e '/perforce/d' Rakefile || die

	sed -i -e '/Hoe.plugin :isolate/ s:^:#:' Rakefile || die
}