diff options
author | Hans de Graaff <graaff@gentoo.org> | 2012-03-22 07:05:04 +0000 |
---|---|---|
committer | Hans de Graaff <graaff@gentoo.org> | 2012-03-22 07:05:04 +0000 |
commit | 40a26dda52da6afe2aae9fae339ee01fcf5332d6 (patch) | |
tree | 40a9f9d88e9c10f74898c34b91f26e279e889df5 | |
parent | Use autotools-utils to reconfigure. (diff) | |
download | historical-40a26dda52da6afe2aae9fae339ee01fcf5332d6.tar.gz historical-40a26dda52da6afe2aae9fae339ee01fcf5332d6.tar.bz2 historical-40a26dda52da6afe2aae9fae339ee01fcf5332d6.zip |
Version bump with upstream patch to fix tests on Linux.
Package-Manager: portage-2.1.10.49/cvs/Linux x86_64
-rw-r--r-- | dev-ruby/mime-types/ChangeLog | 10 | ||||
-rw-r--r-- | dev-ruby/mime-types/Manifest | 15 | ||||
-rw-r--r-- | dev-ruby/mime-types/files/mime-types-1.18-linux-tests.patch | 161 | ||||
-rw-r--r-- | dev-ruby/mime-types/mime-types-1.18.ebuild | 34 |
4 files changed, 212 insertions, 8 deletions
diff --git a/dev-ruby/mime-types/ChangeLog b/dev-ruby/mime-types/ChangeLog index 42dc5793146c..3869191be7a7 100644 --- a/dev-ruby/mime-types/ChangeLog +++ b/dev-ruby/mime-types/ChangeLog @@ -1,6 +1,12 @@ # ChangeLog for dev-ruby/mime-types -# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/dev-ruby/mime-types/ChangeLog,v 1.23 2011/12/31 20:12:33 grobian Exp $ +# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2 +# $Header: /var/cvsroot/gentoo-x86/dev-ruby/mime-types/ChangeLog,v 1.24 2012/03/22 07:05:04 graaff Exp $ + +*mime-types-1.18 (22 Mar 2012) + + 22 Mar 2012; Hans de Graaff <graaff@gentoo.org> +mime-types-1.18.ebuild, + +files/mime-types-1.18-linux-tests.patch: + Version bump with upstream patch to fix tests on Linux. 31 Dec 2011; Fabian Groffen <grobian@gentoo.org> mime-types-1.16-r3.ebuild: Add Prefix keywords, bug #396547 diff --git a/dev-ruby/mime-types/Manifest b/dev-ruby/mime-types/Manifest index b00729d2bafb..18d9ce6dbcaf 100644 --- a/dev-ruby/mime-types/Manifest +++ b/dev-ruby/mime-types/Manifest @@ -1,15 +1,18 @@ -----BEGIN PGP SIGNED MESSAGE----- -Hash: SHA1 +Hash: SHA256 +AUX mime-types-1.18-linux-tests.patch 6433 RMD160 cb506d56c43a8cf39302d178b97983de637fe434 SHA1 ee0e69321c89eb413e86591d4fd1586afb89ee69 SHA256 f7c191bdb59989f5d166e15add923feaed58c008b156a8fe829b1a33627d66e0 DIST mime-types-1.16.gem 47104 RMD160 051bba2db6c6f1690a928f7c7c7364c6e8160912 SHA1 dc9c8d0eca668c18c21302b439645c20327da3ab SHA256 c393a1cb8d6901e89b2eabc6c1ca2cfd46f3067c78848daf62cfa7ddc53b97ea +DIST mime-types-1.18.gem 52736 RMD160 47f112efb73b75d473b5212eb024eeae9355eb45 SHA1 a5fee1d398b6ae0563113fa1493315136aeaa8c5 SHA256 f880433aa2aae29df84a6ccb6e58cbf0bc65876571ea5a86906d96f654de4702 EBUILD mime-types-1.16-r2.ebuild 1074 RMD160 525fa47eaa2b26d11398ca9bcbb2a5b811361560 SHA1 2ea60a9349a0cbebc9c62b961057e491ed9916e8 SHA256 697af5841f22d38ee8658462458a644904690457321c4f096299d30511a83558 EBUILD mime-types-1.16-r3.ebuild 1182 RMD160 0a11c4c83cae711f77a4261f2994a6c7a9266c98 SHA1 d4578ec0703ddd30b607ae7156cccd245d1014b3 SHA256 0f30e96b38eaf137e7b05e884124a4fdd060fb4803a3836702882013b62a77c4 -MISC ChangeLog 3339 RMD160 628a6617fccbb147a7c492d549c30cdbf3fb4a45 SHA1 6b24b6a62ca8d8a90f82e945f207e4887dd39283 SHA256 0a346586d4a120d81daa1f0d3852c07b1f5512d7583a0933e951167e3e2940e4 +EBUILD mime-types-1.18.ebuild 1214 RMD160 b84174720dd5e20aa3e4420af196497b273cbd0e SHA1 46186ddcb56dd98383dc50d741fc6d313bbb1ada SHA256 30963859d3ca6bcf2fc43c94b93edf6bb9e9d2cd28fab0df0bd5e1ac8973201a +MISC ChangeLog 3548 RMD160 5e0ced64e9f2733a425b5c0c804696295242b406 SHA1 108ad66d13e38247a66cac353f7c489db41da5c4 SHA256 61164937cfe3482c619ed78930479cdf39613b7f2d504598fe0797744243f5d1 MISC metadata.xml 157 RMD160 5d9e2c7ecba96ffebd936d38acedf859cdea84e1 SHA1 8ce15dcc608eeb5616aeec610dc695cbe6f93e02 SHA256 11fba03a217e2d996f5cd8895493a5692ece8ddac2c1a2dfc71d0e830555121c -----BEGIN PGP SIGNATURE----- -Version: GnuPG v2.0.18 (Darwin) +Version: GnuPG v2.0.17 (GNU/Linux) -iEYEARECAAYFAk7/bLYACgkQX3X2B8XHTom2ewCgpSj4vjTkyDGVSDT2uiVdxxZQ -1YcAn3k6PwfEDNxEknjyHCiOUFkKaS94 -=IyGj +iF4EAREIAAYFAk9qzzMACgkQiIP6VqMIqNeowAD+MsdBT8m4248SAUJS00RFYcVG +yKkeZ2sg3SbW78d/v6kA/087oShl8xMzkwrnQiAoJZwhsNQ9QMSGalWtkPOy9EtN +=PYhm -----END PGP SIGNATURE----- diff --git a/dev-ruby/mime-types/files/mime-types-1.18-linux-tests.patch b/dev-ruby/mime-types/files/mime-types-1.18-linux-tests.patch new file mode 100644 index 000000000000..b2ccb0ecf61c --- /dev/null +++ b/dev-ruby/mime-types/files/mime-types-1.18-linux-tests.patch @@ -0,0 +1,161 @@ +commit 134cab8ffdbd337bf0b8bb67b5097222f6f15769 +Author: Austin Ziegler <austin@surfeasy.com> +Date: Wed Mar 21 20:30:31 2012 -0400 + + Fixing issue #8. + + Apparently some people run the tests on Linux. Imagine that. :) + +diff --git a/History.rdoc b/History.rdoc +index 82daed8..d1ad126 100644 +--- a/History.rdoc ++++ b/History.rdoc +@@ -1,4 +1,8 @@ +-== MIME::Types 1.18 / 2012-03-20 ++== 1.?? / ????-??-?? ++* Resolve issue #8 (https://github.com/halostatue/mime-types/issues/8). ++ Apparently some people run the tests on Linux. Imagine that. :) ++ ++== 1.18 / 2012-03-20 + * New MIME Types: + * Types reported in Issue #6 (https://github.com/halostatue/mime-types/issues/6): + * CoffeeScript (text/x-coffeescript; .coffee; 8bit). +@@ -13,11 +17,11 @@ + * It was pointed out that Licence.txt was incorrectly named. Fixed by renaming to Licence.rdoc (from Issue/Pull Request #8, https://github.com/halostatue/mime-types/issues/8). + * It was pointed out that a plan to have the test output generated automatically never went through. Issue #10 (https://github.com/halostatue/mime-types/issues/10) + +-== MIME::Types 1.17.2 / 2011-10-25 ++== 1.17.2 / 2011-10-25 + * Bug Fixes: + * Fixed an issue with Ruby 1.9 and file encoding. + +-== MIME::Types 1.17.1 / 2011-10-23 ++== 1.17.1 / 2011-10-23 + * Minor Enhancements: + * Implemented modern 'hoe' semantics. + * Switched to minitest instead of test/unit. +@@ -34,7 +38,7 @@ + * Made it much easier to update MIME types from this point forward. + * Updated MIME types from IANA. + +-== MIME::Types 1.16 ++== 1.16 + * Made compatible with Ruby 1.8.6, 1.8.7, and 1.9.1. + * Switched to the 'hoe' gem system and added a lot of build-time tools. + * Updated the MIME types to the list based on the values in the Perl library +@@ -44,7 +48,7 @@ + starting soon on MIME::Types 2.x with richer data querying mechanisms + and support for external data sources. + +-== MIME::Types 1.15 ++== 1.15 + * Removed lib/mime/type.rb to form a single MIME::Types database source. It + is unlikely that one will ever need MIME::Type without MIME::Types. + * Re-synchronized the MIME type list with the sources, focusing primarily on +@@ -58,7 +62,7 @@ + priority as of this release. The data format and information has changed. + * Removed MIME::Types.by_suffix and MIME::Types.by_mediatype. + +-== MIME::Types 1.13.1 ++== 1.13.1 + * Fixed a problem with the installer running tests. This now works. + * Improved the implementation of MIME::Type.signature? + * Moved code around to use the class << self idiom instead of always +@@ -72,7 +76,7 @@ + version number to be updated separately from the Perl version while keeping + the MIME Type list version in sync. + +-== MIME::Types 1.13 ++== 1.13 + ! WARNING: This version changes the API of MIME::Types ! + ! WARNING: This version is compatible with Ruby 1.8 and higher ONLY ! + * Removed dependency on InstallPackage; offering 1.13 as either .tar.gz or +@@ -111,22 +115,22 @@ + exchange between the two projects. + * Added additional unit tests from Mark Overmeer's 1.12 version. + +-== MIME::Types 1.07 ++== 1.07 + * Changed version numbering to match Perl MIME::Types 1.07. + * Re-synchronized with Mark Overmeer's list in Perl PMIME::Types 1.07. + * [NN Poster] updated the attributes for the PGP types. + +-== MIME::Types 1.005 ++== 1.005 + * Changed to Phil Thomson's InstallPackage. + * Added several types from Perl MIME::Types 1.005. + * Cleaned up data format; some data formats will show up with proper data now. + +-== MIME::Types 1.004 ++== 1.004 + * Updated to match Perl MIME::Types 1.004, links credited to Dan Puro. Adds + new reference list to http://www.indiana.edu/cgi-bin-local/mimetypes + * Removed InvalidType and replaced with TypeError. + * Changed instances of #type to #class. + * Cleaned up how simplified versions are created. + +-== MIME::Types 1.003 ++== 1.003 + * Initial release based on Perl MIME::Types 1.003. +diff --git a/test/test_mime_type.rb b/test/test_mime_type.rb +index 4dfa3a4..8e84cc4 100644 +--- a/test/test_mime_type.rb ++++ b/test/test_mime_type.rb +@@ -2,11 +2,10 @@ $LOAD_PATH.unshift("#{File.dirname(__FILE__)}/../lib") if __FILE__ == $0 + + require 'mime/types' + require 'minitest/autorun' +-#require 'test/unit' unless defined? $ZENTEST and $ZENTEST + + class TestMIME_Type < MiniTest::Unit::TestCase + def yaml_mime_type_from_array +- MIME::Type.from_array('text/x-yaml', %w(yaml yml), '8bit', 'linux') ++ MIME::Type.from_array('text/x-yaml', %w(yaml yml), '8bit', 'd9d172f608') + end + + def setup +@@ -22,7 +21,7 @@ class TestMIME_Type < MiniTest::Unit::TestCase + def test_class_from_hash + yaml = MIME::Type.from_hash('Content-Type' => 'text/x-yaml', + 'Content-Transfer-Encoding' => '8bit', +- 'System' => 'linux', ++ 'System' => 'd9d172f608', + 'Extensions' => %w(yaml yml)) + assert_instance_of(MIME::Type, yaml) + assert_equal('text/yaml', yaml.simplified) +@@ -247,7 +246,7 @@ class TestMIME_Type < MiniTest::Unit::TestCase + + def test_system_equals + yaml = yaml_mime_type_from_array +- assert_equal(yaml.system, %r{linux}) ++ assert_equal(yaml.system, %r{d9d172f608}) + yaml.system = /win32/ + assert_equal(yaml.system, %r{win32}) + yaml.system = nil +@@ -264,7 +263,7 @@ class TestMIME_Type < MiniTest::Unit::TestCase + def test_to_a + yaml = yaml_mime_type_from_array + assert_equal(yaml.to_a, ['text/x-yaml', %w(yaml yml), '8bit', +- /linux/, nil, nil, nil, false]) ++ /d9d172f608/, nil, nil, nil, false]) + end + + def test_to_hash +@@ -273,7 +272,7 @@ class TestMIME_Type < MiniTest::Unit::TestCase + { 'Content-Type' => 'text/x-yaml', + 'Content-Transfer-Encoding' => '8bit', + 'Extensions' => %w(yaml yml), +- 'System' => /linux/, ++ 'System' => /d9d172f608/, + 'Registered' => false, + 'URL' => nil, + 'Obsolete' => nil, +@@ -289,7 +288,7 @@ class TestMIME_Type < MiniTest::Unit::TestCase + yaml = MIME::Type.new('text/x-yaml') do |y| + y.extensions = %w(yaml yml) + y.encoding = '8bit' +- y.system = 'linux' ++ y.system = 'd9d172f608' + end + assert_instance_of(MIME::Type, yaml) + assert_raises(MIME::InvalidContentType) { MIME::Type.new('apps') } diff --git a/dev-ruby/mime-types/mime-types-1.18.ebuild b/dev-ruby/mime-types/mime-types-1.18.ebuild new file mode 100644 index 000000000000..b1429d51b62f --- /dev/null +++ b/dev-ruby/mime-types/mime-types-1.18.ebuild @@ -0,0 +1,34 @@ +# Copyright 1999-2012 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: /var/cvsroot/gentoo-x86/dev-ruby/mime-types/mime-types-1.18.ebuild,v 1.1 2012/03/22 07:05:04 graaff Exp $ + +EAPI=2 + +USE_RUBY="ruby18 ruby19 jruby ree18" + +RUBY_FAKEGEM_TASK_DOC="docs" +RUBY_FAKEGEM_DOCDIR="doc" +RUBY_FAKEGEM_EXTRADOC="History.rdoc README.rdoc" + +inherit ruby-fakegem + +DESCRIPTION="Provides a mailcap-like MIME Content-Type lookup for Ruby." +HOMEPAGE="http://rubyforge.org/projects/mime-types" + +LICENSE="Ruby Artistic GPL-2" +SLOT="0" +KEYWORDS="~amd64 ~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_bdepend "doc? ( dev-ruby/hoe ) + test? ( dev-ruby/hoe virtual/ruby-test-unit )" + +all_ruby_prepare() { + # when rcov is installed, and a new enough Hoe is installed as + # well, the Rakefile will fail because Hoe::test_files is no + # longer defined. Since we don't use rcov for testing, we just + # disable the whole section unconditionally. + sed -i -e '/rcovtask/,/end/ s:^:#:' Rakefile || die "Rakefile fix failed" + + epatch "${FILESDIR}/${P}-linux-tests.patch" +} |