summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorKaarle Ritvanen <kaarle.ritvanen@datakunkku.fi>2014-12-09 00:22:58 +0200
committerKaarle Ritvanen <kaarle.ritvanen@datakunkku.fi>2014-12-09 00:23:08 +0200
commitb1cd204733c69706df5014719590153675c0b8ea (patch)
tree4768e38b12506d9f89261bde49bcacb34658fc14
parent4a14e5946f6f3df878a6489c81ef1efa2274a023 (diff)
downloadaports-b1cd204733c69706df5014719590153675c0b8ea.tar.bz2
aports-b1cd204733c69706df5014719590153675c0b8ea.tar.xz
main/ruby-json: use bundled version
-rw-r--r--main/ruby-json/APKBUILD37
-rw-r--r--main/ruby/APKBUILD14
2 files changed, 9 insertions, 42 deletions
diff --git a/main/ruby-json/APKBUILD b/main/ruby-json/APKBUILD
deleted file mode 100644
index 492069895..000000000
--- a/main/ruby-json/APKBUILD
+++ /dev/null
@@ -1,37 +0,0 @@
-# Maintainer: Natanael Copa <ncopa@alpinelinux.org>
-_gemname=json
-pkgname=ruby-$_gemname
-pkgver=1.8.1
-pkgrel=0
-pkgdesc="JSON implementation as a Ruby extension in C"
-url="http://json-jruby.rubyforge.org/"
-arch="all"
-license="MIT"
-depends="ruby"
-depends_dev=""
-makedepends="$depends_dev ruby-dev"
-install=""
-subpackages=""
-source="http://gems.rubyforge.org/gems/$_gemname-$pkgver.gem"
-
-_builddir="$srcdir"/$_gemname-$pkgver
-build() {
- return 0
-}
-
-package() {
- local _gemdir="$(ruby -rubygems -e'puts Gem.default_dir')"
- local _geminstdir=$_gemdir/gems/$_gemname-$pkgver
- mkdir -p "$pkgdir" || return 1
-
- gem install --local --install-dir "$pkgdir"/$_gemdir \
- --ignore-dependencies --verbose --no-rdoc --no-ri \
- "$srcdir"/$_gemname-$pkgver.gem || return 1
- rm -rf "$pkgdir"/$_gemdir/cache \
- "$pkgdir"/$_geminstdir/ext \
- "$pkgdir"/$_geminstdir/.require_paths
-}
-
-md5sums="d53582f76c34719aa815b0336beeb0a9 json-1.8.1.gem"
-sha256sums="961bfbbfa9fda1e857e9c791e964e6664e0d43bf687b19669dfbc7cdbc5e0200 json-1.8.1.gem"
-sha512sums="ad729c00a9f7b4940e077a151a1e74f054d9df5bff8bac996634b3df3eb42ad7c732035c4bbb40de92816c3989339b113c4fecebd36ee3f5c301b76169fe4fb7 json-1.8.1.gem"
diff --git a/main/ruby/APKBUILD b/main/ruby/APKBUILD
index 13e7b8459..99dd18a3e 100644
--- a/main/ruby/APKBUILD
+++ b/main/ruby/APKBUILD
@@ -3,7 +3,7 @@
pkgname=ruby
pkgver=2.1.5
_pkgver=${pkgver/_/-}
-pkgrel=0
+pkgrel=1
_abi=2.1.0
@@ -17,7 +17,7 @@ makedepends="zlib-dev openssl-dev libiconv-dev gdbm-dev db-dev readline-dev
subpackages="$pkgname-doc $pkgname-dev $pkgname-irb
$pkgname-rdoc $pkgname-rake $pkgname-bigdecimal
$pkgname-io-console:io_console $pkgname-minitest
- $pkgname-libs
+ $pkgname-json $pkgname-libs
"
patches="
"
@@ -101,8 +101,6 @@ package() {
fi
install -Dm644 COPYING \
"${pkgdir}/usr/share/licenses/${pkgname}"/COPYING || return 1
- # unbundle
- _rmgem json
}
_mv() {
@@ -157,7 +155,7 @@ irb() {
rdoc() {
pkgdesc="Ruby documentation tool"
- depends="ruby"
+ depends="ruby ruby-json"
arch="noarch"
_mvgem rdoc || return 1
_mv usr/bin/ri \
@@ -186,6 +184,12 @@ minitest() {
_mvgem minitest
}
+json() {
+ pkgdesc="JSON implementation as a Ruby extension in C"
+ depends=ruby
+ _mvgem json
+}
+
libs() {
pkgdesc="Libraries necessary to run Ruby"
depends=""