From 5623361b77ff5df6f0a55134cfbfa3361a0713d9 Mon Sep 17 00:00:00 2001 From: Carlo Landmeter Date: Fri, 13 Sep 2013 13:19:43 +0000 Subject: main/ruby: spec location updated fixes #2255 (cherry picked from commit 2c04a95307a976de0ee7e56846103771927cb211) --- main/ruby/APKBUILD | 12 +++++++++--- 1 file changed, 9 insertions(+), 3 deletions(-) diff --git a/main/ruby/APKBUILD b/main/ruby/APKBUILD index 9da0f6d94..733cefe88 100644 --- a/main/ruby/APKBUILD +++ b/main/ruby/APKBUILD @@ -3,7 +3,7 @@ pkgname=ruby pkgver=2.0.0_p247 _pkgver=${pkgver/_/-} -pkgrel=0 +pkgrel=1 _abi=2.0.0 @@ -116,7 +116,7 @@ _mvgem() { ./$_rubydir/${1} \ ./$_rubydir/$_arch-linux${_libc}/${1} \ ./$_gemdir/gems/${1}-* \ - ./$_gemdir/specifications/${1}-* ; do + ./$_gemdir/specifications/default/${1}-* ; do [ -e "$pkgdir"/$i ] || continue _mv "$i" done @@ -128,7 +128,7 @@ _rmgem() { ./$_rubydir/${1} \ ./$_rubydir/$_arch-linux${_libc}/${1} \ ./$_gemdir/gems/${1}-* \ - ./$_gemdir/specifications/${1}-* ; do + ./$_gemdir/specifications/default/${1}-* ; do [ -e "$pkgdir"/$i ] && rm -r "$pkgdir/$i" done return 0 @@ -138,6 +138,7 @@ gems() { pkgdesc="The Ruby standard for packaging ruby libraries" replaces="rubygems" depends="ruby" + arch="noarch" _mv usr/bin/gem \ $_rubydir/rubygems \ || return 1 @@ -146,6 +147,7 @@ gems() { rake() { pkgdesc="Ruby based make-like utility" depends="ruby" + arch="noarch" _mvgem rake || return 1 _mv usr/bin/rake } @@ -154,6 +156,7 @@ irb() { pkgdesc="The Interactive Ruby" replaces="ruby" depends="ruby" + arch="noarch" cd "$pkgdir" _mv usr/bin/irb \ usr/lib/ruby/$_abi/irb* @@ -162,6 +165,7 @@ irb() { rdoc() { pkgdesc="Ruby documentation tool" depends="ruby" + arch="noarch" _mvgem rdoc || return 1 _mv usr/bin/ri \ usr/bin/rdoc @@ -170,6 +174,7 @@ rdoc() { bigdecimal() { pkgdesc="Ruby arbitrary-precision floating point decimal arithmetic" depends="ruby" + arch="noarch" _mvgem bigdecimal } @@ -184,6 +189,7 @@ io_console() { minitest() { pkgdesc="Ruby suite of testing facilities" depends="ruby" + arch="noarch" _mvgem minitest } -- cgit v1.2.3