summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorNathan Phillip Brink (binki) <ohnobinki@ohnopublishing.net>2011-09-14 00:25:16 +0000
committerNathan Phillip Brink (binki) <ohnobinki@ohnopublishing.net>2011-09-14 00:25:16 +0000
commitb9cd377901e372d98e85e27638d68fdcae728fb0 (patch)
treecfee77ed056fbffe4997f9ef107f468b3f2bc974 /dev-ruby
parentapp-misc/gcalcli: Version bump for gcalcli (diff)
downloadsunrise-b9cd377901e372d98e85e27638d68fdcae728fb0.tar.gz
sunrise-b9cd377901e372d98e85e27638d68fdcae728fb0.tar.bz2
sunrise-b9cd377901e372d98e85e27638d68fdcae728fb0.zip
dev-ruby/grit: Bump to grit-2.4.1.
(Portage version: 2.2.0_alpha50-r1/svn/Linux x86_64) svn path=/sunrise/; revision=12376
Diffstat (limited to 'dev-ruby')
-rw-r--r--dev-ruby/grit/ChangeLog8
-rw-r--r--dev-ruby/grit/files/grit-2.3.0-sorted-refs.patch25
-rw-r--r--dev-ruby/grit/grit-2.4.1.ebuild (renamed from dev-ruby/grit/grit-2.3.0.ebuild)20
3 files changed, 21 insertions, 32 deletions
diff --git a/dev-ruby/grit/ChangeLog b/dev-ruby/grit/ChangeLog
index 9772745db..690b9d28a 100644
--- a/dev-ruby/grit/ChangeLog
+++ b/dev-ruby/grit/ChangeLog
@@ -1,7 +1,13 @@
# ChangeLog for dev-ruby/grit
-# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
+# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
# $Header: $
+*grit-2.4.1 (14 Sep 2011)
+
+ 14 Sep 2011; Nathan Phillip Brink <binki@gentoo.org> -grit-2.3.0.ebuild,
+ -files/grit-2.3.0-sorted-refs.patch, +grit-2.4.1.ebuild:
+ Bump to grit-2.4.1.
+
13 Oct 2010; Nathan Phillip Brink (ohnobinki)
<ohnobinki@ohnopublishing.net> grit-2.3.0.ebuild:
Replace all_ruby_prepare() with RUBY_PATCHES.
diff --git a/dev-ruby/grit/files/grit-2.3.0-sorted-refs.patch b/dev-ruby/grit/files/grit-2.3.0-sorted-refs.patch
deleted file mode 100644
index de3c1f966..000000000
--- a/dev-ruby/grit/files/grit-2.3.0-sorted-refs.patch
+++ /dev/null
@@ -1,25 +0,0 @@
-From 7079d8c8465fef1ebd40681af590b5355b88aabc Mon Sep 17 00:00:00 2001
-From: Nathan Phillip Brink <ohnobinki@ohnopublishing.net>
-Date: Tue, 12 Oct 2010 00:27:25 -0400
-Subject: [PATCH] Sort refs to produce results predictable enough for test_tag. (The current test_tag assumes that Dir::glob() alphabetically sorts its output before returning it).
-
----
- lib/grit/git-ruby.rb | 2 +-
- 1 files changed, 1 insertions(+), 1 deletions(-)
-
-diff --git a/lib/grit/git-ruby.rb b/lib/grit/git-ruby.rb
-index 37302c2..ba722b8 100644
---- a/lib/grit/git-ruby.rb
-+++ b/lib/grit/git-ruby.rb
-@@ -112,7 +112,7 @@ module Grit
- refs = []
- already = {}
- Dir.chdir(@git_dir) do
-- files = Dir.glob(prefix + '/**/*')
-+ files = Dir.glob(prefix + '/**/*').sort
- files.each do |ref|
- next if !File.file?(ref)
- id = File.read(ref).chomp
---
-1.7.2.2
-
diff --git a/dev-ruby/grit/grit-2.3.0.ebuild b/dev-ruby/grit/grit-2.4.1.ebuild
index 5d07c3520..ce066b0e0 100644
--- a/dev-ruby/grit/grit-2.3.0.ebuild
+++ b/dev-ruby/grit/grit-2.4.1.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2010 Gentoo Foundation
+# Copyright 1999-2011 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Header: $
-EAPI=2
+EAPI=4
RUBY_FAKEGEM_DOCDIR="rdoc"
USE_RUBY="ruby18"
@@ -11,9 +11,8 @@ inherit eutils ruby-fakegem
DESCRIPTION="Git Library for Ruby"
HOMEPAGE="http://rubyforge.org/projects/grit http://github.com/mojombo/grit"
-# http://github.com/mojombo/grit/issues/issue/33
-SRC_URI="ftp://mirror.calvin.edu/~binki/${P}.tar.bz2
- test? ( ftp://mirror.calvin.edu/~binki/${P}-dot_git.tar.bz2 )"
+SRC_URI="https://github.com/mojombo/grit/tarball/v2.4.1 -> ${P}.tar.gz
+ test? ( ftp://mirror.ohnopub.net/mirror/${P}.git.tar.bz2 http://mirror.ohnopub.net/mirror/${P}.git.tar.bz2 )"
LICENSE="MIT"
SLOT="0"
@@ -29,4 +28,13 @@ ruby_add_bdepend "doc? ( virtual/ruby-rdoc )
ruby_add_rdepend "dev-ruby/mime-types
dev-ruby/diff-lcs"
-RUBY_PATCHES=(${P}-sorted-refs.patch)
+# Override fakegem's all_ruby_unpack() for github fix.
+all_ruby_unpack() {
+ unpack ${A}
+ mv mojombo-${PN}-* "${S}" || die "Removing githubiness."
+
+ # Tests require the grit directory to look like a git repo.
+ if [[ -e ${P}.git ]]; then
+ mv ${P}.git "${S}"/.git || die "Inserting .git for tests."
+ fi
+}