summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDiego Elio Pettenò <flameeyes@gentoo.org>2010-05-01 20:05:23 +0000
committerDiego Elio Pettenò <flameeyes@gentoo.org>2010-05-01 20:05:23 +0000
commitc5b676315dae593cdd34f065dc0631e0f15a87bc (patch)
tree56b0bd477a761361f17172ffbfc555e5f40dc888 /dev-ruby
parentImport from Perl overlay, dependency of sci-visualization/circos (diff)
downloadgentoo-2-c5b676315dae593cdd34f065dc0631e0f15a87bc.tar.gz
gentoo-2-c5b676315dae593cdd34f065dc0631e0f15a87bc.tar.bz2
gentoo-2-c5b676315dae593cdd34f065dc0631e0f15a87bc.zip
Version bump, the patches merged.
(Portage version: 2.2_rc67/cvs/Linux x86_64)
Diffstat (limited to 'dev-ruby')
-rw-r--r--dev-ruby/echoe/ChangeLog8
-rw-r--r--dev-ruby/echoe/echoe-4.3.1.ebuild (renamed from dev-ruby/echoe/echoe-4.3.ebuild)6
-rw-r--r--dev-ruby/echoe/files/echoe-4.3-gentoo.patch29
3 files changed, 8 insertions, 35 deletions
diff --git a/dev-ruby/echoe/ChangeLog b/dev-ruby/echoe/ChangeLog
index 65033b87d59e..282c2ba61296 100644
--- a/dev-ruby/echoe/ChangeLog
+++ b/dev-ruby/echoe/ChangeLog
@@ -1,6 +1,12 @@
# ChangeLog for dev-ruby/echoe
# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-ruby/echoe/ChangeLog,v 1.15 2010/05/01 16:58:04 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-ruby/echoe/ChangeLog,v 1.16 2010/05/01 20:05:23 flameeyes Exp $
+
+*echoe-4.3.1 (01 May 2010)
+
+ 01 May 2010; Diego E. Pettenò <flameeyes@gentoo.org> -echoe-4.3.ebuild,
+ +echoe-4.3.1.ebuild, -files/echoe-4.3-gentoo.patch:
+ Version bump, the patches merged.
01 May 2010; Diego E. Pettenò <flameeyes@gentoo.org>
-files/echoe-4.0-optional-gemcutter.patch, echoe-4.3.ebuild,
diff --git a/dev-ruby/echoe/echoe-4.3.ebuild b/dev-ruby/echoe/echoe-4.3.1.ebuild
index 221f539d04f3..f877a09adba0 100644
--- a/dev-ruby/echoe/echoe-4.3.ebuild
+++ b/dev-ruby/echoe/echoe-4.3.1.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2010 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-ruby/echoe/echoe-4.3.ebuild,v 1.2 2010/05/01 16:58:04 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-ruby/echoe/echoe-4.3.1.ebuild,v 1.1 2010/05/01 20:05:23 flameeyes Exp $
EAPI=2
@@ -25,7 +25,3 @@ KEYWORDS="~amd64 ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-solaris"
IUSE=""
ruby_add_rdepend "dev-ruby/highline dev-ruby/rubyforge"
-
-all_ruby_prepare() {
- epatch "${FILESDIR}"/${P}-gentoo.patch
-}
diff --git a/dev-ruby/echoe/files/echoe-4.3-gentoo.patch b/dev-ruby/echoe/files/echoe-4.3-gentoo.patch
deleted file mode 100644
index 0bfd0c0c401d..000000000000
--- a/dev-ruby/echoe/files/echoe-4.3-gentoo.patch
+++ /dev/null
@@ -1,29 +0,0 @@
-unchanged:
---- echoe-4.0.orig/lib/echoe.rb
-+++ echoe-4.0/lib/echoe.rb
-@@ -21,7 +21,11 @@ require "#{$HERE}/echoe/extensions"
- require 'rubygems'
- require 'rubygems/specification'
- require "#{$HERE}/echoe/rubygems"
--require 'rubygems_plugin'
-+begin
-+ gem 'gemcutter'
-+ require 'rubygems_plugin'
-+rescue Gem::LoadError
-+end
-
- require 'highline/import'
-
-only in patch2:
-unchanged:
---- a/lib/echoe.rb
-+++ b/lib/echoe.rb
-@@ -723,7 +723,7 @@ private
- task :default => :test
- end
-
-- if spec_pattern.any?
-+ if defined? Spec and spec_pattern.any?
- desc "Run the spec suite"
- Spec::Rake::SpecTask.new('spec') do |t|
- t.spec_files = spec_pattern