summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorKaarle Ritvanen <kaarle.ritvanen@datakunkku.fi>2014-12-26 08:09:17 +0200
committerKaarle Ritvanen <kaarle.ritvanen@datakunkku.fi>2014-12-26 08:09:17 +0200
commitddb37cfcd578b29c861f227e34b4e110ac9deaf1 (patch)
tree8349989c5b05799ffe9312464b12b56590326e67
parent3bb9db2ddf00a15e0989434cae18f11f585475a6 (diff)
downloadabuild-ddb37cfcd578b29c861f227e34b4e110ac9deaf1.tar.bz2
abuild-ddb37cfcd578b29c861f227e34b4e110ac9deaf1.tar.xz
apkbuild-gem-resolver: support for v2.6
-rw-r--r--apkbuild-gem-resolver.in8
1 files changed, 7 insertions, 1 deletions
diff --git a/apkbuild-gem-resolver.in b/apkbuild-gem-resolver.in
index 491d630..821ba30 100644
--- a/apkbuild-gem-resolver.in
+++ b/apkbuild-gem-resolver.in
@@ -10,6 +10,11 @@ require 'rubygems/spec_fetcher'
class Aport
RUBY_SUBPACKAGES = {
+ '2.0.0_p353' => {
+ 'ruby-minitest' => ['minitest', '4.3.2'],
+ 'ruby-rake' => ['rake', '0.9.6'],
+ 'ruby-rdoc' => ['rdoc', '4.0.0', 'ruby-json']
+ },
'2.0.0_p481' => {
'ruby-minitest' => ['minitest', '4.3.2'],
'ruby-rake' => ['rake', '0.9.6'],
@@ -118,7 +123,8 @@ class FileAport < Aport
super name, get.call('_gemname'), get.call('pkgver')
for dep in `echo #{get.call('depends')}`.split
- add_dependency dep if dep.start_with? 'ruby-'
+ # ruby-gems: workaround for v2.6
+ add_dependency dep if dep.start_with?('ruby-') && dep != 'ruby-gems'
end
end
end