From 47882770e5ba1100ca3d3fc20763b4c7a263bded Mon Sep 17 00:00:00 2001 From: Denis Reva Date: Thu, 22 Sep 2022 10:26:04 +0500 Subject: [PATCH 01/22] dev-util/DirectXShaderCompiler: Sadly DirectXShaderCompiler is required for modern AMDVLK versions (since 2022.3.4) Signed-off-by: Denis Reva --- .../DirectXShaderCompiler-1.7.2207-r1.ebuild | 62 +++++++++++++++++++ dev-util/DirectXShaderCompiler/Manifest | 3 + dev-util/DirectXShaderCompiler/metadata.xml | 12 ++++ 3 files changed, 77 insertions(+) create mode 100644 dev-util/DirectXShaderCompiler/DirectXShaderCompiler-1.7.2207-r1.ebuild create mode 100644 dev-util/DirectXShaderCompiler/Manifest create mode 100644 dev-util/DirectXShaderCompiler/metadata.xml diff --git a/dev-util/DirectXShaderCompiler/DirectXShaderCompiler-1.7.2207-r1.ebuild b/dev-util/DirectXShaderCompiler/DirectXShaderCompiler-1.7.2207-r1.ebuild new file mode 100644 index 0000000000..d9b7bcc152 --- /dev/null +++ b/dev-util/DirectXShaderCompiler/DirectXShaderCompiler-1.7.2207-r1.ebuild @@ -0,0 +1,62 @@ +# Copyright 1999-2022 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +PYTHON_COMPAT=( python3_{8..11} ) +inherit cmake check-reqs python-any-r1 + +DESCRIPTION="Microsoft DirectX Shader Compiler which is based on LLVM/Clang" +HOMEPAGE="https://github.com/microsoft/DirectXShaderCompiler" +# ToDo: unbundle spirv headers/tools +SPIRV_HEADERS_COMMIT_MAGIC="0bcc624926a25a2a273d07877fd25a6ff5ba1cfb" +SPIRV_TOOLS_COMMIT_MAGIC="71b2aee6c868a673ec82d1385f97593aa2881316" +SRC_URI="https://github.com/microsoft/DirectXShaderCompiler/archive/refs/tags/v${PV}.tar.gz -> ${P}.tar.gz +https://github.com/KhronosGroup/SPIRV-Headers/archive/${SPIRV_HEADERS_COMMIT_MAGIC}.tar.gz -> DirectXShaderCompiler-headers-${SPIRV_HEADERS_COMMIT_MAGIC}.tar.gz +https://github.com/KhronosGroup/SPIRV-Tools/archive/${SPIRV_TOOLS_COMMIT_MAGIC}.tar.gz -> DirectXShaderCompiler-tools-${SPIRV_TOOLS_COMMIT_MAGIC}.tar.gz" + +LICENSE="Apache-2.0-with-LLVM-exceptions UoI-NCSA BSD public-domain rc" +SLOT="0" +KEYWORDS="~amd64 ~x86" +IUSE="" + +DEPEND="${PYTHON_DEPS}" +RDEPEND=" + sys-libs/zlib:0= + >=dev-libs/libffi-3.4.2-r1:0= +" +BDEPEND="dev-util/cmake + sys-devel/gnuconfig +" + +CHECKREQS_MEMORY="4G" +CHECKREQS_DISK_BUILD="4G" +CMAKE_EXTRA_CACHE_FILE="${S}/cmake/caches/PredefinedParams.cmake" + +src_prepare() { + rm -d "${S}"/external/SPIRV* + mv "${WORKDIR}/SPIRV-Headers-${SPIRV_HEADERS_COMMIT_MAGIC}" "${S}/external/SPIRV-Headers" || die "can't move headers" + mv "${WORKDIR}/SPIRV-Tools-${SPIRV_TOOLS_COMMIT_MAGIC}" "${S}/external/SPIRV-Tools"|| die "can't move tools" + cmake_src_prepare +} + +src_configure() { + local mycmakeargs=( + -Wno-dev + -DCMAKE_INSTALL_PREFIX="${EPREFIX}/usr/lib/llvm/dxc" + -DLLVM_BUILD_DOCS=0 + -DLLVM_BUILD_TOOLS=0 + -DSPIRV_BUILD_TESTS=0 + -DBUILD_SHARED_LIBS=OFF + -DLLVM_VERSION_SUFFIX=dxc + ) + cmake_src_configure +} +src_install() { + cmake_src_install + cat > "99${PN}" <<-EOF + LDPATH="${EPREFIX}/usr/lib/llvm/dxc/lib" + EOF + doenvd "99${PN}" + dosym -r /usr/lib/llvm/dxc/bin/dxc /usr/bin/dxc +} diff --git a/dev-util/DirectXShaderCompiler/Manifest b/dev-util/DirectXShaderCompiler/Manifest new file mode 100644 index 0000000000..dd49913b20 --- /dev/null +++ b/dev-util/DirectXShaderCompiler/Manifest @@ -0,0 +1,3 @@ +DIST DirectXShaderCompiler-1.7.2207.tar.gz 23764105 BLAKE2B 4b3bab8a961cdec96fd31da85386cf61af304d5ed1f6dcb40530bb2b084bc454f42ecfcbf9bcb228ecd2870c13b7b211509e05e3b7ed08ee3c2ed264505d162d SHA512 4faa6b53f2f694c9593ebf4ac02ce771fe1cb1822595799dc3a6c85752de701afe546b5fbdfedcc0ba466b0081bc679fca1fd7fb5fc05167c7449fb378a1c651 +DIST DirectXShaderCompiler-headers-0bcc624926a25a2a273d07877fd25a6ff5ba1cfb.tar.gz 437771 BLAKE2B 08815e36ad99b84777e38ad0c5616b6608a552f993e7f67433f2b8e20de81e9bce41420ac5998f5b67bca70a92ce70aed91b238990bd431c7b97070dfb0c5a60 SHA512 5995cf75d5605d41e9643bca81c195ef5aaa17d596e0282807f6fa8f8c494f7b63a41d611c535ae43dc3d609436aabef1e0d89626f37e6f20bad17b5e122e32c +DIST DirectXShaderCompiler-tools-71b2aee6c868a673ec82d1385f97593aa2881316.tar.gz 3042018 BLAKE2B e9d62559fc270c4140f2638a51b8d14120d84a868a35c488f30bff1b098a98fa1683e85b0778208de61a0b5c0b3f0996071e655a8fa64cc7c3c791527ff9441a SHA512 68f80e4a3395ba7c87ab08f515d265f0c106f39770e043cc8eba5e62f2762405e05e4b5b187e33702ce0a2204fc9d42cbf7ce27a6268daf59f4ab4c04b73d462 diff --git a/dev-util/DirectXShaderCompiler/metadata.xml b/dev-util/DirectXShaderCompiler/metadata.xml new file mode 100644 index 0000000000..eda7faf2ff --- /dev/null +++ b/dev-util/DirectXShaderCompiler/metadata.xml @@ -0,0 +1,12 @@ + + + + + denis7774@gmail.com + Denis Reva + rarogcmex + + + The DirectX Shader Compiler project includes a compiler and related tools used to compile High-Level Shader Language (HLSL) programs into DirectX Intermediate Language (DXIL) representation. Applications that make use of DirectX for graphics, games, and computation can use it to generate shader programs. + + From 53f88efa2406c4a025836264a8f7cb7cd2ee2474 Mon Sep 17 00:00:00 2001 From: Denis Reva Date: Thu, 22 Sep 2022 10:28:14 +0500 Subject: [PATCH 02/22] media-libs/amdvlk: 2022.3.4 is experimental version, still not ready Signed-off-by: Denis Reva --- media-libs/amdvlk/Manifest | 8 ++ media-libs/amdvlk/amdvlk-2021.4.2.ebuild | 28 +++--- media-libs/amdvlk/amdvlk-2022.3.4.ebuild | 117 +++++++++++++++++++++++ 3 files changed, 139 insertions(+), 14 deletions(-) create mode 100644 media-libs/amdvlk/amdvlk-2022.3.4.ebuild diff --git a/media-libs/amdvlk/Manifest b/media-libs/amdvlk/Manifest index 4aca432adf..e6a1fe5a93 100644 --- a/media-libs/amdvlk/Manifest +++ b/media-libs/amdvlk/Manifest @@ -9,10 +9,18 @@ DIST AMDVLK-v-2021.Q4.2-spvgen-0aa19873514a8272dfdc5cb8861859a52f5de503.tar.gz 2 DIST AMDVLK-v-2021.Q4.2-xgl-da1a583a51c69c115f9144b68ec2bdf5b6519056.tar.gz 960709 BLAKE2B 825e7d349da18e8a0beb42c4125bb208bd2e62780d97d5131e76e9ddc08dc6d60b2d78455aa245bb4172bb7ee7d64084307e48df2c18598cee638911fce8074c SHA512 a626459503b50a511ac04f4973036468336e9d55baecda5a84165f7209d867291ef35a9292734f38a53d13aaf70cd46fc8e3068fc3748d80278fcf3c5f8a54bb DIST AMDVLK-v-2021.Q4.2.tar.gz 30012 BLAKE2B 27d11126d54df299ce702adb7c66bd0aa8a905074dac0e2cd8560f2fa9c39deafd16885c15ae9df4f70f4008a446d8e90e1dcc50514afa7ab0a874d12b2e5334 SHA512 15fb89bb78039c36435fb9534588f08e0e0e6e6099d5e803e9bacafef8b5e81eedc19e0fcc7cd7ca7dad919397cab8b87b30b22950ae32945a5465da542d6d99 DIST AMDVLK-v-2022.Q3.1.tar.gz 30017 BLAKE2B 4abbdb709d6d61331185f7cef3e78228a9a7ad633ddf96e4ca18870fb9f7b04c1dd393864d6f85e349c56d20bffded81d95556f6625d7a8be7dc2ef6ed78de10 SHA512 e8a1662e14861fbb90ca4bad3dcff15932ce0e43b27e2fc0bfefd5f7eff359e1c46acedb6e168583646237e030da6948ef8640fe6b4ff1693f9a7ba16f1081a4 +DIST AMDVLK-v-2022.Q3.4.tar.gz 29752 BLAKE2B a20c33d06034337a1786f0701a5798416e33e008c1b3f49f069f12352647635a62053d40eafe847e8bc0b2917cc59d10fdd843b7283a229725249616c4b15bfc SHA512 cbc161d1ab88cd43fd98b7c73244f53d838935cd7255a97b5fd5b01f02c9c014f763324363f379cc1fd1cf17151955186f01b1209a880aea9e463ef5e7be3916 DIST CWPack-4f8cf0584442a91d829d269158567d7ed926f026.tar.gz 39633 BLAKE2B d5b2a88f0d563eef5beb42a8304cf6cdd825e75242c22acc360c5bb9cbd1d02a4f891b6b2f3a4803e1e6b48a4d176aad40f8bdeca92847f2fbf53674dedeaff3 SHA512 06d56baaba1f1224a5266f4a63c1abf70edba7cc16cc4e62f2f5b1ec94fc2c1cfc4c6f11a9c6ef42c23b29be8d07921caad5e919357c0bd82cf714783eee0bcc DIST CWPack-7387247eb9889ddcabbc1053b9c2052e253b088e.tar.gz 24538 BLAKE2B 76c4da32ea06df355f7e8f77a14c185b2ccab2ce2762988f04a04d65b674e089d4fc27206e744f89b4bd84c9d7226d324414a31941303290e7f574e9d64756cf SHA512 38378ef325e42a7356511c2fc06b6c896581968079e85c4b924a1768d895feecaf1eb8fd65afb59bed0f66e0547104d67c2deb9f82a86f4b9fa65b36e57cd47d DIST MetroHash-18893fb28601bb9af1154cd1a671a121fff6d8d3.tar.gz 11729 BLAKE2B b0e3de885e50c317141d62c885b421c7fd2e1ac783733704342bbed3109bff36a9209ab276f534a2231531483539221bbb1014bd39528a91124161bafc5646eb SHA512 8f12f95e80d594c8bd87a852c67a2d6777ce89d1a13e1a87ee17bbb876a0702c14ffe7a7fd65a244620f2043ad5d22ae8eb863d69f1dc5494d985733bbfb7bf9 DIST MetroHash-3c566dd9cda44ca7fd97659e0b53ac953f9037d2.tar.gz 11804 BLAKE2B 683ca8a9e4b93a945dc455c5cb78a2c6dd9dbdf22432ea9f447a6d2d1b05399cc57b621d1e304dc5695ab936a212a2df110e47ec9141764f4eaa2b184a01f4ba SHA512 ae4fcf09a097ceddfcc9f0b721cae0018fff8a0360d8fbbb195d2a8c2809cf8f3c01090ba8129593d89fe1c041224e42a49e7a1c66f20e60958a5373f6d9027f +DIST amdvlk-CWPack-4f8cf0584442a91d829d269158567d7ed926f026.tar.gz 39633 BLAKE2B d5b2a88f0d563eef5beb42a8304cf6cdd825e75242c22acc360c5bb9cbd1d02a4f891b6b2f3a4803e1e6b48a4d176aad40f8bdeca92847f2fbf53674dedeaff3 SHA512 06d56baaba1f1224a5266f4a63c1abf70edba7cc16cc4e62f2f5b1ec94fc2c1cfc4c6f11a9c6ef42c23b29be8d07921caad5e919357c0bd82cf714783eee0bcc +DIST amdvlk-MetroHash-18893fb28601bb9af1154cd1a671a121fff6d8d3.tar.gz 11729 BLAKE2B b0e3de885e50c317141d62c885b421c7fd2e1ac783733704342bbed3109bff36a9209ab276f534a2231531483539221bbb1014bd39528a91124161bafc5646eb SHA512 8f12f95e80d594c8bd87a852c67a2d6777ce89d1a13e1a87ee17bbb876a0702c14ffe7a7fd65a244620f2043ad5d22ae8eb863d69f1dc5494d985733bbfb7bf9 +DIST amdvlk-gpurt-c1df7354336aba18d54c0e32a95b58eac0d44c07.tar.gz 273130 BLAKE2B ae88ac12ab34f6f9934bb5f151812a5f4a8c055e0f3665754608344fba85c4fc2fd743eb9d770f741ebb4392b364ca8bcd57d43a35ab0710bca52c92c437f46b SHA512 078cc01979c4b8944f6a4196317ab6de7d8aea24df6b7882d258e72fbf85559a2260042eb65e82143e3af41ee154adb5fe54e767b074d46d302d82fa88fa07e4 +DIST amdvlk-llpc-58214602f9bc8583795d60c21bf2f122df02d6b5.tar.gz 2444994 BLAKE2B 941ec7e7e4538dfe84ff14382389b20757276105f6d3d1744b55beb6ab5af809a525b77be14087f28797ca5ba623e65d18fe3d6db738c1276ea7559cae6ee9cc SHA512 f27a5cc61121d61cfc58b4e0c28435d678c9dc1e0b9839462ee746ef4089d49aa599ad852b2f5df01746db38589e306fb029e098f4dd60cf74e021362c4243a2 +DIST amdvlk-llvm-project-f5023e507645c8178128891b96bf463f9a1a81a0.tar.gz 165884582 BLAKE2B d59d58ef37526690bf691f84915ab8353277c14241d097af82fddb225a37fd664c67711d572d02ab17eb9222e53d000f1e7e73a53db9afeefe65f42a705e3764 SHA512 57a48854b118a8204b06c7bd48417856708353eee36a6bdf0b7b98111a7fd5f6e6650f7a4e81d1646c6c12ba0e26bbb1fbcd2b477e17f16db35054400392b446 +DIST amdvlk-pal-9078fd5c95e2afd5331b414c07464efd37e4e0fb.tar.gz 11671512 BLAKE2B 2b796a10869cdb22b31944912866b01dfde49cf97446ab9711f98a6028caf54f7a16c88a173c57c57c5538e29d21a572852cc663b59633abc8f9aaab0e707791 SHA512 aefda31b77afdda11e8e0f8597fb159b5701a7f56f25a5b865185e81238fa45a7426af49ebfad57c0b3ec299cda417bd2a570d04e8c6f8e0d493d7c71a46bbea +DIST amdvlk-xgl-6a26878147ab246a8885ab5b4b8897626870c1cd.tar.gz 1177671 BLAKE2B 30b857230adf2174d6c51367ffb407bd347e3d8299d56e902dddc3129514376b564f48f06f4659ed558f5631d3f4c83d00d3e423f9d7aacd88578511b9c634a8 SHA512 06600624542ca549892fde15286102d8cdcbe0cb9bdba5b83da2ab19c05774b62990d73fae6a29ce623a7ce54d2bf4ab248743cbd3f41ee899bde941b71c5d79 DIST llpc-38dcb76aadf729b67cabe15c2cc07a784020f704.tar.gz 2079177 BLAKE2B eb3f594b195af82faeeb9e9f5d73cc294d8178d7390183c083b4231f17a8382f0e72480f3e883b7d3e3b1f7a654974efd4d2dec1c60f6d9ae019696f467f296a SHA512 599ea375fc87621d0085bc9a1d68f00bbde42408c1b9f745ea7da8658c041cdc24722b763e53981a2ad844efa042348be7df939cee4459503ab66d462403ce32 DIST llpc-d4763a9dcab538955bc5ad4b5c6e0139d8fe8949.tar.gz 2344266 BLAKE2B 30243cef585f77a9a7edaa162696926c5f4ee0c9612e0339b2e28d06968f57760f3ab31ddfd028bab8d0f4c78e3e46cc23a1139b244f21860af067c3a363e2af SHA512 51e17e92ab6ed9ba10d974326f9c25cd9bb994a305c781851c48cca48a868eb5977f5b733f5bd57ee22863a93a695fab2a527badf9eb46b7e16c284bdfa98b3d DIST llpc-e2d38b0c8042efbc435e51696aba5c1abd256c88.tar.gz 2091062 BLAKE2B 64dbba4f1a9c1739e56015b149143ece3795022f81eb28cb05930a1b86e505789d474ab5e6483e9700f3dba07d30a21591417564e630b2fc0e4827ab7f61a0e3 SHA512 04c3f12e6c89cae9b44703bca545e824e9f6ccb6bd88d3be80efe5edc29956fa3b8368bf79f026a691f916567f12643cf7f38a09265db656457d34600a7fe6e6 diff --git a/media-libs/amdvlk/amdvlk-2021.4.2.ebuild b/media-libs/amdvlk/amdvlk-2021.4.2.ebuild index a4b9ef85db..29a40e23e6 100644 --- a/media-libs/amdvlk/amdvlk-2021.4.2.ebuild +++ b/media-libs/amdvlk/amdvlk-2021.4.2.ebuild @@ -81,20 +81,20 @@ multilib_src_configure() { cmake_src_configure } -multilib_src_install() { - cmake_src_install - if use abi_x86_64 && multilib_is_native_abi; then - mkdir -p "${D}/usr/lib64/" - mv "${BUILD_DIR}/icd/amdvlk64.so" "${D}/usr/lib64/" - insinto /usr/share/vulkan/icd.d - doins "${S}/AMDVLK/json/Redhat/amd_icd64.json" - else - mkdir -p "${D}/usr/lib/" - mv "${BUILD_DIR}/icd/amdvlk32.so" "${D}/usr/lib/" - insinto /usr/share/vulkan/icd.d - doins "${S}/AMDVLK/json/Redhat/amd_icd32.json" - fi -} +# multilib_src_install() { +# cmake_src_install +# if use abi_x86_64 && multilib_is_native_abi; then +# mkdir -p "${D}/usr/lib64/" +# mv "${BUILD_DIR}/icd/amdvlk64.so" "${D}/usr/lib64/" +# insinto /usr/share/vulkan/icd.d +# doins "${S}/AMDVLK/json/Redhat/amd_icd64.json" +# else +# mkdir -p "${D}/usr/lib/" +# mv "${BUILD_DIR}/icd/amdvlk32.so" "${D}/usr/lib/" +# insinto /usr/share/vulkan/icd.d +# doins "${S}/AMDVLK/json/Redhat/amd_icd32.json" +# fi +# } pkg_postinst() { elog "More information about the configuration can be found here:" diff --git a/media-libs/amdvlk/amdvlk-2022.3.4.ebuild b/media-libs/amdvlk/amdvlk-2022.3.4.ebuild new file mode 100644 index 0000000000..5294089ead --- /dev/null +++ b/media-libs/amdvlk/amdvlk-2022.3.4.ebuild @@ -0,0 +1,117 @@ +# Copyright 1999-2022 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +MULTILIB_COMPAT=( abi_x86_{32,64} ) + +inherit cmake-multilib check-reqs + +DESCRIPTION="AMD Open Source Driver for Vulkan" +HOMEPAGE="https://github.com/GPUOpen-Drivers/AMDVLK" +LICENSE="MIT" +SLOT="0" +KEYWORDS="" +IUSE="wayland" +REQUIRED_USE="|| ( abi_x86_32 abi_x86_64 )" +###DEPENDS +BUNDLED_LLVM_DEPEND="sys-libs/zlib:0=[${MULTILIB_USEDEP}]" +DEPEND="wayland? ( dev-libs/wayland[${MULTILIB_USEDEP}] ) + ${BUNDLED_LLVM_DEPEND} + >=dev-util/vulkan-headers-1.3.224" +BDEPEND="${BUNDLED_LLVM_DEPEND} + dev-util/cmake" +RDEPEND=" ${DEPEND} + x11-libs/libdrm[${MULTILIB_USEDEP}] + x11-libs/libXrandr[${MULTILIB_USEDEP}] + x11-libs/libxcb[${MULTILIB_USEDEP}] + x11-libs/libxshmfence[${MULTILIB_USEDEP}] + >=media-libs/vulkan-loader-1.3.224[${MULTILIB_USEDEP}] + dev-util/glslang + dev-util/DirectXShaderCompiler" + +CHECKREQS_MEMORY="16G" +CHECKREQS_DISK_BUILD="4G" +S="${WORKDIR}" +CMAKE_USE_DIR="${S}/xgl" + +###SOURCE CODE PER_VERSION VARIABLES +FETCH_URI="https://github.com/GPUOpen-Drivers" +CORRECT_AMDVLK_PV="v-$(ver_rs 1 '.Q')" #Works only for amdvlk source code: transforming version 2019.2.2 to v-2019.Q2.2. Any other commits should be updated manually +##For those who wants update ebuild: check https://github.com/GPUOpen-Drivers/AMDVLK/blob/master/default.xml +##and place commits in the desired variables +## EXAMPLE: XGL_COMMIT="80e5a4b11ad2058097e77746772ddc9ab2118e07" +## SRC_URI="... ${FETCH_URI}/$PART/archive/$COMMIT.zip -> $PART-$COMMIT.zip ..." +XGL_COMMIT="6a26878147ab246a8885ab5b4b8897626870c1cd" +PAL_COMMIT="9078fd5c95e2afd5331b414c07464efd37e4e0fb" +LLPC_COMMIT="58214602f9bc8583795d60c21bf2f122df02d6b5" +GPURT_COMMIT="c1df7354336aba18d54c0e32a95b58eac0d44c07" +LLVM_PROJECT_COMMIT="f5023e507645c8178128891b96bf463f9a1a81a0" +METROHASH_COMMIT="18893fb28601bb9af1154cd1a671a121fff6d8d3" +CWPACK_COMMIT="4f8cf0584442a91d829d269158567d7ed926f026" +# end +SRC_URI=" ${FETCH_URI}/AMDVLK/archive/${CORRECT_AMDVLK_PV}.tar.gz -> AMDVLK-${CORRECT_AMDVLK_PV}.tar.gz +${FETCH_URI}/xgl/archive/${XGL_COMMIT}.tar.gz -> amdvlk-xgl-${XGL_COMMIT}.tar.gz +${FETCH_URI}/pal/archive/${PAL_COMMIT}.tar.gz -> amdvlk-pal-${PAL_COMMIT}.tar.gz +${FETCH_URI}/llpc/archive/${LLPC_COMMIT}.tar.gz -> amdvlk-llpc-${LLPC_COMMIT}.tar.gz +${FETCH_URI}/gpurt/archive/${GPURT_COMMIT}.tar.gz -> amdvlk-gpurt-${GPURT_COMMIT}.tar.gz +${FETCH_URI}/llvm-project/archive/${LLVM_PROJECT_COMMIT}.tar.gz -> amdvlk-llvm-project-${LLVM_PROJECT_COMMIT}.tar.gz +${FETCH_URI}/MetroHash/archive/${METROHASH_COMMIT}.tar.gz -> amdvlk-MetroHash-${METROHASH_COMMIT}.tar.gz +${FETCH_URI}/CWPack/archive/${CWPACK_COMMIT}.tar.gz -> amdvlk-CWPack-${CWPACK_COMMIT}.tar.gz" + +src_prepare() { + einfo "moving src to proper directories" + mkdir -p "${S}" + mkdir -p "${S}/third_party" + mv AMDVLK-${CORRECT_AMDVLK_PV}/ "${S}/AMDVLK" + mv xgl-${XGL_COMMIT}/ "${S}/xgl" + mv pal-${PAL_COMMIT}/ "${S}/pal" + mv llpc-${LLPC_COMMIT}/ "${S}/llpc" + mv gpurt-${GPURT_COMMIT}/ "${S}/gpurt" + mv llvm-project-${LLVM_PROJECT_COMMIT}/ "${S}/llvm-project" + mv MetroHash-${METROHASH_COMMIT}/ "${S}/third_party/metrohash" + mv CWPack-${CWPACK_COMMIT}/ "${S}/third_party/cwpack" + cmake_src_prepare +} + +multilib_src_configure() { + local mycmakeargs=( + -DBUILD_WAYLAND_SUPPORT=$(usex wayland) + ) + cmake_src_configure +} +# multilib_src_install() { +# if use abi_x86_64 && multilib_is_native_abi; then +# mkdir -p "${D}/usr/lib64/" +# cp "${BUILD_DIR}/icd/amdvlk64.so" "${D}/usr/lib64/" +# insinto /usr/share/vulkan/icd.d +# doins "${S}/build-abi_x86_64.amd64/icd/amd_icd64.json" +# insinto /usr/share/vulkan/implicit_layer.d +# doins "${S}/build-abi_x86_64.amd64/icd/amd_icd64.json" +# else +# mkdir -p "${D}/usr/lib/" +# cp "${BUILD_DIR}/icd/amdvlk32.so" "${D}/usr/lib/" +# insinto /usr/share/vulkan/icd.d +# doins "${S}/build-abi_x86_32.x86/icd/amd_icd32.json" +# insinto /usr/share/vulkan/implicit_layer.d +# doins "${S}/build-abi_x86_32.x86/icd/amd_icd32.json" +# fi +# } + +pkg_postinst() { + elog "More information about the configuration can be found here:" + elog " https://github.com/GPUOpen-Drivers/AMDVLK" + ewarn "Make sure the following line is NOT included in the any Xorg configuration section:" + ewarn "| Driver \"modesetting\"" + ewarn "and make sure you use DRI3 mode for Xorg (not revelant for wayland)" + ewarn "Else AMDVLK breaks things" + ewarn "With some games AMDVLK is still not stable. Use it at you own risk" + elog "You may want to disable default vulkan mesa provider in package.use \"media-libs/mesa -vulkan\"" + elog "or perform export in /etc/env.d/ variable VK_ICD_FILENAMES=vulkanprovidername:vulkanprovidername2 " + elog "exampe| VK_ICD_FILENAMES=\"/usr/share/vulkan/icd.d/amd_icd64.json:/usr/share/vulkan/icd.d/amd_icd64.json\"" + elog "For DXVK: use DXVK_FILTER_DEVICE_NAME= variable" + elog "" + elog "You can also use AMD_VULKAN_ICD to switch to the required driver." + elog "AMD_VULKAN_ICD=RADV application - for using radv." + elog "AMD_VULKAN_ICD=AMDVLK application - for using amdvlk." +} From 74d1ad6e9f76470bede3e8540f720b16f4ca8e08 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Leonardo=20Hern=C3=A1ndez=20Hern=C3=A1ndez?= Date: Wed, 21 Sep 2022 23:44:12 -0500 Subject: [PATCH 03/22] app-shells/zoxide: fix pre-stripped files + fix LICENSE MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Closes: https://bugs.gentoo.org/856529 Signed-off-by: Leonardo Hernández Hernández --- ...oxide-0.8.2-r1.ebuild => zoxide-0.8.2-r2.ebuild} | 12 +++++++++++- .../{zoxide-0.8.3.ebuild => zoxide-0.8.3-r1.ebuild} | 13 ++++++++++--- 2 files changed, 21 insertions(+), 4 deletions(-) rename app-shells/zoxide/{zoxide-0.8.2-r1.ebuild => zoxide-0.8.2-r2.ebuild} (93%) rename app-shells/zoxide/{zoxide-0.8.3.ebuild => zoxide-0.8.3-r1.ebuild} (91%) diff --git a/app-shells/zoxide/zoxide-0.8.2-r1.ebuild b/app-shells/zoxide/zoxide-0.8.2-r2.ebuild similarity index 93% rename from app-shells/zoxide/zoxide-0.8.2-r1.ebuild rename to app-shells/zoxide/zoxide-0.8.2-r2.ebuild index 80e44741f6..838b405caa 100644 --- a/app-shells/zoxide/zoxide-0.8.2-r1.ebuild +++ b/app-shells/zoxide/zoxide-0.8.2-r2.ebuild @@ -157,12 +157,22 @@ SRC_URI=" $(cargo_crate_uris) " -LICENSE="MIT" +LICENSE="BSD CC0-1.0 MIT + || ( Apache-2.0 Apache-2.0-with-LLVM-exceptions MIT ) + || ( Apache-2.0 BSD-2 MIT ) + || ( Apache-2.0 MIT ) + || ( MIT Unlicense ) +" SLOT="0" KEYWORDS="~amd64" QA_FLAGS_IGNORED="usr/bin/zoxide" +src_prepare() { + sed -i 's:strip = true:strip = false:g' Cargo.toml || die + default +} + src_install() { cargo_src_install diff --git a/app-shells/zoxide/zoxide-0.8.3.ebuild b/app-shells/zoxide/zoxide-0.8.3-r1.ebuild similarity index 91% rename from app-shells/zoxide/zoxide-0.8.3.ebuild rename to app-shells/zoxide/zoxide-0.8.3-r1.ebuild index 4c29612bca..67bf478a47 100644 --- a/app-shells/zoxide/zoxide-0.8.3.ebuild +++ b/app-shells/zoxide/zoxide-0.8.3-r1.ebuild @@ -109,14 +109,21 @@ SRC_URI=" $(cargo_crate_uris) " -# License set may be more restrictive as OR is not respected -# use cargo-license for a more accurate license picture -LICENSE="Apache-2.0 Apache-2.0-with-LLVM-exceptions BSD CC0-1.0 MIT Unicode-DFS-2016 Unlicense" +LICENSE="BSD CC0-1.0 MIT Unicode-DFS-2016 + || ( Apache-2.0 Apache-2.0-with-LLVM-exceptions MIT ) + || ( Apache-2.0 MIT ) + || ( MIT Unlicense ) +" SLOT="0" KEYWORDS="~amd64" QA_FLAGS_IGNORED="usr/bin/zoxide" +src_prepare() { + sed -i 's:strip = true:strip = false:g' Cargo.toml || die + default +} + src_install() { cargo_src_install From 950e0e64f3170003f2292e351725d841ac629a38 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Leonardo=20Hern=C3=A1ndez=20Hern=C3=A1ndez?= Date: Thu, 22 Sep 2022 00:10:47 -0500 Subject: [PATCH 04/22] net-mail/hydroxide: respect $(makeopts_jobs) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit and also simplify docs installing no revbump because the binary itsef doesn't change and the same files are installed Signed-off-by: Leonardo Hernández Hernández --- net-mail/hydroxide/hydroxide-0.2.23.ebuild | 8 +++----- net-mail/hydroxide/hydroxide-0.2.24.ebuild | 8 +++----- net-mail/hydroxide/hydroxide-9999.ebuild | 8 +++----- 3 files changed, 9 insertions(+), 15 deletions(-) diff --git a/net-mail/hydroxide/hydroxide-0.2.23.ebuild b/net-mail/hydroxide/hydroxide-0.2.23.ebuild index 901210cd91..e11059b9e6 100644 --- a/net-mail/hydroxide/hydroxide-0.2.23.ebuild +++ b/net-mail/hydroxide/hydroxide-0.2.23.ebuild @@ -3,7 +3,7 @@ EAPI=8 -inherit go-module +inherit go-module multiprocessing if [[ "${PV}" == "9999" ]]; then inherit git-r3 @@ -38,13 +38,11 @@ src_unpack() { } src_compile() { - ego build -v ./cmd/hydroxide + ego build -v -x -p "$(makeopts_jobs)" ./cmd/hydroxide } src_install() { - local DOCS=( "README.md" ) - einstalldocs - + default dobin "${PN}" } diff --git a/net-mail/hydroxide/hydroxide-0.2.24.ebuild b/net-mail/hydroxide/hydroxide-0.2.24.ebuild index ef3cb95b9d..f75d823e4e 100644 --- a/net-mail/hydroxide/hydroxide-0.2.24.ebuild +++ b/net-mail/hydroxide/hydroxide-0.2.24.ebuild @@ -3,7 +3,7 @@ EAPI=8 -inherit go-module +inherit go-module multiprocessing if [[ "${PV}" == "9999" ]]; then inherit git-r3 @@ -38,13 +38,11 @@ src_unpack() { } src_compile() { - ego build -v ./cmd/hydroxide + ego build -v -x -p "$(makeopts_jobs)" ./cmd/hydroxide } src_install() { - local DOCS=( "README.md" ) - einstalldocs - + default dobin "${PN}" } diff --git a/net-mail/hydroxide/hydroxide-9999.ebuild b/net-mail/hydroxide/hydroxide-9999.ebuild index ef3cb95b9d..f75d823e4e 100644 --- a/net-mail/hydroxide/hydroxide-9999.ebuild +++ b/net-mail/hydroxide/hydroxide-9999.ebuild @@ -3,7 +3,7 @@ EAPI=8 -inherit go-module +inherit go-module multiprocessing if [[ "${PV}" == "9999" ]]; then inherit git-r3 @@ -38,13 +38,11 @@ src_unpack() { } src_compile() { - ego build -v ./cmd/hydroxide + ego build -v -x -p "$(makeopts_jobs)" ./cmd/hydroxide } src_install() { - local DOCS=( "README.md" ) - einstalldocs - + default dobin "${PN}" } From a8d131e9bbcb4d4b6eb9db31216062f9243e84b7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Leonardo=20Hern=C3=A1ndez=20Hern=C3=A1ndez?= Date: Thu, 22 Sep 2022 00:25:56 -0500 Subject: [PATCH 05/22] www-apps/code-server-bin: add 4.7.0 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Leonardo Hernández Hernández --- www-apps/code-server-bin/Manifest | 2 + .../code-server-bin-4.7.0.ebuild | 127 ++++++++++++++++++ 2 files changed, 129 insertions(+) create mode 100644 www-apps/code-server-bin/code-server-bin-4.7.0.ebuild diff --git a/www-apps/code-server-bin/Manifest b/www-apps/code-server-bin/Manifest index adf420fc65..5bbdae39c3 100644 --- a/www-apps/code-server-bin/Manifest +++ b/www-apps/code-server-bin/Manifest @@ -2,3 +2,5 @@ DIST code-server-4.5.1-linux-amd64.tar.gz 99839294 BLAKE2B a72b14b8647b8814d4c79 DIST code-server-4.5.1-linux-arm64.tar.gz 90931432 BLAKE2B 829c405c4b47339dad4bcc883433716e2f2da2b64e90b461fa8fb12f61414768a0705624c01f1eb13fc984a09fe1d8ce15c36aefd33afcd8406af7688d58a552 SHA512 91f1554c0505eefc717ea6f479fa6d7560c1abd121934842e333775d0a01a205dea203914d223a8c4ea69edd65203a557243e4a4fe040e0833531e77a31e5398 DIST code-server-4.6.1-linux-amd64.tar.gz 98908844 BLAKE2B 7ca74733578b8f2fcfbc395a2fd385511b23ebced014f024904e1bf29dfa48f0ac7295746f61ea3a9d8cafa13e2b9072d48062f753ffab4f95470b868958d5e7 SHA512 d4bf2cbc06cdf6fe387758a6968bb4db375745f24c32c7b1f5ad199295fb363b83a071d6de78f55f117e20e78287274a0ab7b654b03454ed3056e4ea4cbefb2d DIST code-server-4.6.1-linux-arm64.tar.gz 89823651 BLAKE2B 1795c6d7f3198f26a5f8567fe00c59e01f6bc9dd1230e74672671399d3ee9d2566ae73711ae30fdece51a387c4d5cfe3738ade6705b91610da67fabc7adcc6fc SHA512 36c3d102c5fdf09c1ce8e22edc10464c6f9b6915572a7ce8b9c50a77f77489a5ba89e050f204383375d04772f7ebce6dde5d6914c3d769af8f7e4d2e53831b0c +DIST code-server-4.7.0-linux-amd64.tar.gz 103853310 BLAKE2B a6435b233f2d5aeebe6a5c057f5e98e1c66496c380c60b59ba69eaef17e5dfb84f169dbbd99baac26936dc2de7055dae906436c77311118562eaed96907688fe SHA512 2e07c6e55625a17538a9cde29065196b0c065b9791dc56a76e24bdb5a2eec11133b7f1f8d8fce512da3dc8dda69cea31572d3d16b0472123892165ed4327449b +DIST code-server-4.7.0-linux-arm64.tar.gz 94759564 BLAKE2B aa012c85cab9736b9dbf0d8c6780b0141a08d5b41a6a3db38a14ab84c16562ee710d3c42851c59ea3d2c0d9548182df8ade7b72b8d513663db63cad2d7f81d23 SHA512 282eb625a728b5573efaec720d44b0b1871779444cb771346dea2b46f1e77adf58aedbb3cc517fd9f49740ef552ed6357de04aabab38d7f3dc70f3361da45d37 diff --git a/www-apps/code-server-bin/code-server-bin-4.7.0.ebuild b/www-apps/code-server-bin/code-server-bin-4.7.0.ebuild new file mode 100644 index 0000000000..69c4e9ff66 --- /dev/null +++ b/www-apps/code-server-bin/code-server-bin-4.7.0.ebuild @@ -0,0 +1,127 @@ +# Copyright 1999-2022 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +MY_PN="${PN/-bin/}" +MY_P="${MY_PN}-${PV}" +BASE_URI="https://github.com/coder/${MY_PN}/releases/download/v${PV}/${MY_P}-linux" + +inherit systemd + +DESCRIPTION="VS Code in the browser (binary version with unbundled node and ripgrep)" +HOMEPAGE="https://coder.com/" +SRC_URI=" + amd64? ( ${BASE_URI}-amd64.tar.gz ) + arm64? ( ${BASE_URI}-arm64.tar.gz ) +" +RESTRICT="test" +LICENSE="MIT 0BSD ISC PYTHON BSD-2 BSD Apache-2.0 Unlicense LGPL-2.1+ + || ( BSD-2 MIT Apache-2.0 ) + || ( MIT WTFPL ) + || ( BSD GPL-2 ) +" +SLOT="0" +KEYWORDS="~amd64 ~arm64" +IUSE="gnome-keyring" + +RDEPEND=" + ${DEPEND} + >=net-libs/nodejs-16.0.0[ssl] + sys-apps/ripgrep + gnome-keyring? ( + app-crypt/libsecret + ) +" + +S="${WORKDIR}/${MY_P}-linux-${ARCH}" + +PATCHES=( "${FILESDIR}/${PN}-node.patch" ) + +DOCS=( "LICENSE" "README.md" "ThirdPartyNotices.txt" ) + +# Relative +VSCODE_MODULES="lib/vscode/node_modules" + +QA_PREBUILT=" + opt/${PN}/lib/coder-cloud-agent + opt/${PN}/node_modules/argon2/lib/binding/napi-v3/argon2.node + opt/${PN}/node_modules/argon2/build-tmp-napi-v3/Release/argon2.node + opt/${PN}/node_modules/argon2/build-tmp-napi-v3/Release/obj.target/argon2.node + opt/${PN}/node_modules/@node-rs/argon2-linux-x64-musl/argon2.linux-x64-musl.node + opt/${PN}/node_modules/@node-rs/argon2-linux-x64-gnu/argon2.linux-x64-gnu.node + opt/${PN}/${VSCODE_MODULES}/native-is-elevated/build/Release/obj.target/iselevated.node + opt/${PN}/${VSCODE_MODULES}/native-is-elevated/build/Release/iselevated.node + opt/${PN}/${VSCODE_MODULES}/node-pty/build/Release/pty.node + opt/${PN}/${VSCODE_MODULES}/native-watchdog/build/Release/obj.target/watchdog.node + opt/${PN}/${VSCODE_MODULES}/native-watchdog/build/Release/watchdog.node + opt/${PN}/${VSCODE_MODULES}/@parcel/watcher/prebuilds/linux-x64/node.napi.musl.node + opt/${PN}/${VSCODE_MODULES}/@parcel/watcher/prebuilds/linux-x64/node.napi.glibc.node + opt/${PN}/${VSCODE_MODULES}/spdlog/build/Release/obj.target/spdlog.node + opt/${PN}/${VSCODE_MODULES}/spdlog/build/Release/spdlog.node + opt/${PN}/${VSCODE_MODULES}/vscode-nsfw/build/Release/obj.target/nsfw.node + opt/${PN}/${VSCODE_MODULES}/vscode-nsfw/build/Release/nsfw.node + opt/${PN}/${VSCODE_MODULES}/@vscode/sqlite3/build/Release/obj.target/sqlite.node + opt/${PN}/${VSCODE_MODULES}/@vscode/sqlite3/build/Release/sqlite.node + opt/${PN}/${VSCODE_MODULES}/@parcel/watcher/build/Release/watcher.node + opt/${PN}/${VSCODE_MODULES}/@parcel/watcher/build/Release/obj.target/watcher.node +" + +QA_PRESTRIPPED=" + opt/${PN}/node_modules/@node-rs/argon2-linux-x64-musl/argon2.linux-x64-musl.node + opt/${PN}/${VSCODE_MODULES}/@parcel/watcher/prebuilds/linux-x64/node.napi.musl.node + opt/${PN}/${VSCODE_MODULES}/@parcel/watcher/prebuilds/linux-x64/node.napi.glibc.node +" + +src_prepare() { + default + + # We remove as much precompiled code as we can, + # node modules not written in JS cannot be removed + # thus "-bin". + + # use system node + rm ./node ./lib/node \ + || die "Failed to remove bundled nodejs" + + # remove bundled ripgrep binary + rm ./"${VSCODE_MODULES}"/@vscode/ripgrep/bin/rg \ + || die "Failed to remove bundled ripgrep" + + # not needed + rm ./code-server || die + rm ./postinstall.sh || die + + # For windows + rm -r ./"${VSCODE_MODULES}"/@parcel/watcher/prebuilds/win32-x64 || die + + if [[ $ELIBC != "musl" ]]; then + rm ./"${VSCODE_MODULES}"/@parcel/watcher/prebuilds/linux-x64/node.napi.musl.node || die + elif [[ $ELIBC != "glibc" ]]; then + rm ./"${VSCODE_MODULES}"/@parcel/watcher/prebuilds/linux-x64/node.napi.glibc.node || die + rm ./"${VSCODE_MODULES}"/@parcel/watcher/prebuilds/darwin-x64/node.napi.glibc.node || die + rm ./"${VSCODE_MODULES}"/@parcel/watcher/prebuilds/darwin-arm64/node.napi.glibc.node || die + fi + + rm -r ./lib/vscode/extensions/node_modules/.bin || die +} + +src_install() { + einstalldocs + + insinto "/opt/${PN}" + doins -r . + fperms +x "/opt/${PN}/bin/${MY_PN}" + dosym -r "/opt/${PN}/bin/${MY_PN}" "/opt/${PN}/bin/${PN}" + dosym -r "/opt/${PN}/bin/${PN}" "${EPREFIX}/usr/bin/${PN}" + + dosym -r "/usr/bin/rg" \ + "${EPREFIX}/opt/${PN}/${VSCODE_MODULES}/@vscode/ripgrep/bin/rg" + + systemd_douserunit "${FILESDIR}/${PN}.service" +} + +pkg_postinst() { + elog "When using code-server systemd service run it as a user" + elog "For example: 'systemctl --user enable --now code-server'" +} From d1a59f75541fc4aa41e9cf8d89a03bd172c4b47e Mon Sep 17 00:00:00 2001 From: "Ronny (tastytea) Gutbrod" Date: Thu, 22 Sep 2022 12:10:40 +0200 Subject: [PATCH 06/22] app-editors/imhex: die early if gcc is too old Signed-off-by: Ronny (tastytea) Gutbrod --- app-editors/imhex/imhex-1.22.0-r1.ebuild | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/app-editors/imhex/imhex-1.22.0-r1.ebuild b/app-editors/imhex/imhex-1.22.0-r1.ebuild index 6d16b8837d..6e5fb12bb7 100644 --- a/app-editors/imhex/imhex-1.22.0-r1.ebuild +++ b/app-editors/imhex/imhex-1.22.0-r1.ebuild @@ -7,7 +7,7 @@ CMAKE_BUILD_TYPE="Release" CMAKE_MAKEFILE_GENERATOR="emake" PYTHON_COMPAT=( python3_{8..11} ) -inherit cmake desktop llvm python-r1 xdg +inherit cmake desktop llvm python-r1 toolchain-funcs xdg DESCRIPTION="A hex editor for reverse engineers, programmers, and eyesight" HOMEPAGE="https://github.com/WerWolv/ImHex" @@ -51,6 +51,12 @@ BDEPEND=" sys-devel/llvm " +pkg_pretend() { + if tc-is-gcc && [[ $(gcc-major-version) -lt 12 ]]; then + die "${PN} requires GCC 12 or newer" + fi +} + src_prepare() { default # Due to network sandboxing, we can't do network test here. From e71c62eb4a3673afec807ee5c6365d983e6af605 Mon Sep 17 00:00:00 2001 From: Nicola Smaniotto Date: Thu, 22 Sep 2022 16:03:23 +0200 Subject: [PATCH 07/22] net-voip/discover-overlay: add 0.6.3, drop 0.6.2 Signed-off-by: Nicola Smaniotto --- net-voip/discover-overlay/Manifest | 2 +- ...cover-overlay-0.6.2.ebuild => discover-overlay-0.6.3.ebuild} | 0 2 files changed, 1 insertion(+), 1 deletion(-) rename net-voip/discover-overlay/{discover-overlay-0.6.2.ebuild => discover-overlay-0.6.3.ebuild} (100%) diff --git a/net-voip/discover-overlay/Manifest b/net-voip/discover-overlay/Manifest index 51780fa0fa..880f49340c 100644 --- a/net-voip/discover-overlay/Manifest +++ b/net-voip/discover-overlay/Manifest @@ -1,3 +1,3 @@ DIST discover-overlay-0.4.5.tar.gz 76114 BLAKE2B c0c735cea547374f6f7338e09954930a105fc883ea9faa1f4e457800636694d47988726884360643eab9de0df2786ef1242fa036df15896301a48f0f2e684312 SHA512 6a7121c0923a68bf6b278b6985a82a3bba98b155c8812056cc0532961cb54ee5045c1279a32fdde8708a15f444d2a2ba0afdeea61f79a89cc542b3a1d5b2aed4 DIST discover-overlay-0.5.4.tar.gz 87273 BLAKE2B bb34ec75f575aadc1ede2ebc7118026bdc47c3c5f0a13a994e28811e6765c3f375c45b941f99aa72b7e779e5d0e94915089d4c8a8f2b7a262723e09d3032813b SHA512 8e1893636063b741335c19438a85c65353b0ea82269de8deb342a3537016b3324d3a8549dd6f7d08a029512d4a34870bfb4ef88e57bd2a32be7766536f6b2040 -DIST discover-overlay-0.6.2.tar.gz 95583 BLAKE2B abfe77a8bc449089be1c50b731159db89c34f6c31a8744070ac52385ca7a0a5e4c9deba21152cecdcab3a6b3277fa3fae5d47468d252030c909f1f4d8ae34f34 SHA512 a2290e8aeabd30cccf0873111a674f8be6675edaa9844557785490a9eb6df440af770ab5c346ace5788e236d53443fbbf984ea039fe17c472deba6ef836b62cc +DIST discover-overlay-0.6.3.tar.gz 95647 BLAKE2B a822a2cdd511b82e6c6e0ddee23c90d553b04a562d6e75c8024a57e11482af482cc26b3863508b8857896c3cae85287412234b16ac248ae8dbf9cc0483778f52 SHA512 49ca7ddfb292c7a16e0f6dd08b3703ea9024c10f2ac870ab84be8adf0795ea17b7388af67c31ff1119f243c5639b2efae764892fbb51ed6202df52ee2ec23892 diff --git a/net-voip/discover-overlay/discover-overlay-0.6.2.ebuild b/net-voip/discover-overlay/discover-overlay-0.6.3.ebuild similarity index 100% rename from net-voip/discover-overlay/discover-overlay-0.6.2.ebuild rename to net-voip/discover-overlay/discover-overlay-0.6.3.ebuild From e026eefdc53b012f50afca655b1f61df168468a4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Efe=20=C4=B0zbudak?= Date: Thu, 22 Sep 2022 11:48:36 -0400 Subject: [PATCH 08/22] gui-apps/someblocks: respect CFLAGS MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Closes: https://bugs.gentoo.org/870754 Signed-off-by: Efe İzbudak --- gui-apps/someblocks/someblocks-1.0.0.ebuild | 2 ++ 1 file changed, 2 insertions(+) diff --git a/gui-apps/someblocks/someblocks-1.0.0.ebuild b/gui-apps/someblocks/someblocks-1.0.0.ebuild index 880ff5a6ac..ef03442793 100644 --- a/gui-apps/someblocks/someblocks-1.0.0.ebuild +++ b/gui-apps/someblocks/someblocks-1.0.0.ebuild @@ -19,6 +19,8 @@ BDEPEND="" src_prepare() { default + sed -i -e 's:$(LDFLAGS):$(CPPFLAGS) $(CFLAGS) $(LDFLAGS):' Makefile \ + || die "sed fix failed. Uh-oh..." restore_config blocks.h } From 51c6c2d8ea8f87897e3b4945d45964bde50bc2fa Mon Sep 17 00:00:00 2001 From: Adrian Schollmeyer Date: Thu, 22 Sep 2022 18:59:32 +0200 Subject: [PATCH 09/22] app-vim/ansible-vim: new package, add 3.2 Signed-off-by: Adrian Schollmeyer --- app-vim/ansible-vim/Manifest | 1 + app-vim/ansible-vim/ansible-vim-3.2.ebuild | 20 ++++++++++++++++++++ app-vim/ansible-vim/metadata.xml | 8 ++++++++ 3 files changed, 29 insertions(+) create mode 100644 app-vim/ansible-vim/Manifest create mode 100644 app-vim/ansible-vim/ansible-vim-3.2.ebuild create mode 100644 app-vim/ansible-vim/metadata.xml diff --git a/app-vim/ansible-vim/Manifest b/app-vim/ansible-vim/Manifest new file mode 100644 index 0000000000..4a86b00a62 --- /dev/null +++ b/app-vim/ansible-vim/Manifest @@ -0,0 +1 @@ +DIST ansible-vim-3.2.tar.gz 12116 BLAKE2B e532b348216f3616060b9e09d177d601534c37eda1305512309954e0480e2827bd6f2d40564151104184a389c495b2442264f34d5b8031a1023ddd093cdd1be6 SHA512 a75e8b149befb001fdb0012ea8219287a6b4c302e2ae2de456835c48e3a516bb99bfb91a21e2d60eff12b5a24d918510dd9302d93e0bf43cb42f025ea0504d1b diff --git a/app-vim/ansible-vim/ansible-vim-3.2.ebuild b/app-vim/ansible-vim/ansible-vim-3.2.ebuild new file mode 100644 index 0000000000..9229487934 --- /dev/null +++ b/app-vim/ansible-vim/ansible-vim-3.2.ebuild @@ -0,0 +1,20 @@ +# Copyright 2022 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +VIM_PLUGIN_VIM_VERSION="7.0" +inherit vim-plugin + +DESCRIPTION="vim plugin: sytax highlighting for Ansible's common file types" +HOMEPAGE="https://github.com/pearofducks/ansible-vim" +SRC_URI="https://github.com/pearofducks/ansible-vim/archive/refs/tags/${PV}.tar.gz -> ${P}.tar.gz" + +LICENSE="MIT BSD" +KEYWORDS="~amd64" + +src_install() { + vim-plugin_src_install + + find "${ED}" -name "*LICENSE" -delete || die +} diff --git a/app-vim/ansible-vim/metadata.xml b/app-vim/ansible-vim/metadata.xml new file mode 100644 index 0000000000..f384473e1c --- /dev/null +++ b/app-vim/ansible-vim/metadata.xml @@ -0,0 +1,8 @@ + + + + + Adrian Schollmeyer + nex+b-g-o@nexadn.de + + From bc19d08e7c27dca83acd3e67b265de4fc355c179 Mon Sep 17 00:00:00 2001 From: Anthony Ruhier Date: Fri, 23 Sep 2022 02:03:58 +0200 Subject: [PATCH 10/22] gui-apps/swaync: add 0.7.2, drop 0.7.1 Signed-off-by: Anthony Ruhier v0.7.2 fixes crashes with glib 2.74 --- gui-apps/swaync/Manifest | 2 +- gui-apps/swaync/{swaync-0.7.1.ebuild => swaync-0.7.2.ebuild} | 0 2 files changed, 1 insertion(+), 1 deletion(-) rename gui-apps/swaync/{swaync-0.7.1.ebuild => swaync-0.7.2.ebuild} (100%) diff --git a/gui-apps/swaync/Manifest b/gui-apps/swaync/Manifest index 5cbf01106f..0450cc6799 100644 --- a/gui-apps/swaync/Manifest +++ b/gui-apps/swaync/Manifest @@ -1 +1 @@ -DIST swaync-0.7.1.tar.gz 3152621 BLAKE2B d3e0939054c62a5a0853d567bac4835904ecbfcf1bb250c940c94eddcf1eb565d18bff01a46d4b5d98b5fa933c0934768b19c675d1cac5b12428dd72958e0e7d SHA512 02f655f2faa7055332b44a8d7113c7019f280a0dcd1aedcba6e2dbf15a1661fd6b71b8307e3874e2909437b678cc8c7a3fc5fc3f18c8b43210078fc46ccd98c8 +DIST swaync-0.7.2.tar.gz 3153294 BLAKE2B 0c53a2e3dbecb60ee85a04fbbc3010c473a827842c2e144deca017b4f910924bce14b1332c4c3de77d39d798c25901717f2568511cfe9708724985d95b29e2a5 SHA512 be4ac254755959aa20d70526aa78cc00e88df19efe4b6380efedc7d0eda6f792631ddd33cc460c1f295efcbe8dd7913a928acf8e4a18f60fb8132451b2dab374 diff --git a/gui-apps/swaync/swaync-0.7.1.ebuild b/gui-apps/swaync/swaync-0.7.2.ebuild similarity index 100% rename from gui-apps/swaync/swaync-0.7.1.ebuild rename to gui-apps/swaync/swaync-0.7.2.ebuild From cef0b19b7b9a6f31c7a3a770197cf023a6d0b867 Mon Sep 17 00:00:00 2001 From: Big Pineapple Date: Fri, 23 Sep 2022 10:59:42 +0800 Subject: [PATCH 11/22] games-action/ddnet: add 16.4, drop 16.3.2 Signed-off-by: Big Pineapple --- games-action/ddnet/Manifest | 2 +- games-action/ddnet/{ddnet-16.3.2.ebuild => ddnet-16.4.ebuild} | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) rename games-action/ddnet/{ddnet-16.3.2.ebuild => ddnet-16.4.ebuild} (96%) diff --git a/games-action/ddnet/Manifest b/games-action/ddnet/Manifest index 310cba6174..3efea23921 100644 --- a/games-action/ddnet/Manifest +++ b/games-action/ddnet/Manifest @@ -1 +1 @@ -DIST ddnet-16.3.2.tar.gz 35885532 BLAKE2B 9ba13ef9bf6f31cd1084a88a4156db5abb5163e3566201f94872b9a32ed94750d356f5209e62fb4d98272164816b66d48d34415f978188212db044fcc157375b SHA512 6ddfb80f742d674a87d4953aab708e05d4efce2758dd91a1366454a799d10b607a2b3beba75d1104b49870cc4ebdbb3631478c11403a14cf7f9507666741169b +DIST ddnet-16.4.tar.gz 35885750 BLAKE2B 0ed16b83f1b4327f3bac0687372bdcdf362385ac5e553ab62c0bf80e853a0f3a3dee46e3a114b61e462de60794b7e08c77d9000eba31bba867c73612e68e5c64 SHA512 a1215f052a42e346510c2303dcf008f00b78bd99fa869ff65b8383c473c3d09fd53066264ba826f0a4462232f9ad860792a1d5f8fd96417d3118f311e527070d diff --git a/games-action/ddnet/ddnet-16.3.2.ebuild b/games-action/ddnet/ddnet-16.4.ebuild similarity index 96% rename from games-action/ddnet/ddnet-16.3.2.ebuild rename to games-action/ddnet/ddnet-16.4.ebuild index 8f3b5f9c0f..03ca0306cd 100644 --- a/games-action/ddnet/ddnet-16.3.2.ebuild +++ b/games-action/ddnet/ddnet-16.4.ebuild @@ -8,7 +8,7 @@ PYTHON_COMPAT=( python3_{9..11} ) inherit cmake python-any-r1 xdg DESCRIPTION="DDraceNetwork, a cooperative racing mod of Teeworlds " -HOMEPAGE="https://ddnet.tw/ +HOMEPAGE="https://ddnet.org/ https://github.com/ddnet/ddnet" SRC_URI="https://github.com/ddnet/ddnet/archive/refs/tags/${PV}.tar.gz -> ${P}.tar.gz" @@ -50,7 +50,7 @@ DEPEND=" " RDEPEND="${DEPEND}" BDEPEND=" - >=dev-lang/python-3.8:3.8 + >=dev-lang/python-3.9 dev-util/cmake dev-util/glslang dev-util/spirv-tools From bf6f782336f42305c3410009e9801d097595cb19 Mon Sep 17 00:00:00 2001 From: Samuel Bauer Date: Fri, 23 Sep 2022 06:20:32 +0200 Subject: [PATCH 12/22] games-emulation/citra: updates Signed-off-by: Samuel Bauer --- games-emulation/citra/citra-9999.ebuild | 32 ++++++++++++++++--------- 1 file changed, 21 insertions(+), 11 deletions(-) diff --git a/games-emulation/citra/citra-9999.ebuild b/games-emulation/citra/citra-9999.ebuild index d5e0f2d1b8..4f7d825b20 100644 --- a/games-emulation/citra/citra-9999.ebuild +++ b/games-emulation/citra/citra-9999.ebuild @@ -9,7 +9,7 @@ DESCRIPTION="A Nintendo 3DS Emulator" HOMEPAGE="https://citra-emu.org" EGIT_REPO_URI="https://github.com/citra-emu/citra" EGIT_SUBMODULES=( - 'discord-rpc' 'dynarmic' 'libyuv' + 'catch2' 'discord-rpc' 'dynarmic' 'fmt' 'libyuv' 'lodepng' 'nihstro' 'soundtouch' 'xbyak' ) @@ -18,7 +18,7 @@ SLOT="0" KEYWORDS="" IUSE="cubeb +hle-sound nls +qt5 sdl system-libfmt +telemetry video" -DEPEND=" +RDEPEND=" cubeb? ( media-libs/cubeb ) !hle-sound? ( media-libs/fdk-aac ) hle-sound? ( media-video/ffmpeg[fdk] ) @@ -43,13 +43,15 @@ DEPEND=" net-libs/enet:1.3= virtual/libusb:1 " -RDEPEND="${DEPEND} +DEPEND="${RDEPEND} + dev-cpp/cpp-httplib + dev-cpp/cpp-jwt dev-cpp/robin-map" REQUIRED_USE="|| ( qt5 sdl )" src_unpack() { - if ! use system-libfmt; then - EGIT_SUBMODULES+=( 'fmt' ) + if use system-libfmt; then + EGIT_SUBMODULES+=( '-fmt' ) fi git-r3_src_unpack @@ -122,12 +124,7 @@ src_prepare() { src/core/CMakeLists.txt || die sed -i -e '/cryptopp/d' externals/CMakeLists.txt || die - # Unbundle catch - sed -i -e '1ifind_package(Catch2)' src/tests/CMakeLists.txt externals/dynarmic/tests/CMakeLists.txt || die - sed -i -e '/target_link_libraries/s/catch/Catch2::Catch2/' externals/dynarmic/tests/CMakeLists.txt || die - sed -i -e '/target_link_libraries/s/catch-single-include/Catch2::Catch2/' src/tests/CMakeLists.txt || die - sed -i -e '/catch/d' externals/CMakeLists.txt externals/dynarmic/externals/CMakeLists.txt || die - grep -rl 'include ' externals/dynarmic | xargs sed -i -e '/include/s:catch.hpp:catch/&:' || die + # Unbundle catch -- Wait for catch>=3 # Unbundle cubeb sed -i -e '/CUBEB/,/endif()/d' externals/CMakeLists.txt || die @@ -135,6 +132,18 @@ src_prepare() { sed -i -e '$afind_package(cubeb REQUIRED)\n' CMakeLists.txt || die fi + # Unbundle cpp-httplib + sed -i -e '/# httplib/,/target_link_libraries(httplib/d' externals/CMakeLists.txt || die + sed -i -e 's/ httplib//' src/{web_service,network,core}/CMakeLists.txt || die + + # Unbundle cpp-jwt + sed -i -e '/# cpp-jwt/,/CPP_JWT_USE_VENDORED_NLOHMANN_JSON/d' externals/CMakeLists.txt || die + sed -i -e 's/ cpp-jwt//' src/web_service/CMakeLists.txt || die + + # Alias for sdl + #sed -i -e '/find_package(SDL2/aadd_library(SDL2::SDL2 ALIAS SDL2)' CMakeLists.txt || die + sed -i -e '/find_package(SDL2/aadd_library(SDL2 INTERFACE)\ntarget_link_libraries(SDL2 INTERFACE "${SDL2_LIBRARY}")\ntarget_include_directories(SDL2 INTERFACE "${SDL2_INCLUDE_DIR}")\nadd_library(SDL2::SDL2 ALIAS SDL2)\n' CMakeLists.txt || die + # TODO unbundle xbyak (wait for 5.96 in ytree) cmake_src_prepare } @@ -151,6 +160,7 @@ src_configure() { -DENABLE_WEB_SERVICE=$(usex telemetry) -DGENERATE_QT_TRANSLATION=$(use qt5 && usex nls || echo OFF) -DUSE_SYSTEM_BOOST=ON + -DUSE_SYSTEM_SDL2=ON ) cmake_src_configure From 49e1aaf7381546316aa97e80be918015c38489b6 Mon Sep 17 00:00:00 2001 From: Samuel Bauer Date: Fri, 23 Sep 2022 07:08:16 +0200 Subject: [PATCH 13/22] citra-9999.ebuild Signed-off-by: Samuel Bauer --- games-emulation/citra/citra-9999.ebuild | 1 - 1 file changed, 1 deletion(-) diff --git a/games-emulation/citra/citra-9999.ebuild b/games-emulation/citra/citra-9999.ebuild index 4f7d825b20..58fda2f5a4 100644 --- a/games-emulation/citra/citra-9999.ebuild +++ b/games-emulation/citra/citra-9999.ebuild @@ -141,7 +141,6 @@ src_prepare() { sed -i -e 's/ cpp-jwt//' src/web_service/CMakeLists.txt || die # Alias for sdl - #sed -i -e '/find_package(SDL2/aadd_library(SDL2::SDL2 ALIAS SDL2)' CMakeLists.txt || die sed -i -e '/find_package(SDL2/aadd_library(SDL2 INTERFACE)\ntarget_link_libraries(SDL2 INTERFACE "${SDL2_LIBRARY}")\ntarget_include_directories(SDL2 INTERFACE "${SDL2_INCLUDE_DIR}")\nadd_library(SDL2::SDL2 ALIAS SDL2)\n' CMakeLists.txt || die # TODO unbundle xbyak (wait for 5.96 in ytree) From f6728d255deacd20d55d23071df8812ef760cdc8 Mon Sep 17 00:00:00 2001 From: Patrick Zwerschke Date: Fri, 23 Sep 2022 16:00:55 +0200 Subject: [PATCH 14/22] app-misc/ledger-live: add missing dependency Signed-off-by: Patrick Zwerschke --- app-misc/ledger-live/ledger-live-2.43.1.ebuild | 2 +- app-misc/ledger-live/ledger-live-2.46.2.ebuild | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/app-misc/ledger-live/ledger-live-2.43.1.ebuild b/app-misc/ledger-live/ledger-live-2.43.1.ebuild index a6ad3d63bb..8f4330b5c8 100644 --- a/app-misc/ledger-live/ledger-live-2.43.1.ebuild +++ b/app-misc/ledger-live/ledger-live-2.43.1.ebuild @@ -13,7 +13,7 @@ KEYWORDS="~amd64" IUSE="" DEPEND="" -RDEPEND="${DEPEND}" +RDEPEND="sys-fs/fuse:0" RESTRICT="binchecks strip" diff --git a/app-misc/ledger-live/ledger-live-2.46.2.ebuild b/app-misc/ledger-live/ledger-live-2.46.2.ebuild index 839209abb1..d6893c4858 100644 --- a/app-misc/ledger-live/ledger-live-2.46.2.ebuild +++ b/app-misc/ledger-live/ledger-live-2.46.2.ebuild @@ -13,7 +13,7 @@ KEYWORDS="~amd64" IUSE="" DEPEND="" -RDEPEND="${DEPEND}" +RDEPEND="sys-fs/fuse:0" RESTRICT="binchecks strip" From 32d51f255e8c654c9d1e65e6e1db3bd0ba147b9f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Micha=C5=82=20G=C3=B3rny?= Date: Fri, 23 Sep 2022 18:42:41 +0200 Subject: [PATCH 15/22] dev-python/keyrings-alt: Remove, it's now in ::gentoo MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Michał Górny --- dev-python/keyrings-alt/Manifest | 1 - .../keyrings-alt/keyrings-alt-4.1.2.ebuild | 34 ------------------- dev-python/keyrings-alt/metadata.xml | 12 ------- 3 files changed, 47 deletions(-) delete mode 100644 dev-python/keyrings-alt/Manifest delete mode 100644 dev-python/keyrings-alt/keyrings-alt-4.1.2.ebuild delete mode 100644 dev-python/keyrings-alt/metadata.xml diff --git a/dev-python/keyrings-alt/Manifest b/dev-python/keyrings-alt/Manifest deleted file mode 100644 index 893bfa4be8..0000000000 --- a/dev-python/keyrings-alt/Manifest +++ /dev/null @@ -1 +0,0 @@ -DIST keyrings-alt-4.1.2.gh.tar.gz 26661 BLAKE2B 14d0f0647441dbf74c7378c7546becbc800dc0b1693b5569261283c355dd41d3afcbb600e559b3c921395e13382dcef5de23a8b60bdf0f2db7b71902fbba5fe8 SHA512 a4c46f8a61bef65c6962ca78d0176a937a8267cdd10d9195b1d313fd4a6653cf3b736c0fcfe8cd40d73e6e69c1ff23a1e6550624cbdf5a8a94a299ce597aa61d diff --git a/dev-python/keyrings-alt/keyrings-alt-4.1.2.ebuild b/dev-python/keyrings-alt/keyrings-alt-4.1.2.ebuild deleted file mode 100644 index 60328568f6..0000000000 --- a/dev-python/keyrings-alt/keyrings-alt-4.1.2.ebuild +++ /dev/null @@ -1,34 +0,0 @@ -# Copyright 2021-2022 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -DISTUTILS_USE_PEP517=setuptools -PYTHON_COMPAT=( python3_{8..11} ) -inherit distutils-r1 - -MY_PN=${PN/-/.} -DESCRIPTION="Alternate keyring backend implementations for use with the keyring package" -HOMEPAGE=" - https://github.com/jaraco/keyrings.alt - https://pypi.org/project/keyrings.alt/ -" -SRC_URI="https://github.com/jaraco/${MY_PN}/archive/refs/tags/v${PV}.tar.gz -> ${P}.gh.tar.gz" - -LICENSE="MIT" -SLOT="0" -KEYWORDS="~amd64 ~x86" - -RDEPEND=" - dev-python/jaraco-classes[${PYTHON_USEDEP}] - dev-python/keyring[${PYTHON_USEDEP}] -" - -distutils_enable_tests pytest -# dev-python/jaraco-packaging removed, cannot build docs - -pkg_setup() { - export SETUPTOOLS_SCM_PRETEND_VERSION=${PV} -} - -S="${WORKDIR}/${MY_PN}-${PV}" diff --git a/dev-python/keyrings-alt/metadata.xml b/dev-python/keyrings-alt/metadata.xml deleted file mode 100644 index 700850bcec..0000000000 --- a/dev-python/keyrings-alt/metadata.xml +++ /dev/null @@ -1,12 +0,0 @@ - - - - - ceamac.paragon@gmail.com - Primary maintainer - - - jaraco/keyrings.alt - keyrings.alt - - From 7b2cd99983dd4920f3eb180fdc3b0417dfbc3cc5 Mon Sep 17 00:00:00 2001 From: Patrick Zwerschke Date: Sun, 25 Sep 2022 00:56:26 +0200 Subject: [PATCH 16/22] app-misc/ledger-live: add 2.47.0 Signed-off-by: Patrick Zwerschke --- app-misc/ledger-live/Manifest | 1 + .../ledger-live/ledger-live-2.47.0.ebuild | 25 +++++++++++++++++++ 2 files changed, 26 insertions(+) create mode 100644 app-misc/ledger-live/ledger-live-2.47.0.ebuild diff --git a/app-misc/ledger-live/Manifest b/app-misc/ledger-live/Manifest index 4c5a1982b3..9199fe8d52 100644 --- a/app-misc/ledger-live/Manifest +++ b/app-misc/ledger-live/Manifest @@ -1,2 +1,3 @@ DIST ledger-live-desktop-2.43.1-linux-x86_64.AppImage 108981264 BLAKE2B aa14b1087ffffbf623b9e78a41e005ef93d0a62dd29d9112becbd380809d00ec3978bba4b4364eccd9e2775da1f6b979035685885a9c35845b224b10a7525699 SHA512 738254ea939772bcbe0bd9dcaf2e7698477a88e830cba6e362a937038510263b221b06f7fd1211bdbe186e855e355bc2dd8b60ed404a10d89ee6258733a64726 DIST ledger-live-desktop-2.46.2-linux-x86_64.AppImage 108909081 BLAKE2B ec1c4031dff8209a3d4885fd972781248ce8f20a3925a26168018eac5546e69bc53f20d2eaac97c5dcf7894aadec92ee3c6f150748bf979dfbb98094f82aca45 SHA512 7ddf8b56502f98250e6a2b0cb4024250b7c1aef1ea4d73534a0f96e966311b4b8f7a51c8023613af492b625c52f47b474fc2b132e2d4aafbf92b8d9f75651586 +DIST ledger-live-desktop-2.47.0-linux-x86_64.AppImage 109568705 BLAKE2B 2402617cde0da5f72627a1d3e770b83d17c6cfed2f3a43ed11bfbc39bb07213289bd53da4598b4871d0bec8b429503b05ac4e16c6bbc9de9c1a5a14ed4c585db SHA512 72648065939ab273c920600173118df9116162d37490d0987db493a451d2aea0ddb5e5f775ac4207cae804670c9bc0a689a894025ee56df5899e3ffc79d6070f diff --git a/app-misc/ledger-live/ledger-live-2.47.0.ebuild b/app-misc/ledger-live/ledger-live-2.47.0.ebuild new file mode 100644 index 0000000000..d6893c4858 --- /dev/null +++ b/app-misc/ledger-live/ledger-live-2.47.0.ebuild @@ -0,0 +1,25 @@ +# Copyright 1999-2018 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +DESCRIPTION="Manager for the Ledger hardware wallet" +HOMEPAGE="https://www.ledger.com/" +SRC_URI="https://download.live.ledger.com/ledger-live-desktop-${PV}-linux-x86_64.AppImage" + +LICENSE="all-rights-reserved" +SLOT="0" +KEYWORDS="~amd64" +IUSE="" + +DEPEND="" +RDEPEND="sys-fs/fuse:0" + +RESTRICT="binchecks strip" + +S="${WORKDIR}" + +src_install() { + cp "${DISTDIR}/ledger-live-desktop-${PV}-linux-x86_64.AppImage" ledger-live || die + dobin ledger-live +} From 7c6fe1abc2ecff0451eac317683716d14be5fe88 Mon Sep 17 00:00:00 2001 From: Sergey Alirzaev Date: Sun, 25 Sep 2022 02:03:20 +0200 Subject: [PATCH 17/22] net-p2p/bisq-bin: update EAPI 7 -> 8 Signed-off-by: Sergey Alirzaev --- net-p2p/bisq-bin/bisq-bin-1.9.5.ebuild | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/net-p2p/bisq-bin/bisq-bin-1.9.5.ebuild b/net-p2p/bisq-bin/bisq-bin-1.9.5.ebuild index f62746c77e..532472d2bd 100644 --- a/net-p2p/bisq-bin/bisq-bin-1.9.5.ebuild +++ b/net-p2p/bisq-bin/bisq-bin-1.9.5.ebuild @@ -1,7 +1,7 @@ # Copyright 2019-2022 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=7 +EAPI=8 inherit desktop unpacker xdg From 72605fe6634114c3a33a7ab398233227d165be58 Mon Sep 17 00:00:00 2001 From: Sergey Alirzaev Date: Sun, 25 Sep 2022 02:17:31 +0200 Subject: [PATCH 18/22] net-p2p/monero: update EAPI 7 -> 8 Signed-off-by: Sergey Alirzaev --- net-p2p/monero/monero-0.18.1.1.ebuild | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/net-p2p/monero/monero-0.18.1.1.ebuild b/net-p2p/monero/monero-0.18.1.1.ebuild index 54ce411dc3..ab8f289a37 100644 --- a/net-p2p/monero/monero-0.18.1.1.ebuild +++ b/net-p2p/monero/monero-0.18.1.1.ebuild @@ -1,7 +1,7 @@ # Copyright 1999-2021 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=7 +EAPI=8 inherit cmake systemd From 62801559026bd164f86dbb8dc7cbd9457594a961 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?M=C3=A5rten=20Wadenb=C3=A4ck?= Date: Sun, 25 Sep 2022 16:23:30 +0200 Subject: [PATCH 19/22] media-fonts/libertinus: new package, add 7.040 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Mårten Wadenbäck --- media-fonts/libertinus/Manifest | 3 +++ .../libertinus/libertinus-7.040.ebuild | 20 +++++++++++++++++++ media-fonts/libertinus/metadata.xml | 11 ++++++++++ 3 files changed, 34 insertions(+) create mode 100644 media-fonts/libertinus/Manifest create mode 100644 media-fonts/libertinus/libertinus-7.040.ebuild create mode 100644 media-fonts/libertinus/metadata.xml diff --git a/media-fonts/libertinus/Manifest b/media-fonts/libertinus/Manifest new file mode 100644 index 0000000000..39adf30e91 --- /dev/null +++ b/media-fonts/libertinus/Manifest @@ -0,0 +1,3 @@ +DIST libertinus-7.040.tar.xz 4374448 BLAKE2B f460d66a58353ac7fcb2982ce425f165ac2fa3a25156d1d62b934e5123ede827727bc2655c78e34ecab3d0d02461592d97d2754b6ae4799bc9a16177865540bd SHA512 9cd870adc2c9007dd7265b4c0bcb8590c3467506ed4c912190cb198f07e27a784ec62c6922e8244cc875a94e880afaa96937ff5b547f7868ac4f0ffb6747f2a3 +EBUILD libertinus-7.040.ebuild 545 BLAKE2B 675864e2f613ee87325764d0cc8521ecc70ede66746d9a8f9a52b1857329a2a72208d31120008524e4d513d4f53138be63fe10ecdce95838d946e76f1f4bef57 SHA512 88e8d695b248e6b75c7389302d008bac775278dc64e70d7ba307c5c39a96fa7cb2f9cfa1e053e8f3638e85dd09142a2cb6e1bebfd674c83e5812d1a534780e17 +MISC metadata.xml 352 BLAKE2B de36a9e16846f81786e01863f2783f23da55f2ae9370614774b57285761421e58f338fb2b86223daff5f7acf9d89dada50edd6541dbfe50eac8c533ebc92af4f SHA512 0526a8fe7dbf3ce248dc3b3c4a89ce03260acde21887bb9f1030d57931c916efc16224edb54528e568e19ead1a6a377eddb24cf4e4e5e0972c3f5f88971f3646 diff --git a/media-fonts/libertinus/libertinus-7.040.ebuild b/media-fonts/libertinus/libertinus-7.040.ebuild new file mode 100644 index 0000000000..0eec951414 --- /dev/null +++ b/media-fonts/libertinus/libertinus-7.040.ebuild @@ -0,0 +1,20 @@ +# Copyright 1999-2020 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +MY_PN="Libertinus" +inherit font + +DESCRIPTION="Libertinus font" +HOMEPAGE="https://github.com/alerque/libertinus" +SRC_URI="https://github.com/alerque/libertinus/releases/download/v${PV}/${MY_PN}-${PV}.tar.xz -> ${P}.tar.xz" + +LICENSE="OFL-1.1" +SLOT="0" +KEYWORDS="~amd64 ~x86" + +DOCS="AUTHORS.txt CONTRIBUTING.md CONTRIBUTORS.txt FONTLOG.txt OFL.txt README.md" +S="${WORKDIR}/${MY_PN}-${PV}" +FONT_S="${S}/static/OTF" +FONT_SUFFIX="otf" diff --git a/media-fonts/libertinus/metadata.xml b/media-fonts/libertinus/metadata.xml new file mode 100644 index 0000000000..55beed6f8e --- /dev/null +++ b/media-fonts/libertinus/metadata.xml @@ -0,0 +1,11 @@ + + + + + spamfilter-1@wadenback.se + Mårten Wadenbäck + + + alerque/libertinus + + From 5f2719cf06ab94e276e7bc79c9a6c94d0be050d8 Mon Sep 17 00:00:00 2001 From: Oliver Freyermuth Date: Sun, 25 Sep 2022 17:20:09 +0200 Subject: [PATCH 20/22] x11-misc/gromit-mpx: add 1.4.3 Signed-off-by: Oliver Freyermuth --- x11-misc/gromit-mpx/Manifest | 1 + x11-misc/gromit-mpx/gromit-mpx-1.4.3.ebuild | 40 +++++++++++++++++++++ 2 files changed, 41 insertions(+) create mode 100644 x11-misc/gromit-mpx/gromit-mpx-1.4.3.ebuild diff --git a/x11-misc/gromit-mpx/Manifest b/x11-misc/gromit-mpx/Manifest index 05a9e7a2b1..7cde3a42b3 100644 --- a/x11-misc/gromit-mpx/Manifest +++ b/x11-misc/gromit-mpx/Manifest @@ -1,2 +1,3 @@ DIST gromit-mpx-1.4.1.tar.gz 1860019 BLAKE2B e13668e0e96aaa41c0a7a32f58ba136a406d0c675ee9b494171ee0ae834891f7c3251b58cd0c7987c5241ae172f16f7d27ff9bf22c5ab737507738bf21353712 SHA512 762cb068331121c27de8ebd6e226a18fe2f67d80f574a9d9241ae1484038cd82165b3098be29fc2e00831cf40f52c0e8bd0ef78e493a9eb642405a18a48680d3 DIST gromit-mpx-1.4.2.tar.gz 1861027 BLAKE2B 5bfd5a3b229aee179b1dd5b224d729e035acbd5e2ca802dae18ea4fd569be8871e027f4e6c7f4e5a6866f8ed23c9bd40f949dcd27f3b458246bdbfb4bb61a936 SHA512 3fc5b26e73574b88829a6e5b057388114684ad6bb73350088664859928e808c7680398d8ed789730ed96fa0525b72bd59a4d8479eab14115dd31c57bd8e3560f +DIST gromit-mpx-1.4.3.tar.gz 1861824 BLAKE2B f8337adf400b40e10dd32dfc702be73039e2cc3da9430b4d911794b6e0a9f16b6862948c9573d189445f47ec23a6bde2126765cf8df61af0a46b7dcb94c951d4 SHA512 9da94c3aed4d9c52c62317373ae1ca6dd6ece1adf3c48b95126b6f40ebe6ae8ede45c7c8c93732bcaafbb7ba85b66677b100cb0115fa989661e1e9c8f489ae25 diff --git a/x11-misc/gromit-mpx/gromit-mpx-1.4.3.ebuild b/x11-misc/gromit-mpx/gromit-mpx-1.4.3.ebuild new file mode 100644 index 0000000000..95600ede05 --- /dev/null +++ b/x11-misc/gromit-mpx/gromit-mpx-1.4.3.ebuild @@ -0,0 +1,40 @@ +# Copyright 1999-2022 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +inherit cmake xdg + +DESCRIPTION="Gromit-MPX is a multi-pointer GTK3 port of the Gromit desktop annotation tool" +HOMEPAGE="https://github.com/bk138/gromit-mpx" + +if [[ ${PV} == *9999* ]]; then + inherit git-r3 + EGIT_REPO_URI="https://github.com/bk138/${PN}.git" +else + SRC_URI="https://github.com/bk138/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz" + KEYWORDS="~amd64 ~x86" +fi + +SLOT="0" +LICENSE="GPL-2" + +RDEPEND=" + x11-libs/gtk+:3 + dev-libs/libappindicator:3 + x11-libs/libX11 + >=x11-apps/xinput-1.3 +" +DEPEND="${RDEPEND}" + +src_prepare () { + cmake_src_prepare +} + +src_configure() { + local mycmakeargs=( + -DCMAKE_INSTALL_SYSCONFDIR="${EPREFIX}"/etc + ) + + cmake_src_configure +} From 1c5e373307b9f1431e64068fc0854ad48c0be1ab Mon Sep 17 00:00:00 2001 From: Oliver Freyermuth Date: Sun, 25 Sep 2022 17:20:47 +0200 Subject: [PATCH 21/22] x11-misc/gromit-mpx: drop 1.4.1 Signed-off-by: Oliver Freyermuth --- x11-misc/gromit-mpx/Manifest | 1 - x11-misc/gromit-mpx/gromit-mpx-1.4.1.ebuild | 40 --------------------- 2 files changed, 41 deletions(-) delete mode 100644 x11-misc/gromit-mpx/gromit-mpx-1.4.1.ebuild diff --git a/x11-misc/gromit-mpx/Manifest b/x11-misc/gromit-mpx/Manifest index 7cde3a42b3..ea6ed0702c 100644 --- a/x11-misc/gromit-mpx/Manifest +++ b/x11-misc/gromit-mpx/Manifest @@ -1,3 +1,2 @@ -DIST gromit-mpx-1.4.1.tar.gz 1860019 BLAKE2B e13668e0e96aaa41c0a7a32f58ba136a406d0c675ee9b494171ee0ae834891f7c3251b58cd0c7987c5241ae172f16f7d27ff9bf22c5ab737507738bf21353712 SHA512 762cb068331121c27de8ebd6e226a18fe2f67d80f574a9d9241ae1484038cd82165b3098be29fc2e00831cf40f52c0e8bd0ef78e493a9eb642405a18a48680d3 DIST gromit-mpx-1.4.2.tar.gz 1861027 BLAKE2B 5bfd5a3b229aee179b1dd5b224d729e035acbd5e2ca802dae18ea4fd569be8871e027f4e6c7f4e5a6866f8ed23c9bd40f949dcd27f3b458246bdbfb4bb61a936 SHA512 3fc5b26e73574b88829a6e5b057388114684ad6bb73350088664859928e808c7680398d8ed789730ed96fa0525b72bd59a4d8479eab14115dd31c57bd8e3560f DIST gromit-mpx-1.4.3.tar.gz 1861824 BLAKE2B f8337adf400b40e10dd32dfc702be73039e2cc3da9430b4d911794b6e0a9f16b6862948c9573d189445f47ec23a6bde2126765cf8df61af0a46b7dcb94c951d4 SHA512 9da94c3aed4d9c52c62317373ae1ca6dd6ece1adf3c48b95126b6f40ebe6ae8ede45c7c8c93732bcaafbb7ba85b66677b100cb0115fa989661e1e9c8f489ae25 diff --git a/x11-misc/gromit-mpx/gromit-mpx-1.4.1.ebuild b/x11-misc/gromit-mpx/gromit-mpx-1.4.1.ebuild deleted file mode 100644 index 95600ede05..0000000000 --- a/x11-misc/gromit-mpx/gromit-mpx-1.4.1.ebuild +++ /dev/null @@ -1,40 +0,0 @@ -# Copyright 1999-2022 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -inherit cmake xdg - -DESCRIPTION="Gromit-MPX is a multi-pointer GTK3 port of the Gromit desktop annotation tool" -HOMEPAGE="https://github.com/bk138/gromit-mpx" - -if [[ ${PV} == *9999* ]]; then - inherit git-r3 - EGIT_REPO_URI="https://github.com/bk138/${PN}.git" -else - SRC_URI="https://github.com/bk138/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz" - KEYWORDS="~amd64 ~x86" -fi - -SLOT="0" -LICENSE="GPL-2" - -RDEPEND=" - x11-libs/gtk+:3 - dev-libs/libappindicator:3 - x11-libs/libX11 - >=x11-apps/xinput-1.3 -" -DEPEND="${RDEPEND}" - -src_prepare () { - cmake_src_prepare -} - -src_configure() { - local mycmakeargs=( - -DCMAKE_INSTALL_SYSCONFDIR="${EPREFIX}"/etc - ) - - cmake_src_configure -} From 7009f47f78331463cad6ef241d98d2131ae22dc7 Mon Sep 17 00:00:00 2001 From: Andrew Ammerlaan Date: Mon, 26 Sep 2022 11:50:40 +0200 Subject: [PATCH 22/22] profiles: mask dev-cpp/ packs with broken deops Signed-off-by: Andrew Ammerlaan --- profiles/package.mask | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/profiles/package.mask b/profiles/package.mask index 9e4d0d6aef..2eaac93c56 100644 --- a/profiles/package.mask +++ b/profiles/package.mask @@ -14,6 +14,12 @@ # New entries go on top. +# Andrew Ammerlaan (2022-09-26) +# Depends on removed ~dev-cpp/folly-2022.04.11.00:= +dev-cpp/fbthrift +dev-cpp/fizz +dev-cpp/wangle + # Andrew Ammerlaan (2022-09-08) # depends on removed dev-haskell/pandoc-citeproc dev-python/pypandoc