diff options
| author | Jakub Jirutka <jakub@jirutka.cz> | 2019-10-27 19:37:15 +0100 |
|---|---|---|
| committer | Jakub Jirutka <jakub@jirutka.cz> | 2019-10-27 19:47:00 +0100 |
| commit | 197e60bb6da1ea65a273b8cfa8cc3c2dfa9d7a14 (patch) | |
| tree | b02d3183f3ae3d621af75cedd2e2f85180b6c8e5 | |
| parent | 3633856093e02c1159f2e7f3376712a62a210768 (diff) | |
| download | aports-197e60bb6da1ea65a273b8cfa8cc3c2dfa9d7a14.tar.bz2 aports-197e60bb6da1ea65a273b8cfa8cc3c2dfa9d7a14.tar.xz | |
main/ruby: remove duplicated package ruby-bundler
It's already provided by a separate aport/package ruby-bundler. Bundler
is a standalone Ruby gem with its own release cycle and version.
The version bundled in Ruby is outdated.
| -rw-r--r-- | main/ruby/APKBUILD | 27 |
1 files changed, 10 insertions, 17 deletions
diff --git a/main/ruby/APKBUILD b/main/ruby/APKBUILD index ea71b1a837..3477ad5eb2 100644 --- a/main/ruby/APKBUILD +++ b/main/ruby/APKBUILD @@ -33,7 +33,7 @@ pkgname=ruby pkgver=2.6.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" @@ -45,7 +45,6 @@ makedepends="$depends_dev zlib-dev openssl-dev gdbm-dev db-dev readline-dev install="$pkgname.post-upgrade" subpackages="$pkgname-doc $pkgname-dev $pkgname-bigdecimal - $pkgname-bundler $pkgname-dbm $pkgname-did_you_mean::noarch $pkgname-etc @@ -148,8 +147,12 @@ package() { make DESTDIR="$pkgdir" install - install -m 644 -D COPYING \ - "$pkgdir"/usr/share/licenses/$pkgname/COPYING + install -m 644 -D COPYING "$pkgdir"/usr/share/licenses/$pkgname/COPYING + + # Remove bundled gem bundler; it's provided by a separate aport/package + # ruby-bundler. + subpkgdir=".trash" _mvgem bundler && rm -Rf .trash + rm usr/bin/bundle usr/bin/bundler if [ -d "$pkgdir"/usr/local ]; then local f=$(cd "$pkgdir" ; find usr/local -type f) @@ -162,18 +165,6 @@ package() { fi } -bundler() { - pkgdesc="Ruby arbitrary-precision floating point decimal arithmetic" - license="Ruby" - depends="$pkgname-libs" - - _mvgem bundler - mkdir -p "$subpkgdir"/usr/bin - mv "$pkgdir"/usr/bin/bundle \ - "$pkgdir"/usr/bin/bundler \ - "$subpkgdir"/usr/bin/ -} - bigdecimal() { pkgdesc="Ruby arbitrary-precision floating point decimal arithmetic" license="Ruby" @@ -333,7 +324,9 @@ libs() { full() { pkgdesc="Ruby with all bundled gems" - depends="ruby $_bundled_gems" + # bundler is bundled since Ruby 2.6, so include it in ruby-full despite + # that it's provided by a seprate aport/package. + depends="ruby $_bundled_gems ruby-bundler" mkdir -p "$subpkgdir" } |