main/ruby: remove bundled gems - they are packaged separately

I'm moving "Bundled gems" (https://stdgems.org/3.0.2/#bundled-gems) to
separate aports mainly to provide correct pkgver - to avoid confusion and
future complications if the upstream decide to remove it from the
"Bundled gems" (as they did for some other gems with 3.0.0 release).

1 files changed, 13 insertions, 47 deletions

diff --git a/main/ruby/APKBUILD b/main/ruby/APKBUILD
index 40d4d8d4d39..758a22598ae 100644
--- a/main/ruby/APKBUILD
+++ b/main/ruby/APKBUILD
@@ -43,6 +43,9 @@
 #     - CVE-2017-17405
 #
 pkgname=ruby
+# When upgrading, upgrade also each ruby-<name> aport listed in "Bundled Gems"
+# at https://stdgems.org/<pkgver>/#bundled-gems to the version specified in
+# this list. If some aport is missing or not in the main repo, create/move it.
 pkgver=3.0.2
 _abiver="${pkgver%.*}.0"
 pkgrel=0
@@ -61,11 +64,7 @@ makedepends="$depends_dev zlib-dev openssl1.1-compat-dev gdbm-dev readline-dev
 	libffi-dev coreutils yaml-dev linux-headers autoconf"
 install="$pkgname.post-upgrade"
 subpackages="$pkgname-dbg $pkgname-doc $pkgname-dev
-	$pkgname-minitest::noarch
-	$pkgname-power_assert::noarch
-	$pkgname-rake::noarch
 	$pkgname-rdoc::noarch
-	$pkgname-test-unit:test_unit:noarch
 	$pkgname-libs
 	$pkgname-full::noarch
 	"
@@ -73,6 +72,7 @@ source="https://cache.ruby-lang.org/pub/ruby/${pkgver%.*}/ruby-$pkgver.tar.gz
 	get-ruby_nonempty_memcpy-to-have-c-linkage.patch
 	test_insns-lower-recursion-depth.patch
 	fix-get_main_stack.patch
+	dont-install-bundled-gems.patch
 	"
 replaces="ruby-gems"
 
@@ -90,14 +90,6 @@ case "$CARCH" in
 	*) _arch="$CARCH";;
 esac
 
-_bundled_gems=
-for _i in $subpackages; do
-	case "$_i" in
-		*-dev | *-doc | *-libs | *-full:*) continue;;
-		*) _bundled_gems="$_bundled_gems ${_i%%:*}";;
-	esac
-done
-
 prepare() {
 	default_prepare
 	autoconf
@@ -105,8 +97,7 @@ prepare() {
 	# v2.7.1 - Of all the bootstraptest only test_fiber fails on s390x:
 	# test_fiber.rb bootstraptest.tmp.rb:8: [BUG] vm_call_cfunc: cfp consistency error (0x000003ffb63fefb0, 0x000003ffb42f5f58)
 	case "$CARCH" in
-		s390x)
-			rm bootstraptest/test_fiber.rb ;;
+		s390x) rm bootstraptest/test_fiber.rb;;
 	esac
 }
 
@@ -174,30 +165,6 @@ package() {
 	fi
 }
 
-minitest() {
-	pkgdesc="Ruby suite of testing facilities"
-	license="MIT"
-	depends="$pkgname"
-
-	_mvgem minitest
-}
-
-power_assert() {
-	pkgdesc="Power Assert for Ruby"
-	depends="$pkgname-libs"
-
-	_mvgem power_assert
-}
-
-rake() {
-	pkgdesc="Ruby based make-like utility"
-	license="MIT"
-	depends="$pkgname"
-
-	_mvgem rake
-	_mv usr/bin/rake
-}
-
 rdoc() {
 	pkgdesc="Ruby documentation tool"
 	license="Ruby"
@@ -208,14 +175,6 @@ rdoc() {
 		usr/bin/rdoc
 }
 
-test_unit() {
-	pkgdesc="An xUnit family unit testing framework for Ruby"
-	license="Ruby PSFL"
-	depends="$pkgname $pkgname-power_assert"
-
-	_mvgem test-unit
-}
-
 libs() {
 	pkgdesc="Libraries necessary to run Ruby"
 	depends=""
@@ -228,9 +187,15 @@ full() {
 	pkgdesc="Ruby with all 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"
+	depends="ruby ruby-rdoc ruby-bundler"
 
 	mkdir -p "$subpkgdir"
+
+	local name ver; while read -r name ver _; do
+		case "$name=$ver" in
+			[a-z]*=[0-9]*.[0-9]*) depends="$depends ruby-$name>=$ver";;
+		esac
+	done < "$builddir"/gems/bundled_gems
 }
 
 _mv() {
@@ -259,4 +224,5 @@ e1fba6f5429b5fca9c3f52a32535615fcf95fafa415efc71c46db4cce159f249112c01574c305026
 59f85e23f9487b6a3ff1a5de9f73c243f23d2f9538d2628b4ba1fe62b47d5cac254e812ae2a0212d5866fb9df89125b32829b77f8d9397a2fcc4d39d837916e9  get-ruby_nonempty_memcpy-to-have-c-linkage.patch
 2ee66e841f841ad6e7c8877ec20b548d23b50d6a888a0d2d16f9062892c5d1c64efb59385f6723bae6cd1591824278787eefc0180768619c653243756d1300ab  test_insns-lower-recursion-depth.patch
 8e0a75899a3855f85441dabb6571569f13cf3472c2ccb2ec5c8e0e5cc9026af3c9951ebed4a754d9723dfd1c8ece32862802f20e18b7e5de4875125d92ef146b  fix-get_main_stack.patch
+10bda0462feaec73a7522ef622ffc18815b1d4302e771013ab78ef88d1d9f76277b1d24401eff054e031ca0fbc1ac80486d58282378cbdaf695786b212e6524d  dont-install-bundled-gems.patch
 "