gentoo resync : 22.01.2021

7 files changed, 165 insertions, 6 deletions

diff --git a/dev-lang/ruby/Manifest b/dev-lang/ruby/Manifest
index 673298912ecf..adbd6bc59b6a 100644
--- a/dev-lang/ruby/Manifest
+++ b/dev-lang/ruby/Manifest
@@ -5,13 +5,16 @@ AUX 2.4/010-libressl_2.7.patch 638 BLAKE2B ffd6091c3d1d657d44370d4bfd84e8c40fe38
 AUX 2.4/011-gcc8.patch 2470 BLAKE2B d6fe2e34e7c33ca7bccf3b934092ef43b4ba8766d8c160a0548fa4946fc61a763634037c3180479896802e6e75828af043e75839fd03cc9e4b6e126c833d2cb8 SHA512 1636dc821a822ab6ec919e576ebba9e9cba64540801df6a2b4411e650930ec5cdc3ab28aeb3c5d45d3304f73af52372c2dee91833bcd9952692f3167d21007d2
 AUX 2.4/012-openssl_1.1.patch 12158 BLAKE2B b7a77180159d6e2620a148b1c8dc2b137dbad0263d4f588c2d533a0ab9775ea0e685770fc708c3d4ae7ac53c16f657b990af39032219807925e46bcf11478d6b SHA512 050eeb45f7bc8a11bcd7fea0dfabb6137a009cc8f8337aa1c62ca4cd476ff0d66723148a20764a72843a5809f3dd66fe7a607a6098e5da990c90a3d2e15a6f54
 AUX 2.5/001-ia64-update-ia64-specific-code-to-use-execution-cont.patch 2501 BLAKE2B 7c166f47ce8264354272c7f74ebee5fbe038b1cf06230c6507f62d823be266959b622a0a61920845dfc38fbe7846c4ccd1cabf8e133f456e94b1da5197c49526 SHA512 72319113329c7c3c74e5bab21b67256327a65fbe01827cd32ea289de769a91b493c5d1eb35a087ed026105a9e5daf8b0bc17374c01ef1a83cb408440d6316706
+AUX 2.5/002-autoconf-2.70.patch 1916 BLAKE2B bd5d2f079aee5506b7c3d77642dad8ce465aabeea3fc0d86065e14cc5bb6d2d77e99cfc1a895674c4654d20a8322c9d21c518bca598d3be1e069bed88c8945db SHA512 8f6c7da86d618dd5f47019e1fdf1094294b46dd4d0c097ef90a62ca3ef41972ffb84bd1d40de0a3851682d9615215fc705f1b0d205724d8178ddd353d85eca75
 AUX 2.5/005_no-undefined-ext.patch 486 BLAKE2B 715f952cab863847f420afb020cac6819e4ab4e8f5527bdf550dd51eef37e272e7e89cbda5b6f9f137fdac89dfc5e99d42be8ae5712c255f11a0628cf07dc84d SHA512 6bbded9fce0c091b7cfb170c9dc2b0882b0e8bbf8fe31eaf596f3620853c8c75aa64c2648d5a72a0208a6ab6d711eb080a2d6aa98352933eda3b874bdd39cee8
 AUX 2.5/009_no-gems.patch 3454 BLAKE2B f2439a799776c39ba16f1503d573c90ea6d74fc2bad3b3874a961add6b605bb064c683080a4258ed1a0e83bca5cb67c02ba68bceb6acea7613ab7166e16a2f4c SHA512 bef8b2763993755b5b6ccba0b5cbe002fd721405d7c274f421ae3d95fa4d0d99cdf946f5fa9a907cac2c3696b2cc23f2f2e030b3a70eca93081e49b02f25a072
 AUX 2.5/010-libressl_2.7.patch 638 BLAKE2B 53f5f5d275e2c5482a608a947a1b3c41e9dcdd1763cc57a075e3abd536567852387506ec0ce2f5f49f5eed2246ca9f860d56637a9f18cd17cd49fff6fc92d340 SHA512 986aff99fd35814c94581cdc169cfc5a5f75c87889db5556941809ecaf878b6af838afe2ee108dd7147ea70be6fe9e47f98cce3c1804af0a34f7c1aab8c13d89
 AUX 2.5/011-no-gems.patch 3139 BLAKE2B ce05d6ef90001b3011167ba0827ef7852173fa508d6b4cd584f853e90a9d18325e7f2823e306fe7dd139cbdcce2a3c31cc7d2546909798489dec082dcc00d937 SHA512 758cf5ba94ab38753e8489284587254d172c308509d7542ecaca0a368cfd0834561e9d51e814c388f1b607740627ddd9cfc239c02333c24bcf7b7fb890e6909e
+AUX 2.6/002-autoconf-2.70.patch 1916 BLAKE2B bd5d2f079aee5506b7c3d77642dad8ce465aabeea3fc0d86065e14cc5bb6d2d77e99cfc1a895674c4654d20a8322c9d21c518bca598d3be1e069bed88c8945db SHA512 8f6c7da86d618dd5f47019e1fdf1094294b46dd4d0c097ef90a62ca3ef41972ffb84bd1d40de0a3851682d9615215fc705f1b0d205724d8178ddd353d85eca75
 AUX 2.6/005_no-undefined-ext.patch 486 BLAKE2B 715f952cab863847f420afb020cac6819e4ab4e8f5527bdf550dd51eef37e272e7e89cbda5b6f9f137fdac89dfc5e99d42be8ae5712c255f11a0628cf07dc84d SHA512 6bbded9fce0c091b7cfb170c9dc2b0882b0e8bbf8fe31eaf596f3620853c8c75aa64c2648d5a72a0208a6ab6d711eb080a2d6aa98352933eda3b874bdd39cee8
 AUX 2.6/009_no-gems.patch 1261 BLAKE2B 359d0a73c374e5c464eb0343d33272244bb88ba200977007a93f3c3c776779a013174fc2c97717e4ae4a1495011d3baae80e68b07433eab1320955a49aed8b59 SHA512 1607b9c2021e5b5f08cf28c64d3f3ddd077bc47df02a353182a9bc70dc6831ea18e8681d9808bb6841939d64082ae4966081014ee110d2090ec67ffe8faa9b8b
 AUX 2.6/010-default-gem-location.patch 688 BLAKE2B 4c2074d69b9fe5258a2fe0e38bb501a39f34ad1fa08ef338224edba1f06073138cbe3d831ecdf9910c989a7f0a1c6c6b73ced0d8ff212207a3a3df5f4d90b5de SHA512 65206a6ca42ade0413ae1467f41082f4a93b3166644d2504cff3d280d23da02fd41aea5aca69dd43f6081b436db90a5b1e98725d8fa51519ca302c02ec526ad7
+AUX 2.7/002-autoconf-2.70.patch 964 BLAKE2B ccddabc1d6d7321a46fa0a0facb85a221b11d05fd21abbdffcd6111117449bfa78d98080f61181720cd1c784320ae1d1de2fdcf6c5996bd0d6932b4d4e029e71 SHA512 0d07e1c74dfa7d620b6eab2a0cc7c8e05211e5a5458d3deab9eed699f3e34ed80ace803f65efb71805be6d67e4aa9150fefb85f2631fbea2003b3e1a5cc44cbe
 AUX 2.7/010-default-gem-location.patch 688 BLAKE2B 4c2074d69b9fe5258a2fe0e38bb501a39f34ad1fa08ef338224edba1f06073138cbe3d831ecdf9910c989a7f0a1c6c6b73ced0d8ff212207a3a3df5f4d90b5de SHA512 65206a6ca42ade0413ae1467f41082f4a93b3166644d2504cff3d280d23da02fd41aea5aca69dd43f6081b436db90a5b1e98725d8fa51519ca302c02ec526ad7
 AUX 3.0/001-socksocket-fix.patch 457 BLAKE2B cf3e15858481cdaa48be2cb3685bed663d9de792c743f6ef07ea5d2be214d630ee9bd70c1b6958110516d69a1889fdc4cf26676e52c55d4d530588b8274f962e SHA512 77381cb3c8d4a87a5ae06966d5dd00a38ea07148ed2feacb883e1d041d85ae0a6d64b30fd213f2ac0b1a07e3722f0e724cd0ec8414e74dc4de8844d849584b00
 AUX 3.0/010-default-gem-location.patch 753 BLAKE2B 2e9c209521e113c9b5b66ef305a2f29e042bc9330cc95ca847e04aec7a9450de48904bf583265aceec5984e8384e78a37b16a65435962ffc3ef458019b5ebedf SHA512 af63cd6c2c998533fd518abc6f48d1acb0f185e3bc9c4747301f7c7f3b3780e456f32db0252a0a03306dbc19a63d24c031fcfb7c35d732190fa68763e5817dcd
@@ -19,10 +22,10 @@ DIST ruby-2.5.8.tar.xz 11298404 BLAKE2B 3256c0448e72b63c0bd89f89a27fa9c09c8feed5
 DIST ruby-2.6.6.tar.xz 11567284 BLAKE2B 45e910dd9b128c46bff3003834c4fdcbbc2e2e4d3e44f298ff4356a285de2c375d6b6021a3aa28d89336b32a1655fa4a7c086d07f4a0f6bcd578a11dd4a894da SHA512 86caf93dbf61d03781767ab5375a7edf4761f13ba08ccfefe16c0a7550499237e7390c2f72a95d42670d4fe76b2401b4218936187c62ec1572799e9e04c50d62
 DIST ruby-2.7.2.tar.xz 12037052 BLAKE2B a4ad22295b3fed4e8064fc6e77adb8642d1fa7ae1f4ef912d7bde19c735cb25b1a3e3aefba53dad944046d844d608bcefba61c314cf1e52747f50d7d91f4c436 SHA512 7972278b096aa768c7adf2befd26003e18781a29ca317640317d30d93d6e963ded197724c8e2f1dfe1e838c5647176d414a74732a62e931fb50d6f2e0f777349
 DIST ruby-3.0.0.tar.xz 14374176 BLAKE2B 9e7520e0b1ae6644285449c4ae92983d306772b3dd5366a17da709a55797c798d099424a5628c78c842b825fb336c6a769ac9c371ef276f42bf3550fd0761ebe SHA512 2a23c2894e62e24bb20cec6b2a016b66d7df05083668726b6f70af8338211cfec417aa3624290d1f5ccd130f65ee7b52b5db7d428abc4a9460459c9a5dd1a450
-EBUILD ruby-2.5.8-r1.ebuild 7069 BLAKE2B 77e1c5ba8e5c3c203293d996b176702d96af4f850fe3687cf924c20ceaed19bb807847a2b4cbdbe9454e399623fd068e602561e1f7d2f3d33e45d3f0b31b3b7e SHA512 865e728e530b4711256f29e3f9d81de1db67caf0627c24407cfebdfbf9a27e28a2dcbfb24f7d78c430d48649338d50776cd6d8bcfb567a616b3e0e7f580b94ac
+EBUILD ruby-2.5.8-r1.ebuild 7073 BLAKE2B eaf5037da9841527af3e3197442c31c69eca718d25fdeb89836e61e40e5b63f6d34aa5116d50477348cd589f560fc85affd8dc04cb8d69f1c26d1aad1deeada4 SHA512 762019ac4eba249710a190579659112ba6b5152c75074fe6b2b20d2e310a2ecc860c8b7207bae371b31e9cf26820201b6aa8a514235f69eaa3af3278beafa6d5
 EBUILD ruby-2.5.8.ebuild 6189 BLAKE2B aa04b9f393085468d3452bfcc55a45c721bcbe51c9602d6f44510d1f936369f1c741ade879d24c619b1722270a460ba20bc679f0714a98d310d8293bc84c3678 SHA512 156ac0da5b5e6d1240bcb42ad9a7ce455a17077a3bfd66610d5425216ff7436462e8e1362764c8614900376eef146b168e1dd4691cddd9f13ded5a4a30204c9e
-EBUILD ruby-2.6.6-r2.ebuild 7477 BLAKE2B 35a9387635b0eefd90e4aa313d49e8254d96de6e1172c7a2f2a7d966859fc08ca95f9c25817bbcde9e938d5bde62687a706f2bbacf72ce3d482841c284641aaf SHA512 4acce5fef4cb07649df770a35f30a2aef5e77df569e30074f8165f00687d2cb2e7176006a9dbfb6979f0c79583ae25b457da8f76323af2ae6db4471dc8e1dffb
-EBUILD ruby-2.7.2.ebuild 7648 BLAKE2B 4d7958b01427946a7b23d24cd486d54b9a0dfdc2f07549d2f2f8562eb887dc021f3fb07145818c97e1aecb4cf4ce4018b68e69ca4726e36a96142dce4eb60a63 SHA512 49c54dd909e370f676faada8a43d4fe5604183b38bb48178d418c8a91fe8cfe3c8586b0c0f08f66d586592b544d77cd0c4db56d524964f270be8fe98ce1e1502
+EBUILD ruby-2.6.6-r2.ebuild 7483 BLAKE2B 5a35f894ad96b5fd275ced79d45efc8ef3eae80a4649bf78bae35bbe97e129d9e9a7ea1a76fed0ce013f391159aa202015a805c401c13639825c138b3dad3ccb SHA512 9f248423913fffb984744387f1fd2d8b2b38cbe8a90d60fd75e5bbf25ddf9e90064a4fa24ae8cb5ab158c3201024cf2c3646706c24464e6973ecb739046e9c16
+EBUILD ruby-2.7.2.ebuild 7654 BLAKE2B 9c3a093850ad70ff63c334b2f3dfe3e3d8637e23667f4f5b0e4d969e287a3ed5ce5055f22cbd3c334ffd1ddb3b0ec09c7bafa8a8c87ecdc3d2d2d392cf5860cf SHA512 c284e72bd6847aaaca2bb2481af752e56eff49ac45007f4757edd80237bba092d21bfdc2d863d1e0fc6b9b7ccb3bdbb3898b91490261325621d8c7b395c0875b
 EBUILD ruby-3.0.0-r1.ebuild 7658 BLAKE2B 16d96d395cb398a2bb2f3b986996163453b44769b667545f5ca1d8527c48d4b9f17c5ba3da41769cc6fcf482f2f1e0e3e5be44a11b40bb3a0c175757ae9ceedf SHA512 0fc8907e181c259a30cbb6db82b66a99791b131bd93068b3fd924a6babb4e89729a4efe8437b143cd0e907a6ee5804a3a1c55634ec72c65a9f37d1e31f22aad1
 EBUILD ruby-3.0.0.ebuild 7652 BLAKE2B 3e67942dd8dd944bd7af027d257bdc6a41769c3099f5a5f9e391fc0bbb4916e7203dae81bc4b568121bbbfe0b758b229bb66e25eebcde3cffee1766652adc036 SHA512 5b02c7620ba26e49007ecc105d946ddbcc286b848ab90210dd712130a8e05c4d7a1e258ebbbec257bab4801b5c018404b284e0eda8cc66f2d130e1cc4b73286e
 MISC metadata.xml 523 BLAKE2B 4ed08360a279c8d44fe87f677cdc24a76eda6d37c591186951e16321f464d4451d0d1299c4e1d996bffe15a8cca672d4c5c1bc5fb0aa6cda69b8eff90ec31df8 SHA512 f74c386a3d6314d630aff11c40314db40b7f9fb202910480b37aa65b7bac62d6e87fa7590b2a26aa1713bb65be486ed84138e1273eaf7c8b966d7414e6b55464
diff --git a/dev-lang/ruby/files/2.5/002-autoconf-2.70.patch b/dev-lang/ruby/files/2.5/002-autoconf-2.70.patch
new file mode 100644
index 000000000000..576ed6c759bd
--- /dev/null
+++ b/dev-lang/ruby/files/2.5/002-autoconf-2.70.patch
@@ -0,0 +1,65 @@
+From 6160ea5e22ee7353a0814159c94bd3cf890a52ce Mon Sep 17 00:00:00 2001
+From: Sergei Trofimovich <slyfox@gentoo.org>
+Date: Mon, 16 Nov 2020 08:42:15 +0000
+Subject: [PATCH] configure.ac: fix for upcoming autoconf-2.70
+
+The failure initially noticed on `autoconf-2.69d` (soon to become 2.70):
+
+```
+$ ./configure
+./configure: line 8720: syntax error near unexpected token `fi'
+./configure: line 8720: `fi'
+```
+
+Before the change generated `./configure ` snippet looked like:
+
+```
+    if ! $CC -E -xc - <<SRC >/dev/null
+then :
+
+	#if defined __APPLE_CC__ && defined __clang_major__ && __clang_major__ < 3
+	#error premature clang
+	#endif
+SRC
+	as_fn_error $? "clang version 3.0 or later is required" "$LINENO" 5
+fi
+```
+
+Note the newline that breaks here-document syntax.
+
+After the change the snippet does not use here-document.
+
+Signed-off-by: Sergei Trofimovich <slyfox@gentoo.org>
+---
+ configure.ac | 15 ++++++++-------
+ 1 file changed, 8 insertions(+), 7 deletions(-)
+
+diff --git a/configure.ac b/configure.ac
+index a5e3dc76f6..4e4a52f066 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -271,13 +271,14 @@ AS_CASE(["$host_os:$build_os"],
+     # clang version 1.0 (http://llvm.org/svn/llvm-project/cfe/tags/Apple/clang-23 exported)
+     # Apple clang version 2.0 (tags/Apple/clang-137) (based on LLVM 2.9svn)
+     # Apple clang version 2.1 (tags/Apple/clang-163.7.1) (based on LLVM 3.0svn)
+-    AS_IF([! $CC -E -xc - <<SRC >/dev/null], [
+-	@%:@if defined __APPLE_CC__ && defined __clang_major__ && __clang_major__ < 3
+-	@%:@error premature clang
+-	@%:@endif
+-SRC
+-	AC_MSG_ERROR([clang version 3.0 or later is required])
+-    ])
++    AC_PREPROC_IFELSE(
++	[AC_LANG_PROGRAM([
++	    @%:@if defined __APPLE_CC__ && defined __clang_major__ && __clang_major__ < 3
++	    @%:@error premature clang
++	    @%:@endif
++	])],
++	[],
++	[AC_MSG_ERROR([clang version 3.0 or later is required])])
+ ])
+ 
+ AS_CASE(["$target_os"],
+-- 
+2.29.2
+
diff --git a/dev-lang/ruby/files/2.6/002-autoconf-2.70.patch b/dev-lang/ruby/files/2.6/002-autoconf-2.70.patch
new file mode 100644
index 000000000000..576ed6c759bd
--- /dev/null
+++ b/dev-lang/ruby/files/2.6/002-autoconf-2.70.patch
@@ -0,0 +1,65 @@
+From 6160ea5e22ee7353a0814159c94bd3cf890a52ce Mon Sep 17 00:00:00 2001
+From: Sergei Trofimovich <slyfox@gentoo.org>
+Date: Mon, 16 Nov 2020 08:42:15 +0000
+Subject: [PATCH] configure.ac: fix for upcoming autoconf-2.70
+
+The failure initially noticed on `autoconf-2.69d` (soon to become 2.70):
+
+```
+$ ./configure
+./configure: line 8720: syntax error near unexpected token `fi'
+./configure: line 8720: `fi'
+```
+
+Before the change generated `./configure ` snippet looked like:
+
+```
+    if ! $CC -E -xc - <<SRC >/dev/null
+then :
+
+	#if defined __APPLE_CC__ && defined __clang_major__ && __clang_major__ < 3
+	#error premature clang
+	#endif
+SRC
+	as_fn_error $? "clang version 3.0 or later is required" "$LINENO" 5
+fi
+```
+
+Note the newline that breaks here-document syntax.
+
+After the change the snippet does not use here-document.
+
+Signed-off-by: Sergei Trofimovich <slyfox@gentoo.org>
+---
+ configure.ac | 15 ++++++++-------
+ 1 file changed, 8 insertions(+), 7 deletions(-)
+
+diff --git a/configure.ac b/configure.ac
+index a5e3dc76f6..4e4a52f066 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -271,13 +271,14 @@ AS_CASE(["$host_os:$build_os"],
+     # clang version 1.0 (http://llvm.org/svn/llvm-project/cfe/tags/Apple/clang-23 exported)
+     # Apple clang version 2.0 (tags/Apple/clang-137) (based on LLVM 2.9svn)
+     # Apple clang version 2.1 (tags/Apple/clang-163.7.1) (based on LLVM 3.0svn)
+-    AS_IF([! $CC -E -xc - <<SRC >/dev/null], [
+-	@%:@if defined __APPLE_CC__ && defined __clang_major__ && __clang_major__ < 3
+-	@%:@error premature clang
+-	@%:@endif
+-SRC
+-	AC_MSG_ERROR([clang version 3.0 or later is required])
+-    ])
++    AC_PREPROC_IFELSE(
++	[AC_LANG_PROGRAM([
++	    @%:@if defined __APPLE_CC__ && defined __clang_major__ && __clang_major__ < 3
++	    @%:@error premature clang
++	    @%:@endif
++	])],
++	[],
++	[AC_MSG_ERROR([clang version 3.0 or later is required])])
+ ])
+ 
+ AS_CASE(["$target_os"],
+-- 
+2.29.2
+
diff --git a/dev-lang/ruby/files/2.7/002-autoconf-2.70.patch b/dev-lang/ruby/files/2.7/002-autoconf-2.70.patch
new file mode 100644
index 000000000000..bea2bc178dc4
--- /dev/null
+++ b/dev-lang/ruby/files/2.7/002-autoconf-2.70.patch
@@ -0,0 +1,26 @@
+diff --git a/configure.ac b/configure.ac
+index 6766df2..bc503d6 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -177,13 +177,14 @@ AS_CASE(["$host_os:$build_os"],
+     # clang version 1.0 (http://llvm.org/svn/llvm-project/cfe/tags/Apple/clang-23 exported)
+     # Apple clang version 2.0 (tags/Apple/clang-137) (based on LLVM 2.9svn)
+     # Apple clang version 2.1 (tags/Apple/clang-163.7.1) (based on LLVM 3.0svn)
+-    AS_IF([! $CC -E -xc - <<SRC >/dev/null], [
+-	@%:@if defined __APPLE_CC__ && defined __clang_major__ && __clang_major__ < 3
+-	@%:@error premature clang
+-	@%:@endif
+-SRC
+-	AC_MSG_ERROR([clang version 3.0 or later is required])
+-    ])],
++    AC_PREPROC_IFELSE(
++	[AC_LANG_PROGRAM([
++	    @%:@if defined __APPLE_CC__ && defined __clang_major__ && __clang_major__ < 3
++	    @%:@error premature clang
++	    @%:@endif
++	])],
++	[],
++	[AC_MSG_ERROR([clang version 3.0 or later is required])])],
+ [openbsd*:openbsd*], [
+     AC_CHECK_TOOLS(CC, [cc])
+ ])
diff --git a/dev-lang/ruby/ruby-2.5.8-r1.ebuild b/dev-lang/ruby/ruby-2.5.8-r1.ebuild
index 21d81b7477bc..1a4584807865 100644
--- a/dev-lang/ruby/ruby-2.5.8-r1.ebuild
+++ b/dev-lang/ruby/ruby-2.5.8-r1.ebuild
@@ -61,7 +61,7 @@ PDEPEND="
 	xemacs? ( app-xemacs/ruby-modes )"
 
 src_prepare() {
-	eapply "${FILESDIR}"/${SLOT}/{001,005,011}*.patch
+	eapply "${FILESDIR}"/${SLOT}/{001,002,005,011}*.patch
 
 	einfo "Unbundling gems..."
 	cd "$S"
diff --git a/dev-lang/ruby/ruby-2.6.6-r2.ebuild b/dev-lang/ruby/ruby-2.6.6-r2.ebuild
index ee064ea4a67b..795321234d25 100644
--- a/dev-lang/ruby/ruby-2.6.6-r2.ebuild
+++ b/dev-lang/ruby/ruby-2.6.6-r2.ebuild
@@ -65,7 +65,7 @@ PDEPEND="
 src_prepare() {
 	# 005 does not compile bigdecimal and is questionable because it
 	# compiles ruby in a non-standard way, may be dropped
-	eapply "${FILESDIR}"/2.6/010*.patch
+	eapply "${FILESDIR}"/2.6/{002,010}*.patch
 
 	einfo "Unbundling gems..."
 	cd "$S"
diff --git a/dev-lang/ruby/ruby-2.7.2.ebuild b/dev-lang/ruby/ruby-2.7.2.ebuild
index 473f807c1923..138024506971 100644
--- a/dev-lang/ruby/ruby-2.7.2.ebuild
+++ b/dev-lang/ruby/ruby-2.7.2.ebuild
@@ -65,7 +65,7 @@ PDEPEND="
 src_prepare() {
 	# 005 does not compile bigdecimal and is questionable because it
 	# compiles ruby in a non-standard way, may be dropped
-	eapply "${FILESDIR}"/2.7/010*.patch
+	eapply "${FILESDIR}"/2.7/{002,010}*.patch
 
 	einfo "Unbundling gems..."
 	cd "$S"