Bump to released version and partly-merged fixes.

Package-Manager: portage-2.2_rc62/cvs/Linux x86_64

5 files changed, 32 insertions, 53 deletions

diff --git a/dev-ruby/tryouts/ChangeLog b/dev-ruby/tryouts/ChangeLog
index f4e6ed15d759..a1a590c9dbd8 100644
--- a/dev-ruby/tryouts/ChangeLog
+++ b/dev-ruby/tryouts/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for dev-ruby/tryouts
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-ruby/tryouts/ChangeLog,v 1.1 2010/02/14 00:18:32 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-ruby/tryouts/ChangeLog,v 1.2 2010/02/17 19:13:39 flameeyes Exp $
+
+*tryouts-0.8.7 (17 Feb 2010)
+
+  17 Feb 2010; Diego E. Pettenò <flameeyes@gentoo.org>
+  -tryouts-0.8.5.ebuild, -files/tryouts-0.8.5-fixes.patch,
+  +tryouts-0.8.7.ebuild, +files/tryouts-0.8.7-fixes.patch:
+  Bump to released version and partly-merged fixes.
 
 *tryouts-0.8.5 (14 Feb 2010)
 
diff --git a/dev-ruby/tryouts/Manifest b/dev-ruby/tryouts/Manifest
index 6d1a9d70c4a6..d71f4e967d54 100644
--- a/dev-ruby/tryouts/Manifest
+++ b/dev-ruby/tryouts/Manifest
@@ -1,15 +1,15 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA1
 
-AUX tryouts-0.8.5-fixes.patch 1002 RMD160 2ebef2a111c3a70b57591fcbace71475e82215da SHA1 804b80bea1461aa255fcc2995da928bacf046c3b SHA256 50b171818fc3545492d7f500fcb1af76825714a90933c4275cd19655e808b7f5
-DIST tryouts-0.8.5.gem 30720 RMD160 3ff1e6c5abaa936dc85f51bd3e4138e4e5fea97f SHA1 410da9fc18a6fe49524ae34c1a1c7cc083d6e678 SHA256 2473bc28000f8b402ce3ab47135dc99031acd9f106f6d72be41917f7456ac2af
-EBUILD tryouts-0.8.5.ebuild 786 RMD160 1ed9e5c08e0af490bfe2173fe7cbafe3fc658019 SHA1 13a42d65de5414d90ee8c4bc6afd0213e017d281 SHA256 c681fba7b0cbae223a9396f7554244af03f4556847140340ef91ed20375408da
-MISC ChangeLog 444 RMD160 b71e4c0ce4651a341aecbe094485e0ad0e821e15 SHA1 785637e014426eab0828aead005facc50e79f81f SHA256 d55be71c1fa7c74e1aeb86032871e5a934d2d0942574b68b9fd531db0c07430e
+AUX tryouts-0.8.7-fixes.patch 428 RMD160 7c77455213ad48129b058e2c70807d867d32ea70 SHA1 afbdf0a54a6fda43b83abdee67db1d95cd65a1e0 SHA256 67d518c949cd3228208ebe0d48bb021f2d3b0e146f7c58ae520529eb9f763f7c
+DIST tryouts-0.8.7.gem 30720 RMD160 dcf9224cd567b9960ce7534d2ee9ff6cd089dd7d SHA1 cc89b0e81e27232eec16e28806c9e536de39e490 SHA256 f3b2ad9f981ca5842db467eaac011efe1a411644170ad335487d545b582290fe
+EBUILD tryouts-0.8.7.ebuild 753 RMD160 244976de14112c80971540354134988a43a24944 SHA1 7932e579c6f8f861fa6955eba6950583f6a09c36 SHA256 d9e1e7deea3ec15213cc274be875d9939fd2c69637e664c93eb2fd417a407399
+MISC ChangeLog 701 RMD160 8911324d4b9b54a90b5fb08af57010d74a4f5e41 SHA1 62f1cf56f6dcf22b7e3c3cbbae39035ec503fa68 SHA256 3a41dae142fe835bb6ecc7db84daf251c01d69be66ecc7c95222452a2dc766ac
 MISC metadata.xml 157 RMD160 5d9e2c7ecba96ffebd936d38acedf859cdea84e1 SHA1 8ce15dcc608eeb5616aeec610dc695cbe6f93e02 SHA256 11fba03a217e2d996f5cd8895493a5692ece8ddac2c1a2dfc71d0e830555121c
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.14 (GNU/Linux)
 
-iEYEARECAAYFAkt3QVwACgkQAiZjviIA2XiehACff37IQ5WkB1/u4/ARwhzZejvQ
-EzoAn0/HELxSV3xmGP27ofn0f55OQ72H
-=EUfi
+iEYEARECAAYFAkt8P7EACgkQAiZjviIA2XgiqQCgv9GzUr1K22bsr7goKAwVwqxV
+y+oAoN2Xf2AanoBpXNJ1CIBPwlKctkbd
+=sHAP
 -----END PGP SIGNATURE-----
diff --git a/dev-ruby/tryouts/files/tryouts-0.8.5-fixes.patch b/dev-ruby/tryouts/files/tryouts-0.8.5-fixes.patch
deleted file mode 100644
index 9add5279bf5e..000000000000
--- a/dev-ruby/tryouts/files/tryouts-0.8.5-fixes.patch
+++ /dev/null
@@ -1,42 +0,0 @@
-Index: tryouts-0.8.5/lib/tryouts.rb
-===================================================================
---- tryouts-0.8.5.orig/lib/tryouts.rb
-+++ tryouts-0.8.5/lib/tryouts.rb
-@@ -2,10 +2,9 @@
- require 'time'
- require 'digest/sha1'
- 
--autoload :Attic, 'attic'
--autoload :SysInfo, 'sysinfo'
--autoload :OpenStruct, 'ostruct'
--autoload :YAML, 'yaml'
-+require 'attic'
-+require 'sysinfo'
-+require 'yaml'
- 
- ## NOTE: Don't require rye here so
- ## we can still run tryouts on the
-Index: tryouts-0.8.5/Rakefile
-===================================================================
---- tryouts-0.8.5.orig/Rakefile
-+++ tryouts-0.8.5/Rakefile
-@@ -1,7 +1,6 @@
- require 'rubygems'
- require 'rake/clean'
- require 'rake/gempackagetask'
--require 'hanna/rdoctask'
- require 'fileutils'
- include FileUtils
-  
-@@ -65,6 +64,11 @@ end
- 
- 
- # RUBY DOCS TASK ==================================
-+begin
-+  require 'hanna/rdoctask'
-+rescue LoadError
-+  require 'rake/rdoctask'
-+end
- 
- Rake::RDocTask.new do |t|
- 	t.rdoc_dir = 'doc'
diff --git a/dev-ruby/tryouts/files/tryouts-0.8.7-fixes.patch b/dev-ruby/tryouts/files/tryouts-0.8.7-fixes.patch
new file mode 100644
index 000000000000..927dccb24736
--- /dev/null
+++ b/dev-ruby/tryouts/files/tryouts-0.8.7-fixes.patch
@@ -0,0 +1,16 @@
+Index: tryouts-0.8.5/lib/tryouts.rb
+===================================================================
+--- tryouts-0.8.5.orig/lib/tryouts.rb
++++ tryouts-0.8.5/lib/tryouts.rb
+@@ -2,9 +2,8 @@
+ require 'time'
+ require 'digest/sha1'
+ 
+-autoload :SysInfo, 'sysinfo'
+-autoload :OpenStruct, 'ostruct'
+-autoload :YAML, 'yaml'
++require 'sysinfo'
++require 'yaml'
+ 
+ ## NOTE: Don't require rye here so
+ ## we can still run tryouts on the
diff --git a/dev-ruby/tryouts/tryouts-0.8.5.ebuild b/dev-ruby/tryouts/tryouts-0.8.7.ebuild
index 48cf70e26029..55a96f754613 100644
--- a/dev-ruby/tryouts/tryouts-0.8.5.ebuild
+++ b/dev-ruby/tryouts/tryouts-0.8.7.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/tryouts/tryouts-0.8.5.ebuild,v 1.1 2010/02/14 00:18:32 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-ruby/tryouts/tryouts-0.8.7.ebuild,v 1.1 2010/02/17 19:13:39 flameeyes Exp $
 
 EAPI=2
 
@@ -22,8 +22,6 @@ SLOT="0"
 KEYWORDS="~amd64 ~x86"
 IUSE=""
 
-ruby_add_rdepend dev-ruby/attic
-
 all_ruby_prepare() {
 	epatch "${FILESDIR}"/${P}-fixes.patch
 }