From 67de9f3d674744ed72c4a756e3f6c31c5e4ea39b Mon Sep 17 00:00:00 2001 From: Kostadin Shishmanov Date: Thu, 19 Oct 2023 19:23:54 +0300 Subject: [PATCH 01/13] app-misc/corectrl: add 1.3.6 Signed-off-by: Kostadin Shishmanov --- app-misc/corectrl/Manifest | 1 + app-misc/corectrl/corectrl-1.3.6.ebuild | 54 +++++++++++++++++++++++++ 2 files changed, 55 insertions(+) create mode 100644 app-misc/corectrl/corectrl-1.3.6.ebuild diff --git a/app-misc/corectrl/Manifest b/app-misc/corectrl/Manifest index 1200ceeaf3..ec75a7d39d 100644 --- a/app-misc/corectrl/Manifest +++ b/app-misc/corectrl/Manifest @@ -1 +1,2 @@ DIST corectrl-v1.3.5.tar.bz2 570723 BLAKE2B 4ee9ff0f84455599b9801d7e712ad98207462e573b3654f3dfa668b0691ef57a35482087ca193a985d241a10a3c9617e77ef5c1acdbbe9974b9d44fcdacd9295 SHA512 3c07bf0f99950b332bdf909f2580a8eb1243d71380f232bfc0980f7d6fd0d261eb522b22205f6dfb6ffd7f295afc243e1e6cd4dcd5f84dc4d5e129713fcb9ef1 +DIST corectrl-v1.3.6.tar.bz2 570738 BLAKE2B 8ff9255c67836e6826ea76663d1dcc8b39b024d806a75279ab5065550b1c9b1b54ed33acbf255a6c41f603df3146988c82df0c4c3f12e9e1f345c0eba432f361 SHA512 7f7718176a566c3f8d3b236c41a283d0b61f83c0dcc5954845214bb7b174bdff775e05d563c02b3fe17f2224541b0defc7900bbab6b0498d4bb02babfe4c8ce3 diff --git a/app-misc/corectrl/corectrl-1.3.6.ebuild b/app-misc/corectrl/corectrl-1.3.6.ebuild new file mode 100644 index 0000000000..e56edefc64 --- /dev/null +++ b/app-misc/corectrl/corectrl-1.3.6.ebuild @@ -0,0 +1,54 @@ +# Copyright 1999-2023 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +inherit ecm + +DESCRIPTION="Core control application" +HOMEPAGE="https://gitlab.com/corectrl/corectrl" + +if [[ ${PV} == 9999 ]]; then + inherit git-r3 + EGIT_REPO_URI="https://gitlab.com/corectrl/corectrl.git" +else + SRC_URI="https://gitlab.com/corectrl/corectrl/-/archive/v${PV}/corectrl-v${PV}.tar.bz2" + KEYWORDS="~amd64" + S="${WORKDIR}/${PN}-v${PV}" +fi + +LICENSE="GPL-3" +SLOT="0" + +IUSE="test" +RESTRICT="!test? ( test )" + +DEPEND=" + dev-qt/qtdbus:5 + dev-qt/qtdeclarative:5 + dev-qt/qtcharts:5[qml] + dev-qt/qtsvg:5 + dev-qt/linguist-tools:5 + dev-qt/qtquickcontrols2:5 + dev-libs/quazip + dev-libs/botan:2 + sys-auth/polkit + x11-libs/libdrm[video_cards_amdgpu] + dev-libs/libfmt + dev-libs/pugixml + dev-cpp/easyloggingpp + dev-cpp/units + test? ( + ~dev-cpp/catch-2.13.8 + dev-cpp/trompeloeil + ) +" + +BDEPEND="${DEPEND}" + +src_configure() { + local mycmakeargs+=( + -DBUILD_TESTING=$(usex test ON OFF) + ) + cmake_src_configure +} From 8f9abd955bf31f465b1b7c373e41fd1080e4f67a Mon Sep 17 00:00:00 2001 From: Kostadin Shishmanov Date: Thu, 19 Oct 2023 19:24:18 +0300 Subject: [PATCH 02/13] app-misc/corectrl-9999: allow building with dev-libs/botan:3 Signed-off-by: Kostadin Shishmanov --- app-misc/corectrl/corectrl-9999.ebuild | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app-misc/corectrl/corectrl-9999.ebuild b/app-misc/corectrl/corectrl-9999.ebuild index e56edefc64..7b4ca92f3e 100644 --- a/app-misc/corectrl/corectrl-9999.ebuild +++ b/app-misc/corectrl/corectrl-9999.ebuild @@ -31,7 +31,7 @@ DEPEND=" dev-qt/linguist-tools:5 dev-qt/qtquickcontrols2:5 dev-libs/quazip - dev-libs/botan:2 + dev-libs/botan sys-auth/polkit x11-libs/libdrm[video_cards_amdgpu] dev-libs/libfmt From ec6e72fd9225182251cbf6f629a288de61e49271 Mon Sep 17 00:00:00 2001 From: Kostadin Shishmanov Date: Thu, 19 Oct 2023 19:36:59 +0300 Subject: [PATCH 03/13] media-video/obs-vkcapture: add 1.4.4 Signed-off-by: Kostadin Shishmanov --- media-video/obs-vkcapture/Manifest | 1 + .../obs-vkcapture/obs-vkcapture-1.4.4.ebuild | 61 +++++++++++++++++++ 2 files changed, 62 insertions(+) create mode 100644 media-video/obs-vkcapture/obs-vkcapture-1.4.4.ebuild diff --git a/media-video/obs-vkcapture/Manifest b/media-video/obs-vkcapture/Manifest index 4d5b0ccac6..e7fb4d5665 100644 --- a/media-video/obs-vkcapture/Manifest +++ b/media-video/obs-vkcapture/Manifest @@ -1,3 +1,4 @@ DIST obs-vkcapture-1.3.3.tar.gz 53301 BLAKE2B bfa51f847978d2abc1393e92aaf6a54ef48781778651652808449546f5ae043514d4798d75fc58a991eec7a0bb5d0e0e09efee9a2df049682f5714261f6e5f46 SHA512 d4d234eff53ff9d0e53e6478b378fce8376b22dc4088c1366e194eeb826db5f24f5c3ce26925423e29f4979ef2b0c081ed69d208a8af27810636a2c9538e98e7 DIST obs-vkcapture-1.4.0.tar.gz 57914 BLAKE2B b92f89a4d6fd3fa97bd6f681d58671d190ac73705c7861c0d4147ae980a7585f329b9cf1f8d26f67754c55c4004f70e53c71515c0a8473b848f0226d049a3a4d SHA512 8b487a09d54ada2482f218eb0b7d22228ca8bdb8ed7b71e8b9456554e48a2d2de80fc94ce336de1b574842b9839c402a98902039696df36a002e3f9e850b936d DIST obs-vkcapture-1.4.1.tar.gz 57996 BLAKE2B d39bdb0376124495298668f4ac2ade83fa757d3361ab2e177a4f3847b0d1e5a093747f4d4e3b3de2abfe588cc174b9a5ce17ce2b6eeb61420c5fe1f13b07a7dd SHA512 3fa64486df0966f8e33262f821833a9a37a9d2a0e27fb9c6ffc9393e5c829444b995155aa54ddc60ab2cb07ca4f7f01c6581dc6c550335a26fddebd46ff604df +DIST obs-vkcapture-1.4.4.tar.gz 58688 BLAKE2B 563f00ebda6eb4240791329c55fbdc7032afe5963dc2ab9dd008d1f58a4270d5d9fa20ab0f71e826575785c4c00a99c11a2ac4ebc703b264a054f38c32867b4b SHA512 656a0b1b0b59002b9688a7876412747f3af00637b140728be01c43b0bfd6ea6ae26d95ef0313e2a8e159102a4a0068a1a9b4730672ef99abb4362b8b1bf1a2a9 diff --git a/media-video/obs-vkcapture/obs-vkcapture-1.4.4.ebuild b/media-video/obs-vkcapture/obs-vkcapture-1.4.4.ebuild new file mode 100644 index 0000000000..685b7e3362 --- /dev/null +++ b/media-video/obs-vkcapture/obs-vkcapture-1.4.4.ebuild @@ -0,0 +1,61 @@ +# Copyright 1999-2021 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +CMAKE_REMOVE_MODULES_LIST=( FindFreetype ) + +inherit xdg cmake-multilib + +if [[ ${PV} == 9999 ]]; then + inherit git-r3 + EGIT_REPO_URI="https://github.com/nowrep/obs-vkcapture" +else + SRC_URI="https://github.com/nowrep/obs-vkcapture/archive/refs/tags/v${PV}.tar.gz -> ${P}.tar.gz" + KEYWORDS="~amd64" +fi + +DESCRIPTION="OBS Linux Vulkan/OpenGL game capture" +HOMEPAGE="https://github.com/nowrep/obs-vkcapture" + +LICENSE="GPL-2" +SLOT="0" +IUSE="" + +BDEPEND=" + dev-util/vulkan-headers + media-libs/shaderc + media-libs/vulkan-loader[${MULTILIB_USEDEP}] + >=media-video/obs-studio-27[wayland] + x11-libs/libdrm[${MULTILIB_USEDEP}] +" +RDEPEND=" + media-libs/libglvnd[${MULTILIB_USEDEP}] + >=media-video/obs-studio-27[wayland] + x11-libs/libdrm[${MULTILIB_USEDEP}] + x11-libs/libxcb:=[${MULTILIB_USEDEP}] +" + +QA_SONAME=" + /usr/lib64/libVkLayer_obs_vkcapture.so + /usr/lib64/libobs_glcapture.so + /usr/lib/libVkLayer_obs_vkcapture.so + /usr/lib/libobs_glcapture.so +" + +src_unpack() { + default + + if [[ ${PV} == 9999 ]]; then + git-r3_src_unpack + fi +} + +multilib_src_configure() { +if ! multilib_is_native_abi; then + local mycmakeargs+=( + -DBUILD_PLUGIN=OFF + ) +fi + cmake_src_configure +} From 8860bf2fafd7d47aae81aea16d7ed2a37b464916 Mon Sep 17 00:00:00 2001 From: Kostadin Shishmanov Date: Thu, 19 Oct 2023 19:38:08 +0300 Subject: [PATCH 04/13] media-video/obs-vkcapture: drop 1.3.3, 1.4.0 Signed-off-by: Kostadin Shishmanov --- media-video/obs-vkcapture/Manifest | 2 - .../obs-vkcapture/obs-vkcapture-1.3.3.ebuild | 61 ------------------- .../obs-vkcapture/obs-vkcapture-1.4.0.ebuild | 61 ------------------- 3 files changed, 124 deletions(-) delete mode 100644 media-video/obs-vkcapture/obs-vkcapture-1.3.3.ebuild delete mode 100644 media-video/obs-vkcapture/obs-vkcapture-1.4.0.ebuild diff --git a/media-video/obs-vkcapture/Manifest b/media-video/obs-vkcapture/Manifest index e7fb4d5665..60302e1231 100644 --- a/media-video/obs-vkcapture/Manifest +++ b/media-video/obs-vkcapture/Manifest @@ -1,4 +1,2 @@ -DIST obs-vkcapture-1.3.3.tar.gz 53301 BLAKE2B bfa51f847978d2abc1393e92aaf6a54ef48781778651652808449546f5ae043514d4798d75fc58a991eec7a0bb5d0e0e09efee9a2df049682f5714261f6e5f46 SHA512 d4d234eff53ff9d0e53e6478b378fce8376b22dc4088c1366e194eeb826db5f24f5c3ce26925423e29f4979ef2b0c081ed69d208a8af27810636a2c9538e98e7 -DIST obs-vkcapture-1.4.0.tar.gz 57914 BLAKE2B b92f89a4d6fd3fa97bd6f681d58671d190ac73705c7861c0d4147ae980a7585f329b9cf1f8d26f67754c55c4004f70e53c71515c0a8473b848f0226d049a3a4d SHA512 8b487a09d54ada2482f218eb0b7d22228ca8bdb8ed7b71e8b9456554e48a2d2de80fc94ce336de1b574842b9839c402a98902039696df36a002e3f9e850b936d DIST obs-vkcapture-1.4.1.tar.gz 57996 BLAKE2B d39bdb0376124495298668f4ac2ade83fa757d3361ab2e177a4f3847b0d1e5a093747f4d4e3b3de2abfe588cc174b9a5ce17ce2b6eeb61420c5fe1f13b07a7dd SHA512 3fa64486df0966f8e33262f821833a9a37a9d2a0e27fb9c6ffc9393e5c829444b995155aa54ddc60ab2cb07ca4f7f01c6581dc6c550335a26fddebd46ff604df DIST obs-vkcapture-1.4.4.tar.gz 58688 BLAKE2B 563f00ebda6eb4240791329c55fbdc7032afe5963dc2ab9dd008d1f58a4270d5d9fa20ab0f71e826575785c4c00a99c11a2ac4ebc703b264a054f38c32867b4b SHA512 656a0b1b0b59002b9688a7876412747f3af00637b140728be01c43b0bfd6ea6ae26d95ef0313e2a8e159102a4a0068a1a9b4730672ef99abb4362b8b1bf1a2a9 diff --git a/media-video/obs-vkcapture/obs-vkcapture-1.3.3.ebuild b/media-video/obs-vkcapture/obs-vkcapture-1.3.3.ebuild deleted file mode 100644 index 685b7e3362..0000000000 --- a/media-video/obs-vkcapture/obs-vkcapture-1.3.3.ebuild +++ /dev/null @@ -1,61 +0,0 @@ -# Copyright 1999-2021 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -CMAKE_REMOVE_MODULES_LIST=( FindFreetype ) - -inherit xdg cmake-multilib - -if [[ ${PV} == 9999 ]]; then - inherit git-r3 - EGIT_REPO_URI="https://github.com/nowrep/obs-vkcapture" -else - SRC_URI="https://github.com/nowrep/obs-vkcapture/archive/refs/tags/v${PV}.tar.gz -> ${P}.tar.gz" - KEYWORDS="~amd64" -fi - -DESCRIPTION="OBS Linux Vulkan/OpenGL game capture" -HOMEPAGE="https://github.com/nowrep/obs-vkcapture" - -LICENSE="GPL-2" -SLOT="0" -IUSE="" - -BDEPEND=" - dev-util/vulkan-headers - media-libs/shaderc - media-libs/vulkan-loader[${MULTILIB_USEDEP}] - >=media-video/obs-studio-27[wayland] - x11-libs/libdrm[${MULTILIB_USEDEP}] -" -RDEPEND=" - media-libs/libglvnd[${MULTILIB_USEDEP}] - >=media-video/obs-studio-27[wayland] - x11-libs/libdrm[${MULTILIB_USEDEP}] - x11-libs/libxcb:=[${MULTILIB_USEDEP}] -" - -QA_SONAME=" - /usr/lib64/libVkLayer_obs_vkcapture.so - /usr/lib64/libobs_glcapture.so - /usr/lib/libVkLayer_obs_vkcapture.so - /usr/lib/libobs_glcapture.so -" - -src_unpack() { - default - - if [[ ${PV} == 9999 ]]; then - git-r3_src_unpack - fi -} - -multilib_src_configure() { -if ! multilib_is_native_abi; then - local mycmakeargs+=( - -DBUILD_PLUGIN=OFF - ) -fi - cmake_src_configure -} diff --git a/media-video/obs-vkcapture/obs-vkcapture-1.4.0.ebuild b/media-video/obs-vkcapture/obs-vkcapture-1.4.0.ebuild deleted file mode 100644 index 685b7e3362..0000000000 --- a/media-video/obs-vkcapture/obs-vkcapture-1.4.0.ebuild +++ /dev/null @@ -1,61 +0,0 @@ -# Copyright 1999-2021 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -CMAKE_REMOVE_MODULES_LIST=( FindFreetype ) - -inherit xdg cmake-multilib - -if [[ ${PV} == 9999 ]]; then - inherit git-r3 - EGIT_REPO_URI="https://github.com/nowrep/obs-vkcapture" -else - SRC_URI="https://github.com/nowrep/obs-vkcapture/archive/refs/tags/v${PV}.tar.gz -> ${P}.tar.gz" - KEYWORDS="~amd64" -fi - -DESCRIPTION="OBS Linux Vulkan/OpenGL game capture" -HOMEPAGE="https://github.com/nowrep/obs-vkcapture" - -LICENSE="GPL-2" -SLOT="0" -IUSE="" - -BDEPEND=" - dev-util/vulkan-headers - media-libs/shaderc - media-libs/vulkan-loader[${MULTILIB_USEDEP}] - >=media-video/obs-studio-27[wayland] - x11-libs/libdrm[${MULTILIB_USEDEP}] -" -RDEPEND=" - media-libs/libglvnd[${MULTILIB_USEDEP}] - >=media-video/obs-studio-27[wayland] - x11-libs/libdrm[${MULTILIB_USEDEP}] - x11-libs/libxcb:=[${MULTILIB_USEDEP}] -" - -QA_SONAME=" - /usr/lib64/libVkLayer_obs_vkcapture.so - /usr/lib64/libobs_glcapture.so - /usr/lib/libVkLayer_obs_vkcapture.so - /usr/lib/libobs_glcapture.so -" - -src_unpack() { - default - - if [[ ${PV} == 9999 ]]; then - git-r3_src_unpack - fi -} - -multilib_src_configure() { -if ! multilib_is_native_abi; then - local mycmakeargs+=( - -DBUILD_PLUGIN=OFF - ) -fi - cmake_src_configure -} From 919ecdb13d81adc71546a17ed7d72bc2d48cf756 Mon Sep 17 00:00:00 2001 From: Konstantin Tutsch Date: Thu, 19 Oct 2023 18:47:17 +0200 Subject: [PATCH 05/13] x11-themes/adw-gtk3: add 5.1, drop 4.9 Signed-off-by: Konstantin Tutsch --- x11-themes/adw-gtk3/Manifest | 2 +- .../adw-gtk3/{adw-gtk3-4.9.ebuild => adw-gtk3-5.1.ebuild} | 0 2 files changed, 1 insertion(+), 1 deletion(-) rename x11-themes/adw-gtk3/{adw-gtk3-4.9.ebuild => adw-gtk3-5.1.ebuild} (100%) diff --git a/x11-themes/adw-gtk3/Manifest b/x11-themes/adw-gtk3/Manifest index 57a92bcc79..776cd768cd 100644 --- a/x11-themes/adw-gtk3/Manifest +++ b/x11-themes/adw-gtk3/Manifest @@ -1,2 +1,2 @@ -DIST adw-gtk3-4.9.tar.gz 6146910 BLAKE2B 5611b10a87258815b668389b519e5a50b89615ab7d838214a196415932a0ef7b36dbba051168418354496782275bb7667b329893d92a838a94fe647d497dea7d SHA512 2b4f1f7a46c487b61135de12982044f7a036302a80ff2c1d0bdde56fee08435273f1871dc4794e825c11af00ea9e8588deaa604ed68f5f096efe32f9aa090ec0 DIST adw-gtk3-5.0.tar.gz 6152490 BLAKE2B ba32ca8114d1561fc6bb60c2b4e9fa41336e42c23000f0891b7730206ce4a34b6a1f9149519d3f847e63b4fb86a47a8b207699cc5bd3a5e8ba93a4d4bb9fa6c7 SHA512 c43a19277d1e870cc1ead09e3f6ff9c361b029efd052d2b3d4e492556371a59a0de190521924c4d96c63b1c53c9bb1f081be4f8964ccd3e5fa51814ad71496a5 +DIST adw-gtk3-5.1.tar.gz 6152577 BLAKE2B 78f05a219950a1458a1bc6afde762e40d07c53adf71f145ec219a0acda7009811ae227a730b06c7579e65a415b81157f54b02d6ce032ed997f3c98713903fe1e SHA512 9190574a92d16149d807c80fad882edcad17f8f1543e89726a349094efc7a6eb2616c1c7e9d57c500f3bb1c0c957c572ae9fadfeec9a10012c33d650f9cbff5a diff --git a/x11-themes/adw-gtk3/adw-gtk3-4.9.ebuild b/x11-themes/adw-gtk3/adw-gtk3-5.1.ebuild similarity index 100% rename from x11-themes/adw-gtk3/adw-gtk3-4.9.ebuild rename to x11-themes/adw-gtk3/adw-gtk3-5.1.ebuild From 944502e4b4321036c04ce7d68dbfa84e280a5657 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Pascal=20J=C3=A4ger?= Date: Thu, 19 Oct 2023 19:36:29 +0200 Subject: [PATCH 06/13] gui-apps/nwg-panel: remove systemd use flag MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Pascal Jäger --- gui-apps/nwg-panel/nwg-panel-0.9.14.ebuild | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/gui-apps/nwg-panel/nwg-panel-0.9.14.ebuild b/gui-apps/nwg-panel/nwg-panel-0.9.14.ebuild index 2174621ad2..4397671dd7 100644 --- a/gui-apps/nwg-panel/nwg-panel-0.9.14.ebuild +++ b/gui-apps/nwg-panel/nwg-panel-0.9.14.ebuild @@ -19,7 +19,6 @@ fi DESCRIPTION="GTK3-based panel for sway and Hyprland Wayland compositors" HOMEPAGE="https://github.com/nwg-piotr/nwg-panel" LICENSE="MIT" -IUSE="systemd" SLOT="0" @@ -42,9 +41,7 @@ python_install_all() { doicon nwg-panel.svg doicon nwg-processes.svg doicon nwg-shell.svg - if use systemd; then - systemd_dounit nwg-panel.service - fi + systemd_dounit nwg-panel.service } pkg_postinst() { From cbd044cdb91e8f8453e78a97508538eae1e104eb Mon Sep 17 00:00:00 2001 From: Alexey Zapparov Date: Fri, 20 Oct 2023 00:50:07 +0200 Subject: [PATCH 07/13] app-admin/pulumi-bin: add 3.89.0, drop 3.81.0 Signed-off-by: Alexey Zapparov --- app-admin/pulumi-bin/Manifest | 2 +- .../{pulumi-bin-3.81.0.ebuild => pulumi-bin-3.89.0.ebuild} | 0 2 files changed, 1 insertion(+), 1 deletion(-) rename app-admin/pulumi-bin/{pulumi-bin-3.81.0.ebuild => pulumi-bin-3.89.0.ebuild} (100%) diff --git a/app-admin/pulumi-bin/Manifest b/app-admin/pulumi-bin/Manifest index 35ac2bc5cc..139a4a4494 100644 --- a/app-admin/pulumi-bin/Manifest +++ b/app-admin/pulumi-bin/Manifest @@ -1,3 +1,3 @@ -DIST pulumi-v3.81.0-linux-x64.tar.gz 162663777 BLAKE2B 95ab73b4f8d3695bf90b9cd5068692908e89e0e931b1d580f847de74871b6e5ca5e39196d4d3e6e010cf91843f6649b39e77d4b278e32302d22730d6eb7efbec SHA512 8a3b680cc348385c32c1069338e7d710b696e26c6f4b60dea963848b0df4298c8b08262938d2e93460c77cb620ce6495b60da97145a347b50fd71619173585f8 DIST pulumi-v3.86.0-linux-x64.tar.gz 163524936 BLAKE2B 9a5865f85a6e835c91ac4b2b3a66a8eb97b6f85026cdd314614d9ffea9a3a7ec01d8d6571d9b2a8cbb13cd26c4b5df73cf4bef443ece841ce31d78a8147b5ffd SHA512 6328207c6cbddd08824334a55906ad37c724335757298586fd9e0a3f50979b08bbb4754e1b34745f559b7fd285a99f8d0d615c49f9ca2fba43d7e3e25f28a93f DIST pulumi-v3.88.0-linux-x64.tar.gz 168130870 BLAKE2B 876f03ae240f338a5a258cd0ddfca089837b55a29d1ded333b5c89cdcf5abcc4f7561cd31ccb7bd5a679d2a7e29dec1102e3a77cff5061d90e48570c0bfb3688 SHA512 bc85f4362cf0665b706aab731d079797e1eca9a064d5cf411891e5aa2e2cf50eefb76a7f1e156799754ec51548db17e9438ee6e0be077e692e0b25a6e0017d96 +DIST pulumi-v3.89.0-linux-x64.tar.gz 168161986 BLAKE2B 0720c66fe5a64e8c988d54bd8775af2498ad75512b3b01962a4200d305afe8e58d7ea30864f9fac652c08aff3859b1d444b24e38719a2a0fa1e85be5ee3f53b4 SHA512 cc2e10e9bcb6c6cdbca18081668c9e8eda45f885cd65f4b0e27d4de5a8446c9a523c08a3b57759686eda0bb0513dd30589ecbc639cf32c7f8ccb178d9b620f2e diff --git a/app-admin/pulumi-bin/pulumi-bin-3.81.0.ebuild b/app-admin/pulumi-bin/pulumi-bin-3.89.0.ebuild similarity index 100% rename from app-admin/pulumi-bin/pulumi-bin-3.81.0.ebuild rename to app-admin/pulumi-bin/pulumi-bin-3.89.0.ebuild From 3b15b53f22e533e215168b277dd86bfafe23d095 Mon Sep 17 00:00:00 2001 From: Bailey Kasin Date: Fri, 20 Oct 2023 01:22:52 -0700 Subject: [PATCH 08/13] app-misc/hyfetch: treeclean Moved to ::gentoo Signed-off-by: Bailey Kasin --- app-misc/hyfetch/Manifest | 1 - .../files/hyfetch-1.4.10-config_fix.patch | 15 ------- app-misc/hyfetch/hyfetch-1.4.10.ebuild | 40 ------------------- app-misc/hyfetch/hyfetch-9999.ebuild | 36 ----------------- app-misc/hyfetch/metadata.xml | 15 ------- 5 files changed, 107 deletions(-) delete mode 100644 app-misc/hyfetch/Manifest delete mode 100644 app-misc/hyfetch/files/hyfetch-1.4.10-config_fix.patch delete mode 100644 app-misc/hyfetch/hyfetch-1.4.10.ebuild delete mode 100644 app-misc/hyfetch/hyfetch-9999.ebuild delete mode 100644 app-misc/hyfetch/metadata.xml diff --git a/app-misc/hyfetch/Manifest b/app-misc/hyfetch/Manifest deleted file mode 100644 index 3a5f627eff..0000000000 --- a/app-misc/hyfetch/Manifest +++ /dev/null @@ -1 +0,0 @@ -DIST hyfetch-1.4.10.tar.gz 266471 BLAKE2B 294002c2cd986055f6392aa61bb8de1d3d558712cd327243e7c2e756aa6e00ff23372fd0ffcc60db8f978110a3d8d1d78c6f683e304fc65b19d2f076e10347f2 SHA512 3f44bd9c0b030b435949db0c0cbd4913e7ec15e857df0dcf2fc3b7d10dca0a4c8ecb9862157f60eebd15b7a1c233c51a74f341b440892e0925871e42215c80e0 diff --git a/app-misc/hyfetch/files/hyfetch-1.4.10-config_fix.patch b/app-misc/hyfetch/files/hyfetch-1.4.10-config_fix.patch deleted file mode 100644 index 955eaf60ca..0000000000 --- a/app-misc/hyfetch/files/hyfetch-1.4.10-config_fix.patch +++ /dev/null @@ -1,15 +0,0 @@ -check_config uses the global constant CONFIG_PATH instead -of the path that gets passed to it. - ---- a/hyfetch/main.py -+++ b/hyfetch/main.py -@@ -27,7 +27,7 @@ def check_config(path) -> Config: - """ - if path.is_file(): - try: -- return Config.from_dict(json.loads(CONFIG_PATH.read_text('utf-8'))) -+ return Config.from_dict(json.loads(path.read_text('utf-8'))) - except KeyError: - return create_config() - - diff --git a/app-misc/hyfetch/hyfetch-1.4.10.ebuild b/app-misc/hyfetch/hyfetch-1.4.10.ebuild deleted file mode 100644 index 076daa8128..0000000000 --- a/app-misc/hyfetch/hyfetch-1.4.10.ebuild +++ /dev/null @@ -1,40 +0,0 @@ -# Copyright 1999-2023 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -DISTUTILS_USE_PEP517=setuptools -PYTHON_COMPAT=( python3_{9..12} ) -inherit optfeature distutils-r1 - -DESCRIPTION="Neofetch with LGBTQ+ pride flags!" -HOMEPAGE="https://github.com/hykilpikonna/hyfetch" -if [[ ${PV} == *9999 ]]; then - EGIT_REPO_URI="https://github.com/hykilpikonna/hyfetch.git" - inherit git-r3 -else - SRC_URI="https://github.com/hykilpikonna/${PN}/archive/${PV}/${P}.tar.gz" - KEYWORDS="~amd64" -fi - -LICENSE="MIT" -SLOT="0" - -RDEPEND=" - dev-python/typing-extensions[${PYTHON_USEDEP}] -" - -PATCHES=( - "${FILESDIR}"/${PN}-1.4.10-config_fix.patch -) - -pkg_postinst() { - optfeature "displaying images" "media-libs/imlib2 www-client/w3m[imlib]" - optfeature "gpu detection" sys-apps/pciutils - optfeature "thumbnail creation" media-gfx/imagemagick - optfeature "wallpaper" media-gfx/feh x11-misc/nitrogen - optfeature "window size" x11-misc/xdotool "x11-apps/xwininfo x11-apps/xprop" "x11-apps/xwininfo x11-apps/xdpyinfo" - elog "The standard neofetch is installed as 'neowofetch', to avoid name conflicts." - elog "So if you do not wish to use the pride flag functionality, you can call the" - elog "tool that way instead." -} diff --git a/app-misc/hyfetch/hyfetch-9999.ebuild b/app-misc/hyfetch/hyfetch-9999.ebuild deleted file mode 100644 index c73d6a446e..0000000000 --- a/app-misc/hyfetch/hyfetch-9999.ebuild +++ /dev/null @@ -1,36 +0,0 @@ -# Copyright 1999-2023 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -DISTUTILS_USE_PEP517=setuptools -PYTHON_COMPAT=( python3_{9..12} ) -inherit optfeature distutils-r1 - -DESCRIPTION="Neofetch with LGBTQ+ pride flags!" -HOMEPAGE="https://github.com/hykilpikonna/hyfetch" -if [[ ${PV} == *9999* ]]; then - EGIT_REPO_URI="https://github.com/hykilpikonna/hyfetch.git" - inherit git-r3 -else - SRC_URI="https://github.com/hykilpikonna/${PN}/archive/${PV}/${P}.tar.gz" - KEYWORDS="~amd64" -fi - -LICENSE="MIT" -SLOT="0" - -RDEPEND=" - dev-python/typing-extensions[${PYTHON_USEDEP}] -" - -pkg_postinst() { - optfeature "displaying images" "media-libs/imlib2 www-client/w3m[imlib]" - optfeature "gpu detection" sys-apps/pciutils - optfeature "thumbnail creation" media-gfx/imagemagick - optfeature "wallpaper" media-gfx/feh x11-misc/nitrogen - optfeature "window size" x11-misc/xdotool "x11-apps/xwininfo x11-apps/xprop" "x11-apps/xwininfo x11-apps/xdpyinfo" - elog "The standard neofetch is installed as 'neowofetch', to avoid name conflicts." - elog "So if you do not wish to use the pride flag functionality, you can call the" - elog "tool that way instead." -} diff --git a/app-misc/hyfetch/metadata.xml b/app-misc/hyfetch/metadata.xml deleted file mode 100644 index 357a752525..0000000000 --- a/app-misc/hyfetch/metadata.xml +++ /dev/null @@ -1,15 +0,0 @@ - - - - - baileykasin@gmail.com - Bailey Kasin - - hyfetch builds upon neofetch to add pride flag coloration to the OS - logo, and also maintains the standard version of neofetch with bug fixes and new features, - as the original project is un-maintained. - - hykilpikonna/hyfetch - https://github.com/hykilpikonna/hyfetch/issues - - From 479a430569e3ba33ea2d9a8e1c9ccfefa523b836 Mon Sep 17 00:00:00 2001 From: YiFei Zhu Date: Fri, 20 Oct 2023 07:37:45 -0700 Subject: [PATCH 09/13] app-editors/pulsar-bin: add 1.110.0, drop 1.108.0 Signed-off-by: YiFei Zhu --- app-editors/pulsar-bin/Manifest | 4 ++-- .../{pulsar-bin-1.108.0.ebuild => pulsar-bin-1.110.0.ebuild} | 0 2 files changed, 2 insertions(+), 2 deletions(-) rename app-editors/pulsar-bin/{pulsar-bin-1.108.0.ebuild => pulsar-bin-1.110.0.ebuild} (100%) diff --git a/app-editors/pulsar-bin/Manifest b/app-editors/pulsar-bin/Manifest index 57aca4efc6..a1c71ffd47 100644 --- a/app-editors/pulsar-bin/Manifest +++ b/app-editors/pulsar-bin/Manifest @@ -1,4 +1,4 @@ -DIST pulsar-bin-1.108.0-amd64.tar.gz 230184003 BLAKE2B 706208f24deaf90ac381358c46747c0ac00954c5aa9d7cb4db45dee15a4450df9a4abe88df096c00b8be4cb86b7bd207c60227b0e3c261ce208b4a08ebc2cd1b SHA512 8c90f8dbec1dcfa8e8ada01809dc1b95b6f8f61886cf0e767509f04c72ec49abd7edd5cfe773df649ff7c081d936bf1dcf906e3e70a831cbb417e5a3a033f2f1 -DIST pulsar-bin-1.108.0-arm64.tar.gz 191573170 BLAKE2B 1f8242730531ccf0395fbfcfd0c6284a0191ce40a1d700f449014662f93de72db6d55599e92baaba1c9b3135c73c8f17c063494778620974c0e37880621723d8 SHA512 d049d6f6951e9e3438b7334d7aafde612719be8c71e647970ad99031be1bf5581f0d02711c7b3a05d1248d0e9783b83a982a60178f6aee2f3f8d4609beea18ca DIST pulsar-bin-1.109.0-amd64.tar.gz 230323361 BLAKE2B 1f97a0ad37bb32d677923fcfe18870dffd8865b116a21936178ef8deed276409cb38fd5b22f9375a7fc72d5996030afc15648d13da36fa4bd30e74febd79ce4c SHA512 c95d1b1a6a644eff5eee0ce49fd88b56062effb7ecc7a37a6de732846ee86c862504d3341e9b5fc10cdadf71051f427f7d252ed66865cc4b83f8861680b7624e DIST pulsar-bin-1.109.0-arm64.tar.gz 191749896 BLAKE2B 2097ffcb98f3b0b1862b7852f5cf497bf04b6f55629e7ecb863b0b0b2bad36b983c76eb57b46e38b281fabdc3aeff4c97045cd0ee21a34d7b6cd42dd0db712d9 SHA512 683e1c495808643f5f380c7c231a6b811f7834be6d6c8f1021cd4535f1a6c9416180f919aab7d3f7aaa4feef91d713e5f25a540246145641baca35814eec951d +DIST pulsar-bin-1.110.0-amd64.tar.gz 230950040 BLAKE2B 27a0f7a9ec5c3c9feb98d41893aa79f8d3a234cf09099730ccf9d54c369b49a23b470ba74e04ff3a7bb2a6a3b10d89d992141b969d4ba3632477942ccddee585 SHA512 07826455d66cc3167c2aa5d85ada623d033026984f7bde7a4aa14f583d144cbd590dd4529bccb7669aced1ed22bb33f17331f406708720bba857177eb58ac492 +DIST pulsar-bin-1.110.0-arm64.tar.gz 192205620 BLAKE2B ad74d5d7406c8788fc3d6ae44a0149c417bfdbba4562ae66994288a5c2367c5ea8e3618041c768eafea4748aa9e768283e9e498914e0b8aac17b837f4795d422 SHA512 c844f3094a186f73466e98e04c6a54271a84a89a62fe1310f52bcd1e14979600b3b488c97b61d7ec27e08f4ba927384354954df8be39da299359650198880006 diff --git a/app-editors/pulsar-bin/pulsar-bin-1.108.0.ebuild b/app-editors/pulsar-bin/pulsar-bin-1.110.0.ebuild similarity index 100% rename from app-editors/pulsar-bin/pulsar-bin-1.108.0.ebuild rename to app-editors/pulsar-bin/pulsar-bin-1.110.0.ebuild From 4866421356a469a400052a5d9af38770192402f8 Mon Sep 17 00:00:00 2001 From: YiFei Zhu Date: Fri, 20 Oct 2023 07:42:26 -0700 Subject: [PATCH 10/13] dev-python/guppy3: add 3.1.4 Signed-off-by: YiFei Zhu --- dev-python/guppy3/Manifest | 1 + dev-python/guppy3/guppy3-3.1.4.ebuild | 24 ++++++++++++++++++++++++ 2 files changed, 25 insertions(+) create mode 100644 dev-python/guppy3/guppy3-3.1.4.ebuild diff --git a/dev-python/guppy3/Manifest b/dev-python/guppy3/Manifest index c386a307c1..9cc3512a93 100644 --- a/dev-python/guppy3/Manifest +++ b/dev-python/guppy3/Manifest @@ -1 +1,2 @@ DIST guppy3-3.1.3.tar.gz 343281 BLAKE2B cbc17a26dff0c9f217843575054aed4925461e3525f1f3785aa535fc125d7455b155dc69755edce9b7b6b43e04b18b685051644dee12935a8af8bba384da0e0d SHA512 f35219ecea5fa20edf3f064109b16ea3b022fea666415751000329fb35726759a697b79efe6a93c29d1a422a57c6dbb881bb313e267a569b621fef6cb0971c68 +DIST guppy3-3.1.4.tar.gz 344051 BLAKE2B 1578ad1d467e3492e6d6ce4142b18670e7e4357c4ca24237b41b478069504a48ff36c9c14af67c8164396a7b2797c0d14d9884de9e251f00fc89e3f2b14e572b SHA512 6f551989ab296d974cf372c8ccfdc7768e17eed35d25e4b14e95a66c35d2ecb6813bad1158ad0b005c730216d33b87d71833cfa9048d9f349851444f39782b9c diff --git a/dev-python/guppy3/guppy3-3.1.4.ebuild b/dev-python/guppy3/guppy3-3.1.4.ebuild new file mode 100644 index 0000000000..5d4719b641 --- /dev/null +++ b/dev-python/guppy3/guppy3-3.1.4.ebuild @@ -0,0 +1,24 @@ +# Copyright 1999-2023 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +PYTHON_COMPAT=( python3_{10..12} ) +DISTUTILS_USE_PEP517=setuptools +DISTUTILS_EXT=1 +inherit distutils-r1 pypi + +DESCRIPTION="A Python Programming Environment & Heap analysis toolset" +HOMEPAGE=" + https://pypi.org/project/guppy3/ + https://zhuyifei1999.github.io/guppy3/ +" + +LICENSE="MIT" +SLOT="0" +KEYWORDS="~amd64 ~x86" + +python_test() { + cd "${T}" || die + "${EPYTHON}" "${S}"/guppy/heapy/test/test_all.py || die +} From 7d626fa31706272569a312176d42b2569a6deb74 Mon Sep 17 00:00:00 2001 From: Huang Rui Date: Sat, 21 Oct 2023 00:47:54 +0800 Subject: [PATCH 11/13] sci-electronics/kactus2: fix build with qt6/6.6.0 - fix build problem with qt6/6.6.0, add missing QSharedPointer header - improve ebuild and follow @ceamac 's suggestions, thanks Signed-off-by: Huang Rui --- ...s2-3.12.0-fix-missing-qsharedpointer.patch | 117 ++++++++++++++++++ sci-electronics/kactus2/kactus2-3.12.0.ebuild | 13 +- sci-electronics/kactus2/kactus2-9999.ebuild | 45 +++++-- 3 files changed, 155 insertions(+), 20 deletions(-) create mode 100644 sci-electronics/kactus2/files/kactus2-3.12.0-fix-missing-qsharedpointer.patch diff --git a/sci-electronics/kactus2/files/kactus2-3.12.0-fix-missing-qsharedpointer.patch b/sci-electronics/kactus2/files/kactus2-3.12.0-fix-missing-qsharedpointer.patch new file mode 100644 index 0000000000..ff271885f0 --- /dev/null +++ b/sci-electronics/kactus2/files/kactus2-3.12.0-fix-missing-qsharedpointer.patch @@ -0,0 +1,117 @@ +From 1fd0d3cc8a3530a04491e736a673b9fc5092daeb Mon Sep 17 00:00:00 2001 +From: Huang Rui +Date: Fri, 20 Oct 2023 23:41:51 +0800 +Subject: [PATCH] [CORRECTIVE] add missing include to fix + QT6.6.0 build + +- add missing #include to fix incomplete type about QSharedPointer + +Closes: https://github.com/kactus2/kactus2dev/issues/85 +Signed-off-by: Huang Rui +--- + editors/HWDesign/undoCommands/HWComponentAddCommand.h | 5 +++-- + .../SystemDesign/UndoCommands/ApiConnectionDeleteCommand.h | 3 ++- + .../SystemDesign/UndoCommands/ComConnectionDeleteCommand.h | 3 ++- + editors/SystemDesign/UndoCommands/SWInterfaceDeleteCommand.h | 3 ++- + .../SystemDesign/UndoCommands/SystemComponentDeleteCommand.h | 3 ++- + editors/SystemDesign/UndoCommands/SystemDeleteCommands.h | 3 ++- + 6 files changed, 13 insertions(+), 7 deletions(-) + +diff --git a/editors/HWDesign/undoCommands/HWComponentAddCommand.h b/editors/HWDesign/undoCommands/HWComponentAddCommand.h +index fe53209d6..c131ada50 100644 +--- a/editors/HWDesign/undoCommands/HWComponentAddCommand.h ++++ b/editors/HWDesign/undoCommands/HWComponentAddCommand.h +@@ -12,10 +12,11 @@ + #ifndef HWCOMPONENTADDCOMMAND_H + #define HWCOMPONENTADDCOMMAND_H + +-#include + #include +-#include + #include ++#include ++#include ++#include + + class IGraphicsItemStack; + class ComponentItem; +diff --git a/editors/SystemDesign/UndoCommands/ApiConnectionDeleteCommand.h b/editors/SystemDesign/UndoCommands/ApiConnectionDeleteCommand.h +index 02aaea2c1..7173b9dd9 100644 +--- a/editors/SystemDesign/UndoCommands/ApiConnectionDeleteCommand.h ++++ b/editors/SystemDesign/UndoCommands/ApiConnectionDeleteCommand.h +@@ -12,9 +12,10 @@ + #ifndef APICONNECTIONDELETECOMMAND_H + #define APICONNECTIONDELETECOMMAND_H + +-#include + #include + #include ++#include ++#include + + class ApiGraphicsConnection; + +diff --git a/editors/SystemDesign/UndoCommands/ComConnectionDeleteCommand.h b/editors/SystemDesign/UndoCommands/ComConnectionDeleteCommand.h +index 5e86dbdf1..e0676b2ca 100644 +--- a/editors/SystemDesign/UndoCommands/ComConnectionDeleteCommand.h ++++ b/editors/SystemDesign/UndoCommands/ComConnectionDeleteCommand.h +@@ -12,9 +12,10 @@ + #ifndef COMCONNECTIONDELETECOMMAND_H + #define COMCONNECTIONDELETECOMMAND_H + +-#include + #include + #include ++#include ++#include + + class ComGraphicsConnection; + +diff --git a/editors/SystemDesign/UndoCommands/SWInterfaceDeleteCommand.h b/editors/SystemDesign/UndoCommands/SWInterfaceDeleteCommand.h +index d05d3750d..72a1128fd 100644 +--- a/editors/SystemDesign/UndoCommands/SWInterfaceDeleteCommand.h ++++ b/editors/SystemDesign/UndoCommands/SWInterfaceDeleteCommand.h +@@ -12,9 +12,10 @@ + #ifndef SWINTERFACEDELETECOMMAND_H + #define SWINTERFACEDELETECOMMAND_H + +-#include + #include + #include ++#include ++#include + + class IGraphicsItemStack; + class SWInterfaceItem; +diff --git a/editors/SystemDesign/UndoCommands/SystemComponentDeleteCommand.h b/editors/SystemDesign/UndoCommands/SystemComponentDeleteCommand.h +index 36abdda6f..ecfcef7db 100644 +--- a/editors/SystemDesign/UndoCommands/SystemComponentDeleteCommand.h ++++ b/editors/SystemDesign/UndoCommands/SystemComponentDeleteCommand.h +@@ -12,9 +12,10 @@ + #ifndef SYSTEMCOMPONENTDELETECOMMAND_H + #define SYSTEMCOMPONENTDELETECOMMAND_H + +-#include + #include + #include ++#include ++#include + + class ComponentItem; + class IGraphicsItemStack; +diff --git a/editors/SystemDesign/UndoCommands/SystemDeleteCommands.h b/editors/SystemDesign/UndoCommands/SystemDeleteCommands.h +index 7eb0ed694..a3c1748e6 100644 +--- a/editors/SystemDesign/UndoCommands/SystemDeleteCommands.h ++++ b/editors/SystemDesign/UndoCommands/SystemDeleteCommands.h +@@ -12,9 +12,10 @@ + #ifndef SYSTEMDELETECOMMANDS_H + #define SYSTEMDELETECOMMANDS_H + +-#include + #include + #include ++#include ++#include + + class GraphicsConnection; + class GraphicsColumnLayout; diff --git a/sci-electronics/kactus2/kactus2-3.12.0.ebuild b/sci-electronics/kactus2/kactus2-3.12.0.ebuild index 37a6d83439..7812278f3b 100644 --- a/sci-electronics/kactus2/kactus2-3.12.0.ebuild +++ b/sci-electronics/kactus2/kactus2-3.12.0.ebuild @@ -42,17 +42,16 @@ BDEPEND=" PATCHES=( "${FILESDIR}"/${PN}-3.12.0-fix-createhelp.patch + "${FILESDIR}"/${PN}-3.12.0-fix-missing-qsharedpointer.patch ) src_prepare() { default # Fix QA pre-stripped warnings, bug 781674 - while IFS= read -r -d '' i; do - echo "CONFIG+=nostrip" >> "${i}" || die - done < <(find . -type f '(' -name "*.pro" ')' -print0) + find . -type f -name \*.pro -exec sed -e '$a\\nCONFIG+=nostrip' -i '{}' + || die # Fix bug 854081 python_setup - sed -i -e "s|PYTHON_CONFIG=.*|PYTHON_CONFIG=${EPYTHON}-config|" .qmake.conf || die + sed -e "s|PYTHON_CONFIG=.*|PYTHON_CONFIG=${EPYTHON}-config|" -i .qmake.conf || die } src_configure() { @@ -68,14 +67,14 @@ src_compile() { cp -TR "${S}/" "${BUILD_DIR}/" || die # Fix bug 854081 python_setup - sed -i -e "s|PYTHON_CONFIG=.*|PYTHON_CONFIG=${EPYTHON}-config|" .qmake.conf || die + sed -e "s|PYTHON_CONFIG=.*|PYTHON_CONFIG=${EPYTHON}-config|" -i .qmake.conf || die export PYTHON_C_FLAGS="$(python_get_CFLAGS)" export PYTHON_LIBS="$(python_get_LIBS)" pushd "PythonAPI" || die eqmake6 PREFIX="$(python_get_library_path)" emake - rm -rf _pythonAPI.so || die - cp -rf libPythonAPI.so.1.0.0 _pythonAPI.so || die + rm _pythonAPI.so || die + cp libPythonAPI.so.1.0.0 _pythonAPI.so || die popd } python_foreach_impl run_in_build_dir python_compile diff --git a/sci-electronics/kactus2/kactus2-9999.ebuild b/sci-electronics/kactus2/kactus2-9999.ebuild index 5d9feb0745..7812278f3b 100644 --- a/sci-electronics/kactus2/kactus2-9999.ebuild +++ b/sci-electronics/kactus2/kactus2-9999.ebuild @@ -42,33 +42,52 @@ BDEPEND=" PATCHES=( "${FILESDIR}"/${PN}-3.12.0-fix-createhelp.patch + "${FILESDIR}"/${PN}-3.12.0-fix-missing-qsharedpointer.patch ) src_prepare() { default # Fix QA pre-stripped warnings, bug 781674 - while IFS= read -r -d '' i; do - echo "CONFIG+=nostrip" >> "${i}" || die - done < <(find . -type f '(' -name "*.pro" ')' -print0) - # # Fix QTBIN_PATH - # sed -i -e "s|QTBIN_PATH=.*|QTBIN_PATH=\"$(qt6_get_bindir)/\"|" configure || die + find . -type f -name \*.pro -exec sed -e '$a\\nCONFIG+=nostrip' -i '{}' + || die + # Fix bug 854081 + python_setup + sed -e "s|PYTHON_CONFIG=.*|PYTHON_CONFIG=${EPYTHON}-config|" -i .qmake.conf || die +} + +src_configure() { + default + # Fix bug 854075 + # Fix bug 854078 + eqmake6 Kactus2.pro +} + +src_compile() { + default + python_compile() { + cp -TR "${S}/" "${BUILD_DIR}/" || die + # Fix bug 854081 + python_setup + sed -e "s|PYTHON_CONFIG=.*|PYTHON_CONFIG=${EPYTHON}-config|" -i .qmake.conf || die + export PYTHON_C_FLAGS="$(python_get_CFLAGS)" + export PYTHON_LIBS="$(python_get_LIBS)" + pushd "PythonAPI" || die + eqmake6 PREFIX="$(python_get_library_path)" + emake + rm _pythonAPI.so || die + cp libPythonAPI.so.1.0.0 _pythonAPI.so || die + popd + } + python_foreach_impl run_in_build_dir python_compile } src_install() { # Can't use default, set INSTALL_ROOT and workaround parallel install bug emake -j1 INSTALL_ROOT="${D}" install python_install() { - export PYTHON_C_FLAGS="$(python_get_CFLAGS)" - export PYTHON_LIBS="$(python_get_LIBS)" pushd "PythonAPI" || die - emake clean - eqmake5 PREFIX="$(python_get_library_path)" - emake - rm -rf _pythonAPI.so || die - cp -rf libPythonAPI.so.1.0.0 _pythonAPI.so || die python_domodule _pythonAPI.so python_domodule pythonAPI.py popd } - python_foreach_impl python_install + python_foreach_impl run_in_build_dir python_install } From f5b884b40f636b5eb850f19aaadf04ad4512d04c Mon Sep 17 00:00:00 2001 From: Huang Rui Date: Sat, 21 Oct 2023 01:40:02 +0800 Subject: [PATCH 12/13] sci-electronics/kactus2: fix build failed bug Signed-off-by: Huang Rui --- sci-electronics/kactus2/kactus2-3.12.0.ebuild | 2 +- sci-electronics/kactus2/kactus2-9999.ebuild | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/sci-electronics/kactus2/kactus2-3.12.0.ebuild b/sci-electronics/kactus2/kactus2-3.12.0.ebuild index 7812278f3b..72f44b10d5 100644 --- a/sci-electronics/kactus2/kactus2-3.12.0.ebuild +++ b/sci-electronics/kactus2/kactus2-3.12.0.ebuild @@ -58,7 +58,7 @@ src_configure() { default # Fix bug 854075 # Fix bug 854078 - eqmake6 Kactus2.pro + eqmake6 Kactus2_Solution.pro } src_compile() { diff --git a/sci-electronics/kactus2/kactus2-9999.ebuild b/sci-electronics/kactus2/kactus2-9999.ebuild index 7812278f3b..72f44b10d5 100644 --- a/sci-electronics/kactus2/kactus2-9999.ebuild +++ b/sci-electronics/kactus2/kactus2-9999.ebuild @@ -58,7 +58,7 @@ src_configure() { default # Fix bug 854075 # Fix bug 854078 - eqmake6 Kactus2.pro + eqmake6 Kactus2_Solution.pro } src_compile() { From 81296165c19b97a41635a5dcdc3623c9f62d596e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Gon=C3=A7alo=20Duarte?= Date: Fri, 20 Oct 2023 22:08:00 +0100 Subject: [PATCH 13/13] games-util/ProtonUp-Qt: remove unneeded dependency dev-python/PyQt6 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Gonçalo Duarte --- games-util/ProtonUp-Qt/ProtonUp-Qt-2.8.2.ebuild | 5 ++--- games-util/ProtonUp-Qt/ProtonUp-Qt-9999.ebuild | 5 ++--- 2 files changed, 4 insertions(+), 6 deletions(-) diff --git a/games-util/ProtonUp-Qt/ProtonUp-Qt-2.8.2.ebuild b/games-util/ProtonUp-Qt/ProtonUp-Qt-2.8.2.ebuild index 2056b7f3b0..25bbae4633 100644 --- a/games-util/ProtonUp-Qt/ProtonUp-Qt-2.8.2.ebuild +++ b/games-util/ProtonUp-Qt/ProtonUp-Qt-2.8.2.ebuild @@ -5,7 +5,7 @@ EAPI=8 _app_id=net.davidotek.pupgui2 DISTUTILS_USE_PEP517=setuptools -PYTHON_COMPAT=( python3_{9..12} ) +PYTHON_COMPAT=(python3_{9..12}) EPYTHON=python3 @@ -21,7 +21,6 @@ SLOT="0" RDEPEND="dev-python/steam dev-python/requests dev-python/pyside6[designer(+)] - dev-python/PyQt6 dev-python/vdf dev-python/pyxdg dev-python/pyaml @@ -44,7 +43,7 @@ src_compile() { src_install() { distutils-r1_src_install domenu "${FILESDIR}/ProtonUp-Qt.desktop" - dobin "${FILESDIR}/ProtonUp-Qt" + dobin "${FILESDIR}/ProtonUp-Qt" newicon -s 64 "${WORKDIR}/${P}/share/icons/hicolor/64x64/apps/net.davidotek.pupgui2.png" ProtonUp-Qt.png newicon -s 128 "${WORKDIR}/${P}/share/icons/hicolor/128x128/apps/net.davidotek.pupgui2.png" ProtonUp-Qt.png newicon -s 256 "${WORKDIR}/${P}/share/icons/hicolor/256x256/apps/net.davidotek.pupgui2.png" ProtonUp-Qt.png diff --git a/games-util/ProtonUp-Qt/ProtonUp-Qt-9999.ebuild b/games-util/ProtonUp-Qt/ProtonUp-Qt-9999.ebuild index 5dd43d0a00..fe322a1732 100644 --- a/games-util/ProtonUp-Qt/ProtonUp-Qt-9999.ebuild +++ b/games-util/ProtonUp-Qt/ProtonUp-Qt-9999.ebuild @@ -5,7 +5,7 @@ EAPI=8 _app_id=net.davidotek.pupgui2 DISTUTILS_USE_PEP517=setuptools -PYTHON_COMPAT=( python3_{9..12} ) +PYTHON_COMPAT=(python3_{9..12}) EPYTHON=python3 @@ -20,7 +20,6 @@ SLOT="0" DEPEND="dev-python/steam dev-python/requests dev-python/pyside6[designer(+)] - dev-python/PyQt6 dev-python/vdf dev-python/pyxdg dev-python/pyaml @@ -38,7 +37,7 @@ src_compile() { src_install() { distutils-r1_src_install domenu "${FILESDIR}/ProtonUp-Qt.desktop" - dobin "${FILESDIR}/ProtonUp-Qt" + dobin "${FILESDIR}/ProtonUp-Qt" newicon -s 64 "${WORKDIR}/${P}/share/icons/hicolor/64x64/apps/net.davidotek.pupgui2.png" ProtonUp-Qt.png newicon -s 128 "${WORKDIR}/${P}/share/icons/hicolor/128x128/apps/net.davidotek.pupgui2.png" ProtonUp-Qt.png newicon -s 256 "${WORKDIR}/${P}/share/icons/hicolor/256x256/apps/net.davidotek.pupgui2.png" ProtonUp-Qt.png