[gentoo-commits] dev/graaff:master commit in: dev-ruby/spring/, dev-ruby/spring/files/

[Hans de Graaff]

commit:     9dff9dd75ed73523e8ae4bbcfb05bb999992ef69
Author:     Hans de Graaff <hans <AT> degraaff <DOT> org>
AuthorDate: Wed Jun  1 05:00:37 2016 +0000
Commit:     Hans de Graaff <graaff <AT> gentoo <DOT> org>
CommitDate: Wed Jun  1 05:00:37 2016 +0000
URL:        https://gitweb.gentoo.org/dev/graaff.git/commit/?id=9dff9dd7

move hacked isolate version to internal company overlay

 dev-ruby/spring/Manifest                           |  3 -
 .../spring/files/spring-1.4.0-no-bundler.patch     | 79 ----------------------
 dev-ruby/spring/metadata.xml                       |  5 --
 dev-ruby/spring/spring-1.4.0-r100.ebuild           | 35 ----------
 dev-ruby/spring/spring-1.6.3-r100.ebuild           | 35 ----------
 dev-ruby/spring/spring-1.6.4-r100.ebuild           | 35 ----------
 6 files changed, 192 deletions(-)

diff --git a/dev-ruby/spring/Manifest b/dev-ruby/spring/Manifest
deleted file mode 100644
index db94526..0000000
--- a/dev-ruby/spring/Manifest
+++ /dev/null
@@ -1,3 +0,0 @@
-DIST spring-1.4.0.tar.gz 38007 SHA256 a27501bd182893d6071b46c03d47cb43ab78b4515901420e487d7a4b78821aa7 SHA512 b7096861dd19c3869f3899d8a48f26f39a6496f3b1a1c407d91c48b7896212f3eb18a477c6a3416c8522e1b8de955c20372814c29babbd465d8c0bdff51c928d WHIRLPOOL 8af890262cb45b579bed035b460c87d96cf13b5cc60f642669ab59bb5ea9af470a0cdb220d26bbc466fb1e1913b29ffbf404acebef37a1e05b9b0a86d8c874b6
-DIST spring-1.6.3.tar.gz 39349 SHA256 6396158ef4479e5bedaa4383db197ead1e04c4c9781eed3300e954ec66a6ce34 SHA512 88d605cd5c9751a8dd3d9e7903beda0304f0d7b31934735c841b63ee450d5250b73b73f7c95f8a25dcffbbeb73e05028873bf54827481d19a691d345744d576d WHIRLPOOL ff8220c6ba1201765268120434903796c7a2ce3401ca88a71d3b82aaca1694471fe1fe929832559a8faf666aee8b9b517f462aee12a81940d5047893b1dbf719
-DIST spring-1.6.4.tar.gz 39370 SHA256 d7584ecb01fb980451c12d65bbb0175c7b15fb3bf8c117058145de5ecc8c349b SHA512 9dffdcef750bd25028761da8e69c44ae3eace843dff9f81d5566085d3a8c7f944f4c99b6d455078ff564b7135116ae38dcf1aaf6dcc127ac351eae85e15dc143 WHIRLPOOL b7fd0e1520b77e1dc150f270e1cb222915ab98322b9ec0f75242fbfeceec7bd6155262a2fdeee8cf8c5651e9b03e1ce441159042c877675ddc3c4e07fbb2e1cb

diff --git a/dev-ruby/spring/files/spring-1.4.0-no-bundler.patch b/dev-ruby/spring/files/spring-1.4.0-no-bundler.patch
deleted file mode 100644
index a86715b..0000000
--- a/dev-ruby/spring/files/spring-1.4.0-no-bundler.patch
+++ /dev/null
@@ -1,79 +0,0 @@
-commit 55a8136e7ec8753eca783473710bcf6056c40783
-Author: Hans de Graaff <hans@×××××××××.com>
-Date:   Tue Oct 6 14:31:33 2015 +0200
-
-    Avoid bundler.
-
-diff --git a/lib/spring/application_manager.rb b/lib/spring/application_manager.rb
-index 8b34b9f..739eac6 100644
---- a/lib/spring/application_manager.rb
-+++ b/lib/spring/application_manager.rb
-@@ -92,7 +92,7 @@ module Spring
-     def start_child(preload = false)
-       @child, child_socket = UNIXSocket.pair
- 
--      Bundler.with_clean_env do
-+#      Bundler.with_clean_env do
-         @pid = Process.spawn(
-           {
-             "RAILS_ENV"           => app_env,
-@@ -105,7 +105,7 @@ module Spring
-           "-e", "require 'spring/application/boot'",
-           3 => child_socket
-         )
--      end
-+#      end
- 
-       start_wait_thread(pid, child) if child.gets
-       child_socket.close
-diff --git a/lib/spring/client/run.rb b/lib/spring/client/run.rb
-index 4a7c213..f6dd216 100644
---- a/lib/spring/client/run.rb
-+++ b/lib/spring/client/run.rb
-@@ -66,9 +66,9 @@ module Spring
-         env.socket_path.unlink if env.socket_path.exist?
- 
-         pid = Process.spawn(
--          gem_env,
-+          isolate_env,
-           "ruby",
--          "-e", "gem 'spring', '#{Spring::VERSION}'; require 'spring/server'; Spring::Server.boot"
-+          "-e", "require 'spring/server'; Spring::Server.boot",
-         )
- 
-         until env.socket_path.exist?
-@@ -78,6 +78,10 @@ module Spring
-         end
-       end
- 
-+      def isolate_env
-+        {}
-+      end
-+
-       def gem_env
-         bundle = Bundler.bundle_path.to_s
-         paths  = Gem.path + ENV["GEM_PATH"].to_s.split(File::PATH_SEPARATOR)
-diff --git a/lib/spring/configuration.rb b/lib/spring/configuration.rb
-index e25e079..7bc0759 100644
---- a/lib/spring/configuration.rb
-+++ b/lib/spring/configuration.rb
-@@ -8,6 +8,10 @@ module Spring
-       ENV['BUNDLE_GEMFILE'] || "Gemfile"
-     end
- 
-+    def isolatefile
-+      'Isolate'
-+    end
-+
-     def after_fork_callbacks
-       @after_fork_callbacks ||= []
-     end
-@@ -42,6 +46,8 @@ module Spring
-     def find_project_root(current_dir)
-       if current_dir.join(gemfile).exist?
-         current_dir
-+      elsif current_dir.join(isolatefile).exist?
-+        current_dir
-       elsif current_dir.root?
-         raise UnknownProject.new(Dir.pwd)
-       else

diff --git a/dev-ruby/spring/metadata.xml b/dev-ruby/spring/metadata.xml
deleted file mode 100644
index f977299..0000000
--- a/dev-ruby/spring/metadata.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version = '1.0' encoding = 'UTF-8'?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-<maintainer><email>graaff@g.o</email></maintainer>
-</pkgmetadata>

diff --git a/dev-ruby/spring/spring-1.4.0-r100.ebuild b/dev-ruby/spring/spring-1.4.0-r100.ebuild
deleted file mode 100644
index 243bbc0..0000000
--- a/dev-ruby/spring/spring-1.4.0-r100.ebuild
+++ /dev/null
@@ -1,35 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-USE_RUBY="ruby19 ruby20 ruby21"
-
-RUBY_FAKEGEM_TASK_DOC=""
-RUBY_FAKEGEM_EXTRADOC="CHANGELOG.md README.md"
-
-RUBY_FAKEGEM_TASK_TEST="test:unit"
-
-inherit ruby-fakegem
-
-DESCRIPTION="Rails application preloader"
-HOMEPAGE="https://github.com/rails/spring"
-SRC_URI="https://github.com/rails/spring/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="1.1"
-KEYWORDS="~amd64"
-
-IUSE=""
-
-RUBY_PATCHES=( "${P}-no-bundler.patch" )
-
-ruby_add_rdepend ">=dev-ruby/rubygems-2.1.0"
-
-ruby_add_bdepend "test? ( dev-ruby/bundler dev-ruby/activesupport )"
-
-all_ruby_prepare() {
-	sed -i -e '/files/d' \
-		-e '/bump/d' ${PN}.gemspec || die
-	sed -i -e '/bump/d' Rakefile || die
-}

diff --git a/dev-ruby/spring/spring-1.6.3-r100.ebuild b/dev-ruby/spring/spring-1.6.3-r100.ebuild
deleted file mode 100644
index d203ae5..0000000
--- a/dev-ruby/spring/spring-1.6.3-r100.ebuild
+++ /dev/null
@@ -1,35 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-USE_RUBY="ruby20 ruby21 ruby22"
-
-RUBY_FAKEGEM_TASK_DOC=""
-RUBY_FAKEGEM_EXTRADOC="CHANGELOG.md README.md"
-
-RUBY_FAKEGEM_TASK_TEST="test:unit"
-
-inherit ruby-fakegem
-
-DESCRIPTION="Rails application preloader"
-HOMEPAGE="https://github.com/rails/spring"
-SRC_URI="https://github.com/rails/spring/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="1.1"
-KEYWORDS="~amd64"
-
-IUSE=""
-
-RUBY_PATCHES=( "${PN}-1.4.0-no-bundler.patch" )
-
-ruby_add_rdepend ">=dev-ruby/rubygems-2.1.0"
-
-ruby_add_bdepend "test? ( dev-ruby/bundler dev-ruby/activesupport )"
-
-all_ruby_prepare() {
-	sed -i -e '/files/d' \
-		-e '/bump/d' ${PN}.gemspec || die
-	sed -i -e '/bump/d' Rakefile || die
-}

diff --git a/dev-ruby/spring/spring-1.6.4-r100.ebuild b/dev-ruby/spring/spring-1.6.4-r100.ebuild
deleted file mode 100644
index d203ae5..0000000
--- a/dev-ruby/spring/spring-1.6.4-r100.ebuild
+++ /dev/null
@@ -1,35 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-USE_RUBY="ruby20 ruby21 ruby22"
-
-RUBY_FAKEGEM_TASK_DOC=""
-RUBY_FAKEGEM_EXTRADOC="CHANGELOG.md README.md"
-
-RUBY_FAKEGEM_TASK_TEST="test:unit"
-
-inherit ruby-fakegem
-
-DESCRIPTION="Rails application preloader"
-HOMEPAGE="https://github.com/rails/spring"
-SRC_URI="https://github.com/rails/spring/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="1.1"
-KEYWORDS="~amd64"
-
-IUSE=""
-
-RUBY_PATCHES=( "${PN}-1.4.0-no-bundler.patch" )
-
-ruby_add_rdepend ">=dev-ruby/rubygems-2.1.0"
-
-ruby_add_bdepend "test? ( dev-ruby/bundler dev-ruby/activesupport )"
-
-all_ruby_prepare() {
-	sed -i -e '/files/d' \
-		-e '/bump/d' ${PN}.gemspec || die
-	sed -i -e '/bump/d' Rakefile || die
-}