diff options
Diffstat (limited to 'sys-libs')
53 files changed, 622 insertions, 489 deletions
diff --git a/sys-libs/Manifest.gz b/sys-libs/Manifest.gz Binary files differindex fb1009fc6703..10af4d2488ad 100644 --- a/sys-libs/Manifest.gz +++ b/sys-libs/Manifest.gz diff --git a/sys-libs/compiler-rt-sanitizers/Manifest b/sys-libs/compiler-rt-sanitizers/Manifest index b7c5762e66b7..02d67d4b649a 100644 --- a/sys-libs/compiler-rt-sanitizers/Manifest +++ b/sys-libs/compiler-rt-sanitizers/Manifest @@ -3,18 +3,19 @@ DIST llvm-gentoo-patchset-12.0.1.tar.xz 5280 BLAKE2B 963d005bc7b636570be90eb841a DIST llvm-gentoo-patchset-13.0.0-r3.tar.xz 10176 BLAKE2B fc5825a4bd3b85bd9c970901e5e036cc4c928373495a8a6f63c7f4531c7f52575d06f80dfbd80671d9f0fcd32d5c48d96f5961602b024c7a936362aeba8a612a SHA512 2289eef3f6301ade2e1110ebc4b66ad3db91ed10868ca7296a29c55667007e06739b01f38c0783bb2c56deadfb8a04605c370df9c5a4c6bc9aea9382e6ed52a5 DIST llvm-gentoo-patchset-13.0.0.tar.xz 5012 BLAKE2B 6760c78c086aaf6629143fd920b0a2c68cad9278628fbea8164dfeb59db95984a5b5d6b3505b510c697e8c95bf8d2be782c6b73c01622d52f2da9b07ecff39e0 SHA512 7764d49343b795b6bebae64f646ba27e3e6cc2a20b8a1aee645ce0d8474633c34acfbb73c08546fee415755dd4ea5a98c1d84db5e394cf5f4fc802eb61148ab6 DIST llvm-gentoo-patchset-13.0.1.tar.xz 6288 BLAKE2B 899222b962486e924e4f8a2b574d285531a3f87af9385ff68c81db92aa224a0cde6d4ee049b5405056bedb4b232b50e1d5840024071a4a215f6311853304c92d SHA512 b2805337f1deca626768a44c5e7ac9ed16e0c31bead1647d44a493a8123c1b8e8f1c8ceee3536bcc6fa87fdd3fcec408229f701adf30eff07e7ef9889b847b01 +DIST llvm-gentoo-patchset-14.0.0.tar.xz 4076 BLAKE2B dc114e53fb878ca74489c420506b9dd9c417e2b97dff4d9441d78a0a256ca1e7243ea2ce38b8665d37b0f24436f9ea5771cd05d9b13887e7370a19ec5e05ba20 SHA512 7f7d08fc762d634692fb251a51c0d73a4a9098907f25451b9ca9453315b603331b65a454b2d631cfecbb3fbc11ab3a36f644c0d7b03e1bb8e96ce4aa08d60615 DIST llvm-gentoo-patchset-9999-1.tar.xz 4032 BLAKE2B b9413484dafed8ae0c68c2c164b45fd07bb8d5d0898f03abe118fd2120ffcb1fb6c949de9649a97c2e8105f24b9d131a725c67c0a502ca4d4d192c1a0d65f49d SHA512 e64449eeaf756c5bd945109937b84ba4bd8a015222bd792d39cf3947871e87571a4ca57814790e51544cb05ad4c2d1f044e818e4caaac7c2e2a02cb1aa290fcc DIST llvmorg-11.1.0.tar.gz 122776532 BLAKE2B ca842ff4afff8f44c82b5e7383962a9c45ca1c93b64fa4c6ebcd70a1d3849dbad2b8e4e24fba02d144c6266d7fab3607ebc6999b28c229cb35256cf40f26a985 SHA512 9a8ce022a935eed42fa71a224f2a207122aadcbef58ee855fdb4825f879e7d028e4dcff22c19b9d336db1c8bf63fb84372d44981acf84615f757e54306c92b81 DIST llvmorg-12.0.1.tar.gz 134259748 BLAKE2B f41de787bc73ff2edfda1b22cc8602be6f65f37dd9e4c8888533cfa8c3ccdcf4f108aaab9de23ab0ab987966eb160f2a553a0bdff99461e71ddd5bfcd086090d SHA512 6eb0dc18e2c25935fabfdfc48b0114be0939158dfdef7b85b395fe2e71042672446af0e68750aae003c9847d10d1f63316fe95d3df738d18f249174292b1b9e1 DIST llvmorg-13.0.0.tar.gz 147270176 BLAKE2B 628f316b580e1edf3a58d4825b724df759e6ed2a4116802470c04562caefc392fa325c91f388036365a2e45a9595cca6d3557fab12984fc8bcfef29c9116d822 SHA512 8004c05d32b9720fb3391783621690c1df9bd1e97e72cbff9192ed88a84b0acd303b61432145fa917b5b5e548c8cee29b24ef8547dcc8677adf4816e7a8a0eb2 DIST llvmorg-13.0.1.tar.gz 147290251 BLAKE2B 2a44b012a672501761d0c27c6b3a315b69bfef0cd13b078a7e7d2fccc4a9c8c0f2bee0f164c4271c9106b0a99cb06e8b64986f66253b613336719fb86b82541b SHA512 9a8cb5d11964ba88b7624f19ec861fb28701f23956ea3c92f6ac644332d5f41fde97bd8933dd3ee70ed378058c252fa3a3887c8d1af90d219970c2b27691166f -DIST llvmorg-14.0.0-rc4.tar.gz 158082013 BLAKE2B 0e717898d8f1ed160e525a68aba56a84b7d31856ea72fdb8fa02e863c5a2074245a38d4a4aa7d178beab1ea64aa92d0ba9dcad4373ebb03868070bf718112107 SHA512 a942848aa5042b97bab6d0d5bcee11ea2f85f1244d7eaadb8f7000bf104b2160e6034c04e3755501dd178bc99c26669cf4aca40edb4bba598fdde6bcf3f40ddc +DIST llvmorg-14.0.0.tar.gz 158057350 BLAKE2B 7052684c620a5eaf52beeee4591adf58cfec9e64a5ee0b24f3d5849fd4df5b006e2906a839cb806ac69c33fab6013c58589b1d74e4fb8558758edcb7d5065064 SHA512 eb5acf96b5e2c59bd07579f7ebe73018b0dd6e2f2d9a5a3c7986320e88febd837d1084b9e5313a2264310342193044629d228337cc76dd2b8527dc0a8bdda999 EBUILD compiler-rt-sanitizers-11.1.0-r1.ebuild 6042 BLAKE2B b2e497920258f581395f794ac977615e42e153ea966fead3a7ce5fbd9c93831ec807f4b711ffc41a1ecb84214e3bd386ffc038b549bc9ade691b7f843a5032a4 SHA512 05092de752ccb3a1832eb834315a63e161b52a7bd4a52ec77b24adeff9611368fe1166bf7bd12b2111e15364a44d2573527111641d97b9e989e593342a4fbc9a EBUILD compiler-rt-sanitizers-12.0.1.ebuild 5959 BLAKE2B acfa1240b3ffa450fe5ede50a6d8bc9d32b06bea46da57f82c004fbde8e69693242037f9571bf885f56d16d3ead4711402f1c3a2bf65fb42741ea95b12a1baff SHA512 cf095eeaf547d431d60b11f147e5e8a03e3659a3b56ec98be4af3fdbd4cb3ed16891eb8066187bff27613f0c6a37d30d08725df95419b515f1038087c149ad82 EBUILD compiler-rt-sanitizers-13.0.0-r1.ebuild 6162 BLAKE2B e9f41c36aa12ed0257e3fa3298a5504e13243c1f73a0c4e425a9660751011f05856d09f72eb6d6c5fe9c901b670173931899858420352bc63627df69feccb975 SHA512 b134ad7badbd4f6540f8d683c5a0b0b583702879465caa16a13ab0f528328d7db92ed214dae6698371671fec582429032b0d7dbcdcefa94721395f4d366de60a EBUILD compiler-rt-sanitizers-13.0.0.ebuild 6154 BLAKE2B 97eaca6637d5f368d5f21e6640486734d1fb60fca89cc330ab19b7d129c425f8eefabfa225711a624018972b403329434e44e55fd1f69cf148d2b0d642ba08ae SHA512 31c7c45eec392795267f8ca2efa1f2894e183ef4fc5f575fbc531a60ebee3c90c4bb4a551f82a6723a3010ac5196a8c83cbd1b7e49704d9b9cfbe1cc68753cf9 EBUILD compiler-rt-sanitizers-13.0.1.ebuild 6339 BLAKE2B 0b59bece9f63cbbd363b8724dcff68626d6117446d0a21972a8147e7794873ae19841ea045b140c5c8d632f01d219f80211a371415b91a6acc58257726f8c437 SHA512 f53ac3fbc24fd119f3809563c772d72cfc0702d935cf5172f9876a5edf215f41f3b18249f2f3366e365a7828ce4bbd08389bc49ded65ec6cd7309e42ea16fcf2 EBUILD compiler-rt-sanitizers-14.0.0.9999.ebuild 6273 BLAKE2B 74cecea17e26529cf75ada6ba68c169d587033de3320ed5ed5f31ae85935cff691e9b025011338b34ea50d1a747f8fe2f3fe25874072cfb328704906d0c298bb SHA512 701c5f5d70c20d7cd1276763d7198438dc53772c2b2713be82a96b05d5ef3797d2866eb94b65b16d2a0e3f842caffe4578c12dc3e775368ebc0d7afc8811be0e -EBUILD compiler-rt-sanitizers-14.0.0_rc4.ebuild 6273 BLAKE2B 74cecea17e26529cf75ada6ba68c169d587033de3320ed5ed5f31ae85935cff691e9b025011338b34ea50d1a747f8fe2f3fe25874072cfb328704906d0c298bb SHA512 701c5f5d70c20d7cd1276763d7198438dc53772c2b2713be82a96b05d5ef3797d2866eb94b65b16d2a0e3f842caffe4578c12dc3e775368ebc0d7afc8811be0e +EBUILD compiler-rt-sanitizers-14.0.0.ebuild 6348 BLAKE2B b5af3a1463dbd380734be4ac8bfca915433b6211d2c4a4c1d72d78a9fed3ad6019af27acd3ae35ad2b5c08c1c79dc474fcd4ef61081486db7287ebebbb0aefd2 SHA512 2c20d2182c590f03eab7a59861da8ae324446df3d5a4a4d6b23f49ae9090645c494fc9673f43b2648b201ac330dab9fb104823435763713772e1bffd7e46f44b EBUILD compiler-rt-sanitizers-15.0.0.9999.ebuild 6273 BLAKE2B 74cecea17e26529cf75ada6ba68c169d587033de3320ed5ed5f31ae85935cff691e9b025011338b34ea50d1a747f8fe2f3fe25874072cfb328704906d0c298bb SHA512 701c5f5d70c20d7cd1276763d7198438dc53772c2b2713be82a96b05d5ef3797d2866eb94b65b16d2a0e3f842caffe4578c12dc3e775368ebc0d7afc8811be0e MISC metadata.xml 1330 BLAKE2B 8381c36fb0ee37358cebacf512ee2a0ff6f2c0fc8e05544d9dc1bb1e11bc53f4196c2ecc6c8eb66c833f266c8d12da2c92a5f0b94cb3404397f925f9ebfc2a72 SHA512 6ea6159eb0929dc9f009ab326295549db329f7594dd5ff82e255238ed1fb17e3e8909079c915c6ae4829bb853666456772d17fa2078a332f6340807d6cd4f20e diff --git a/sys-libs/compiler-rt-sanitizers/compiler-rt-sanitizers-14.0.0_rc4.ebuild b/sys-libs/compiler-rt-sanitizers/compiler-rt-sanitizers-14.0.0.ebuild index 12e5eb2d01e7..b0a36755b564 100644 --- a/sys-libs/compiler-rt-sanitizers/compiler-rt-sanitizers-14.0.0_rc4.ebuild +++ b/sys-libs/compiler-rt-sanitizers/compiler-rt-sanitizers-14.0.0.ebuild @@ -11,7 +11,7 @@ HOMEPAGE="https://llvm.org/" LICENSE="Apache-2.0-with-LLVM-exceptions || ( UoI-NCSA MIT )" SLOT="$(ver_cut 1-3)" -KEYWORDS="" +KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86 ~amd64-linux ~ppc-macos ~x64-macos" IUSE="+abi_x86_32 abi_x86_64 +clang debug test" # base targets IUSE+=" +libfuzzer +memprof +orc +profile +xray" @@ -51,7 +51,7 @@ BDEPEND=" LLVM_COMPONENTS=( compiler-rt cmake ) LLVM_TEST_COMPONENTS=( llvm/lib/Testing/Support llvm/utils/unittest ) -LLVM_PATCHSET=9999-1 +LLVM_PATCHSET=${PV/_/-} llvm.org_set_globals python_check_deps() { diff --git a/sys-libs/compiler-rt/Manifest b/sys-libs/compiler-rt/Manifest index 697b06855d60..acb54dc3db77 100644 --- a/sys-libs/compiler-rt/Manifest +++ b/sys-libs/compiler-rt/Manifest @@ -2,17 +2,18 @@ DIST llvm-gentoo-patchset-11.1.0-1.tar.xz 4032 BLAKE2B e69138a422e315b31a3d9c11f DIST llvm-gentoo-patchset-12.0.1.tar.xz 5280 BLAKE2B 963d005bc7b636570be90eb841ac5bcaeb927538cc7de27683167111a17d6496677c7517de2ecfaf14b5d8ac22bad357be490b8a2ed9aba502fd5f447ecc99e9 SHA512 fc7c38e671555751650299c3a8bee44d5c7f26e11b68d5538c507fb7fe9ff2d349bdcd43bce90a448a747f082d523b3849d6bcda5e3ae2e998edcb926d6aa249 DIST llvm-gentoo-patchset-13.0.0.tar.xz 5012 BLAKE2B 6760c78c086aaf6629143fd920b0a2c68cad9278628fbea8164dfeb59db95984a5b5d6b3505b510c697e8c95bf8d2be782c6b73c01622d52f2da9b07ecff39e0 SHA512 7764d49343b795b6bebae64f646ba27e3e6cc2a20b8a1aee645ce0d8474633c34acfbb73c08546fee415755dd4ea5a98c1d84db5e394cf5f4fc802eb61148ab6 DIST llvm-gentoo-patchset-13.0.1.tar.xz 6288 BLAKE2B 899222b962486e924e4f8a2b574d285531a3f87af9385ff68c81db92aa224a0cde6d4ee049b5405056bedb4b232b50e1d5840024071a4a215f6311853304c92d SHA512 b2805337f1deca626768a44c5e7ac9ed16e0c31bead1647d44a493a8123c1b8e8f1c8ceee3536bcc6fa87fdd3fcec408229f701adf30eff07e7ef9889b847b01 +DIST llvm-gentoo-patchset-14.0.0.tar.xz 4076 BLAKE2B dc114e53fb878ca74489c420506b9dd9c417e2b97dff4d9441d78a0a256ca1e7243ea2ce38b8665d37b0f24436f9ea5771cd05d9b13887e7370a19ec5e05ba20 SHA512 7f7d08fc762d634692fb251a51c0d73a4a9098907f25451b9ca9453315b603331b65a454b2d631cfecbb3fbc11ab3a36f644c0d7b03e1bb8e96ce4aa08d60615 DIST llvm-gentoo-patchset-9999-1.tar.xz 4032 BLAKE2B b9413484dafed8ae0c68c2c164b45fd07bb8d5d0898f03abe118fd2120ffcb1fb6c949de9649a97c2e8105f24b9d131a725c67c0a502ca4d4d192c1a0d65f49d SHA512 e64449eeaf756c5bd945109937b84ba4bd8a015222bd792d39cf3947871e87571a4ca57814790e51544cb05ad4c2d1f044e818e4caaac7c2e2a02cb1aa290fcc DIST llvmorg-11.1.0.tar.gz 122776532 BLAKE2B ca842ff4afff8f44c82b5e7383962a9c45ca1c93b64fa4c6ebcd70a1d3849dbad2b8e4e24fba02d144c6266d7fab3607ebc6999b28c229cb35256cf40f26a985 SHA512 9a8ce022a935eed42fa71a224f2a207122aadcbef58ee855fdb4825f879e7d028e4dcff22c19b9d336db1c8bf63fb84372d44981acf84615f757e54306c92b81 DIST llvmorg-12.0.1.tar.gz 134259748 BLAKE2B f41de787bc73ff2edfda1b22cc8602be6f65f37dd9e4c8888533cfa8c3ccdcf4f108aaab9de23ab0ab987966eb160f2a553a0bdff99461e71ddd5bfcd086090d SHA512 6eb0dc18e2c25935fabfdfc48b0114be0939158dfdef7b85b395fe2e71042672446af0e68750aae003c9847d10d1f63316fe95d3df738d18f249174292b1b9e1 DIST llvmorg-13.0.0.tar.gz 147270176 BLAKE2B 628f316b580e1edf3a58d4825b724df759e6ed2a4116802470c04562caefc392fa325c91f388036365a2e45a9595cca6d3557fab12984fc8bcfef29c9116d822 SHA512 8004c05d32b9720fb3391783621690c1df9bd1e97e72cbff9192ed88a84b0acd303b61432145fa917b5b5e548c8cee29b24ef8547dcc8677adf4816e7a8a0eb2 DIST llvmorg-13.0.1.tar.gz 147290251 BLAKE2B 2a44b012a672501761d0c27c6b3a315b69bfef0cd13b078a7e7d2fccc4a9c8c0f2bee0f164c4271c9106b0a99cb06e8b64986f66253b613336719fb86b82541b SHA512 9a8cb5d11964ba88b7624f19ec861fb28701f23956ea3c92f6ac644332d5f41fde97bd8933dd3ee70ed378058c252fa3a3887c8d1af90d219970c2b27691166f -DIST llvmorg-14.0.0-rc4.tar.gz 158082013 BLAKE2B 0e717898d8f1ed160e525a68aba56a84b7d31856ea72fdb8fa02e863c5a2074245a38d4a4aa7d178beab1ea64aa92d0ba9dcad4373ebb03868070bf718112107 SHA512 a942848aa5042b97bab6d0d5bcee11ea2f85f1244d7eaadb8f7000bf104b2160e6034c04e3755501dd178bc99c26669cf4aca40edb4bba598fdde6bcf3f40ddc +DIST llvmorg-14.0.0.tar.gz 158057350 BLAKE2B 7052684c620a5eaf52beeee4591adf58cfec9e64a5ee0b24f3d5849fd4df5b006e2906a839cb806ac69c33fab6013c58589b1d74e4fb8558758edcb7d5065064 SHA512 eb5acf96b5e2c59bd07579f7ebe73018b0dd6e2f2d9a5a3c7986320e88febd837d1084b9e5313a2264310342193044629d228337cc76dd2b8527dc0a8bdda999 EBUILD compiler-rt-11.1.0.ebuild 3506 BLAKE2B fea54ca4aabe9bf35afc64a579ae18eb4491eeecb58ede43369ba9c294f624851214525f399cfa3adadee70ca66cbe64821376272b9965304266bcfc07b9f220 SHA512 f50906ee9f3b044a251ddd56db6ce10d3d2b632ffa7d3fd608cc5d7320e8d4b47b1ada26965b5fc9bb746e77c1b01ec61b5f719bc6bb2805720df035fca993da EBUILD compiler-rt-12.0.1.ebuild 3539 BLAKE2B 7d6bd0a7be4fec1b8427aa9d81eacf69d3338490c70f097910ad0bb4a67f0313ea8fd6bae15a5e05b8805cad6a789124d94ee91577a58beb96f471a1bf49c3b3 SHA512 bd671f1896182a00ade3b53252ba6b7cb8a6f65eec3d806bbfc7bd4e2b9253a8bc2bd497c018705f34fb30ad1897693af268c6e4cc39e044c788807042d7b55e EBUILD compiler-rt-13.0.0.ebuild 3717 BLAKE2B bb6b7ccb4ee20e7da325bd111adefa0c212be6b6291d71e2553d31b56e0c95e7a50ea5ba2b2107bf3cbd052126491ae5811844a06a60b742069cb8ca268c8315 SHA512 03e3925de867fefa79ffc8bf6a1b53020452ccda98d79dedc09b4d2c5dddcef07890b2055c7774ea054241cb124f0629819aef9df1102cb70b6e7579ed52aa44 EBUILD compiler-rt-13.0.1.ebuild 3870 BLAKE2B f99226a8813fb7226292c663b1af2735480be598f81b41968cf3fffff2cdf646b5679308194ada0fa1e1007662392e3682edd0fd0ebf9fb4ba91080f555cd115 SHA512 e81c802f8c41469dd9f7bdf3620835d17613df28c1b2f27d554efdca4370b7bddc44b790abfe133318564b762dc95861b83eca5eacf843002928f03091107280 EBUILD compiler-rt-14.0.0.9999.ebuild 3804 BLAKE2B 82c0f8ca2a0505fb8365fa410d063df60f79a2bc5148f9d0372e2e987121d88bc407542eee0069d3b8495158fc51054e8087c09275eeb3d935132dadb4866271 SHA512 3cc9e175bdc873aa27f753c12562107aaacee59f066e305ccfbd80444e45abd91d7139251b100541e598c88d31fc899e5ac25f96edf398ec203d2a0964da6afa -EBUILD compiler-rt-14.0.0_rc4.ebuild 3804 BLAKE2B 5e4c91ff5ed9ddd0c4567b540a2eb4607434000b26ad826c706c806aff443b2b33e86911f09b9c380ca6a052c0012ee2bcb7e464dae67c254793463fff605241 SHA512 1b23c0bec12a5b2450cd4d6e5b09248607f81b7a4c70b074340d3975172bf9a077da89f308af7ae32ee4bfa4d6a080b4cfa08fc1c8c7fcfc661868a0266bbc31 +EBUILD compiler-rt-14.0.0.ebuild 3879 BLAKE2B f67b9247bb931ef6fe9de922e98842a2df8271e17eba634a34bab201670a8e0ada3a252b378e4a5584ac8d40a32b254a2970a1294dfc75a9198757f4164f403e SHA512 2cd68cecd5e1207086f99d469234fb147e3b64fc65a111260e18b1668efcbe1caa2ce3852a528433bc8c27d0f3575e8089c4d8b118f0ed86ac8941c9a9f9b3c3 EBUILD compiler-rt-15.0.0.9999.ebuild 3804 BLAKE2B 5e4c91ff5ed9ddd0c4567b540a2eb4607434000b26ad826c706c806aff443b2b33e86911f09b9c380ca6a052c0012ee2bcb7e464dae67c254793463fff605241 SHA512 1b23c0bec12a5b2450cd4d6e5b09248607f81b7a4c70b074340d3975172bf9a077da89f308af7ae32ee4bfa4d6a080b4cfa08fc1c8c7fcfc661868a0266bbc31 MISC metadata.xml 334 BLAKE2B e52ad011edc624e8b4c6449a9c77d0972222c4e3ecad01ea24eb9f3175053b191df6267886a186bc3e169581b86b624b6c77f37fac763a12129a1dd8cd6ee285 SHA512 1bf0f62c12690e6596650e8872405fc53bc3c4bbddcf80e02b3bcce9b762f0aa02d462949b9b54c0c930ca6cce5518333e79951ae57378def8eb9719463a9297 diff --git a/sys-libs/compiler-rt/compiler-rt-14.0.0_rc4.ebuild b/sys-libs/compiler-rt/compiler-rt-14.0.0.ebuild index 1c847a474a08..0ac188065657 100644 --- a/sys-libs/compiler-rt/compiler-rt-14.0.0_rc4.ebuild +++ b/sys-libs/compiler-rt/compiler-rt-14.0.0.ebuild @@ -11,7 +11,7 @@ HOMEPAGE="https://llvm.org/" LICENSE="Apache-2.0-with-LLVM-exceptions || ( UoI-NCSA MIT )" SLOT="$(ver_cut 1-3)" -KEYWORDS="" +KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86 ~amd64-linux ~ppc-macos ~x64-macos" IUSE="+abi_x86_32 abi_x86_64 +clang debug test" RESTRICT="!test? ( test ) !clang? ( test )" @@ -31,7 +31,7 @@ BDEPEND=" )" LLVM_COMPONENTS=( compiler-rt cmake ) -LLVM_PATCHSET=9999-1 +LLVM_PATCHSET=${PV/_/-} llvm.org_set_globals python_check_deps() { diff --git a/sys-libs/db/Manifest b/sys-libs/db/Manifest index c4be38f2320d..a19eac69f2aa 100644 --- a/sys-libs/db/Manifest +++ b/sys-libs/db/Manifest @@ -1,17 +1,14 @@ -AUX db-18.1.25-test-link.patch 1443 BLAKE2B 819038f07f0329575eecdb5891b16114507d9a530b434eabf748367baf86be979198dd7aeb904af14d9b3643e013e2ec34257bc254724351dc62dab30029b5b8 SHA512 e3cba1c842dffbbf1bbf353111ce41cf46078d03d9b42052ad72081e9b9434eeb3eedad42d532dba9f2c90b36a620f2a2f9a65fb98477e5b1fa6dfc04ba1ec0e +AUX db-18.1.25-sqlite-configure-path.patch 782 BLAKE2B ecca297f94f161010c05aa018369430f2e1173ac7c2f76f4f15b3965f88547fb4403282890394dfe897b9c97da9b89dc0ee7865264463f29f2647f032c47cb88 SHA512 442a7a43c47664ce806d3026c17997a5cb8b087ac6538c170b17bd42fc81ed0ea0f38b32c8cb6728e18ef7fffa5331b2e53f5e2e0b425d3fff8c260a6aa57063 +AUX db-18.1.25-test-link.patch 1425 BLAKE2B a6a586008fde747c36734dfeff77178e1fd97c76ed87d8bbfeb7fab20327b4f224382269bd75255f80dbda3021e3d15fc93f144667ab6c0ec5bb491577f1ac51 SHA512 ccfe99fdae653d8380288ddbc47aacae52957ce8eb4970dd5cb877cb6bf97013f60244ef64ff086781e2abd3b2106f8a832bbfc190539f88fff2f05f678aa3b6 AUX db-18.1.40-fix-docs.patch 613 BLAKE2B 5b3c5f8b35624eac5c14caedac9ffadecae26122a0024b2c42c75d9c10e8ac414b2195a29cece5a680ef30355d20c5bf5405dd7bb03647fbf2d603c5abc66417 SHA512 ddd0daa3de0efa363764abf1dade45914f6bdf44d883c2b0b3ea1c96c2cff0889b5078beea274113169c9b056135a09905e5083d6be3e3139e74f86ef61deb1f -AUX db-4.2-listen-to-java-options.patch 244 BLAKE2B 221f39b4cc6e4d4ce91efb90a5b207e634f8d362fbb34d1fe9c57960323cce71507e49a4aca0a6187374a37fa77208547e56edea2695d7b1111d96345469cd1d SHA512 20103923b1da278ca5a682ba0a74183d9c8f68a4774af51d12884d7d405fe7ec27f82b0b49a01a6453b96798db995b1f0fef34f2aa40a3b66db48efddb94af49 -AUX db-4.6-jni-check-prefix-first.patch 1104 BLAKE2B 830f19c74df5730234496f8035c943ee13388154a60fca4701f7a72b4c2685550cd95892d9edc406ee29889af94df2ab5094abf35362da15b0669fbfe73b0165 SHA512 78791ada74d91e572e35d33f60d0174705916655c0e4db4844b73bc3e9dd71a65b916e153c087c0ede1d4a400588af7674b7e69804d8a2883e45992904b0b3f3 AUX db-4.8-libtool.patch 2080 BLAKE2B 9a3dae0587dcf97f41b2991a577a92a558cf8c171c14e703dc5e83ab8292a00e37fb939922197c0b0dbc96c6462faf27cead0fa3535c0e798378d8c2b22b546a SHA512 b1298a1f98c7a99a05cae1f205550d7019a488c9f049bc5e6ee32d4fd7a5ec852ae4d41b7cfe928917b57b9e9949460d907cd5926fa7cdafe1c8749191996218 -AUX db-4.8.24-java-manifest-location.patch 592 BLAKE2B c8e295dbf888b3ef832ea3536f91a6be49a0ce9ed90fec92ff90cd0288b4eaacc4f4eed43599dce61e79454372844f150e24a8f054104cdca22f5ae9861c3444 SHA512 306503befbc76b1b0775adb94185407fbff23f467d474e0ad3b28190edfdb485942d14c3a53a7cde71213f49bc548a7d271fedd95286920ae5c21778e139fec2 -AUX db-4.8.30-rename-atomic-compare-exchange.patch 836 BLAKE2B 4d837c6850d35327c79d9adfc138759e09454d222a63c16f7ca3f5bd36b7f12107a16962cb3f37ba9464d8acec19dca020223e33e45dea5b0007f10fe1ec248d SHA512 1a4be944b1d41483fb4429a9454a3e9446b41720ff829c0b90b09bc3f9838c798dc3f9e0c918332d0933d6bc62b9b13b3f8251463f1fbddfddbdb341adbaf5ed -AUX db-5.1.29-rename-atomic-compare-exchange.patch 852 BLAKE2B 2c521fc843bb6764f076dde6ed640a9641b35698b9ad9fac06d2b820046a060264560f2219e516844ac3ad5fd045786f920aac8a2e8f62a01807e3f8caecda04 SHA512 8ba96cfc3e484a839b8651214f0769b35273c6235de7e53d5118eb0347f5a477f75e3336a12f1399b7748c6b6ab95aec39c8b813d7b227dd61f37ed4ab52f7d5 -AUX db-5.2.28-sqlite-configure-path.patch 906 BLAKE2B b3c41488954e113fcc7dc8788ee2b2b2e53629302e5a0f4bd32f092213bf9ef23120f56551d0d2f4be17ca9605969c555b604401f19054c3b4848e9c3bb94ba4 SHA512 ed0e683313f780975b3aec60018b08569ebdd38e4cdf60de170ef0bc4fc63d602e7a5572792f2634f3680e763b74ffdb0a5b484562a10a4b82b28b19c3acc565 -AUX db-6.0.20-test-link.patch 1568 BLAKE2B e61cac8c00aa5db4ef224b94f1214eff09beda3f088a8a56c6ca917e37a6f4bf0538b3cde7dba166419397975ce0c13d352298009c75a4d729bfb855dff926b5 SHA512 0e091949a071e76439cae4bb37cfdd6c4e4f586c15adbaa6d5d1c9cca5a4982f8e5960d968b41c4368d99556a95b172a6ef1331daf90fb87a77567fc7343f980 -AUX db-6.0.35-sqlite-configure-path.patch 764 BLAKE2B 9c0f9f4cce511d407b760572a31c83d7d49f0c98b104c519c30eb3cfa054e9b300c7f869b27392fe1063533aa0eba22d42016a0d5b5908cebca4cde70f426a8c SHA512 acb6aa901d62a5c5f4ae22e9d2e0bb89101038a3e91c2d65845cd514cdb0e38c3aa15645701024dc5ed39372850362a24b47faa96a0a81f8149958d8ebabdf17 -AUX db-6.1.19-sqlite-configure-path.patch 727 BLAKE2B 46b5f562042be34e134dbc8bf66f9a1a282992253ae1473960255765aab16df348c472772a20f7a29c49cb0478edff78eadc40e91dc5b96d622b5f69fa164b5c SHA512 6d15c1ec5726998001a6dfa6679bd6f55fe70dc16b1cc531709ba49ee962531e3b4e4bd91ac3a5ea0d1b0736632e66269638651e42a3bbf7697785cecb87aff7 -AUX db-6.2-jni-check-prefix-first.patch 1302 BLAKE2B 4703beff3c14e0218d4b8b3b911ee912cc80c2ed42730e7b11eb728c9ae16ee535baf628dff6c62bb3cf25d262b87896ab3ed5df5b2bd88968f1fce62b0b7095 SHA512 662fb5e1b292dd87b11db7cd071b280863d2cb7c5e1e8ec7149e6ecc5d0db0c40a0b3995503c27ff0dd0d3d5fb274a7f72736058edd2e5b52521048e11253a30 -AUX db-6.2.32-jni-check-prefix-first.patch 1575 BLAKE2B 5230393b8f40e6ef329590b0037a975dbc60f23f3ce8a603e3c21cec5b0bb311a225c1d8558cc3c6bfdb658e88c83f441c45aaf556051aee8ba83f9262616ba0 SHA512 eb0739c46f88ad9538e4a467e8547f97404747633942ec6b05eabcfb7ba427ff66c00aa5dc95cb9518056b861c240898db4745dd3626ed95e7cb01c54b47dccd +AUX db-4.8.30-rename-atomic-compare-exchange.patch 761 BLAKE2B 01d01cb784049f7d598945d205b560c84c1dfcb0bfad733a31182122c9be30177051284f364b2846805b4d639de1e259554b9bc89c092d285a577276eb83eaed SHA512 8733ccf1b6c3072b7035f4cc976b151bb5331a4be6a23736baccf05268f869f594fc39b843b37cdd5b84e48f8af035f05d676be0b17c6031299f682f4793b4f6 +AUX db-5.1.29-rename-atomic-compare-exchange.patch 769 BLAKE2B a6110550327dbe154ad21a053f8ebcb2a37506228c34858337b1bf375b290a351cd75405f50f567b3b56da6a2871e1f166e6e3b972a92808f841fe6f64cfb159 SHA512 25121cb7aaa08d46fb206a1437bfb2e180c4c3f5866bb02550c49bc5084842b330f9e1c47df6fd2eda72003b9ab510199588ff05a0f2e115e91f3990805dcd8f +AUX db-5.2.28-sqlite-configure-path.patch 733 BLAKE2B 7324ab06fdf2b7c05ad03d4a91d9c62af8e0fe07db9474f3874cb3e8d50fd90e08d85a743d84062ef2ce1895d999572b3d862e3f525e719274614e2c3cf802cf SHA512 18f5fa82c236e6961711b0a41d43d2cd7b4a4b72759df69ba265a49a55023f17b1356b8a5d1c1c539d69eaaaaf4f525adbd7173acb3a8ab7eae838dd10f54021 +AUX db-6.0.20-test-link.patch 1395 BLAKE2B 639f40b16fd225a57825387d75ac8bd961b11ffe653a8f2b9fa9526251713e48d8c877624e257f63c6d88a6c601e787ae44120477aa517c37c1e279298dfcaa8 SHA512 206bfe3fce4b4f8476c5d885fe8f004ce4437e42e33a6b8944de780c58bdbd8c0e7380e43113be5efeae86fcd50a12f8fca96ceb38539bb9624898a24395d408 +AUX db-6.0.35-sqlite-configure-path.patch 748 BLAKE2B 570c499549fddd62fa4d14a6eb7830dea3da6b60a05c9be6e5e5169dd9ee7b2e032b4ba9669d8de3985a2717101f7b709e1c26efb5a3200d1aa0d6511bed5d16 SHA512 fd8a4eed5d54f3364c5d3509a238db1f1d62b3f13b75ba1e58a20659c83d038904562d32cc4cdde41b324623459e50071b507979b3fedbc85f2231e6784f1227 +AUX db-6.1.19-sqlite-configure-path.patch 711 BLAKE2B d00fe596fe422f152889fe0285a5b00d2fd0724a9406f27ef904cc533c0197c6ad340946256cf0ccc388b7126c61bcdbc37921c84028e742201d952c1f2e1df6 SHA512 d79c2520c75d0f96049e0b7ffa168de5aaee9050927d8b1ffaa5a4a7fc64b75654906f182e7aa5e0a33d55402655b2d10981849f15cf6b4bec5c6feb080de1c5 +AUX db-6.2.38-bashism-configure.patch 425 BLAKE2B 68e67fd52ffc11cdc23b8e19954b34a320faad8f001bb4282464caf48a5911f58db1824cd8f2803968f3b4b31084999b8b04967cd917111b099ec2d43138dd44 SHA512 b6c5e44055d2d763ddef12f48a030693deb0addd9b72f63896a9c9bf61a4ad243b0c663b3f8d60a84b5dddaea6b7fbb76f0bc9de53065b030a3431a59facc8c3 DIST db-18.1.32.tar.gz 44244747 BLAKE2B b539d8966a269f6a9440ef442248849f12c6b1eda79b9a41074e1eb0eb4930fd4674dd0e20a114e4020fe2ce19832572c4c86d458835da39a99f639dc3c4e23e SHA512 890b3047c28114ac30794c0234126b0b2a3e699f3ed259831091f02d51885e3583dd10c0ef0cecc215b9b8d80b48a2d3a82a5793cd3816afb45f6cc19ae23f25 DIST db-18.1.40.tar.gz 30763705 BLAKE2B c7235cbdf82d8e38450c98baa1ff67132f6132d59a43dd2d6ed8bc2672b7924b4cbd93320278a0a3a78e454caff622b4480abe8dcc20c94ae56a78b3569a76fd SHA512 53787164fb8a198a0178c7f58d891c2b0943d1c52b11fe9de525938469327e85664f0bc63e33d740c171bc370954710a6b3e8b9be2a08237fb9757a795c5b19e DIST db-4.8.30.tar.gz 22887305 BLAKE2B 10487580a371fa97ef5e468e1fcc4af68490934a82467da88b723f7d4ce403cd5f2b77bd95c218dda58161fe30bfef81f5093a8e5176f5ad5f482251c07c6423 SHA512 d1a3c52b0ab54ae3fd6792e6396c9f74d25f36b2eb9e853b67ef9c872508a58c784c7818108d06d184f59601b70cc877916e67dfea6f0ee1ca2b07468c1041f1 @@ -19,11 +16,11 @@ DIST db-5.3.28.tar.gz 35090431 BLAKE2B 5b77a4ec0945fa96ce6c2b452fb4b029295e037fa DIST db-6.0.35.tar.gz 36532251 BLAKE2B 22fbe557ccc13e4b936db8ca7d6ba11ce42e477bbf39f7e472067e06fb5910b1147fa58a44ac944c24a51ea839f1c61edda6bd8f3c450acac0c13d7fdba11e89 SHA512 002db1553def44efa715095b04b2bac2de7450cdc7142586d1d8b5d8ce79ee5e98f824b3bd276cd586ca932dc51ed35a9ffbed95b2b9847264f262cfa092479d DIST db-6.1.38.tar.gz 37644337 BLAKE2B 32b3f65bef04bb18e45c3c0c9110d5d0bf58f4761bee5bf07949e192f4b9f5fa28117b1696c17863da0affe408bd6c81eeee32c472c46d31c17693519959ff03 SHA512 5760d1e441bea11c371825ac47203b1eb9f188f9cb2ea0e3d547b3d3b15620d27cb0b3333d617eb7b89c53407fb7ed79cad27477d714b5b797869f8bf4b1808b DIST db-6.2.38.tar.gz 41298311 BLAKE2B a04a3344058b1d9982f39628c1114aded8f8c860753853c8b487e9ea14bd69a0391301620396d22204b3c8f25945c3f5485ea4792567e2d903a657541204d297 SHA512 b357932e4a5856b9cf8cf42050a307977eee8483d24a32ad938611545178fb1e6be597c1542a11466b1fb31ef4ef47b519deea1c5310a6460495281539083a19 -EBUILD db-18.1.32-r1.ebuild 6912 BLAKE2B ac4bec54fedf37e5f093bc3d8ae60e020ac9252e2547a2ef080c19454edafc1a499046bbd8d805580a37f5ec23f8726b55fd8da7f3caab73286a186833f5e6c5 SHA512 24e3b227716ed725b434d3da0c7a6b174c4964d9b26be389087376c1d98614bde66c83b59dbaad9440b93d2749f4dcf8f05c10f12c0c6672edb34179284d0059 -EBUILD db-18.1.40-r1.ebuild 6844 BLAKE2B 91d803f6c72eeae01410ddbcadad18d5bffc321123f374d3599bbadb7d4c69ab2071f7134814c69f158815317640a779257b93706fd07d6ef1dd8939ff7ff296 SHA512 e006904a600c7907a621fd6af91b5d6c1b9c70cc55fb19df80d16629a2815fbbb5c3932d903f01e5a269addbdb5cc03915e20b21571cf8360ba1c58c5ad30bec -EBUILD db-4.8.30-r6.ebuild 5234 BLAKE2B c8f8b141eb5d9c2d1ff25b9faf7df72878874395aa73e401c7ed8c229479fd52757c0111e7865a63a38fcf62950e5ce9212ea64e5be93417fdd0ab5e5ae812d8 SHA512 f56d829b4166ffe5d2fa44396ee2c05543b2cc8885e62e75f04b2503973feb7d7361e610ede6a1f0425d64233e777a12aadd5d61c769bcff1ecce96d5d477839 -EBUILD db-5.3.28-r8.ebuild 7158 BLAKE2B e13767e068447cf4ceb49d1497e4006469a5cb98cacaa08463ba29a84b19a6c594895068ff94e7b61e2c72b3765a7dbe844a9de5514b732e1726c5531dec7af2 SHA512 898cef2b4da5e145416d716e8c363ec7f32faa878662f64c9a50513713b916c8fe27ac96049814ceccae5efaeaffd440c95894092377e7621eb3a60869cda404 -EBUILD db-6.0.35-r4.ebuild 7171 BLAKE2B ff986f36576a53a417d2099fe384766bff9ac9325ffa919d3edf69e81460f4f3e9ed7d296f039d4e76fea1c62a72dd6f6623a1901620e3aaf4b808da74d6f0aa SHA512 ea324b57f6cf094ecd4d8e56ced05c78e6d97efb9cc6f645b35a15d9bb4bad980fea54bb2fd37e3248948d0e139c8f861ebec1a31e7695dd2a8c104e7d8cbc55 -EBUILD db-6.1.38-r1.ebuild 6961 BLAKE2B 7507744c38b054e4bfd929e576ae6f5a34dc1c5377407b76c5d7525f6ecfb4799cb2cd618c6eae9343f587110d27d954bd5d1385d8c71aea908e10081ccd1aef SHA512 d6aae878dc7707672c4b8e4af1827a001ae5fa0070959ead6552711d09d45c9d7f0e48eb87459a94e5944341fa8d97dd8541df5c475e039e479dc249512179b4 -EBUILD db-6.2.38-r1.ebuild 7174 BLAKE2B d66ce4b678328c88a8c97f899780177e3ba3a369f42ab50bde09d1097434cd9210639356797559cd88069f70d69d40e98a82c964c84b8ad6966ae5b18fb9ba2f SHA512 59bd01603384927a3a45846b9064a3a63522113ff3d9f9384d4b6eb7c1edbe272495104b4c45582e2e35aef295ea80f81a25e3346bac4a8264eef7d0a3f034ad +EBUILD db-18.1.32-r1.ebuild 5960 BLAKE2B 0c5376bf33a91c69c3f0bfe3baf9b4f99770082ebbbf202ac436a9a1b9d8f9ce8e59f8e2670c0a524848717e98991cbb0e628098d060af99cead9fa5ef82a632 SHA512 3f5dca955df5d78f95baaeb2f64ae30e67f7ee30656e962ccd119f8a88d45905fecbdf5d29a2e72b5e63c41ef849db6961b22b86cc03aa132a0114fc00310d61 +EBUILD db-18.1.40-r1.ebuild 5877 BLAKE2B 225c7e6250140cc1c8c81f0b99a326e5b3ea0007b5b8804155b45e4b3c82fe09bb704590379098789ea43a657d0e72e79b1bd2e0c0dfd69c4615685010939d51 SHA512 6d9052607d2bf864d3ded422054b55a387c7cbc17f2575c879b7333be22b57507f186598f4107167a914dee7594c0a98d5e1628aba40a2c3269dc95ef0b73905 +EBUILD db-4.8.30-r6.ebuild 4304 BLAKE2B c9021ae73d814d5f78e0fa9066a27813729d7353fb62b5735dadf7394dbc586b67e4f4703132396f9b80906c70353cde6ae1113cab8ed5778894d6242024e648 SHA512 6509604b1624b47f5e3a51e2b37e5de002836d23a4ea4633b994a4f168c44804dd2283904783473391e160cae5462ed6c087da893d2e4e06440f7db6456246e9 +EBUILD db-5.3.28-r8.ebuild 6274 BLAKE2B 47e32b5796b11c9d794a0ac69d5983d89b17c88ea98b2e50b9678fd9ae1d0072a8c28dc126d3c787324d84f04fd7db9f3d6e1eebea32a29cf35b1f295f4e14e0 SHA512 8b200232eeeee74f7e3cd23f53b202a8da8f3e215ee3a21ee62f57729fcea533379b8515a48de3449442a3b75abd40c4a1bcbab197366e9e82af9de201671dd4 +EBUILD db-6.0.35-r4.ebuild 6221 BLAKE2B c5c9602d02034638fd45c9cf4723cd86ee0bec8d2291add78ebbfb13fe43278fb477dea4337514b41002e4ade5dd2f715cf391b8f5353e9145455766bea2d2f6 SHA512 9642cb3f3b64510ec3d8d8bf04f95299f4301a48641b67c4a219d5c770947df9d2be20adc82c919c1b8be546fb19e0de85a8336fb28f7b7c51825c81f88db4b5 +EBUILD db-6.1.38-r1.ebuild 6004 BLAKE2B fb9176d0eef059b4b9606d9287bebe69dafa3752c98fd03e536593b34159b500498758b77456771e28edf9409bbf917f10ca13365899c5245685ce2fe10e5a20 SHA512 7ccfff6e27f1e138a53abba02123f56e10a3da56ddc41c12a2715aa9fd6e8a47d8c8b2e05a6489e18ef69b063a1c9150378a93b398288f3c5fb89ed3c2c2449c +EBUILD db-6.2.38-r1.ebuild 6267 BLAKE2B 883d7c81d6e2fc11a2c3d7dc6746935f1ea3a26aae9ab0bc833138234c238057a58caebc23b70e2dc2da05d0ea130bb670a4b33bf68aeb2bfd90bf86d9339b0f SHA512 b1411c814134c6ef9751425aaa79362cc03c0aa8d19a21fd4c5cc8085ec5a98bddc773442bdb69ee9f06544d013505f36b3c2d1301b37b20646f4126573c7aeb MISC metadata.xml 1261 BLAKE2B 81cfdd965f4e2e0342d812c6c1fd602c43ca8bbbb23bd12f230444d26bee578f9ba2af781a8390bb754b66b4699c6aada379dea90397798f8a489a7fd11b85fb SHA512 08d43450d54a8718639ae2637f13da7626415e99a8fa5948c5107b7a973161f31b3b0cf58dc538dd48a18db996f020d57d20edefbcdd8e37c6e58c206c3aab6e diff --git a/sys-libs/db/db-18.1.32-r1.ebuild b/sys-libs/db/db-18.1.32-r1.ebuild index 76b018c57445..463c37170918 100644 --- a/sys-libs/db/db-18.1.32-r1.ebuild +++ b/sys-libs/db/db-18.1.32-r1.ebuild @@ -2,7 +2,7 @@ # Distributed under the terms of the GNU General Public License v2 EAPI=6 -inherit db flag-o-matic java-pkg-opt-2 autotools multilib multilib-minimal eapi7-ver toolchain-funcs +inherit db flag-o-matic autotools multilib multilib-minimal eapi7-ver toolchain-funcs #Number of official patches #PATCHNO=`echo ${PV}|sed -e "s,\(.*_p\)\([0-9]*\),\2,"` @@ -31,30 +31,21 @@ done LICENSE="AGPL-3" SLOT="$(ver_cut 1-2)" KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~ppc ~ppc64 ~s390 ~sparc ~x86" -IUSE="doc java cxx tcl test" +IUSE="doc cxx tcl test" REQUIRED_USE="test? ( tcl )" # the entire testsuite needs the TCL functionality DEPEND="tcl? ( >=dev-lang/tcl-8.5.15-r1:0=[${MULTILIB_USEDEP}] ) test? ( >=dev-lang/tcl-8.5.15-r1:0=[${MULTILIB_USEDEP}] ) - java? ( >=virtual/jdk-1.8 ) >=sys-devel/binutils-2.16.1" -RDEPEND="tcl? ( >=dev-lang/tcl-8.5.15-r1:0=[${MULTILIB_USEDEP}] ) - java? ( >=virtual/jre-1.8 )" +RDEPEND="tcl? ( >=dev-lang/tcl-8.5.15-r1:0=[${MULTILIB_USEDEP}] )" MULTILIB_WRAPPED_HEADERS=( /usr/include/db$(ver_cut 1-2)/db.h ) PATCHES=( - # bug #510506 - "${FILESDIR}"/${PN}-4.8.24-java-manifest-location.patch - - # use the includes from the prefix - "${FILESDIR}"/${PN}-6.2.32-jni-check-prefix-first.patch - "${FILESDIR}"/${PN}-4.2-listen-to-java-options.patch - # sqlite configure call has an extra leading .. # upstreamed:5.2.36, missing in 5.3.x/6.x # still needs to be patched in 6.0.20 @@ -83,12 +74,6 @@ src_prepare() { -e "/^DB_RELEASE_DATE=/s~=.*~='${REAL_DB_RELEASE_DATE}'~g" \ "${S_BASE}"/dist/RELEASE || die - # Include the SLOT for Java JAR files - # This supersedes the unused jarlocation patches. - sed -r -i \ - -e '/jarfile=.*\.jar$/s,(.jar$),-$(LIBVERSION)\1,g' \ - "${S_BASE}"/dist/Makefile.in || die - cd "${S_BASE}"/dist || die rm -f aclocal/libtool.m4 sed -i \ @@ -97,7 +82,7 @@ src_prepare() { sed -i \ -e '/^AC_PATH_TOOL/s/ sh, none/ bash, none/' \ aclocal/programs.m4 || die - AT_M4DIR="aclocal aclocal_java" eautoreconf + AT_M4DIR="aclocal" eautoreconf # Upstream sucks - they do autoconf and THEN replace the version variables. . ./RELEASE for v in \ @@ -131,11 +116,11 @@ multilib_src_configure() { --disable-sql --disable-sql_codegen --disable-sql_compat + --disable-java $([[ ${ABI} == arm ]] && echo --with-mutex=ARM/gcc-assembly) $([[ ${ABI} == amd64 ]] && echo --with-mutex=x86/gcc-assembly) $(use_enable cxx) $(use_enable cxx stl) - $(multilib_native_use_enable java) $(use_enable test) ) @@ -152,14 +137,6 @@ multilib_src_configure() { # mumbo jumbo. append-ldflags -Wl,--default-symver - # use `set` here since the java opts will contain whitespace - if multilib_is_native_abi && use java ; then - myconf+=( - --with-java-prefix="${JAVA_HOME}" - --with-javac-flags="$(java-pkg_javac-args)" - ) - fi - # Bug #270851: test needs TCL support if use tcl || use test ; then myeconfargs+=( @@ -181,12 +158,6 @@ multilib_src_install() { db_src_install_headerslot db_src_install_usrlibcleanup - - if multilib_is_native_abi && use java; then - java-pkg_regso "${ED%/}"/usr/"$(get_libdir)"/libdb_java*.so - java-pkg_dojar "${ED%/}"/usr/"$(get_libdir)"/*.jar - rm -f "${ED%/}"/usr/"$(get_libdir)"/*.jar - fi } multilib_src_install_all() { diff --git a/sys-libs/db/db-18.1.40-r1.ebuild b/sys-libs/db/db-18.1.40-r1.ebuild index 407d361673f7..7809ee145998 100644 --- a/sys-libs/db/db-18.1.40-r1.ebuild +++ b/sys-libs/db/db-18.1.40-r1.ebuild @@ -2,7 +2,7 @@ # Distributed under the terms of the GNU General Public License v2 EAPI=6 -inherit db flag-o-matic java-pkg-opt-2 autotools multilib multilib-minimal eapi7-ver toolchain-funcs +inherit db flag-o-matic autotools multilib multilib-minimal eapi7-ver toolchain-funcs #Number of official patches #PATCHNO=`echo ${PV}|sed -e "s,\(.*_p\)\([0-9]*\),\2,"` @@ -32,30 +32,21 @@ LICENSE="AGPL-3" SLOT="$(ver_cut 1-2)" KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" -IUSE="doc java cxx tcl test" +IUSE="doc cxx tcl test" REQUIRED_USE="test? ( tcl )" # the entire testsuite needs the TCL functionality DEPEND="tcl? ( >=dev-lang/tcl-8.5.15-r1:0=[${MULTILIB_USEDEP}] ) test? ( >=dev-lang/tcl-8.5.15-r1:0=[${MULTILIB_USEDEP}] ) - java? ( >=virtual/jdk-1.8 ) >=sys-devel/binutils-2.16.1" -RDEPEND="tcl? ( >=dev-lang/tcl-8.5.15-r1:0=[${MULTILIB_USEDEP}] ) - java? ( >=virtual/jre-1.8 )" +RDEPEND="tcl? ( >=dev-lang/tcl-8.5.15-r1:0=[${MULTILIB_USEDEP}] )" MULTILIB_WRAPPED_HEADERS=( /usr/include/db$(ver_cut 1-2)/db.h ) PATCHES=( - # bug #510506 - "${FILESDIR}"/${PN}-4.8.24-java-manifest-location.patch - - # use the includes from the prefix - "${FILESDIR}"/${PN}-6.2.32-jni-check-prefix-first.patch - "${FILESDIR}"/${PN}-4.2-listen-to-java-options.patch - # The upstream testsuite copies .lib and the binaries for each parallel test # core, ~300MB each. This patch uses links instead, saves a lot of space. "${FILESDIR}"/${PN}-18.1.25-test-link.patch @@ -81,12 +72,6 @@ src_prepare() { -e "/^DB_RELEASE_DATE=/s~=.*~='${REAL_DB_RELEASE_DATE}'~g" \ "${S_BASE}"/dist/RELEASE || die - # Include the SLOT for Java JAR files - # This supersedes the unused jarlocation patches. - sed -r -i \ - -e '/jarfile=.*\.jar$/s,(.jar$),-$(LIBVERSION)\1,g' \ - "${S_BASE}"/dist/Makefile.in || die - cd "${S_BASE}"/dist || die rm -f aclocal/libtool.m4 sed -i \ @@ -95,8 +80,8 @@ src_prepare() { sed -i \ -e '/^AC_PATH_TOOL/s/ sh, none/ bash, none/' \ aclocal/programs.m4 || die - AT_M4DIR="aclocal aclocal_java" eautoreconf - # Upstream sucks - they do autoconf and THEN replace the version variables. + AT_M4DIR="aclocal" eautoreconf + # They do autoconf and THEN replace the version variables :( . ./RELEASE for v in \ DB_VERSION_{FAMILY,LETTER,RELEASE,MAJOR,MINOR} \ @@ -129,11 +114,11 @@ multilib_src_configure() { --disable-sql --disable-sql_codegen --disable-sql_compat + --disable-java $([[ ${ABI} == arm ]] && echo --with-mutex=ARM/gcc-assembly) $([[ ${ABI} == amd64 ]] && echo --with-mutex=x86/gcc-assembly) $(use_enable cxx) $(use_enable cxx stl) - $(multilib_native_use_enable java) $(use_enable test) ) @@ -150,14 +135,6 @@ multilib_src_configure() { # mumbo jumbo. append-ldflags -Wl,--default-symver - # use `set` here since the java opts will contain whitespace - if multilib_is_native_abi && use java ; then - myconf+=( - --with-java-prefix="${JAVA_HOME}" - --with-javac-flags="$(java-pkg_javac-args)" - ) - fi - # Bug #270851: test needs TCL support if use tcl || use test ; then myeconfargs+=( @@ -179,12 +156,6 @@ multilib_src_install() { db_src_install_headerslot db_src_install_usrlibcleanup - - if multilib_is_native_abi && use java; then - java-pkg_regso "${ED%/}"/usr/"$(get_libdir)"/libdb_java*.so - java-pkg_dojar "${ED%/}"/usr/"$(get_libdir)"/*.jar - rm -f "${ED%/}"/usr/"$(get_libdir)"/*.jar - fi } multilib_src_install_all() { diff --git a/sys-libs/db/db-4.8.30-r6.ebuild b/sys-libs/db/db-4.8.30-r6.ebuild index 3bc178287279..ca3d63339448 100644 --- a/sys-libs/db/db-4.8.30-r6.ebuild +++ b/sys-libs/db/db-4.8.30-r6.ebuild @@ -3,7 +3,7 @@ EAPI=7 -inherit autotools db flag-o-matic java-pkg-opt-2 multilib multilib-minimal toolchain-funcs +inherit autotools db flag-o-matic multilib multilib-minimal toolchain-funcs #Number of official patches #PATCHNO=`echo ${PV}|sed -e "s,\(.*_p\)\([0-9]*\),\2,"` @@ -30,25 +30,18 @@ done LICENSE="Sleepycat" SLOT="$(ver_cut 1-2)" KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~s390 sparc x86" -IUSE="doc java cxx tcl test" +IUSE="doc cxx tcl test" REQUIRED_USE="test? ( tcl )" # the entire testsuite needs the TCL functionality DEPEND="tcl? ( >=dev-lang/tcl-8.5.15-r1:0=[${MULTILIB_USEDEP}] ) - test? ( >=dev-lang/tcl-8.5.15-r1:0=[${MULTILIB_USEDEP}] ) - java? ( >=virtual/jdk-1.8 )" -RDEPEND="tcl? ( >=dev-lang/tcl-8.5.15-r1:0=[${MULTILIB_USEDEP}] ) - java? ( >=virtual/jre-1.8 )" + test? ( >=dev-lang/tcl-8.5.15-r1:0=[${MULTILIB_USEDEP}] )" +RDEPEND="tcl? ( >=dev-lang/tcl-8.5.15-r1:0=[${MULTILIB_USEDEP}] )" PATCHES=( "${FILESDIR}"/${PN}-4.8-libtool.patch - "${FILESDIR}"/${PN}-4.8.24-java-manifest-location.patch "${FILESDIR}"/${PN}-4.8.30-rename-atomic-compare-exchange.patch - - # use the includes from the prefix - "${FILESDIR}"/${PN}-4.6-jni-check-prefix-first.patch - "${FILESDIR}"/${PN}-4.2-listen-to-java-options.patch ) src_prepare() { @@ -63,12 +56,6 @@ src_prepare() { sed -e "/^DB_RELEASE_DATE=/s/%B %e, %Y/%Y-%m-%d/" -i dist/RELEASE \ || die - # Include the SLOT for Java JAR files - # This supersedes the unused jarlocation patches. - sed -r \ - -e '/jarfile=.*\.jar$/s,(.jar$),-$(LIBVERSION)\1,g' \ - -i dist/Makefile.in || die - cd dist || die rm aclocal/libtool.m4 || die sed \ @@ -78,9 +65,9 @@ src_prepare() { -e '/^AC_PATH_TOOL/s/ sh, none/ bash, none/' \ -i aclocal/programs.m4 || die - AT_M4DIR="aclocal aclocal_java" eautoreconf + AT_M4DIR="aclocal" eautoreconf - # Upstream sucks - they do autoconf and THEN replace the version variables. + # They do autoconf and THEN replace the version variables :( . ./RELEASE sed \ -e "s/__EDIT_DB_VERSION_MAJOR__/$DB_VERSION_MAJOR/g" \ @@ -98,10 +85,10 @@ multilib_src_configure() { --enable-o_direct --without-uniquename --disable-static + --disable-java $([[ ${ABI} == amd64 ]] && echo --with-mutex=x86/gcc-assembly) $(use_enable cxx) $(use_enable cxx stl) - $(multilib_native_use_enable java) $(use_enable test) ) @@ -118,14 +105,6 @@ multilib_src_configure() { # mumbo jumbo. append-ldflags -Wl,--default-symver - # use `set` here since the java opts will contain whitespace - if multilib_is_native_abi && use java ; then - myconf+=( - --with-java-prefix="${JAVA_HOME}" - --with-javac-flags="$(java-pkg_javac-args)" - ) - fi - # Bug #270851: test needs TCL support if use tcl || use test ; then myconf+=( @@ -161,12 +140,6 @@ multilib_src_install() { db_src_install_headerslot db_src_install_usrlibcleanup - - if multilib_is_native_abi && use java; then - java-pkg_regso "${ED}"/usr/"$(get_libdir)"/libdb_java*.so - java-pkg_dojar "${ED}"/usr/"$(get_libdir)"/*.jar - rm -f "${ED}"/usr/"$(get_libdir)"/*.jar - fi } multilib_src_install_all() { diff --git a/sys-libs/db/db-5.3.28-r8.ebuild b/sys-libs/db/db-5.3.28-r8.ebuild index 91d4a786cf4c..c7f5d0f6d288 100644 --- a/sys-libs/db/db-5.3.28-r8.ebuild +++ b/sys-libs/db/db-5.3.28-r8.ebuild @@ -2,7 +2,7 @@ # Distributed under the terms of the GNU General Public License v2 EAPI=7 -inherit autotools db flag-o-matic java-pkg-opt-2 multilib multilib-minimal toolchain-funcs +inherit autotools db flag-o-matic multilib multilib-minimal toolchain-funcs #Number of official patches #PATCHNO=`echo ${PV}|sed -e "s,\(.*_p\)\([0-9]*\),\2,"` @@ -30,29 +30,20 @@ done LICENSE="Sleepycat" SLOT="$(ver_cut 1-2)" KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ppc ppc64 ~riscv ~s390 sparc x86" -IUSE="doc java cxx tcl test" +IUSE="doc cxx tcl test" REQUIRED_USE="test? ( tcl )" # the entire testsuite needs the TCL functionality DEPEND="tcl? ( >=dev-lang/tcl-8.5.15-r1:0=[${MULTILIB_USEDEP}] ) - test? ( >=dev-lang/tcl-8.5.15-r1:0=[${MULTILIB_USEDEP}] ) - java? ( >=virtual/jdk-1.7 )" -RDEPEND="tcl? ( >=dev-lang/tcl-8.5.15-r1:0=[${MULTILIB_USEDEP}] ) - java? ( >=virtual/jre-1.7 )" + test? ( >=dev-lang/tcl-8.5.15-r1:0=[${MULTILIB_USEDEP}] )" +RDEPEND="tcl? ( >=dev-lang/tcl-8.5.15-r1:0=[${MULTILIB_USEDEP}] )" MULTILIB_WRAPPED_HEADERS=( /usr/include/db${SLOT}/db.h ) PATCHES=( - # bug #510506 - "${FILESDIR}"/${PN}-4.8.24-java-manifest-location.patch - - # use the includes from the prefix - "${FILESDIR}"/${PN}-4.6-jni-check-prefix-first.patch - "${FILESDIR}"/${PN}-4.2-listen-to-java-options.patch - # sqlite configure call has an extra leading .. # upstreamed:5.2.36, missing in 5.3.x "${FILESDIR}"/${PN}-5.2.28-sqlite-configure-path.patch @@ -83,12 +74,6 @@ src_prepare() { -e "/^DB_RELEASE_DATE=/s~=.*~='${REAL_DB_RELEASE_DATE}'~g" \ -i dist/RELEASE || die - # Include the SLOT for Java JAR files - # This supersedes the unused jarlocation patches. - sed -r \ - -e '/jarfile=.*\.jar$/s,(.jar$),-$(LIBVERSION)\1,g' \ - -i dist/Makefile.in || die - cd dist || die rm aclocal/libtool.m4 || die sed \ @@ -98,9 +83,9 @@ src_prepare() { -e '/^AC_PATH_TOOL/s/ sh, none/ bash, none/' \ -i aclocal/programs.m4 || die - AT_M4DIR="aclocal aclocal_java" eautoreconf + AT_M4DIR="aclocal" eautoreconf - # Upstream sucks - they do autoconf and THEN replace the version variables. + # They do autoconf and THEN replace the version variables :( . ./RELEASE local v ev for v in \ @@ -133,10 +118,10 @@ multilib_src_configure() { --disable-sql_codegen --disable-sql_compat --disable-static + --disable-java $([[ ${ABI} == amd64 ]] && echo --with-mutex=x86/gcc-assembly) $(use_enable cxx) $(use_enable cxx stl) - $(multilib_native_use_enable java) $(use_enable test) ) @@ -153,13 +138,6 @@ multilib_src_configure() { # mumbo jumbo. append-ldflags -Wl,--default-symver - if multilib_is_native_abi && use java ; then - myconf+=( - --with-java-prefix="${JAVA_HOME}" - --with-javac-flags="$(java-pkg_javac-args)" - ) - fi - # Bug #270851: test needs TCL support if use tcl || use test ; then myconf+=( @@ -189,12 +167,6 @@ multilib_src_install() { db_src_install_headerslot db_src_install_usrlibcleanup - - if multilib_is_native_abi && use java; then - java-pkg_regso "${ED}"/usr/"$(get_libdir)"/libdb_java*.so - java-pkg_dojar "${ED}"/usr/"$(get_libdir)"/*.jar - rm -f "${ED}"/usr/"$(get_libdir)"/*.jar - fi } multilib_src_install_all() { diff --git a/sys-libs/db/db-6.0.35-r4.ebuild b/sys-libs/db/db-6.0.35-r4.ebuild index 261cbcd2b8c0..cf95493690ea 100644 --- a/sys-libs/db/db-6.0.35-r4.ebuild +++ b/sys-libs/db/db-6.0.35-r4.ebuild @@ -2,7 +2,7 @@ # Distributed under the terms of the GNU General Public License v2 EAPI=7 -inherit autotools db flag-o-matic java-pkg-opt-2 multilib multilib-minimal toolchain-funcs +inherit autotools db flag-o-matic multilib multilib-minimal toolchain-funcs #Number of official patches #PATCHNO=`echo ${PV}|sed -e "s,\(.*_p\)\([0-9]*\),\2,"` @@ -30,29 +30,20 @@ done LICENSE="AGPL-3" SLOT="$(ver_cut 1-2)" KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86" -IUSE="doc java cxx tcl test" +IUSE="doc cxx tcl test" REQUIRED_USE="test? ( tcl )" # the entire testsuite needs the TCL functionality DEPEND="tcl? ( >=dev-lang/tcl-8.5.15-r1:0=[${MULTILIB_USEDEP}] ) - test? ( >=dev-lang/tcl-8.5.15-r1:0=[${MULTILIB_USEDEP}] ) - java? ( >=virtual/jdk-1.7:* )" -RDEPEND="tcl? ( >=dev-lang/tcl-8.5.15-r1:0=[${MULTILIB_USEDEP}] ) - java? ( >=virtual/jre-1.7:* )" + test? ( >=dev-lang/tcl-8.5.15-r1:0=[${MULTILIB_USEDEP}] )" +RDEPEND="tcl? ( >=dev-lang/tcl-8.5.15-r1:0=[${MULTILIB_USEDEP}] )" MULTILIB_WRAPPED_HEADERS=( /usr/include/db${SLOT}/db.h ) PATCHES=( - # bug #510506 - "${FILESDIR}"/${PN}-4.8.24-java-manifest-location.patch - - # use the includes from the prefix - "${FILESDIR}"/${PN}-4.6-jni-check-prefix-first.patch - "${FILESDIR}"/${PN}-4.2-listen-to-java-options.patch - # sqlite configure call has an extra leading .. # upstreamed:5.2.36, missing in 5.3.x/6.x # still needs to be patched in 6.0.20 @@ -81,12 +72,6 @@ src_prepare() { -e "/^DB_RELEASE_DATE=/s~=.*~='${REAL_DB_RELEASE_DATE}'~g" \ -i dist/RELEASE || die - # Include the SLOT for Java JAR files - # This supersedes the unused jarlocation patches. - sed -r \ - -e '/jarfile=.*\.jar$/s,(.jar$),-$(LIBVERSION)\1,g' \ - -i dist/Makefile.in || die - cd dist || die rm aclocal/libtool.m4 || die sed \ @@ -96,9 +81,9 @@ src_prepare() { -e '/^AC_PATH_TOOL/s/ sh, none/ bash, none/' \ -i aclocal/programs.m4 || die - AT_M4DIR="aclocal aclocal_java" eautoreconf + AT_M4DIR="aclocal" eautoreconf - # Upstream sucks - they do autoconf and THEN replace the version variables. + # They do autoconf and THEN replace the version variables :( . ./RELEASE local v ev for v in \ @@ -127,10 +112,10 @@ multilib_src_configure() { --disable-sql_codegen --disable-sql_compat --disable-static + --disable-java $([[ ${ABI} == amd64 ]] && echo --with-mutex=x86/gcc-assembly) $(use_enable cxx) $(use_enable cxx stl) - $(multilib_native_use_enable java) $(use_enable test) ) @@ -147,14 +132,6 @@ multilib_src_configure() { # mumbo jumbo. append-ldflags -Wl,--default-symver - # use `set` here since the java opts will contain whitespace - if multilib_is_native_abi && use java ; then - myconf+=( - --with-java-prefix="${JAVA_HOME}" - --with-javac-flags="$(java-pkg_javac-args)" - ) - fi - # Bug #270851: test needs TCL support if use tcl || use test ; then myconf+=( @@ -188,12 +165,6 @@ multilib_src_install() { db_src_install_headerslot db_src_install_usrlibcleanup - - if multilib_is_native_abi && use java; then - java-pkg_regso "${ED}"/usr/"$(get_libdir)"/libdb_java*.so - java-pkg_dojar "${ED}"/usr/"$(get_libdir)"/*.jar - rm -f "${ED}"/usr/"$(get_libdir)"/*.jar - fi } multilib_src_install_all() { diff --git a/sys-libs/db/db-6.1.38-r1.ebuild b/sys-libs/db/db-6.1.38-r1.ebuild index 74fb45257401..278f210fd913 100644 --- a/sys-libs/db/db-6.1.38-r1.ebuild +++ b/sys-libs/db/db-6.1.38-r1.ebuild @@ -2,7 +2,7 @@ # Distributed under the terms of the GNU General Public License v2 EAPI=6 -inherit db flag-o-matic java-pkg-opt-2 autotools multilib multilib-minimal eapi7-ver toolchain-funcs +inherit db flag-o-matic autotools multilib multilib-minimal eapi7-ver versionator toolchain-funcs #Number of official patches #PATCHNO=`echo ${PV}|sed -e "s,\(.*_p\)\([0-9]*\),\2,"` @@ -30,30 +30,21 @@ done LICENSE="AGPL-3" SLOT="$(get_version_component_range 1-2)" KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86" -IUSE="doc java cxx tcl test" +IUSE="doc cxx tcl test" REQUIRED_USE="test? ( tcl )" # the entire testsuite needs the TCL functionality DEPEND="tcl? ( >=dev-lang/tcl-8.5.15-r1:0=[${MULTILIB_USEDEP}] ) test? ( >=dev-lang/tcl-8.5.15-r1:0=[${MULTILIB_USEDEP}] ) - java? ( >=virtual/jdk-1.8 ) >=sys-devel/binutils-2.16.1" -RDEPEND="tcl? ( >=dev-lang/tcl-8.5.15-r1:0=[${MULTILIB_USEDEP}] ) - java? ( >=virtual/jre-1.8 )" +RDEPEND="tcl? ( >=dev-lang/tcl-8.5.15-r1:0=[${MULTILIB_USEDEP}] )" MULTILIB_WRAPPED_HEADERS=( /usr/include/db$(ver_cut 1-2)/db.h ) PATCHES=( - # bug #510506 - "${FILESDIR}"/${PN}-4.8.24-java-manifest-location.patch - - # use the includes from the prefix - "${FILESDIR}"/${PN}-6.2-jni-check-prefix-first.patch - "${FILESDIR}"/${PN}-4.2-listen-to-java-options.patch - # sqlite configure call has an extra leading .. # upstreamed:5.2.36, missing in 5.3.x/6.x # still needs to be patched in 6.0.20 @@ -82,12 +73,6 @@ src_prepare() { -e "/^DB_RELEASE_DATE=/s~=.*~='${REAL_DB_RELEASE_DATE}'~g" \ "${S_BASE}"/dist/RELEASE || die - # Include the SLOT for Java JAR files - # This supersedes the unused jarlocation patches. - sed -r -i \ - -e '/jarfile=.*\.jar$/s,(.jar$),-$(LIBVERSION)\1,g' \ - "${S_BASE}"/dist/Makefile.in || die - cd "${S_BASE}"/dist || die rm -f aclocal/libtool.m4 sed -i \ @@ -96,8 +81,8 @@ src_prepare() { sed -i \ -e '/^AC_PATH_TOOL/s/ sh, none/ bash, none/' \ aclocal/programs.m4 || die - AT_M4DIR="aclocal aclocal_java" eautoreconf - # Upstream sucks - they do autoconf and THEN replace the version variables. + AT_M4DIR="aclocal" eautoreconf + # They do autoconf and THEN replace the version variables :( . ./RELEASE for v in \ DB_VERSION_{FAMILY,LETTER,RELEASE,MAJOR,MINOR} \ @@ -129,11 +114,11 @@ multilib_src_configure() { --disable-sql_codegen --disable-sql_compat --disable-static + --disable-java $([[ ${ABI} == arm ]] && echo --with-mutex=ARM/gcc-assembly) $([[ ${ABI} == amd64 ]] && echo --with-mutex=x86/gcc-assembly) $(use_enable cxx) $(use_enable cxx stl) - $(multilib_native_use_enable java) $(use_enable test) ) @@ -150,14 +135,6 @@ multilib_src_configure() { # mumbo jumbo. append-ldflags -Wl,--default-symver - # use `set` here since the java opts will contain whitespace - if multilib_is_native_abi && use java ; then - myeconfargs+=( - --with-java-prefix="${JAVA_HOME}" - --with-javac-flags="$(java-pkg_javac-args)" - ) - fi - # Bug #270851: test needs TCL support if use tcl || use test ; then myeconfargs+=( @@ -179,12 +156,6 @@ multilib_src_install() { db_src_install_headerslot db_src_install_usrlibcleanup - - if multilib_is_native_abi && use java; then - java-pkg_regso "${ED%/}"/usr/"$(get_libdir)"/libdb_java*.so - java-pkg_dojar "${ED%/}"/usr/"$(get_libdir)"/*.jar - rm -f "${ED%/}"/usr/"$(get_libdir)"/*.jar - fi } multilib_src_install_all() { diff --git a/sys-libs/db/db-6.2.38-r1.ebuild b/sys-libs/db/db-6.2.38-r1.ebuild index 786041b37bd1..de6a736bdf14 100644 --- a/sys-libs/db/db-6.2.38-r1.ebuild +++ b/sys-libs/db/db-6.2.38-r1.ebuild @@ -1,8 +1,8 @@ -# Copyright 1999-2021 Gentoo Authors +# Copyright 1999-2022 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=6 -inherit db flag-o-matic java-pkg-opt-2 autotools multilib multilib-minimal eapi7-ver toolchain-funcs +inherit db flag-o-matic autotools multilib multilib-minimal versionator eapi7-ver toolchain-funcs #Number of official patches #PATCHNO=`echo ${PV}|sed -e "s,\(.*_p\)\([0-9]*\),\2,"` @@ -30,31 +30,22 @@ done LICENSE="AGPL-3" SLOT="$(get_version_component_range 1-2)" KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" -IUSE="doc java cxx tcl test" +IUSE="doc cxx tcl test" REQUIRED_USE="test? ( tcl )" # the entire testsuite needs the TCL functionality DEPEND="tcl? ( >=dev-lang/tcl-8.5.15-r1:0=[${MULTILIB_USEDEP}] ) test? ( >=dev-lang/tcl-8.5.15-r1:0=[${MULTILIB_USEDEP}] ) - java? ( >=virtual/jdk-1.8 ) kernel_linux? ( >=sys-devel/binutils-2.16.1 ) kernel_SunOS? ( >=sys-devel/binutils-2.16.1 )" -RDEPEND="tcl? ( >=dev-lang/tcl-8.5.15-r1:0=[${MULTILIB_USEDEP}] ) - java? ( >=virtual/jre-1.8 )" +RDEPEND="tcl? ( >=dev-lang/tcl-8.5.15-r1:0=[${MULTILIB_USEDEP}] )" MULTILIB_WRAPPED_HEADERS=( /usr/include/db$(ver_cut 1-2)/db.h ) PATCHES=( - # bug #510506 - "${FILESDIR}"/${PN}-4.8.24-java-manifest-location.patch - - # use the includes from the prefix - "${FILESDIR}"/${PN}-6.2.32-jni-check-prefix-first.patch - "${FILESDIR}"/${PN}-4.2-listen-to-java-options.patch - # sqlite configure call has an extra leading .. # upstreamed:5.2.36, missing in 5.3.x/6.x # still needs to be patched in 6.0.20 @@ -63,6 +54,8 @@ PATCHES=( # The upstream testsuite copies .lib and the binaries for each parallel test # core, ~300MB each. This patch uses links instead, saves a lot of space. "${FILESDIR}"/${PN}-6.0.20-test-link.patch + + "${FILESDIR}"/${PN}-6.2.38-bashism-configure.patch ) src_prepare() { @@ -83,12 +76,6 @@ src_prepare() { -e "/^DB_RELEASE_DATE=/s~=.*~='${REAL_DB_RELEASE_DATE}'~g" \ "${S_BASE}"/dist/RELEASE || die - # Include the SLOT for Java JAR files - # This supersedes the unused jarlocation patches. - sed -r -i \ - -e '/jarfile=.*\.jar$/s,(.jar$),-$(LIBVERSION)\1,g' \ - "${S_BASE}"/dist/Makefile.in || die - cd "${S_BASE}"/dist || die rm -f aclocal/libtool.m4 sed -i \ @@ -97,8 +84,8 @@ src_prepare() { sed -i \ -e '/^AC_PATH_TOOL/s/ sh, none/ bash, none/' \ aclocal/programs.m4 || die - AT_M4DIR="aclocal aclocal_java" eautoreconf - # Upstream sucks - they do autoconf and THEN replace the version variables. + AT_M4DIR="aclocal" eautoreconf + # They do autoconf and THEN replace the version variables :( . ./RELEASE for v in \ DB_VERSION_{FAMILY,LETTER,RELEASE,MAJOR,MINOR} \ @@ -130,11 +117,11 @@ multilib_src_configure() { --disable-sql_codegen --disable-sql_compat --disable-static + --disable-java $([[ ${ABI} == arm ]] && echo --with-mutex=ARM/gcc-assembly) $([[ ${ABI} == amd64 ]] && echo --with-mutex=x86/gcc-assembly) $(use_enable cxx) $(use_enable cxx stl) - $(multilib_native_use_enable java) $(use_enable test) ) @@ -153,14 +140,6 @@ multilib_src_configure() { append-ldflags -Wl,--default-symver fi - # use `set` here since the java opts will contain whitespace - if multilib_is_native_abi && use java ; then - myeconfargs+=( - --with-java-prefix="${JAVA_HOME}" - --with-javac-flags="$(java-pkg_javac-args)" - ) - fi - # Bug #270851: test needs TCL support if use tcl || use test ; then myeconfargs+=( @@ -182,12 +161,6 @@ multilib_src_install() { db_src_install_headerslot db_src_install_usrlibcleanup - - if multilib_is_native_abi && use java; then - java-pkg_regso "${ED%/}"/usr/"$(get_libdir)"/libdb_java*.so - java-pkg_dojar "${ED%/}"/usr/"$(get_libdir)"/*.jar - rm -f "${ED%/}"/usr/"$(get_libdir)"/*.jar - fi } multilib_src_install_all() { diff --git a/sys-libs/db/files/db-18.1.25-sqlite-configure-path.patch b/sys-libs/db/files/db-18.1.25-sqlite-configure-path.patch new file mode 100644 index 000000000000..83fe2d66765e --- /dev/null +++ b/sys-libs/db/files/db-18.1.25-sqlite-configure-path.patch @@ -0,0 +1,11 @@ +--- a/dist/aclocal/sql.m4 ++++ b/dist/aclocal/sql.m4 +@@ -99,7 +99,7 @@ + if test "$db_cv_debug" = "yes"; then + CPPFLAGS="$CPPFLAGS -g" + fi +-(cd sql && eval "\$SHELL ../$sqlite_dir/configure --disable-option-checking $ac_sub_configure_args CPPFLAGS=\"-I.. $CPPFLAGS\" --enable-amalgamation=$db_cv_sql_amalgamation --enable-readline=$with_readline --enable-editline=$with_editline" && cat build_config.h >> config.h) || exit 1 ++(cd sql && eval "\$SHELL $sqlite_dir/configure --disable-option-checking $ac_sub_configure_args CPPFLAGS=\"-I.. $CPPFLAGS\" --enable-amalgamation=$db_cv_sql_amalgamation --enable-readline=$with_readline --enable-editline=$with_editline" && cat build_config.h >> config.h) || exit 1 + + # Configure JDBC if --enable-jdbc + if test "$db_cv_jdbc" != "no"; then diff --git a/sys-libs/db/files/db-18.1.25-test-link.patch b/sys-libs/db/files/db-18.1.25-test-link.patch index dc3d8ae93c5a..5fb6d5fae7e9 100644 --- a/sys-libs/db/files/db-18.1.25-test-link.patch +++ b/sys-libs/db/files/db-18.1.25-test-link.patch @@ -1,5 +1,5 @@ ---- db-18.1.25/test/tcl/parallel.tcl -+++ db-18.1.25/test/tcl/parallel.tcl +--- a/test/tcl/parallel.tcl ++++ b/test/tcl/parallel.tcl @@ -296,17 +296,26 @@ [eval glob -nocomplain {$dir/$buildpath/db_{reptest,repsite,replicate}$EXE}] \ $destdir/$buildpath} diff --git a/sys-libs/db/files/db-4.2-listen-to-java-options.patch b/sys-libs/db/files/db-4.2-listen-to-java-options.patch deleted file mode 100644 index f1f701de1261..000000000000 --- a/sys-libs/db/files/db-4.2-listen-to-java-options.patch +++ /dev/null @@ -1,10 +0,0 @@ ---- a/dist/configure.ac -+++ b/dist/configure.ac -@@ -385,6 +385,7 @@ - # A classpath that includes . is needed to check for Java - CLASSPATH=".:$CLASSPATH" - export CLASSPATH -+ AC_JAVA_OPTIONS - AC_PROG_JAVAC - AC_PROG_JAR - AC_PROG_JAVA diff --git a/sys-libs/db/files/db-4.6-jni-check-prefix-first.patch b/sys-libs/db/files/db-4.6-jni-check-prefix-first.patch deleted file mode 100644 index a0b2800d1286..000000000000 --- a/sys-libs/db/files/db-4.6-jni-check-prefix-first.patch +++ /dev/null @@ -1,30 +0,0 @@ ---- a/dist/aclocal_java/ac_jni_include_dirs.m4 -+++ b/dist/aclocal_java/ac_jni_include_dirs.m4 -@@ -43,14 +43,19 @@ - *) AC_MSG_ERROR([$_ACJNI_JAVAC is not an absolute path name]);; - esac - --_ACJNI_FOLLOW_SYMLINKS("$_ACJNI_JAVAC") --_JTOPDIR=`echo "$_ACJNI_FOLLOWED" | sed -e 's://*:/:g' -e 's:/[[^/]]*$::'` --case "$host_os" in -- darwin*) _JTOPDIR=`echo "$_JTOPDIR" | sed -e 's:/[[^/]]*$::'` -- _JINC="$_JTOPDIR/Headers";; -- *) _JINC="$_JTOPDIR/include";; --esac -- -+# If JAVAPREFIX is defined, look there first -+if test -r "$JAVAPREFIX/include/jni.h"; then -+ _JTOPDIR="$JAVAPREFIX" -+ _JINC="$JAVAPREFIX/include" -+else -+ _ACJNI_FOLLOW_SYMLINKS("$_ACJNI_JAVAC") -+ _JTOPDIR=`echo "$_ACJNI_FOLLOWED" | sed -e 's://*:/:g' -e 's:/[[^/]]*$::'` -+ case "$host_os" in -+ darwin*) _JTOPDIR=`echo "$_JTOPDIR" | sed -e 's:/[[^/]]*$::'` -+ _JINC="$_JTOPDIR/Headers";; -+ *) _JINC="$_JTOPDIR/include";; -+ esac -+fi - # If we find jni.h in /usr/include, then it's not a java-only tree, so - # don't add /usr/include or subdirectories to the list of includes. - # An extra -I/usr/include can foul things up with newer gcc's. diff --git a/sys-libs/db/files/db-4.8.24-java-manifest-location.patch b/sys-libs/db/files/db-4.8.24-java-manifest-location.patch deleted file mode 100644 index 9cebadc52064..000000000000 --- a/sys-libs/db/files/db-4.8.24-java-manifest-location.patch +++ /dev/null @@ -1,12 +0,0 @@ -diff -Nuar db-4.8.24.orig/dist/Makefile.in db-4.8.24/dist/Makefile.in ---- db-4.8.24.orig/dist/Makefile.in 2009-09-19 23:39:45.286001896 +0000 -+++ db-4.8.24/dist/Makefile.in 2009-09-19 23:41:13.079326882 +0000 -@@ -830,7 +830,7 @@ - $(JAVA) -classpath $(JAVA_CLASSTOP) \ - com.sleepycat.persist.model.ClassEnhancer $(JAVA_CLASSTOP) - cd $(JAVA_CLASSTOP) && \ -- $(JAR) cfm ../$(libj_jarfile) ../$(JAVA_MANIFEST) ./com/sleepycat -+ $(JAR) cfm ../$(libj_jarfile) $(JAVA_MANIFEST) ./com/sleepycat - - $(libj_exjarfile): $(libj_jarfile) $(JAVA_EXSRCS) - @test -d $(JAVA_EXCLASSTOP) || \ diff --git a/sys-libs/db/files/db-4.8.30-rename-atomic-compare-exchange.patch b/sys-libs/db/files/db-4.8.30-rename-atomic-compare-exchange.patch index c53160a82970..99a26e15fbfb 100644 --- a/sys-libs/db/files/db-4.8.30-rename-atomic-compare-exchange.patch +++ b/sys-libs/db/files/db-4.8.30-rename-atomic-compare-exchange.patch @@ -1,5 +1,3 @@ -diff --git a/dbinc/atomic.h b/dbinc/atomic.h -index 0034dcc..fa7ba93 100644 --- a/dbinc/atomic.h +++ b/dbinc/atomic.h @@ -144,7 +144,7 @@ typedef LONG volatile *interlocked_val; diff --git a/sys-libs/db/files/db-5.1.29-rename-atomic-compare-exchange.patch b/sys-libs/db/files/db-5.1.29-rename-atomic-compare-exchange.patch index ad3da2786c88..252a6213b30f 100644 --- a/sys-libs/db/files/db-5.1.29-rename-atomic-compare-exchange.patch +++ b/sys-libs/db/files/db-5.1.29-rename-atomic-compare-exchange.patch @@ -1,5 +1,3 @@ -diff --git a/src/dbinc/atomic.h b/src/dbinc/atomic.h -index 0034dcc..fa7ba93 100644 --- a/src/dbinc/atomic.h +++ b/src/dbinc/atomic.h @@ -144,7 +144,7 @@ typedef LONG volatile *interlocked_val; diff --git a/sys-libs/db/files/db-5.2.28-sqlite-configure-path.patch b/sys-libs/db/files/db-5.2.28-sqlite-configure-path.patch index ff7abbe1fd79..cfbe2a7ffd01 100644 --- a/sys-libs/db/files/db-5.2.28-sqlite-configure-path.patch +++ b/sys-libs/db/files/db-5.2.28-sqlite-configure-path.patch @@ -1,6 +1,5 @@ -diff -Nuar db-5.2.28.orig//dist/aclocal/sql.m4 db-5.2.28//dist/aclocal/sql.m4 ---- db-5.2.28.orig//dist/aclocal/sql.m4 2011-06-10 09:50:45.000000000 -0700 -+++ db-5.2.28//dist/aclocal/sql.m4 2011-07-15 17:02:54.646521189 -0700 +--- a/dist/aclocal/sql.m4 ++++ b/dist/aclocal/sql.m4 @@ -91,7 +91,7 @@ # !!! END COPIED from autoconf distribution diff --git a/sys-libs/db/files/db-6.0.20-test-link.patch b/sys-libs/db/files/db-6.0.20-test-link.patch index 8aceaa4d6f8c..5fc6669465c6 100644 --- a/sys-libs/db/files/db-6.0.20-test-link.patch +++ b/sys-libs/db/files/db-6.0.20-test-link.patch @@ -1,6 +1,5 @@ -diff -Nuar db-6.0.20.orig/test/tcl/parallel.tcl db-6.0.20/test/tcl/parallel.tcl ---- db-6.0.20.orig/test/tcl/parallel.tcl 2013-07-04 15:49:43.408348040 +0000 -+++ db-6.0.20/test/tcl/parallel.tcl 2013-07-04 17:40:07.147943377 +0000 +--- a/test/tcl/parallel.tcl ++++ b/test/tcl/parallel.tcl @@ -289,16 +289,26 @@ [eval glob -nocomplain {$dir/$buildpath/db_{reptest,repsite,replicate}$EXE}] \ $destdir/$buildpath} diff --git a/sys-libs/db/files/db-6.0.35-sqlite-configure-path.patch b/sys-libs/db/files/db-6.0.35-sqlite-configure-path.patch index c239bb118a82..66bdcf9fe130 100644 --- a/sys-libs/db/files/db-6.0.35-sqlite-configure-path.patch +++ b/sys-libs/db/files/db-6.0.35-sqlite-configure-path.patch @@ -1,5 +1,5 @@ ---- db-6.0.35/dist/aclocal/sql.m4 -+++ db-6.0.35/dist/aclocal/sql.m4 +--- a/dist/aclocal/sql.m4 ++++ b/dist/aclocal/sql.m4 @@ -96,7 +96,7 @@ if test "$db_cv_build_cryptography" = "yes"; then CPPFLAGS="$CPPFLAGS -DSQLITE_HAS_CODEC=1" diff --git a/sys-libs/db/files/db-6.1.19-sqlite-configure-path.patch b/sys-libs/db/files/db-6.1.19-sqlite-configure-path.patch index 25854c53e160..103e3302bdc9 100644 --- a/sys-libs/db/files/db-6.1.19-sqlite-configure-path.patch +++ b/sys-libs/db/files/db-6.1.19-sqlite-configure-path.patch @@ -1,5 +1,5 @@ ---- db-6.1.19/dist/aclocal/sql.m4 -+++ db-6.1.19/dist/aclocal/sql.m4 +--- a/dist/aclocal/sql.m4 ++++ b/dist/aclocal/sql.m4 @@ -96,6 +96,6 @@ if test "$db_cv_build_cryptography" = "yes"; then CPPFLAGS="$CPPFLAGS -DSQLITE_HAS_CODEC=1" diff --git a/sys-libs/db/files/db-6.2-jni-check-prefix-first.patch b/sys-libs/db/files/db-6.2-jni-check-prefix-first.patch deleted file mode 100644 index 963b01380c23..000000000000 --- a/sys-libs/db/files/db-6.2-jni-check-prefix-first.patch +++ /dev/null @@ -1,38 +0,0 @@ ---- db-6.2.23/dist/aclocal_java/ac_jni_include_dirs.m4 -+++ db-6.2.23/dist/aclocal_java/ac_jni_include_dirs.m4 -@@ -43,18 +43,23 @@ - *) AC_MSG_ERROR([$_ACJNI_JAVAC is not an absolute path name]);; - esac - --_ACJNI_FOLLOW_SYMLINKS("$_ACJNI_JAVAC") --_JTOPDIR=`echo "$_ACJNI_FOLLOWED" | sed -e 's://*:/:g' -e 's:/[[^/]]*$::'` --case "$host_os" in -- darwin*) _JTOPDIR=`echo "$_JTOPDIR" | sed -e 's:/[[^/]]*$::'` -- if test -d "$_JTOPDIR/include"; then -- _JINC="$_JTOPDIR/include" -- else -- _JINC="$_JTOPDIR/Headers" -- fi;; -- *) _JINC="$_JTOPDIR/include";; --esac -- -+# If JAVAPREFIX is defined, look there first -+if test -r "$JAVAPREFIX/include/jni.h"; then -+ _JTOPDIR="$JAVAPREFIX" -+ _JINC="$JAVAPREFIX/include" -+else -+ _ACJNI_FOLLOW_SYMLINKS("$_ACJNI_JAVAC") -+ _JTOPDIR=`echo "$_ACJNI_FOLLOWED" | sed -e 's://*:/:g' -e 's:/[[^/]]*$::'` -+ case "$host_os" in -+ darwin*) _JTOPDIR=`echo "$_JTOPDIR" | sed -e 's:/[[^/]]*$::'` -+ if test -d "$_JTOPDIR/include"; then -+ _JINC="$_JTOPDIR/include" -+ else -+ _JINC="$_JTOPDIR/Headers" -+ fi;; -+ *) _JINC="$_JTOPDIR/include";; -+ esac -+fi - # If we find jni.h in /usr/include, then it's not a java-only tree, so - # don't add /usr/include or subdirectories to the list of includes. - # An extra -I/usr/include can foul things up with newer gcc's. diff --git a/sys-libs/db/files/db-6.2.32-jni-check-prefix-first.patch b/sys-libs/db/files/db-6.2.32-jni-check-prefix-first.patch deleted file mode 100644 index 0a320d7f9336..000000000000 --- a/sys-libs/db/files/db-6.2.32-jni-check-prefix-first.patch +++ /dev/null @@ -1,44 +0,0 @@ ---- db-6.2.32/dist/aclocal_java/ac_jni_include_dirs.m4 -+++ db-6.2.32/dist/aclocal_java/ac_jni_include_dirs.m4 -@@ -43,21 +43,26 @@ - *) AC_MSG_ERROR([$_ACJNI_JAVAC is not an absolute path name]);; - esac - --_ACJNI_FOLLOW_SYMLINKS("$_ACJNI_JAVAC") --_JTOPDIR=`echo "$_ACJNI_FOLLOWED" | sed -e 's://*:/:g' -e 's:/[[^/]]*$::'` --case "$host_os" in -- darwin*) _JTOPDIR=`echo "$_JTOPDIR" | sed -e 's:/[[^/]]*$::'` -- if test -d "$_JTOPDIR/include"; then -- _JINC="$_JTOPDIR/include" -- else -- _JINC="`$_JTOPDIR/Commands/java_home`/include" -- fi;; -- *) if test ! -r "$_JTOPDIR/include/jni.h"; then -- _JTOPDIR=`echo "$_JTOPDIR" | sed -e 's:/[[^/]]*$::'` -- fi -- _JINC="$_JTOPDIR/include";; --esac -- -+# If JAVAPREFIX is defined, look there first -+if test -r "$JAVAPREFIX/include/jni.h"; then -+ _JTOPDIR="$JAVAPREFIX" -+ _JINC="$JAVAPREFIX/include" -+else -+ _ACJNI_FOLLOW_SYMLINKS("$_ACJNI_JAVAC") -+ _JTOPDIR=`echo "$_ACJNI_FOLLOWED" | sed -e 's://*:/:g' -e 's:/[[^/]]*$::'` -+ case "$host_os" in -+ darwin*) _JTOPDIR=`echo "$_JTOPDIR" | sed -e 's:/[[^/]]*$::'` -+ if test -d "$_JTOPDIR/include"; then -+ _JINC="$_JTOPDIR/include" -+ else -+ _JINC="`$_JTOPDIR/Commands/java_home`/include" -+ fi;; -+ *) if test ! -r "$_JTOPDIR/include/jni.h"; then -+ _JTOPDIR=`echo "$_JTOPDIR" | sed -e 's:/[[^/]]*$::'` -+ fi -+ _JINC="$_JTOPDIR/include";; -+ esac -+fi - # If we find jni.h in /usr/include, then it's not a java-only tree, so - # don't add /usr/include or subdirectories to the list of includes. - # An extra -I/usr/include can foul things up with newer gcc's. diff --git a/sys-libs/db/files/db-6.2.38-bashism-configure.patch b/sys-libs/db/files/db-6.2.38-bashism-configure.patch new file mode 100644 index 000000000000..bea1f3d3bde0 --- /dev/null +++ b/sys-libs/db/files/db-6.2.38-bashism-configure.patch @@ -0,0 +1,11 @@ +--- a/dist/aclocal/types.m4 ++++ b/dist/aclocal/types.m4 +@@ -188,7 +188,7 @@ AC_SUBST(db_off_t_decl) + AC_CHECK_TYPE(db_off_t,, + [AM_SEARCH_SSIZES(db_off_t_decl, db_off_t, $ac_cv_sizeof_off_t)]) + AC_SUBST(db_off_t_max_decl) +-if test "$ac_cv_sizeof_off_t" == "4"; then ++if test "$ac_cv_sizeof_off_t" = "4"; then + db_off_t_max_decl="#define DB_OFF_T_MAX INT32_MAX" + else + db_off_t_max_decl="#define DB_OFF_T_MAX INT64_MAX" diff --git a/sys-libs/efivar/Manifest b/sys-libs/efivar/Manifest index 7571ffc443a1..ca5120f59eac 100644 --- a/sys-libs/efivar/Manifest +++ b/sys-libs/efivar/Manifest @@ -1,7 +1,7 @@ AUX efivar-37-ia64-relro.patch 1702 BLAKE2B faa170f1a0ce1a9c48764cd49b466db4cdc40b3d79dc17954dd4bb043b4a4cae9a3610d14a85ad56fac655ad8a16e00f04cd4f29f506c6d3402d243f272e38d4 SHA512 35b56b6d8c4c682c55b4b2051367aa3be9c8f46950de6f2f4e30b75fdb9abacca037044b35df2efbf37289a72e294314f469b78f2cbd106c989ce43ffd7b05ff AUX efivar-38-Makefile-dep.patch 1126 BLAKE2B aeeddf608f1bcf9c2a729559ccca6c85271159f4ca0ea82b6685995f34c2ae39c996bb0f98bebfc9abf77ef0b679622267ad31f682f312d58a775a837bfe2bd4 SHA512 156314cbc49f2e298b1a46810ce261716384d19f8d1cc3c7a0aaba816c96cde286b52a578338e2948f770e9404f9c292ce6c0319bdb56963e3ac05789473eb45 AUX efivar-38-binutils-2.36.patch 1231 BLAKE2B ccddc04ab83d4dcf570d5a89e43fc27d36e2010513b36d9eb2fcdea71ceb5dba96a064a1cbca9ffdecf17fb5b9cb22cfe89eae4ee3a188547a4ab6fa6b4e2983 SHA512 568bc88b182875c37479c49b3dbf5b8ee6edf8090f940176e67c9aa28dd2ff6f417c70b2bef6b5df99ada2afa33db3efd295ba9de5d68b3ecc5ce1dc3361d042 -AUX efivar-38-ia64-relro.patch 1831 BLAKE2B 08dc6882f261568d95a0059193dfd975e4482f34d533c3827eb6574e0e5db2d8f1b8aab061aa25db7daa940483ef89d08ba0f22b747cd36a0170f26f90c304fe SHA512 a4365c13d710b98049c93ad532afb483af7040167b3623f81d91c8f1a68094f8b4b458139c59224fb1fa11cde159913811c7c9f6c9d899ae70695e4d65798a2d +AUX efivar-38-ia64-relro.patch 2351 BLAKE2B ba1ec68ab42e8f0ddd37285e520b437464f377feaa235521c28d5e2ddaf0790b9de4a7f7130bf1d71664156cd0a17681a2e10d0522e59eb09a9be0f258f05a42 SHA512 0cc065e530e1e62607ae22e23089458a12ea3113dca96d4074033037b3aa6ef9f0dfc8ea10a7e6f3efa73b3a9bc1c04a442b742b585da003c93aa32878b87221 AUX efivar-38-march-native.patch 1203 BLAKE2B 950a72a5ae4872894379a6688e80c796dd43db67667dd0b30515e2911a981339af6069405e3058ef49be159e37fa6000dbf26db1378b665f3acf6204feaee906 SHA512 fbe34223677a80c5b4e98db7a0171d48a6b56a8d2fd6793299200a64e81c1415913b1b098b5bca8183cbd0f6dada9802aa1967607217a7398f189f58370bb44a DIST efivar-37.tar.bz2 109431 BLAKE2B 813d477d31562b773f6e19f20e9e237b94beed437ce221771770e7d46ff0e657530285f035dc942cc20609185be92dc50319bfe8e10dee642c8bd88403ef6ffe SHA512 305a82ed103c7e3d8f723934019d552677c73558768dd5341f87d0364f5c60824d24f5a8e1bf90075e825908085083d4ecdccec5ac757fd38ee6ac8fea28c3e4 DIST efivar-38.tar.bz2 320221 BLAKE2B 0b96f3d71ddc2246e6a11a5cd32af3d007823c4a283186a428c3f145cd74425a31bd22c4671ad1ab252a3c572991bb1698381cb8bdf51efcbebd62befdc6c070 SHA512 c2f17297c863ece134a9dd758d237fd2df8c8d072f87af1d0bf2bcf9acfc7a53c25597f03fd4fb8cc664b205743d4ffa0ef1b068d0f73c58fa573d40993f3155 diff --git a/sys-libs/efivar/files/efivar-38-ia64-relro.patch b/sys-libs/efivar/files/efivar-38-ia64-relro.patch index 2f3686cac444..e90736a0394b 100644 --- a/sys-libs/efivar/files/efivar-38-ia64-relro.patch +++ b/sys-libs/efivar/files/efivar-38-ia64-relro.patch @@ -23,6 +23,8 @@ The change drops `--fatal-warnings` option from gcc.spec entirely. Rejected upstream in https://github.com/rhboot/efivar/pull/164. +[sam: add extra hunk to fix 38 build.] + Reported-by: Émeric Maschino Bug: https://bugs.gentoo.org/749963 Signed-off-by: Sergei Trofimovich <slyfox@gentoo.org> @@ -43,3 +45,16 @@ index ef28e2b..4deead5 100644 -- 2.34.1 +diff --git a/src/include/defaults.mk b/src/include/defaults.mk +index 9024a3a..f5515fa 100644 +--- a/src/include/defaults.mk ++++ b/src/include/defaults.mk +@@ -58,7 +58,7 @@ override LDFLAGS = $(CFLAGS) -L. $(_LDFLAGS) $(_CCLDFLAGS) \ + -Wl,-z,now \ + -Wl,-z,muldefs \ + -Wl,-z,relro \ +- -Wl,--fatal-warnings \ ++ -Wl,--no-fatal-warnings \ + $(call family,LDFLAGS) $(call family,CCLDFLAGS) \ + $(call pkg-config-ccldflags) + override CCLDFLAGS = $(LDFLAGS) diff --git a/sys-libs/glibc/Manifest b/sys-libs/glibc/Manifest index 9f835843e6e7..041b1af7e3d8 100644 --- a/sys-libs/glibc/Manifest +++ b/sys-libs/glibc/Manifest @@ -3,6 +3,7 @@ AUX 2.19/glibc-2.19-ia64-gcc-4.8-reloc-hack.patch 1360 BLAKE2B 19d218e91b1d3d38c AUX 2.19/glibc-2.19-kernel-2.6.16-compat.patch 3214 BLAKE2B 64af88703bddaa301ce25d4400e00140fae536882443510466510766a60ac1cf4ceca35ca0ad4384f0cdc05b79352ac7da92f555561d1f6cdd65f7cc8464c6d7 SHA512 c21d80b7ae5b2691e5b6d43a42153193822ccc2b4418728edd5f2fa72412992d103b61418b57f9cf26e72378b24aa7cbaed05eeb31a4ec312a715d258cf5232b AUX 2.19/glibc-2.19-kernel-2.6.16-hide-pipe2.patch 620 BLAKE2B 216e728e40b044684843bff97eae31d65689595bcc3e345ef019a68e15c190cbd7fa685ff39e6363cf213f3f5676dee49f235beb1984a9e150e2b4ab72fcf605 SHA512 b93822269e67262fa45cbc50c5ec562d60ef69b2338afd56421b2d74d97360823dd4252abb0faee83231e4b3fd3f7357ef0249be8721f48fe176e512c6f5e447 AUX 2.25/glibc-2.25-gentoo-chk_fail.c 9068 BLAKE2B 6fabcbb981d92101ff3b97e8eed4da3c0ee4fc3d09ca344c2d0b7ee5e04fec66b5db314263541beeb1290bafa837795fef1a6300986de938d2958ba89a9c1f2f SHA512 4503002b0e2cee0b6efc4599152d24fcff330157d4e35992a77d0d83a2decc4cf2da2b8645a44d90d428a1d82300a4fd8d13c5937b7c89f368c12b3c9139be6f +AUX 2.34/glibc-2.34-hppa-asm-getcontext-fixes.patch 6677 BLAKE2B bca5a964e35201ab99df746c08f069a3d4d344a02c063f6e1785fc70bc6d6f96b62108558afdbcb634bec136a45ed7df5b27065031f96777ff723a411cb1ab35 SHA512 2dfab5b31a0a92812ca83a797fcbbb22ab08eea6e3550e464f21fbed6cb33e474fc54bc90aebcf98912406d6a6b1938609fb36ce6fddac7d0aab86a309dd3f95 AUX host.conf-1 826 BLAKE2B 32fe7f016325e781d477a0f855c32d0df12626edd11d58c0ec368fc579811b73e4851dec6bfca9e9f53d1c2de1bb2b3b4406e50b7f665870958d727fbeab2f87 SHA512 91102a5383b49199eceb94fb1ecd223ce0f585021de94dc1646af1095a220ba1acf540271af908da47a3ee1aa55c35f5f372d61e34d0e14f1718e67633a13e76 AUX nscd-1 1897 BLAKE2B aefa781de3181c5609ac2659632f0a5bdfa6bbc8e22b73fdf5c28ca36184b5614bb2febd581d0c41a1f3dd72c45a191866cbc827f5e7009722b6d839518a27d6 SHA512 b2edbdc33fb4290378d9520bfcefcbb5183e8b8f0e80cf3573fb4ce6cf309e21f59178f31eec4ada90b4b37e502038e71b31f93b2ba2c7fa36a7eef1b1d9bf70 AUX nscd.service 337 BLAKE2B 6b163465dd8db024652921892dc913da8dfc0984eec7ffce621229e48fa99dcedc3b5944844529190122c81f4884b6a6fe7836d37d2d812f34059c530856dec1 SHA512 2001100f3b054843c69b6fd2d38852c7c824282aa8998c25a3c0352db993705429d25c70d8ce6cb3579f836b7089644c520acac423ebd69cb1b36e94a77c5bea @@ -39,8 +40,8 @@ EBUILD glibc-2.31-r7.ebuild 44522 BLAKE2B 1adfba68c35d3af5ec8476b2fe5d3bebf13880 EBUILD glibc-2.32-r8.ebuild 44853 BLAKE2B 724f95c0ed2cda18dc2edcaa03b0783a2bc603b72a67e1451535040ddc83be6d1a90ad4b30f9623140b5c0a329ecafb6f19793390137e629d43a3c26e202b28a SHA512 0973b86c266e40203e301cf0c6f8fddc4273c002ffb8fd6c16f6e78f2cfdfbea95fda04adfebb8ee84a14dc950763ba706eadadb2e83f7982b800bee636d5d8f EBUILD glibc-2.33-r13.ebuild 48597 BLAKE2B 2c2c6b6e5a730d57cca81fb33030a345ca69f1406141819e2856f5c85d8f6df1b03ef04418ee82bb7dddc6c1de77137af0f338763ed99399ab6e3a3a8d9301c0 SHA512 1cecb7b3d3b10a05713db0a1fa5cd06c1f1d38b9a3439cb37a131fa6bb4a311e7470f246a79d3080c898328b25821af2d3d121956710e6421caa685d893289a0 EBUILD glibc-2.33-r7.ebuild 46953 BLAKE2B 471614f6ad36d99057e29cfd6287db80bc232dfd6fc1bb54dfd3e5ef17ee725b5a94f54c76f228c610383d7de923e938037f959b4b64de21b9309b68d3cbb022 SHA512 5908adbf27b9a7e931d3f3cb27db2baccaa86ab634128b7ea64ab9742197211d49db13e9a65eb001b78cf31b3d62c9b4ae391e1be6ec5b109af2b33896253217 -EBUILD glibc-2.34-r10.ebuild 49374 BLAKE2B 22139f71f7cd94fb6a42141ba36ae71b735462f480d68d49ab75fd8c0ff4bb3a15ef0ff2d178514616fbae766fff993121a932f3a24afdc42e13aa00857020ed SHA512 076e804c040c5ce51f007e2aa9d305ebd524727b3e958628d946058131885cdc4211df68286500645a0201e8d4c5567106f438c19b147934a895b6a029953e3a +EBUILD glibc-2.34-r10.ebuild 49947 BLAKE2B 28c82f4bd5ca582b6edba04f2ba35c6ab0d9c361778f07d58b891da554b50fff53417e45bd939f4b387ccacce287733b5dd3d2e0a1ef70dad09d8c7d31493f62 SHA512 5a5daca54e4339ffaba58b40420438d11ac7f4badc547d02f99b6d4eace4c4861536e25233a69bc1f60bcef2dccf7145d2272b95bc05f9208204751491f6d5f0 EBUILD glibc-2.34-r9.ebuild 49374 BLAKE2B 9894a20a8ad6e46b2c933234394644d02f6d6eeaac61b7a450916d440c3862e37db39a990fa9384ac133b9610adf5f7d4dd1e0ac83ea995a04fbcccdccc60f28 SHA512 388af5e7c4efbf8528079945540ef5392686a4ae7664a6013571554b8cbb2768dab65fcf427829c9e76c1ac835dd6f01a039e155ae1a02c2b3e35e559e00d441 -EBUILD glibc-2.35.ebuild 48059 BLAKE2B 3a4926941ab73648e80a821a25f356aac1c866b123c51a4879547693c8874e2989ca3a401be37da5f7f2f914aa865302903f4a76ad6e99a43a0f00324a6e7d76 SHA512 fc5a972f021324816e5c07429db77d597f97dbded9ae01a68934465089a4d37923e2e46ce34355d097f503af8442fabffa3482da7214575391e232c29f1cf945 -EBUILD glibc-9999.ebuild 48059 BLAKE2B b8bc91107b0d8dc09a6408ccdce8dbd1d42f3410be7f4e5e41e54e1ef9b2692d9a1103c4ec49dbe4d9cc35a92badc4f85633c82e4a5e886cfe94909fb21377fd SHA512 45beafbd4c1cf6b2df6e2185b4704f5a83a2548a1d78fc20525ca0de1be0c4a8409033c75952fb726fe19ba757a874163be020d4e9b30159f0eab6987f0d8a6e +EBUILD glibc-2.35.ebuild 48397 BLAKE2B 099a3f5284ff39edd806315469591f063e8886ec3e7a0f14dc52b79aeffd429c7c9a7028858ab0682a2f44433731e40f767883386a1b7fc65b55925e48c88717 SHA512 fae6fb96b92cae23b8a99ba62c081abf215e93ad33c996d39909c6c3c87573e25e677108c0b27b99cf858b8605ccc4e8618e918265967a0515c1b3ce2d194ada +EBUILD glibc-9999.ebuild 48397 BLAKE2B e6971b17314533cbb60c8938b661cdd7caf066bdb5de6af8ef1af890e6182adb5f7f1e4b32261a2a6332ceaa8a48fb57e99114f5df110957f8d9034c943f9b2a SHA512 30c7006145e80bcd5b28ae8cbb8e86fd1204e9c197b1bf7434d86eb30be16a0a4da9cdc5fce87a534317861152459c89a4d1f38316293c23348f0f85078c8522 MISC metadata.xml 1701 BLAKE2B 91bd245d0a3685d76e3f874b50db872660054767fca5181871022fbdef9a18c4e674890bfed52cc3332c9557430ae8eec64505e67cdbedff000987406ab69ac5 SHA512 524edc37a01a47958ef557d586e8f06c6132481734ea28ed57e146969503fd129ad1da813a4d2d143a9bb8abe8810b0d8c920ab3c422a729287838435c44743a diff --git a/sys-libs/glibc/files/2.34/glibc-2.34-hppa-asm-getcontext-fixes.patch b/sys-libs/glibc/files/2.34/glibc-2.34-hppa-asm-getcontext-fixes.patch new file mode 100644 index 000000000000..299a6dae7dbe --- /dev/null +++ b/sys-libs/glibc/files/2.34/glibc-2.34-hppa-asm-getcontext-fixes.patch @@ -0,0 +1,214 @@ +https://sourceware.org/git/?p=glibc.git;a=patch;h=738ee53f0ce5e39b9b7a6777f5d3057afbaac498 +https://sourceware.org/git/?p=glibc.git;a=patch;h=d53b9cc391c72a1011ea8fe7a9f70dc5060a0db2 + +From 738ee53f0ce5e39b9b7a6777f5d3057afbaac498 Mon Sep 17 00:00:00 2001 +From: John David Anglin <danglin@gcc.gnu.org> +Date: Tue, 15 Mar 2022 23:12:37 +0000 +Subject: [PATCH] hppa: Implement swapcontext in assembler (bug 28960) + +When swapcontext.c is compiled without -g, the following error occurs: +Error: CFI instruction used without previous .cfi_startproc + +Fix by converting swapcontext routine to assembler. +--- + sysdeps/unix/sysv/linux/hppa/swapcontext.S | 72 +++++++++++++++++++ + sysdeps/unix/sysv/linux/hppa/swapcontext.c | 83 ---------------------- + 2 files changed, 72 insertions(+), 83 deletions(-) + create mode 100644 sysdeps/unix/sysv/linux/hppa/swapcontext.S + delete mode 100644 sysdeps/unix/sysv/linux/hppa/swapcontext.c + +diff --git a/sysdeps/unix/sysv/linux/hppa/swapcontext.S b/sysdeps/unix/sysv/linux/hppa/swapcontext.S +new file mode 100644 +index 0000000000..94b164dc63 +--- /dev/null ++++ b/sysdeps/unix/sysv/linux/hppa/swapcontext.S +@@ -0,0 +1,72 @@ ++/* Swap to new context. ++ Copyright (C) 2008-2022 Free Software Foundation, Inc. ++ This file is part of the GNU C Library. ++ ++ The GNU C Library is free software; you can redistribute it and/or ++ modify it under the terms of the GNU Lesser General Public ++ License as published by the Free Software Foundation; either ++ version 2.1 of the License, or (at your option) any later version. ++ ++ The GNU C Library is distributed in the hope that it will be useful, ++ but WITHOUT ANY WARRANTY; without even the implied warranty of ++ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU ++ Lesser General Public License for more details. ++ ++ You should have received a copy of the GNU Lesser General Public ++ License along with the GNU C Library. If not, see ++ <https://www.gnu.org/licenses/>. */ ++ ++#include <sysdep.h> ++#include "ucontext_i.h" ++ ++ .text ++ENTRY(__swapcontext) ++ ++ /* Copy rp to ret0 (r28). */ ++ copy %rp,%ret0 ++ ++ /* Create a frame. */ ++ ldo 64(%sp),%sp ++ .cfi_def_cfa_offset -64 ++ ++ /* Save the current machine context to oucp. */ ++ bl __getcontext,%rp ++ ++ /* Copy oucp to register ret1 (r29). __getcontext saves and ++ restores it on a normal return. It is restored from oR29 ++ on reactivation. */ ++ copy %r26,%ret1 ++ ++ /* Pop frame. */ ++ ldo -64(%sp),%sp ++ .cfi_def_cfa_offset 0 ++ ++ /* Load return pointer from oR28. */ ++ ldw oR28(%ret1),%rp ++ ++ /* Return if error. */ ++ or,= %r0,%ret0,%r0 ++ bv,n %r0(%rp) ++ ++ /* Load sc_sar flag. */ ++ ldb oSAR(%ret1),%r20 ++ ++ /* Return if oucp context has been reactivated. */ ++ or,= %r0,%r20,%r0 ++ bv,n %r0(%rp) ++ ++ /* Mark sc_sar flag. */ ++ ldi 1,%r20 ++ stb %r20,oSAR(%ret1) ++ ++ /* Activate the machine context in ucp. */ ++ bl __setcontext,%rp ++ ldw oR25(%ret1),%r26 ++ ++ /* Load return pointer. */ ++ ldw oR28(%ret1),%rp ++ bv,n %r0(%rp) ++ ++PSEUDO_END(__swapcontext) ++ ++weak_alias (__swapcontext, swapcontext) +diff --git a/sysdeps/unix/sysv/linux/hppa/swapcontext.c b/sysdeps/unix/sysv/linux/hppa/swapcontext.c +deleted file mode 100644 +index 1664f68c7b..0000000000 +--- a/sysdeps/unix/sysv/linux/hppa/swapcontext.c ++++ /dev/null +@@ -1,83 +0,0 @@ +-/* Swap to new context. +- Copyright (C) 2008-2021 Free Software Foundation, Inc. +- This file is part of the GNU C Library. +- Contributed by Helge Deller <deller@gmx.de>, 2008. +- +- The GNU C Library is free software; you can redistribute it and/or +- modify it under the terms of the GNU Lesser General Public +- License as published by the Free Software Foundation; either +- version 2.1 of the License, or (at your option) any later version. +- +- The GNU C Library is distributed in the hope that it will be useful, +- but WITHOUT ANY WARRANTY; without even the implied warranty of +- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU +- Lesser General Public License for more details. +- +- You should have received a copy of the GNU Lesser General Public +- License along with the GNU C Library. If not, see +- <https://www.gnu.org/licenses/>. */ +- +-#include <ucontext.h> +-#include "ucontext_i.h" +- +-extern int __getcontext (ucontext_t *ucp); +-extern int __setcontext (const ucontext_t *ucp); +- +-int +-__swapcontext (ucontext_t *oucp, const ucontext_t *ucp) +-{ +- /* Save rp for debugger. */ +- asm ("stw %rp,-20(%sp)"); +- asm (".cfi_offset 2, -20"); +- +- /* Copy rp to ret0 (r28). */ +- asm ("copy %rp,%ret0"); +- +- /* Create a frame. */ +- asm ("ldo 64(%sp),%sp"); +- asm (".cfi_def_cfa_offset -64"); +- +- /* Save the current machine context to oucp. */ +- asm ("bl __getcontext,%rp"); +- +- /* Copy oucp to register ret1 (r29). __getcontext saves and restores it +- on a normal return. It is restored from oR29 on reactivation. */ +- asm ("copy %r26,%ret1"); +- +- /* Pop frame. */ +- asm ("ldo -64(%sp),%sp"); +- asm (".cfi_def_cfa_offset 0"); +- +- /* Load return pointer from oR28. */ +- asm ("ldw %0(%%ret1),%%rp" : : "i" (oR28)); +- +- /* Return if error. */ +- asm ("or,= %r0,%ret0,%r0"); +- asm ("bv,n %r0(%rp)"); +- +- /* Load sc_sar flag. */ +- asm ("ldb %0(%%ret1),%%r20" : : "i" (oSAR)); +- +- /* Return if oucp context has been reactivated. */ +- asm ("or,= %r0,%r20,%r0"); +- asm ("bv,n %r0(%rp)"); +- +- /* Mark sc_sar flag. */ +- asm ("1: ldi 1,%r20"); +- asm ("stb %%r20,%0(%%ret1)" : : "i" (oSAR)); +- +- /* Activate the machine context in ucp. */ +- asm ("bl __setcontext,%rp"); +- asm ("ldw %0(%%ret1),%%r26" : : "i" (oR25)); +- +- /* Load return pointer. */ +- asm ("ldw %0(%%ret1),%%rp" : : "i" (oR28)); +- +- /* A successful call to setcontext does not return. */ +- asm ("bv,n %r0(%rp)"); +- +- /* Make gcc happy. */ +- return 0; +-} +- +-weak_alias (__swapcontext, swapcontext) +-- +2.27.0 + + +From d53b9cc391c72a1011ea8fe7a9f70dc5060a0db2 Mon Sep 17 00:00:00 2001 +From: John David Anglin <danglin@gcc.gnu.org> +Date: Tue, 15 Mar 2022 23:04:39 +0000 +Subject: [PATCH] hppa: Use END instead of PSEUDO_END in swapcontext.S + +(cherry picked from commit 7a5c440102d4ec7fafd9bbd98eca9bd90ecaaafd) +--- + sysdeps/unix/sysv/linux/hppa/swapcontext.S | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/sysdeps/unix/sysv/linux/hppa/swapcontext.S b/sysdeps/unix/sysv/linux/hppa/swapcontext.S +index 94b164dc63..fbc22586d1 100644 +--- a/sysdeps/unix/sysv/linux/hppa/swapcontext.S ++++ b/sysdeps/unix/sysv/linux/hppa/swapcontext.S +@@ -67,6 +67,6 @@ ENTRY(__swapcontext) + ldw oR28(%ret1),%rp + bv,n %r0(%rp) + +-PSEUDO_END(__swapcontext) ++END(__swapcontext) + + weak_alias (__swapcontext, swapcontext) +-- +2.27.0 diff --git a/sys-libs/glibc/glibc-2.34-r10.ebuild b/sys-libs/glibc/glibc-2.34-r10.ebuild index 5c7b4c9a1936..e5b596095245 100644 --- a/sys-libs/glibc/glibc-2.34-r10.ebuild +++ b/sys-libs/glibc/glibc-2.34-r10.ebuild @@ -46,7 +46,7 @@ SRC_URI+=" https://gitweb.gentoo.org/proj/locale-gen.git/snapshot/locale-gen-${L SRC_URI+=" multilib-bootstrap? ( https://dev.gentoo.org/~dilfridge/distfiles/gcc-multilib-bootstrap-${GCC_BOOTSTRAP_VER}.tar.xz )" SRC_URI+=" systemd? ( https://gitweb.gentoo.org/proj/toolchain/glibc-systemd.git/snapshot/glibc-systemd-${GLIBC_SYSTEMD_VER}.tar.gz )" -IUSE="audit caps cet +clone3 compile-locales +crypt custom-cflags doc gd headers-only +multiarch multilib multilib-bootstrap nscd profile selinux +ssp +static-libs static-pie suid systemd systemtap test vanilla" +IUSE="audit caps cet compile-locales +crypt custom-cflags doc gd headers-only +multiarch multilib multilib-bootstrap nscd profile selinux +ssp +static-libs static-pie suid systemd systemtap test vanilla" # Minimum kernel version that glibc requires MIN_KERN_VER="3.2.0" @@ -525,9 +525,11 @@ setup_env() { # a good start into that direction. # Also, if you're crosscompiling, let's assume you know what you are doing. # Hopefully. + # Last, we need the settings of the *build* environment, not of the + # target environment... - local current_binutils_path=$(binutils-config -B) - local current_gcc_path=$(gcc-config -B) + local current_binutils_path=$(env ROOT="${SYSROOT}" binutils-config -B) + local current_gcc_path=$(env ROOT="${SYSROOT}" gcc-config -B) einfo "Overriding clang configuration, since it won't work here" export CC="${current_gcc_path}/gcc" @@ -760,6 +762,14 @@ sanity_prechecks() { # When we actually have to compile something... if ! just_headers && [[ ${MERGE_TYPE} != "binary" ]] ; then + if [[ -d "${ESYSROOT}"/usr/lib/include ]] ; then + # bug #833620, bug #643302 + eerror "Found ${ESYSROOT}/usr/lib/include directory!" + eerror "This is known to break glibc's build." + eerror "Please backup its contents then remove the directory." + die "Found directory (${ESYSROOT}/usr/lib/include) which will break build (bug #833620)!" + fi + if [[ ${CTARGET} == *-linux* ]] ; then local run_kv build_kv want_kv @@ -863,13 +873,13 @@ src_prepare() { einfo "Done." fi - if use clone3 ; then - append-cppflags -DGENTOO_USE_CLONE3 - else - # See e.g. bug #827386, bug #819045. - elog "Disabling the clone3 syscall for compatibility with older Electron apps." - elog "Please re-enable this flag before filing bugs!" - fi + # Contained within our next patchset version but build-time only fix + # (pretty much, anyway) so just apply manually here for now until + # next patchset version rolled. + eapply "${FILESDIR}"/2.34/${P}-hppa-asm-getcontext-fixes.patch + + # TODO: We can drop this once patch is gone from our patchset + append-cppflags -DGENTOO_USE_CLONE3 default diff --git a/sys-libs/glibc/glibc-2.35.ebuild b/sys-libs/glibc/glibc-2.35.ebuild index b37bf4d692ac..0237132b9373 100644 --- a/sys-libs/glibc/glibc-2.35.ebuild +++ b/sys-libs/glibc/glibc-2.35.ebuild @@ -44,7 +44,7 @@ SRC_URI+=" https://gitweb.gentoo.org/proj/locale-gen.git/snapshot/locale-gen-${L SRC_URI+=" multilib-bootstrap? ( https://dev.gentoo.org/~dilfridge/distfiles/gcc-multilib-bootstrap-${GCC_BOOTSTRAP_VER}.tar.xz )" SRC_URI+=" systemd? ( https://gitweb.gentoo.org/proj/toolchain/glibc-systemd.git/snapshot/glibc-systemd-${GLIBC_SYSTEMD_VER}.tar.gz )" -IUSE="audit caps cet +clone3 compile-locales +crypt custom-cflags doc gd headers-only +multiarch multilib multilib-bootstrap nscd profile selinux +ssp +static-libs suid systemd systemtap test vanilla" +IUSE="audit caps cet compile-locales +crypt custom-cflags doc gd headers-only +multiarch multilib multilib-bootstrap nscd profile selinux +ssp +static-libs suid systemd systemtap test vanilla" # Minimum kernel version that glibc requires MIN_KERN_VER="3.2.0" @@ -515,9 +515,11 @@ setup_env() { # a good start into that direction. # Also, if you're crosscompiling, let's assume you know what you are doing. # Hopefully. + # Last, we need the settings of the *build* environment, not of the + # target environment... - local current_binutils_path=$(binutils-config -B) - local current_gcc_path=$(gcc-config -B) + local current_binutils_path=$(env ROOT="${SYSROOT}" binutils-config -B) + local current_gcc_path=$(env ROOT="${SYSROOT}" gcc-config -B) einfo "Overriding clang configuration, since it won't work here" export CC="${current_gcc_path}/gcc" @@ -750,6 +752,14 @@ sanity_prechecks() { # When we actually have to compile something... if ! just_headers && [[ ${MERGE_TYPE} != "binary" ]] ; then + if [[ -d "${ESYSROOT}"/usr/lib/include ]] ; then + # bug #833620, bug #643302 + eerror "Found ${ESYSROOT}/usr/lib/include directory!" + eerror "This is known to break glibc's build." + eerror "Please backup its contents then remove the directory." + die "Found directory (${ESYSROOT}/usr/lib/include) which will break build (bug #833620)!" + fi + if [[ ${CTARGET} == *-linux* ]] ; then local run_kv build_kv want_kv @@ -850,13 +860,8 @@ src_prepare() { einfo "Done." fi - if use clone3 ; then - append-cppflags -DGENTOO_USE_CLONE3 - else - # See e.g. bug #827386, bug #819045. - elog "Disabling the clone3 syscall for compatibility with older Electron apps." - elog "Please re-enable this flag before filing bugs!" - fi + # TODO: We can drop this once patch is gone from our patchset + append-cppflags -DGENTOO_USE_CLONE3 default diff --git a/sys-libs/glibc/glibc-9999.ebuild b/sys-libs/glibc/glibc-9999.ebuild index 6928c0dc4788..f9c41f6d8ccc 100644 --- a/sys-libs/glibc/glibc-9999.ebuild +++ b/sys-libs/glibc/glibc-9999.ebuild @@ -44,7 +44,7 @@ SRC_URI+=" https://gitweb.gentoo.org/proj/locale-gen.git/snapshot/locale-gen-${L SRC_URI+=" multilib-bootstrap? ( https://dev.gentoo.org/~dilfridge/distfiles/gcc-multilib-bootstrap-${GCC_BOOTSTRAP_VER}.tar.xz )" SRC_URI+=" systemd? ( https://gitweb.gentoo.org/proj/toolchain/glibc-systemd.git/snapshot/glibc-systemd-${GLIBC_SYSTEMD_VER}.tar.gz )" -IUSE="audit caps cet +clone3 compile-locales +crypt custom-cflags doc gd headers-only +multiarch multilib multilib-bootstrap nscd profile selinux +ssp +static-libs suid systemd systemtap test vanilla" +IUSE="audit caps cet compile-locales +crypt custom-cflags doc gd headers-only +multiarch multilib multilib-bootstrap nscd profile selinux +ssp +static-libs suid systemd systemtap test vanilla" # Minimum kernel version that glibc requires MIN_KERN_VER="3.2.0" @@ -515,9 +515,11 @@ setup_env() { # a good start into that direction. # Also, if you're crosscompiling, let's assume you know what you are doing. # Hopefully. + # Last, we need the settings of the *build* environment, not of the + # target environment... - local current_binutils_path=$(binutils-config -B) - local current_gcc_path=$(gcc-config -B) + local current_binutils_path=$(env ROOT="${SYSROOT}" binutils-config -B) + local current_gcc_path=$(env ROOT="${SYSROOT}" gcc-config -B) einfo "Overriding clang configuration, since it won't work here" export CC="${current_gcc_path}/gcc" @@ -750,6 +752,14 @@ sanity_prechecks() { # When we actually have to compile something... if ! just_headers && [[ ${MERGE_TYPE} != "binary" ]] ; then + if [[ -d "${ESYSROOT}"/usr/lib/include ]] ; then + # bug #833620, bug #643302 + eerror "Found ${ESYSROOT}/usr/lib/include directory!" + eerror "This is known to break glibc's build." + eerror "Please backup its contents then remove the directory." + die "Found directory (${ESYSROOT}/usr/lib/include) which will break build (bug #833620)!" + fi + if [[ ${CTARGET} == *-linux* ]] ; then local run_kv build_kv want_kv @@ -850,13 +860,8 @@ src_prepare() { einfo "Done." fi - if use clone3 ; then - append-cppflags -DGENTOO_USE_CLONE3 - else - # See e.g. bug #827386, bug #819045. - elog "Disabling the clone3 syscall for compatibility with older Electron apps." - elog "Please re-enable this flag before filing bugs!" - fi + # TODO: We can drop this once patch is gone from our patchset + append-cppflags -DGENTOO_USE_CLONE3 default diff --git a/sys-libs/ldb/Manifest b/sys-libs/ldb/Manifest index ed07b9deeb8a..664006118303 100644 --- a/sys-libs/ldb/Manifest +++ b/sys-libs/ldb/Manifest @@ -7,10 +7,10 @@ DIST ldb-2.4.0.tar.gz 1689484 BLAKE2B 904d74900011ce3f63ad1c24fe88b1a090e835c688 DIST ldb-2.4.1.tar.gz 1719769 BLAKE2B 868d3dcc51bd8272d99f2335ed1af2e37506b6a175254f1aca37f758488ba0997e37419a7d8c81def77698128307df97de26d4807ac78c34088f7a623f8d9e68 SHA512 14ab5397d28c369142b2ccf55a2ab4e678a3fe6e018541cfce46241f8226400bc169360bbef254fae4410a6e15024ae986f02298d3d324e3d3a8b88801bf76d7 DIST ldb-2.4.2.tar.gz 1720169 BLAKE2B d144218bf62dde57560df8b8a641e9f58bee001fdfa7b1527d9eb9a1a55e428662db81912173cbcdb9f993c0b316faab7d758a4878beeff1daadd487e9aa44a9 SHA512 77705ad284eed9105c9aba0459d2e48cd66ca19b657a55f7513e10281dd2e96540d24d1c8df53adc84109a918900687dc75b635cda05c4e788424ed71b5ff989 DIST ldb-2.5.0.tar.gz 1722847 BLAKE2B 880a5a516b0b423854f8a3f9c54da89e4640f8462ccc54a7b147c70c3a9eb073dc9e914d1906ab914a9ddd9b9aa0e7d177ef3ecb4c0b506f5417db931b017849 SHA512 f16a235f1409e06266c51735ac645cf2708d31dd731ee7b95d6778498b115f4252b0a528952e620767d1616a4e1e7c5f2cdc69f3fa32d79288cf14da2f52a010 -EBUILD ldb-2.3.1.ebuild 2938 BLAKE2B 1b1bad3a97da1dc608fa25144d10b03328fc3c7a3666cd4554c2d9234b854655978b6c22ad7cdccd8dad98c649c5300b8c38361f95e04ae84b1c00947da6bcc2 SHA512 477ce1e42cde597201ee814a665c270bd5ac40808532f8c5ae4cab4bfbd583f594d648ebdc75443867c7a04738e782d5f72e89ceaebaaf10055f5e9c3c793bfe -EBUILD ldb-2.3.2.ebuild 2938 BLAKE2B 1b1bad3a97da1dc608fa25144d10b03328fc3c7a3666cd4554c2d9234b854655978b6c22ad7cdccd8dad98c649c5300b8c38361f95e04ae84b1c00947da6bcc2 SHA512 477ce1e42cde597201ee814a665c270bd5ac40808532f8c5ae4cab4bfbd583f594d648ebdc75443867c7a04738e782d5f72e89ceaebaaf10055f5e9c3c793bfe -EBUILD ldb-2.4.0-r1.ebuild 2945 BLAKE2B b316c4132a2a821775acb807a336c531482f9e798bbac0035c577f528ea3ecb0b9d7e13a484746a23ce8cf274ac996816270b4340cc0eb2e951b119f7a5c79ed SHA512 57d1069bfbd0bc2d55e9407b753bf98fa00deeb8b3747b4f24bb19c965d6b6028d0ee605082d64c32b2c23c866f7cf3820518e42c146c612c53d163794c9dac9 -EBUILD ldb-2.4.1.ebuild 2939 BLAKE2B b6b089e5f985c823e145dce7419f69b4681bde1494f5a9ac0e1a5a3bb08242522de40ddea10f4368eb509060754a3c88d9a81a4c4d7a5eee3d49283118db3247 SHA512 0fc55f0157b2f7c1ea6eb4aa61a8be60cc7dc96ec9079d41e1da984d99591c9b69d8cf4e7d7717a7e8956aa054988fe3151a349d5562e87e1aa711f30354f3f6 -EBUILD ldb-2.4.2.ebuild 3003 BLAKE2B f39f0b69ee5286990cb2616dc61f1ee97b8e6d5af20e42d1653f72e460a82b5759f02c4ecd4a92395859286cd026efaa67b601160608368efbda8608ef39e524 SHA512 58544addd6f525566090c97e4704b1de356a1f30df95b8adc3be8ce84efb6071c2c0df11f59c14ed4d60e0ccfbeb7e5eed2afc17ca3d0a6e7fdc764b31df922a -EBUILD ldb-2.5.0.ebuild 3003 BLAKE2B dc8bcf7f4225a87f446ce6b17658d69ad13624a642e95296ff992ec65161ccf02ffdeb5c97d5783eae21d80a79248bea536298fbc584d1280914a111cbbac6b1 SHA512 d37009c316e8b88902802a0b38647ab0e91b8322235390a5a66b2ad487f63407e678b329210d452e7a2b68e91cb7d7b8973910cf0c21e944f9d8006d4eace23f +EBUILD ldb-2.3.1-r1.ebuild 2942 BLAKE2B d2495240018b7ecece8c88092c30ea64f411ea0f073f0ff2404ca6184fe931ada8342ea3beffd710fb0d3c137174cc01fba37d73d7884ad11edba84855f2ae08 SHA512 8711a2758689c818b66af5548af9881cf217839d5ea951cbcdbc83531ec602a9b39e1d2b12e8452e60691f09ef4e9db0d0d639e7d4a45d16cc7e75db583c714b +EBUILD ldb-2.3.2-r1.ebuild 2942 BLAKE2B d2495240018b7ecece8c88092c30ea64f411ea0f073f0ff2404ca6184fe931ada8342ea3beffd710fb0d3c137174cc01fba37d73d7884ad11edba84855f2ae08 SHA512 8711a2758689c818b66af5548af9881cf217839d5ea951cbcdbc83531ec602a9b39e1d2b12e8452e60691f09ef4e9db0d0d639e7d4a45d16cc7e75db583c714b +EBUILD ldb-2.4.0-r2.ebuild 2949 BLAKE2B 119bd03399cb6851748acd19904afb7cb423bf77b58cb419169be64ef49a8d1461ab705f992529a726d5e00dd1977ea9d6f6b2e3009f61512f13c431b5d729fe SHA512 6ba869ee1b7c082a02ede9a78384fcd539c2482b44c46bed3afe8712541eabf169cf991c1bf65649ab1b4300b5fce7c3f0512a605e25d37a63f93d9b1a602377 +EBUILD ldb-2.4.1-r1.ebuild 2943 BLAKE2B e96f5909024e90dd48096bd1a80d123460cd86c6a1743372992cdab7ed758f0759f889f558ce999cd493b625a231f8185852e18cf678f086bc221a61f895e887 SHA512 60ffaadddc5007e6c3aa8cbad369b20e5691b26ed163e747196cc7c1fb40ee74477ea00e022cfd94ff69eb9c911aaa51945d793913aa3056321b8026bd38bb66 +EBUILD ldb-2.4.2-r1.ebuild 3007 BLAKE2B 543d57e1e3e50a57fdde0a15003fbd04990b16300df7e38b0be8021549f57e2bbfc30417a81b8519ca47d236cfbf3be3bf10d8dbeeff2b5d06e575ab9acff22b SHA512 71027d7877c6af0db3b859aa3271aefb3e9bb0134d732393e5c7d6a2b14da9a55d255fac0e04de271caf269a9d627f4203a932ed13d74137558d1c7adfcccc51 +EBUILD ldb-2.5.0-r1.ebuild 3007 BLAKE2B 0abb5aa964f1b945d2bddd1154421bf35d24e9fb78dde2b0ae34b4495326142dbda601c1aa2579bdfb81face8bf6072f0dafb676524d2aa3c1f2e9947c7a9cf7 SHA512 ff46752cb5c33374665b52eef69398821f7c463deaa1a5c8c05115b94fb97cc56c805df49826f09ded208adf91a50799fa9f43e878f36291676ff7e2c9f917a7 MISC metadata.xml 526 BLAKE2B 004dbbf0286ced4bcd404eb3caf091f973e67e00b9230d2399f07dcb31d93a423045b353c1813958da151cded2f52996608de1b4294e3cb90cb8da0ac8877f9f SHA512 9f8008b5b57e5f73e79df68d828f1644edb0a154fa97504c3088301aa60e6ba3ac83a2e06d55d14c06cded89196dd635598f1d767ca93398cbf9610af3b49038 diff --git a/sys-libs/ldb/ldb-2.3.1.ebuild b/sys-libs/ldb/ldb-2.3.1-r1.ebuild index b6f289c27beb..49ea629050ba 100644 --- a/sys-libs/ldb/ldb-2.3.1.ebuild +++ b/sys-libs/ldb/ldb-2.3.1-r1.ebuild @@ -28,8 +28,8 @@ RDEPEND=" >=sys-libs/talloc-2.3.2[${MULTILIB_USEDEP}] >=sys-libs/tdb-1.4.3[${MULTILIB_USEDEP}] >=sys-libs/tevent-0.10.2[${MULTILIB_USEDEP}] - ldap? ( net-nds/openldap ) - lmdb? ( >=dev-db/lmdb-0.9.16[${MULTILIB_USEDEP}] ) + ldap? ( net-nds/openldap:= ) + lmdb? ( >=dev-db/lmdb-0.9.16:=[${MULTILIB_USEDEP}] ) python? ( ${PYTHON_DEPS} sys-libs/talloc[python,${PYTHON_SINGLE_USEDEP}] diff --git a/sys-libs/ldb/ldb-2.3.2.ebuild b/sys-libs/ldb/ldb-2.3.2-r1.ebuild index b6f289c27beb..49ea629050ba 100644 --- a/sys-libs/ldb/ldb-2.3.2.ebuild +++ b/sys-libs/ldb/ldb-2.3.2-r1.ebuild @@ -28,8 +28,8 @@ RDEPEND=" >=sys-libs/talloc-2.3.2[${MULTILIB_USEDEP}] >=sys-libs/tdb-1.4.3[${MULTILIB_USEDEP}] >=sys-libs/tevent-0.10.2[${MULTILIB_USEDEP}] - ldap? ( net-nds/openldap ) - lmdb? ( >=dev-db/lmdb-0.9.16[${MULTILIB_USEDEP}] ) + ldap? ( net-nds/openldap:= ) + lmdb? ( >=dev-db/lmdb-0.9.16:=[${MULTILIB_USEDEP}] ) python? ( ${PYTHON_DEPS} sys-libs/talloc[python,${PYTHON_SINGLE_USEDEP}] diff --git a/sys-libs/ldb/ldb-2.4.0-r1.ebuild b/sys-libs/ldb/ldb-2.4.0-r2.ebuild index 054a066f3cbb..ebd2a0d0b0ea 100644 --- a/sys-libs/ldb/ldb-2.4.0-r1.ebuild +++ b/sys-libs/ldb/ldb-2.4.0-r2.ebuild @@ -28,8 +28,8 @@ RDEPEND=" >=sys-libs/talloc-2.3.3[${MULTILIB_USEDEP}] >=sys-libs/tdb-1.4.4[${MULTILIB_USEDEP}] >=sys-libs/tevent-0.11.0[${MULTILIB_USEDEP}] - ldap? ( net-nds/openldap ) - lmdb? ( >=dev-db/lmdb-0.9.16[${MULTILIB_USEDEP}] ) + ldap? ( net-nds/openldap:= ) + lmdb? ( >=dev-db/lmdb-0.9.16:=[${MULTILIB_USEDEP}] ) python? ( ${PYTHON_DEPS} sys-libs/talloc[python,${PYTHON_SINGLE_USEDEP}] diff --git a/sys-libs/ldb/ldb-2.4.1.ebuild b/sys-libs/ldb/ldb-2.4.1-r1.ebuild index 8af580927576..eae274809755 100644 --- a/sys-libs/ldb/ldb-2.4.1.ebuild +++ b/sys-libs/ldb/ldb-2.4.1-r1.ebuild @@ -28,8 +28,8 @@ RDEPEND=" >=sys-libs/talloc-2.3.3[${MULTILIB_USEDEP}] >=sys-libs/tdb-1.4.4[${MULTILIB_USEDEP}] >=sys-libs/tevent-0.11.0[${MULTILIB_USEDEP}] - ldap? ( net-nds/openldap ) - lmdb? ( >=dev-db/lmdb-0.9.16[${MULTILIB_USEDEP}] ) + ldap? ( net-nds/openldap:= ) + lmdb? ( >=dev-db/lmdb-0.9.16:=[${MULTILIB_USEDEP}] ) python? ( ${PYTHON_DEPS} sys-libs/talloc[python,${PYTHON_SINGLE_USEDEP}] diff --git a/sys-libs/ldb/ldb-2.4.2.ebuild b/sys-libs/ldb/ldb-2.4.2-r1.ebuild index a8af63199f6d..54d9456e59cd 100644 --- a/sys-libs/ldb/ldb-2.4.2.ebuild +++ b/sys-libs/ldb/ldb-2.4.2-r1.ebuild @@ -28,8 +28,8 @@ RDEPEND=" >=sys-libs/talloc-2.3.3[${MULTILIB_USEDEP}] >=sys-libs/tdb-1.4.4[${MULTILIB_USEDEP}] >=sys-libs/tevent-0.11.0[${MULTILIB_USEDEP}] - ldap? ( net-nds/openldap ) - lmdb? ( >=dev-db/lmdb-0.9.16[${MULTILIB_USEDEP}] ) + ldap? ( net-nds/openldap:= ) + lmdb? ( >=dev-db/lmdb-0.9.16:=[${MULTILIB_USEDEP}] ) python? ( ${PYTHON_DEPS} sys-libs/talloc[python,${PYTHON_SINGLE_USEDEP}] diff --git a/sys-libs/ldb/ldb-2.5.0.ebuild b/sys-libs/ldb/ldb-2.5.0-r1.ebuild index dd87ed506eac..4b4ed4c7fa5b 100644 --- a/sys-libs/ldb/ldb-2.5.0.ebuild +++ b/sys-libs/ldb/ldb-2.5.0-r1.ebuild @@ -28,8 +28,8 @@ RDEPEND=" >=sys-libs/talloc-2.3.3[${MULTILIB_USEDEP}] >=sys-libs/tdb-1.4.5[${MULTILIB_USEDEP}] >=sys-libs/tevent-0.11.0[${MULTILIB_USEDEP}] - ldap? ( net-nds/openldap ) - lmdb? ( >=dev-db/lmdb-0.9.16[${MULTILIB_USEDEP}] ) + ldap? ( net-nds/openldap:= ) + lmdb? ( >=dev-db/lmdb-0.9.16:=[${MULTILIB_USEDEP}] ) python? ( ${PYTHON_DEPS} sys-libs/talloc[python,${PYTHON_SINGLE_USEDEP}] diff --git a/sys-libs/libcxx/Manifest b/sys-libs/libcxx/Manifest index 99a31a736c52..8888c6cc2b38 100644 --- a/sys-libs/libcxx/Manifest +++ b/sys-libs/libcxx/Manifest @@ -2,17 +2,18 @@ DIST llvm-gentoo-patchset-11.1.0-1.tar.xz 4032 BLAKE2B e69138a422e315b31a3d9c11f DIST llvm-gentoo-patchset-12.0.1.tar.xz 5280 BLAKE2B 963d005bc7b636570be90eb841ac5bcaeb927538cc7de27683167111a17d6496677c7517de2ecfaf14b5d8ac22bad357be490b8a2ed9aba502fd5f447ecc99e9 SHA512 fc7c38e671555751650299c3a8bee44d5c7f26e11b68d5538c507fb7fe9ff2d349bdcd43bce90a448a747f082d523b3849d6bcda5e3ae2e998edcb926d6aa249 DIST llvm-gentoo-patchset-13.0.0.tar.xz 5012 BLAKE2B 6760c78c086aaf6629143fd920b0a2c68cad9278628fbea8164dfeb59db95984a5b5d6b3505b510c697e8c95bf8d2be782c6b73c01622d52f2da9b07ecff39e0 SHA512 7764d49343b795b6bebae64f646ba27e3e6cc2a20b8a1aee645ce0d8474633c34acfbb73c08546fee415755dd4ea5a98c1d84db5e394cf5f4fc802eb61148ab6 DIST llvm-gentoo-patchset-13.0.1.tar.xz 6288 BLAKE2B 899222b962486e924e4f8a2b574d285531a3f87af9385ff68c81db92aa224a0cde6d4ee049b5405056bedb4b232b50e1d5840024071a4a215f6311853304c92d SHA512 b2805337f1deca626768a44c5e7ac9ed16e0c31bead1647d44a493a8123c1b8e8f1c8ceee3536bcc6fa87fdd3fcec408229f701adf30eff07e7ef9889b847b01 +DIST llvm-gentoo-patchset-14.0.0.tar.xz 4076 BLAKE2B dc114e53fb878ca74489c420506b9dd9c417e2b97dff4d9441d78a0a256ca1e7243ea2ce38b8665d37b0f24436f9ea5771cd05d9b13887e7370a19ec5e05ba20 SHA512 7f7d08fc762d634692fb251a51c0d73a4a9098907f25451b9ca9453315b603331b65a454b2d631cfecbb3fbc11ab3a36f644c0d7b03e1bb8e96ce4aa08d60615 DIST llvm-gentoo-patchset-9999-1.tar.xz 4032 BLAKE2B b9413484dafed8ae0c68c2c164b45fd07bb8d5d0898f03abe118fd2120ffcb1fb6c949de9649a97c2e8105f24b9d131a725c67c0a502ca4d4d192c1a0d65f49d SHA512 e64449eeaf756c5bd945109937b84ba4bd8a015222bd792d39cf3947871e87571a4ca57814790e51544cb05ad4c2d1f044e818e4caaac7c2e2a02cb1aa290fcc DIST llvmorg-11.1.0.tar.gz 122776532 BLAKE2B ca842ff4afff8f44c82b5e7383962a9c45ca1c93b64fa4c6ebcd70a1d3849dbad2b8e4e24fba02d144c6266d7fab3607ebc6999b28c229cb35256cf40f26a985 SHA512 9a8ce022a935eed42fa71a224f2a207122aadcbef58ee855fdb4825f879e7d028e4dcff22c19b9d336db1c8bf63fb84372d44981acf84615f757e54306c92b81 DIST llvmorg-12.0.1.tar.gz 134259748 BLAKE2B f41de787bc73ff2edfda1b22cc8602be6f65f37dd9e4c8888533cfa8c3ccdcf4f108aaab9de23ab0ab987966eb160f2a553a0bdff99461e71ddd5bfcd086090d SHA512 6eb0dc18e2c25935fabfdfc48b0114be0939158dfdef7b85b395fe2e71042672446af0e68750aae003c9847d10d1f63316fe95d3df738d18f249174292b1b9e1 DIST llvmorg-13.0.0.tar.gz 147270176 BLAKE2B 628f316b580e1edf3a58d4825b724df759e6ed2a4116802470c04562caefc392fa325c91f388036365a2e45a9595cca6d3557fab12984fc8bcfef29c9116d822 SHA512 8004c05d32b9720fb3391783621690c1df9bd1e97e72cbff9192ed88a84b0acd303b61432145fa917b5b5e548c8cee29b24ef8547dcc8677adf4816e7a8a0eb2 DIST llvmorg-13.0.1.tar.gz 147290251 BLAKE2B 2a44b012a672501761d0c27c6b3a315b69bfef0cd13b078a7e7d2fccc4a9c8c0f2bee0f164c4271c9106b0a99cb06e8b64986f66253b613336719fb86b82541b SHA512 9a8cb5d11964ba88b7624f19ec861fb28701f23956ea3c92f6ac644332d5f41fde97bd8933dd3ee70ed378058c252fa3a3887c8d1af90d219970c2b27691166f -DIST llvmorg-14.0.0-rc4.tar.gz 158082013 BLAKE2B 0e717898d8f1ed160e525a68aba56a84b7d31856ea72fdb8fa02e863c5a2074245a38d4a4aa7d178beab1ea64aa92d0ba9dcad4373ebb03868070bf718112107 SHA512 a942848aa5042b97bab6d0d5bcee11ea2f85f1244d7eaadb8f7000bf104b2160e6034c04e3755501dd178bc99c26669cf4aca40edb4bba598fdde6bcf3f40ddc +DIST llvmorg-14.0.0.tar.gz 158057350 BLAKE2B 7052684c620a5eaf52beeee4591adf58cfec9e64a5ee0b24f3d5849fd4df5b006e2906a839cb806ac69c33fab6013c58589b1d74e4fb8558758edcb7d5065064 SHA512 eb5acf96b5e2c59bd07579f7ebe73018b0dd6e2f2d9a5a3c7986320e88febd837d1084b9e5313a2264310342193044629d228337cc76dd2b8527dc0a8bdda999 EBUILD libcxx-11.1.0.ebuild 6638 BLAKE2B 1c141e7dc80e2e4a47d7619500626458c931903c7efc1d5b1f3173ff927ec682b277ed0a932af1681df1416f499d98fd1e8c024ddd14d839a543bf42f673e896 SHA512 4d37e1d3077908dd49fd55b8422f12547848d58dede2b6f9be58d993862d71e47a45c6ce383677b46c178dbfd6c22559beb7f7745f3b589039208d63585174e2 EBUILD libcxx-12.0.1.ebuild 6677 BLAKE2B 32a2f3bbff395d3c129cd4d168a8cb0ee1074c3fc164bf9a33f3287852c07af3e7443018b3fa31036f851cf5544bf80db0579ba2dfa2a3420801a6aef0dd6b05 SHA512 3820b6a249a36cf12ba72b4c4a3847ec035265ce23388dcdbc0547c5708737eee4cf449b14370badc13be3f79ecda2f3c788ac6c7f2f8063c3dd53b1e7b1bf62 EBUILD libcxx-13.0.0.ebuild 6756 BLAKE2B c27aba7517136e19bdebd4f864958922000fd9d59791c0ae0407afffa5c39db21c3cbf2655532453679a54beddd46ad90df2a9482fed99501340f6b0073e264b SHA512 0516aed74ebe4cb170c2b3a975005f054e1227cdd8ae4807c7f1e6796055b09abce148a44425ffd12dde88eb8f638559e3a3dd6c7e29b1fe2bdc86123783f941 EBUILD libcxx-13.0.1.ebuild 6781 BLAKE2B 6ada751bfe1f8e1980e4c20b2a45f237c6630deb4fbb695701b596af17b78391e6a2db99101371a6577f4d414933cf4143d0b60d29fd62e6ec8d6ef3f563b77d SHA512 9d389d1323e866d9b66881b215a2625eee8263a6df790ef5027462b0c3de5421d4ae6077d5861fdfe8adad9d66e34a12de754149e1a1764a42fd824b900c03ac EBUILD libcxx-14.0.0.9999.ebuild 6893 BLAKE2B d45f14e1ecf594063281916fdd8d63bca9fe910e2c51b7d9ca03d363bb1fe9ec06504af44fc61be1f848094ef76ea752ffe479553e9b990544482c69211bea67 SHA512 814773f6731309b31e46636e6e3ed9b4508ed60154eda14826015bf0da75ff4a2cebdacbb1e1535958d3af1d1f10b1e552126eb6aebed945f3a034d36d1b9e1e -EBUILD libcxx-14.0.0_rc4.ebuild 6893 BLAKE2B d45f14e1ecf594063281916fdd8d63bca9fe910e2c51b7d9ca03d363bb1fe9ec06504af44fc61be1f848094ef76ea752ffe479553e9b990544482c69211bea67 SHA512 814773f6731309b31e46636e6e3ed9b4508ed60154eda14826015bf0da75ff4a2cebdacbb1e1535958d3af1d1f10b1e552126eb6aebed945f3a034d36d1b9e1e +EBUILD libcxx-14.0.0.ebuild 6937 BLAKE2B 04722fb717fcf971cfad08599681619a1f003ef487ba73dded68aa1661a8ad64369f30844379750045e81df0959d5d3b2416e9fbe4b2f7faf7043456ed913abe SHA512 ae21926685648e200c8ad649d7172c70962b17fc447a6c5b0d7979d31a7fd3428f54ed43efb24ee1af1868ef059d7519a886b427b5cd18ce0489d7b3dee3cd04 EBUILD libcxx-15.0.0.9999.ebuild 6893 BLAKE2B d45f14e1ecf594063281916fdd8d63bca9fe910e2c51b7d9ca03d363bb1fe9ec06504af44fc61be1f848094ef76ea752ffe479553e9b990544482c69211bea67 SHA512 814773f6731309b31e46636e6e3ed9b4508ed60154eda14826015bf0da75ff4a2cebdacbb1e1535958d3af1d1f10b1e552126eb6aebed945f3a034d36d1b9e1e MISC metadata.xml 622 BLAKE2B 33ff3f89844694f08cdcdb12d7098ad937041c31aa6f453fbd887bfebec688bc05552f9a39431daccd2b309a58c2fb75b04a6350410f90beb96f32c14ab3ca95 SHA512 8b3d12f8904c336cc35f31352014ffe247dd4475f143921cdd56e5396590ebd64fb700df64f76e83aece127d8ed39af5f45da086fa75fca841c9a5ad767cbed2 diff --git a/sys-libs/libcxx/libcxx-14.0.0_rc4.ebuild b/sys-libs/libcxx/libcxx-14.0.0.ebuild index 0562667b5a4b..ddd39dc817b6 100644 --- a/sys-libs/libcxx/libcxx-14.0.0_rc4.ebuild +++ b/sys-libs/libcxx/libcxx-14.0.0.ebuild @@ -12,7 +12,7 @@ HOMEPAGE="https://libcxx.llvm.org/" LICENSE="Apache-2.0-with-LLVM-exceptions || ( UoI-NCSA MIT )" SLOT="0" -KEYWORDS="" +KEYWORDS="~amd64 ~arm ~arm64 ~riscv ~x86 ~x64-macos" IUSE="+libcxxabi +libunwind static-libs test" REQUIRED_USE="libunwind? ( libcxxabi )" RESTRICT="!test? ( test )" @@ -35,7 +35,7 @@ BDEPEND=" )" LLVM_COMPONENTS=( runtimes libcxx{,abi} llvm/{cmake,utils/llvm-lit} cmake ) -LLVM_PATCHSET=9999-1 +LLVM_PATCHSET=${PV/_/-} llvm.org_set_globals python_check_deps() { diff --git a/sys-libs/libcxxabi/Manifest b/sys-libs/libcxxabi/Manifest index 4a5aa49aa6c2..524ffa60327e 100644 --- a/sys-libs/libcxxabi/Manifest +++ b/sys-libs/libcxxabi/Manifest @@ -2,12 +2,12 @@ DIST llvmorg-11.1.0.tar.gz 122776532 BLAKE2B ca842ff4afff8f44c82b5e7383962a9c45c DIST llvmorg-12.0.1.tar.gz 134259748 BLAKE2B f41de787bc73ff2edfda1b22cc8602be6f65f37dd9e4c8888533cfa8c3ccdcf4f108aaab9de23ab0ab987966eb160f2a553a0bdff99461e71ddd5bfcd086090d SHA512 6eb0dc18e2c25935fabfdfc48b0114be0939158dfdef7b85b395fe2e71042672446af0e68750aae003c9847d10d1f63316fe95d3df738d18f249174292b1b9e1 DIST llvmorg-13.0.0.tar.gz 147270176 BLAKE2B 628f316b580e1edf3a58d4825b724df759e6ed2a4116802470c04562caefc392fa325c91f388036365a2e45a9595cca6d3557fab12984fc8bcfef29c9116d822 SHA512 8004c05d32b9720fb3391783621690c1df9bd1e97e72cbff9192ed88a84b0acd303b61432145fa917b5b5e548c8cee29b24ef8547dcc8677adf4816e7a8a0eb2 DIST llvmorg-13.0.1.tar.gz 147290251 BLAKE2B 2a44b012a672501761d0c27c6b3a315b69bfef0cd13b078a7e7d2fccc4a9c8c0f2bee0f164c4271c9106b0a99cb06e8b64986f66253b613336719fb86b82541b SHA512 9a8cb5d11964ba88b7624f19ec861fb28701f23956ea3c92f6ac644332d5f41fde97bd8933dd3ee70ed378058c252fa3a3887c8d1af90d219970c2b27691166f -DIST llvmorg-14.0.0-rc4.tar.gz 158082013 BLAKE2B 0e717898d8f1ed160e525a68aba56a84b7d31856ea72fdb8fa02e863c5a2074245a38d4a4aa7d178beab1ea64aa92d0ba9dcad4373ebb03868070bf718112107 SHA512 a942848aa5042b97bab6d0d5bcee11ea2f85f1244d7eaadb8f7000bf104b2160e6034c04e3755501dd178bc99c26669cf4aca40edb4bba598fdde6bcf3f40ddc +DIST llvmorg-14.0.0.tar.gz 158057350 BLAKE2B 7052684c620a5eaf52beeee4591adf58cfec9e64a5ee0b24f3d5849fd4df5b006e2906a839cb806ac69c33fab6013c58589b1d74e4fb8558758edcb7d5065064 SHA512 eb5acf96b5e2c59bd07579f7ebe73018b0dd6e2f2d9a5a3c7986320e88febd837d1084b9e5313a2264310342193044629d228337cc76dd2b8527dc0a8bdda999 EBUILD libcxxabi-11.1.0.ebuild 3548 BLAKE2B 322a3306a33c720fd242b6dc69c233562f24c373c76b13d7a41332b26e668b7742c33550fd41fd3f2f0965390ed0cc3185b05d36908e434067f94f353b27e2e3 SHA512 40b2755e57c13a6473a53da14c257d73a4e9d13ea4ed08d23957d15892d3a702f705d294059f0dc13320930214da7793037cd94715f64ebfebbfc2da8f23321a EBUILD libcxxabi-12.0.1.ebuild 3532 BLAKE2B 87f97e6d1d5c222b1a421bc7ee0fb1e9f0156c5f34888456dc265356fd2ae5e1b22343cd8970acf2820852f9be12d48006dee1d9493972b5761781156393735d SHA512 6369fbc69360eb0bb25e49d4fc554b897a86c7ac081c99cdc97bf61ddfa6cfe75c297afb91fa3c8fb6f24db67cc326a5ee3de74e10fdab1702d1894b3a5ba8a3 EBUILD libcxxabi-13.0.0.ebuild 3605 BLAKE2B 7bdc8ecd9c35cdc247f08f9d5687d7362013be7c9c5afe006817cb5a384d4dd272bc686c6fe2ddf2a9bde5be8d1fa185ae60da940fded833a356f76e6105feb8 SHA512 69c4564fc68e3037620de0ce0cda29093bff9eb919f48f4760558edd1031c0d198991e6346774244701679aa0619d6afd814ec80d0d66265418408416621d9d0 EBUILD libcxxabi-13.0.1.ebuild 3606 BLAKE2B e81a4b8b3f179d70f5e54b311c6298c427505945ba53ae7f9e42c0113e7dbd3e5178ff1e9f0bd2ba27e491ca252efdcc337e572cc722d27912231ca3eee45687 SHA512 36cca18b3f083205d486fe07d78ce8d0cc79b1af59f8289731d5615591fe98d67ae3f48012d8a19c2e87a3a38c7118feaed44a60d132323b90e376c76d0a14f2 EBUILD libcxxabi-14.0.0.9999.ebuild 3459 BLAKE2B e154cf8ad9a7055fb941d4b2cdc78ce87286f3ae648f37170606775c791ff2b69b5b421a9cc716fa12aa86ec9b0a48643e78aab0a7b372d4f79cf362bc4b9a8b SHA512 79b43fd3cecec2393431df7d9a6720a4cff5ef24977b579dc815120262ba2a860df06ceb7e93f9c8df578fd5737a02abad4c737774cc7b9d4983567aa9ef6b3e -EBUILD libcxxabi-14.0.0_rc4.ebuild 3459 BLAKE2B e154cf8ad9a7055fb941d4b2cdc78ce87286f3ae648f37170606775c791ff2b69b5b421a9cc716fa12aa86ec9b0a48643e78aab0a7b372d4f79cf362bc4b9a8b SHA512 79b43fd3cecec2393431df7d9a6720a4cff5ef24977b579dc815120262ba2a860df06ceb7e93f9c8df578fd5737a02abad4c737774cc7b9d4983567aa9ef6b3e +EBUILD libcxxabi-14.0.0.ebuild 3500 BLAKE2B ae2784bce2de92f63f5a0c30a74738ec77e80c69b59d976deca43442a70fa3b0c82eb1d3ea0ece17e317806c8a3f5a88729ed4fe8e7eb4af1602874d848e9400 SHA512 80b46ae415783bb1b64613d144530d0dda03114fb732ccbe3cce10996ca29fb11418f9c06912f64ba4657ff123ebe22d94acadf0628e6f19cb25a42b80b752b7 EBUILD libcxxabi-15.0.0.9999.ebuild 3459 BLAKE2B e154cf8ad9a7055fb941d4b2cdc78ce87286f3ae648f37170606775c791ff2b69b5b421a9cc716fa12aa86ec9b0a48643e78aab0a7b372d4f79cf362bc4b9a8b SHA512 79b43fd3cecec2393431df7d9a6720a4cff5ef24977b579dc815120262ba2a860df06ceb7e93f9c8df578fd5737a02abad4c737774cc7b9d4983567aa9ef6b3e MISC metadata.xml 351 BLAKE2B 9071a2cbb0eee25e4396bd720f39cd09b011e70fa4a2a87bab63801fa54d307304219a6bddc9b6fb8d0e3b32b07ea09d0419b8ea74af25d601505c3b577c656a SHA512 096b95417b8cdaeed177108ac27e54cd44c4488e8dd3b6ca0aa07f2c70fc59d42343c926d44adf54349e3f9791b9151293383e471df1282678a3c60031184d13 diff --git a/sys-libs/libcxxabi/libcxxabi-14.0.0_rc4.ebuild b/sys-libs/libcxxabi/libcxxabi-14.0.0.ebuild index 577953191e5d..1598ec8868a1 100644 --- a/sys-libs/libcxxabi/libcxxabi-14.0.0_rc4.ebuild +++ b/sys-libs/libcxxabi/libcxxabi-14.0.0.ebuild @@ -12,7 +12,7 @@ HOMEPAGE="https://libcxxabi.llvm.org/" LICENSE="Apache-2.0-with-LLVM-exceptions || ( UoI-NCSA MIT )" SLOT="0" -KEYWORDS="" +KEYWORDS="~amd64 ~arm ~arm64 ~riscv ~x86 ~x64-macos" IUSE="+libunwind static-libs test" RESTRICT="!test? ( test )" diff --git a/sys-libs/libomp/Manifest b/sys-libs/libomp/Manifest index a79b733ecc10..a587b0777c6c 100644 --- a/sys-libs/libomp/Manifest +++ b/sys-libs/libomp/Manifest @@ -5,12 +5,12 @@ DIST llvmorg-11.1.0.tar.gz 122776532 BLAKE2B ca842ff4afff8f44c82b5e7383962a9c45c DIST llvmorg-12.0.1.tar.gz 134259748 BLAKE2B f41de787bc73ff2edfda1b22cc8602be6f65f37dd9e4c8888533cfa8c3ccdcf4f108aaab9de23ab0ab987966eb160f2a553a0bdff99461e71ddd5bfcd086090d SHA512 6eb0dc18e2c25935fabfdfc48b0114be0939158dfdef7b85b395fe2e71042672446af0e68750aae003c9847d10d1f63316fe95d3df738d18f249174292b1b9e1 DIST llvmorg-13.0.0.tar.gz 147270176 BLAKE2B 628f316b580e1edf3a58d4825b724df759e6ed2a4116802470c04562caefc392fa325c91f388036365a2e45a9595cca6d3557fab12984fc8bcfef29c9116d822 SHA512 8004c05d32b9720fb3391783621690c1df9bd1e97e72cbff9192ed88a84b0acd303b61432145fa917b5b5e548c8cee29b24ef8547dcc8677adf4816e7a8a0eb2 DIST llvmorg-13.0.1.tar.gz 147290251 BLAKE2B 2a44b012a672501761d0c27c6b3a315b69bfef0cd13b078a7e7d2fccc4a9c8c0f2bee0f164c4271c9106b0a99cb06e8b64986f66253b613336719fb86b82541b SHA512 9a8cb5d11964ba88b7624f19ec861fb28701f23956ea3c92f6ac644332d5f41fde97bd8933dd3ee70ed378058c252fa3a3887c8d1af90d219970c2b27691166f -DIST llvmorg-14.0.0-rc4.tar.gz 158082013 BLAKE2B 0e717898d8f1ed160e525a68aba56a84b7d31856ea72fdb8fa02e863c5a2074245a38d4a4aa7d178beab1ea64aa92d0ba9dcad4373ebb03868070bf718112107 SHA512 a942848aa5042b97bab6d0d5bcee11ea2f85f1244d7eaadb8f7000bf104b2160e6034c04e3755501dd178bc99c26669cf4aca40edb4bba598fdde6bcf3f40ddc +DIST llvmorg-14.0.0.tar.gz 158057350 BLAKE2B 7052684c620a5eaf52beeee4591adf58cfec9e64a5ee0b24f3d5849fd4df5b006e2906a839cb806ac69c33fab6013c58589b1d74e4fb8558758edcb7d5065064 SHA512 eb5acf96b5e2c59bd07579f7ebe73018b0dd6e2f2d9a5a3c7986320e88febd837d1084b9e5313a2264310342193044629d228337cc76dd2b8527dc0a8bdda999 EBUILD libomp-11.1.0.ebuild 2888 BLAKE2B fa9005fa8b8d26e264ac7555ab755fe0402c93c82205dbcc1802ac0ae54b245f33ebef8aa7d17c125652acd08f59bcd1efaca169e28fd5e5fcf266c4cbf0d1ba SHA512 24e44ea53c7b6238f3de78088076b3c4d426cc6039dbac5c2bbb1694f9b1e4088b7bf8ada2ad51eca525c4f6fff772178511fe07f449c200e95206c828a2095a EBUILD libomp-12.0.1.ebuild 2955 BLAKE2B 731a206c38d7c982b1b746517061de539c64e1d3bd5afd24c2e1d441bbcd7e91d80e6b20920d64eabaf0c3de85d5e269ef59c17ebdbe30c8808f1deeff495b88 SHA512 0d27c7374062a9831edcadbbea0787998184fca979637da1bab9b8848b3c7165e5e558fc9ef388a1f8d9e20e913b61e7fd19c3e9f2ecf885990a041a0f436156 EBUILD libomp-13.0.0-r2.ebuild 3808 BLAKE2B a24b4436e0547b1f7d7becb8866288c19da6e345f0fd8b5ffb6c016634f3891833de79864bc85f0e310c48ab1eada3d3d59cc7658ef8c96995fd8340a0a1b179 SHA512 decaeeda70320eee804dd6d2320e464d3d4b744c4c5a8ee9bf9a191e80f72ca1e97a1251d0ef69a6608740da2706dc1eea8a379b1e3b0ef06858dc043a2529c7 EBUILD libomp-13.0.1.ebuild 3838 BLAKE2B 37e71494f702ba47713cb523380566557dc1aeb522fe06da8a2a4879bb47d638dd4bbe5630361ed78c09df7b9f4d25fdf31fcc13b0701c32270190e77b26d2f0 SHA512 b8c7d1591a59603391160ae3ffe9213b7081c808a1a56f5517a04f48d177670f4fe0c6fb989665a02b23d03245a267e3f58a54937530f2af2188d296a7c78aa1 EBUILD libomp-14.0.0.9999.ebuild 3751 BLAKE2B 849748f2a27549b150afbff92be3279dbf67c8d8e3d7fa1460c9693bc8ae9e684d737e6a1ae79ee4a351759b6c1523ebaab7a17889e58c7328180344492572c8 SHA512 bb4a8c5512249ad1553b0c849882865c98482859eab81f17702283b27253fdc079ee32864af617817c1e13e717b78df39814b4d7b48db0b208e2d8b55e18e216 -EBUILD libomp-14.0.0_rc4.ebuild 3751 BLAKE2B 849748f2a27549b150afbff92be3279dbf67c8d8e3d7fa1460c9693bc8ae9e684d737e6a1ae79ee4a351759b6c1523ebaab7a17889e58c7328180344492572c8 SHA512 bb4a8c5512249ad1553b0c849882865c98482859eab81f17702283b27253fdc079ee32864af617817c1e13e717b78df39814b4d7b48db0b208e2d8b55e18e216 +EBUILD libomp-14.0.0.ebuild 3817 BLAKE2B 7f5c80c1a8e6995b58576911a3ab73a3dd1b66338889ab5b6396589aae574aae1cd85529ff9a5baa1dd565f2c260964445062a7575e3bfb8ff74b8f1b92a57e7 SHA512 2bc2897f6e6863d9a4d1e18d09b253d918fe8353e2af094995bef4d86880d1b85377d882782c6e84223ca19ebe93108f380ac602e3b6680d2927f6874bb3e1b5 EBUILD libomp-15.0.0.9999.ebuild 3751 BLAKE2B 849748f2a27549b150afbff92be3279dbf67c8d8e3d7fa1460c9693bc8ae9e684d737e6a1ae79ee4a351759b6c1523ebaab7a17889e58c7328180344492572c8 SHA512 bb4a8c5512249ad1553b0c849882865c98482859eab81f17702283b27253fdc079ee32864af617817c1e13e717b78df39814b4d7b48db0b208e2d8b55e18e216 MISC metadata.xml 826 BLAKE2B 94bad2982b52156c2755f4fcdc534648e30b45b514f486028d7beba9af050c3c6847a33fdc11cbf26195794b8e8a7cbeb4e110b8b4398f784c7b7c3edeea02ca SHA512 60de2890b1edc3d60feb5b04dbce840b17e0812ff301f00fd7c12242d3b81cdb3b8ad7afeb3624d70526a93cf8285c96a65b5fcd0384dd093b722c1ae645fa2f diff --git a/sys-libs/libomp/libomp-14.0.0_rc4.ebuild b/sys-libs/libomp/libomp-14.0.0.ebuild index dbee89f1997c..eac03ceafd28 100644 --- a/sys-libs/libomp/libomp-14.0.0_rc4.ebuild +++ b/sys-libs/libomp/libomp-14.0.0.ebuild @@ -12,7 +12,7 @@ HOMEPAGE="https://openmp.llvm.org" LICENSE="Apache-2.0-with-LLVM-exceptions || ( UoI-NCSA MIT )" SLOT="0" -KEYWORDS="" +KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~x86 ~amd64-linux ~x64-macos" IUSE="cuda debug hwloc offload ompt test llvm_targets_AMDGPU llvm_targets_NVPTX" # CUDA works only with the x86_64 ABI diff --git a/sys-libs/libunwind/Manifest b/sys-libs/libunwind/Manifest index f8cb9e99ef09..f3ab7cbcb568 100644 --- a/sys-libs/libunwind/Manifest +++ b/sys-libs/libunwind/Manifest @@ -6,5 +6,5 @@ AUX libunwind-1.5.0-x32.patch 596 BLAKE2B dc032ca1b2c3e21595239954252a41676c0745 DIST libunwind-1.5.0.tar.gz 878355 BLAKE2B ee35441289926ac22a58bedb9f831d8e13bacd663a99b3ce25eed229f25f0423bbbd90e09e3d62b003518d7a620aa6d15b0dd5b93632736a89fa0667b35d5fc2 SHA512 1df20ca7a8cee2f2e61294fa9b677e88fec52e9d5a329f88d05c2671c69fa462f6c18808c97ca9ff664ef57292537a844f00b18d142b1938c9da701ca95a4bab DIST libunwind-1.6.2.tar.gz 901392 BLAKE2B 3d0313f7e92cbc3e1a84ad3831a5170f21cdf772f1697ca0a59dea63cdd47da382e9f1fd77325d9ff8bcd47559a425dc883a820c646c628cd00faed82cb0f83f SHA512 1d17dfb14f99a894a6cda256caf9ec481c14068aaf8f3a85fa3befa7c7cca7fca0f544a91a3a7c2f2fc55bab19b06a67ca79f55ac9081151d94478c7f611f8f7 EBUILD libunwind-1.5.0-r1.ebuild 3276 BLAKE2B 0a0ab57f71c05521de552b6a9e7530258e6390e64a33bb09f1751ede229abf5ec0d70537321ff77a80946abb1d3d8b6b5517fe17648231e7a5f4b14032870636 SHA512 48aa9c88e5d535bff85cad52fe7ef2b9d854d4adbdb9249430932458cbf5918ce7d4cd29330882577a1acfc85f06efe6adfe669093c8a7cdc3b0ec61f1459a04 -EBUILD libunwind-1.6.2.ebuild 2698 BLAKE2B acaba96fc6d463c89f959719a240047b786e47f5935b650ae8f74b8cd54e62380d6b96d2a4332819ebd1870d18edaf05630dee6b9772588d84495ea8cba3dd50 SHA512 d33ec5aae7825dde69745761ca4d5c94d43804383260785c82035d9a9a8ae4d12d477713ff3b2387b3c71a6b0dd891f2db4802602fc11fb8a9e787c24a3fa871 +EBUILD libunwind-1.6.2.ebuild 2704 BLAKE2B 9aeabebd03199541b2923c87fa0f5268b5a7e4472f62e59ed3b777d7e29ed6403d533dd76323e27bd291fe75fd07893c32d0fed6ba2a7f27039cd5042428217c SHA512 245400b0698b1675de30bb2ce28f7bb4ca4262aeac303a09878c7a7f41b3fefcb44a72d6cb9a7d7756d655ac2032ea6dbb3a93bb0c39110acc8d49d7941add10 MISC metadata.xml 574 BLAKE2B cf49536a68a838e39d6c67191eff496d8910f1d58cd7830546e519af38972db7cf7add177a6e5902202d2a66bc6b3dadcd261505b3bb61f285f0be10a0db42e7 SHA512 bf5fd787ae0b233c7fe5e8f4b987c472a03b93c07adebf35ce27c7b6759b9ac239296d5ede6725ac11f5030365199533389e51ced10dc6a20bb5aa74baf34ab0 diff --git a/sys-libs/libunwind/libunwind-1.6.2.ebuild b/sys-libs/libunwind/libunwind-1.6.2.ebuild index c92b672c50e3..f67ca2db225d 100644 --- a/sys-libs/libunwind/libunwind-1.6.2.ebuild +++ b/sys-libs/libunwind/libunwind-1.6.2.ebuild @@ -14,7 +14,7 @@ S="${WORKDIR}/${MY_P}" LICENSE="MIT" SLOT="0/8" # libunwind.so.8 -KEYWORDS="amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 ~riscv -sparc x86 ~amd64-linux ~x86-linux" +KEYWORDS="amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 ~riscv ~s390 -sparc x86 ~amd64-linux ~x86-linux" IUSE="debug debug-frame doc libatomic lzma static-libs test zlib" RESTRICT="test !test? ( test )" # some tests are broken (toolchain version dependent, rely on external binaries) diff --git a/sys-libs/llvm-libunwind/Manifest b/sys-libs/llvm-libunwind/Manifest index 6f40d10ad5f1..65def5c5eabb 100644 --- a/sys-libs/llvm-libunwind/Manifest +++ b/sys-libs/llvm-libunwind/Manifest @@ -3,12 +3,12 @@ DIST llvmorg-11.1.0.tar.gz 122776532 BLAKE2B ca842ff4afff8f44c82b5e7383962a9c45c DIST llvmorg-12.0.1.tar.gz 134259748 BLAKE2B f41de787bc73ff2edfda1b22cc8602be6f65f37dd9e4c8888533cfa8c3ccdcf4f108aaab9de23ab0ab987966eb160f2a553a0bdff99461e71ddd5bfcd086090d SHA512 6eb0dc18e2c25935fabfdfc48b0114be0939158dfdef7b85b395fe2e71042672446af0e68750aae003c9847d10d1f63316fe95d3df738d18f249174292b1b9e1 DIST llvmorg-13.0.0.tar.gz 147270176 BLAKE2B 628f316b580e1edf3a58d4825b724df759e6ed2a4116802470c04562caefc392fa325c91f388036365a2e45a9595cca6d3557fab12984fc8bcfef29c9116d822 SHA512 8004c05d32b9720fb3391783621690c1df9bd1e97e72cbff9192ed88a84b0acd303b61432145fa917b5b5e548c8cee29b24ef8547dcc8677adf4816e7a8a0eb2 DIST llvmorg-13.0.1.tar.gz 147290251 BLAKE2B 2a44b012a672501761d0c27c6b3a315b69bfef0cd13b078a7e7d2fccc4a9c8c0f2bee0f164c4271c9106b0a99cb06e8b64986f66253b613336719fb86b82541b SHA512 9a8cb5d11964ba88b7624f19ec861fb28701f23956ea3c92f6ac644332d5f41fde97bd8933dd3ee70ed378058c252fa3a3887c8d1af90d219970c2b27691166f -DIST llvmorg-14.0.0-rc4.tar.gz 158082013 BLAKE2B 0e717898d8f1ed160e525a68aba56a84b7d31856ea72fdb8fa02e863c5a2074245a38d4a4aa7d178beab1ea64aa92d0ba9dcad4373ebb03868070bf718112107 SHA512 a942848aa5042b97bab6d0d5bcee11ea2f85f1244d7eaadb8f7000bf104b2160e6034c04e3755501dd178bc99c26669cf4aca40edb4bba598fdde6bcf3f40ddc +DIST llvmorg-14.0.0.tar.gz 158057350 BLAKE2B 7052684c620a5eaf52beeee4591adf58cfec9e64a5ee0b24f3d5849fd4df5b006e2906a839cb806ac69c33fab6013c58589b1d74e4fb8558758edcb7d5065064 SHA512 eb5acf96b5e2c59bd07579f7ebe73018b0dd6e2f2d9a5a3c7986320e88febd837d1084b9e5313a2264310342193044629d228337cc76dd2b8527dc0a8bdda999 EBUILD llvm-libunwind-11.1.0.ebuild 3222 BLAKE2B e9f47dd9859691d9c629b0eee62cf4e6d9a41e6f74b991410ee4cb1c647c828388a2ea7c1806df7350dcefff9a8178021956f85c7ec2aeb11d702a17e3b32132 SHA512 fc85afa5f560b2e7ad28c1e7d7b0d36b7bc0be408817b66f0d9afb3a811b94c24a282cbb13400685a2ffb00dbf620eb0c94d66fddfe27c9cffc2108f71c11a32 EBUILD llvm-libunwind-12.0.1.ebuild 3656 BLAKE2B cdf5e4e4f39ce47ac57ac43f287b5d6a42a61a79d988cdcd52823aadb0c1950abc85f5c1ba8276198e46357fc27f3ab7d06c0e7e9279a9a40e4dc7f4b936aac5 SHA512 c6477d4837e8e0d3ee6c035e0462e0a817752af214ff20ace3b8c3e377c749351cf78bf2ffec3d95085334f6b9a0a23e311f5a50109c390ad5bec60a0bef2dd5 EBUILD llvm-libunwind-13.0.0.ebuild 3781 BLAKE2B 08d2c7ea77679aa9ea06997ce86d8c8c6c073ae3b8a1ff94be33c6dd5904425ae75632bf8ea3bd00825941e6c7a6fb4879693f33a94b54b9fe054a8ec61eeaec SHA512 b83af0f0a6d45e618d70fd59c7e4ff7dfa815c8eca650a65a4c892756197bc34ea389150bd65f01c6243ea54b0cfac476d5095f657f6a34e72d92967af600aeb EBUILD llvm-libunwind-13.0.1.ebuild 3812 BLAKE2B 62e1976431679d89c0e91b96cccea6b8a51392e3b45e733117ca90be86af0778543e602159f5ee54e4a243a065afce99a236939c8583be85eb73ae7b3f198a7d SHA512 1fa0a8fae7b8bd2b03020f417d6862412fa50c2891ad5cd03c38611ee82fa6e96cd8ec8b9b75a690d8817c3e21d977b4cff929d526eca6b0f3656e5815b0c0e4 EBUILD llvm-libunwind-14.0.0.9999.ebuild 3126 BLAKE2B c5f745f265c39e9d4686ac99fe5893b27d2e156208c92d127ddbcfb93aad9e12ed596d5d29774722db6117b3db4962be9a9d355cd2cc7d3f04efe78b2a2ed891 SHA512 dfe17e8eb6fb8b03e25c1662a209530cc4bf6c3d31adeb5dc1a57cc0bead836c60babb027809f5d1b3119d7a7bbcf538ec449b0f766763806c17c351fd775807 -EBUILD llvm-libunwind-14.0.0_rc4.ebuild 3126 BLAKE2B c5f745f265c39e9d4686ac99fe5893b27d2e156208c92d127ddbcfb93aad9e12ed596d5d29774722db6117b3db4962be9a9d355cd2cc7d3f04efe78b2a2ed891 SHA512 dfe17e8eb6fb8b03e25c1662a209530cc4bf6c3d31adeb5dc1a57cc0bead836c60babb027809f5d1b3119d7a7bbcf538ec449b0f766763806c17c351fd775807 +EBUILD llvm-libunwind-14.0.0.ebuild 3179 BLAKE2B 5e7cf67a48f80e4b7faae2095063d76865892e1547b76488d9f127f51e8407950842ee156fc7ed132f01b9b3b918b0d450b475a725daf70addc832ba61740449 SHA512 fe6efe833c3f7c5482aa8238393f94803344c67d28927b26946eefa6ad53dd5ebdfd23280d56f531c1821e4f9bb259d831c97ad3f269c8a194da3332d67e7083 EBUILD llvm-libunwind-15.0.0.9999.ebuild 3126 BLAKE2B c5f745f265c39e9d4686ac99fe5893b27d2e156208c92d127ddbcfb93aad9e12ed596d5d29774722db6117b3db4962be9a9d355cd2cc7d3f04efe78b2a2ed891 SHA512 dfe17e8eb6fb8b03e25c1662a209530cc4bf6c3d31adeb5dc1a57cc0bead836c60babb027809f5d1b3119d7a7bbcf538ec449b0f766763806c17c351fd775807 MISC metadata.xml 303 BLAKE2B ed0dbe1165e30ee5c3556aaf467abf212e198590a06c70f0de4e2c12060644df928c8f388fadfe776249a77dc000b40881d7254cfdc30f7a41209e2524136adb SHA512 5a69c07b9b1b37646d29a7287f1ba1c9150a5fae60df644266232871b5e4db41c0e8d102e8b873af2bdbf814935e8f8479e1534b8aa47d0ee31e971e2fa4dc50 diff --git a/sys-libs/llvm-libunwind/llvm-libunwind-14.0.0_rc4.ebuild b/sys-libs/llvm-libunwind/llvm-libunwind-14.0.0.ebuild index 377022eb4033..5c46a2ae1249 100644 --- a/sys-libs/llvm-libunwind/llvm-libunwind-14.0.0_rc4.ebuild +++ b/sys-libs/llvm-libunwind/llvm-libunwind-14.0.0.ebuild @@ -12,7 +12,7 @@ HOMEPAGE="https://github.com/llvm-mirror/libunwind" LICENSE="Apache-2.0-with-LLVM-exceptions || ( UoI-NCSA MIT )" SLOT="0" -KEYWORDS="" +KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~x86 ~x64-macos" IUSE="debug static-libs test" RESTRICT="!test? ( test )" diff --git a/sys-libs/timezone-data/Manifest b/sys-libs/timezone-data/Manifest index baef16bf0370..5882790a2032 100644 --- a/sys-libs/timezone-data/Manifest +++ b/sys-libs/timezone-data/Manifest @@ -1,7 +1,10 @@ DIST tzcode2021a.tar.gz 262204 BLAKE2B 4072685f2344602ffcfe32a7bf92d3b0d93e38ffca842f1c07a60db5e26f1f18ab32fc7b5f155b0bdab49f8d0bfcd5b58f4a192b4d06d7d9639893e5cb596328 SHA512 bf1d53bcbfecd3b09d57a9e6d3cb49b5dc5f8e1b6674b67e7f974e1a268c2aaf13ca89a7ef12f49d0665aff782bd72685e00c22a41ca88a028da0429f972fd45 DIST tzcode2021e.tar.gz 273644 BLAKE2B 3331477d8107fb30b2c37d3a3afb212dda7ecf53aa553ea5070537bd1a4a01bf62e70adb2fb14c025e22d272d96ee51e9e5089c5c9790682d3c43cda0ded8680 SHA512 87b0335129ea41c5f42f687f548712e5da892baa8494cecf5d34851beceecf6ae52f22104696ed187713cf9e502570eb2041e277dfd3c043c11d0253bfde685a +DIST tzcode2022a.tar.gz 275632 BLAKE2B f9b3bb5eedc51896c2a1dd77fe8118518c8a1f35152325fa6c4163e11dd34aeb0c88b16b17a27ad022feb2f6818996ec0e40e06a7e1edd454187f586c3739070 SHA512 3f047a6f414ae3df4a3d6bb9b39a1790833d191ae48e6320ab9438cd326dc455475186a02c44e4cde96b48101ab000880919b1e0e8092aed7254443ed2c831ed DIST tzdata2021a.tar.gz 411892 BLAKE2B b8d177e90e22bd8a3fd23c9a9c19896cb245efd8e768b59ab8c63e56ab141e67331f3231e3a7c802f844375049cfd902e14e912ce677b3aea38fc0d968905e87 SHA512 7cdd762ec90ce12a30fa36b1d66d1ea82d9fa21e514e2b9c7fcbe2541514ee0fadf30843ff352c65512fb270857b51d1517b45e1232b89c6f954ba9ff1833bb3 DIST tzdata2021e.tar.gz 422509 BLAKE2B e0e1189a1bbfb2ee641b9c4c8d00775372638d46d7aea72ff0c4bcb02b38a65eedaf89e6b272e054245c940369a50c2573e6fc720414e4ab3d45adeda8ed9c75 SHA512 c1e8d04e049157ed5d4af0868855bbd75517e3d7e1db9c41d5283ff260109de46b6fac6be94828201d093e163d868044ac2a9db2bf0aeab800e264d0c73a9119 +DIST tzdata2022a.tar.gz 425833 BLAKE2B 0af5b785a6f5d871b017237ad58d3d9bedd0de38cf18ac51b32cd8df9811215af7af913d8cd3966de695ce65df3f49f52e239196e93b953094763814cc56ecd0 SHA512 542e4559beac8fd8c4af7d08d816fd12cfe7ffcb6f20bba4ff1c20eba717749ef96e5cf599b2fe03b5b8469c0467f8cb1c893008160da281055a123dd9e810d9 EBUILD timezone-data-2021a-r1.ebuild 5675 BLAKE2B ebb7b82895a58585f688b164655c2d52dbc54d5c2f7234167fa8bcbe87d1189b88e9449cfec7b80aa46edd8e7d2a29047409b81fbd6c8114546668914e49c362 SHA512 1cee878422e1f7939066b439a987883cfb3a3148ab7aa2218cf4c6b83ba5b7fc12301709862339be283dd2e0e4726ac295aaa19eb526c9fdaf0fc32eadf62434 EBUILD timezone-data-2021e.ebuild 5675 BLAKE2B ebb7b82895a58585f688b164655c2d52dbc54d5c2f7234167fa8bcbe87d1189b88e9449cfec7b80aa46edd8e7d2a29047409b81fbd6c8114546668914e49c362 SHA512 1cee878422e1f7939066b439a987883cfb3a3148ab7aa2218cf4c6b83ba5b7fc12301709862339be283dd2e0e4726ac295aaa19eb526c9fdaf0fc32eadf62434 +EBUILD timezone-data-2022a.ebuild 5683 BLAKE2B d0df561f3b77e8c8cd34e0da49c6ddb6bddf0c870d7505cd966f4637a3190b9d40a387db48a1b4a354279e82393c0e1c3a89722f9e5069869d0ed219012ca63d SHA512 2ae3f0089a8bd16d7d86cabd3ee5e3ec3f3edbccc7876e6c429e533b1bedcf9e2d9e9793faeb4f2df2f487892af98a8416fef0530d4ee332d6864a0c7d33c57d MISC metadata.xml 729 BLAKE2B 96a262bedf50590ed1325e4856ed58766e359cfba537252b51b172f868dbf6902fd03044bfd1bbbf0b8f5e1db72c2e4f52dbc63557cead2cc865e5fbeb171647 SHA512 1f20b48f5d4054f4f48c33a965992ceaeb43b9919f6b5698b0f6ccc2fa0b0eb677c6ad67cb88c599db4d5f5e3db1cecf87372dc72ff5541a799f0aaae2c2dac1 diff --git a/sys-libs/timezone-data/timezone-data-2022a.ebuild b/sys-libs/timezone-data/timezone-data-2022a.ebuild new file mode 100644 index 000000000000..656c7f532b86 --- /dev/null +++ b/sys-libs/timezone-data/timezone-data-2022a.ebuild @@ -0,0 +1,196 @@ +# Copyright 1999-2022 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI="7" + +inherit toolchain-funcs flag-o-matic + +code_ver=${PV} +data_ver=${PV} +DESCRIPTION="Timezone data (/usr/share/zoneinfo) and utilities (tzselect/zic/zdump)" +HOMEPAGE="https://www.iana.org/time-zones" +SRC_URI="https://www.iana.org/time-zones/repository/releases/tzdata${data_ver}.tar.gz + https://www.iana.org/time-zones/repository/releases/tzcode${code_ver}.tar.gz" + +LICENSE="BSD public-domain" +SLOT="0" +KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" +IUSE="nls leaps-timezone zic-slim" + +DEPEND="nls? ( virtual/libintl )" +RDEPEND="${DEPEND} + !sys-libs/glibc[vanilla(+)]" + +src_unpack() { + mkdir -p "${S}" && cd "${S}" || die + default +} + +src_prepare() { + default + + # check_web contacts validator.w3.org + sed -i -e 's/check_tables check_web/check_tables/g' \ + Makefile || die "Failed to disable check_web" + + tc-is-cross-compiler && cp -pR "${S}" "${S}"-native +} + +src_configure() { + tc-export CC + + append-lfs-flags #471102 + + if use elibc_Darwin ; then + append-cppflags -DSTD_INSPIRED #138251 + fi + + append-cppflags -DHAVE_GETTEXT=$(usex nls 1 0) -DTZ_DOMAIN='\"libc\"' + + # Upstream default is 'slim', but it breaks quite a few programs + # that parse /etc/localtime directly: bug# 747538. + append-cppflags -DZIC_BLOAT_DEFAULT='\"'$(usex zic-slim slim fat)'\"' + + LDLIBS="" + if use nls ; then + # See if an external libintl is available. #154181 #578424 + local c="${T}/test" + echo 'main(){}' > "${c}.c" + if $(tc-getCC) ${CPPFLAGS} ${CFLAGS} ${LDFLAGS} "${c}.c" -o "${c}" -lintl 2>/dev/null ; then + LDLIBS+=" -lintl" + fi + fi +} + +_emake() { + emake \ + REDO=$(usex leaps-timezone posix_right posix_only) \ + TOPDIR="${EPREFIX}" \ + ZICDIR='$(TOPDIR)/usr/bin' \ + "$@" +} + +src_compile() { + _emake \ + AR="$(tc-getAR)" \ + cc="$(tc-getCC)" \ + RANLIB="$(tc-getRANLIB)" \ + CFLAGS="${CFLAGS} -std=gnu99 ${CPPFLAGS}" \ + LDFLAGS="${LDFLAGS}" \ + LDLIBS="${LDLIBS}" + if tc-is-cross-compiler ; then + _emake -C "${S}"-native \ + AR="$(tc-getBUILD_AR)" \ + cc="$(tc-getBUILD_CC)" \ + RANLIB="$(tc-getBUILD_RANLIB)" \ + CFLAGS="${BUILD_CFLAGS} ${BUILD_CPPFLAGS}" \ + LDFLAGS="${BUILD_LDFLAGS}" \ + LDLIBS="${LDLIBS}" \ + zic + fi +} + +src_test() { + # VALIDATE_ENV is used for extended/web based tests. Punt on them. + emake check VALIDATE_ENV=true +} + +src_install() { + local zic="" + tc-is-cross-compiler && zic="zic=${S}-native/zic" + _emake install ${zic} DESTDIR="${D}" LIBDIR="/nukeit" + rm -rf "${D}/nukeit" "${ED}/etc" || die + + insinto /usr/share/zoneinfo + doins "${S}"/leap-seconds.list + + # Delete man pages installed by man-pages package. + rm "${ED}"/usr/share/man/man5/tzfile.5* "${ED}"/usr/share/man/man8/{tzselect,zdump,zic}.8 || die + dodoc CONTRIBUTING README NEWS *.html +} + +get_TIMEZONE() { + local tz src="${EROOT}/etc/timezone" + if [[ -e ${src} ]] ; then + tz=$(sed -e 's:#.*::' -e 's:[[:space:]]*::g' -e '/^$/d' "${src}") + else + tz="FOOKABLOIE" + fi + [[ -z ${tz} ]] && return 1 || echo "${tz}" +} + +pkg_preinst() { + local tz=$(get_TIMEZONE) + if [[ ${tz} == right/* || ${tz} == posix/* ]] ; then + eerror "The right & posix subdirs are no longer installed as subdirs -- they have been" + eerror "relocated to match upstream paths as sibling paths. Further, posix/xxx is the" + eerror "same as xxx, so you should simply drop the posix/ prefix. You also should not" + eerror "be using right/xxx for the system timezone as it breaks programs." + die "Please fix your timezone setting" + fi + + # Trim the symlink by hand to avoid portage's automatic protection checks. + rm -f "${EROOT}"/usr/share/zoneinfo/posix + + if has_version "<=${CATEGORY}/${PN}-2015c" ; then + elog "Support for accessing posix/ and right/ directly has been dropped to match" + elog "upstream. There is no need to set TZ=posix/xxx as it is the same as TZ=xxx." + elog "For TZ=right/, you can use TZ=../zoneinfo-leaps/xxx instead. See this post" + elog "for details: https://mm.icann.org/pipermail/tz/2015-February/022024.html" + fi +} + +configure_tz_data() { + # make sure the /etc/localtime file does not get stale #127899 + local tz src="${EROOT}/etc/timezone" etc_lt="${EROOT}/etc/localtime" + + # If it's a symlink, assume the user knows what they're doing and + # they're managing it themselves. #511474 + if [[ -L "${etc_lt}" ]] ; then + einfo "Assuming your ${etc_lt} symlink is what you want; skipping update." + return 0 + fi + + if ! tz=$(get_TIMEZONE) ; then + einfo "Assuming your empty ${src} file is what you want; skipping update." + return 0 + fi + + if [[ "${tz}" == "FOOKABLOIE" ]] ; then + einfo "You do not have a timezone set in ${src}; skipping update." + return 0 + fi + + local tzpath="${EROOT}/usr/share/zoneinfo/${tz}" + + if [[ ! -e ${tzpath} ]]; then + ewarn "The timezone specified in ${src} is not valid." + return 1 + fi + + if [[ -f ${etc_lt} ]]; then + # If a regular file already exists, copy over it. + ewarn "Found a regular file at ${etc_lt}." + ewarn "Some software may expect a symlink instead." + ewarn "You may convert it to a symlink by removing the file and running:" + ewarn " emerge --config sys-libs/timezone-data" + einfo "Copying ${tzpath} to ${etc_lt}." + cp -f "${tzpath}" "${etc_lt}" + else + # Otherwise, create a symlink and remove the timezone file. + tzpath="../usr/share/zoneinfo/${tz}" + einfo "Linking ${tzpath} at ${etc_lt}." + if ln -snf "${tzpath}" "${etc_lt}"; then + einfo "Removing ${src}." + rm -f "${src}" + fi + fi +} + +pkg_config() { + configure_tz_data +} + +pkg_postinst() { + configure_tz_data +} |