| 1 |
commit: 48a6d599a4406835d85b7d13cab3936c870706b9 |
| 2 |
Author: Fabian Groffen <grobian <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Wed Jul 3 06:29:33 2019 +0000 |
| 4 |
Commit: Fabian Groffen <grobian <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Wed Jul 3 06:30:33 2019 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/proj/prefix.git/commit/?id=48a6d599 |
| 7 |
|
| 8 |
dev-lang/ruby: sync |
| 9 |
|
| 10 |
Package-Manager: Portage-2.3.68-prefix, Repoman-2.3.15 |
| 11 |
Signed-off-by: Fabian Groffen <grobian <AT> gentoo.org> |
| 12 |
|
| 13 |
dev-lang/ruby/Manifest | 43 ++- |
| 14 |
dev-lang/ruby/files/2.4/002_windows_crossdev.patch | 64 ++++ |
| 15 |
dev-lang/ruby/files/2.4/005_no-undefined-ext.patch | 11 + |
| 16 |
dev-lang/ruby/files/2.4/009_no-gems.patch | 112 +++++++ |
| 17 |
dev-lang/ruby/files/2.4/010-libressl_2.7.patch | 15 + |
| 18 |
dev-lang/ruby/files/2.4/011-gcc8.patch | 64 ++++ |
| 19 |
dev-lang/ruby/files/2.4/012-openssl_1.1.patch | 339 +++++++++++++++++++++ |
| 20 |
...-ia64-specific-code-to-use-execution-cont.patch | 67 ++++ |
| 21 |
dev-lang/ruby/files/2.5/005_no-undefined-ext.patch | 11 + |
| 22 |
dev-lang/ruby/files/2.5/009_no-gems.patch | 95 ++++++ |
| 23 |
dev-lang/ruby/files/2.5/010-libressl_2.7.patch | 15 + |
| 24 |
dev-lang/ruby/files/2.5/011-no-gems.patch | 85 ++++++ |
| 25 |
dev-lang/ruby/files/2.6/005_no-undefined-ext.patch | 11 + |
| 26 |
dev-lang/ruby/files/2.6/009_no-gems.patch | 39 +++ |
| 27 |
.../ruby/files/2.6/010-default-gem-location.patch | 20 ++ |
| 28 |
dev-lang/ruby/files/ruby-1.9.1-prefix.patch | 8 +- |
| 29 |
dev-lang/ruby/metadata.xml | 32 +- |
| 30 |
.../ruby/{ruby-2.4.2.ebuild => ruby-2.4.6.ebuild} | 44 ++- |
| 31 |
.../ruby/{ruby-2.2.9.ebuild => ruby-2.5.5.ebuild} | 102 +++---- |
| 32 |
.../ruby/{ruby-2.2.8.ebuild => ruby-2.6.3.ebuild} | 128 ++++---- |
| 33 |
20 files changed, 1117 insertions(+), 188 deletions(-) |
| 34 |
|
| 35 |
diff --git a/dev-lang/ruby/Manifest b/dev-lang/ruby/Manifest |
| 36 |
index 0b347ffcad..5ddf617921 100644 |
| 37 |
--- a/dev-lang/ruby/Manifest |
| 38 |
+++ b/dev-lang/ruby/Manifest |
| 39 |
@@ -1,8 +1,39 @@ |
| 40 |
-DIST ruby-2.2.8.tar.xz 10520648 BLAKE2B 96c483786b1a7e0b1483c337a13fe7e07e740bb21b507b518e142dc9ac8cf19ba00c094b4357db4305c645d370d776269145b699ad11429aa56a0de78abfbf83 SHA512 e21004bee537f0c706f4ac9526507b414ddb6a8d721e8fad8d7fe88992a4f048eb5eb79f8d8b8af2a8b331dcfa74b560490218a1acb3532c2cdb4fb4909da3c9 |
| 41 |
-DIST ruby-2.2.9.tar.xz 10511456 BLAKE2B aeb631c47def96e8dd19e4f7281ef95833d9d0cde0912ffccd341032d2be22d6eebf259b0926f248298a5a290fd4d99b7ec38e29b805c9d77d4f3f4481fc0edb SHA512 c4ef84cd00f72f60d6c168f0726d9d7e9573549c2bbae83893e1a9d5e64fc7938f4c9d50a47147b28b37cbf36263f95e10a810c0797bad941775a48d75a8c933 |
| 42 |
-DIST ruby-2.4.2.tar.xz 10046412 BLAKE2B 33af07ee102367fe811dd3248edc72238bddfc3332f64280b6b36497c7de70bce939127c1efcc965072451ddd60ede98c855fc1fd24be9b12eedc58a21faad5a SHA512 c1d42272fb0d94b693452e703b0ea4942bf59cbd4b08ba83bf039f54be97ebc88511632413da0164970b4cf97bc302bccb88aab48edfa8fa147498e7ee741595 |
| 43 |
+AUX 2.4/002_windows_crossdev.patch 2175 BLAKE2B 988871c957bd1b54c0ce46d98f47b67dc9a708a641ed27b8159021384dec8fe72ecfab0c8c081dfab8025c1de7b356771bb45ed6b6911d200e81edc75c095dfd SHA512 5e88b30680f1d1d34e218972180271f57dce4db0299e423ce96901e8eadb9e461e38649adfc10d0361e8715ec94bfc7fe3198a95eca2d817cfccc3a677b60523 |
| 44 |
+AUX 2.4/005_no-undefined-ext.patch 479 BLAKE2B b11ae86049ed792e5f98e6e56d93468b0a3346aa33b8df076f1c50569bebeaa73f8d59452749654c4771fb7677ff4be19d7f566f6b7e548613caba6310f54dcd SHA512 347cbc588ac2551bd0f66cdcfa79d63ed51e0a743aa981420ed5205bda35efae752795b6a527985948b978e755b5c25a29c663cb5651fe58f37c3d9e711be42e |
| 45 |
+AUX 2.4/009_no-gems.patch 4153 BLAKE2B c7d056d46cd769a00c3ae8b3866ad7ca7126fe008362461561693b6da7fb867c5418cc9f5fb11af242842af5edab050b68fafd349b8c6e75af208f6a36850900 SHA512 ec63fa29a6be3b86b4bde397292a2de73accbdab479ae881af9d364d7c8cb1f2a3e85c809735d47375b52923754d4abbd26a63c01616926189fda5e4a5a8a454 |
| 46 |
+AUX 2.4/010-libressl_2.7.patch 638 BLAKE2B ffd6091c3d1d657d44370d4bfd84e8c40fe387483972c09dbcb7819957be78ee320c6f46d2f78493d25357072950db13e08dff6d622d2374a9c330fe97ce200f SHA512 d42f61eda8292ee5d3485ba4576fd6dbd8a3e40918f2096de3b376b92f633b476f6ad4913fb3be3f7ef356e722d8a192317b233d174563cd342a429595b0cdae |
| 47 |
+AUX 2.4/011-gcc8.patch 2470 BLAKE2B d6fe2e34e7c33ca7bccf3b934092ef43b4ba8766d8c160a0548fa4946fc61a763634037c3180479896802e6e75828af043e75839fd03cc9e4b6e126c833d2cb8 SHA512 1636dc821a822ab6ec919e576ebba9e9cba64540801df6a2b4411e650930ec5cdc3ab28aeb3c5d45d3304f73af52372c2dee91833bcd9952692f3167d21007d2 |
| 48 |
+AUX 2.4/012-openssl_1.1.patch 12158 BLAKE2B b7a77180159d6e2620a148b1c8dc2b137dbad0263d4f588c2d533a0ab9775ea0e685770fc708c3d4ae7ac53c16f657b990af39032219807925e46bcf11478d6b SHA512 050eeb45f7bc8a11bcd7fea0dfabb6137a009cc8f8337aa1c62ca4cd476ff0d66723148a20764a72843a5809f3dd66fe7a607a6098e5da990c90a3d2e15a6f54 |
| 49 |
+AUX 2.5/001-ia64-update-ia64-specific-code-to-use-execution-cont.patch 2501 BLAKE2B 7c166f47ce8264354272c7f74ebee5fbe038b1cf06230c6507f62d823be266959b622a0a61920845dfc38fbe7846c4ccd1cabf8e133f456e94b1da5197c49526 SHA512 72319113329c7c3c74e5bab21b67256327a65fbe01827cd32ea289de769a91b493c5d1eb35a087ed026105a9e5daf8b0bc17374c01ef1a83cb408440d6316706 |
| 50 |
+AUX 2.5/005_no-undefined-ext.patch 486 BLAKE2B 715f952cab863847f420afb020cac6819e4ab4e8f5527bdf550dd51eef37e272e7e89cbda5b6f9f137fdac89dfc5e99d42be8ae5712c255f11a0628cf07dc84d SHA512 6bbded9fce0c091b7cfb170c9dc2b0882b0e8bbf8fe31eaf596f3620853c8c75aa64c2648d5a72a0208a6ab6d711eb080a2d6aa98352933eda3b874bdd39cee8 |
| 51 |
+AUX 2.5/009_no-gems.patch 3454 BLAKE2B f2439a799776c39ba16f1503d573c90ea6d74fc2bad3b3874a961add6b605bb064c683080a4258ed1a0e83bca5cb67c02ba68bceb6acea7613ab7166e16a2f4c SHA512 bef8b2763993755b5b6ccba0b5cbe002fd721405d7c274f421ae3d95fa4d0d99cdf946f5fa9a907cac2c3696b2cc23f2f2e030b3a70eca93081e49b02f25a072 |
| 52 |
+AUX 2.5/010-libressl_2.7.patch 638 BLAKE2B 53f5f5d275e2c5482a608a947a1b3c41e9dcdd1763cc57a075e3abd536567852387506ec0ce2f5f49f5eed2246ca9f860d56637a9f18cd17cd49fff6fc92d340 SHA512 986aff99fd35814c94581cdc169cfc5a5f75c87889db5556941809ecaf878b6af838afe2ee108dd7147ea70be6fe9e47f98cce3c1804af0a34f7c1aab8c13d89 |
| 53 |
+AUX 2.5/011-no-gems.patch 3139 BLAKE2B ce05d6ef90001b3011167ba0827ef7852173fa508d6b4cd584f853e90a9d18325e7f2823e306fe7dd139cbdcce2a3c31cc7d2546909798489dec082dcc00d937 SHA512 758cf5ba94ab38753e8489284587254d172c308509d7542ecaca0a368cfd0834561e9d51e814c388f1b607740627ddd9cfc239c02333c24bcf7b7fb890e6909e |
| 54 |
+AUX 2.6/005_no-undefined-ext.patch 486 BLAKE2B 715f952cab863847f420afb020cac6819e4ab4e8f5527bdf550dd51eef37e272e7e89cbda5b6f9f137fdac89dfc5e99d42be8ae5712c255f11a0628cf07dc84d SHA512 6bbded9fce0c091b7cfb170c9dc2b0882b0e8bbf8fe31eaf596f3620853c8c75aa64c2648d5a72a0208a6ab6d711eb080a2d6aa98352933eda3b874bdd39cee8 |
| 55 |
+AUX 2.6/009_no-gems.patch 1261 BLAKE2B 359d0a73c374e5c464eb0343d33272244bb88ba200977007a93f3c3c776779a013174fc2c97717e4ae4a1495011d3baae80e68b07433eab1320955a49aed8b59 SHA512 1607b9c2021e5b5f08cf28c64d3f3ddd077bc47df02a353182a9bc70dc6831ea18e8681d9808bb6841939d64082ae4966081014ee110d2090ec67ffe8faa9b8b |
| 56 |
+AUX 2.6/010-default-gem-location.patch 688 BLAKE2B 4c2074d69b9fe5258a2fe0e38bb501a39f34ad1fa08ef338224edba1f06073138cbe3d831ecdf9910c989a7f0a1c6c6b73ced0d8ff212207a3a3df5f4d90b5de SHA512 65206a6ca42ade0413ae1467f41082f4a93b3166644d2504cff3d280d23da02fd41aea5aca69dd43f6081b436db90a5b1e98725d8fa51519ca302c02ec526ad7 |
| 57 |
+AUX auto_gem.rb 509 BLAKE2B 3aeb669d0dc6c6016091375adf8df8f8a2b810d40e11b3142669098d119369c4294c5d4758d1369fb2479ae3766d8e1421daa0076e2da4f66d00f9e0ed6584c1 SHA512 2b8f4ae00fae383357dd1eb1159ecf1689cb5b79e996688ae091a157b9f27e980761ed8a771d9d3b954d325f817972c4d02f4b5d3c8f4307d2cebce7651af666 |
| 58 |
+AUX ruby-1.8.6-memory-leak.diff 1351 BLAKE2B f727af95129e086aee3d04ff048335fc3abf5d2b0476fff76c6c3507de1551b16e8d11f35809aba1b56143f73346cdf7179df050e0938ac923240fe3072805a2 SHA512 6d489a52166839808eedbe9b78d99930056586793e9adda2a16cc1638a9891632f689735be8dadebdabb7c7d72ffcc655dadb22a603cb16f1f7df16fd0039446 |
| 59 |
+AUX ruby-1.8.6-uclibc-udp.patch 572 BLAKE2B 837f64cee4c4d1e6166052c3df3830b2a4e1b64067449d63cd6169dd791d31a8caaa763d7439b081f3fa26355dc93f1f52c8a68c93fad695422d65792c3928e6 SHA512 165886819eb498c3297f85c81481555bca663635b5b08e5e10098c25cec6168c0d7ce764309d703652e664c79e38c1e53ce09e06e3ac9ceaa2ef8af133fbb5f0 |
| 60 |
+AUX ruby-1.8.6_p36-only-ncurses.patch 427 BLAKE2B 410fc71daf451c5321a71d9ec6bfd19691ec981988d3da66f552acaf82b72c30eabc9ad8cbe39f1cb8a60eee0c2febf13e5653cf8d2e21ae2b969e0f97ca11ee SHA512 e6433764401ba6af82bf5c1085ecc364957d9ef0cb1a9d0fcb5a9599b55b3edc6907248fda9f6ca9fc5c083f04e840edb6f2afd6afc1fc051329c70a629bab2b |
| 61 |
+AUX ruby-1.8.6_p36-prefix.patch 294 BLAKE2B ef4e3605f67df308ab3eadcde75c7aa59b7e18408ac65be86e75a6b82e08f03066c7a00a994dcca18bd76cf4ce9564ce4f0e922a3e101d02160e929d7ba897e6 SHA512 5b8bd5cf40c64aa5823b1842e0940fe17e5f53dfe0b8098119acd0b9604843b456e741146352b8f3c58c4b3d7763da8ef2f589fc44c7a3e217c744f48b3f8676 |
| 62 |
+AUX ruby-1.8.7-darwin9-getsetcontext.patch 1001 BLAKE2B 4394902f7c0a958f2c60cdd2d9f8bd6ad44e3c6f4817cdca66386548c16da5ed55d53ea0a77c224ddb6d8efe5e6b1a2de7a351cb722c1a2cff676b7315f89a74 SHA512 1e419eaf08b0d00a776cde808b993bd74bf35c9469388d7183f138e43365e0bb8f9dd3bf6873608e17fafdf1fd8a8c5adfb149583ef5649db20075a60d90d069 |
| 63 |
+AUX ruby-1.8.7-glibc-2.14-fclose-behaviour.patch 780 BLAKE2B 166d700bb02f900805fc5023850f9476aa5d258fdf2862b9680bc42b357cc8b3d74584747a22bb5ca0a2cdc36214178386511db27d6849a8297aabf3b31c91e4 SHA512 9033e300504cbf6589b6675aadcc82718d45db36451ea1b8a82bc8d6a8d38aec8c34c9155ee6d7084c603dad8b13ed65d450e3b320cfc8fef49050b89fca0615 |
| 64 |
+AUX ruby-1.8.7_p160-solaris.patch 288 BLAKE2B 709c47e538616d4e9a45594d313b111db4b27bd0fa8644678c7667680802b975d13a74523b3b4f497be5a547754bb69c04f7780033e5f73415e48b447314d2fb SHA512 98d6c4320413f1ab834f57fbcb3bdff1d5378c33308ec4f4dfef53ba760068355d2f1bafe605d13b2262e344b5aa1102fbdbbf02c54e94cfd8e037e2a834c765 |
| 65 |
+AUX ruby-1.8.7_p249-pthread-linking.patch 656 BLAKE2B c03a038503f234f2499b61e24a7d4a21697f5ea244a388514dca3b7b4971cbda98da1c47e26efa5b3d74f73f0994aae4af81e3b6091215d8b974286c8df8b592 SHA512 5f5699e7f237bc589e31073afa7308accea043bdf850572a0b0c96220e7c7dc2b4e507de713dd41f0f8c29f9586a81be67be24875456e0cbf29f6df2000b723c |
| 66 |
+AUX ruby-1.8.7_p370-mint-sha2.patch 4505 BLAKE2B 9c4f1aa08f2e4af67b8a75f37fc47128359bb94f7d90dfcfd7fd748750fd39067b3219f473203e84ad4c289f7644d9ccfe9791f700f1819f647e86930838389c SHA512 06aaffadfc84d3b61bd6f778f278d863253168e8087e4e3da30ad54348b36102e57fe0ae5ff3bf1eff01984855e8e994d4eb30b53f9713504558d5bbda29d7a5 |
| 67 |
+AUX ruby-1.8.7_p370-mint.patch 476 BLAKE2B c5ea6c2af8698bc7ecfb23422e906fdebc5652ea08105751ad4ff0f2c61d598da48243343173b1d4fb52044e03befc203b8c9eb50eb40c822fa16b176ae71049 SHA512 057e4481eb5db11420b726d825f56e089c1e8c578f96afb6fce5c0ca10326f7619c582f035cfdfde5dbe81b7ea7a6c6bc99ce5cdea5fbb99bccfcc3c57e6227d |
| 68 |
+AUX ruby-1.9.1-only-ncurses.patch 482 BLAKE2B 79978b43e13df7cd4d663cd502343899ffdb0ecfa9909fe2e350df5103ddc3fe2a946b68e36d66fe5ecb4e43aca1535c7e0d9025fbe15b3bd5702afef4b3afa2 SHA512 d2e84dcf360855b655750138399ebb119953ce12d17b6cbab5029054c8eadc2f16488e7d845b7cb95f211b09b02021f6f6e6bc032bbb120d45aa3006b66d477f |
| 69 |
+AUX ruby-1.9.1-prefix.patch 503 BLAKE2B 329120f3584641d41bc8ab422cb2aafa2515223d3d6fd98398a52db865293c950b39e5804e7f20c5b2fc218a84697de1cbedc7e4ff5ae7e76a1bd7d8dc0e218f SHA512 c61252dae651410a3b627ff3b24633bc6c9926b573fa8afa9f933709ac90366c1bba5b1720d51ba28a1b9e4767a6dca36e9b3d546930714fb6d17d56999cdb91 |
| 70 |
+AUX ruby-mkconfig.patch 407 BLAKE2B b5b3690bbbab5fd32e9e35fb24c73d8d24d64e2cfb6cefaddf6cb496b7cc9a090145f9531060bcf0b6d748f36b4a240522e5fb5de15fdc2ee7a5f858291168fa SHA512 2bd7cc77ca866f1f86221b7e5addb363d0dd7b0ec03d6e7da6286f5ef4311f1b882239cdd6ba7ef0fa82adb0047f1f8aeb0e16e1b6776b49597a0f7b4d2d8cf1 |
| 71 |
+AUX ruby18-mkmf-parallel-install.patch 527 BLAKE2B 2031ead92d5e75954db886af9cc0374f90628a38d5a844f7f456b97a46a97d0b251ea00fbcbd581e1b3ca6c43acf377654f20a79008ea592d40f4bff06060676 SHA512 bd2348b4cf4c4b1d296e5fd72201d6059fce2685428b068d54cef4055ab07f6f4cfc1677fe74eb1f503bd2ed6a4229cee41faa1a2246061fdabd806b3c662ce2 |
| 72 |
DIST ruby-2.4.3.tar.xz 10040072 BLAKE2B 87ad9700312a104a60b079f4ef95804d2a9e01109e9fef6e83e593464f1d2c5077af54cbbaff6e0d25a925d05f513cade6c76f05960d9bcc1817bdee51ad4a0f SHA512 8bcf60c994a96787da5d743c66f5609a5a6d834d6d61243cdea7fd059197c3b10da43c99e5649be85e2f2329eedcbb1dd76e89ce3ac586be9056348f7449ed09 |
| 73 |
-DIST ruby-patches-2.2.8.tar.bz2 5764 BLAKE2B f50729480a4231db51de7981acb04dafa09d5fde592cf4a824a6fefe8ae3189ab9e82857e7ca41f1bb32dff1c4057ac37badf971c1b8f2981189e13d42dd38d2 SHA512 296387ec7f2ff82ad55f147d8f9568de544403d286ad24bb60aca916215d7ff6e1d6aca5a31c00a1999504989cda2bbd3260cae96c18ba73f9ffdcfd6b2695bd |
| 74 |
-DIST ruby-patches-2.2.9.tar.bz2 5764 BLAKE2B f50729480a4231db51de7981acb04dafa09d5fde592cf4a824a6fefe8ae3189ab9e82857e7ca41f1bb32dff1c4057ac37badf971c1b8f2981189e13d42dd38d2 SHA512 296387ec7f2ff82ad55f147d8f9568de544403d286ad24bb60aca916215d7ff6e1d6aca5a31c00a1999504989cda2bbd3260cae96c18ba73f9ffdcfd6b2695bd |
| 75 |
-DIST ruby-patches-2.4.2.tar.bz2 3443 BLAKE2B d90cfb496ad8701fccb061fd314a7f2394b251c921f270f17c8335f617e71dacc8e4a2df4e76842b67eb34627e5f5291d8a2723f6dfed53a36ace3abad95a179 SHA512 fb8349c67c72caf10ec12c4b5410194b4df24345446c2e3b6c6176d00727bfe803f4a905ef094a2d52315b6f4c3ce74fb8fbaa2fdf5efe46e6ccb24bf8418b17 |
| 76 |
+DIST ruby-2.4.6.tar.xz 10005544 BLAKE2B 2af984d96dad4d7ef4d467b317bd4bb54b0614d96619377bc46f7588cd1c72bee47202b61d6ec54f00113fd25672d2831221dbf0a4491aa271541a34c634ee84 SHA512 eafb2257747f99e2ed262af142e71175b70f7cceaa4d1253b92c8337f075a9a58a2d93b029d75e11a9b124f112a8f0983273b2b30afc147b5cf71a8dbb5fa0ba |
| 77 |
+DIST ruby-2.5.5.tar.xz 11459832 BLAKE2B ced1105a87e7df8f82a65ca8d1d329d5a9d110d2f3f88b27a79262c4ac1484dda16d8646c0c03f18c1bb25f8b154075eb03a0614355ec62f677c2fa56ab3c956 SHA512 06b1d58536ebfacb7b56c1e6ed4b8ab816fadc4f48c845a452554cd262e7908199a30e5793f3cbaec2db56a8803aa5c6089abf7bf06c8fc47867e97870b7dfec |
| 78 |
+DIST ruby-2.6.3.tar.xz 11904360 BLAKE2B 8113e5a19b967cdf995a3c8d3c83aeab3bf89e975d3b039c64259e97f20dbe9ebd96ada093f9d330516d16ef78bb0ecbbac8f3facd467aa13f1f70b23b992f82 SHA512 959a613f5cf5b3185a1d7a7ba0e1921166b3930f30461b391b1c9fcfe396f56dc3c736123dfc7b4e72c32a97dc5a1eb1fd7f09bcc3793a3c5526f6644ba421c8 |
| 79 |
DIST ruby-patches-2.4.3.tar.bz2 2898 BLAKE2B e46502dbb0aa25c3d71693a6c04b433bd4de60f194cdd283517c4b08da190356885d9bca4a6765402088185fa8ec681156e8e8eecf0703a2c1ea7bb81adc0bf9 SHA512 d767d43c7df737469247e42e1c4205b8c6850c8f335a2869c884f145c037e9bab10492cc7cd2903f5c33e232cdc5bbdabb3e8da837c7bf420b9d58d1d33149ed |
| 80 |
+EBUILD ruby-2.4.3.ebuild 7479 BLAKE2B f8b71cd35704a1aa16f3ad77b339701c1c652cc319915730abcef549e2198729002d3b860dc985f5078218db47960035ab5c9513acef968315652360cb5d293a SHA512 e136f3bf5523e6d38661e4de1cccb7049ade1f39af31e1b81aa98cc8fcf43658e6562f3884df7d42e68a067aa479f8e3e090971739a9eb681023c6eae1de2b92 |
| 81 |
+EBUILD ruby-2.4.6.ebuild 7269 BLAKE2B adf02c33d187b0e177280f9a8b4646e63a062e376301b3ebb8b76c0bae3732e27769e72e95cf8a36c1c10a0cfee76ad0dca2c414f6532c2c06d30134058084fc SHA512 ca8393b1ea82b5d0e3073874d7262587aa1160b8047d66d4ee096523ed56dd828d8373311ea49d314c6b014e3632f06290848522f0fb17a80dad016c8893668e |
| 82 |
+EBUILD ruby-2.5.5.ebuild 6894 BLAKE2B 87cebbf6aac94ccaf0312acc68c38ec8720aaea9945a89a828ec87c710653a4ec05a3a9da264a8aa3b7caad1a7fbe2ae06fb56b6750c0a2e7a3143f820a91d36 SHA512 5e1ff27f26e855118a25a5e97204c44c00a0e9cda2842037582ff300681fca89d5f93f9b31cf1e5e5f66bd5e3634841184531cf1c777fb66ff78cc67dab97461 |
| 83 |
+EBUILD ruby-2.6.3.ebuild 7343 BLAKE2B fa225eb6863f2d4afd7f63f7a7a3501ef56c6ea7518c33bc7b41020f6f67cb7b27516b07602fbb137816d348c66cd28c3941b624db647191e650938c8152b98b SHA512 0bfa1887e6073f0d47dc94e24b42b6b08cebb0b83ea70729d0582997159bed5bd46b1e256b792ab7201311bca2f51ea31c081dd63fb89563dfc06c0dd4fd16e3 |
| 84 |
+MISC metadata.xml 445 BLAKE2B c3b5fae44894da3c78d024a376522aa2ef486cd9435351ddd7fa8b7c9afdc36969251a3b043d5890a368616f0736ae80e2a65a7342b327f30eb3497c5c02d28a SHA512 3818ac938dd6f8a05e18662f83af542fb29af00a476362592afa86bc537a74ddd0abe275784340539b2cd38f97ad1fce8b8c427c65d61c05a90b2118f2d16a91 |
| 85 |
|
| 86 |
diff --git a/dev-lang/ruby/files/2.4/002_windows_crossdev.patch b/dev-lang/ruby/files/2.4/002_windows_crossdev.patch |
| 87 |
new file mode 100644 |
| 88 |
index 0000000000..7e290d434f |
| 89 |
--- /dev/null |
| 90 |
+++ b/dev-lang/ruby/files/2.4/002_windows_crossdev.patch |
| 91 |
@@ -0,0 +1,64 @@ |
| 92 |
+Bug: https://bugs.gentoo.org/show_bug.cgi?id=618878 |
| 93 |
+ |
| 94 |
+A few patches to make crossdev for mingw-w64 play nice with ruby's ebuilds. |
| 95 |
+Basic gist is that without the following patch to configure.in ruby-2.4.1 |
| 96 |
+hardcodes 240 into the shared, static, and import library names, which when |
| 97 |
+built with the current ruby ebuilds results in names like libx64-msvcrt-ruby24240.dll and so on. The patch is in ruby-trunk[1], but may take a while |
| 98 |
+to hit the tarballs that gentoo uses. |
| 99 |
+ |
| 100 |
+Index: configure.in |
| 101 |
+=================================================================== |
| 102 |
+--- a/configure.in (revision 57824) |
| 103 |
++++ b/configure.in (revision 57825) |
| 104 |
+@@ -3825,7 +3825,23 @@ |
| 105 |
+ |
| 106 |
+ AC_ARG_WITH(soname, |
| 107 |
+ AS_HELP_STRING([--with-soname=SONAME], [base name of shared library]), |
| 108 |
+- [RUBY_SO_NAME=$withval], [RUBY_SO_NAME='$(RUBY_BASE_NAME)']) |
| 109 |
++ [RUBY_SO_NAME=$withval], |
| 110 |
++ [ |
| 111 |
++ AS_CASE(["$target_os"], |
| 112 |
++ [darwin*], [ |
| 113 |
++ RUBY_SO_NAME='$(RUBY_BASE_NAME).$(RUBY_PROGRAM_VERSION)' |
| 114 |
++ ], |
| 115 |
++ [cygwin*], [ |
| 116 |
++ RUBY_SO_NAME='$(RUBY_BASE_NAME)$(MAJOR)$(MINOR)0' |
| 117 |
++ ], |
| 118 |
++ [mingw*], [ |
| 119 |
++ RUBY_SO_NAME="${rb_cv_msvcrt}"'-$(RUBY_BASE_NAME)$(MAJOR)$(MINOR)0' |
| 120 |
++ AS_IF([test x"${target_cpu}" != xi386], [ |
| 121 |
++ RUBY_SO_NAME="${target_cpu}-${RUBY_SO_NAME}" |
| 122 |
++ ]) |
| 123 |
++ ], |
| 124 |
++ [RUBY_SO_NAME='$(RUBY_BASE_NAME)']) |
| 125 |
++ ]) |
| 126 |
+ |
| 127 |
+ LIBRUBY_LDSHARED=$LDSHARED |
| 128 |
+ LIBRUBY_DLDFLAGS=$DLDFLAGS |
| 129 |
+@@ -3925,7 +3941,6 @@ |
| 130 |
+ SOLIBS='-lm -lc' |
| 131 |
+ ], |
| 132 |
+ [darwin*], [ |
| 133 |
+- RUBY_SO_NAME="$RUBY_SO_NAME"'.$(RUBY_PROGRAM_VERSION)' |
| 134 |
+ LIBRUBY_LDSHARED='$(CC) -dynamiclib' |
| 135 |
+ if test "$load_relative" = yes; then |
| 136 |
+ libprefix="@executable_path/../${libdir_basename}" |
| 137 |
+@@ -4157,7 +4172,6 @@ |
| 138 |
+ fi |
| 139 |
+ ], |
| 140 |
+ [cygwin*|mingw*], [ |
| 141 |
+- RUBY_SO_NAME="${RUBY_SO_NAME}"'$(MAJOR)$(MINOR)0' |
| 142 |
+ LIBRUBY_DLDFLAGS="${DLDFLAGS}"' -Wl,--out-implib=$(LIBRUBY)' |
| 143 |
+ AS_CASE(["$target_os"], |
| 144 |
+ [cygwin*], [ |
| 145 |
+@@ -4167,10 +4181,6 @@ |
| 146 |
+ fi |
| 147 |
+ ], |
| 148 |
+ [mingw*], [ |
| 149 |
+- RUBY_SO_NAME="${rb_cv_msvcrt}-${RUBY_SO_NAME}" |
| 150 |
+- if test x"${target_cpu}" != xi386; then |
| 151 |
+- RUBY_SO_NAME="${target_cpu}-${RUBY_SO_NAME}" |
| 152 |
+- fi |
| 153 |
+ if test x"$enable_shared" = xyes; then |
| 154 |
+ LIBRUBY_SO='$(RUBY_SO_NAME)'.dll |
| 155 |
+ LIBRUBY_DLDFLAGS="${LIBRUBY_DLDFLAGS}"' $(RUBYDEF)' |
| 156 |
|
| 157 |
diff --git a/dev-lang/ruby/files/2.4/005_no-undefined-ext.patch b/dev-lang/ruby/files/2.4/005_no-undefined-ext.patch |
| 158 |
new file mode 100644 |
| 159 |
index 0000000000..f279932401 |
| 160 |
--- /dev/null |
| 161 |
+++ b/dev-lang/ruby/files/2.4/005_no-undefined-ext.patch |
| 162 |
@@ -0,0 +1,11 @@ |
| 163 |
+--- ruby-1.9.3-preview1.orig/configure.in |
| 164 |
++++ ruby-1.9.3-preview1/configure.in |
| 165 |
+@@ -2038,7 +2038,7 @@ if test "$with_dln_a_out" != yes; then |
| 166 |
+ [linux* | gnu* | k*bsd*-gnu | netbsd* | bsdi* | kopensolaris*-gnu], [ |
| 167 |
+ : ${LDSHARED='$(CC) -shared'} |
| 168 |
+ if test "$rb_cv_binary_elf" = yes; then |
| 169 |
+- LDFLAGS="$LDFLAGS -Wl,-export-dynamic" |
| 170 |
++ LDFLAGS="$LDFLAGS -Wl,-export-dynamic -Wl,--no-undefined" |
| 171 |
+ fi |
| 172 |
+ rb_cv_dlopen=yes], |
| 173 |
+ [interix*], [ : ${LDSHARED='$(CC) -shared'} |
| 174 |
|
| 175 |
diff --git a/dev-lang/ruby/files/2.4/009_no-gems.patch b/dev-lang/ruby/files/2.4/009_no-gems.patch |
| 176 |
new file mode 100644 |
| 177 |
index 0000000000..6e4e2643d4 |
| 178 |
--- /dev/null |
| 179 |
+++ b/dev-lang/ruby/files/2.4/009_no-gems.patch |
| 180 |
@@ -0,0 +1,112 @@ |
| 181 |
+--- a/tool/rbinstall.rb.~1~ 2016-10-17 09:17:07.000000000 +0200 |
| 182 |
++++ b/tool/rbinstall.rb 2016-12-25 08:20:07.873491045 +0100 |
| 183 |
+@@ -695,107 +695,11 @@ |
| 184 |
+ # :startdoc: |
| 185 |
+ |
| 186 |
+ install?(:ext, :comm, :gem) do |
| 187 |
+- gem_dir = Gem.default_dir |
| 188 |
+- directories = Gem.ensure_gem_subdirectories(gem_dir, :mode => $dir_mode) |
| 189 |
+- prepare "default gems", gem_dir, directories |
| 190 |
+- |
| 191 |
+- spec_dir = File.join(gem_dir, directories.grep(/^spec/)[0]) |
| 192 |
+- default_spec_dir = "#{spec_dir}/default" |
| 193 |
+- makedirs(default_spec_dir) |
| 194 |
+- |
| 195 |
+- gems = Dir.glob(srcdir+"/{lib,ext}/**/*.gemspec").map {|src| |
| 196 |
+- spec = Gem::Specification.load(src) || raise("invalid spec in #{src}") |
| 197 |
+- file_collector = RbInstall::Specs::FileCollector.new(File.dirname(src)) |
| 198 |
+- files = file_collector.collect |
| 199 |
+- next if files.empty? |
| 200 |
+- spec.files = files |
| 201 |
+- spec |
| 202 |
+- } |
| 203 |
+- gems.compact.sort_by(&:name).each do |gemspec| |
| 204 |
+- full_name = "#{gemspec.name}-#{gemspec.version}" |
| 205 |
+- |
| 206 |
+- puts "#{" "*30}#{gemspec.name} #{gemspec.version}" |
| 207 |
+- gemspec_path = File.join(default_spec_dir, "#{full_name}.gemspec") |
| 208 |
+- open_for_install(gemspec_path, $data_mode) do |
| 209 |
+- gemspec.to_ruby |
| 210 |
+- end |
| 211 |
+- |
| 212 |
+- unless gemspec.executables.empty? then |
| 213 |
+- bin_dir = File.join(gem_dir, 'gems', full_name, gemspec.bindir) |
| 214 |
+- makedirs(bin_dir) |
| 215 |
+- |
| 216 |
+- execs = gemspec.executables.map {|exec| File.join(srcdir, 'bin', exec)} |
| 217 |
+- install(execs, bin_dir, :mode => $script_mode) |
| 218 |
+- end |
| 219 |
+- end |
| 220 |
++ # gems are unbundled in Gentoo |
| 221 |
+ end |
| 222 |
+ |
| 223 |
+ install?(:ext, :comm, :gem) do |
| 224 |
+- gem_dir = Gem.default_dir |
| 225 |
+- directories = Gem.ensure_gem_subdirectories(gem_dir, :mode => $dir_mode) |
| 226 |
+- prepare "bundle gems", gem_dir, directories |
| 227 |
+- install_dir = with_destdir(gem_dir) |
| 228 |
+- installed_gems = {} |
| 229 |
+- options = { |
| 230 |
+- :install_dir => install_dir, |
| 231 |
+- :bin_dir => with_destdir(bindir), |
| 232 |
+- :domain => :local, |
| 233 |
+- :ignore_dependencies => true, |
| 234 |
+- :dir_mode => $dir_mode, |
| 235 |
+- :data_mode => $data_mode, |
| 236 |
+- :prog_mode => $prog_mode, |
| 237 |
+- :wrappers => true, |
| 238 |
+- :format_executable => true, |
| 239 |
+- } |
| 240 |
+- gem_ext_dir = "#$extout/gems/#{CONFIG['arch']}" |
| 241 |
+- extensions_dir = Gem::StubSpecification.gemspec_stub("", gem_dir, gem_dir).extensions_dir |
| 242 |
+- Gem::Specification.each_gemspec([srcdir+'/gems/*']) do |path| |
| 243 |
+- dir = File.dirname(path) |
| 244 |
+- spec = Dir.chdir(dir) { |
| 245 |
+- Gem::Specification.load(File.basename(path)) |
| 246 |
+- } |
| 247 |
+- next unless spec.platform == Gem::Platform::RUBY |
| 248 |
+- next unless spec.full_name == path[srcdir.size..-1][/\A\/gems\/([^\/]+)/, 1] |
| 249 |
+- spec.extension_dir = "#{extensions_dir}/#{spec.full_name}" |
| 250 |
+- if File.directory?(ext = "#{gem_ext_dir}/#{spec.full_name}") |
| 251 |
+- spec.extensions[0] ||= "-" |
| 252 |
+- end |
| 253 |
+- ins = RbInstall::UnpackedInstaller.new(spec, options) |
| 254 |
+- puts "#{" "*30}#{spec.name} #{spec.version}" |
| 255 |
+- ins.install |
| 256 |
+- File.chmod($data_mode, File.join(install_dir, "specifications", "#{spec.full_name}.gemspec")) |
| 257 |
+- unless spec.extensions.empty? |
| 258 |
+- install_recursive(ext, spec.extension_dir) |
| 259 |
+- end |
| 260 |
+- installed_gems[spec.full_name] = true |
| 261 |
+- end |
| 262 |
+- installed_gems, gems = Dir.glob(srcdir+'/gems/*.gem').partition {|gem| installed_gems.key?(File.basename(gem, '.gem'))} |
| 263 |
+- unless installed_gems.empty? |
| 264 |
+- install installed_gems, gem_dir+"/cache" |
| 265 |
+- end |
| 266 |
+- next if gems.empty? |
| 267 |
+- if defined?(Zlib) |
| 268 |
+- Gem.instance_variable_set(:@ruby, with_destdir(File.join(bindir, ruby_install_name))) |
| 269 |
+- silent = Gem::SilentUI.new |
| 270 |
+- gems.each do |gem| |
| 271 |
+- inst = Gem::Installer.new(gem, options) |
| 272 |
+- inst.spec.extension_dir = with_destdir(inst.spec.extension_dir) |
| 273 |
+- begin |
| 274 |
+- Gem::DefaultUserInteraction.use_ui(silent) {inst.install} |
| 275 |
+- rescue Gem::InstallError => e |
| 276 |
+- next |
| 277 |
+- end |
| 278 |
+- gemname = File.basename(gem) |
| 279 |
+- puts "#{" "*30}#{gemname}" |
| 280 |
+- end |
| 281 |
+- # fix directory permissions |
| 282 |
+- # TODO: Gem.install should accept :dir_mode option or something |
| 283 |
+- File.chmod($dir_mode, *Dir.glob(install_dir+"/**/")) |
| 284 |
+- # fix .gemspec permissions |
| 285 |
+- File.chmod($data_mode, *Dir.glob(install_dir+"/specifications/*.gemspec")) |
| 286 |
+- else |
| 287 |
+- puts "skip installing bundle gems because of lacking zlib" |
| 288 |
+- end |
| 289 |
++ # gems are unbundled in Gentoo |
| 290 |
+ end |
| 291 |
+ |
| 292 |
+ parse_args() |
| 293 |
|
| 294 |
diff --git a/dev-lang/ruby/files/2.4/010-libressl_2.7.patch b/dev-lang/ruby/files/2.4/010-libressl_2.7.patch |
| 295 |
new file mode 100644 |
| 296 |
index 0000000000..2e25ab0958 |
| 297 |
--- /dev/null |
| 298 |
+++ b/dev-lang/ruby/files/2.4/010-libressl_2.7.patch |
| 299 |
@@ -0,0 +1,15 @@ |
| 300 |
+--- a/ext/openssl/extconf.rb.orig 2017-09-08 14:38:12 UTC |
| 301 |
++++ b/ext/openssl/extconf.rb |
| 302 |
+@@ -157,8 +157,11 @@ OpenSSL.check_func_or_macro("SSL_get_ser |
| 303 |
+ have_func("SSL_is_server") |
| 304 |
+ |
| 305 |
+ # added in 1.1.0 |
| 306 |
++if !have_struct_member("SSL", "ctx", "openssl/ssl.h") || |
| 307 |
++ try_static_assert("LIBRESSL_VERSION_NUMBER >= 0x2070000fL", "openssl/opensslv.h") |
| 308 |
++ $defs.push("-DHAVE_OPAQUE_OPENSSL") |
| 309 |
++end |
| 310 |
+ have_func("CRYPTO_lock") || $defs.push("-DHAVE_OPENSSL_110_THREADING_API") |
| 311 |
+-have_struct_member("SSL", "ctx", "openssl/ssl.h") || $defs.push("-DHAVE_OPAQUE_OPENSSL") |
| 312 |
+ have_func("BN_GENCB_new") |
| 313 |
+ have_func("BN_GENCB_free") |
| 314 |
+ have_func("BN_GENCB_get_arg") |
| 315 |
|
| 316 |
diff --git a/dev-lang/ruby/files/2.4/011-gcc8.patch b/dev-lang/ruby/files/2.4/011-gcc8.patch |
| 317 |
new file mode 100644 |
| 318 |
index 0000000000..cb2443631d |
| 319 |
--- /dev/null |
| 320 |
+++ b/dev-lang/ruby/files/2.4/011-gcc8.patch |
| 321 |
@@ -0,0 +1,64 @@ |
| 322 |
+From 027b576b31cd12bad575b3a39476726273f58c41 Mon Sep 17 00:00:00 2001 |
| 323 |
+From: naruse <naruse@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> |
| 324 |
+Date: Mon, 18 Dec 2017 09:03:59 +0000 |
| 325 |
+Subject: [PATCH] suppress warning: 'const' attribute on function returning |
| 326 |
+ 'void' |
| 327 |
+ |
| 328 |
+git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@61323 b2dd03c8-39d4-4d8f-98ff-823fe69b080e |
| 329 |
+--- |
| 330 |
+ include/ruby/intern.h | 4 ++-- |
| 331 |
+ include/ruby/ruby.h | 2 +- |
| 332 |
+ internal.h | 4 ++-- |
| 333 |
+ 3 files changed, 5 insertions(+), 5 deletions(-) |
| 334 |
+ |
| 335 |
+diff --git a/include/ruby/intern.h b/include/ruby/intern.h |
| 336 |
+index 5684b3230a67..a711b861159f 100644 |
| 337 |
+--- a/include/ruby/intern.h |
| 338 |
++++ b/include/ruby/intern.h |
| 339 |
+@@ -249,9 +249,9 @@ PRINTF_ARGS(NORETURN(void rb_name_error_str(VALUE, const char*, ...)), 2, 3); |
| 340 |
+ NORETURN(void rb_invalid_str(const char*, const char*)); |
| 341 |
+ NORETURN(void rb_error_frozen(const char*)); |
| 342 |
+ NORETURN(void rb_error_frozen_object(VALUE)); |
| 343 |
+-CONSTFUNC(void rb_error_untrusted(VALUE)); |
| 344 |
++void rb_error_untrusted(VALUE); |
| 345 |
+ void rb_check_frozen(VALUE); |
| 346 |
+-CONSTFUNC(void rb_check_trusted(VALUE)); |
| 347 |
++void rb_check_trusted(VALUE); |
| 348 |
+ #define rb_check_frozen_internal(obj) do { \ |
| 349 |
+ VALUE frozen_obj = (obj); \ |
| 350 |
+ if (OBJ_FROZEN(frozen_obj)) { \ |
| 351 |
+diff --git a/include/ruby/ruby.h b/include/ruby/ruby.h |
| 352 |
+index 9c7d2fb68439..3210103c648a 100644 |
| 353 |
+--- a/include/ruby/ruby.h |
| 354 |
++++ b/include/ruby/ruby.h |
| 355 |
+@@ -628,7 +628,7 @@ int ruby_safe_level_2_warning(void) __attribute__((const,warning("$SAFE=2 to 4 a |
| 356 |
+ # define rb_set_safe_level(level) rb_set_safe_level(RUBY_SAFE_LEVEL_CHECK(level, error)) |
| 357 |
+ #endif |
| 358 |
+ void rb_set_safe_level_force(int); |
| 359 |
+-CONSTFUNC(void rb_secure_update(VALUE)); |
| 360 |
++void rb_secure_update(VALUE); |
| 361 |
+ NORETURN(void rb_insecure_operation(void)); |
| 362 |
+ |
| 363 |
+ VALUE rb_errinfo(void); |
| 364 |
+diff --git a/internal.h b/internal.h |
| 365 |
+index d0257a8d8ba0..4ccf3218c6ca 100644 |
| 366 |
+--- a/internal.h |
| 367 |
++++ b/internal.h |
| 368 |
+@@ -1110,7 +1110,7 @@ VALUE rb_invcmp(VALUE, VALUE); |
| 369 |
+ struct rb_block; |
| 370 |
+ int rb_dvar_defined(ID, const struct rb_block *); |
| 371 |
+ int rb_local_defined(ID, const struct rb_block *); |
| 372 |
+-CONSTFUNC(const char * rb_insns_name(int i)); |
| 373 |
++const char * rb_insns_name(int i); |
| 374 |
+ VALUE rb_insns_name_array(void); |
| 375 |
+ |
| 376 |
+ /* complex.c */ |
| 377 |
+@@ -1136,7 +1136,7 @@ void Init_ext(void); |
| 378 |
+ |
| 379 |
+ /* encoding.c */ |
| 380 |
+ ID rb_id_encoding(void); |
| 381 |
+-CONSTFUNC(void rb_gc_mark_encodings(void)); |
| 382 |
++void rb_gc_mark_encodings(void); |
| 383 |
+ rb_encoding *rb_enc_get_from_index(int index); |
| 384 |
+ rb_encoding *rb_enc_check_str(VALUE str1, VALUE str2); |
| 385 |
+ int rb_encdb_replicate(const char *alias, const char *orig); |
| 386 |
|
| 387 |
diff --git a/dev-lang/ruby/files/2.4/012-openssl_1.1.patch b/dev-lang/ruby/files/2.4/012-openssl_1.1.patch |
| 388 |
new file mode 100644 |
| 389 |
index 0000000000..edf344bedc |
| 390 |
--- /dev/null |
| 391 |
+++ b/dev-lang/ruby/files/2.4/012-openssl_1.1.patch |
| 392 |
@@ -0,0 +1,339 @@ |
| 393 |
+From 7af808153dd34a980e027a04d4490ae38019b3ed Mon Sep 17 00:00:00 2001 |
| 394 |
+From: Mark Wright <gienah@g.o> |
| 395 |
+Date: Sun, 15 Oct 2017 01:24:12 +1100 |
| 396 |
+Subject: [PATCH] Fix build failure against OpenSSL 1.1 built with |
| 397 |
+ no-deprecated Thanks rhenium for the code review and fixes. |
| 398 |
+ |
| 399 |
+--- |
| 400 |
+ ext/openssl/openssl_missing.h | 4 +++ |
| 401 |
+ ext/openssl/ossl.c | 23 ++++++--------- |
| 402 |
+ ext/openssl/ossl.h | 5 ++++ |
| 403 |
+ ext/openssl/ossl_cipher.c | 14 ++++----- |
| 404 |
+ ext/openssl/ossl_engine.c | 54 ++++++++++++++++++++++------------- |
| 405 |
+ ext/openssl/ossl_ssl.c | 2 +- |
| 406 |
+ ext/openssl/ossl_x509cert.c | 4 +-- |
| 407 |
+ ext/openssl/ossl_x509crl.c | 4 +-- |
| 408 |
+ 8 files changed, 63 insertions(+), 47 deletions(-) |
| 409 |
+ |
| 410 |
+diff --git a/ext/openssl/openssl_missing.h b/ext/openssl/openssl_missing.h |
| 411 |
+index cc31f6ac..debd25ad 100644 |
| 412 |
+--- a/ext/openssl/openssl_missing.h |
| 413 |
++++ b/ext/openssl/openssl_missing.h |
| 414 |
+@@ -209,6 +209,10 @@ IMPL_PKEY_GETTER(EC_KEY, ec) |
| 415 |
+ # define X509_get0_notAfter(x) X509_get_notAfter(x) |
| 416 |
+ # define X509_CRL_get0_lastUpdate(x) X509_CRL_get_lastUpdate(x) |
| 417 |
+ # define X509_CRL_get0_nextUpdate(x) X509_CRL_get_nextUpdate(x) |
| 418 |
++# define X509_set1_notBefore(x, t) X509_set_notBefore(x, t) |
| 419 |
++# define X509_set1_notAfter(x, t) X509_set_notAfter(x, t) |
| 420 |
++# define X509_CRL_set1_lastUpdate(x, t) X509_CRL_set_lastUpdate(x, t) |
| 421 |
++# define X509_CRL_set1_nextUpdate(x, t) X509_CRL_set_nextUpdate(x, t) |
| 422 |
+ #endif |
| 423 |
+ |
| 424 |
+ #if !defined(HAVE_SSL_SESSION_GET_PROTOCOL_VERSION) |
| 425 |
+diff --git a/ext/openssl/ossl.c b/ext/openssl/ossl.c |
| 426 |
+index 93ecc7d4..245385e7 100644 |
| 427 |
+--- a/ext/openssl/ossl.c |
| 428 |
++++ b/ext/openssl/ossl.c |
| 429 |
+@@ -1109,25 +1109,14 @@ Init_openssl(void) |
| 430 |
+ /* |
| 431 |
+ * Init all digests, ciphers |
| 432 |
+ */ |
| 433 |
+- /* CRYPTO_malloc_init(); */ |
| 434 |
+- /* ENGINE_load_builtin_engines(); */ |
| 435 |
++#if !defined(LIBRESSL_VERSION_NUMBER) && OPENSSL_VERSION_NUMBER >= 0x10100000 |
| 436 |
++ if (!OPENSSL_init_ssl(0, NULL)) |
| 437 |
++ rb_raise(rb_eRuntimeError, "OPENSSL_init_ssl"); |
| 438 |
++#else |
| 439 |
+ OpenSSL_add_ssl_algorithms(); |
| 440 |
+ OpenSSL_add_all_algorithms(); |
| 441 |
+ ERR_load_crypto_strings(); |
| 442 |
+ SSL_load_error_strings(); |
| 443 |
+- |
| 444 |
+- /* |
| 445 |
+- * FIXME: |
| 446 |
+- * On unload do: |
| 447 |
+- */ |
| 448 |
+-#if 0 |
| 449 |
+- CONF_modules_unload(1); |
| 450 |
+- destroy_ui_method(); |
| 451 |
+- EVP_cleanup(); |
| 452 |
+- ENGINE_cleanup(); |
| 453 |
+- CRYPTO_cleanup_all_ex_data(); |
| 454 |
+- ERR_remove_state(0); |
| 455 |
+- ERR_free_strings(); |
| 456 |
+ #endif |
| 457 |
+ |
| 458 |
+ /* |
| 459 |
+@@ -1149,7 +1138,11 @@ Init_openssl(void) |
| 460 |
+ /* |
| 461 |
+ * Version of OpenSSL the ruby OpenSSL extension is running with |
| 462 |
+ */ |
| 463 |
++#if !defined(LIBRESSL_VERSION_NUMBER) && OPENSSL_VERSION_NUMBER >= 0x10100000 |
| 464 |
++ rb_define_const(mOSSL, "OPENSSL_LIBRARY_VERSION", rb_str_new2(OpenSSL_version(OPENSSL_VERSION))); |
| 465 |
++#else |
| 466 |
+ rb_define_const(mOSSL, "OPENSSL_LIBRARY_VERSION", rb_str_new2(SSLeay_version(SSLEAY_VERSION))); |
| 467 |
++#endif |
| 468 |
+ |
| 469 |
+ /* |
| 470 |
+ * Version number of OpenSSL the ruby OpenSSL extension was built with |
| 471 |
+diff --git a/ext/openssl/ossl.h b/ext/openssl/ossl.h |
| 472 |
+index f08889b2..5a15839c 100644 |
| 473 |
+--- a/ext/openssl/ossl.h |
| 474 |
++++ b/ext/openssl/ossl.h |
| 475 |
+@@ -35,6 +35,11 @@ |
| 476 |
+ #if !defined(OPENSSL_NO_OCSP) |
| 477 |
+ # include <openssl/ocsp.h> |
| 478 |
+ #endif |
| 479 |
++#include <openssl/bn.h> |
| 480 |
++#include <openssl/rsa.h> |
| 481 |
++#include <openssl/dsa.h> |
| 482 |
++#include <openssl/evp.h> |
| 483 |
++#include <openssl/dh.h> |
| 484 |
+ |
| 485 |
+ /* |
| 486 |
+ * Common Module |
| 487 |
+diff --git a/ext/openssl/ossl_cipher.c b/ext/openssl/ossl_cipher.c |
| 488 |
+index bfa76c1a..e6179733 100644 |
| 489 |
+--- a/ext/openssl/ossl_cipher.c |
| 490 |
++++ b/ext/openssl/ossl_cipher.c |
| 491 |
+@@ -508,9 +508,9 @@ ossl_cipher_set_iv(VALUE self, VALUE iv) |
| 492 |
+ StringValue(iv); |
| 493 |
+ GetCipher(self, ctx); |
| 494 |
+ |
| 495 |
+ #if defined(HAVE_AUTHENTICATED_ENCRYPTION) |
| 496 |
+- if (EVP_CIPHER_CTX_flags(ctx) & EVP_CIPH_FLAG_AEAD_CIPHER) |
| 497 |
++ if (EVP_CIPHER_flags(EVP_CIPHER_CTX_cipher(ctx)) & EVP_CIPH_FLAG_AEAD_CIPHER) |
| 498 |
+ iv_len = (int)(VALUE)EVP_CIPHER_CTX_get_app_data(ctx); |
| 499 |
+ #endif |
| 500 |
+ if (!iv_len) |
| 501 |
+ iv_len = EVP_CIPHER_CTX_iv_length(ctx); |
| 502 |
+@@ -535,7 +535,7 @@ ossl_cipher_is_authenticated(VALUE self) |
| 503 |
+ |
| 504 |
+ GetCipher(self, ctx); |
| 505 |
+ |
| 506 |
+ #if defined(HAVE_AUTHENTICATED_ENCRYPTION) |
| 507 |
+- return (EVP_CIPHER_CTX_flags(ctx) & EVP_CIPH_FLAG_AEAD_CIPHER) ? Qtrue : Qfalse; |
| 508 |
++ return (EVP_CIPHER_flags(EVP_CIPHER_CTX_cipher(ctx)) & EVP_CIPH_FLAG_AEAD_CIPHER) ? Qtrue : Qfalse; |
| 509 |
+ #else |
| 510 |
+ return Qfalse; |
| 511 |
+ #endif |
| 512 |
+@@ -606,7 +606,7 @@ ossl_cipher_get_auth_tag(int argc, VALUE *argv, VALUE self) |
| 513 |
+ |
| 514 |
+ GetCipher(self, ctx); |
| 515 |
+ |
| 516 |
+- if (!(EVP_CIPHER_CTX_flags(ctx) & EVP_CIPH_FLAG_AEAD_CIPHER)) |
| 517 |
++ if (!(EVP_CIPHER_flags(EVP_CIPHER_CTX_cipher(ctx)) & EVP_CIPH_FLAG_AEAD_CIPHER)) |
| 518 |
+ ossl_raise(eCipherError, "authentication tag not supported by this cipher"); |
| 519 |
+ |
| 520 |
+ ret = rb_str_new(NULL, tag_len); |
| 521 |
+@@ -641,7 +641,7 @@ ossl_cipher_set_auth_tag(VALUE self, VALUE vtag) |
| 522 |
+ tag_len = RSTRING_LENINT(vtag); |
| 523 |
+ |
| 524 |
+ GetCipher(self, ctx); |
| 525 |
+- if (!(EVP_CIPHER_CTX_flags(ctx) & EVP_CIPH_FLAG_AEAD_CIPHER)) |
| 526 |
++ if (!(EVP_CIPHER_flags(EVP_CIPHER_CTX_cipher(ctx)) & EVP_CIPH_FLAG_AEAD_CIPHER)) |
| 527 |
+ ossl_raise(eCipherError, "authentication tag not supported by this cipher"); |
| 528 |
+ |
| 529 |
+ if (!EVP_CIPHER_CTX_ctrl(ctx, EVP_CTRL_AEAD_SET_TAG, tag_len, tag)) |
| 530 |
+@@ -668,7 +668,7 @@ ossl_cipher_set_auth_tag_len(VALUE self, VALUE vlen) |
| 531 |
+ EVP_CIPHER_CTX *ctx; |
| 532 |
+ |
| 533 |
+ GetCipher(self, ctx); |
| 534 |
+- if (!(EVP_CIPHER_CTX_flags(ctx) & EVP_CIPH_FLAG_AEAD_CIPHER)) |
| 535 |
++ if (!(EVP_CIPHER_flags(EVP_CIPHER_CTX_cipher(ctx)) & EVP_CIPH_FLAG_AEAD_CIPHER)) |
| 536 |
+ ossl_raise(eCipherError, "AEAD not supported by this cipher"); |
| 537 |
+ |
| 538 |
+ if (!EVP_CIPHER_CTX_ctrl(ctx, EVP_CTRL_AEAD_SET_TAG, tag_len, NULL)) |
| 539 |
+@@ -695,7 +695,7 @@ ossl_cipher_set_iv_length(VALUE self, VALUE iv_length) |
| 540 |
+ EVP_CIPHER_CTX *ctx; |
| 541 |
+ |
| 542 |
+ GetCipher(self, ctx); |
| 543 |
+- if (!(EVP_CIPHER_CTX_flags(ctx) & EVP_CIPH_FLAG_AEAD_CIPHER)) |
| 544 |
++ if (!(EVP_CIPHER_flags(EVP_CIPHER_CTX_cipher(ctx)) & EVP_CIPH_FLAG_AEAD_CIPHER)) |
| 545 |
+ ossl_raise(eCipherError, "cipher does not support AEAD"); |
| 546 |
+ |
| 547 |
+ if (!EVP_CIPHER_CTX_ctrl(ctx, EVP_CTRL_AEAD_SET_IVLEN, len, NULL)) |
| 548 |
+@@ -786,9 +786,9 @@ ossl_cipher_iv_length(VALUE self) |
| 549 |
+ int len = 0; |
| 550 |
+ |
| 551 |
+ GetCipher(self, ctx); |
| 552 |
+ #if defined(HAVE_AUTHENTICATED_ENCRYPTION) |
| 553 |
+- if (EVP_CIPHER_CTX_flags(ctx) & EVP_CIPH_FLAG_AEAD_CIPHER) |
| 554 |
++ if (EVP_CIPHER_flags(EVP_CIPHER_CTX_cipher(ctx)) & EVP_CIPH_FLAG_AEAD_CIPHER) |
| 555 |
+ len = (int)(VALUE)EVP_CIPHER_CTX_get_app_data(ctx); |
| 556 |
+ #endif |
| 557 |
+ if (!len) |
| 558 |
+ len = EVP_CIPHER_CTX_iv_length(ctx); |
| 559 |
+diff --git a/ext/openssl/ossl_engine.c b/ext/openssl/ossl_engine.c |
| 560 |
+index d69b5dca..5ca0d4ca 100644 |
| 561 |
+--- a/ext/openssl/ossl_engine.c |
| 562 |
++++ b/ext/openssl/ossl_engine.c |
| 563 |
+@@ -46,13 +46,25 @@ VALUE eEngineError; |
| 564 |
+ /* |
| 565 |
+ * Private |
| 566 |
+ */ |
| 567 |
+-#define OSSL_ENGINE_LOAD_IF_MATCH(x) \ |
| 568 |
++#if !defined(LIBRESSL_VERSION_NUMBER) && OPENSSL_VERSION_NUMBER >= 0x10100000 |
| 569 |
++#define OSSL_ENGINE_LOAD_IF_MATCH(engine_name, x) \ |
| 570 |
+ do{\ |
| 571 |
+- if(!strcmp(#x, RSTRING_PTR(name))){\ |
| 572 |
+- ENGINE_load_##x();\ |
| 573 |
++ if(!strcmp(#engine_name, RSTRING_PTR(name))){\ |
| 574 |
++ if (OPENSSL_init_crypto(OPENSSL_INIT_ENGINE_##x, NULL))\ |
| 575 |
++ return Qtrue;\ |
| 576 |
++ else\ |
| 577 |
++ ossl_raise(eEngineError, "OPENSSL_init_crypto"); \ |
| 578 |
++ }\ |
| 579 |
++}while(0) |
| 580 |
++#else |
| 581 |
++#define OSSL_ENGINE_LOAD_IF_MATCH(engine_name, x) \ |
| 582 |
++do{\ |
| 583 |
++ if(!strcmp(#engine_name, RSTRING_PTR(name))){\ |
| 584 |
++ ENGINE_load_##engine_name();\ |
| 585 |
+ return Qtrue;\ |
| 586 |
+ }\ |
| 587 |
+ }while(0) |
| 588 |
++#endif |
| 589 |
+ |
| 590 |
+ static void |
| 591 |
+ ossl_engine_free(void *engine) |
| 592 |
+@@ -94,55 +106,55 @@ ossl_engine_s_load(int argc, VALUE *argv, VALUE klass) |
| 593 |
+ StringValueCStr(name); |
| 594 |
+ #ifndef OPENSSL_NO_STATIC_ENGINE |
| 595 |
+ #if HAVE_ENGINE_LOAD_DYNAMIC |
| 596 |
+- OSSL_ENGINE_LOAD_IF_MATCH(dynamic); |
| 597 |
++ OSSL_ENGINE_LOAD_IF_MATCH(dynamic, DYNAMIC); |
| 598 |
+ #endif |
| 599 |
+ #if HAVE_ENGINE_LOAD_4758CCA |
| 600 |
+- OSSL_ENGINE_LOAD_IF_MATCH(4758cca); |
| 601 |
++ OSSL_ENGINE_LOAD_IF_MATCH(4758cca, 4758CCA); |
| 602 |
+ #endif |
| 603 |
+ #if HAVE_ENGINE_LOAD_AEP |
| 604 |
+- OSSL_ENGINE_LOAD_IF_MATCH(aep); |
| 605 |
++ OSSL_ENGINE_LOAD_IF_MATCH(aep, AEP); |
| 606 |
+ #endif |
| 607 |
+ #if HAVE_ENGINE_LOAD_ATALLA |
| 608 |
+- OSSL_ENGINE_LOAD_IF_MATCH(atalla); |
| 609 |
++ OSSL_ENGINE_LOAD_IF_MATCH(atalla, ATALLA); |
| 610 |
+ #endif |
| 611 |
+ #if HAVE_ENGINE_LOAD_CHIL |
| 612 |
+- OSSL_ENGINE_LOAD_IF_MATCH(chil); |
| 613 |
++ OSSL_ENGINE_LOAD_IF_MATCH(chil, CHIL); |
| 614 |
+ #endif |
| 615 |
+ #if HAVE_ENGINE_LOAD_CSWIFT |
| 616 |
+- OSSL_ENGINE_LOAD_IF_MATCH(cswift); |
| 617 |
++ OSSL_ENGINE_LOAD_IF_MATCH(cswift, CSWIFT); |
| 618 |
+ #endif |
| 619 |
+ #if HAVE_ENGINE_LOAD_NURON |
| 620 |
+- OSSL_ENGINE_LOAD_IF_MATCH(nuron); |
| 621 |
++ OSSL_ENGINE_LOAD_IF_MATCH(nuron, NURON); |
| 622 |
+ #endif |
| 623 |
+ #if HAVE_ENGINE_LOAD_SUREWARE |
| 624 |
+- OSSL_ENGINE_LOAD_IF_MATCH(sureware); |
| 625 |
++ OSSL_ENGINE_LOAD_IF_MATCH(sureware, SUREWARE); |
| 626 |
+ #endif |
| 627 |
+ #if HAVE_ENGINE_LOAD_UBSEC |
| 628 |
+- OSSL_ENGINE_LOAD_IF_MATCH(ubsec); |
| 629 |
++ OSSL_ENGINE_LOAD_IF_MATCH(ubsec, UBSEC); |
| 630 |
+ #endif |
| 631 |
+ #if HAVE_ENGINE_LOAD_PADLOCK |
| 632 |
+- OSSL_ENGINE_LOAD_IF_MATCH(padlock); |
| 633 |
++ OSSL_ENGINE_LOAD_IF_MATCH(padlock, PADLOCK); |
| 634 |
+ #endif |
| 635 |
+ #if HAVE_ENGINE_LOAD_CAPI |
| 636 |
+- OSSL_ENGINE_LOAD_IF_MATCH(capi); |
| 637 |
++ OSSL_ENGINE_LOAD_IF_MATCH(capi, CAPI); |
| 638 |
+ #endif |
| 639 |
+ #if HAVE_ENGINE_LOAD_GMP |
| 640 |
+- OSSL_ENGINE_LOAD_IF_MATCH(gmp); |
| 641 |
++ OSSL_ENGINE_LOAD_IF_MATCH(gmp, GMP); |
| 642 |
+ #endif |
| 643 |
+ #if HAVE_ENGINE_LOAD_GOST |
| 644 |
+- OSSL_ENGINE_LOAD_IF_MATCH(gost); |
| 645 |
++ OSSL_ENGINE_LOAD_IF_MATCH(gost, GOST); |
| 646 |
+ #endif |
| 647 |
+ #if HAVE_ENGINE_LOAD_CRYPTODEV |
| 648 |
+- OSSL_ENGINE_LOAD_IF_MATCH(cryptodev); |
| 649 |
++ OSSL_ENGINE_LOAD_IF_MATCH(cryptodev, CRYPTODEV); |
| 650 |
+ #endif |
| 651 |
+ #if HAVE_ENGINE_LOAD_AESNI |
| 652 |
+- OSSL_ENGINE_LOAD_IF_MATCH(aesni); |
| 653 |
++ OSSL_ENGINE_LOAD_IF_MATCH(aesni, AESNI); |
| 654 |
+ #endif |
| 655 |
+ #endif |
| 656 |
+ #ifdef HAVE_ENGINE_LOAD_OPENBSD_DEV_CRYPTO |
| 657 |
+- OSSL_ENGINE_LOAD_IF_MATCH(openbsd_dev_crypto); |
| 658 |
++ OSSL_ENGINE_LOAD_IF_MATCH(openbsd_dev_crypto, OPENBSD_DEV_CRYPTO); |
| 659 |
+ #endif |
| 660 |
+- OSSL_ENGINE_LOAD_IF_MATCH(openssl); |
| 661 |
++ OSSL_ENGINE_LOAD_IF_MATCH(openssl, OPENSSL); |
| 662 |
+ rb_warning("no such builtin loader for `%"PRIsVALUE"'", name); |
| 663 |
+ return Qnil; |
| 664 |
+ #endif /* HAVE_ENGINE_LOAD_BUILTIN_ENGINES */ |
| 665 |
+@@ -160,7 +172,9 @@ ossl_engine_s_load(int argc, VALUE *argv, VALUE klass) |
| 666 |
+ static VALUE |
| 667 |
+ ossl_engine_s_cleanup(VALUE self) |
| 668 |
+ { |
| 669 |
++#if defined(LIBRESSL_VERSION_NUMBER) || OPENSSL_VERSION_NUMBER < 0x10100000 |
| 670 |
+ ENGINE_cleanup(); |
| 671 |
++#endif |
| 672 |
+ return Qnil; |
| 673 |
+ } |
| 674 |
+ |
| 675 |
+diff --git a/ext/openssl/ossl_ssl.c b/ext/openssl/ossl_ssl.c |
| 676 |
+index 8e3c0c42..d32a299c 100644 |
| 677 |
+--- a/ext/openssl/ossl_ssl.c |
| 678 |
++++ b/ext/openssl/ossl_ssl.c |
| 679 |
+@@ -379,7 +379,7 @@ ossl_call_session_get_cb(VALUE ary) |
| 680 |
+ |
| 681 |
+ /* this method is currently only called for servers (in OpenSSL <= 0.9.8e) */ |
| 682 |
+ static SSL_SESSION * |
| 683 |
+-#if OPENSSL_VERSION_NUMBER >= 0x10100000L && !defined(LIBRESSL_VERSION_NUMBER) |
| 684 |
++#if OPENSSL_VERSION_NUMBER >= 0x10100000 && !defined(LIBRESSL_VERSION_NUMBER) |
| 685 |
+ ossl_sslctx_session_get_cb(SSL *ssl, const unsigned char *buf, int len, int *copy) |
| 686 |
+ #else |
| 687 |
+ ossl_sslctx_session_get_cb(SSL *ssl, unsigned char *buf, int len, int *copy) |
| 688 |
+diff --git a/ext/openssl/ossl_x509cert.c b/ext/openssl/ossl_x509cert.c |
| 689 |
+index cf82a53d..8d16b9b7 100644 |
| 690 |
+--- a/ext/openssl/ossl_x509cert.c |
| 691 |
++++ b/ext/openssl/ossl_x509cert.c |
| 692 |
+@@ -440,7 +440,7 @@ ossl_x509_set_not_before(VALUE self, VALUE time) |
| 693 |
+ |
| 694 |
+ GetX509(self, x509); |
| 695 |
+ asn1time = ossl_x509_time_adjust(NULL, time); |
| 696 |
+- if (!X509_set_notBefore(x509, asn1time)) { |
| 697 |
++ if (!X509_set1_notBefore(x509, asn1time)) { |
| 698 |
+ ASN1_TIME_free(asn1time); |
| 699 |
+ ossl_raise(eX509CertError, "X509_set_notBefore"); |
| 700 |
+ } |
| 701 |
+@@ -479,7 +479,7 @@ ossl_x509_set_not_after(VALUE self, VALUE time) |
| 702 |
+ |
| 703 |
+ GetX509(self, x509); |
| 704 |
+ asn1time = ossl_x509_time_adjust(NULL, time); |
| 705 |
+- if (!X509_set_notAfter(x509, asn1time)) { |
| 706 |
++ if (!X509_set1_notAfter(x509, asn1time)) { |
| 707 |
+ ASN1_TIME_free(asn1time); |
| 708 |
+ ossl_raise(eX509CertError, "X509_set_notAfter"); |
| 709 |
+ } |
| 710 |
+diff --git a/ext/openssl/ossl_x509crl.c b/ext/openssl/ossl_x509crl.c |
| 711 |
+index 5ecd7ea0..45cf7fb4 100644 |
| 712 |
+--- a/ext/openssl/ossl_x509crl.c |
| 713 |
++++ b/ext/openssl/ossl_x509crl.c |
| 714 |
+@@ -226,7 +226,7 @@ ossl_x509crl_set_last_update(VALUE self, VALUE time) |
| 715 |
+ |
| 716 |
+ GetX509CRL(self, crl); |
| 717 |
+ asn1time = ossl_x509_time_adjust(NULL, time); |
| 718 |
+- if (!X509_CRL_set_lastUpdate(crl, asn1time)) { |
| 719 |
++ if (!X509_CRL_set1_lastUpdate(crl, asn1time)) { |
| 720 |
+ ASN1_TIME_free(asn1time); |
| 721 |
+ ossl_raise(eX509CRLError, "X509_CRL_set_lastUpdate"); |
| 722 |
+ } |
| 723 |
+@@ -257,7 +257,7 @@ ossl_x509crl_set_next_update(VALUE self, VALUE time) |
| 724 |
+ |
| 725 |
+ GetX509CRL(self, crl); |
| 726 |
+ asn1time = ossl_x509_time_adjust(NULL, time); |
| 727 |
+- if (!X509_CRL_set_nextUpdate(crl, asn1time)) { |
| 728 |
++ if (!X509_CRL_set1_nextUpdate(crl, asn1time)) { |
| 729 |
+ ASN1_TIME_free(asn1time); |
| 730 |
+ ossl_raise(eX509CRLError, "X509_CRL_set_nextUpdate"); |
| 731 |
+ } |
| 732 |
|
| 733 |
diff --git a/dev-lang/ruby/files/2.5/001-ia64-update-ia64-specific-code-to-use-execution-cont.patch b/dev-lang/ruby/files/2.5/001-ia64-update-ia64-specific-code-to-use-execution-cont.patch |
| 734 |
new file mode 100644 |
| 735 |
index 0000000000..2ade8b8d42 |
| 736 |
--- /dev/null |
| 737 |
+++ b/dev-lang/ruby/files/2.5/001-ia64-update-ia64-specific-code-to-use-execution-cont.patch |
| 738 |
@@ -0,0 +1,67 @@ |
| 739 |
+From 5af43b1ec2674e9f86090790bc61abdb96be14ff Mon Sep 17 00:00:00 2001 |
| 740 |
+From: hsbt <hsbt@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> |
| 741 |
+Date: Tue, 30 Jan 2018 05:43:42 +0000 |
| 742 |
+Subject: [PATCH] ia64: update ia64-specific code to use execution context |
| 743 |
+ |
| 744 |
+This change follows commit 837fd5e494731d7d44786f29e7d6e8c27029806f |
| 745 |
+in '#ifdef __ia64' branches. |
| 746 |
+ |
| 747 |
+Noticed as a build failure by John Paul Adrian Glaubitz: |
| 748 |
+ |
| 749 |
+``` |
| 750 |
+ cont.c:502:50: error: 'rb_thread_t {aka struct rb_thread_struct}' |
| 751 |
+ has no member named 'machine' |
| 752 |
+ size = cont->machine.register_stack_size = |
| 753 |
+ th->machine.register_stack_end - th->machine.register_stack_start; |
| 754 |
+ ^~ |
| 755 |
+``` |
| 756 |
+ |
| 757 |
+The change is trivial: update 'th->machine' usage to 'th->ec->machine'. |
| 758 |
+Signed-off-by: Sergei Trofimovich <slyfox@g.o> |
| 759 |
+ |
| 760 |
+git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@62106 b2dd03c8-39d4-4d8f-98ff-823fe69b080e |
| 761 |
+--- |
| 762 |
+ cont.c | 6 +++--- |
| 763 |
+ thread.c | 2 +- |
| 764 |
+ 2 files changed, 4 insertions(+), 4 deletions(-) |
| 765 |
+ |
| 766 |
+diff --git a/cont.c b/cont.c |
| 767 |
+index f48fd2e52b..93a64f8fe6 100644 |
| 768 |
+--- a/cont.c |
| 769 |
++++ b/cont.c |
| 770 |
+@@ -475,7 +475,7 @@ cont_save_machine_stack(rb_thread_t *th, rb_context_t *cont) |
| 771 |
+ |
| 772 |
+ SET_MACHINE_STACK_END(&th->ec->machine.stack_end); |
| 773 |
+ #ifdef __ia64 |
| 774 |
+- th->machine.register_stack_end = rb_ia64_bsp(); |
| 775 |
++ th->ec->machine.register_stack_end = rb_ia64_bsp(); |
| 776 |
+ #endif |
| 777 |
+ |
| 778 |
+ if (th->ec->machine.stack_start > th->ec->machine.stack_end) { |
| 779 |
+@@ -499,8 +499,8 @@ cont_save_machine_stack(rb_thread_t *th, rb_context_t *cont) |
| 780 |
+ |
| 781 |
+ #ifdef __ia64 |
| 782 |
+ rb_ia64_flushrs(); |
| 783 |
+- size = cont->machine.register_stack_size = th->machine.register_stack_end - th->machine.register_stack_start; |
| 784 |
+- cont->machine.register_stack_src = th->machine.register_stack_start; |
| 785 |
++ size = cont->machine.register_stack_size = th->ec->machine.register_stack_end - th->ec->machine.register_stack_start; |
| 786 |
++ cont->machine.register_stack_src = th->ec->machine.register_stack_start; |
| 787 |
+ if (cont->machine.register_stack) { |
| 788 |
+ REALLOC_N(cont->machine.register_stack, VALUE, size); |
| 789 |
+ } |
| 790 |
+diff --git a/thread.c b/thread.c |
| 791 |
+index acb53354fd..23957eba09 100644 |
| 792 |
+--- a/thread.c |
| 793 |
++++ b/thread.c |
| 794 |
+@@ -133,7 +133,7 @@ static inline void blocking_region_end(rb_thread_t *th, struct rb_blocking_regio |
| 795 |
+ |
| 796 |
+ #ifdef __ia64 |
| 797 |
+ #define RB_GC_SAVE_MACHINE_REGISTER_STACK(th) \ |
| 798 |
+- do{(th)->machine.register_stack_end = rb_ia64_bsp();}while(0) |
| 799 |
++ do{(th)->ec->machine.register_stack_end = rb_ia64_bsp();}while(0) |
| 800 |
+ #else |
| 801 |
+ #define RB_GC_SAVE_MACHINE_REGISTER_STACK(th) |
| 802 |
+ #endif |
| 803 |
+-- |
| 804 |
+2.16.1 |
| 805 |
+ |
| 806 |
|
| 807 |
diff --git a/dev-lang/ruby/files/2.5/005_no-undefined-ext.patch b/dev-lang/ruby/files/2.5/005_no-undefined-ext.patch |
| 808 |
new file mode 100644 |
| 809 |
index 0000000000..1f0fdda08d |
| 810 |
--- /dev/null |
| 811 |
+++ b/dev-lang/ruby/files/2.5/005_no-undefined-ext.patch |
| 812 |
@@ -0,0 +1,11 @@ |
| 813 |
+--- a/configure.ac.~1~ 2017-12-15 10:43:40.000000000 +0100 |
| 814 |
++++ b/configure.ac 2017-12-25 11:02:19.099076831 +0100 |
| 815 |
+@@ -3233,7 +3233,7 @@ |
| 816 |
+ [linux* | gnu* | k*bsd*-gnu | netbsd* | bsdi* | kopensolaris*-gnu | haiku*], [ |
| 817 |
+ : ${LDSHARED='$(CC) -shared'} |
| 818 |
+ AS_IF([test "$rb_cv_binary_elf" = yes], [ |
| 819 |
+- LDFLAGS="$LDFLAGS -Wl,-export-dynamic" |
| 820 |
++ LDFLAGS="$LDFLAGS -Wl,-export-dynamic -Wl,--no-undefined" |
| 821 |
+ ]) |
| 822 |
+ rb_cv_dlopen=yes], |
| 823 |
+ [interix*], [ : ${LDSHARED='$(CC) -shared'} |
| 824 |
|
| 825 |
diff --git a/dev-lang/ruby/files/2.5/009_no-gems.patch b/dev-lang/ruby/files/2.5/009_no-gems.patch |
| 826 |
new file mode 100644 |
| 827 |
index 0000000000..e12429a432 |
| 828 |
--- /dev/null |
| 829 |
+++ b/dev-lang/ruby/files/2.5/009_no-gems.patch |
| 830 |
@@ -0,0 +1,95 @@ |
| 831 |
+--- a/tool/rbinstall.rb.~1~ 2017-10-30 06:45:20.000000000 +0100 |
| 832 |
++++ b/tool/rbinstall.rb 2017-12-25 11:06:53.340432435 +0100 |
| 833 |
+@@ -700,20 +700,10 @@ |
| 834 |
+ # :startdoc: |
| 835 |
+ |
| 836 |
+ install?(:ext, :comm, :gem, :'default-gems', :'default-gems-comm') do |
| 837 |
+- install_default_gem('lib', srcdir) |
| 838 |
++ # Gems are unbundled in Gentoo |
| 839 |
+ end |
| 840 |
+ install?(:ext, :arch, :gem, :'default-gems', :'default-gems-arch') do |
| 841 |
+- install_default_gem('ext', srcdir) do |path| |
| 842 |
+- # assume that gemspec and extconf.rb are placed in the same directory |
| 843 |
+- success = false |
| 844 |
+- begin |
| 845 |
+- IO.foreach(File.dirname(path[(srcdir.size+1)..-1]) + "/Makefile") do |l| |
| 846 |
+- break success = true if /^TARGET\s*=/ =~ l |
| 847 |
+- end |
| 848 |
+- rescue Errno::ENOENT |
| 849 |
+- end |
| 850 |
+- success |
| 851 |
+- end |
| 852 |
++ # Gems are unbundled in Gentoo |
| 853 |
+ end |
| 854 |
+ |
| 855 |
+ def load_gemspec(file) |
| 856 |
+@@ -765,68 +755,7 @@ |
| 857 |
+ end |
| 858 |
+ |
| 859 |
+ install?(:ext, :comm, :gem, :'bundled-gems') do |
| 860 |
+- gem_dir = Gem.default_dir |
| 861 |
+- directories = Gem.ensure_gem_subdirectories(gem_dir, :mode => $dir_mode) |
| 862 |
+- prepare "bundled gems", gem_dir, directories |
| 863 |
+- install_dir = with_destdir(gem_dir) |
| 864 |
+- installed_gems = {} |
| 865 |
+- options = { |
| 866 |
+- :install_dir => install_dir, |
| 867 |
+- :bin_dir => with_destdir(bindir), |
| 868 |
+- :domain => :local, |
| 869 |
+- :ignore_dependencies => true, |
| 870 |
+- :dir_mode => $dir_mode, |
| 871 |
+- :data_mode => $data_mode, |
| 872 |
+- :prog_mode => $prog_mode, |
| 873 |
+- :wrappers => true, |
| 874 |
+- :format_executable => true, |
| 875 |
+- } |
| 876 |
+- gem_ext_dir = "#$extout/gems/#{CONFIG['arch']}" |
| 877 |
+- extensions_dir = Gem::StubSpecification.gemspec_stub("", gem_dir, gem_dir).extensions_dir |
| 878 |
+- Gem::Specification.each_gemspec([srcdir+'/gems/*']) do |path| |
| 879 |
+- spec = load_gemspec(path) |
| 880 |
+- next unless spec.platform == Gem::Platform::RUBY |
| 881 |
+- next unless spec.full_name == path[srcdir.size..-1][/\A\/gems\/([^\/]+)/, 1] |
| 882 |
+- spec.extension_dir = "#{extensions_dir}/#{spec.full_name}" |
| 883 |
+- if File.directory?(ext = "#{gem_ext_dir}/#{spec.full_name}") |
| 884 |
+- spec.extensions[0] ||= "-" |
| 885 |
+- end |
| 886 |
+- ins = RbInstall::UnpackedInstaller.new(spec, options) |
| 887 |
+- puts "#{INDENT}#{spec.name} #{spec.version}" |
| 888 |
+- ins.install |
| 889 |
+- File.chmod($data_mode, File.join(install_dir, "specifications", "#{spec.full_name}.gemspec")) |
| 890 |
+- unless spec.extensions.empty? |
| 891 |
+- install_recursive(ext, spec.extension_dir) |
| 892 |
+- end |
| 893 |
+- installed_gems[spec.full_name] = true |
| 894 |
+- end |
| 895 |
+- installed_gems, gems = Dir.glob(srcdir+'/gems/*.gem').partition {|gem| installed_gems.key?(File.basename(gem, '.gem'))} |
| 896 |
+- unless installed_gems.empty? |
| 897 |
+- install installed_gems, gem_dir+"/cache" |
| 898 |
+- end |
| 899 |
+- next if gems.empty? |
| 900 |
+- if defined?(Zlib) |
| 901 |
+- Gem.instance_variable_set(:@ruby, with_destdir(File.join(bindir, ruby_install_name))) |
| 902 |
+- silent = Gem::SilentUI.new |
| 903 |
+- gems.each do |gem| |
| 904 |
+- inst = Gem::Installer.new(gem, options) |
| 905 |
+- inst.spec.extension_dir = with_destdir(inst.spec.extension_dir) |
| 906 |
+- begin |
| 907 |
+- Gem::DefaultUserInteraction.use_ui(silent) {inst.install} |
| 908 |
+- rescue Gem::InstallError => e |
| 909 |
+- next |
| 910 |
+- end |
| 911 |
+- gemname = File.basename(gem) |
| 912 |
+- puts "#{INDENT}#{gemname}" |
| 913 |
+- end |
| 914 |
+- # fix directory permissions |
| 915 |
+- # TODO: Gem.install should accept :dir_mode option or something |
| 916 |
+- File.chmod($dir_mode, *Dir.glob(install_dir+"/**/")) |
| 917 |
+- # fix .gemspec permissions |
| 918 |
+- File.chmod($data_mode, *Dir.glob(install_dir+"/specifications/*.gemspec")) |
| 919 |
+- else |
| 920 |
+- puts "skip installing bundled gems because of lacking zlib" |
| 921 |
+- end |
| 922 |
++ # Gems are unbundled in Gentoo |
| 923 |
+ end |
| 924 |
+ |
| 925 |
+ parse_args() |
| 926 |
|
| 927 |
diff --git a/dev-lang/ruby/files/2.5/010-libressl_2.7.patch b/dev-lang/ruby/files/2.5/010-libressl_2.7.patch |
| 928 |
new file mode 100644 |
| 929 |
index 0000000000..150f43c9e5 |
| 930 |
--- /dev/null |
| 931 |
+++ b/dev-lang/ruby/files/2.5/010-libressl_2.7.patch |
| 932 |
@@ -0,0 +1,15 @@ |
| 933 |
+--- a/ext/openssl/extconf.rb.orig 2018-04-02 09:57:14 UTC |
| 934 |
++++ b/ext/openssl/extconf.rb |
| 935 |
+@@ -122,8 +122,11 @@ OpenSSL.check_func_or_macro("SSL_get_ser |
| 936 |
+ have_func("SSL_is_server") |
| 937 |
+ |
| 938 |
+ # added in 1.1.0 |
| 939 |
++if !have_struct_member("SSL", "ctx", "openssl/ssl.h") || |
| 940 |
++ try_static_assert("LIBRESSL_VERSION_NUMBER >= 0x2070000fL", "openssl/opensslv.h") |
| 941 |
++ $defs.push("-DHAVE_OPAQUE_OPENSSL") |
| 942 |
++end |
| 943 |
+ have_func("CRYPTO_lock") || $defs.push("-DHAVE_OPENSSL_110_THREADING_API") |
| 944 |
+-have_struct_member("SSL", "ctx", "openssl/ssl.h") || $defs.push("-DHAVE_OPAQUE_OPENSSL") |
| 945 |
+ have_func("BN_GENCB_new") |
| 946 |
+ have_func("BN_GENCB_free") |
| 947 |
+ have_func("BN_GENCB_get_arg") |
| 948 |
|
| 949 |
diff --git a/dev-lang/ruby/files/2.5/011-no-gems.patch b/dev-lang/ruby/files/2.5/011-no-gems.patch |
| 950 |
new file mode 100644 |
| 951 |
index 0000000000..2ebe064c8a |
| 952 |
--- /dev/null |
| 953 |
+++ b/dev-lang/ruby/files/2.5/011-no-gems.patch |
| 954 |
@@ -0,0 +1,85 @@ |
| 955 |
+--- a/tool/rbinstall.rb.~1~ 2017-10-30 06:45:20.000000000 +0100 |
| 956 |
++++ b/tool/rbinstall.rb 2017-12-25 11:06:53.340432435 +0100 |
| 957 |
+@@ -700,10 +700,10 @@ |
| 958 |
+ # :startdoc: |
| 959 |
+ |
| 960 |
+ install?(:ext, :comm, :gem, :'default-gems', :'default-gems-comm') do |
| 961 |
+- install_default_gem('lib', srcdir) |
| 962 |
++ # Gems are unbundled in Gentoo |
| 963 |
+ end |
| 964 |
+ install?(:ext, :arch, :gem, :'default-gems', :'default-gems-arch') do |
| 965 |
+- install_default_gem('ext', srcdir) |
| 966 |
++ # Gems are unbundled in Gentoo |
| 967 |
+ end |
| 968 |
+ |
| 969 |
+ def load_gemspec(file) |
| 970 |
+@@ -765,68 +755,7 @@ |
| 971 |
+ end |
| 972 |
+ |
| 973 |
+ install?(:ext, :comm, :gem, :'bundled-gems') do |
| 974 |
+- gem_dir = Gem.default_dir |
| 975 |
+- directories = Gem.ensure_gem_subdirectories(gem_dir, :mode => $dir_mode) |
| 976 |
+- prepare "bundled gems", gem_dir, directories |
| 977 |
+- install_dir = with_destdir(gem_dir) |
| 978 |
+- installed_gems = {} |
| 979 |
+- options = { |
| 980 |
+- :install_dir => install_dir, |
| 981 |
+- :bin_dir => with_destdir(bindir), |
| 982 |
+- :domain => :local, |
| 983 |
+- :ignore_dependencies => true, |
| 984 |
+- :dir_mode => $dir_mode, |
| 985 |
+- :data_mode => $data_mode, |
| 986 |
+- :prog_mode => $prog_mode, |
| 987 |
+- :wrappers => true, |
| 988 |
+- :format_executable => true, |
| 989 |
+- } |
| 990 |
+- gem_ext_dir = "#$extout/gems/#{CONFIG['arch']}" |
| 991 |
+- extensions_dir = Gem::StubSpecification.gemspec_stub("", gem_dir, gem_dir).extensions_dir |
| 992 |
+- Gem::Specification.each_gemspec([srcdir+'/gems/*']) do |path| |
| 993 |
+- spec = load_gemspec(path) |
| 994 |
+- next unless spec.platform == Gem::Platform::RUBY |
| 995 |
+- next unless spec.full_name == path[srcdir.size..-1][/\A\/gems\/([^\/]+)/, 1] |
| 996 |
+- spec.extension_dir = "#{extensions_dir}/#{spec.full_name}" |
| 997 |
+- if File.directory?(ext = "#{gem_ext_dir}/#{spec.full_name}") |
| 998 |
+- spec.extensions[0] ||= "-" |
| 999 |
+- end |
| 1000 |
+- ins = RbInstall::UnpackedInstaller.new(spec, options) |
| 1001 |
+- puts "#{INDENT}#{spec.name} #{spec.version}" |
| 1002 |
+- ins.install |
| 1003 |
+- File.chmod($data_mode, File.join(install_dir, "specifications", "#{spec.full_name}.gemspec")) |
| 1004 |
+- unless spec.extensions.empty? |
| 1005 |
+- install_recursive(ext, spec.extension_dir) |
| 1006 |
+- end |
| 1007 |
+- installed_gems[spec.full_name] = true |
| 1008 |
+- end |
| 1009 |
+- installed_gems, gems = Dir.glob(srcdir+'/gems/*.gem').partition {|gem| installed_gems.key?(File.basename(gem, '.gem'))} |
| 1010 |
+- unless installed_gems.empty? |
| 1011 |
+- install installed_gems, gem_dir+"/cache" |
| 1012 |
+- end |
| 1013 |
+- next if gems.empty? |
| 1014 |
+- if defined?(Zlib) |
| 1015 |
+- Gem.instance_variable_set(:@ruby, with_destdir(File.join(bindir, ruby_install_name))) |
| 1016 |
+- silent = Gem::SilentUI.new |
| 1017 |
+- gems.each do |gem| |
| 1018 |
+- inst = Gem::Installer.new(gem, options) |
| 1019 |
+- inst.spec.extension_dir = with_destdir(inst.spec.extension_dir) |
| 1020 |
+- begin |
| 1021 |
+- Gem::DefaultUserInteraction.use_ui(silent) {inst.install} |
| 1022 |
+- rescue Gem::InstallError => e |
| 1023 |
+- next |
| 1024 |
+- end |
| 1025 |
+- gemname = File.basename(gem) |
| 1026 |
+- puts "#{INDENT}#{gemname}" |
| 1027 |
+- end |
| 1028 |
+- # fix directory permissions |
| 1029 |
+- # TODO: Gem.install should accept :dir_mode option or something |
| 1030 |
+- File.chmod($dir_mode, *Dir.glob(install_dir+"/**/")) |
| 1031 |
+- # fix .gemspec permissions |
| 1032 |
+- File.chmod($data_mode, *Dir.glob(install_dir+"/specifications/*.gemspec")) |
| 1033 |
+- else |
| 1034 |
+- puts "skip installing bundled gems because of lacking zlib" |
| 1035 |
+- end |
| 1036 |
++ # Gems are unbundled in Gentoo |
| 1037 |
+ end |
| 1038 |
+ |
| 1039 |
+ parse_args() |
| 1040 |
|
| 1041 |
diff --git a/dev-lang/ruby/files/2.6/005_no-undefined-ext.patch b/dev-lang/ruby/files/2.6/005_no-undefined-ext.patch |
| 1042 |
new file mode 100644 |
| 1043 |
index 0000000000..1f0fdda08d |
| 1044 |
--- /dev/null |
| 1045 |
+++ b/dev-lang/ruby/files/2.6/005_no-undefined-ext.patch |
| 1046 |
@@ -0,0 +1,11 @@ |
| 1047 |
+--- a/configure.ac.~1~ 2017-12-15 10:43:40.000000000 +0100 |
| 1048 |
++++ b/configure.ac 2017-12-25 11:02:19.099076831 +0100 |
| 1049 |
+@@ -3233,7 +3233,7 @@ |
| 1050 |
+ [linux* | gnu* | k*bsd*-gnu | netbsd* | bsdi* | kopensolaris*-gnu | haiku*], [ |
| 1051 |
+ : ${LDSHARED='$(CC) -shared'} |
| 1052 |
+ AS_IF([test "$rb_cv_binary_elf" = yes], [ |
| 1053 |
+- LDFLAGS="$LDFLAGS -Wl,-export-dynamic" |
| 1054 |
++ LDFLAGS="$LDFLAGS -Wl,-export-dynamic -Wl,--no-undefined" |
| 1055 |
+ ]) |
| 1056 |
+ rb_cv_dlopen=yes], |
| 1057 |
+ [interix*], [ : ${LDSHARED='$(CC) -shared'} |
| 1058 |
|
| 1059 |
diff --git a/dev-lang/ruby/files/2.6/009_no-gems.patch b/dev-lang/ruby/files/2.6/009_no-gems.patch |
| 1060 |
new file mode 100644 |
| 1061 |
index 0000000000..f98801d503 |
| 1062 |
--- /dev/null |
| 1063 |
+++ b/dev-lang/ruby/files/2.6/009_no-gems.patch |
| 1064 |
@@ -0,0 +1,39 @@ |
| 1065 |
+--- a/tool/rbinstall.rb.~1~ 2018-12-27 07:43:59.938638174 +0100 |
| 1066 |
++++ b/tool/rbinstall.rb 2018-12-27 07:51:09.096382161 +0100 |
| 1067 |
+@@ -723,17 +723,7 @@ |
| 1068 |
+ # :startdoc: |
| 1069 |
+ |
| 1070 |
+ install?(:ext, :arch, :gem, :'default-gems', :'default-gems-arch') do |
| 1071 |
+- install_default_gem('ext', srcdir) do |path| |
| 1072 |
+- # assume that gemspec and extconf.rb are placed in the same directory |
| 1073 |
+- success = false |
| 1074 |
+- begin |
| 1075 |
+- IO.foreach(File.dirname(path[(srcdir.size+1)..-1]) + "/Makefile") do |l| |
| 1076 |
+- break success = true if /^TARGET\s*=/ =~ l |
| 1077 |
+- end |
| 1078 |
+- rescue Errno::ENOENT |
| 1079 |
+- end |
| 1080 |
+- success |
| 1081 |
+- end |
| 1082 |
++ # Gems are unbundled in Gentoo |
| 1083 |
+ end |
| 1084 |
+ |
| 1085 |
+ def load_gemspec(file) |
| 1086 |
+@@ -743,7 +743,7 @@ |
| 1087 |
+ end |
| 1088 |
+ |
| 1089 |
+ def install_default_gem(dir, srcdir) |
| 1090 |
+- gem_dir = Gem.default_dir |
| 1091 |
++ gem_dir = ENV['GEM_DESTDIR'] ; puts "gem_dir for default gems = #{gem_dir}" |
| 1092 |
+ directories = Gem.ensure_gem_subdirectories(gem_dir, :mode => $dir_mode) |
| 1093 |
+ prepare "default gems from #{dir}", gem_dir, directories |
| 1094 |
+ |
| 1095 |
+@@ -777,7 +777,7 @@ |
| 1096 |
+ end |
| 1097 |
+ |
| 1098 |
+ install?(:ext, :comm, :gem, :'bundled-gems') do |
| 1099 |
+- gem_dir = Gem.default_dir |
| 1100 |
++ gem_dir = ENV['GEM_DESTDIR'] |
| 1101 |
+ directories = Gem.ensure_gem_subdirectories(gem_dir, :mode => $dir_mode) |
| 1102 |
+ prepare "bundled gems", gem_dir, directories |
| 1103 |
+ install_dir = with_destdir(gem_dir) |
| 1104 |
|
| 1105 |
diff --git a/dev-lang/ruby/files/2.6/010-default-gem-location.patch b/dev-lang/ruby/files/2.6/010-default-gem-location.patch |
| 1106 |
new file mode 100644 |
| 1107 |
index 0000000000..7a50c35ff6 |
| 1108 |
--- /dev/null |
| 1109 |
+++ b/dev-lang/ruby/files/2.6/010-default-gem-location.patch |
| 1110 |
@@ -0,0 +1,20 @@ |
| 1111 |
+--- a/tool/rbinstall.rb.~1~ 2019-01-24 02:00:07.000000000 +0100 |
| 1112 |
++++ b/tool/rbinstall.rb 2019-02-03 08:39:49.778007118 +0100 |
| 1113 |
+@@ -806,7 +806,7 @@ |
| 1114 |
+ end |
| 1115 |
+ |
| 1116 |
+ def install_default_gem(dir, srcdir) |
| 1117 |
+- gem_dir = Gem.default_dir |
| 1118 |
++ gem_dir = ENV['GEM_DESTDIR'] |
| 1119 |
+ directories = Gem.ensure_gem_subdirectories(gem_dir, :mode => $dir_mode) |
| 1120 |
+ prepare "default gems from #{dir}", gem_dir, directories |
| 1121 |
+ |
| 1122 |
+@@ -844,7 +844,7 @@ |
| 1123 |
+ end |
| 1124 |
+ |
| 1125 |
+ install?(:ext, :comm, :gem, :'bundled-gems') do |
| 1126 |
+- gem_dir = Gem.default_dir |
| 1127 |
++ gem_dir = ENV['GEM_DESTDIR'] |
| 1128 |
+ directories = Gem.ensure_gem_subdirectories(gem_dir, :mode => $dir_mode) |
| 1129 |
+ prepare "bundled gems", gem_dir, directories |
| 1130 |
+ install_dir = with_destdir(gem_dir) |
| 1131 |
|
| 1132 |
diff --git a/dev-lang/ruby/files/ruby-1.9.1-prefix.patch b/dev-lang/ruby/files/ruby-1.9.1-prefix.patch |
| 1133 |
index 250ad90dee..322dd56e0f 100644 |
| 1134 |
--- a/dev-lang/ruby/files/ruby-1.9.1-prefix.patch |
| 1135 |
+++ b/dev-lang/ruby/files/ruby-1.9.1-prefix.patch |
| 1136 |
@@ -1,5 +1,5 @@ |
| 1137 |
---- configure.in |
| 1138 |
-+++ configure.in |
| 1139 |
+--- a/configure.in |
| 1140 |
++++ b/configure.in |
| 1141 |
@@ -2111,7 +2111,7 @@ |
| 1142 |
esac |
| 1143 |
]) |
| 1144 |
@@ -9,8 +9,8 @@ |
| 1145 |
if ${NROFF} -mdoc ${srcdir}/man/ruby.1 >/dev/null 2>&1; then |
| 1146 |
MANTYPE=doc |
| 1147 |
else |
| 1148 |
---- configure |
| 1149 |
-+++ configure |
| 1150 |
+--- a/configure |
| 1151 |
++++ b/configure |
| 1152 |
@@ -22605,7 +22605,7 @@ |
| 1153 |
;; |
| 1154 |
*) |
| 1155 |
|
| 1156 |
diff --git a/dev-lang/ruby/metadata.xml b/dev-lang/ruby/metadata.xml |
| 1157 |
index 249178be81..ad18c95606 100644 |
| 1158 |
--- a/dev-lang/ruby/metadata.xml |
| 1159 |
+++ b/dev-lang/ruby/metadata.xml |
| 1160 |
@@ -1,28 +1,12 @@ |
| 1161 |
<?xml version="1.0" encoding="UTF-8"?> |
| 1162 |
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> |
| 1163 |
<pkgmetadata> |
| 1164 |
- <maintainer type="project"> |
| 1165 |
- <email>ruby@g.o</email> |
| 1166 |
- <name>Gentoo Ruby Project</name> |
| 1167 |
- </maintainer> |
| 1168 |
- <use> |
| 1169 |
- <flag name="rubytests"> |
| 1170 |
- Install ruby tests that can only be run after ruby is installed |
| 1171 |
- </flag> |
| 1172 |
- <flag name="readline"> |
| 1173 |
- Use the <pkg>sys-libs/readline</pkg> library to provide the |
| 1174 |
- readline extension, used for instance by the irb tool. This flag |
| 1175 |
- is meaningful only if the libedit USE flag is disabled. |
| 1176 |
- |
| 1177 |
- If neither libedit nor readline USE flags are enabled, the |
| 1178 |
- readline extension will not be built (and irb will lose line |
| 1179 |
- editing functionality). |
| 1180 |
- </flag> |
| 1181 |
- <flag name="rdoc"> |
| 1182 |
- Install <pkg>dev-ruby/rdoc</pkg> after installing Ruby. |
| 1183 |
- </flag> |
| 1184 |
- <flag name="jemalloc"> |
| 1185 |
- Use <pkg>dev-libs/jemalloc</pkg> for memory allocation. |
| 1186 |
- </flag> |
| 1187 |
- </use> |
| 1188 |
+ <maintainer type="project"> |
| 1189 |
+ <email>ruby@g.o</email> |
| 1190 |
+ <name>Gentoo Ruby Project</name> |
| 1191 |
+ </maintainer> |
| 1192 |
+ <use> |
| 1193 |
+ <flag name="rubytests">Install ruby tests that can only be run after ruby is installed</flag> |
| 1194 |
+ <flag name="rdoc">Install <pkg>dev-ruby/rdoc</pkg> after installing Ruby.</flag> |
| 1195 |
+ </use> |
| 1196 |
</pkgmetadata> |
| 1197 |
|
| 1198 |
diff --git a/dev-lang/ruby/ruby-2.4.2.ebuild b/dev-lang/ruby/ruby-2.4.6.ebuild |
| 1199 |
similarity index 89% |
| 1200 |
rename from dev-lang/ruby/ruby-2.4.2.ebuild |
| 1201 |
rename to dev-lang/ruby/ruby-2.4.6.ebuild |
| 1202 |
index 240aab02eb..003af89c3a 100644 |
| 1203 |
--- a/dev-lang/ruby/ruby-2.4.2.ebuild |
| 1204 |
+++ b/dev-lang/ruby/ruby-2.4.6.ebuild |
| 1205 |
@@ -1,41 +1,28 @@ |
| 1206 |
-# Copyright 1999-2017 Gentoo Foundation |
| 1207 |
+# Copyright 1999-2019 Gentoo Authors |
| 1208 |
# Distributed under the terms of the GNU General Public License v2 |
| 1209 |
|
| 1210 |
-EAPI=6 |
| 1211 |
+EAPI=7 |
| 1212 |
|
| 1213 |
-#PATCHSET=1 |
| 1214 |
+inherit autotools flag-o-matic multilib |
| 1215 |
|
| 1216 |
-inherit autotools eutils flag-o-matic multilib versionator |
| 1217 |
- |
| 1218 |
-MY_P="${PN}-$(get_version_component_range 1-3)" |
| 1219 |
+MY_P="${PN}-$(ver_cut 1-3)" |
| 1220 |
S=${WORKDIR}/${MY_P} |
| 1221 |
|
| 1222 |
-SLOT=$(get_version_component_range 1-2) |
| 1223 |
-MY_SUFFIX=$(delete_version_separator 1 ${SLOT}) |
| 1224 |
+SLOT=$(ver_cut 1-2) |
| 1225 |
+MY_SUFFIX=$(ver_rs 1 '' ${SLOT}) |
| 1226 |
RUBYVERSION=${SLOT}.0 |
| 1227 |
|
| 1228 |
-if [[ -n ${PATCHSET} ]]; then |
| 1229 |
- if [[ ${PVR} == ${PV} ]]; then |
| 1230 |
- PATCHSET="${PV}-r0.${PATCHSET}" |
| 1231 |
- else |
| 1232 |
- PATCHSET="${PVR}.${PATCHSET}" |
| 1233 |
- fi |
| 1234 |
-else |
| 1235 |
- PATCHSET="${PVR}" |
| 1236 |
-fi |
| 1237 |
- |
| 1238 |
DESCRIPTION="An object-oriented scripting language" |
| 1239 |
-HOMEPAGE="http://www.ruby-lang.org/" |
| 1240 |
-SRC_URI="mirror://ruby/${SLOT}/${MY_P}.tar.xz |
| 1241 |
- https://dev.gentoo.org/~graaff/ruby-team/${PN}-patches-${PATCHSET}.tar.bz2" |
| 1242 |
+HOMEPAGE="https://www.ruby-lang.org/" |
| 1243 |
+SRC_URI="mirror://ruby/${SLOT}/${MY_P}.tar.xz" |
| 1244 |
|
| 1245 |
LICENSE="|| ( Ruby-BSD BSD-2 )" |
| 1246 |
KEYWORDS="~ppc-aix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" |
| 1247 |
-IUSE="berkdb debug doc examples gdbm ipv6 jemalloc libressl +rdoc rubytests socks5 ssl static-libs tk xemacs" |
| 1248 |
+IUSE="berkdb debug doc examples gdbm ipv6 jemalloc libressl +rdoc rubytests socks5 +ssl static-libs tk xemacs" |
| 1249 |
|
| 1250 |
RDEPEND=" |
| 1251 |
berkdb? ( sys-libs/db:= ) |
| 1252 |
- gdbm? ( sys-libs/gdbm ) |
| 1253 |
+ gdbm? ( sys-libs/gdbm:= ) |
| 1254 |
jemalloc? ( dev-libs/jemalloc ) |
| 1255 |
ssl? ( |
| 1256 |
!libressl? ( dev-libs/openssl:0= ) |
| 1257 |
@@ -47,7 +34,8 @@ RDEPEND=" |
| 1258 |
dev-lang/tk:0=[threads] |
| 1259 |
) |
| 1260 |
dev-libs/libyaml |
| 1261 |
- virtual/libffi |
| 1262 |
+ virtual/libffi:= |
| 1263 |
+ sys-libs/readline:0= |
| 1264 |
sys-libs/zlib |
| 1265 |
>=app-eselect/eselect-ruby-20161226 |
| 1266 |
!<dev-ruby/rdoc-3.9.4 |
| 1267 |
@@ -73,9 +61,8 @@ PDEPEND=" |
| 1268 |
xemacs? ( app-xemacs/ruby-modes )" |
| 1269 |
|
| 1270 |
src_prepare() { |
| 1271 |
- epatch "${FILESDIR}/${PN}-1.9.1-prefix.patch" |
| 1272 |
- EPATCH_FORCE="yes" EPATCH_SUFFIX="patch" \ |
| 1273 |
- epatch "${WORKDIR}/patches" |
| 1274 |
+ eapply "${FILESDIR}/${PN}-1.9.1-prefix.patch" |
| 1275 |
+ eapply "${FILESDIR}"/${SLOT}/{002,005,009,012}*.patch |
| 1276 |
|
| 1277 |
einfo "Unbundling gems..." |
| 1278 |
cd "$S" |
| 1279 |
@@ -95,6 +82,9 @@ src_prepare() { |
| 1280 |
# avoid symlink loop on Darwin (?!) |
| 1281 |
sed -i -e '/LIBRUBY_ALIASES=/s/lib$(RUBY_INSTALL_NAME).dylib//' \ |
| 1282 |
configure.in || die "sed failed" |
| 1283 |
+ # Fix using installed ruby |
| 1284 |
+ sed -i -e '/^libs << File.expand_path("lib", srcdir)/s/^/#/' \ |
| 1285 |
+ tool/runruby.rb || die |
| 1286 |
|
| 1287 |
eapply_user |
| 1288 |
|
| 1289 |
|
| 1290 |
diff --git a/dev-lang/ruby/ruby-2.2.9.ebuild b/dev-lang/ruby/ruby-2.5.5.ebuild |
| 1291 |
similarity index 70% |
| 1292 |
rename from dev-lang/ruby/ruby-2.2.9.ebuild |
| 1293 |
rename to dev-lang/ruby/ruby-2.5.5.ebuild |
| 1294 |
index 58e78aed98..c02ac06e74 100644 |
| 1295 |
--- a/dev-lang/ruby/ruby-2.2.9.ebuild |
| 1296 |
+++ b/dev-lang/ruby/ruby-2.5.5.ebuild |
| 1297 |
@@ -1,37 +1,24 @@ |
| 1298 |
-# Copyright 1999-2018 Gentoo Foundation |
| 1299 |
+# Copyright 1999-2019 Gentoo Authors |
| 1300 |
# Distributed under the terms of the GNU General Public License v2 |
| 1301 |
|
| 1302 |
-EAPI=5 |
| 1303 |
+EAPI=7 |
| 1304 |
|
| 1305 |
-#PATCHSET=1 |
| 1306 |
+inherit autotools flag-o-matic multilib |
| 1307 |
|
| 1308 |
-inherit autotools eutils flag-o-matic multilib versionator |
| 1309 |
- |
| 1310 |
-MY_P="${PN}-$(get_version_component_range 1-3)" |
| 1311 |
+MY_P="${PN}-$(ver_cut 1-3)" |
| 1312 |
S=${WORKDIR}/${MY_P} |
| 1313 |
|
| 1314 |
-SLOT=$(get_version_component_range 1-2) |
| 1315 |
-MY_SUFFIX=$(delete_version_separator 1 ${SLOT}) |
| 1316 |
-RUBYVERSION=2.2.0 |
| 1317 |
- |
| 1318 |
-if [[ -n ${PATCHSET} ]]; then |
| 1319 |
- if [[ ${PVR} == ${PV} ]]; then |
| 1320 |
- PATCHSET="${PV}-r0.${PATCHSET}" |
| 1321 |
- else |
| 1322 |
- PATCHSET="${PVR}.${PATCHSET}" |
| 1323 |
- fi |
| 1324 |
-else |
| 1325 |
- PATCHSET="${PVR}" |
| 1326 |
-fi |
| 1327 |
+SLOT=$(ver_cut 1-2) |
| 1328 |
+MY_SUFFIX=$(ver_rs 1 '' ${SLOT}) |
| 1329 |
+RUBYVERSION=${SLOT}.0 |
| 1330 |
|
| 1331 |
DESCRIPTION="An object-oriented scripting language" |
| 1332 |
-HOMEPAGE="http://www.ruby-lang.org/" |
| 1333 |
-SRC_URI="mirror://ruby/2.2/${MY_P}.tar.xz |
| 1334 |
- https://dev.gentoo.org/~flameeyes/ruby-team/${PN}-patches-${PATCHSET}.tar.bz2" |
| 1335 |
+HOMEPAGE="https://www.ruby-lang.org/" |
| 1336 |
+SRC_URI="mirror://ruby/${SLOT}/${MY_P}.tar.xz" |
| 1337 |
|
| 1338 |
LICENSE="|| ( Ruby-BSD BSD-2 )" |
| 1339 |
KEYWORDS="~ppc-aix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" |
| 1340 |
-IUSE="berkdb debug doc examples gdbm ipv6 jemalloc libressl +rdoc rubytests socks5 ssl tk xemacs ncurses +readline" |
| 1341 |
+IUSE="berkdb debug doc examples gdbm ipv6 jemalloc libressl +rdoc rubytests socks5 +ssl static-libs tk xemacs" |
| 1342 |
|
| 1343 |
RDEPEND=" |
| 1344 |
berkdb? ( sys-libs/db:= ) |
| 1345 |
@@ -46,56 +33,52 @@ RDEPEND=" |
| 1346 |
dev-lang/tcl:0=[threads] |
| 1347 |
dev-lang/tk:0=[threads] |
| 1348 |
) |
| 1349 |
- ncurses? ( sys-libs/ncurses:0= ) |
| 1350 |
- readline? ( sys-libs/readline:0= ) |
| 1351 |
dev-libs/libyaml |
| 1352 |
- virtual/libffi |
| 1353 |
+ virtual/libffi:= |
| 1354 |
+ sys-libs/readline:0= |
| 1355 |
sys-libs/zlib |
| 1356 |
- >=app-eselect/eselect-ruby-20141227 |
| 1357 |
- !<dev-ruby/rdoc-3.9.4 |
| 1358 |
- !<dev-ruby/rubygems-1.8.10-r1" |
| 1359 |
+ >=app-eselect/eselect-ruby-20171225 |
| 1360 |
+" |
| 1361 |
|
| 1362 |
DEPEND="${RDEPEND}" |
| 1363 |
|
| 1364 |
BUNDLED_GEMS=" |
| 1365 |
- >=dev-ruby/minitest-5.4.3[ruby_targets_ruby22] |
| 1366 |
- >=dev-ruby/power_assert-0.2.2[ruby_targets_ruby22] |
| 1367 |
- >=dev-ruby/test-unit-3.0.8[ruby_targets_ruby22] |
| 1368 |
+ >=dev-ruby/did_you_mean-1.2.0:2.5[ruby_targets_ruby25] |
| 1369 |
+ >=dev-ruby/minitest-5.10.3[ruby_targets_ruby25] |
| 1370 |
+ >=dev-ruby/net-telnet-0.1.1[ruby_targets_ruby25] |
| 1371 |
+ >=dev-ruby/power_assert-1.1.1[ruby_targets_ruby25] |
| 1372 |
+ >=dev-ruby/rake-12.3.0[ruby_targets_ruby25] |
| 1373 |
+ >=dev-ruby/test-unit-3.2.7[ruby_targets_ruby25] |
| 1374 |
+ >=dev-ruby/xmlrpc-0.3.0[ruby_targets_ruby25] |
| 1375 |
" |
| 1376 |
|
| 1377 |
PDEPEND=" |
| 1378 |
${BUNDLED_GEMS} |
| 1379 |
- virtual/rubygems[ruby_targets_ruby22] |
| 1380 |
- >=dev-ruby/json-1.8.1[ruby_targets_ruby22] |
| 1381 |
- >=dev-ruby/rake-0.9.6[ruby_targets_ruby22] |
| 1382 |
- rdoc? ( >=dev-ruby/rdoc-4.0.1[ruby_targets_ruby22] ) |
| 1383 |
+ virtual/rubygems[ruby_targets_ruby25] |
| 1384 |
+ >=dev-ruby/json-2.0.2[ruby_targets_ruby25] |
| 1385 |
+ rdoc? ( >=dev-ruby/rdoc-5.1.0[ruby_targets_ruby25] ) |
| 1386 |
xemacs? ( app-xemacs/ruby-modes )" |
| 1387 |
|
| 1388 |
src_prepare() { |
| 1389 |
- epatch "${FILESDIR}/${PN}-1.9.1-prefix.patch" |
| 1390 |
+ eapply "${FILESDIR}"/${SLOT}/{001,005,011}*.patch |
| 1391 |
|
| 1392 |
- EPATCH_FORCE="yes" EPATCH_SUFFIX="patch" \ |
| 1393 |
- epatch "${WORKDIR}/patches" |
| 1394 |
- |
| 1395 |
- # We can no longer unbundle all of rake because rubygems now depends |
| 1396 |
- # on this. We leave the actual rake code around to bootstrap |
| 1397 |
- # rubygems, but remove the bits that would cause a file collision. |
| 1398 |
einfo "Unbundling gems..." |
| 1399 |
cd "$S" |
| 1400 |
- rm -rf \ |
| 1401 |
- {bin,lib}/rake lib/rake.rb man/rake.1 \ |
| 1402 |
- bin/gem || die "removal failed" |
| 1403 |
# Remove bundled gems that we will install via PDEPEND, bug |
| 1404 |
# 539700. Use explicit version numbers to ensure rm fails when they |
| 1405 |
# change so we can update dependencies accordingly. |
| 1406 |
- rm gems/{minitest-5.4.3,power_assert-0.2.2,test-unit-3.0.8}.gem || die |
| 1407 |
+ rm -f gems/{did_you_mean-1.2.0,minitest-5.10.3,net-telnet-0.1.1,power_assert-1.1.1,rake-12.3.0,test-unit-3.2.7,xmlrpc-0.3.0}.gem || die |
| 1408 |
|
| 1409 |
- # Fix a hardcoded lib path in configure script |
| 1410 |
- sed -i -e "s:\(RUBY_LIB_PREFIX=\"\${prefix}/\)lib:\1$(get_libdir):" \ |
| 1411 |
- configure.in || die "sed failed" |
| 1412 |
+ einfo "Removing bundled libraries..." |
| 1413 |
+ rm -fr ext/fiddle/libffi-3.2.1 || die |
| 1414 |
|
| 1415 |
# Fix hardcoded SHELL var in mkmf library |
| 1416 |
- sed -e "s#\(SHELL = \).*#\1${EPREFIX}/bin/sh#" -i lib/mkmf.rb |
| 1417 |
+ sed -i -e "s#\(SHELL = \).*#\1${EPREFIX}/bin/sh#" lib/mkmf.rb |
| 1418 |
+ # avoid symlink loop on Darwin (?!) |
| 1419 |
+ sed -i -e '/LIBRUBY_ALIASES=/s/lib$(RUBY_INSTALL_NAME).dylib//' \ |
| 1420 |
+ configure.ac || die "sed failed" |
| 1421 |
+ |
| 1422 |
+ eapply_user |
| 1423 |
|
| 1424 |
eautoreconf |
| 1425 |
} |
| 1426 |
@@ -128,9 +111,6 @@ src_configure() { |
| 1427 |
use ipv6 || myconf="${myconf} --with-lookup-order-hack=INET" |
| 1428 |
|
| 1429 |
# Determine which modules *not* to build depending in the USE flags. |
| 1430 |
- if ! use readline ; then |
| 1431 |
- modules="${modules},readline" |
| 1432 |
- fi |
| 1433 |
if ! use berkdb ; then |
| 1434 |
modules="${modules},dbm" |
| 1435 |
fi |
| 1436 |
@@ -140,9 +120,6 @@ src_configure() { |
| 1437 |
if ! use ssl ; then |
| 1438 |
modules="${modules},openssl" |
| 1439 |
fi |
| 1440 |
- if ! use ncurses ; then |
| 1441 |
- modules="${modules},curses" |
| 1442 |
- fi |
| 1443 |
if ! use tk ; then |
| 1444 |
modules="${modules},tk" |
| 1445 |
fi |
| 1446 |
@@ -163,6 +140,9 @@ src_configure() { |
| 1447 |
$(use_enable socks5 socks) \ |
| 1448 |
$(use_enable doc install-doc) \ |
| 1449 |
--enable-ipv6 \ |
| 1450 |
+ $(use_enable static-libs static) \ |
| 1451 |
+ $(use_enable static-libs install-static-library) \ |
| 1452 |
+ $(use_with static-libs static-linked-ext) \ |
| 1453 |
$(use_enable debug) \ |
| 1454 |
${myconf} \ |
| 1455 |
--with-readline-dir="${EPREFIX}"/usr \ |
| 1456 |
@@ -204,16 +184,18 @@ src_install() { |
| 1457 |
local MINIRUBY=$(echo -e 'include Makefile\ngetminiruby:\n\t@echo $(MINIRUBY)'|make -f - getminiruby) |
| 1458 |
|
| 1459 |
LD_LIBRARY_PATH="${S}:${ED}/usr/$(get_libdir)${LD_LIBRARY_PATH+:}${LD_LIBRARY_PATH}" |
| 1460 |
+ DYLD_LIBRARY_PATH="${S}:${ED}/usr/$(get_libdir)${DYLD_LIBRARY_PATH+:}${DYLD_LIBRARY_PATH}" |
| 1461 |
RUBYLIB="${S}:${ED}/usr/$(get_libdir)/ruby/${RUBYVERSION}" |
| 1462 |
for d in $(find "${S}/ext" -type d) ; do |
| 1463 |
RUBYLIB="${RUBYLIB}:$d" |
| 1464 |
done |
| 1465 |
- export LD_LIBRARY_PATH RUBYLIB |
| 1466 |
+ export LD_LIBRARY_PATH DYLD_LIBRARY_PATH RUBYLIB |
| 1467 |
|
| 1468 |
emake V=1 DESTDIR="${D}" install || die "make install failed" |
| 1469 |
|
| 1470 |
- # Remove installed rubygems copy |
| 1471 |
+ # Remove installed rubygems and rdoc copy |
| 1472 |
rm -rf "${ED}/usr/$(get_libdir)/ruby/${RUBYVERSION}/rubygems" || die "rm rubygems failed" |
| 1473 |
+ rm -rf "${ED}/usr/bin/"gem"${MY_SUFFIX}" || die "rm rdoc bins failed" |
| 1474 |
rm -rf "${ED}/usr/$(get_libdir)/ruby/${RUBYVERSION}"/rdoc* || die "rm rdoc failed" |
| 1475 |
rm -rf "${ED}/usr/bin/"{ri,rdoc}"${MY_SUFFIX}" || die "rm rdoc bins failed" |
| 1476 |
|
| 1477 |
@@ -243,7 +225,7 @@ pkg_postinst() { |
| 1478 |
|
| 1479 |
elog |
| 1480 |
elog "To switch between available Ruby profiles, execute as root:" |
| 1481 |
- elog "\teselect ruby set ruby(21|22|...)" |
| 1482 |
+ elog "\teselect ruby set ruby(23|24|...)" |
| 1483 |
elog |
| 1484 |
} |
| 1485 |
|
| 1486 |
|
| 1487 |
diff --git a/dev-lang/ruby/ruby-2.2.8.ebuild b/dev-lang/ruby/ruby-2.6.3.ebuild |
| 1488 |
similarity index 62% |
| 1489 |
rename from dev-lang/ruby/ruby-2.2.8.ebuild |
| 1490 |
rename to dev-lang/ruby/ruby-2.6.3.ebuild |
| 1491 |
index dd78f968da..02ade18d11 100644 |
| 1492 |
--- a/dev-lang/ruby/ruby-2.2.8.ebuild |
| 1493 |
+++ b/dev-lang/ruby/ruby-2.6.3.ebuild |
| 1494 |
@@ -1,42 +1,30 @@ |
| 1495 |
-# Copyright 1999-2018 Gentoo Foundation |
| 1496 |
+# Copyright 1999-2019 Gentoo Authors |
| 1497 |
# Distributed under the terms of the GNU General Public License v2 |
| 1498 |
|
| 1499 |
-EAPI=5 |
| 1500 |
+EAPI=7 |
| 1501 |
|
| 1502 |
-#PATCHSET=1 |
| 1503 |
+inherit autotools flag-o-matic multilib |
| 1504 |
|
| 1505 |
-inherit autotools eutils flag-o-matic multilib versionator |
| 1506 |
- |
| 1507 |
-MY_P="${PN}-$(get_version_component_range 1-3)" |
| 1508 |
+MY_P="${PN}-$(ver_cut 1-3)" |
| 1509 |
S=${WORKDIR}/${MY_P} |
| 1510 |
|
| 1511 |
-SLOT=$(get_version_component_range 1-2) |
| 1512 |
-MY_SUFFIX=$(delete_version_separator 1 ${SLOT}) |
| 1513 |
-RUBYVERSION=2.2.0 |
| 1514 |
- |
| 1515 |
-if [[ -n ${PATCHSET} ]]; then |
| 1516 |
- if [[ ${PVR} == ${PV} ]]; then |
| 1517 |
- PATCHSET="${PV}-r0.${PATCHSET}" |
| 1518 |
- else |
| 1519 |
- PATCHSET="${PVR}.${PATCHSET}" |
| 1520 |
- fi |
| 1521 |
-else |
| 1522 |
- PATCHSET="${PVR}" |
| 1523 |
-fi |
| 1524 |
+SLOT=$(ver_cut 1-2) |
| 1525 |
+MY_SUFFIX=$(ver_rs 1 '' ${SLOT}) |
| 1526 |
+RUBYVERSION=${SLOT}.0 |
| 1527 |
|
| 1528 |
DESCRIPTION="An object-oriented scripting language" |
| 1529 |
-HOMEPAGE="http://www.ruby-lang.org/" |
| 1530 |
-SRC_URI="mirror://ruby/2.2/${MY_P}.tar.xz |
| 1531 |
- https://dev.gentoo.org/~flameeyes/ruby-team/${PN}-patches-${PATCHSET}.tar.bz2" |
| 1532 |
+HOMEPAGE="https://www.ruby-lang.org/" |
| 1533 |
+SRC_URI="mirror://ruby/${SLOT}/${MY_P}.tar.xz" |
| 1534 |
|
| 1535 |
LICENSE="|| ( Ruby-BSD BSD-2 )" |
| 1536 |
KEYWORDS="~ppc-aix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" |
| 1537 |
-IUSE="berkdb debug doc examples gdbm ipv6 jemalloc libressl +rdoc rubytests socks5 ssl tk xemacs ncurses +readline" |
| 1538 |
+IUSE="berkdb debug doc examples gdbm ipv6 jemalloc jit libressl +rdoc rubytests socks5 +ssl static-libs tk xemacs" |
| 1539 |
|
| 1540 |
RDEPEND=" |
| 1541 |
berkdb? ( sys-libs/db:= ) |
| 1542 |
- gdbm? ( sys-libs/gdbm ) |
| 1543 |
+ gdbm? ( sys-libs/gdbm:= ) |
| 1544 |
jemalloc? ( dev-libs/jemalloc ) |
| 1545 |
+ jit? ( || ( sys-devel/gcc:* sys-devel/clang:* ) ) |
| 1546 |
ssl? ( |
| 1547 |
!libressl? ( dev-libs/openssl:0= ) |
| 1548 |
libressl? ( dev-libs/libressl ) |
| 1549 |
@@ -46,56 +34,54 @@ RDEPEND=" |
| 1550 |
dev-lang/tcl:0=[threads] |
| 1551 |
dev-lang/tk:0=[threads] |
| 1552 |
) |
| 1553 |
- ncurses? ( sys-libs/ncurses:0= ) |
| 1554 |
- readline? ( sys-libs/readline:0= ) |
| 1555 |
dev-libs/libyaml |
| 1556 |
- virtual/libffi |
| 1557 |
+ virtual/libffi:= |
| 1558 |
+ sys-libs/readline:0= |
| 1559 |
sys-libs/zlib |
| 1560 |
- >=app-eselect/eselect-ruby-20141227 |
| 1561 |
- !<dev-ruby/rdoc-3.9.4 |
| 1562 |
- !<dev-ruby/rubygems-1.8.10-r1" |
| 1563 |
+ >=app-eselect/eselect-ruby-20171225 |
| 1564 |
+" |
| 1565 |
|
| 1566 |
DEPEND="${RDEPEND}" |
| 1567 |
|
| 1568 |
BUNDLED_GEMS=" |
| 1569 |
- >=dev-ruby/minitest-5.4.3[ruby_targets_ruby22] |
| 1570 |
- >=dev-ruby/power_assert-0.2.2[ruby_targets_ruby22] |
| 1571 |
- >=dev-ruby/test-unit-3.0.8[ruby_targets_ruby22] |
| 1572 |
+ >=dev-ruby/did_you_mean-1.2.1[ruby_targets_ruby26] |
| 1573 |
+ >=dev-ruby/minitest-5.11.3[ruby_targets_ruby26] |
| 1574 |
+ >=dev-ruby/net-telnet-0.2.0[ruby_targets_ruby26] |
| 1575 |
+ >=dev-ruby/power_assert-1.1.3[ruby_targets_ruby26] |
| 1576 |
+ >=dev-ruby/rake-12.3.2[ruby_targets_ruby26] |
| 1577 |
+ >=dev-ruby/test-unit-3.2.9[ruby_targets_ruby26] |
| 1578 |
+ >=dev-ruby/xmlrpc-0.3.0[ruby_targets_ruby26] |
| 1579 |
" |
| 1580 |
|
| 1581 |
PDEPEND=" |
| 1582 |
${BUNDLED_GEMS} |
| 1583 |
- virtual/rubygems[ruby_targets_ruby22] |
| 1584 |
- >=dev-ruby/json-1.8.1[ruby_targets_ruby22] |
| 1585 |
- >=dev-ruby/rake-0.9.6[ruby_targets_ruby22] |
| 1586 |
- rdoc? ( >=dev-ruby/rdoc-4.0.1[ruby_targets_ruby22] ) |
| 1587 |
+ virtual/rubygems[ruby_targets_ruby26] |
| 1588 |
+ >=dev-ruby/bundler-1.17.2[ruby_targets_ruby26] |
| 1589 |
+ >=dev-ruby/json-2.0.2[ruby_targets_ruby26] |
| 1590 |
+ rdoc? ( >=dev-ruby/rdoc-5.1.0[ruby_targets_ruby26] ) |
| 1591 |
xemacs? ( app-xemacs/ruby-modes )" |
| 1592 |
|
| 1593 |
src_prepare() { |
| 1594 |
- epatch "${FILESDIR}/${PN}-1.9.1-prefix.patch" |
| 1595 |
- |
| 1596 |
- EPATCH_FORCE="yes" EPATCH_SUFFIX="patch" \ |
| 1597 |
- epatch "${WORKDIR}/patches" |
| 1598 |
+ # 005 does not compile bigdecimal and is questionable because it |
| 1599 |
+ # compiles ruby in a non-standard way, may be dropped |
| 1600 |
+ eapply "${FILESDIR}"/2.6/010*.patch |
| 1601 |
|
| 1602 |
- # We can no longer unbundle all of rake because rubygems now depends |
| 1603 |
- # on this. We leave the actual rake code around to bootstrap |
| 1604 |
- # rubygems, but remove the bits that would cause a file collision. |
| 1605 |
einfo "Unbundling gems..." |
| 1606 |
cd "$S" |
| 1607 |
- rm -rf \ |
| 1608 |
- {bin,lib}/rake lib/rake.rb man/rake.1 \ |
| 1609 |
- bin/gem || die "removal failed" |
| 1610 |
# Remove bundled gems that we will install via PDEPEND, bug |
| 1611 |
- # 539700. Use explicit version numbers to ensure rm fails when they |
| 1612 |
- # change so we can update dependencies accordingly. |
| 1613 |
- rm gems/{minitest-5.4.3,power_assert-0.2.2,test-unit-3.0.8}.gem || die |
| 1614 |
+ # 539700. |
| 1615 |
+ rm -fr gems/* || die |
| 1616 |
|
| 1617 |
- # Fix a hardcoded lib path in configure script |
| 1618 |
- sed -i -e "s:\(RUBY_LIB_PREFIX=\"\${prefix}/\)lib:\1$(get_libdir):" \ |
| 1619 |
- configure.in || die "sed failed" |
| 1620 |
+ einfo "Removing bundled libraries..." |
| 1621 |
+ rm -fr ext/fiddle/libffi-3.2.1 || die |
| 1622 |
|
| 1623 |
# Fix hardcoded SHELL var in mkmf library |
| 1624 |
- sed -e "s#\(SHELL = \).*#\1${EPREFIX}/bin/sh#" -i lib/mkmf.rb |
| 1625 |
+ sed -i -e "s#\(SHELL = \).*#\1${EPREFIX}/bin/sh#" lib/mkmf.rb |
| 1626 |
+ # avoid symlink loop on Darwin (?!) |
| 1627 |
+ sed -i -e '/LIBRUBY_ALIASES=/s/lib$(RUBY_INSTALL_NAME).dylib//' \ |
| 1628 |
+ configure.ac || die "sed failed" |
| 1629 |
+ |
| 1630 |
+ eapply_user |
| 1631 |
|
| 1632 |
eautoreconf |
| 1633 |
} |
| 1634 |
@@ -128,9 +114,6 @@ src_configure() { |
| 1635 |
use ipv6 || myconf="${myconf} --with-lookup-order-hack=INET" |
| 1636 |
|
| 1637 |
# Determine which modules *not* to build depending in the USE flags. |
| 1638 |
- if ! use readline ; then |
| 1639 |
- modules="${modules},readline" |
| 1640 |
- fi |
| 1641 |
if ! use berkdb ; then |
| 1642 |
modules="${modules},dbm" |
| 1643 |
fi |
| 1644 |
@@ -140,9 +123,6 @@ src_configure() { |
| 1645 |
if ! use ssl ; then |
| 1646 |
modules="${modules},openssl" |
| 1647 |
fi |
| 1648 |
- if ! use ncurses ; then |
| 1649 |
- modules="${modules},curses" |
| 1650 |
- fi |
| 1651 |
if ! use tk ; then |
| 1652 |
modules="${modules},tk" |
| 1653 |
fi |
| 1654 |
@@ -160,18 +140,25 @@ src_configure() { |
| 1655 |
--disable-dtrace \ |
| 1656 |
--with-out-ext="${modules}" \ |
| 1657 |
$(use_with jemalloc jemalloc) \ |
| 1658 |
+ $(use_enable jit jit-support ) \ |
| 1659 |
$(use_enable socks5 socks) \ |
| 1660 |
$(use_enable doc install-doc) \ |
| 1661 |
--enable-ipv6 \ |
| 1662 |
+ $(use_enable static-libs static) \ |
| 1663 |
+ $(use_enable static-libs install-static-library) \ |
| 1664 |
+ $(use_with static-libs static-linked-ext) \ |
| 1665 |
$(use_enable debug) \ |
| 1666 |
${myconf} \ |
| 1667 |
--with-readline-dir="${EPREFIX}"/usr \ |
| 1668 |
--enable-option-checking=no \ |
| 1669 |
|| die "econf failed" |
| 1670 |
+ |
| 1671 |
+ # Makefile is broken because it lacks -ldl |
| 1672 |
+ rm -rf ext/-test-/popen_deadlock || die |
| 1673 |
} |
| 1674 |
|
| 1675 |
src_compile() { |
| 1676 |
- emake V=1 EXTLDFLAGS="${LDFLAGS}" || die "emake failed" |
| 1677 |
+ emake V=1 EXTLDFLAGS="${LDFLAGS}" MJIT_CFLAGS="${CFLAGS}" MJIT_OPTFLAGS="" MJIT_DEBUGFLAGS="" || die "emake failed" |
| 1678 |
} |
| 1679 |
|
| 1680 |
src_test() { |
| 1681 |
@@ -197,6 +184,7 @@ src_install() { |
| 1682 |
# since they are used during the build to e.g. create the |
| 1683 |
# documentation. |
| 1684 |
rm -rf ext/json || die |
| 1685 |
+ rm -rf lib/bundler* lib/rdoc/rdoc.gemspec || die |
| 1686 |
|
| 1687 |
# Ruby is involved in the install process, we don't want interference here. |
| 1688 |
unset RUBYOPT |
| 1689 |
@@ -204,21 +192,27 @@ src_install() { |
| 1690 |
local MINIRUBY=$(echo -e 'include Makefile\ngetminiruby:\n\t@echo $(MINIRUBY)'|make -f - getminiruby) |
| 1691 |
|
| 1692 |
LD_LIBRARY_PATH="${S}:${ED}/usr/$(get_libdir)${LD_LIBRARY_PATH+:}${LD_LIBRARY_PATH}" |
| 1693 |
+ DYLD_LIBRARY_PATH="${S}:${ED}/usr/$(get_libdir)${DYLD_LIBRARY_PATH+:}${DYLD_LIBRARY_PATH}" |
| 1694 |
RUBYLIB="${S}:${ED}/usr/$(get_libdir)/ruby/${RUBYVERSION}" |
| 1695 |
for d in $(find "${S}/ext" -type d) ; do |
| 1696 |
RUBYLIB="${RUBYLIB}:$d" |
| 1697 |
done |
| 1698 |
- export LD_LIBRARY_PATH RUBYLIB |
| 1699 |
+ export LD_LIBRARY_PATH DYLD_LIBRARY_PATH RUBYLIB |
| 1700 |
+ |
| 1701 |
+ # Create directory for the default gems |
| 1702 |
+ local gem_home="${EPREFIX}/usr/$(get_libdir)/ruby/gems/${RUBYVERSION}" |
| 1703 |
+ mkdir -p "${D}/${gem_home}" || die "mkdir gem home failed" |
| 1704 |
|
| 1705 |
- emake V=1 DESTDIR="${D}" install || die "make install failed" |
| 1706 |
+ emake V=1 DESTDIR="${D}" GEM_DESTDIR=${gem_home} install || die "make install failed" |
| 1707 |
|
| 1708 |
- # Remove installed rubygems copy |
| 1709 |
+ # Remove installed rubygems and rdoc copy |
| 1710 |
rm -rf "${ED}/usr/$(get_libdir)/ruby/${RUBYVERSION}/rubygems" || die "rm rubygems failed" |
| 1711 |
+ rm -rf "${ED}/usr/bin/"gem"${MY_SUFFIX}" || die "rm rdoc bins failed" |
| 1712 |
rm -rf "${ED}/usr/$(get_libdir)/ruby/${RUBYVERSION}"/rdoc* || die "rm rdoc failed" |
| 1713 |
- rm -rf "${ED}/usr/bin/"{ri,rdoc}"${MY_SUFFIX}" || die "rm rdoc bins failed" |
| 1714 |
+ rm -rf "${ED}/usr/bin/"{bundle,bundler,ri,rdoc}"${MY_SUFFIX}" || die "rm rdoc bins failed" |
| 1715 |
|
| 1716 |
if use doc; then |
| 1717 |
- make DESTDIR="${D}" install-doc || die "make install-doc failed" |
| 1718 |
+ emake DESTDIR="${D}" GEM_DESTDIR=${gem_home} install-doc || die "make install-doc failed" |
| 1719 |
fi |
| 1720 |
|
| 1721 |
if use examples; then |
| 1722 |
@@ -243,7 +237,7 @@ pkg_postinst() { |
| 1723 |
|
| 1724 |
elog |
| 1725 |
elog "To switch between available Ruby profiles, execute as root:" |
| 1726 |
- elog "\teselect ruby set ruby(21|22|...)" |
| 1727 |
+ elog "\teselect ruby set ruby(23|24|...)" |
| 1728 |
elog |
| 1729 |
} |
Archives