From ebc282ef4dfa408accac685565b8ee5f6faec119 Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Sun, 12 Feb 2023 09:56:54 +0000 Subject: gentoo auto-resync : 12:02:2023 - 09:56:54 --- app-arch/Manifest.gz | Bin 16901 -> 16873 bytes app-arch/bzip3/Manifest | 4 +- app-arch/bzip3/bzip3-1.1.5.ebuild | 32 -------- app-arch/bzip3/bzip3-1.2.2.ebuild | 2 +- app-arch/gzip/Manifest | 2 +- app-arch/gzip/metadata.xml | 20 ++--- app-arch/hardlink/Manifest | 2 +- app-arch/hardlink/metadata.xml | 2 +- app-arch/qpress/Manifest | 2 +- .../files/qpress-20220819-fix-build-system.patch | 5 +- app-arch/unp/Manifest | 2 +- app-arch/unp/metadata.xml | 4 +- app-arch/zstd/Manifest | 6 ++ .../zstd/files/zstd-1.5.4-no-find-valgrind.patch | 12 +++ .../zstd/files/zstd-1.5.4-tests-no-programs.patch | 67 +++++++++++++++++ app-arch/zstd/zstd-1.5.4-r2.ebuild | 66 +++++++++++++++++ app-arch/zstd/zstd-1.5.4.ebuild | 82 +++++++++++++++++++++ 17 files changed, 255 insertions(+), 55 deletions(-) delete mode 100644 app-arch/bzip3/bzip3-1.1.5.ebuild create mode 100644 app-arch/zstd/files/zstd-1.5.4-no-find-valgrind.patch create mode 100644 app-arch/zstd/files/zstd-1.5.4-tests-no-programs.patch create mode 100644 app-arch/zstd/zstd-1.5.4-r2.ebuild create mode 100644 app-arch/zstd/zstd-1.5.4.ebuild (limited to 'app-arch') diff --git a/app-arch/Manifest.gz b/app-arch/Manifest.gz index 0857d55afc41..1f2f533a81f6 100644 Binary files a/app-arch/Manifest.gz and b/app-arch/Manifest.gz differ diff --git a/app-arch/bzip3/Manifest b/app-arch/bzip3/Manifest index 54e9de95ce29..974ebfb02a1d 100644 --- a/app-arch/bzip3/Manifest +++ b/app-arch/bzip3/Manifest @@ -1,9 +1,7 @@ -DIST bzip3-1.1.5.tar.xz 265340 BLAKE2B 0226a97d564f1c9d9d1089b43ae79a9e43d0b77628298ef953c45505ad8d62caaf17bf6fa357857f123cf072b8ccd3003bfe138f25284baa5a5a5cdd8a555f71 SHA512 589c2e8e675a61014c7c4e82d0f2067201e3fb97bf7cfa6b7aa23690dc739824226089ac710509cc085b22eeb671ed5e23c6493967a433d3b284cb638af71be8 DIST bzip3-1.1.8.tar.xz 269668 BLAKE2B fe85ba2ecca8e2433501c13e57856720da731b6c959340a68dd4654a516c12e034a90ff6cd6aed55dd2160c3860fdc3e60cddd47ffd00737a657a2e6c73704af SHA512 36141a48f0d5b35de4b06117ceca3c5d5cdc3df6be187856f1436751984b0154942e0eece531ee7b191cc0cd7056960de6a1ca3ec0fc2bcc7ff1d50444cd1e3e DIST bzip3-1.2.1.tar.xz 271652 BLAKE2B ef4eae00d93b00dd6dcf2d3beb980c5b0466e8d1af5b6a1c1a493c1524fb91043cbafe404d9ac6907491ab5e894676b3802b572125e14e9a8be19f7ffa22abaa SHA512 b20a7ea52f83a4ddfab0965e34809be66729b516688f1f04b8a21adf5c3c1ad0819dab416f3e844d88d8f52dbe098bedefe63f879c8a6322ffcb19f3f1b3d2d8 DIST bzip3-1.2.2.tar.xz 275872 BLAKE2B 601f0b150dee756d204c186f6ace5106fbc90189862cb1bcba7d4f2a2dd093ded64bb8feba0f214aac39ad138a23e6ef430a5e75829dd2ebab77c79d85342197 SHA512 476876f3949ac285e86625a9a83741308910ddce5b9449c0ca02b41d9c336f759b9702f2ce6b61243f1fde59a9ef8cf926fb2e94911828d5f39e207319bf522d -EBUILD bzip3-1.1.5.ebuild 780 BLAKE2B 40c5d480da40010a89acd6f33a35048bdf5983017b9701840b917ff2fc56ffff93da2189cc783f1009d2de3063a41892bba33d3a59bf5a1d9d0c4104075dc71b SHA512 2b3d5355ca469a43563a54ffc1bc8f3e1378955e955e5e603659f7367296c68cbf0392550df77c2ae29f919b01ab33505371ed0a871e98ede7174eb7bf15c6f5 EBUILD bzip3-1.1.8.ebuild 780 BLAKE2B 40c5d480da40010a89acd6f33a35048bdf5983017b9701840b917ff2fc56ffff93da2189cc783f1009d2de3063a41892bba33d3a59bf5a1d9d0c4104075dc71b SHA512 2b3d5355ca469a43563a54ffc1bc8f3e1378955e955e5e603659f7367296c68cbf0392550df77c2ae29f919b01ab33505371ed0a871e98ede7174eb7bf15c6f5 EBUILD bzip3-1.2.1.ebuild 780 BLAKE2B 40c5d480da40010a89acd6f33a35048bdf5983017b9701840b917ff2fc56ffff93da2189cc783f1009d2de3063a41892bba33d3a59bf5a1d9d0c4104075dc71b SHA512 2b3d5355ca469a43563a54ffc1bc8f3e1378955e955e5e603659f7367296c68cbf0392550df77c2ae29f919b01ab33505371ed0a871e98ede7174eb7bf15c6f5 -EBUILD bzip3-1.2.2.ebuild 782 BLAKE2B e2e032db4b8b2a8ec53f240c3dd78e9863ee88d9ee9cef1b48fa7f573b0d0510b3426d4d6fd56ee969aceeeb8351990e7e9d701ee0572baec969c4ae8b0ea3b3 SHA512 e9ecd0a9932d41902bb232d4b6e6862a627b15f50d48bf70450e4b55341dde203fc22327894faf41f09bd0711ebe4bdda2d324ece79f1deedd6070dfd9d10ba2 +EBUILD bzip3-1.2.2.ebuild 780 BLAKE2B c0beeaff4442ba49098444f5b0c04625180a4529776ac9c3b73cf5c9cdde95229c5e42b6db53cae58952b83c7aef907f83ab366e80958f24ba5f3bb3697640f9 SHA512 f68707c80a45818b97de6210cb137b26129ae5e90d57aded24c99a83817ce3e67c6b77b90bbd4a5b8329140dc76754b48d60503e50df16f26f11b944fca25440 MISC metadata.xml 879 BLAKE2B eacb925ae4939be72ae25f0f333d8c8e1c08b2fd7946e27dfadd214b8fd5f27eef3f141f9ca911cf89151245f2fa11c7a8c5459c63badbfaf71e62aaca6d67f4 SHA512 963eae34b110b883993959f97a84c5fbaae914e009d024379d8b83ad02b335f3d7404ecd9020e291a38e78cb358dd4d0ff1b4b8f3604a2cc719e9d82ebee1e50 diff --git a/app-arch/bzip3/bzip3-1.1.5.ebuild b/app-arch/bzip3/bzip3-1.1.5.ebuild deleted file mode 100644 index 4bbe2c3cdb5b..000000000000 --- a/app-arch/bzip3/bzip3-1.1.5.ebuild +++ /dev/null @@ -1,32 +0,0 @@ -# Copyright 1999-2022 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -inherit toolchain-funcs - -DESCRIPTION="A better and stronger spiritual successor to BZip2" -HOMEPAGE="https://github.com/kspalaiologos/bzip3" - -if [[ ${PV} == *9999* ]] ; then - inherit git-r3 - EGIT_REPO_URI="https://github.com/kspalaiologos/${PN}.git" -else - SRC_URI="https://github.com/kspalaiologos/${PN}/releases/download/${PV}/${P}.tar.xz" - KEYWORDS="amd64 arm64 ~loong ~x86" -fi - -LICENSE="LGPL-3+" -SLOT="0" - -src_configure() { - # ./configure script will default to Clang if it is found on the system, - # force the use of CC selected by the user with CC=$(tc-getCC) - econf CC=$(tc-getCC) -} - -src_install() { - default - - find "${ED}" -type f -name '*.la' -delete || die -} diff --git a/app-arch/bzip3/bzip3-1.2.2.ebuild b/app-arch/bzip3/bzip3-1.2.2.ebuild index 33aa6e59599d..5a859349b58a 100644 --- a/app-arch/bzip3/bzip3-1.2.2.ebuild +++ b/app-arch/bzip3/bzip3-1.2.2.ebuild @@ -13,7 +13,7 @@ if [[ ${PV} == *9999* ]] ; then EGIT_REPO_URI="https://github.com/kspalaiologos/${PN}.git" else SRC_URI="https://github.com/kspalaiologos/${PN}/releases/download/${PV}/${P}.tar.xz" - KEYWORDS="~amd64 ~arm64 ~loong ~x86" + KEYWORDS="amd64 arm64 ~loong ~x86" fi LICENSE="LGPL-3+" diff --git a/app-arch/gzip/Manifest b/app-arch/gzip/Manifest index 97d8542e177c..470ca2c875ff 100644 --- a/app-arch/gzip/Manifest +++ b/app-arch/gzip/Manifest @@ -5,4 +5,4 @@ DIST gzip-1.12_p20221228.tar.xz 806448 BLAKE2B 278eb44caca7ee16ca5d0210673726a1d DIST gzip-1.12_p20221228.tar.xz.sig 833 BLAKE2B b59d4677d15e2461d5fa95b4d53e94914e14cad613a9766aa3e51bfcece84ec0c4dd752c0d124cb76cc2240f9460f809c5bbbab958522c795e94026c8d4206ef SHA512 09a3a6687c80d7ec7e97ebd4c679e4d162729232d77966352c2f7ddd45594d79039ff33a93592889137605412b18b7868ea19ba4f4d162a5912a3978b3d67dd2 EBUILD gzip-1.12-r4.ebuild 2131 BLAKE2B 2c224324e98e391123a46d32da2562a2749a198bbd067c52c666db31aec91238f2ebd58ba72185c38af5cd2a00ae50022666e655b4b3666a263243033dae2bc2 SHA512 7ea4adc05098d169c15da62391575926f14fe15f203a53f8fc3e50b515d9cd630de74bda3194a6883ea54ab05cca16e2073d51aeb6f5057e1e6a4e6e764451e6 EBUILD gzip-1.12_p20221228-r1.ebuild 2488 BLAKE2B d1bc7f69dc84b0eb8f5df0deae24142b76b2f412593eed811fa22d08ef5d4b98f788262556ebd989523c72e5fcbe197d58cac63293c5fa0703daf1c6b5828867 SHA512 f3bb3ea65616b9fa82d256e9634514c51a579d3c24849b75cd9d5cf652891d19d143923f540a3fb5d0c464fb5ebce29cf3ab906629786c04eac05d2cb32d1044 -MISC metadata.xml 422 BLAKE2B b3ba7db4fdf23c9b1b801f21a3230898f260b131344538ff8644bc842dcd5f6bef5e4e2f8d475267d6d39047a87c00e1138e69d49892d21d58249346bde1e57c SHA512 6241ec1357f2f326c745589a18622987e9444e515157a53cb1188a21cd90e14e392db1e31b24f833ba05647ddfcfd6a89e13f6125ca15451bceb1a14e80fbc23 +MISC metadata.xml 433 BLAKE2B ec37d1a2da994967c16c5005c7267f5ea788dd5fea6e48e231c59313f8a779fac6241c790d292bb47b5586a734ad114774438785d6f394bad51d9f2818912e3d SHA512 98ed16e20a9c2c8210ca8a8261eecd0718b94fe8fcbf9a647b04b4912132b281b55e17f26ae41afa0429e2f2a9c3faa8b877da5f8f35a14f52a0a7482f6c1afb diff --git a/app-arch/gzip/metadata.xml b/app-arch/gzip/metadata.xml index 32eb6dd3de53..0748488de1b1 100644 --- a/app-arch/gzip/metadata.xml +++ b/app-arch/gzip/metadata.xml @@ -1,14 +1,14 @@ - - base-system@gentoo.org - Gentoo Base System - - - cpe:/a:gnu:gzip - - -disable optimized assembly code that is not PIC friendly - + + base-system@gentoo.org + Gentoo Base System + + + cpe:/a:gnu:gzip + + + disable optimized assembly code that is not PIC friendly + diff --git a/app-arch/hardlink/Manifest b/app-arch/hardlink/Manifest index 4b3139ee8776..e1a05080ddf7 100644 --- a/app-arch/hardlink/Manifest +++ b/app-arch/hardlink/Manifest @@ -1,3 +1,3 @@ DIST hardlink-0.3.2.tar.bz2 15479 BLAKE2B dd6cfc312ed75dc6d9e37b898215ed90efe4734c5974297c9e29a51a69c9b2d4e91d9aa3bca1d42679307eecd95ee46e6f636c211d1ceafef1ea52428761d1ec SHA512 1d027f7b2f1974c950044fa8872dc58101800ca557a4d66406652fb43f64653f7dd39a70f4ac65f5f6bca9116de4ce44aeba2ef1fe446834641ba5c4c5604dff EBUILD hardlink-0.3.2.ebuild 1078 BLAKE2B 050db15d196ebef177a3339cedb39a79650bde599e309a7f2db2391692a3d5917a1b0c3fadbcd19e0685c3809264a552a96013006e54ab9685398bdb57ddee4f SHA512 d782f30244846804f525c29ef09293be395e2a3b2581ba9c08a0c18d3acb9e4cef60ed8024be6bca4d395b3c8d2532d5b346bd633ad29e4ce7ba2c570e39180d -MISC metadata.xml 376 BLAKE2B 316bca94b25cc5fae281038d68c3248a33222648b397b0806e0bf87a2e60d3694fd03c606baf57f25f953052b0b8234f42cd1c2d1eefa81c640f7bcade611660 SHA512 7e61b69ff3e06de9aaadc91e0d1189aca5b79778ccb86475831d37d0c0e820acca1ada69843629674c820f1e39035866f533819242b072aa8f2be9e65fcb75a6 +MISC metadata.xml 377 BLAKE2B a3a8147a14e1207a7fdab70271bba6a0bb1c0a515614f31e22438e475b3fe681b1b0739b7906b39b1e7d5bed200038d7b3f2b6fe3d0bce7c03264595787ce6ec SHA512 be8932e63d0e84fadd088ba9e8e26998ad5d448be6c0cd2a6f015d841b512bf29051dfa1e75fb16080d02f6e3e592324195781b795fd6f580c383650a4f04c36 diff --git a/app-arch/hardlink/metadata.xml b/app-arch/hardlink/metadata.xml index 737247bb16ae..f409a4f8d262 100644 --- a/app-arch/hardlink/metadata.xml +++ b/app-arch/hardlink/metadata.xml @@ -5,7 +5,7 @@ robbat2@gentoo.org Robin H. Johnson - + shell-tools@gentoo.org Gentoo Shell Tools Project diff --git a/app-arch/qpress/Manifest b/app-arch/qpress/Manifest index 683829a59a79..fb1a326e9e78 100644 --- a/app-arch/qpress/Manifest +++ b/app-arch/qpress/Manifest @@ -1,4 +1,4 @@ -AUX qpress-20220819-fix-build-system.patch 1079 BLAKE2B 1d8817e15d37697a47de6f9b9eddcce93d97052d69e5fbd4e4b16338c658accfc96cc3fe13e869dc70462b8554324cb84ad22fda13b7d3fd9189e9d6568e76ad SHA512 4a1c6134d58130dc75dc387ef138845bc18818a0cea096409ce72952a052b45e00a0cc6e2afd2039b71154d30f05d7aa9b9fa9c1765dda3473821a0a0ff24100 +AUX qpress-20220819-fix-build-system.patch 1066 BLAKE2B b7f2183b426defaef850cb1328e15d1e6f8240f1a64dc64e5dc95d500014fddda39ba7f8375387f1aa3b1ee93b151422563e3f75fb4822e550a26083aa97400d SHA512 14774464e4fa47b3ce83ce91a212c821678de79f80b8d2c66916c240eef194a17633daff4043ecb722d70fc8e09ea4c681488be52a52717c52647b610a6eb6ea DIST qpress-20220819.tar.gz 25150 BLAKE2B e19a2bca747ec48507288b1b1ad8e053cfb35558f5936dff4ff83c548a3ab613a640813fc3b793e7acb1b65f371af414635d7e469e92c014b580efce4f84ee90 SHA512 f9cf4f87c25fdaa9b8ed12bbfb8d95c3036a7c5c1a0548042ba460b79787a83d5cd2ad93f2da84e5b6715ade5e137024541a3f29e076d4236d0507e2c604113c EBUILD qpress-20220819.ebuild 482 BLAKE2B a72d325bc86f99870232f7450a09d7f6a0469ca276930167ef84469371eca1d3dd782da51f8ff49d4d43de4993d16850b07fa89281a3a67e027504534ea57a36 SHA512 a34bfa6aa59d9b04c964b820214d84afe7df02b38db2aedda8c513136f6008135c8f4b984584b7eb14b474f4f23a402e0e8ee111cdcb28cfc9635fbd73cdcc38 MISC metadata.xml 488 BLAKE2B 931482680609670cbb65cc79943cca69d01067e8ae15545dfb469d6a1f18619237964fdf42ce1453b3535fc8a68355a35a3ebcd4d45b761d49a254f86ea17250 SHA512 ea1f899fde5b7a54a82e8c77d996fd87efed3784f68cb8f6b1857cb7b5b7ea8d5573e572f3a9578c9956a65ef751124a526ac8af7a53bc77b3fd3f041118304e diff --git a/app-arch/qpress/files/qpress-20220819-fix-build-system.patch b/app-arch/qpress/files/qpress-20220819-fix-build-system.patch index 79676f57664d..3fb5750eac9b 100644 --- a/app-arch/qpress/files/qpress-20220819-fix-build-system.patch +++ b/app-arch/qpress/files/qpress-20220819-fix-build-system.patch @@ -11,13 +11,12 @@ diff --git a/makefile b/makefile index 4890f9d..349fbb2 100755 --- a/makefile +++ b/makefile -@@ -1,9 +1,21 @@ +@@ -1,9 +1,20 @@ -PREFIX = /usr/local +DESTDIR ?= +PREFIX ?= /usr/local +CXX ?= g++ -+CXXFLAGS ?= -O3 -+CXXFLAGS += -Wall -Wextra -Werror ++CXXFLAGS ?= -O3 -Wall -Wextra -Werror +LDFLAGS ?= -g++: qpress.cpp aio.cpp quicklz.c utilities.cpp diff --git a/app-arch/unp/Manifest b/app-arch/unp/Manifest index cb011c146c51..680e4798ea8f 100644 --- a/app-arch/unp/Manifest +++ b/app-arch/unp/Manifest @@ -1,3 +1,3 @@ DIST unp_2.0~pre9.tar.xz 16424 BLAKE2B 9042f48be0f80d5e40a08161a35c282ba458dc98cf13992835bdeecebd5fbadd33b3af9165738332cb9f508550a234a48d314332f00ecdacc808a8051eb0740b SHA512 74c9a6e143c9023bdd456dacff5c3a6e30722e259f324c066fe3eed9e4a09c38b399b381719c8677c2fa84434c1e7720384d782d97c098fa6fbcbdbf4030986e EBUILD unp-2.0_pre9.ebuild 1105 BLAKE2B ff8c7064543eefc29418af34b2eda17b8b7e926da48264cf135b02f94d74d4ef607ce8aecab05d05b317592dc9117896ad391655ad37bd84037760109dacc326 SHA512 c2f35cac91911497611d44a4178dde2aba3ec90c0145992dbc1b80f06948f885b3feb543101fbdeb598827afe5de609949415cdfa561761b3c24c9e43f20e744 -MISC metadata.xml 211 BLAKE2B 8a357a845c5cd7c1afeda19eefd020f5cab0b573e5a6914aa4a06c2b48261c7b86a5d72b96731cd78140f992d895cbb1d54ba70a1bb1485ae5a75bd7062e13c4 SHA512 9a2eeafd67a65fd9a667e31692033480c29f9250bfe5b54166130e805e3621c22d9eb9d0515b2622c220dc78255cb42c2ae6b6379070591164b1295441a4c12d +MISC metadata.xml 217 BLAKE2B 4c798b28d6d7cb91ce9efa46084d222e24f1f62814b89dc32e8ee4c2d2e761392fa46cb368de68fdaf0c020acc5603a124b3a96edaa8e6ee333ba3f71ea59ad5 SHA512 83aaf1cf450d1a0769b0d5bc9533bb17e683dd88d04d3318da131cd1c8c66492451b9518f9f2b08d144ac0a2ba4113ed09ffaff1b7c4779f6c35bd7bdcabb874 diff --git a/app-arch/unp/metadata.xml b/app-arch/unp/metadata.xml index dcdae049d7cf..4da67a4f4b42 100644 --- a/app-arch/unp/metadata.xml +++ b/app-arch/unp/metadata.xml @@ -1,5 +1,7 @@ -hanno@gentoo.org + + hanno@gentoo.org + diff --git a/app-arch/zstd/Manifest b/app-arch/zstd/Manifest index bb0584ca724b..56613d47ef6d 100644 --- a/app-arch/zstd/Manifest +++ b/app-arch/zstd/Manifest @@ -1,5 +1,11 @@ +AUX zstd-1.5.4-no-find-valgrind.patch 596 BLAKE2B 28c5bcc005511703833fc73b2f11ee7a42a69c5e762e71c269265c42585fe4cf167a4bdba4f0e36e8e0e7a61e01e0f992c9417690bc879978d575823aa5e1884 SHA512 ad6cd84fde1a4f29710ecffe40854a8bbad0b1428000a57d706b221411675e2d79958c940dc955ec27020cfb7c9a14b7ac84cfe15759a5d07552d46f94b7df88 +AUX zstd-1.5.4-tests-no-programs.patch 2252 BLAKE2B 014fab10a60fd6f5ecf5399ebc77a192075c0b08cb3b6643b4b414e942198f476d5dc8fbe8fa76306db70361a299518b574f69b84d8b27b30e5c5dc4988c2c48 SHA512 aed61bacf3d4d2b802e8e6a3dfa12221dcd7b6f0e64972530f826995619870ed1e87ea920eb6fdc81069e5165153703972ad1e2d370521f7d1624c308afba520 DIST zstd-1.4.9.tar.gz 1834843 BLAKE2B 907f492bd023db9459bdc292a0bc4d1b6336d92dd7041eb2b36668589c20fcb98c411b85d78f92cd16d9b4a000d9c4125b5f966a5ca777034ae78210e639315b SHA512 f529db9c094f9ae26428bf1fdfcc91c6d783d400980e0f0d802d2cf13c2be2931465ef568907e03841ff76a369a1447e7371f8799d8526edb9a513ba5c6db133 DIST zstd-1.5.2.tar.gz 1950967 BLAKE2B 9d474e9fdcf7e5eb09d1f606712b05ca3001e8f6f7451254d8dba3f429101048532fd9c84a5b9083ae90d0457e9e1b1d48256581a1697e7db19b09d73595f070 SHA512 e107508a41fca50845cc2494e64adaba93efb95a2fa486fc962510a8ba4b2180d93067cae9870f119e88e5e8b28a046bc2240b0b23cdd8933d1fb1a6a9668c1e +DIST zstd-1.5.4.gh.tar.gz 2161536 BLAKE2B ffc5fcbbdf4ab04bc14b5037308bf4e879d4cbaaf863462ea1e8af3f1b86b935ee6036e49298c83ac42b00472c003e32c263c977f0ae7d64f31d9ae63c5c28cb SHA512 2896a6dd6b60cc251720356babcbab6018c874eb2149121b26e28041496fc355a9cb5fd1b39c91558fcfbafb789b3d721264a0f9b5734f893d5f3cdf97016394 +DIST zstd-1.5.4.tar.gz 2178759 BLAKE2B 0c7ad42ebbf888bcd978eee95dc07f8e74c6b4ca1e1cec15ae110f5f57b66cb1d726896f71430e6219ef54ff90e722fc778147d5f77f4bff5395b0dc8b914885 SHA512 b6f64850ceb6cfed831fff3c43508d2a72338862a96dd9430b1d3ebbfcee40201c8b6dcf8b6b603e252bb96f3f283c9cb07da7f24414187f5f1fea3b51e01863 EBUILD zstd-1.4.9.ebuild 1676 BLAKE2B 31a1c1f3b06f03aee1f79be98fd352ebc850cf763a5fca287810fae13042587d434e28f1826e0e86194bffeadb60704d9b36f0b0036aa72a51fa7be11257e814 SHA512 b878ad96130da9450c92597354335b294b24341c6ac0b8f236f9bcd55efda8c46f700f0571ac80822da34a5b854d463d02cf8707ea1e7b3b2b713a6f6924025c EBUILD zstd-1.5.2-r3.ebuild 1490 BLAKE2B 3acb86024c045b85682d2e4b138dd83ab85de948dbc95529aadd260728c6ffe2ddb1168ba3165cab65da7c803f9d715ec2c70f9a0c9d65b7ff01e06ae57d560a SHA512 9fdb17e7d37b41cb2b1cc5553005223d50d3aa0d62fd56100878ac5c30c994e0c515b5dd0aede1f053fc413614810bfd73f4a64da18f12b31f2644537cc6d0a9 +EBUILD zstd-1.5.4-r2.ebuild 1881 BLAKE2B b3ee9ad9883c591454016baa041bc108259559af01f0a8e282e1e7393d47d09eaaefed1e390f914f26f3c7b59b084013c24aad7bc4b50d82142827fd00956761 SHA512 e446b1ca1b202d98149380eafc812407daec6b644c3b8bd4f62ae1c00804cc8221152436b60209cd650c834bc7400c7c66c3461b7414a2a31d31620ea6a7c378 +EBUILD zstd-1.5.4.ebuild 1826 BLAKE2B 606d8babbc91b04dd0901e582195c9d502248c7a87eaed6f6e47255ecf8ad3b10a85a7b9fdb94529721155f78b41896c26e35baf09a028912b31d5d0622f75ff SHA512 470298a353c7834d7d4cde29abf5c71e6e638b1a9d38b0610488cd6a7b1b5b134d52bf5dd35ee026252ed90ae9dffddcbd78d2749da9201381dd916a0b26d908 MISC metadata.xml 302 BLAKE2B 66692581b8918a23bab99bb3b0909702327c1acf2b7f8ec2fbfdf74ff75a8f178ce1140e0a9d46b64983dfe9529134db842a5a60a86b7fcbbd5db88e844d136d SHA512 097c09d06824c85919b21bc841c791851b1a7d1a6c6d16a26bbe9bed9dfb1522cacdd2b430b8ff51762fb73b388d88ec679d46570b2e56b36352ea2cf20e46f6 diff --git a/app-arch/zstd/files/zstd-1.5.4-no-find-valgrind.patch b/app-arch/zstd/files/zstd-1.5.4-no-find-valgrind.patch new file mode 100644 index 000000000000..c52f9dd9c4d6 --- /dev/null +++ b/app-arch/zstd/files/zstd-1.5.4-no-find-valgrind.patch @@ -0,0 +1,12 @@ +Workaround until https://github.com/mesonbuild/meson/pull/11372 lands +--- a/tests/meson.build ++++ b/tests/meson.build +@@ -135,7 +135,7 @@ checkTag = executable('checkTag', + # ============================================================================= + + if tests_supported_oses.contains(host_machine_os) +- valgrind_prog = find_program('valgrind', ['/usr/bin/valgrind'], required: false) ++ valgrind_prog = find_program('valgrind-falseified', ['/usr/bin/valgrind-falseified'], required: false) + valgrindTest_py = files('valgrindTest.py') + if valgrind_prog.found() + test('valgrindTest', diff --git a/app-arch/zstd/files/zstd-1.5.4-tests-no-programs.patch b/app-arch/zstd/files/zstd-1.5.4-tests-no-programs.patch new file mode 100644 index 000000000000..ec1fc325920f --- /dev/null +++ b/app-arch/zstd/files/zstd-1.5.4-tests-no-programs.patch @@ -0,0 +1,67 @@ +https://github.com/facebook/zstd/pull/3490 + +From 183a18a45c1d69f8c42b9fcd25e6d28f9b3d75bb Mon Sep 17 00:00:00 2001 +From: Eli Schwartz +Date: Fri, 10 Feb 2023 00:28:47 -0500 +Subject: [PATCH 1/2] meson: correctly specify the dependency relationship for + playtests + +It depends on the zstd program being built, and passes it as an env +variable. Just like datagen. But for datagen, we explicitly depend on +it, while for zstd, we assume it's built as part of "all". + +This can be wrong in two cases: +- when running individual tests, meson can (re)build just what is needed + for that one test +- a later patch will handle building zstd but not by default +--- a/tests/meson.build ++++ b/tests/meson.build +@@ -162,7 +162,7 @@ if host_machine_os != os_windows + playTests_sh, + args: opt, + env: ['ZSTD_BIN=' + zstd.full_path(), 'DATAGEN_BIN=./datagen'], +- depends: [datagen], ++ depends: [datagen, zstd], + suite: suite, + workdir: meson.current_build_dir(), + timeout: 2800) # Timeout should work on HDD drive + +From 97ab0e2ab60fdda78f610032408df104de20b9f1 Mon Sep 17 00:00:00 2001 +From: Eli Schwartz +Date: Thu, 9 Feb 2023 23:55:09 -0500 +Subject: [PATCH 2/2] meson: always build the zstd binary when tests are + enabled + +We need to run it for the tests, even if programs are disabled. So if +they are disabled, create a build rule for the program, but don't +install it. Just make it available for the test itself. +--- a/meson.build ++++ b/meson.build +@@ -132,7 +132,7 @@ endif + + subdir('lib') + +-if bin_programs ++if bin_programs or bin_tests + subdir('programs') + endif + +--- a/programs/meson.build ++++ b/programs/meson.build +@@ -72,7 +72,14 @@ zstd = executable('zstd', + c_args: zstd_c_args, + dependencies: zstd_deps, + export_dynamic: export_dynamic_on_windows, # Since Meson 0.45.0 +- install: true) ++ build_by_default: bin_programs, ++ install: bin_programs) ++ ++if not bin_programs ++ # we generate rules to build the programs, but don't install anything ++ # so do not continue to installing scripts and manpages ++ subdir_done() ++endif + + zstd_frugal_sources = [join_paths(zstd_rootdir, 'programs/zstdcli.c'), + join_paths(zstd_rootdir, 'programs/timefn.c'), + diff --git a/app-arch/zstd/zstd-1.5.4-r2.ebuild b/app-arch/zstd/zstd-1.5.4-r2.ebuild new file mode 100644 index 000000000000..fc646ce06670 --- /dev/null +++ b/app-arch/zstd/zstd-1.5.4-r2.ebuild @@ -0,0 +1,66 @@ +# Copyright 1999-2023 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +inherit meson-multilib usr-ldscript + +DESCRIPTION="zstd fast compression library" +HOMEPAGE="https://facebook.github.io/zstd/" +# Drop .gh on next bump (>1.5.4), it's only here as we switched to release +# tarball. +SRC_URI="https://github.com/facebook/zstd/releases/download/v${PV}/${P}.tar.gz -> ${P}.gh.tar.gz" +S="${WORKDIR}"/${P}/build/meson + +LICENSE="|| ( BSD GPL-2 )" +SLOT="0/1" +KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" +IUSE="+lzma lz4 static-libs test zlib" +RESTRICT="!test? ( test )" + +RDEPEND=" + lzma? ( app-arch/xz-utils ) + lz4? ( app-arch/lz4:= ) + zlib? ( sys-libs/zlib ) +" +DEPEND="${RDEPEND}" + +PATCHES=( + # Workaround until Valgrind bugfix lands + "${FILESDIR}"/${PN}-1.5.4-no-find-valgrind.patch + # Allow building tests w/o programs (useful for multilib) + "${FILESDIR}"/${PN}-1.5.4-tests-no-programs.patch +) + +multilib_src_configure() { + local native_file="${T}"/meson.${CHOST}.${ABI}.ini.local + + # This replaces the no-find-valgrind patch once bugfix lands in a meson + # release + we can BDEPEND on it (https://github.com/mesonbuild/meson/pull/11372) + cat >> ${native_file} <<-EOF || die + [binaries] + valgrind='valgrind-falseified' + EOF + + local emesonargs=( + -Ddefault_library=$(multilib_native_usex static-libs both shared) + + $(meson_native_true bin_programs) + $(meson_native_true bin_contrib) + $(meson_use test bin_tests) + + $(meson_native_use_feature zlib) + $(meson_native_use_feature lzma) + $(meson_native_use_feature lz4) + + --native-file "${native_file}" + ) + + meson_src_configure +} + +multilib_src_install() { + meson_src_install + + multilib_is_native_abi && gen_usr_ldscript -a zstd +} diff --git a/app-arch/zstd/zstd-1.5.4.ebuild b/app-arch/zstd/zstd-1.5.4.ebuild new file mode 100644 index 000000000000..b933a78b2570 --- /dev/null +++ b/app-arch/zstd/zstd-1.5.4.ebuild @@ -0,0 +1,82 @@ +# Copyright 1999-2023 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +inherit multilib-minimal toolchain-funcs usr-ldscript + +DESCRIPTION="zstd fast compression library" +HOMEPAGE="https://facebook.github.io/zstd/" +SRC_URI="https://github.com/facebook/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz" + +LICENSE="|| ( BSD GPL-2 )" +SLOT="0/1" +KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" +IUSE="+lzma lz4 static-libs zlib" + +RDEPEND=" + lzma? ( app-arch/xz-utils ) + lz4? ( app-arch/lz4 ) + zlib? ( sys-libs/zlib ) +" +DEPEND="${RDEPEND}" + +src_prepare() { + default + multilib_copy_sources +} + +mymake() { + emake \ + CC="$(tc-getCC)" \ + CXX="$(tc-getCXX)" \ + AR="$(tc-getAR)" \ + PREFIX="${EPREFIX}/usr" \ + LIBDIR="${EPREFIX}/usr/$(get_libdir)" \ + V=1 \ + HAVE_LZMA="$(multilib_native_usex lzma 1 0)" \ + HAVE_LZ4="$(multilib_native_usex lz4 1 0)" \ + HAVE_ZLIB="$(multilib_native_usex zlib 1 0)" \ + "${@}" +} + +multilib_src_compile() { + local libzstd_targets=( libzstd{,.a}-mt ) + + mymake -C lib ${libzstd_targets[@]} libzstd.pc + + if multilib_is_native_abi ; then + mymake zstd + mymake -C contrib/pzstd + fi +} + +multilib_src_test() { + if multilib_is_native_abi ; then + # 'test' runs more tests than 'check'. + mymake -C tests test + mymake -C contrib/pzstd test + else + mymake check + fi +} + +multilib_src_install() { + mymake -C lib DESTDIR="${D}" install + + if multilib_is_native_abi ; then + mymake -C programs DESTDIR="${D}" install + + gen_usr_ldscript -a zstd + + mymake -C contrib/pzstd DESTDIR="${D}" install + fi +} + +multilib_src_install_all() { + einstalldocs + + if ! use static-libs; then + find "${ED}" -name "*.a" -delete || die + fi +} -- cgit v1.2.3