diff options
| -rw-r--r-- | system/libssh2/APKBUILD | 1 | ||||
| -rw-r--r-- | system/ruby/APKBUILD | 15 |
2 files changed, 4 insertions, 12 deletions
diff --git a/system/libssh2/APKBUILD b/system/libssh2/APKBUILD index 69989c72f..383854b8f 100644 --- a/system/libssh2/APKBUILD +++ b/system/libssh2/APKBUILD @@ -7,6 +7,7 @@ pkgdesc="Library for accessing SSH servers" url="https://libssh2.org/" arch="all" license="BSD-3-Clause" +checkdepends="openssh-server" makedepends="openssl-dev zlib-dev" subpackages="$pkgname-dev $pkgname-doc" source="https://www.libssh2.org/download/libssh2-$pkgver.tar.gz" diff --git a/system/ruby/APKBUILD b/system/ruby/APKBUILD index 306f47ce7..67b89f845 100644 --- a/system/ruby/APKBUILD +++ b/system/ruby/APKBUILD @@ -35,7 +35,7 @@ pkgname=ruby pkgver=2.5.5 _abiver="${pkgver%.*}.0" -pkgrel=0 +pkgrel=1 pkgdesc="An object-oriented language for quick and easy programming" url="https://www.ruby-lang.org/" arch="all" @@ -48,7 +48,6 @@ install="$pkgname.post-upgrade" subpackages="$pkgname-doc $pkgname-dev $pkgname-bigdecimal $pkgname-did_you_mean::noarch - $pkgname-etc $pkgname-fiddle $pkgname-io-console:io_console $pkgname-irb::noarch @@ -70,7 +69,7 @@ source="https://cache.ruby-lang.org/pub/ruby/${pkgver%.*}/$pkgname-$pkgver.tar.x test_insns-lower-recursion-depth.patch fix-get_main_stack.patch " -replaces="ruby-gems" +replaces="ruby-etc ruby-gems" _gemdir="/usr/lib/ruby/gems/$_abiver" _rubydir="/usr/lib/ruby/$_abiver" @@ -163,14 +162,6 @@ did_you_mean() { _mvgem did_you_mean } -etc() { - pkgdesc="Provides access to information typically stored in UNIX /etc directory" - license="BSD-2-Clause" - depends="" - - _mvgem etc -} - fiddle() { pkgdesc="A libffi wrapper for Ruby" license="BSD-2-Clause" @@ -192,7 +183,7 @@ io_console() { irb() { pkgdesc="The Interactive Ruby" replaces="$pkgname" - depends="$pkgname" + depends="$pkgname ruby-io-console" cd "$pkgdir" _mv usr/bin/irb \ |