From f29539f97e26c00fc0be2b21ee5e67dab94f4e5b Mon Sep 17 00:00:00 2001
From: blshkv <blshkv@pentoo.ch>
Date: Thu, 15 Oct 2015 09:26:50 +0800
Subject: [PATCH] beef: ruby21 migration

---
 dev-ruby/data_objects/data_objects-0.10.13.ebuild        | 8 ++++----
 dev-ruby/dm-core/dm-core-1.2.1.ebuild                    | 8 ++++----
 dev-ruby/dm-do-adapter/dm-do-adapter-1.2.0.ebuild        | 8 ++++----
 dev-ruby/dm-migrations/dm-migrations-1.2.0.ebuild        | 9 +++++----
 .../dm-sqlite-adapter/dm-sqlite-adapter-1.2.0.ebuild     | 6 +++---
 dev-ruby/do_sqlite3/do_sqlite3-0.10.13.ebuild            | 7 ++++---
 dev-ruby/em-websocket/em-websocket-0.3.8.ebuild          | 9 +++++----
 dev-ruby/em-websocket/em-websocket-0.5.1-r1.ebuild       | 5 +++--
 dev-ruby/librex/librex-0.0.68.ebuild                     | 9 +++++----
 dev-ruby/msfrpc-client/msfrpc-client-1.0.1.ebuild        | 7 ++++---
 dev-ruby/websocket/websocket-1.2.1-r1.ebuild             | 5 +++--
 profiles/pentoo/base/package.accept_keywords/dev-ruby    | 5 +++--
 www-apps/beef/beef-0.4.6.1.ebuild                        | 2 +-
 13 files changed, 48 insertions(+), 40 deletions(-)

diff --git a/dev-ruby/data_objects/data_objects-0.10.13.ebuild b/dev-ruby/data_objects/data_objects-0.10.13.ebuild
index 3365afb52..4bdc5e7bd 100644
--- a/dev-ruby/data_objects/data_objects-0.10.13.ebuild
+++ b/dev-ruby/data_objects/data_objects-0.10.13.ebuild
@@ -1,10 +1,10 @@
-# Copyright 1999-2013 Gentoo Foundation
+# Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: $
+# $Id$
 
-EAPI=3
+EAPI=5
 
-USE_RUBY="ruby18 ree18 ruby19"
+USE_RUBY="ruby19 ruby20 ruby21"
 
 RUBY_FAKEGEM_TASK_DOC="yard"
 RUBY_FAKEGEM_DOCDIR="doc"
diff --git a/dev-ruby/dm-core/dm-core-1.2.1.ebuild b/dev-ruby/dm-core/dm-core-1.2.1.ebuild
index bb595032a..8e83c27f5 100644
--- a/dev-ruby/dm-core/dm-core-1.2.1.ebuild
+++ b/dev-ruby/dm-core/dm-core-1.2.1.ebuild
@@ -1,10 +1,10 @@
-# Copyright 1999-2010 Gentoo Foundation
+# Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: $
+# $Id$
 
-EAPI=3
+EAPI=5
 
-USE_RUBY="ruby18 ruby19"
+USE_RUBY="ruby19 ruby20 ruby21"
 
 RUBY_FAKEGEM_TASK_DOC="yard"
 RUBY_FAKEGEM_DOCDIR="doc"
diff --git a/dev-ruby/dm-do-adapter/dm-do-adapter-1.2.0.ebuild b/dev-ruby/dm-do-adapter/dm-do-adapter-1.2.0.ebuild
index 87aa2eea0..ba8a58393 100644
--- a/dev-ruby/dm-do-adapter/dm-do-adapter-1.2.0.ebuild
+++ b/dev-ruby/dm-do-adapter/dm-do-adapter-1.2.0.ebuild
@@ -1,10 +1,10 @@
-# Copyright 1999-2013 Gentoo Foundation
+# Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: $
+# $Id$
 
-EAPI=3
+EAPI=5
 
-USE_RUBY="ruby18 ruby19"
+USE_RUBY="ruby19 ruby20 ruby21"
 
 RUBY_FAKEGEM_TASK_DOC=""
 #RUBY_FAKEGEM_TASK_DOC="yard"
diff --git a/dev-ruby/dm-migrations/dm-migrations-1.2.0.ebuild b/dev-ruby/dm-migrations/dm-migrations-1.2.0.ebuild
index 1fadfddbf..e1c332a48 100644
--- a/dev-ruby/dm-migrations/dm-migrations-1.2.0.ebuild
+++ b/dev-ruby/dm-migrations/dm-migrations-1.2.0.ebuild
@@ -1,9 +1,10 @@
-# Copyright 1999-2013 Gentoo Foundation
+# Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: $
+# $Id$
 
-EAPI=2
-USE_RUBY="ruby19"
+EAPI=5
+
+USE_RUBY="ruby19 ruby20 ruby21"
 
 RUBY_FAKEGEM_TASK_DOC="yard"
 RUBY_FAKEGEM_DOCDIR="doc"
diff --git a/dev-ruby/dm-sqlite-adapter/dm-sqlite-adapter-1.2.0.ebuild b/dev-ruby/dm-sqlite-adapter/dm-sqlite-adapter-1.2.0.ebuild
index 1f649c301..4fa29a62c 100644
--- a/dev-ruby/dm-sqlite-adapter/dm-sqlite-adapter-1.2.0.ebuild
+++ b/dev-ruby/dm-sqlite-adapter/dm-sqlite-adapter-1.2.0.ebuild
@@ -1,10 +1,10 @@
-# Copyright 1999-2011 Gentoo Foundation
+# Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: $
+# $Id$
 
 EAPI=4
 
-USE_RUBY="ruby18 ruby19"
+USE_RUBY="ruby19 ruby21"
 
 RUBY_FAKEGEM_TASK_DOC="yard"
 RUBY_FAKEGEM_DOCDIR="doc"
diff --git a/dev-ruby/do_sqlite3/do_sqlite3-0.10.13.ebuild b/dev-ruby/do_sqlite3/do_sqlite3-0.10.13.ebuild
index 7df3dadd9..1887eb8d8 100644
--- a/dev-ruby/do_sqlite3/do_sqlite3-0.10.13.ebuild
+++ b/dev-ruby/do_sqlite3/do_sqlite3-0.10.13.ebuild
@@ -1,9 +1,10 @@
-# Copyright 1999-2011 Gentoo Foundation
+# Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Header: $
 
-EAPI=3
-USE_RUBY="ruby18 ree18 ruby19"
+EAPI=5
+
+USE_RUBY="ruby19 ruby20 ruby21"
 
 RUBY_FAKEGEM_TASK_TEST="spec"
 
diff --git a/dev-ruby/em-websocket/em-websocket-0.3.8.ebuild b/dev-ruby/em-websocket/em-websocket-0.3.8.ebuild
index a802ceacf..29a959cd8 100644
--- a/dev-ruby/em-websocket/em-websocket-0.3.8.ebuild
+++ b/dev-ruby/em-websocket/em-websocket-0.3.8.ebuild
@@ -1,9 +1,10 @@
-# Copyright 1999-2013 Gentoo Foundation
+# Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: $
+# $Id$
 
-EAPI=2
-USE_RUBY="ruby18 ruby19"
+EAPI=5
+
+USE_RUBY="ruby19 ruby20 ruby21"
 
 RUBY_FAKEGEM_TASK_DOC="yard"
 RUBY_FAKEGEM_DOCDIR="doc"
diff --git a/dev-ruby/em-websocket/em-websocket-0.5.1-r1.ebuild b/dev-ruby/em-websocket/em-websocket-0.5.1-r1.ebuild
index 2d8999aa3..a5228b95a 100644
--- a/dev-ruby/em-websocket/em-websocket-0.5.1-r1.ebuild
+++ b/dev-ruby/em-websocket/em-websocket-0.5.1-r1.ebuild
@@ -1,9 +1,10 @@
-# Copyright 1999-2013 Gentoo Foundation
+# Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Header: $
 
 EAPI=5
-USE_RUBY="ruby19 ruby20"
+
+USE_RUBY="ruby19 ruby20 ruby21"
 
 RUBY_FAKEGEM_TASK_DOC="yard"
 RUBY_FAKEGEM_DOCDIR="doc"
diff --git a/dev-ruby/librex/librex-0.0.68.ebuild b/dev-ruby/librex/librex-0.0.68.ebuild
index 106cbd2f0..f20f02817 100644
--- a/dev-ruby/librex/librex-0.0.68.ebuild
+++ b/dev-ruby/librex/librex-0.0.68.ebuild
@@ -1,9 +1,10 @@
-# Copyright 1999-2013 Gentoo Foundation
+# Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: $
+# $Id$
 
-EAPI=2
-USE_RUBY="ruby19"
+EAPI=5
+
+USE_RUBY="ruby19 ruby20 ruby21"
 
 RUBY_FAKEGEM_TASK_DOC="yard"
 RUBY_FAKEGEM_DOCDIR="doc"
diff --git a/dev-ruby/msfrpc-client/msfrpc-client-1.0.1.ebuild b/dev-ruby/msfrpc-client/msfrpc-client-1.0.1.ebuild
index 8ac6abcc1..cc24cdb22 100644
--- a/dev-ruby/msfrpc-client/msfrpc-client-1.0.1.ebuild
+++ b/dev-ruby/msfrpc-client/msfrpc-client-1.0.1.ebuild
@@ -1,9 +1,10 @@
-# Copyright 1999-2013 Gentoo Foundation
+# Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Header: $
 
-EAPI=2
-USE_RUBY="ruby19"
+EAPI=5
+
+USE_RUBY="ruby19 ruby20 ruby21"
 
 RUBY_FAKEGEM_TASK_DOC="yard"
 RUBY_FAKEGEM_DOCDIR="doc"
diff --git a/dev-ruby/websocket/websocket-1.2.1-r1.ebuild b/dev-ruby/websocket/websocket-1.2.1-r1.ebuild
index a128b5043..f14b65584 100644
--- a/dev-ruby/websocket/websocket-1.2.1-r1.ebuild
+++ b/dev-ruby/websocket/websocket-1.2.1-r1.ebuild
@@ -1,9 +1,10 @@
 # Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: $
+# $Id$
 
 EAPI=5
-USE_RUBY="ruby19 ruby20"
+
+USE_RUBY="ruby19 ruby20 ruby21"
 
 inherit ruby-fakegem
 
diff --git a/profiles/pentoo/base/package.accept_keywords/dev-ruby b/profiles/pentoo/base/package.accept_keywords/dev-ruby
index 84018ffcd..b5b361b46 100644
--- a/profiles/pentoo/base/package.accept_keywords/dev-ruby
+++ b/profiles/pentoo/base/package.accept_keywords/dev-ruby
@@ -26,6 +26,7 @@
 =dev-ruby/ruby-gdkpixbuf2-2.2.3-r1
 =dev-ruby/ruby-atk-2.2.3-r1
 =dev-ruby/rcairo-1.14.3
+~dev-ruby/tins-1.5.4
 
 dev-ruby/mini_exiftool
 ~dev-ruby/spider-0.4.4
@@ -126,7 +127,7 @@ dev-ruby/sprockets:2.2
 ~dev-ruby/ffi-1.3.1
 ~dev-ruby/webmock-1.9.3
 ~dev-ruby/crack-0.3.1
-~dev-ruby/addressable-2.3.2
+~dev-ruby/addressable-2.3.8
 ~dev-ruby/yard-0.8.3
 ~dev-ruby/simplecov-0.7.1 **
 ~dev-ruby/simplecov-html-0.7.1 **
@@ -144,7 +145,7 @@ dev-ruby/sprockets:2.2
 =dev-ruby/fakeweb-1.3.0
 =dev-ruby/test_declarative-0.0.5-r1
 =dev-util/gdbus-codegen-2.34.3
-=dev-ruby/sinatra-1.3.3
+~dev-ruby/sinatra-1.4.6
 =dev-ruby/bcat-0.6.2
 =dev-ruby/childlabor-0.0.3
 =dev-ruby/timecop-0.5.2
diff --git a/www-apps/beef/beef-0.4.6.1.ebuild b/www-apps/beef/beef-0.4.6.1.ebuild
index 839e1432d..7a66cb98b 100644
--- a/www-apps/beef/beef-0.4.6.1.ebuild
+++ b/www-apps/beef/beef-0.4.6.1.ebuild
@@ -4,7 +4,7 @@
 
 EAPI="5"
 
-USE_RUBY="ruby19"
+USE_RUBY="ruby19 ruby21"
 
 inherit ruby-fakegem eutils