From 95a97c3f0b0d048aaf9e183702a1d06b30415b35 Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Sun, 18 Sep 2022 05:18:37 +0100 Subject: gentoo auto-resync : 18:09:2022 - 05:18:37 --- dev-util/Manifest.gz | Bin 68990 -> 68981 bytes dev-util/android-tools/Manifest | 2 +- .../android-tools/android-tools-31.0.3_p2.ebuild | 2 +- dev-util/bpftrace/Manifest | 3 +- dev-util/bpftrace/bpftrace-0.15.0-r1.ebuild | 1 + .../files/bpftrace-0.15.0-binutils-2.39.patch | 87 +++++++++ dev-util/kcov/Manifest | 4 +- dev-util/kcov/files/kcov-40-binutils-2.39.patch | 92 +++++++++ dev-util/kcov/files/kcov-40-gcc-13.patch | 45 +++++ dev-util/kcov/kcov-40.ebuild | 5 + dev-util/watchman/Manifest | 14 +- dev-util/watchman/watchman-2022.04.11.00.ebuild | 210 -------------------- dev-util/watchman/watchman-2022.07.04.00.ebuild | 210 -------------------- dev-util/watchman/watchman-2022.08.08.00.ebuild | 217 --------------------- dev-util/watchman/watchman-2022.08.15.00.ebuild | 217 --------------------- dev-util/watchman/watchman-2022.08.22.00.ebuild | 217 --------------------- dev-util/watchman/watchman-2022.09.05.00.ebuild | 217 --------------------- dev-util/watchman/watchman-2022.09.12.00.ebuild | 217 +++++++++++++++++++++ 18 files changed, 456 insertions(+), 1304 deletions(-) create mode 100644 dev-util/bpftrace/files/bpftrace-0.15.0-binutils-2.39.patch create mode 100644 dev-util/kcov/files/kcov-40-binutils-2.39.patch create mode 100644 dev-util/kcov/files/kcov-40-gcc-13.patch delete mode 100644 dev-util/watchman/watchman-2022.04.11.00.ebuild delete mode 100644 dev-util/watchman/watchman-2022.07.04.00.ebuild delete mode 100644 dev-util/watchman/watchman-2022.08.08.00.ebuild delete mode 100644 dev-util/watchman/watchman-2022.08.15.00.ebuild delete mode 100644 dev-util/watchman/watchman-2022.08.22.00.ebuild delete mode 100644 dev-util/watchman/watchman-2022.09.05.00.ebuild create mode 100644 dev-util/watchman/watchman-2022.09.12.00.ebuild (limited to 'dev-util') diff --git a/dev-util/Manifest.gz b/dev-util/Manifest.gz index 2df663ab3e18..af6430412f85 100644 Binary files a/dev-util/Manifest.gz and b/dev-util/Manifest.gz differ diff --git a/dev-util/android-tools/Manifest b/dev-util/android-tools/Manifest index ca67ba8f8df4..5c9acf42e3a1 100644 --- a/dev-util/android-tools/Manifest +++ b/dev-util/android-tools/Manifest @@ -4,5 +4,5 @@ DIST android-tools-31.0.3-no-gtest.patch 3152 BLAKE2B da71e3cba87b21ffcb144602a0 DIST android-tools-31.0.3.tar.xz 25768908 BLAKE2B e8ca8ff93fcd3936f447926769d7b45194dd96ad99cddd570183a1cbae34dbf49a23e0c53d9eb8f5c25dd09717e1f160829752dc7ebc9404c804b48de8de9889 SHA512 d2c16325b190f77a8ffa38de18ae1aea4bf6848926620f25d14873dc4a3fda3fe2b13349fa2eee197b960ca65738a4a1d2c1f28cf8286ab79e73502e7a8e6357 DIST android-tools-31.0.3p2.tar.xz 22458776 BLAKE2B a51f839ac44e6e998092d802eb182566f4dc2a7f47a5687e0c877fa4fa6d419b16054f75066a6afe8e458e44f8bc5750ca88a2517619379d1044202d64b2ec80 SHA512 367a502c11a136ff15a060df44df14ceec46eb5eb386babb4d38783622e363421d2ec9a65a5810fb8f2b308912c2bdb980e6fce24ba532a111e413647efe67d5 EBUILD android-tools-31.0.3.ebuild 2207 BLAKE2B 075ba2bcbf2f30b9c3804be39c3b67397634e69baf1572096f32a3f0d927fd35526246ef2e4590dddf92f71350bc172bf58c1e70107cfbde015588ada9f90509 SHA512 57d1e597562ab7688f5715635b6c4f86e7dd5b8b00fc120793fd7a047924f647f9f4725e86b93afb0648c8c8c086cca5a7eeea56a90a2636d23fcf571daccde7 -EBUILD android-tools-31.0.3_p2.ebuild 2159 BLAKE2B 9a43702e1d3a68e6a25486b0fbace35f6245f281088ffd8264d5120ae6e15aa28c6c0f5399b195cfd9de9dc8897e703f0ea1fac3691cd0f510ad9b77386c5f41 SHA512 063cb128d8e574da265e8907ca36706dee74dad37d314bb9f2f9f2c6ad0c36aaec0acbb5cbe17428be9d66b68c779298cb0a1c4de807b04840b2038a12263b1f +EBUILD android-tools-31.0.3_p2.ebuild 2157 BLAKE2B 3f7738ccabc27a7b54f30f533613aca897efb4a70cae04a999a586320d42711329cb4521f5da8f19a6b091c72104aace5993fe74b04057f8a00e3f8269ed9436 SHA512 4b6621928d031ee07f0517b882cdd8f37a833aa5f2b398f7a40df6e4ba13b9c030c300f620daef43143f0573aff0ba955d8f59a5ca3d8475395118592add7fbd MISC metadata.xml 724 BLAKE2B 7ef6e07d806dff51946236dfee2f5eaf207fd7c9cde6e73cb7f372fea5cd8b2b559e4f1fe81a315c41beed5beba92603cc93a16183d63953fbed4ba0d2941116 SHA512 d47cf87259ad2b2a8d6f8edf6b2c2084d0046773447ed9647cc232437ec8f3e8c452cb26ac7e0a619b220e073518903b77c55ba7c2e9f7663069fea2e7096e75 diff --git a/dev-util/android-tools/android-tools-31.0.3_p2.ebuild b/dev-util/android-tools/android-tools-31.0.3_p2.ebuild index 0b65a7221081..a67df1447ce7 100644 --- a/dev-util/android-tools/android-tools-31.0.3_p2.ebuild +++ b/dev-util/android-tools/android-tools-31.0.3_p2.ebuild @@ -19,7 +19,7 @@ S="${WORKDIR}/${PN}-${MY_PV}" # The entire source code is Apache-2.0, except for fastboot which is BSD-2. LICENSE="Apache-2.0 BSD-2" SLOT="0" -KEYWORDS="~amd64 ~arm ~arm64 ~x86 ~x86-linux" +KEYWORDS="amd64 ~arm ~arm64 x86 ~x86-linux" IUSE="python" REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )" diff --git a/dev-util/bpftrace/Manifest b/dev-util/bpftrace/Manifest index 6b1054ea1bdb..5e0b45101683 100644 --- a/dev-util/bpftrace/Manifest +++ b/dev-util/bpftrace/Manifest @@ -1,8 +1,9 @@ AUX bpftrace-0.11.4-old-kernels.patch 563 BLAKE2B 3b2afb997119188e7095b24ec459f4b5ae28626f6905c45f6510f84b7c6f28aa3b5174f1f48a30763990b2a3cc50c6336249fe1dc4cf31656871a8adce43c8d7 SHA512 332e6cc4d1c21e917451c9aa6028b082f53dde8221419ba45ad7ae6321e444b3f67ec8366cbd56638d8f8b68a3be06af892eba765c810744951af1de9b994113 AUX bpftrace-0.15.0-bcc-025.patch 3192 BLAKE2B a72790e25963342b2eed5c2b9fd41bd22d88b536a064f6e4039bc83242ea4c5a48b27d2d786008df45656234c700ba9fbb738e09ea8e70e75a3f457163c4da90 SHA512 22ef3d05790416b4286ea9931646c3940877da8cf02b9645edbc753a4adb75e90f233b533d0c2c790eb62592c6af6487c02a502ecca8d547ec3d329a2aa71f64 +AUX bpftrace-0.15.0-binutils-2.39.patch 3051 BLAKE2B 689b22485d3cb994db7253581ae0c87ecfbb50133d4481209a5d9bde349456621901a66d52d3633b8e8e00d1900254b2d8e5e69bbb24dc126855ab43f453a681 SHA512 1436d44d6469d590b4b94577151d2272483dbb0c4c5f70d74f0cffa8b84c7c923f9f4ecfd7c245b440228df681c38f7bcb28c78a9220c8a90af68a71dc0c9506 AUX bpftrace-0.15.0-dont-compress-man.patch 1885 BLAKE2B 89a327cef68fa838d5c04b37e7bf72e6b03b54c244889706ba3c5156e2355d00cf395d14a6e8a7fe622e002acf9bab06dbc1427f6b637f0c59db86af08f05d51 SHA512 b591a73b0bbdd0105e6b87fb264ca4345e200ab58754d09a87dec79e60044eab165f2b34fe5ddc904cd877a460d5f41eef8b4d59eac255ea4f4e0fae37cf3511 AUX bpftrace-0.15.0-install-libs.patch 8206 BLAKE2B 9d8b193f422b0ee64301b7ea12791afdd5111cde487b904ec35750e6189fdd6faca9af36b8956058c820c2398bcabc7dcee6d26b93c55ff1e591b3259a682a27 SHA512 9721d8f3812855d7a9155d8e5ecac305dedb5c8326ccf8ea679048f920ca58a774576840c1b0bc2864a26c66c89bf0c81ed1a1ab30fb571a6cfaebc5b499c2b7 DIST bpftrace-0.14.1-llvm14.patch.gz 7377 BLAKE2B 69b3b74bce74a8d4d8d9cc74de352dc33875ae905d8a88c776bbe80862a4f4ac2d450bcb6190da8be880bcc8fb751e3b8172df5454f31dc4bcd3e41edb02e396 SHA512 3269132981a7d2c0263fe9003bbcd2348e186ca0cdc95ada368331fc6e2495ae126c7bd68676438ccb575aafdafa3d17604a28fdc11d8b629eeaee130c1fd614 DIST bpftrace-0.15.0.tar.gz 1006735 BLAKE2B 3ef4bb5f13aa6dea5140b5362e6fc3de21baa1192e2218307895bf29ddeba8d69543e32c2b769bf3456076095ba661b66e1625f2696631d22628311d7f6ec1a4 SHA512 916e9afeab301e62472e570ef77a3b9b27b43251880b64f1c5f151583c59a6c61e9ede50f3607044b27c5a6ce1a654f290153bf3f9237ebc0a823b5e6356187a -EBUILD bpftrace-0.15.0-r1.ebuild 1920 BLAKE2B 0dbd401e929c3a88106593fd4fe01feb10b7285ecadbec0b1acb2d2ab30a1e60735f45f7ed4b0b07d31e58b0cbe65a8ebe5a1c831f7bc74e9e03ef870fd19027 SHA512 6f6ce6815718a938c4da18c375e1edfbc5cf0d6ae89628cd2b7137015aefab09f34b906e52adadb8f4f4332fac388b5528eb8c7fba42ff02c415c75b2adc1ca6 +EBUILD bpftrace-0.15.0-r1.ebuild 1971 BLAKE2B 1276fff10465ee92d894df3661284cc9c20e3e5d7c5b09a7a7a81629f90b34daf311f16a9d39130c1006254f1b1e8407cf37ea063c2bd2257335ebd4fafabec2 SHA512 39e5b3bd165e95f6e3d1a8cf24203e3b2df28972b33df5ac4f959b9b6728321025a7d5931116f19b14b3362a7759904b1d849e956c30542c08afc7049ab0471d MISC metadata.xml 499 BLAKE2B ce7c46f4c5e49f2f779ff6584053f7fc78dffaeee432ac46a8881b3d49dc569e309af95aaf9d6e77a36ebc87be0cd2f86a5db7b733463e4252d3a242d914f293 SHA512 dfb827afd47feb8204ef40c940ebcc7d1b3217cdf0f24425e4ab32195309d727225e942d777871565e47a2c02244d053f46ed25165e9728c94e0683ff61bf4ce diff --git a/dev-util/bpftrace/bpftrace-0.15.0-r1.ebuild b/dev-util/bpftrace/bpftrace-0.15.0-r1.ebuild index 51346cb3d38d..566a14a29b4a 100644 --- a/dev-util/bpftrace/bpftrace-0.15.0-r1.ebuild +++ b/dev-util/bpftrace/bpftrace-0.15.0-r1.ebuild @@ -53,6 +53,7 @@ PATCHES=( "${FILESDIR}/bpftrace-0.15.0-dont-compress-man.patch" "${FILESDIR}/bpftrace-0.11.4-old-kernels.patch" "${FILESDIR}/bpftrace-0.15.0-bcc-025.patch" + "${FILESDIR}/bpftrace-0.15.0-binutils-2.39.patch" ) pkg_pretend() { diff --git a/dev-util/bpftrace/files/bpftrace-0.15.0-binutils-2.39.patch b/dev-util/bpftrace/files/bpftrace-0.15.0-binutils-2.39.patch new file mode 100644 index 000000000000..cb4b8a9bb2d2 --- /dev/null +++ b/dev-util/bpftrace/files/bpftrace-0.15.0-binutils-2.39.patch @@ -0,0 +1,87 @@ + +Patch taken from: https://github.com/iovisor/bpftrace/pull/2328 +Removed hunk #1 (CHANGELOG.md) since it conflicts and is not required. +Bug: https://bugs.gentoo.org/868120 + +From 3be6e708d514d3378a4fe985ab907643ecbc77ee Mon Sep 17 00:00:00 2001 +From: Viktor Malik +Date: Mon, 15 Aug 2022 15:13:14 +0200 +Subject: [PATCH] Fix builds against libbfd(binutils) >=2.39 + +Binutils 2.39 changed signature of the init_disassemble_info function by +adding an extra parameter for styled printf function. Let CMake detect +which of the versions is present and call it appropriately. +--- + CHANGELOG.md | 2 ++ + CMakeLists.txt | 3 +++ + cmake/FindLibBfd.cmake | 10 ++++++++++ + src/bfd-disasm.cpp | 14 ++++++++++++++ + 4 files changed, 29 insertions(+) + +diff --git a/CMakeLists.txt b/CMakeLists.txt +index 8f7995afd2..2e54eb84f8 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -249,6 +249,9 @@ if(HAVE_BFD_DISASM) + if(LIBBFD_DISASM_FOUR_ARGS_SIGNATURE) + set(BPFTRACE_FLAGS "${BPFTRACE_FLAGS}" LIBBFD_DISASM_FOUR_ARGS_SIGNATURE) + endif(LIBBFD_DISASM_FOUR_ARGS_SIGNATURE) ++ if(LIBBFD_INIT_DISASM_INFO_FOUR_ARGS_SIGNATURE) ++ set(BPFTRACE_FLAGS "${BPFTRACE_FLAGS}" LIBBFD_INIT_DISASM_INFO_FOUR_ARGS_SIGNATURE) ++ endif(LIBBFD_INIT_DISASM_INFO_FOUR_ARGS_SIGNATURE) + endif(HAVE_BFD_DISASM) + + if (LIBBPF_BTF_DUMP_FOUND) +diff --git a/cmake/FindLibBfd.cmake b/cmake/FindLibBfd.cmake +index 4f4b8c4e20..5d917b188c 100644 +--- a/cmake/FindLibBfd.cmake ++++ b/cmake/FindLibBfd.cmake +@@ -75,5 +75,15 @@ int main(void) { + abfd); + return 0; + }" LIBBFD_DISASM_FOUR_ARGS_SIGNATURE) ++CHECK_CXX_SOURCE_COMPILES(" ++// See comment in bfd-disasm.cpp for why this needs to exist ++#define PACKAGE \"bpftrace-test\" ++#include ++ ++int main(void) { ++ init_disassemble_info(NULL, NULL, NULL, NULL); ++ return 0; ++} ++" LIBBFD_INIT_DISASM_INFO_FOUR_ARGS_SIGNATURE) + SET(CMAKE_REQUIRED_LIBRARIES) + endif() +diff --git a/src/bfd-disasm.cpp b/src/bfd-disasm.cpp +index f846468cd8..d4165dfac5 100644 +--- a/src/bfd-disasm.cpp ++++ b/src/bfd-disasm.cpp +@@ -38,6 +38,16 @@ static int fprintf_nop(void *out __attribute__((unused)), const char *fmt __attr + return 0; + } + ++#ifdef LIBBFD_INIT_DISASM_INFO_FOUR_ARGS_SIGNATURE ++static int fprintf_styled_nop(void *out __attribute__((unused)), ++ enum disassembler_style s __attribute__((unused)), ++ const char *fmt __attribute__((unused)), ++ ...) ++{ ++ return 0; ++} ++#endif ++ + static AlignState is_aligned_buf(void *buf, uint64_t size, uint64_t offset) + { + disassembler_ftype disassemble; +@@ -55,7 +65,11 @@ static AlignState is_aligned_buf(void *buf, uint64_t size, uint64_t offset) + return AlignState::Fail; + } + ++#ifdef LIBBFD_INIT_DISASM_INFO_FOUR_ARGS_SIGNATURE ++ init_disassemble_info(&info, stdout, fprintf_nop, fprintf_styled_nop); ++#else + init_disassemble_info(&info, stdout, fprintf_nop); ++#endif + + info.arch = bfd_get_arch(bfdf); + info.mach = bfd_get_mach(bfdf); diff --git a/dev-util/kcov/Manifest b/dev-util/kcov/Manifest index a508f672d8c3..660329ea0652 100644 --- a/dev-util/kcov/Manifest +++ b/dev-util/kcov/Manifest @@ -1,4 +1,6 @@ +AUX kcov-40-binutils-2.39.patch 3139 BLAKE2B 4a296c2b964913df11d4b01a1a0bb732c7d83e83f12fe91837574f4b11df0d28463329430bac2ebc47a47637d068a7711dfaeeb38222e9bdaae954da6004e8c6 SHA512 219c1ec491c3718ebd81601b0680b1adaa86929e331f5827491dee6ed9cedd2f171f59812d97860d0aff53d6b6509382ca9192009f0cba3daac0beacea3185f3 +AUX kcov-40-gcc-13.patch 1219 BLAKE2B 2f0f84e4b468a6ca639f217aa0199bba1e4c516cf02c87839c94436f960f0c14dc11f1396193f0ee3658c8984103f4c249dc99272429f8bf6a1b82f643a55a74 SHA512 ccbd84da7fcda5c373a520c1bc1e7fa68c2db688733d928c01b62c83c24c52c91b333658137783d66db6282d799a7dbd283222931fd0819653fa34e657a879b5 DIST kcov-40.tar.gz 311012 BLAKE2B 19b3cf681fe3c722fde116f454e1760ddd1e54db6fcecc05eca3ec585524fa7d1f7af3ea237943c8a68a81384567205ea443d1542ec380621d35a6f3e3dc667e SHA512 5abe1dd94fbe93fe73d658840593781216b8562a87d010a94d4520e29dd4d537e167de64b7f535347f894c68d5d8b9974ee4b9fd2cebf9291bac4ddbb9ac7cff -EBUILD kcov-40.ebuild 884 BLAKE2B 2a643de4724d600089bdf702a3381deda85746d29474281acc960da7d63bef0acac555585b68566a42107afbbc00f2eeb0710b7be5d7a7c5a1de96bd3ee8063a SHA512 25204e7a3aef29a44a6fdc340f19d468252d3995259fd42c31d16a8c321db10eaafb1fc4698bfb5d599bdb0119d23d88bbd4f322cfdc706ac31d11cf6f980a41 +EBUILD kcov-40.ebuild 970 BLAKE2B 7d5eb3f61269e236196ca98570b693b1b685b21c1b62cdee9d6de14b137599b0a3e8e166c8d372827628cc7cd6c583e1e1e74f2dbf0f0130c52c400dd442a0af SHA512 379c4f08443224f161bbf5111dfbd7aa0001248ff6d4e15d6d662514069f258a27b1c429da244d78e7a810b3ca90e9616bf0dbac398df1d8fdf676b362f18845 EBUILD kcov-9999.ebuild 810 BLAKE2B 909304207d86faefa228d004256f4ad2cd377a997bb9f8fe2c5efd7a8ea4fb9d67cfee54daa1caa860fb5d612edd6feb1ed8763f6b5e38f93afc4827e6510f39 SHA512 a8a00d4cbec51b1365f19b0acc2b7827bbcca9055899072962cabb4a3711f60e322c12cbcef2245299cc918a70d52a59c5553d20124d32a5e41bc9d2904dca60 MISC metadata.xml 356 BLAKE2B 515935715197c175b5b3a465d58b4eaf433ae23f4d884f3d6e2796662d1f9e0eb507955ff591844b18df76f3422f01ebc73163d17f67d500f8d8560ec862b8fd SHA512 7bcd02ba7e6b3da5207d72f3985fb0ac1fdfe4a8dfc93c74d970137e603dc2626398fc2e145c8c250e28eaa0678ff671cb4f3b3ee4b74807935c19d76d0b5d9d diff --git a/dev-util/kcov/files/kcov-40-binutils-2.39.patch b/dev-util/kcov/files/kcov-40-binutils-2.39.patch new file mode 100644 index 000000000000..88029305c90f --- /dev/null +++ b/dev-util/kcov/files/kcov-40-binutils-2.39.patch @@ -0,0 +1,92 @@ +https://github.com/SimonKagstrom/kcov/commit/fd1a4fd2f02cee49afd74e427e38c61b89154582 +https://bugs.gentoo.org/868114 + +From fd1a4fd2f02cee49afd74e427e38c61b89154582 Mon Sep 17 00:00:00 2001 +From: oreo639 +Date: Wed, 14 Sep 2022 16:02:17 -0700 +Subject: [PATCH] Fix build with binutils 2.39 + +--- a/src/CMakeLists.txt ++++ b/src/CMakeLists.txt +@@ -94,6 +94,7 @@ set (DISASSEMBLER_SRCS + ) + + set (HAS_LIBBFD "0") ++set (HAS_LIBBFD_DISASM_STYLED "0") + + if (CMAKE_TARGET_ARCHITECTURES STREQUAL "i386" OR CMAKE_TARGET_ARCHITECTURES STREQUAL "x86_64") + if (LIBBFD_FOUND) +@@ -106,6 +107,23 @@ if (CMAKE_TARGET_ARCHITECTURES STREQUAL "i386" OR CMAKE_TARGET_ARCHITECTURES STR + ${LIBBFD_BFD_LIBRARY} + ${LIBBFD_IBERTY_LIBRARY} + ) ++ include(CheckCSourceCompiles) ++ set(CMAKE_REQUIRED_LIBRARIES ${DISASSEMBLER_LIBRARIES}) ++ check_c_source_compiles(" ++ #define PACKAGE ++ #define PACKAGE_VERSION ++ #include ++ #include ++ ++ int main(int argc, char **argv){ ++ struct disassemble_info info; ++ init_disassemble_info(&info, stdout, NULL, NULL); ++ return 0; ++ } ++ " TEST_LIBBFD_DISASM_STYLED) ++ if (TEST_LIBBFD_DISASM_STYLED) ++ set (HAS_LIBBFD_DISASM_STYLED "1") ++ endif (TEST_LIBBFD_DISASM_STYLED) + endif (LIBBFD_FOUND) + endif (CMAKE_TARGET_ARCHITECTURES STREQUAL "i386" OR CMAKE_TARGET_ARCHITECTURES STREQUAL "x86_64") + +@@ -284,7 +302,7 @@ set (KCOV_SYSTEM_MODE_SRCS + + set (KCOV_LIBRARY_PREFIX "/tmp") + +-set (CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++0x -g -Wall -D_GLIBCXX_USE_NANOSLEEP -DKCOV_LIBRARY_PREFIX=${KCOV_LIBRARY_PREFIX} -DKCOV_HAS_LIBBFD=${HAS_LIBBFD}") ++set (CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++0x -g -Wall -D_GLIBCXX_USE_NANOSLEEP -DKCOV_LIBRARY_PREFIX=${KCOV_LIBRARY_PREFIX} -DKCOV_HAS_LIBBFD=${HAS_LIBBFD} -DKCOV_LIBFD_DISASM_STYLED=${HAS_LIBBFD_DISASM_STYLED}") + + include_directories( + include/ +--- a/src/parsers/bfd-disassembler.cc ++++ b/src/parsers/bfd-disassembler.cc +@@ -75,7 +75,11 @@ class BfdDisassembler : public IDisassembler + BfdDisassembler() + { + memset(&m_info, 0, sizeof(m_info)); ++#if KCOV_LIBFD_DISASM_STYLED ++ init_disassemble_info(&m_info, (void *)this, BfdDisassembler::opcodesFprintFuncStatic, BfdDisassembler::opcodesFprintStyledFuncStatic); ++#else + init_disassemble_info(&m_info, (void *)this, BfdDisassembler::opcodesFprintFuncStatic); ++#endif + m_disassembler = print_insn_i386; + + m_info.arch = bfd_arch_i386; +@@ -407,6 +411,25 @@ class BfdDisassembler : public IDisassembler + return out; + } + ++#if KCOV_LIBFD_DISASM_STYLED ++ static int opcodesFprintStyledFuncStatic(void *info, enum disassembler_style style, const char *fmt, ...) ++ { ++ (void)style; ++ BfdDisassembler *pThis = (BfdDisassembler *)info; ++ char str[64]; ++ int out; ++ ++ va_list args; ++ va_start (args, fmt); ++ out = vsnprintf( str, sizeof(str) - 1, fmt, args ); ++ va_end (args); ++ ++ pThis->opcodesFprintFunc(str); ++ ++ return out; ++ } ++#endif ++ + typedef std::map SectionCache_t; + typedef std::unordered_map InstructionAddressMap_t; + typedef std::map InstructionOrderedMap_t; + diff --git a/dev-util/kcov/files/kcov-40-gcc-13.patch b/dev-util/kcov/files/kcov-40-gcc-13.patch new file mode 100644 index 000000000000..ea92a6b8364c --- /dev/null +++ b/dev-util/kcov/files/kcov-40-gcc-13.patch @@ -0,0 +1,45 @@ +https://github.com/SimonKagstrom/kcov/commit/b63754b53b3a7cf43e13ec56bd0be76cb6175437 + +From b63754b53b3a7cf43e13ec56bd0be76cb6175437 Mon Sep 17 00:00:00 2001 +From: Sergei Trofimovich +Date: Thu, 15 Sep 2022 19:55:21 +0100 +Subject: [PATCH] Fix build on gcc-13: add missing include + +[ 15%] Building CXX object src/CMakeFiles/kcov.dir/writers/cobertura-writer.cc.o +In file included from kcov/src/writers/cobertura-writer.cc:6: +kcov/src/include/reporter.hh:24:90: error: 'uint64_t' has not been declared + 24 | LineExecutionCount(unsigned int hits, unsigned int possibleHits, uint64_t order) : + | ^~~~~~~~ +--- a/src/include/collector.hh ++++ b/src/include/collector.hh +@@ -2,6 +2,8 @@ + + #include + ++#include ++ + namespace kcov + { + class IFileParser; +--- a/src/include/reporter.hh ++++ b/src/include/reporter.hh +@@ -3,6 +3,7 @@ + #include + + #include ++#include + + namespace kcov + { +--- a/src/include/source-file-cache.hh ++++ b/src/include/source-file-cache.hh +@@ -3,6 +3,8 @@ + #include + #include + ++#include ++ + namespace kcov + { + /** + diff --git a/dev-util/kcov/kcov-40.ebuild b/dev-util/kcov/kcov-40.ebuild index 963a9c930a5e..ea10f0c28b26 100644 --- a/dev-util/kcov/kcov-40.ebuild +++ b/dev-util/kcov/kcov-40.ebuild @@ -27,6 +27,11 @@ RDEPEND="dev-libs/elfutils DEPEND="${RDEPEND}" BDEPEND="${PYTHON_DEPS}" +PATCHES=( + "${FILESDIR}"/${P}-binutils-2.39.patch + "${FILESDIR}"/${P}-gcc-13.patch +) + src_configure() { local mycmakeargs=( -DCMAKE_DISABLE_FIND_PACKAGE_Bfd=$(usex !binutils) diff --git a/dev-util/watchman/Manifest b/dev-util/watchman/Manifest index 586191b54da2..d7229541cf9c 100644 --- a/dev-util/watchman/Manifest +++ b/dev-util/watchman/Manifest @@ -86,13 +86,8 @@ DIST vec_map-0.8.2.crate 14466 BLAKE2B 8f109fbff19604b82ea2aa61c952e2ce9b5597ccc DIST version_check-0.9.4.crate 14895 BLAKE2B fa1fa4008af165bfc1fdbe560488afd9d232cfafee94104fbcc4cbc52f234849bff9ddfa88109a1ac682f6d9c1d86b0459893d223f64e65adc08966aaf93dc89 SHA512 b172dc9a3759a4a683ffc39b9a40b03b9974b626a088217de87090466cef695226557c226cf3e469b2b25ee7297b7eb0d7719878cab42457f80146a81943c0c8 DIST wasi-0.10.2+wasi-snapshot-preview1.crate 27505 BLAKE2B 4eb8644b945633d6e856ad80dd74990be19eb6af99823b147163384f61d471e2d9ec054d78a7064072344be53783e57073e8fffc6d5555c149b4834a9bf31dba SHA512 06977a294d76369a3867c45abdd8a87ea5c84e5a3681075ba0d14af1aee3114ff24495c7e7f7fe1e6e42230e65fba0e062898e69bc89e0209af62c2d14094ec7 DIST watchman-2022.03.28.00.tar.gz 3781468 BLAKE2B 5db1f60c7149af418037a0ce7a00656bc652ec90a4bae261dd48c0bc21d2424ad30e049fe1142b072b5a01ca1380a5cd495fafa74d5c10785e097685f8fb5b21 SHA512 3275e66fe522fc45b3f0c8c458d6d2f61ee314f04d6b12935100535bc060603cafe76c8b13c0b8d334c13b63320ff4b84dc8dfb0f5ce09efc28d94e5d7a5974d -DIST watchman-2022.04.11.00.tar.gz 3783345 BLAKE2B 0b4b4cadfb45e5a894428ab27fde3e7b70e3e3021d0cf76a15f7d072e0c86589d4b9f8c32d75e0c055a8dd30832360e669cc3d7f86061d214a3e18adc61a3781 SHA512 129eaded13ecaff0f4bfa2ffcd5fd27a1685a5f98e53d7b9dba837ad09054c9f8054992d92009580e20f80f367eb71276edab11bfbd4604ade353b08a29076d7 -DIST watchman-2022.07.04.00.tar.gz 3785684 BLAKE2B b27f71cd5d505d9383858434eaa90dd9a70478507a2750f10c3fdc88e39978cc6f94402d498dc26e2b5043018913bf71a28c04870dbefe8ee79fbe3e963a86e8 SHA512 43bbccd5e69905105da54fb661f506d2b3ef43719660deb07cb4b3b47b1569af71edcdc798ffdae79ec26c7cf24988394321d0f183f20af51daf6d54f4a3d8e5 -DIST watchman-2022.08.08.00.tar.gz 3788351 BLAKE2B cdf5ea901bbe7ff46d32fadb7eb46d2346f3330fd20c2e14dd4faa54c3feabfaf4c0a76b83a4493bcd052b7fa9d08e7ed05ad3d1bc883edefef9812258afeba6 SHA512 537b52d50823ce27f0c42927f2c04a57bb273f53d9f4c91a6744a319ff8efef9f5ed202ec2f2a1dfd59b1c16f5e8044ba21148bd40ca45660813cc67c839d6a2 -DIST watchman-2022.08.15.00.tar.gz 3783166 BLAKE2B a2090fb9e62890ea77e264c6d2727d93e8799b96ad4eaf7e02c58a8526fbd57b3b6ff2fdeddfb67a41771e2c0e29ca2f7fab2246ef8455df9902685c40c96138 SHA512 497f7127fe6efc5419f9f169b580701bdf88c4774b2c2d35b5c3849b29f679bf72569885cbb4411ebfd92e8d34eb589bf327d2362d8b5a1c141f9c063833f3e7 -DIST watchman-2022.08.22.00.tar.gz 3785807 BLAKE2B 7be65183a03bbef4b880349bc04b27c71699ae3a7c140bddea4f3f40299d9bbf19d63980bba988eab4219205b7250c9de2045d29aa9a5c65820e03a1b4cc647d SHA512 33efa917f7561f8f6fddd77590ad87064cfcca10c3936ccc3fd078a3f425ae49ec4a7e0859251c3020f26a0e9086301fd23fc1fafe73746316bf336123463f9d DIST watchman-2022.08.29.00.tar.gz 3787691 BLAKE2B faf3f6afe351f7596256424c9e4f0c31fe826ee1097e216d04d869b3adee7ca1d4d9afbbea99fb3ca4f095d06171a1afe56fc5a71022242c4fde99246c3a1781 SHA512 25f6f133253335ece931fdbb131e8df4961c4b73877e2caa5008d3bd5e66e44b1121b7d4f2cd3367b1759476307aad8d6642089c482a6b65178b0a05510ea5f1 -DIST watchman-2022.09.05.00.tar.gz 3787904 BLAKE2B e8bf19f3b3bb15a6d1bc6c902928c8390c6b3d275c193b1235585afe9598ba89c8e2ee77e4d2e41a7b20708e9e2d081ecd99b27702bf5d9551a3b9947cfb6371 SHA512 5c4d3a722e610556e7c76ddbb76996a7e8ff60c141d6264900da368417fe6f94cb68452d4aa3ab7818985b6460140388c89a3d5e00a3269a32a2e4acbc84c996 +DIST watchman-2022.09.12.00.tar.gz 3789078 BLAKE2B 57bb4f5e0e0c4fc3390296e78a62c4301997efcafe72f2cc9418c1d1527e03e6825c64c29aa1214d3cdedd6908a3e2ec89eb51e4c00cdf84129d8af6c3cb9fd9 SHA512 283db0b0d801ac5d0b87bf0edd054c0d4c90b1dee75b791f9fd999777dca9ba9efe46c26093ff932588e35679a9f835296b9109d0441c4dec1d37453f1373c1e DIST winapi-0.3.9.crate 1200382 BLAKE2B cb5799749ccd935ea2d7068d953cecf19f543d9db7dc16ad4584bb7005373ada34937a3ced7225544d8bc765da599911c7a3190efefb3a25b7c1bb7123b4f673 SHA512 ff8b7b78065f3d8999ec03c725a0460ebc059771bf071c7a3df3f0ecd733edf3b0a2450024d4e24e1aedddaecd9038ce1376c0d8bbf45132068cf45cf4a53a97 DIST winapi-i686-pc-windows-gnu-0.4.0.crate 2918815 BLAKE2B 4d357e4d30f9552972170d65b9a5358b69c46a3e772fe05efc22f3d4ffc1caeeaad7aacdc7abd503a7ad0545f8bd7d22bf351dcb6df76f812fa4d45c34d65df0 SHA512 a672ccefd0730a8166fef1d4e39f9034d9ae426a3f5e28d1f4169fa5c5790767693f281d890e7804773b34acdb0ae1febac33cde8c50c0044a5a6152c7209ec2 DIST winapi-x86_64-pc-windows-gnu-0.4.0.crate 2947998 BLAKE2B 2ad1ea8b5fa07d544e910ccba043ae925269b76b26c9da356305b34b86741dd8b9aff0b9ffe3d562db4fcd7d7c46a11ce9e3168b782b1d89ae6881742b7ede82 SHA512 4a654af6a5d649dc87e00497245096b35a2894ae66f155cb62389902c3b93ddcc5cf7d0d8b9dd97b291d2d80bc686af2298e80abef6ac69883f4a54e79712513 @@ -103,11 +98,6 @@ DIST windows_i686_msvc-0.32.0.crate 733422 BLAKE2B fa1c9c2e5a879797212caff8cbaf1 DIST windows_x86_64_gnu-0.32.0.crate 744209 BLAKE2B 76106af387f443f2a24a0cd15d53b59a9e66977df8a0a4074993b4efded7cf63f88d18ddd0bfae467bf37b47b4f9400bdcd3db9cec31bc8febaabef995f406d6 SHA512 35cf64bf981a16a011b2276dbbb65200834235075d369fe60ca06092e1c0631c114c402eb43db223ec885f0ab07a77aa9f1822d1db44c5e6747645c65a7ac182 DIST windows_x86_64_msvc-0.32.0.crate 669835 BLAKE2B f8c9dc578d652c2abf0d689dfa9681da29f760bc45ecec83b7d994e7df7c04f91fbcebee464ebd94d5fe7eb0dea90ac7c04578b56264d89ca9d91213fd89b17f SHA512 4720246d2aed3c3b3c252cda7773096642e78891b1a9776c920da908b2d3741e9e341060424327f1c16e4cb47b6e22af1be229589a51b5a3a04d2a6447275332 EBUILD watchman-2022.03.28.00.ebuild 4692 BLAKE2B 380179dc8f5d8a8f98136d9078a6950c4136f7859dc7fbb8ff6e858292426ccbd171db50c59d6722439adcd7808c2f7ccf007d8003caf932922ecf51ab61da82 SHA512 0c25b80ba316477132eb6c940b50ff1b470a23644652405c38d4248a0b939b68e356417c1c625d9acf11cf98b5ecef8e74bf4298097b937f2ec5965f287db998 -EBUILD watchman-2022.04.11.00.ebuild 4693 BLAKE2B 6bf2175c1a839bc5802d8874d3bb6925c51eb04cd0c97d02f219223e3cd16d21abac05e6385ae0ba669de79bf970b6762b1fc18c2257e1d7c73e7cb86d7088a1 SHA512 85f80e28c6df9db0a56c8a122062792aaf40adfe738b9fc5bd1b005b291962d58728ed08f087a4f13aa9b5fbac52344dd4c9f0a03af831ad939453290e2a0c47 -EBUILD watchman-2022.07.04.00.ebuild 4687 BLAKE2B b9b8376653dab8674d042f6f5a0f4f99deeb1459e8dba60e975711d239e61f40a7871ea04dc1ba84e694a242a48957f3766b119a38aaafbd46ba52899fd638c3 SHA512 ac344b1bc10a34808b4a9453280cd682a77bc8e687e7cc8b8e50d9bb413d17a668863a3ebff904d459a0481dc67f4bc485d2a635c3251c25af3a03bb1d672883 -EBUILD watchman-2022.08.08.00.ebuild 4857 BLAKE2B 595589dd252817a04b4fd6cc73d794605f59455616ed25a7b478fcbfc763b9be196f28b6339aa0793f24de7a2e4786c73158b2a6a14b9815adb14fb2299ee9ea SHA512 a74284b7a14e154f38cb656bfa655b3053679f4c71ee13b3f2350a7a8f8e1eb28f92fdcecb9f036c7a94fbeb7235fd7ca066f6aaff1ba5d8134ffd8c834f6474 -EBUILD watchman-2022.08.15.00.ebuild 4857 BLAKE2B 595589dd252817a04b4fd6cc73d794605f59455616ed25a7b478fcbfc763b9be196f28b6339aa0793f24de7a2e4786c73158b2a6a14b9815adb14fb2299ee9ea SHA512 a74284b7a14e154f38cb656bfa655b3053679f4c71ee13b3f2350a7a8f8e1eb28f92fdcecb9f036c7a94fbeb7235fd7ca066f6aaff1ba5d8134ffd8c834f6474 -EBUILD watchman-2022.08.22.00.ebuild 4864 BLAKE2B db42639b804d0d08eaa483788e9a85ffa0dcc6a1be2bcf642bb0affe155a8f017525d6b3ec8b829eef6f8df2c4d67c8c464f6e0d31da3a043ae01164424d5893 SHA512 97b2bfc19ed453f19354bfe05b4170bfbb9195aeafb9f9bb036d71ab27e52bfcbec658af8799c329c1b9d65b8fd90d4246507948c166f27ad5c77472cdddb69d EBUILD watchman-2022.08.29.00.ebuild 4864 BLAKE2B db42639b804d0d08eaa483788e9a85ffa0dcc6a1be2bcf642bb0affe155a8f017525d6b3ec8b829eef6f8df2c4d67c8c464f6e0d31da3a043ae01164424d5893 SHA512 97b2bfc19ed453f19354bfe05b4170bfbb9195aeafb9f9bb036d71ab27e52bfcbec658af8799c329c1b9d65b8fd90d4246507948c166f27ad5c77472cdddb69d -EBUILD watchman-2022.09.05.00.ebuild 4864 BLAKE2B db42639b804d0d08eaa483788e9a85ffa0dcc6a1be2bcf642bb0affe155a8f017525d6b3ec8b829eef6f8df2c4d67c8c464f6e0d31da3a043ae01164424d5893 SHA512 97b2bfc19ed453f19354bfe05b4170bfbb9195aeafb9f9bb036d71ab27e52bfcbec658af8799c329c1b9d65b8fd90d4246507948c166f27ad5c77472cdddb69d +EBUILD watchman-2022.09.12.00.ebuild 4864 BLAKE2B db42639b804d0d08eaa483788e9a85ffa0dcc6a1be2bcf642bb0affe155a8f017525d6b3ec8b829eef6f8df2c4d67c8c464f6e0d31da3a043ae01164424d5893 SHA512 97b2bfc19ed453f19354bfe05b4170bfbb9195aeafb9f9bb036d71ab27e52bfcbec658af8799c329c1b9d65b8fd90d4246507948c166f27ad5c77472cdddb69d MISC metadata.xml 691 BLAKE2B 68506bb31b8d7524b07a12bd2a237ed985215701eb2a28bacfd63ba5f3d61713b0369523a369c5880392e2f4790da4f908538627f3c3d58fe7c78faf9ebc9a15 SHA512 71c073c60fd880455dee0af9193a4279975ba34558144cfe03baa50d2a7c2c5074631a53fb89504d852e9782478f0add9dcea361f36cefe8a42f8f94ae27831a diff --git a/dev-util/watchman/watchman-2022.04.11.00.ebuild b/dev-util/watchman/watchman-2022.04.11.00.ebuild deleted file mode 100644 index da684483d094..000000000000 --- a/dev-util/watchman/watchman-2022.04.11.00.ebuild +++ /dev/null @@ -1,210 +0,0 @@ -# Copyright 2020-2022 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -# TODO: Split into different variables then combine for each component? -# Not all is in rust/ dir. -# Rust components: watchman/cli watchman/rust/serde_bser watchman/rust/watchman_client -CRATES=" -ahash-0.3.8 -ansi_term-0.12.1 -anyhow-1.0.55 -atty-0.2.14 -autocfg-1.1.0 -bitflags-1.3.2 -byteorder-1.4.3 -bytes-1.1.0 -cfg-if-1.0.0 -clap-2.34.0 -const-random-0.1.13 -const-random-macro-0.1.13 -crossbeam-0.8.1 -crossbeam-channel-0.5.2 -crossbeam-deque-0.8.1 -crossbeam-epoch-0.9.7 -crossbeam-queue-0.3.4 -crossbeam-utils-0.8.7 -crunchy-0.2.2 -either-1.6.1 -futures-0.1.31 -futures-0.3.21 -futures-channel-0.3.21 -futures-core-0.3.21 -futures-executor-0.3.21 -futures-io-0.3.21 -futures-macro-0.3.21 -futures-sink-0.3.21 -futures-task-0.3.21 -futures-util-0.3.21 -getrandom-0.2.5 -heck-0.3.3 -hermit-abi-0.1.19 -jwalk-0.6.0 -lazy_static-1.4.0 -libc-0.2.119 -lock_api-0.4.6 -log-0.4.14 -maplit-1.0.2 -memchr-2.4.1 -memoffset-0.6.5 -mio-0.8.0 -miow-0.3.7 -ntapi-0.3.7 -num_cpus-1.13.1 -once_cell-1.9.0 -parking_lot-0.12.0 -parking_lot_core-0.9.1 -pin-project-lite-0.2.8 -pin-utils-0.1.0 -proc-macro2-1.0.36 -proc-macro-error-1.0.4 -proc-macro-error-attr-1.0.4 -proc-macro-hack-0.5.19 -quote-1.0.15 -rayon-1.5.1 -rayon-core-1.9.1 -redox_syscall-0.2.10 -scopeguard-1.1.0 -serde-1.0.136 -serde_derive-1.0.136 -signal-hook-registry-1.4.0 -slab-0.4.5 -smallvec-1.8.0 -socket2-0.4.4 -strsim-0.8.0 -structopt-0.3.26 -structopt-derive-0.4.18 -syn-1.0.86 -textwrap-0.11.0 -thiserror-1.0.30 -thiserror-impl-1.0.30 -tiny-keccak-2.0.2 -tokio-1.17.0 -tokio-macros-1.7.0 -tokio-util-0.6.9 -unicode-segmentation-1.9.0 -unicode-width-0.1.9 -unicode-xid-0.2.2 -vec_map-0.8.2 -version_check-0.9.4 -wasi-0.10.2+wasi-snapshot-preview1 -winapi-0.3.9 -winapi-i686-pc-windows-gnu-0.4.0 -winapi-x86_64-pc-windows-gnu-0.4.0 -windows_aarch64_msvc-0.32.0 -windows_i686_gnu-0.32.0 -windows_i686_msvc-0.32.0 -windows-sys-0.32.0 -windows_x86_64_gnu-0.32.0 -windows_x86_64_msvc-0.32.0 -" - -PYTHON_COMPAT=( python3_{8,9,10} ) -DISTUTILS_USE_PEP517=setuptools -inherit cargo cmake distutils-r1 tmpfiles - -DESCRIPTION="A file watching service" -HOMEPAGE="https://facebook.github.io/watchman/" -SRC_URI="https://github.com/facebook/watchman/archive/refs/tags/v${PV}.tar.gz -> ${P}.tar.gz" -SRC_URI+=" $(cargo_crate_uris)" - -LICENSE="Apache-2.0" -SLOT="0" -KEYWORDS="~amd64" -IUSE="llvm-libunwind python" -REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )" - -# See https://github.com/facebook/watchman/blob/main/CMakeLists.txt#L342 for libevent -RDEPEND=" - dev-libs/libevent:= - dev-libs/libpcre - ~dev-cpp/folly-${PV}:= - dev-cpp/glog:= - >=dev-libs/libfmt-8.1.1-r1:= - dev-libs/openssl:= - llvm-libunwind? ( sys-libs/llvm-libunwind:= ) - !llvm-libunwind? ( sys-libs/libunwind:= ) - python? ( ${PYTHON_DEPS} )" -# TODO: Make gtest test-only (needs a fair bit of patching) -DEPEND="${RDEPEND} - dev-cpp/gtest" - -PATCHES=( - "${FILESDIR}"/watchman-2022.02.28.00-python-working-dir.patch - "${FILESDIR}"/watchman-2022.02.28.00-libatomic.patch -) - -# Rust utility -QA_FLAGS_IGNORED="usr/bin/watchmanctl" - -distutils_enable_tests unittest - -src_prepare() { - cmake_src_prepare -} - -src_configure() { - # https://github.com/facebook/watchman/blob/789678cf9855fb07b402afb75b01e4f8786deba2/build/fbcode_builder/CMake/RustStaticLibrary.cmake#L17 - export RUST_VENDORED_CRATES_DIR="${ECARGO_VENDOR}" - export RUST_CARGO_HOME="${ECARGO_HOME}" - export CARGO_HOME="${ECARGO_HOME}" - # Build system already handles avoiding Rust-jobs-while-CMake-jobs-spawned issue - # https://github.com/facebook/watchman/blob/789678cf9855fb07b402afb75b01e4f8786deba2/build/fbcode_builder/CMake/RustStaticLibrary.cmake#L69 - # so no need to force -j1 via cargo jobs - - local mycmakeargs=( - # Rust wrangling - -DUSE_CARGO_VENDOR=ON - -DGENERATE_CARGO_VENDOR_CONFIG=OFF - -DRUST_CARGO_HOME="${RUST_CARGO_HOME}" - - # General bits - -DWATCHMAN_STATE_DIR="${EPREFIX}"/run/watchman - -DWATCHMAN_VERSION_OVERRIDE=${PV} - - # Fails to build against fbthrift for now in libatomic troubles - -DENABLE_EDEN_SUPPORT=OFF - - # We handle this ourselves - -DCMAKE_DISABLE_FIND_PACKAGE_Python3=ON - ) - - cmake_src_configure -} - -src_compile() { - cmake_src_compile - - if use python ; then - pushd watchman/python >/dev/null || die - distutils-r1_src_compile - popd >/dev/null || die - fi -} - -src_test() { - cmake_src_test - - if use python ; then - pushd watchman/python >/dev/null || die - distutils-r1_src_test - popd >/dev/null || die - fi -} - -src_install() { - cmake_src_install - - newtmpfiles "${FILESDIR}"/watchman.tmpfiles watchman.conf - - if use python ; then - pushd watchman/python >/dev/null || die - distutils-r1_src_install - popd >/dev/null || die - fi -} - -pkg_postinst() { - tmpfiles_process watchman.conf -} diff --git a/dev-util/watchman/watchman-2022.07.04.00.ebuild b/dev-util/watchman/watchman-2022.07.04.00.ebuild deleted file mode 100644 index d70308e436e4..000000000000 --- a/dev-util/watchman/watchman-2022.07.04.00.ebuild +++ /dev/null @@ -1,210 +0,0 @@ -# Copyright 2020-2022 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -# TODO: Split into different variables then combine for each component? -# Not all is in rust/ dir. -# Rust components: watchman/cli watchman/rust/serde_bser watchman/rust/watchman_client -CRATES=" -ahash-0.3.8 -ansi_term-0.12.1 -anyhow-1.0.55 -atty-0.2.14 -autocfg-1.1.0 -bitflags-1.3.2 -byteorder-1.4.3 -bytes-1.1.0 -cfg-if-1.0.0 -clap-2.34.0 -const-random-0.1.13 -const-random-macro-0.1.13 -crossbeam-0.8.1 -crossbeam-channel-0.5.2 -crossbeam-deque-0.8.1 -crossbeam-epoch-0.9.7 -crossbeam-queue-0.3.4 -crossbeam-utils-0.8.7 -crunchy-0.2.2 -either-1.6.1 -futures-0.1.31 -futures-0.3.21 -futures-channel-0.3.21 -futures-core-0.3.21 -futures-executor-0.3.21 -futures-io-0.3.21 -futures-macro-0.3.21 -futures-sink-0.3.21 -futures-task-0.3.21 -futures-util-0.3.21 -getrandom-0.2.5 -heck-0.3.3 -hermit-abi-0.1.19 -jwalk-0.6.0 -lazy_static-1.4.0 -libc-0.2.119 -lock_api-0.4.6 -log-0.4.14 -maplit-1.0.2 -memchr-2.4.1 -memoffset-0.6.5 -mio-0.8.0 -miow-0.3.7 -ntapi-0.3.7 -num_cpus-1.13.1 -once_cell-1.9.0 -parking_lot-0.12.0 -parking_lot_core-0.9.1 -pin-project-lite-0.2.8 -pin-utils-0.1.0 -proc-macro2-1.0.36 -proc-macro-error-1.0.4 -proc-macro-error-attr-1.0.4 -proc-macro-hack-0.5.19 -quote-1.0.15 -rayon-1.5.1 -rayon-core-1.9.1 -redox_syscall-0.2.10 -scopeguard-1.1.0 -serde-1.0.136 -serde_derive-1.0.136 -signal-hook-registry-1.4.0 -slab-0.4.5 -smallvec-1.8.0 -socket2-0.4.4 -strsim-0.8.0 -structopt-0.3.26 -structopt-derive-0.4.18 -syn-1.0.86 -textwrap-0.11.0 -thiserror-1.0.30 -thiserror-impl-1.0.30 -tiny-keccak-2.0.2 -tokio-1.17.0 -tokio-macros-1.7.0 -tokio-util-0.6.9 -unicode-segmentation-1.9.0 -unicode-width-0.1.9 -unicode-xid-0.2.2 -vec_map-0.8.2 -version_check-0.9.4 -wasi-0.10.2+wasi-snapshot-preview1 -winapi-0.3.9 -winapi-i686-pc-windows-gnu-0.4.0 -winapi-x86_64-pc-windows-gnu-0.4.0 -windows_aarch64_msvc-0.32.0 -windows_i686_gnu-0.32.0 -windows_i686_msvc-0.32.0 -windows-sys-0.32.0 -windows_x86_64_gnu-0.32.0 -windows_x86_64_msvc-0.32.0 -" - -PYTHON_COMPAT=( python3_{8,9,10} ) -DISTUTILS_USE_PEP517=setuptools -inherit cargo cmake distutils-r1 tmpfiles - -DESCRIPTION="A file watching service" -HOMEPAGE="https://facebook.github.io/watchman/" -SRC_URI="https://github.com/facebook/watchman/archive/refs/tags/v${PV}.tar.gz -> ${P}.tar.gz" -SRC_URI+=" $(cargo_crate_uris)" - -LICENSE="Apache-2.0" -SLOT="0" -KEYWORDS="~amd64" -IUSE="llvm-libunwind python" -REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )" - -# See https://github.com/facebook/watchman/blob/main/CMakeLists.txt#L342 for libevent -RDEPEND=" - dev-libs/libevent:= - dev-libs/libpcre - ~dev-cpp/folly-${PV}:= - dev-cpp/glog:= - >=dev-libs/libfmt-8.1.1-r1:= - dev-libs/openssl:= - llvm-libunwind? ( sys-libs/llvm-libunwind:= ) - !llvm-libunwind? ( sys-libs/libunwind:= ) - python? ( ${PYTHON_DEPS} )" -# TODO: Make gtest test-only (needs a fair bit of patching) -DEPEND="${RDEPEND} - dev-cpp/gtest" - -PATCHES=( - "${FILESDIR}"/${PN}-2022.07.04.00-python-working-dir.patch - "${FILESDIR}"/${PN}-2022.02.28.00-libatomic.patch -) - -# Rust utility -QA_FLAGS_IGNORED="usr/bin/watchmanctl" - -distutils_enable_tests unittest - -src_prepare() { - cmake_src_prepare -} - -src_configure() { - # https://github.com/facebook/watchman/blob/789678cf9855fb07b402afb75b01e4f8786deba2/build/fbcode_builder/CMake/RustStaticLibrary.cmake#L17 - export RUST_VENDORED_CRATES_DIR="${ECARGO_VENDOR}" - export RUST_CARGO_HOME="${ECARGO_HOME}" - export CARGO_HOME="${ECARGO_HOME}" - # Build system already handles avoiding Rust-jobs-while-CMake-jobs-spawned issue - # https://github.com/facebook/watchman/blob/789678cf9855fb07b402afb75b01e4f8786deba2/build/fbcode_builder/CMake/RustStaticLibrary.cmake#L69 - # so no need to force -j1 via cargo jobs - - local mycmakeargs=( - # Rust wrangling - -DUSE_CARGO_VENDOR=ON - -DGENERATE_CARGO_VENDOR_CONFIG=OFF - -DRUST_CARGO_HOME="${RUST_CARGO_HOME}" - - # General bits - -DWATCHMAN_STATE_DIR="${EPREFIX}"/run/watchman - -DWATCHMAN_VERSION_OVERRIDE=${PV} - - # Fails to build against fbthrift for now in libatomic troubles - -DENABLE_EDEN_SUPPORT=OFF - - # We handle this ourselves - -DCMAKE_DISABLE_FIND_PACKAGE_Python3=ON - ) - - cmake_src_configure -} - -src_compile() { - cmake_src_compile - - if use python ; then - pushd watchman/python >/dev/null || die - distutils-r1_src_compile - popd >/dev/null || die - fi -} - -src_test() { - cmake_src_test - - if use python ; then - pushd watchman/python >/dev/null || die - distutils-r1_src_test - popd >/dev/null || die - fi -} - -src_install() { - cmake_src_install - - newtmpfiles "${FILESDIR}"/watchman.tmpfiles watchman.conf - - if use python ; then - pushd watchman/python >/dev/null || die - distutils-r1_src_install - popd >/dev/null || die - fi -} - -pkg_postinst() { - tmpfiles_process watchman.conf -} diff --git a/dev-util/watchman/watchman-2022.08.08.00.ebuild b/dev-util/watchman/watchman-2022.08.08.00.ebuild deleted file mode 100644 index 030a28e8ed05..000000000000 --- a/dev-util/watchman/watchman-2022.08.08.00.ebuild +++ /dev/null @@ -1,217 +0,0 @@ -# Copyright 2020-2022 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -# These must be bumped together: -# dev-cpp/edencommon -# dev-cpp/folly -# dev-util/watchman - -# TODO: Split into different variables then combine for each component? -# Not all is in rust/ dir. -# Rust components: watchman/cli watchman/rust/serde_bser watchman/rust/watchman_client -CRATES=" -ahash-0.3.8 -ansi_term-0.12.1 -anyhow-1.0.55 -atty-0.2.14 -autocfg-1.1.0 -bitflags-1.3.2 -byteorder-1.4.3 -bytes-1.1.0 -cfg-if-1.0.0 -clap-2.34.0 -const-random-0.1.13 -const-random-macro-0.1.13 -crossbeam-0.8.1 -crossbeam-channel-0.5.2 -crossbeam-deque-0.8.1 -crossbeam-epoch-0.9.7 -crossbeam-queue-0.3.4 -crossbeam-utils-0.8.7 -crunchy-0.2.2 -either-1.6.1 -futures-0.1.31 -futures-0.3.21 -futures-channel-0.3.21 -futures-core-0.3.21 -futures-executor-0.3.21 -futures-io-0.3.21 -futures-macro-0.3.21 -futures-sink-0.3.21 -futures-task-0.3.21 -futures-util-0.3.21 -getrandom-0.2.5 -heck-0.3.3 -hermit-abi-0.1.19 -jwalk-0.6.0 -lazy_static-1.4.0 -libc-0.2.119 -lock_api-0.4.6 -log-0.4.14 -maplit-1.0.2 -memchr-2.4.1 -memoffset-0.6.5 -mio-0.8.0 -miow-0.3.7 -ntapi-0.3.7 -num_cpus-1.13.1 -once_cell-1.9.0 -parking_lot-0.12.0 -parking_lot_core-0.9.1 -pin-project-lite-0.2.8 -pin-utils-0.1.0 -proc-macro2-1.0.36 -proc-macro-error-1.0.4 -proc-macro-error-attr-1.0.4 -proc-macro-hack-0.5.19 -quote-1.0.15 -rayon-1.5.1 -rayon-core-1.9.1 -redox_syscall-0.2.10 -scopeguard-1.1.0 -serde-1.0.136 -serde_derive-1.0.136 -signal-hook-registry-1.4.0 -slab-0.4.5 -smallvec-1.8.0 -socket2-0.4.4 -strsim-0.8.0 -structopt-0.3.26 -structopt-derive-0.4.18 -syn-1.0.86 -textwrap-0.11.0 -thiserror-1.0.30 -thiserror-impl-1.0.30 -tiny-keccak-2.0.2 -tokio-1.17.0 -tokio-macros-1.7.0 -tokio-util-0.6.9 -unicode-segmentation-1.9.0 -unicode-width-0.1.9 -unicode-xid-0.2.2 -vec_map-0.8.2 -version_check-0.9.4 -wasi-0.10.2+wasi-snapshot-preview1 -winapi-0.3.9 -winapi-i686-pc-windows-gnu-0.4.0 -winapi-x86_64-pc-windows-gnu-0.4.0 -windows_aarch64_msvc-0.32.0 -windows_i686_gnu-0.32.0 -windows_i686_msvc-0.32.0 -windows-sys-0.32.0 -windows_x86_64_gnu-0.32.0 -windows_x86_64_msvc-0.32.0 -" - -DISTUTILS_USE_PEP517=setuptools -PYTHON_COMPAT=( python3_{8..10} ) -inherit cargo cmake distutils-r1 tmpfiles - -DESCRIPTION="A file watching service" -HOMEPAGE="https://facebook.github.io/watchman/" -SRC_URI="https://github.com/facebook/watchman/archive/refs/tags/v${PV}.tar.gz -> ${P}.tar.gz" -SRC_URI+=" $(cargo_crate_uris)" - -LICENSE="Apache-2.0" -SLOT="0" -KEYWORDS="~amd64" -IUSE="llvm-libunwind python" -REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )" - -# See https://github.com/facebook/watchman/blob/main/CMakeLists.txt#L342 for libevent -RDEPEND=" - dev-libs/libevent:= - dev-libs/libpcre2 - dev-cpp/edencommon:= - ~dev-cpp/folly-${PV}:= - dev-cpp/glog:= - >=dev-libs/libfmt-8.1.1-r1:= - dev-libs/openssl:= - llvm-libunwind? ( sys-libs/llvm-libunwind:= ) - !llvm-libunwind? ( sys-libs/libunwind:= ) - python? ( ${PYTHON_DEPS} )" -# TODO: Make gtest test-only (needs a fair bit of patching) -DEPEND="${RDEPEND} - dev-cpp/gtest" - -PATCHES=( - "${FILESDIR}"/${PN}-2022.07.04.00-python-working-dir.patch - "${FILESDIR}"/${PN}-2022.02.28.00-libatomic.patch - "${FILESDIR}"/${PN}-2022.08.08.00-musl-fsword-fix.patch -) - -# Rust utility -QA_FLAGS_IGNORED="usr/bin/watchmanctl" - -distutils_enable_tests unittest - -src_prepare() { - cmake_src_prepare -} - -src_configure() { - # https://github.com/facebook/watchman/blob/789678cf9855fb07b402afb75b01e4f8786deba2/build/fbcode_builder/CMake/RustStaticLibrary.cmake#L17 - export RUST_VENDORED_CRATES_DIR="${ECARGO_VENDOR}" - export RUST_CARGO_HOME="${ECARGO_HOME}" - export CARGO_HOME="${ECARGO_HOME}" - # Build system already handles avoiding Rust-jobs-while-CMake-jobs-spawned issue - # https://github.com/facebook/watchman/blob/789678cf9855fb07b402afb75b01e4f8786deba2/build/fbcode_builder/CMake/RustStaticLibrary.cmake#L69 - # so no need to force -j1 via cargo jobs - - local mycmakeargs=( - # Rust wrangling - -DUSE_CARGO_VENDOR=ON - -DGENERATE_CARGO_VENDOR_CONFIG=OFF - -DRUST_CARGO_HOME="${RUST_CARGO_HOME}" - - # General bits - -DWATCHMAN_STATE_DIR="${EPREFIX}"/run/watchman - -DWATCHMAN_VERSION_OVERRIDE=${PV} - - # Fails to build against fbthrift for now in libatomic troubles - -DENABLE_EDEN_SUPPORT=OFF - - # We handle this ourselves - -DCMAKE_DISABLE_FIND_PACKAGE_Python3=ON - ) - - cmake_src_configure -} - -src_compile() { - cmake_src_compile - - if use python ; then - pushd watchman/python >/dev/null || die - distutils-r1_src_compile - popd >/dev/null || die - fi -} - -src_test() { - cmake_src_test - - if use python ; then - pushd watchman/python >/dev/null || die - distutils-r1_src_test - popd >/dev/null || die - fi -} - -src_install() { - cmake_src_install - - newtmpfiles "${FILESDIR}"/watchman.tmpfiles watchman.conf - - if use python ; then - pushd watchman/python >/dev/null || die - distutils-r1_src_install - popd >/dev/null || die - fi -} - -pkg_postinst() { - tmpfiles_process watchman.conf -} diff --git a/dev-util/watchman/watchman-2022.08.15.00.ebuild b/dev-util/watchman/watchman-2022.08.15.00.ebuild deleted file mode 100644 index 030a28e8ed05..000000000000 --- a/dev-util/watchman/watchman-2022.08.15.00.ebuild +++ /dev/null @@ -1,217 +0,0 @@ -# Copyright 2020-2022 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -# These must be bumped together: -# dev-cpp/edencommon -# dev-cpp/folly -# dev-util/watchman - -# TODO: Split into different variables then combine for each component? -# Not all is in rust/ dir. -# Rust components: watchman/cli watchman/rust/serde_bser watchman/rust/watchman_client -CRATES=" -ahash-0.3.8 -ansi_term-0.12.1 -anyhow-1.0.55 -atty-0.2.14 -autocfg-1.1.0 -bitflags-1.3.2 -byteorder-1.4.3 -bytes-1.1.0 -cfg-if-1.0.0 -clap-2.34.0 -const-random-0.1.13 -const-random-macro-0.1.13 -crossbeam-0.8.1 -crossbeam-channel-0.5.2 -crossbeam-deque-0.8.1 -crossbeam-epoch-0.9.7 -crossbeam-queue-0.3.4 -crossbeam-utils-0.8.7 -crunchy-0.2.2 -either-1.6.1 -futures-0.1.31 -futures-0.3.21 -futures-channel-0.3.21 -futures-core-0.3.21 -futures-executor-0.3.21 -futures-io-0.3.21 -futures-macro-0.3.21 -futures-sink-0.3.21 -futures-task-0.3.21 -futures-util-0.3.21 -getrandom-0.2.5 -heck-0.3.3 -hermit-abi-0.1.19 -jwalk-0.6.0 -lazy_static-1.4.0 -libc-0.2.119 -lock_api-0.4.6 -log-0.4.14 -maplit-1.0.2 -memchr-2.4.1 -memoffset-0.6.5 -mio-0.8.0 -miow-0.3.7 -ntapi-0.3.7 -num_cpus-1.13.1 -once_cell-1.9.0 -parking_lot-0.12.0 -parking_lot_core-0.9.1 -pin-project-lite-0.2.8 -pin-utils-0.1.0 -proc-macro2-1.0.36 -proc-macro-error-1.0.4 -proc-macro-error-attr-1.0.4 -proc-macro-hack-0.5.19 -quote-1.0.15 -rayon-1.5.1 -rayon-core-1.9.1 -redox_syscall-0.2.10 -scopeguard-1.1.0 -serde-1.0.136 -serde_derive-1.0.136 -signal-hook-registry-1.4.0 -slab-0.4.5 -smallvec-1.8.0 -socket2-0.4.4 -strsim-0.8.0 -structopt-0.3.26 -structopt-derive-0.4.18 -syn-1.0.86 -textwrap-0.11.0 -thiserror-1.0.30 -thiserror-impl-1.0.30 -tiny-keccak-2.0.2 -tokio-1.17.0 -tokio-macros-1.7.0 -tokio-util-0.6.9 -unicode-segmentation-1.9.0 -unicode-width-0.1.9 -unicode-xid-0.2.2 -vec_map-0.8.2 -version_check-0.9.4 -wasi-0.10.2+wasi-snapshot-preview1 -winapi-0.3.9 -winapi-i686-pc-windows-gnu-0.4.0 -winapi-x86_64-pc-windows-gnu-0.4.0 -windows_aarch64_msvc-0.32.0 -windows_i686_gnu-0.32.0 -windows_i686_msvc-0.32.0 -windows-sys-0.32.0 -windows_x86_64_gnu-0.32.0 -windows_x86_64_msvc-0.32.0 -" - -DISTUTILS_USE_PEP517=setuptools -PYTHON_COMPAT=( python3_{8..10} ) -inherit cargo cmake distutils-r1 tmpfiles - -DESCRIPTION="A file watching service" -HOMEPAGE="https://facebook.github.io/watchman/" -SRC_URI="https://github.com/facebook/watchman/archive/refs/tags/v${PV}.tar.gz -> ${P}.tar.gz" -SRC_URI+=" $(cargo_crate_uris)" - -LICENSE="Apache-2.0" -SLOT="0" -KEYWORDS="~amd64" -IUSE="llvm-libunwind python" -REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )" - -# See https://github.com/facebook/watchman/blob/main/CMakeLists.txt#L342 for libevent -RDEPEND=" - dev-libs/libevent:= - dev-libs/libpcre2 - dev-cpp/edencommon:= - ~dev-cpp/folly-${PV}:= - dev-cpp/glog:= - >=dev-libs/libfmt-8.1.1-r1:= - dev-libs/openssl:= - llvm-libunwind? ( sys-libs/llvm-libunwind:= ) - !llvm-libunwind? ( sys-libs/libunwind:= ) - python? ( ${PYTHON_DEPS} )" -# TODO: Make gtest test-only (needs a fair bit of patching) -DEPEND="${RDEPEND} - dev-cpp/gtest" - -PATCHES=( - "${FILESDIR}"/${PN}-2022.07.04.00-python-working-dir.patch - "${FILESDIR}"/${PN}-2022.02.28.00-libatomic.patch - "${FILESDIR}"/${PN}-2022.08.08.00-musl-fsword-fix.patch -) - -# Rust utility -QA_FLAGS_IGNORED="usr/bin/watchmanctl" - -distutils_enable_tests unittest - -src_prepare() { - cmake_src_prepare -} - -src_configure() { - # https://github.com/facebook/watchman/blob/789678cf9855fb07b402afb75b01e4f8786deba2/build/fbcode_builder/CMake/RustStaticLibrary.cmake#L17 - export RUST_VENDORED_CRATES_DIR="${ECARGO_VENDOR}" - export RUST_CARGO_HOME="${ECARGO_HOME}" - export CARGO_HOME="${ECARGO_HOME}" - # Build system already handles avoiding Rust-jobs-while-CMake-jobs-spawned issue - # https://github.com/facebook/watchman/blob/789678cf9855fb07b402afb75b01e4f8786deba2/build/fbcode_builder/CMake/RustStaticLibrary.cmake#L69 - # so no need to force -j1 via cargo jobs - - local mycmakeargs=( - # Rust wrangling - -DUSE_CARGO_VENDOR=ON - -DGENERATE_CARGO_VENDOR_CONFIG=OFF - -DRUST_CARGO_HOME="${RUST_CARGO_HOME}" - - # General bits - -DWATCHMAN_STATE_DIR="${EPREFIX}"/run/watchman - -DWATCHMAN_VERSION_OVERRIDE=${PV} - - # Fails to build against fbthrift for now in libatomic troubles - -DENABLE_EDEN_SUPPORT=OFF - - # We handle this ourselves - -DCMAKE_DISABLE_FIND_PACKAGE_Python3=ON - ) - - cmake_src_configure -} - -src_compile() { - cmake_src_compile - - if use python ; then - pushd watchman/python >/dev/null || die - distutils-r1_src_compile - popd >/dev/null || die - fi -} - -src_test() { - cmake_src_test - - if use python ; then - pushd watchman/python >/dev/null || die - distutils-r1_src_test - popd >/dev/null || die - fi -} - -src_install() { - cmake_src_install - - newtmpfiles "${FILESDIR}"/watchman.tmpfiles watchman.conf - - if use python ; then - pushd watchman/python >/dev/null || die - distutils-r1_src_install - popd >/dev/null || die - fi -} - -pkg_postinst() { - tmpfiles_process watchman.conf -} diff --git a/dev-util/watchman/watchman-2022.08.22.00.ebuild b/dev-util/watchman/watchman-2022.08.22.00.ebuild deleted file mode 100644 index ab5b42363940..000000000000 --- a/dev-util/watchman/watchman-2022.08.22.00.ebuild +++ /dev/null @@ -1,217 +0,0 @@ -# Copyright 2020-2022 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -# These must be bumped together: -# dev-cpp/edencommon -# dev-cpp/folly -# dev-util/watchman - -# TODO: Split into different variables then combine for each component? -# Not all is in rust/ dir. -# Rust components: watchman/cli watchman/rust/serde_bser watchman/rust/watchman_client -CRATES=" -ahash-0.3.8 -ansi_term-0.12.1 -anyhow-1.0.55 -atty-0.2.14 -autocfg-1.1.0 -bitflags-1.3.2 -byteorder-1.4.3 -bytes-1.1.0 -cfg-if-1.0.0 -clap-2.34.0 -const-random-0.1.13 -const-random-macro-0.1.13 -crossbeam-0.8.1 -crossbeam-channel-0.5.2 -crossbeam-deque-0.8.1 -crossbeam-epoch-0.9.7 -crossbeam-queue-0.3.4 -crossbeam-utils-0.8.7 -crunchy-0.2.2 -either-1.6.1 -futures-0.1.31 -futures-0.3.21 -futures-channel-0.3.21 -futures-core-0.3.21 -futures-executor-0.3.21 -futures-io-0.3.21 -futures-macro-0.3.21 -futures-sink-0.3.21 -futures-task-0.3.21 -futures-util-0.3.21 -getrandom-0.2.5 -heck-0.3.3 -hermit-abi-0.1.19 -jwalk-0.6.0 -lazy_static-1.4.0 -libc-0.2.119 -lock_api-0.4.6 -log-0.4.14 -maplit-1.0.2 -memchr-2.4.1 -memoffset-0.6.5 -mio-0.8.0 -miow-0.3.7 -ntapi-0.3.7 -num_cpus-1.13.1 -once_cell-1.9.0 -parking_lot-0.12.0 -parking_lot_core-0.9.1 -pin-project-lite-0.2.8 -pin-utils-0.1.0 -proc-macro2-1.0.36 -proc-macro-error-1.0.4 -proc-macro-error-attr-1.0.4 -proc-macro-hack-0.5.19 -quote-1.0.15 -rayon-1.5.1 -rayon-core-1.9.1 -redox_syscall-0.2.10 -scopeguard-1.1.0 -serde-1.0.136 -serde_derive-1.0.136 -signal-hook-registry-1.4.0 -slab-0.4.5 -smallvec-1.8.0 -socket2-0.4.4 -strsim-0.8.0 -structopt-0.3.26 -structopt-derive-0.4.18 -syn-1.0.86 -textwrap-0.11.0 -thiserror-1.0.30 -thiserror-impl-1.0.30 -tiny-keccak-2.0.2 -tokio-1.17.0 -tokio-macros-1.7.0 -tokio-util-0.6.9 -unicode-segmentation-1.9.0 -unicode-width-0.1.9 -unicode-xid-0.2.2 -vec_map-0.8.2 -version_check-0.9.4 -wasi-0.10.2+wasi-snapshot-preview1 -winapi-0.3.9 -winapi-i686-pc-windows-gnu-0.4.0 -winapi-x86_64-pc-windows-gnu-0.4.0 -windows_aarch64_msvc-0.32.0 -windows_i686_gnu-0.32.0 -windows_i686_msvc-0.32.0 -windows-sys-0.32.0 -windows_x86_64_gnu-0.32.0 -windows_x86_64_msvc-0.32.0 -" - -DISTUTILS_USE_PEP517=setuptools -PYTHON_COMPAT=( python3_{8..10} ) -inherit cargo cmake distutils-r1 tmpfiles - -DESCRIPTION="A file watching service" -HOMEPAGE="https://facebook.github.io/watchman/" -SRC_URI="https://github.com/facebook/watchman/archive/refs/tags/v${PV}.tar.gz -> ${P}.tar.gz" -SRC_URI+=" $(cargo_crate_uris)" - -LICENSE="Apache-2.0" -SLOT="0" -KEYWORDS="~amd64" -IUSE="llvm-libunwind python" -REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )" - -# See https://github.com/facebook/watchman/blob/main/CMakeLists.txt#L342 for libevent -RDEPEND=" - dev-libs/libevent:= - dev-libs/libpcre2 - ~dev-cpp/edencommon-${PV}:= - ~dev-cpp/folly-${PV}:= - dev-cpp/glog:= - >=dev-libs/libfmt-8.1.1-r1:= - dev-libs/openssl:= - llvm-libunwind? ( sys-libs/llvm-libunwind:= ) - !llvm-libunwind? ( sys-libs/libunwind:= ) - python? ( ${PYTHON_DEPS} )" -# TODO: Make gtest test-only (needs a fair bit of patching) -DEPEND="${RDEPEND} - dev-cpp/gtest" - -PATCHES=( - "${FILESDIR}"/${PN}-2022.07.04.00-python-working-dir.patch - "${FILESDIR}"/${PN}-2022.02.28.00-libatomic.patch - "${FILESDIR}"/${PN}-2022.08.08.00-musl-fsword-fix.patch -) - -# Rust utility -QA_FLAGS_IGNORED="usr/bin/watchmanctl" - -distutils_enable_tests unittest - -src_prepare() { - cmake_src_prepare -} - -src_configure() { - # https://github.com/facebook/watchman/blob/789678cf9855fb07b402afb75b01e4f8786deba2/build/fbcode_builder/CMake/RustStaticLibrary.cmake#L17 - export RUST_VENDORED_CRATES_DIR="${ECARGO_VENDOR}" - export RUST_CARGO_HOME="${ECARGO_HOME}" - export CARGO_HOME="${ECARGO_HOME}" - # Build system already handles avoiding Rust-jobs-while-CMake-jobs-spawned issue - # https://github.com/facebook/watchman/blob/789678cf9855fb07b402afb75b01e4f8786deba2/build/fbcode_builder/CMake/RustStaticLibrary.cmake#L69 - # so no need to force -j1 via cargo jobs - - local mycmakeargs=( - # Rust wrangling - -DUSE_CARGO_VENDOR=ON - -DGENERATE_CARGO_VENDOR_CONFIG=OFF - -DRUST_CARGO_HOME="${RUST_CARGO_HOME}" - - # General bits - -DWATCHMAN_STATE_DIR="${EPREFIX}"/run/watchman - -DWATCHMAN_VERSION_OVERRIDE=${PV} - - # Fails to build against fbthrift for now in libatomic troubles - -DENABLE_EDEN_SUPPORT=OFF - - # We handle this ourselves - -DCMAKE_DISABLE_FIND_PACKAGE_Python3=ON - ) - - cmake_src_configure -} - -src_compile() { - cmake_src_compile - - if use python ; then - pushd watchman/python >/dev/null || die - distutils-r1_src_compile - popd >/dev/null || die - fi -} - -src_test() { - cmake_src_test - - if use python ; then - pushd watchman/python >/dev/null || die - distutils-r1_src_test - popd >/dev/null || die - fi -} - -src_install() { - cmake_src_install - - newtmpfiles "${FILESDIR}"/watchman.tmpfiles watchman.conf - - if use python ; then - pushd watchman/python >/dev/null || die - distutils-r1_src_install - popd >/dev/null || die - fi -} - -pkg_postinst() { - tmpfiles_process watchman.conf -} diff --git a/dev-util/watchman/watchman-2022.09.05.00.ebuild b/dev-util/watchman/watchman-2022.09.05.00.ebuild deleted file mode 100644 index ab5b42363940..000000000000 --- a/dev-util/watchman/watchman-2022.09.05.00.ebuild +++ /dev/null @@ -1,217 +0,0 @@ -# Copyright 2020-2022 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -# These must be bumped together: -# dev-cpp/edencommon -# dev-cpp/folly -# dev-util/watchman - -# TODO: Split into different variables then combine for each component? -# Not all is in rust/ dir. -# Rust components: watchman/cli watchman/rust/serde_bser watchman/rust/watchman_client -CRATES=" -ahash-0.3.8 -ansi_term-0.12.1 -anyhow-1.0.55 -atty-0.2.14 -autocfg-1.1.0 -bitflags-1.3.2 -byteorder-1.4.3 -bytes-1.1.0 -cfg-if-1.0.0 -clap-2.34.0 -const-random-0.1.13 -const-random-macro-0.1.13 -crossbeam-0.8.1 -crossbeam-channel-0.5.2 -crossbeam-deque-0.8.1 -crossbeam-epoch-0.9.7 -crossbeam-queue-0.3.4 -crossbeam-utils-0.8.7 -crunchy-0.2.2 -either-1.6.1 -futures-0.1.31 -futures-0.3.21 -futures-channel-0.3.21 -futures-core-0.3.21 -futures-executor-0.3.21 -futures-io-0.3.21 -futures-macro-0.3.21 -futures-sink-0.3.21 -futures-task-0.3.21 -futures-util-0.3.21 -getrandom-0.2.5 -heck-0.3.3 -hermit-abi-0.1.19 -jwalk-0.6.0 -lazy_static-1.4.0 -libc-0.2.119 -lock_api-0.4.6 -log-0.4.14 -maplit-1.0.2 -memchr-2.4.1 -memoffset-0.6.5 -mio-0.8.0 -miow-0.3.7 -ntapi-0.3.7 -num_cpus-1.13.1 -once_cell-1.9.0 -parking_lot-0.12.0 -parking_lot_core-0.9.1 -pin-project-lite-0.2.8 -pin-utils-0.1.0 -proc-macro2-1.0.36 -proc-macro-error-1.0.4 -proc-macro-error-attr-1.0.4 -proc-macro-hack-0.5.19 -quote-1.0.15 -rayon-1.5.1 -rayon-core-1.9.1 -redox_syscall-0.2.10 -scopeguard-1.1.0 -serde-1.0.136 -serde_derive-1.0.136 -signal-hook-registry-1.4.0 -slab-0.4.5 -smallvec-1.8.0 -socket2-0.4.4 -strsim-0.8.0 -structopt-0.3.26 -structopt-derive-0.4.18 -syn-1.0.86 -textwrap-0.11.0 -thiserror-1.0.30 -thiserror-impl-1.0.30 -tiny-keccak-2.0.2 -tokio-1.17.0 -tokio-macros-1.7.0 -tokio-util-0.6.9 -unicode-segmentation-1.9.0 -unicode-width-0.1.9 -unicode-xid-0.2.2 -vec_map-0.8.2 -version_check-0.9.4 -wasi-0.10.2+wasi-snapshot-preview1 -winapi-0.3.9 -winapi-i686-pc-windows-gnu-0.4.0 -winapi-x86_64-pc-windows-gnu-0.4.0 -windows_aarch64_msvc-0.32.0 -windows_i686_gnu-0.32.0 -windows_i686_msvc-0.32.0 -windows-sys-0.32.0 -windows_x86_64_gnu-0.32.0 -windows_x86_64_msvc-0.32.0 -" - -DISTUTILS_USE_PEP517=setuptools -PYTHON_COMPAT=( python3_{8..10} ) -inherit cargo cmake distutils-r1 tmpfiles - -DESCRIPTION="A file watching service" -HOMEPAGE="https://facebook.github.io/watchman/" -SRC_URI="https://github.com/facebook/watchman/archive/refs/tags/v${PV}.tar.gz -> ${P}.tar.gz" -SRC_URI+=" $(cargo_crate_uris)" - -LICENSE="Apache-2.0" -SLOT="0" -KEYWORDS="~amd64" -IUSE="llvm-libunwind python" -REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )" - -# See https://github.com/facebook/watchman/blob/main/CMakeLists.txt#L342 for libevent -RDEPEND=" - dev-libs/libevent:= - dev-libs/libpcre2 - ~dev-cpp/edencommon-${PV}:= - ~dev-cpp/folly-${PV}:= - dev-cpp/glog:= - >=dev-libs/libfmt-8.1.1-r1:= - dev-libs/openssl:= - llvm-libunwind? ( sys-libs/llvm-libunwind:= ) - !llvm-libunwind? ( sys-libs/libunwind:= ) - python? ( ${PYTHON_DEPS} )" -# TODO: Make gtest test-only (needs a fair bit of patching) -DEPEND="${RDEPEND} - dev-cpp/gtest" - -PATCHES=( - "${FILESDIR}"/${PN}-2022.07.04.00-python-working-dir.patch - "${FILESDIR}"/${PN}-2022.02.28.00-libatomic.patch - "${FILESDIR}"/${PN}-2022.08.08.00-musl-fsword-fix.patch -) - -# Rust utility -QA_FLAGS_IGNORED="usr/bin/watchmanctl" - -distutils_enable_tests unittest - -src_prepare() { - cmake_src_prepare -} - -src_configure() { - # https://github.com/facebook/watchman/blob/789678cf9855fb07b402afb75b01e4f8786deba2/build/fbcode_builder/CMake/RustStaticLibrary.cmake#L17 - export RUST_VENDORED_CRATES_DIR="${ECARGO_VENDOR}" - export RUST_CARGO_HOME="${ECARGO_HOME}" - export CARGO_HOME="${ECARGO_HOME}" - # Build system already handles avoiding Rust-jobs-while-CMake-jobs-spawned issue - # https://github.com/facebook/watchman/blob/789678cf9855fb07b402afb75b01e4f8786deba2/build/fbcode_builder/CMake/RustStaticLibrary.cmake#L69 - # so no need to force -j1 via cargo jobs - - local mycmakeargs=( - # Rust wrangling - -DUSE_CARGO_VENDOR=ON - -DGENERATE_CARGO_VENDOR_CONFIG=OFF - -DRUST_CARGO_HOME="${RUST_CARGO_HOME}" - - # General bits - -DWATCHMAN_STATE_DIR="${EPREFIX}"/run/watchman - -DWATCHMAN_VERSION_OVERRIDE=${PV} - - # Fails to build against fbthrift for now in libatomic troubles - -DENABLE_EDEN_SUPPORT=OFF - - # We handle this ourselves - -DCMAKE_DISABLE_FIND_PACKAGE_Python3=ON - ) - - cmake_src_configure -} - -src_compile() { - cmake_src_compile - - if use python ; then - pushd watchman/python >/dev/null || die - distutils-r1_src_compile - popd >/dev/null || die - fi -} - -src_test() { - cmake_src_test - - if use python ; then - pushd watchman/python >/dev/null || die - distutils-r1_src_test - popd >/dev/null || die - fi -} - -src_install() { - cmake_src_install - - newtmpfiles "${FILESDIR}"/watchman.tmpfiles watchman.conf - - if use python ; then - pushd watchman/python >/dev/null || die - distutils-r1_src_install - popd >/dev/null || die - fi -} - -pkg_postinst() { - tmpfiles_process watchman.conf -} diff --git a/dev-util/watchman/watchman-2022.09.12.00.ebuild b/dev-util/watchman/watchman-2022.09.12.00.ebuild new file mode 100644 index 000000000000..ab5b42363940 --- /dev/null +++ b/dev-util/watchman/watchman-2022.09.12.00.ebuild @@ -0,0 +1,217 @@ +# Copyright 2020-2022 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +# These must be bumped together: +# dev-cpp/edencommon +# dev-cpp/folly +# dev-util/watchman + +# TODO: Split into different variables then combine for each component? +# Not all is in rust/ dir. +# Rust components: watchman/cli watchman/rust/serde_bser watchman/rust/watchman_client +CRATES=" +ahash-0.3.8 +ansi_term-0.12.1 +anyhow-1.0.55 +atty-0.2.14 +autocfg-1.1.0 +bitflags-1.3.2 +byteorder-1.4.3 +bytes-1.1.0 +cfg-if-1.0.0 +clap-2.34.0 +const-random-0.1.13 +const-random-macro-0.1.13 +crossbeam-0.8.1 +crossbeam-channel-0.5.2 +crossbeam-deque-0.8.1 +crossbeam-epoch-0.9.7 +crossbeam-queue-0.3.4 +crossbeam-utils-0.8.7 +crunchy-0.2.2 +either-1.6.1 +futures-0.1.31 +futures-0.3.21 +futures-channel-0.3.21 +futures-core-0.3.21 +futures-executor-0.3.21 +futures-io-0.3.21 +futures-macro-0.3.21 +futures-sink-0.3.21 +futures-task-0.3.21 +futures-util-0.3.21 +getrandom-0.2.5 +heck-0.3.3 +hermit-abi-0.1.19 +jwalk-0.6.0 +lazy_static-1.4.0 +libc-0.2.119 +lock_api-0.4.6 +log-0.4.14 +maplit-1.0.2 +memchr-2.4.1 +memoffset-0.6.5 +mio-0.8.0 +miow-0.3.7 +ntapi-0.3.7 +num_cpus-1.13.1 +once_cell-1.9.0 +parking_lot-0.12.0 +parking_lot_core-0.9.1 +pin-project-lite-0.2.8 +pin-utils-0.1.0 +proc-macro2-1.0.36 +proc-macro-error-1.0.4 +proc-macro-error-attr-1.0.4 +proc-macro-hack-0.5.19 +quote-1.0.15 +rayon-1.5.1 +rayon-core-1.9.1 +redox_syscall-0.2.10 +scopeguard-1.1.0 +serde-1.0.136 +serde_derive-1.0.136 +signal-hook-registry-1.4.0 +slab-0.4.5 +smallvec-1.8.0 +socket2-0.4.4 +strsim-0.8.0 +structopt-0.3.26 +structopt-derive-0.4.18 +syn-1.0.86 +textwrap-0.11.0 +thiserror-1.0.30 +thiserror-impl-1.0.30 +tiny-keccak-2.0.2 +tokio-1.17.0 +tokio-macros-1.7.0 +tokio-util-0.6.9 +unicode-segmentation-1.9.0 +unicode-width-0.1.9 +unicode-xid-0.2.2 +vec_map-0.8.2 +version_check-0.9.4 +wasi-0.10.2+wasi-snapshot-preview1 +winapi-0.3.9 +winapi-i686-pc-windows-gnu-0.4.0 +winapi-x86_64-pc-windows-gnu-0.4.0 +windows_aarch64_msvc-0.32.0 +windows_i686_gnu-0.32.0 +windows_i686_msvc-0.32.0 +windows-sys-0.32.0 +windows_x86_64_gnu-0.32.0 +windows_x86_64_msvc-0.32.0 +" + +DISTUTILS_USE_PEP517=setuptools +PYTHON_COMPAT=( python3_{8..10} ) +inherit cargo cmake distutils-r1 tmpfiles + +DESCRIPTION="A file watching service" +HOMEPAGE="https://facebook.github.io/watchman/" +SRC_URI="https://github.com/facebook/watchman/archive/refs/tags/v${PV}.tar.gz -> ${P}.tar.gz" +SRC_URI+=" $(cargo_crate_uris)" + +LICENSE="Apache-2.0" +SLOT="0" +KEYWORDS="~amd64" +IUSE="llvm-libunwind python" +REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )" + +# See https://github.com/facebook/watchman/blob/main/CMakeLists.txt#L342 for libevent +RDEPEND=" + dev-libs/libevent:= + dev-libs/libpcre2 + ~dev-cpp/edencommon-${PV}:= + ~dev-cpp/folly-${PV}:= + dev-cpp/glog:= + >=dev-libs/libfmt-8.1.1-r1:= + dev-libs/openssl:= + llvm-libunwind? ( sys-libs/llvm-libunwind:= ) + !llvm-libunwind? ( sys-libs/libunwind:= ) + python? ( ${PYTHON_DEPS} )" +# TODO: Make gtest test-only (needs a fair bit of patching) +DEPEND="${RDEPEND} + dev-cpp/gtest" + +PATCHES=( + "${FILESDIR}"/${PN}-2022.07.04.00-python-working-dir.patch + "${FILESDIR}"/${PN}-2022.02.28.00-libatomic.patch + "${FILESDIR}"/${PN}-2022.08.08.00-musl-fsword-fix.patch +) + +# Rust utility +QA_FLAGS_IGNORED="usr/bin/watchmanctl" + +distutils_enable_tests unittest + +src_prepare() { + cmake_src_prepare +} + +src_configure() { + # https://github.com/facebook/watchman/blob/789678cf9855fb07b402afb75b01e4f8786deba2/build/fbcode_builder/CMake/RustStaticLibrary.cmake#L17 + export RUST_VENDORED_CRATES_DIR="${ECARGO_VENDOR}" + export RUST_CARGO_HOME="${ECARGO_HOME}" + export CARGO_HOME="${ECARGO_HOME}" + # Build system already handles avoiding Rust-jobs-while-CMake-jobs-spawned issue + # https://github.com/facebook/watchman/blob/789678cf9855fb07b402afb75b01e4f8786deba2/build/fbcode_builder/CMake/RustStaticLibrary.cmake#L69 + # so no need to force -j1 via cargo jobs + + local mycmakeargs=( + # Rust wrangling + -DUSE_CARGO_VENDOR=ON + -DGENERATE_CARGO_VENDOR_CONFIG=OFF + -DRUST_CARGO_HOME="${RUST_CARGO_HOME}" + + # General bits + -DWATCHMAN_STATE_DIR="${EPREFIX}"/run/watchman + -DWATCHMAN_VERSION_OVERRIDE=${PV} + + # Fails to build against fbthrift for now in libatomic troubles + -DENABLE_EDEN_SUPPORT=OFF + + # We handle this ourselves + -DCMAKE_DISABLE_FIND_PACKAGE_Python3=ON + ) + + cmake_src_configure +} + +src_compile() { + cmake_src_compile + + if use python ; then + pushd watchman/python >/dev/null || die + distutils-r1_src_compile + popd >/dev/null || die + fi +} + +src_test() { + cmake_src_test + + if use python ; then + pushd watchman/python >/dev/null || die + distutils-r1_src_test + popd >/dev/null || die + fi +} + +src_install() { + cmake_src_install + + newtmpfiles "${FILESDIR}"/watchman.tmpfiles watchman.conf + + if use python ; then + pushd watchman/python >/dev/null || die + distutils-r1_src_install + popd >/dev/null || die + fi +} + +pkg_postinst() { + tmpfiles_process watchman.conf +} -- cgit v1.2.3