commit: 673106f694d00f4cc0f288cb5ffb2ea3898069b5 Author: Michael Mair-Keimberger (asterix) <m.mairkeimberger <AT> gmail <DOT> com> AuthorDate: Thu Jan 26 17:11:55 2017 +0000 Commit: David Seifert <soap <AT> gentoo <DOT> org> CommitDate: Thu Jan 26 22:36:47 2017 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=673106f6
net-misc/mikutter: remove unused patch Closes: https://github.com/gentoo/gentoo/pull/3663 .../mikutter-0.2.2.1537-disable-bundler.patch | 31 ---------------------- 1 file changed, 31 deletions(-) diff --git a/net-misc/mikutter/files/mikutter-0.2.2.1537-disable-bundler.patch b/net-misc/mikutter/files/mikutter-0.2.2.1537-disable-bundler.patch deleted file mode 100644 index 582787d..00000000 --- a/net-misc/mikutter/files/mikutter-0.2.2.1537-disable-bundler.patch +++ /dev/null @@ -1,31 +0,0 @@ -commit d2d55a4c463c43de4577b479b7717f7648005e5c -Author: Toshiaki Asai <[email protected]> -Date: Sat Mar 15 23:31:59 2014 +0900 - - 環境変数 DISABLE_BUNDLER_SETUP を空にセットすることで、bundlerを読みに行く挙動を抑制できるようにした refs #645 - -diff --git a/mikutter.rb b/mikutter.rb -index 3adcb90..695e2f5 100755 ---- a/mikutter.rb -+++ b/mikutter.rb -@@ -13,12 +13,14 @@ You should have received a copy of the GNU General Public License along with thi - =end - mikutter_directory = File.expand_path(File.dirname(__FILE__)) - --begin -- ENV['BUNDLE_GEMFILE'] = File.expand_path(File.join(File.dirname($0), "Gemfile")) -- require 'bundler/setup' --rescue LoadError, SystemExit -- # bundlerがないか、依存関係の解決に失敗した場合 -- # System の gem を使ってみる -+unless ENV['DISABLE_BUNDLER_SETUP'] -+ begin -+ ENV['BUNDLE_GEMFILE'] = File.expand_path(File.join(File.dirname($0), "Gemfile")) -+ require 'bundler/setup' -+ rescue LoadError, SystemExit -+ # bundlerがないか、依存関係の解決に失敗した場合 -+ # System の gem を使ってみる -+ end - end - - Thread.abort_on_exception = true
