aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--main/ruby/APKBUILD34
1 files changed, 21 insertions, 13 deletions
diff --git a/main/ruby/APKBUILD b/main/ruby/APKBUILD
index ef39ae031a..8020b7037c 100644
--- a/main/ruby/APKBUILD
+++ b/main/ruby/APKBUILD
@@ -3,7 +3,7 @@
pkgname=ruby
pkgver=1.9.3_p286
_pkgver=${pkgver/_/-}
-pkgrel=1
+pkgrel=2
_abi=1.9.1
@@ -17,7 +17,7 @@ makedepends="zlib-dev openssl-dev libiconv-dev gdbm-dev db-dev readline-dev
autoconf"
subpackages="$pkgname-doc $pkgname-dev $pkgname-irb $pkgname-gems \
$pkgname-rdoc $pkgname-rake $pkgname-bigdecimal
- $pkgname-io-console:io_console $pkgname-json $pkgname-minitest
+ $pkgname-io-console:io_console $pkgname-minitest
$pkgname-libs
"
patches="
@@ -95,6 +95,8 @@ package() {
fi
install -Dm644 COPYING \
"${pkgdir}/usr/share/licenses/${pkgname}"/COPYING || return 1
+ # unbundle
+ _rmgem json
}
_mv() {
@@ -107,16 +109,28 @@ _mv() {
_mvgem() {
cd "$pkgdir"
- for i in $_rubydir/${1}.rb \
- $_rubydir/${1} \
- $_rubydir/$_arch-linux-uclibc/${1} \
- $_gemdir/gems/${1}-* \
- $_gemdir/specifications/${1}-* ; do
+ for i in ./$_rubydir/${1}.rb \
+ ./$_rubydir/${1} \
+ ./$_rubydir/$_arch-linux-uclibc/${1} \
+ ./$_gemdir/gems/${1}-* \
+ ./$_gemdir/specifications/${1}-* ; do
[ -e "$pkgdir"/$i ] || continue
_mv "$i"
done
}
+_rmgem() {
+ cd "$pkgdir"
+ for i in ./$_rubydir/${1}.rb \
+ ./$_rubydir/${1} \
+ ./$_rubydir/$_arch-linux-uclibc/${1} \
+ ./$_gemdir/gems/${1}-* \
+ ./$_gemdir/specifications/${1}-* ; do
+ [ -e "$pkgdir"/$i ] && rm -r "$pkgdir/$i"
+ done
+ return 0
+}
+
gems() {
pkgdesc="The Ruby standard for packaging ruby libraries"
replaces="rubygems"
@@ -164,12 +178,6 @@ io_console() {
$_rubydir/$_arch-linux-uclibc/io/console.so
}
-json() {
- pkgdesc="Ruby JSON library"
- depends="ruby"
- _mvgem json
-}
-
minitest() {
pkgdesc="Ruby suite of testing facilities"
depends="ruby"