From 106eb1d6859742b28d06a563d22511f1e2a56717 Mon Sep 17 00:00:00 2001 From: Zero_Chaos Date: Tue, 7 Jul 2015 15:43:21 +0000 Subject: [PATCH] cewl et al: upgrade and make it work for ruby21...hopefully --- app-text/cewl/Manifest | 4 ++-- .../cewl/{cewl-5.0.ebuild => cewl-5.1.ebuild} | 16 +++++++++++++--- dev-ruby/http_configuration/Manifest | 4 ++-- ...r1.ebuild => http_configuration-1.0.4.ebuild} | 7 +++---- dev-ruby/mini_exiftool/Manifest | 4 ++-- ....0.1-r1.ebuild => mini_exiftool-2.5.1.ebuild} | 6 +++--- dev-ruby/spider/Manifest | 2 +- ...er-0.4.4-r1.ebuild => spider-0.4.4-r2.ebuild} | 4 ++-- .../pentoo/base/package.accept_keywords/app-text | 2 +- .../pentoo/base/package.accept_keywords/dev-ruby | 6 ++++-- 10 files changed, 33 insertions(+), 22 deletions(-) rename app-text/cewl/{cewl-5.0.ebuild => cewl-5.1.ebuild} (70%) rename dev-ruby/http_configuration/{http_configuration-1.0.2-r1.ebuild => http_configuration-1.0.4.ebuild} (71%) rename dev-ruby/mini_exiftool/{mini_exiftool-1.0.1-r1.ebuild => mini_exiftool-2.5.1.ebuild} (74%) rename dev-ruby/spider/{spider-0.4.4-r1.ebuild => spider-0.4.4-r2.ebuild} (88%) diff --git a/app-text/cewl/Manifest b/app-text/cewl/Manifest index ecfde6fa9..c42bd73a5 100644 --- a/app-text/cewl/Manifest +++ b/app-text/cewl/Manifest @@ -1,2 +1,2 @@ -DIST cewl_5.0.tar.bz2 11865 SHA256 9a3b843916f871056a7fa84b96997f7ed374f28726e0775a67e4b525931b7030 SHA512 72415e18a62fe6b2c646c71c367f6283224fcf376b7cae87069da771a4a1c27053407e2756f5d6a5452db283dc657662f00d97833e946c20d3ceaf72172c8195 WHIRLPOOL 388d633f6842fb082b916bb28a83a795ad9643b4d59d2276b7076834ade04fcbbdcff91593f304a841b3182fcb2e458ab60773ed4e8dd3486d35f42228730444 -EBUILD cewl-5.0.ebuild 885 SHA256 56d1faeaf32d8cf8bd0ad6723f83c51fff2450a6ebe3a25754b711f4a275a258 SHA512 4d71bc4638e7e8589ab069dd5a798bc66efc8f89d7cc6b994f9a719e0240c3f1f17f70636031cf8df004b06711be2815d978fe9b301cd267671a031312414fc4 WHIRLPOOL be1aa2524e34fdabf7eccc5fb87f152c01f9c0e47f687851a0bf317f4dcec48efcea14f3e49c44973e6bc6022c2dc36363f01cb27228a0186ead8c95b489919d +DIST cewl_5.1.tar.bz2 12144 SHA256 4f7e87422f5a82edf0f859e6cb73074adca75694330edf6beb7f6166a6fa3499 SHA512 52c22f0a0cb14a01570a1450b2e77c07673b1730f24c6d9b7183f6f380cbf94f029bd961a9130b858425ab3f4bcfcc5a16a276213ca78941c14ea05d0d15b051 WHIRLPOOL 3957635ec446de4b8aa902e8ddd469cb35a002936a7f5d7cb0899a2c4e2d92033a48e13673c428d80ff036520048802c67a5bac7e6a86f3c2aa1eb676b7d51be +EBUILD cewl-5.1.ebuild 1091 SHA256 ff3d8203fe78eac64ba91746d0d5f4cca560c3787a39e024843e52b2d45d4a83 SHA512 2b07f2815daa3ccc7b705f32cc6c70229c214cb0f0de4fcd6673b5d3322ffb3ca1e6b52493c0796d27f3bf7b89fc28445cc7260aed71a34e674284058a4c0cd4 WHIRLPOOL d16a00b1b16da94bf6599b66f6b091a3f1cfc869a43488cd7185f8701bb1eef23eee6090f2946396bc54324f3a89dc3b066fa64334759e449aa81f094937f748 diff --git a/app-text/cewl/cewl-5.0.ebuild b/app-text/cewl/cewl-5.1.ebuild similarity index 70% rename from app-text/cewl/cewl-5.0.ebuild rename to app-text/cewl/cewl-5.1.ebuild index 1bbb40972..ed7781067 100644 --- a/app-text/cewl/cewl-5.0.ebuild +++ b/app-text/cewl/cewl-5.1.ebuild @@ -4,7 +4,7 @@ EAPI=5 -USE_RUBY="ruby18 ruby19" +USE_RUBY="ruby19 ruby20 ruby21" inherit ruby-ng DESCRIPTION="A custom word list generator" @@ -16,7 +16,9 @@ SLOT="0" KEYWORDS="~amd64 ~x86" IUSE="" -RDEPEND="dev-ruby/hpricot +DEPEND="dev-ruby/bundler" + +ruby_add_rdepend "dev-ruby/hpricot dev-ruby/http_configuration dev-ruby/spider dev-ruby/mime-types @@ -25,7 +27,6 @@ RDEPEND="dev-ruby/hpricot all_ruby_prepare() { sed -i "s|require './cewl_lib'|require 'cewl_lib'|g" cewl/cewl.rb - sed -i 's|require "zip"|require "zip/zip"|g' cewl/cewl_lib.rb sed -i "s|require 'mime'|require 'mime/types'|g" cewl/cewl_lib.rb } @@ -37,3 +38,12 @@ all_ruby_install() { dodoc cewl/README newbin cewl/cewl.rb cewl } + +each_ruby_prepare() { + if [ -f Gemfile ] + then + BUNDLE_GEMFILE=Gemfile ${RUBY} -S bundle install --local || die + BUNDLE_GEMFILE=Gemfile ${RUBY} -S bundle check || die + fi +} + diff --git a/dev-ruby/http_configuration/Manifest b/dev-ruby/http_configuration/Manifest index 5df3791bc..2932a6b21 100644 --- a/dev-ruby/http_configuration/Manifest +++ b/dev-ruby/http_configuration/Manifest @@ -1,2 +1,2 @@ -DIST http_configuration-1.0.2.gem 9728 RMD160 3add104bae7f0ac1ab25ab99b10fb27c6f33216e SHA1 49f59cc0c3000617244bba30dbeda7819bff8029 SHA256 f9a69a634df3244e41cf6823f5fe1bb9ccbc5fa7a1fa94b44b6d261f85ccef58 -EBUILD http_configuration-1.0.2-r1.ebuild 454 RMD160 fd350e82f3a3cee846f13c8683683b93f6cca579 SHA1 42b06fd33a41ee3fc13a808effa0ede775f7f492 SHA256 ccdff51069af2f38e823eab02dc385d8825855575735f652f0932a725f3e7fb4 +DIST http_configuration-1.0.4.gem 9216 SHA256 c3536eb4a22ad9b38321587669cadef2fee01c6eb105f0d45528dcae3273d189 SHA512 184f59ca9d6f2556f61cb6033181583bf94c71258ababcaee2be9073a329179a6b63c8acefe543a9e8496816420fa3d048df9e1f0088d9d62bfa59dd45f3ba3e WHIRLPOOL 0e4e23db53671c0e5b39f50ab43511ad2f0989fb3b93d7af2005ebf9c83ef5bde9fd3a8213039a182e263d45b53ab57077304918a14184225f472c4555ff5a59 +EBUILD http_configuration-1.0.4.ebuild 422 SHA256 7bf6a77cfb138340e751eaa9012d58479d7a089a8c419de983b1a6a141579992 SHA512 377603d88458bead602b3100270ddc0ab75e9f116d59fc4b6af25632378e84bb9ade5a864e809ec62efc15027ec57d29ae772f518343ab16786676e0ec75cf2f WHIRLPOOL 3b4188f9d0d70c4b9f5b0c2cddb5c604eff2e9b8a63e423881330b71d36523ecd4069beb2c2df569a387676cc1593f195859d3e266223336ddd69bf610805cad diff --git a/dev-ruby/http_configuration/http_configuration-1.0.2-r1.ebuild b/dev-ruby/http_configuration/http_configuration-1.0.4.ebuild similarity index 71% rename from dev-ruby/http_configuration/http_configuration-1.0.2-r1.ebuild rename to dev-ruby/http_configuration/http_configuration-1.0.4.ebuild index 619bb628d..b6dae4a56 100644 --- a/dev-ruby/http_configuration/http_configuration-1.0.2-r1.ebuild +++ b/dev-ruby/http_configuration/http_configuration-1.0.4.ebuild @@ -2,16 +2,15 @@ # Distributed under the terms of the GNU General Public License v2 # $Header: $ -EAPI=4 +EAPI=5 -USE_RUBY="ruby18 ruby19" +USE_RUBY="ruby19 ruby20 ruby21" inherit ruby-fakegem DESCRIPTION="set configuration for Net::HTTP" -HOMEPAGE="http://rubyforge.org/projects/httpconfig/" -#MY_P="${P/httpconfig/http_configuration}" +HOMEPAGE="https://github.com/bdurand/http_configuration" SRC_URI="mirror://rubygems/${P}.gem" LICENSE="MIT" diff --git a/dev-ruby/mini_exiftool/Manifest b/dev-ruby/mini_exiftool/Manifest index bc5d80582..609db292f 100644 --- a/dev-ruby/mini_exiftool/Manifest +++ b/dev-ruby/mini_exiftool/Manifest @@ -1,2 +1,2 @@ -DIST mini_exiftool-1.0.1.gem 48128 SHA256 0ce0f5922868f2b2c3318d879669aa7ce7872641e587f6a939158e90f9486fe0 -EBUILD mini_exiftool-1.0.1-r1.ebuild 355 SHA256 ea499ee7300eace003924ce6e110c303d2094018bcdef67963218816d011b214 SHA512 0d26843f6be07f4e3a5296c43442d5d4510db68249566d60590aa822e04f3fa46f4c42aff63549eac4d388dee07aef322969303721759ab8f70004c0bf983de6 WHIRLPOOL 539289170ed9d1a9e78a83cb9c7ebdfac93aedb64cc0257afb0ca01f9c55b1bdfed18af8d14c4ba80a96accc68b557a65db0b81b271c1aebcc81278eaab8e37b +DIST mini_exiftool-2.5.1.gem 308736 SHA256 55ed7a351c3a1b1c658073513561dcd6b24088b1520dbed0838174740664b518 SHA512 d5ff148fcd122856909f51e62fc618efef45cd28edfeaeff2b67d4dbbb94d7d49315d32528adee4235f8dec3b37070902988a99a5165e31fd15d95e585077b27 WHIRLPOOL 4de8d054e54330cf950272369a456cf285269760457ec2f31b43871f4091b4d64523c62bda7c6930d91388d8f2e233321fa5303a1907b46075cdbd3b5614b3f2 +EBUILD mini_exiftool-2.5.1.ebuild 358 SHA256 36089c9877b8a0c304406a6528a01c26cb13c5d450b8c38b70c25d173d9f5838 SHA512 1ea926a388d2fe5af2b38598e62eb46b05b14930e5804b534f53cc27851f0c6db1ee855cef0647f014da32e8c9fc3cf57a5d628daf6b5b0738b197f6feb6c82c WHIRLPOOL 857ddab2d2c3cb24e379cb8eba07e36da9b475d6fd0226f15f87a8d6f66b27736316699017cd4a33692382ed013d82ab0b60a150844aec0dd6ac0c72d6673f75 diff --git a/dev-ruby/mini_exiftool/mini_exiftool-1.0.1-r1.ebuild b/dev-ruby/mini_exiftool/mini_exiftool-2.5.1.ebuild similarity index 74% rename from dev-ruby/mini_exiftool/mini_exiftool-1.0.1-r1.ebuild rename to dev-ruby/mini_exiftool/mini_exiftool-2.5.1.ebuild index 62c03ffd7..52f03da05 100644 --- a/dev-ruby/mini_exiftool/mini_exiftool-1.0.1-r1.ebuild +++ b/dev-ruby/mini_exiftool/mini_exiftool-2.5.1.ebuild @@ -2,14 +2,14 @@ # Distributed under the terms of the GNU General Public License v2 # $Header: $ -EAPI=4 +EAPI=5 -USE_RUBY="ruby18 ruby19" +USE_RUBY="ruby19 ruby20 ruby21" inherit ruby-fakegem DESCRIPTION="wrapper for exiftool" -HOMEPAGE="http://rubyforge.org/projects/miniexiftool/" +HOMEPAGE="https://rubygems.org/gems/mini_exiftool" LICENSE="GPL-2" SLOT="0" diff --git a/dev-ruby/spider/Manifest b/dev-ruby/spider/Manifest index 7a01e0720..df723663a 100644 --- a/dev-ruby/spider/Manifest +++ b/dev-ruby/spider/Manifest @@ -1,2 +1,2 @@ DIST spider-0.4.4.gem 31232 SHA256 b07bba8e003f7665efdb797f717085030352732b4bd01ba8dc80ac6fc364b103 -EBUILD spider-0.4.4-r1.ebuild 319 SHA256 0ae8ef7b8e04ed93d451aadfda834d3827053de110079cb1f3ea7160ce57a6c7 SHA512 40e17dbe22563d118ca3bbae58aac589ddfe8bca8c3ee00c4d2be4c3b0c2a4e1b8b87e09624bd0538730eb2c823f54c48158a82adf3405efc63de5ff7bf2641e WHIRLPOOL c95e4fb97695ceb24efd0c21c9216a68d5e2c77c680e982cb03f657185312fe73d94e08fe6b81d35fd5281addd2a465c11fb6eb6c542531e87cb82b7b6ef2134 +EBUILD spider-0.4.4-r2.ebuild 326 SHA256 895e88aae70a74de9f81f8f79b397b41cb7d8e7e0dfffefb70e055b00c350ed7 SHA512 8dd56e3d3bf720eeb3099d70b8ca29ebd6193a77f2ea35315aa1b197ef9adacf90764f92f23659c450853e56a25a66bed7a566ad6a7397d70e171feffa6c1f43 WHIRLPOOL bce0acab630606b83e39ff3173742d88dd11a4db5a1abbacc5393a5dcad1e77a25b8098d4439e565a2b4faecd80b0e3bd0085cd8da87c1fcaff81a5cadc2536b diff --git a/dev-ruby/spider/spider-0.4.4-r1.ebuild b/dev-ruby/spider/spider-0.4.4-r2.ebuild similarity index 88% rename from dev-ruby/spider/spider-0.4.4-r1.ebuild rename to dev-ruby/spider/spider-0.4.4-r2.ebuild index c64209149..85a7dde43 100644 --- a/dev-ruby/spider/spider-0.4.4-r1.ebuild +++ b/dev-ruby/spider/spider-0.4.4-r2.ebuild @@ -2,9 +2,9 @@ # Distributed under the terms of the GNU General Public License v2 # $Header: $ -EAPI=4 +EAPI=5 -USE_RUBY="ruby18 ruby19" +USE_RUBY="ruby19 ruby20 ruby21" inherit ruby-fakegem diff --git a/profiles/pentoo/base/package.accept_keywords/app-text b/profiles/pentoo/base/package.accept_keywords/app-text index 38d822b13..e47e03996 100644 --- a/profiles/pentoo/base/package.accept_keywords/app-text +++ b/profiles/pentoo/base/package.accept_keywords/app-text @@ -1,5 +1,5 @@ #required by pentoo/pentoo-cracking -~app-text/cewl-5.0 +~app-text/cewl-5.1 ~app-text/mupdf-1.6 =dev-lang/mujs-0_p2015* diff --git a/profiles/pentoo/base/package.accept_keywords/dev-ruby b/profiles/pentoo/base/package.accept_keywords/dev-ruby index c85b3d897..1820915f6 100644 --- a/profiles/pentoo/base/package.accept_keywords/dev-ruby +++ b/profiles/pentoo/base/package.accept_keywords/dev-ruby @@ -12,12 +12,14 @@ ~dev-ruby/rake-compiler-0.9.5 ~dev-ruby/coderay-1.1.0 ~dev-ruby/serialport-1.3.1 +~dev-ruby/hpricot-0.8.6 +~dev-ruby/fast_xs-0.8.0 ~dev-ruby/kissfft-0.0.1 -~dev-ruby/mini_exiftool-1.0.1 +dev-ruby/mini_exiftool ~dev-ruby/spider-0.4.4 -~dev-ruby/http_configuration-1.0.2 +dev-ruby/http_configuration ~dev-ruby/arel-3.0.2-r1 ~dev-ruby/arel-4.0.2 dev-ruby/activerecord:3.2