From f005d594f0095f50a9f1ae8a8253258173b7d009 Mon Sep 17 00:00:00 2001
From: "A. Wilcox" <AWilcox@Wilcox-Tech.com>
Date: Mon, 1 Jul 2019 21:46:23 +0000
Subject: system/ruby: fix depends on some split gems, don't split etc

---
 system/ruby/APKBUILD | 15 +++------------
 1 file changed, 3 insertions(+), 12 deletions(-)

(limited to 'system')

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 \
-- 
cgit v1.2.3-70-g09d2