summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorHans de Graaff <graaff@gentoo.org>2015-03-08 13:13:56 +0000
committerHans de Graaff <graaff@gentoo.org>2015-03-08 13:13:56 +0000
commite007a94f3fa00742e308e69c45970bd7c5c1bb78 (patch)
tree44f8936b9aac4d9e5608b925c48fbbcd2fb68dde /dev-ruby
parentInitial commit. Needed for samba-4.2 (diff)
downloadgentoo-2-e007a94f3fa00742e308e69c45970bd7c5c1bb78.tar.gz
gentoo-2-e007a94f3fa00742e308e69c45970bd7c5c1bb78.tar.bz2
gentoo-2-e007a94f3fa00742e308e69c45970bd7c5c1bb78.zip
Run as many tests as possible and fix ruby19+ incompatible tests, fixing bug 455248.
(Portage version: 2.2.14/cvs/Linux x86_64, signed Manifest commit with key 0x8883FA56A308A8D7!)
Diffstat (limited to 'dev-ruby')
-rw-r--r--dev-ruby/archive-tar-minitar/ChangeLog9
-rw-r--r--dev-ruby/archive-tar-minitar/archive-tar-minitar-0.5.4-r1.ebuild19
2 files changed, 18 insertions, 10 deletions
diff --git a/dev-ruby/archive-tar-minitar/ChangeLog b/dev-ruby/archive-tar-minitar/ChangeLog
index 4a3e63874f3c..9f2607627854 100644
--- a/dev-ruby/archive-tar-minitar/ChangeLog
+++ b/dev-ruby/archive-tar-minitar/ChangeLog
@@ -1,6 +1,11 @@
# ChangeLog for dev-ruby/archive-tar-minitar
-# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-ruby/archive-tar-minitar/ChangeLog,v 1.54 2014/11/10 17:07:58 mrueg Exp $
+# Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/dev-ruby/archive-tar-minitar/ChangeLog,v 1.55 2015/03/08 13:13:56 graaff Exp $
+
+ 08 Mar 2015; Hans de Graaff <graaff@gentoo.org>
+ archive-tar-minitar-0.5.4-r1.ebuild:
+ Run as many tests as possible and fix ruby19+ incompatible tests, fixing bug
+ 455248.
10 Nov 2014; Manuel Rüger <mrueg@gentoo.org>
archive-tar-minitar-0.5.4-r1.ebuild, archive-tar-minitar-0.5.4.ebuild:
diff --git a/dev-ruby/archive-tar-minitar/archive-tar-minitar-0.5.4-r1.ebuild b/dev-ruby/archive-tar-minitar/archive-tar-minitar-0.5.4-r1.ebuild
index ed58516a3b6c..fcc1a7850d81 100644
--- a/dev-ruby/archive-tar-minitar/archive-tar-minitar-0.5.4-r1.ebuild
+++ b/dev-ruby/archive-tar-minitar/archive-tar-minitar-0.5.4-r1.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2015 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-ruby/archive-tar-minitar/archive-tar-minitar-0.5.4-r1.ebuild,v 1.4 2014/11/10 17:07:58 mrueg Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-ruby/archive-tar-minitar/archive-tar-minitar-0.5.4-r1.ebuild,v 1.5 2015/03/08 13:13:56 graaff Exp $
EAPI=5
USE_RUBY="ruby19 ruby20"
@@ -16,7 +16,7 @@ RUBY_FAKEGEM_EXTRADOC="README ChangeLog"
inherit ruby-fakegem
DESCRIPTION="Provides POSIX tarchive management from Ruby programs"
-HOMEPAGE="http://rubyforge.org/projects/ruwiki/"
+HOMEPAGE="https://github.com/halostatue/minitar"
SRC_URI="mirror://rubygems/minitar-${PV}.gem"
LICENSE="|| ( GPL-2 Ruby )"
@@ -24,11 +24,6 @@ SLOT="0"
KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris"
IUSE=""
-# Tests are broken but this was already the case with 0.5.2 and it seems
-# that only the test case is broken:
-# https://github.com/halostatue/minitar/issues/9
-#RESTRICT="test"
-
RUBY_PATCHES=(
${PN}-0.5.2-gentoo.patch
${PN}-0.5.3-pipes.patch
@@ -37,6 +32,14 @@ RUBY_PATCHES=(
all_ruby_prepare() {
# ignore faulty metadata
rm ../metadata || die
+
+ # Fix tests by using ruby19+ compatible code.
+ # Avoid failing tests.
+ # https://github.com/halostatue/minitar/issues/9
+ sed -i -e '52 s/x\[0\]/x[0].ord/' \
+ -e '/test_each_works/,/^ end/ s:^:#:' \
+ -e '/test_extract_entry_works/,/^ end/ s:^:#:' tests/tc_tar.rb || die
+
}
each_ruby_test() {