From ce81c738106c1391e5b9577a3557bb1016d2f747 Mon Sep 17 00:00:00 2001 From: "Anna (cybertailor) Vyalkova" Date: Mon, 8 Jan 2024 06:39:53 +0500 Subject: [PATCH 1/5] dev-util/find-work: fix license Signed-off-by: Anna (cybertailor) Vyalkova --- dev-util/find-work/find-work-0.1.1.ebuild | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dev-util/find-work/find-work-0.1.1.ebuild b/dev-util/find-work/find-work-0.1.1.ebuild index 5686117f50..134d677904 100644 --- a/dev-util/find-work/find-work-0.1.1.ebuild +++ b/dev-util/find-work/find-work-0.1.1.ebuild @@ -13,7 +13,7 @@ HOMEPAGE=" https://pypi.org/project/find-work/ " -LICENSE="WTFPL" +LICENSE="WTFPL-2" SLOT="0" KEYWORDS="~amd64" From 1b195185cc8d151f877d583e3dc7ff40cadcead9 Mon Sep 17 00:00:00 2001 From: Takuya Wakazono Date: Mon, 8 Jan 2024 12:40:35 +0900 Subject: [PATCH 2/5] app-emulation/looking-glass: keyword 1_beta6 for ~amd64 Signed-off-by: Takuya Wakazono --- app-emulation/looking-glass/Manifest | 1 + .../looking-glass-1_beta6.ebuild | 64 ++++++++++++------- 2 files changed, 43 insertions(+), 22 deletions(-) create mode 100644 app-emulation/looking-glass/Manifest diff --git a/app-emulation/looking-glass/Manifest b/app-emulation/looking-glass/Manifest new file mode 100644 index 0000000000..bab5816a51 --- /dev/null +++ b/app-emulation/looking-glass/Manifest @@ -0,0 +1 @@ +DIST looking-glass-1_beta6.tar.gz 2774858 BLAKE2B 351d7805447552d9945ae9a4e24cb853eda8f5bbff32d882355aa634ad67912881830dd36e5c48b1796b2f26f83f6db061004bfb6af4dfbc7704162190629efe SHA512 558981d6b32098076ef0775a748da349941551352cbef836e37310e43e5cd6072df3dec6fa2418a9abecc7729ef0c1c6869e3168d05a3d76bea46c6eb8c4e82c diff --git a/app-emulation/looking-glass/looking-glass-1_beta6.ebuild b/app-emulation/looking-glass/looking-glass-1_beta6.ebuild index 90b1c633e8..8e9108ef0e 100644 --- a/app-emulation/looking-glass/looking-glass-1_beta6.ebuild +++ b/app-emulation/looking-glass/looking-glass-1_beta6.ebuild @@ -1,21 +1,31 @@ -# Copyright 1999-2023 Gentoo Authors +# Copyright 1999-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=8 -inherit cmake git-r3 desktop xdg-utils +inherit cmake desktop xdg + +MY_PV="${PV/1_beta/B}" -EGIT_REPO_URI="https://github.com/gnif/LookingGlass.git" -EGIT_BRANCH="Release/B6" DESCRIPTION="A low latency KVM FrameRelay implementation for guests with VGA PCI Passthrough" HOMEPAGE="https://looking-glass.io https://github.com/gnif/LookingGlass" +if [[ "${PV}" == *9999* ]]; then + inherit git-r3 + EGIT_REPO_URI="https://github.com/gnif/LookingGlass.git" +else + SRC_URI="https://looking-glass.io/artifact/${MY_PV}/source -> ${P}.tar.gz" + S="${WORKDIR}/${PN}-${MY_PV}" + KEYWORDS="~amd64" +fi + LICENSE="GPL-2" SLOT="0" IUSE="binutils gnome pipewire pulseaudio wayland X" -REQUIRED_USE="|| ( binutils gnome pipewire pulseaudio wayland X ) pipewire? ( !pulseaudio ) pulseaudio? ( !pipewire ) " +REQUIRED_USE="|| ( wayland X )" -RDEPEND="dev-libs/libconfig +RDEPEND=" + dev-libs/libconfig dev-libs/nettle media-libs/freetype media-libs/fontconfig @@ -24,35 +34,44 @@ RDEPEND="dev-libs/libconfig virtual/glu media-libs/libsamplerate binutils? ( sys-devel/binutils ) - X? ( x11-libs/libX11 x11-libs/libXfixes x11-libs/libXi x11-libs/libXScrnSaver x11-libs/libXpresent ) + X? ( + x11-libs/libX11 + x11-libs/libXfixes + x11-libs/libXi + x11-libs/libXinerama + x11-libs/libXScrnSaver + x11-libs/libXpresent + ) wayland? ( dev-libs/wayland ) media-libs/libpulse pipewire? ( media-video/pipewire ) gnome? ( gui-libs/libdecor ) " -DEPEND="${RDEPEND} +DEPEND=" + ${RDEPEND} app-emulation/spice-protocol wayland? ( dev-libs/wayland-protocols ) " -BDEPEND="virtual/pkgconfig" +BDEPEND=" + virtual/pkgconfig + wayland? ( dev-util/wayland-scanner ) +" CMAKE_USE_DIR="${S}"/client -src_prepare () { - default - +src_configure () { # Base on build.rst from the project # doc/build.rst - MYCMAKEARGS=( - -DENABLE_BACKTRACE=$(usex binutils) \ - -DENABLE_X11=$(usex X) -DENABLE_WAYLAND=$(usex wayland) \ - -DENABLE_PIPEWIRE=$(usex pipewire) \ - -DENABLE_PULSEAUDIO=$(usex pulseaudio) \ + local mycmakeargs=( + -DENABLE_BACKTRACE=$(usex binutils) + -DENABLE_X11=$(usex X) + -DENABLE_WAYLAND=$(usex wayland) + -DENABLE_PIPEWIRE=$(usex pipewire) + -DENABLE_PULSEAUDIO=$(usex pulseaudio) -DENABLE_LIBDECOR=$(usex gnome) ) - - cmake_src_prepare + cmake_src_configure } src_install() { @@ -71,12 +90,13 @@ src_install() { } pkg_postinst() { - xdg_icon_cache_update + xdg_pkg_postinst + if use X && ! use wayland || ! use X && use wayland; then - ewarn "The desktop file located located at /usr/share/applications/LookingGlass.desktop" + ewarn "The desktop file located at /usr/share/applications/LookingGlass.desktop" fi if use X && use wayland; then - ewarn "The desktop files located located at /usr/share/applications/LookingGlass-X.desktop /usr/share/applications/LookingGlass-Wayland.desktop" + ewarn "The desktop files located at /usr/share/applications/LookingGlass-X.desktop /usr/share/applications/LookingGlass-Wayland.desktop" fi ewarn "Use the Right Control (Control_R) as the modifier key to control the action in LookingGlass" ewarn "Note: Key was change because my laptop dosent have ScrLk" From 38fdbcf7a7b2f9b7f9fda3ee151c56c24b9a99c0 Mon Sep 17 00:00:00 2001 From: Takuya Wakazono Date: Mon, 8 Jan 2024 12:41:36 +0900 Subject: [PATCH 3/5] app-emulation/looking-glass: sync live Signed-off-by: Takuya Wakazono --- .../looking-glass/looking-glass-9999.ebuild | 67 ++++++++++++------- 1 file changed, 42 insertions(+), 25 deletions(-) diff --git a/app-emulation/looking-glass/looking-glass-9999.ebuild b/app-emulation/looking-glass/looking-glass-9999.ebuild index e7ce49f17f..8e9108ef0e 100644 --- a/app-emulation/looking-glass/looking-glass-9999.ebuild +++ b/app-emulation/looking-glass/looking-glass-9999.ebuild @@ -1,20 +1,31 @@ -# Copyright 1999-2023 Gentoo Authors +# Copyright 1999-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=8 -inherit cmake git-r3 desktop xdg-utils +inherit cmake desktop xdg + +MY_PV="${PV/1_beta/B}" -EGIT_REPO_URI="https://github.com/gnif/LookingGlass.git" DESCRIPTION="A low latency KVM FrameRelay implementation for guests with VGA PCI Passthrough" HOMEPAGE="https://looking-glass.io https://github.com/gnif/LookingGlass" +if [[ "${PV}" == *9999* ]]; then + inherit git-r3 + EGIT_REPO_URI="https://github.com/gnif/LookingGlass.git" +else + SRC_URI="https://looking-glass.io/artifact/${MY_PV}/source -> ${P}.tar.gz" + S="${WORKDIR}/${PN}-${MY_PV}" + KEYWORDS="~amd64" +fi + LICENSE="GPL-2" SLOT="0" IUSE="binutils gnome pipewire pulseaudio wayland X" -REQUIRED_USE="|| ( binutils gnome pipewire pulseaudio wayland X ) pipewire? ( !pulseaudio ) pulseaudio? ( !pipewire ) " +REQUIRED_USE="|| ( wayland X )" -RDEPEND="dev-libs/libconfig +RDEPEND=" + dev-libs/libconfig dev-libs/nettle media-libs/freetype media-libs/fontconfig @@ -23,39 +34,44 @@ RDEPEND="dev-libs/libconfig virtual/glu media-libs/libsamplerate binutils? ( sys-devel/binutils ) - X? ( x11-libs/libX11 x11-libs/libXfixes x11-libs/libXi x11-libs/libXScrnSaver x11-libs/libXpresent ) + X? ( + x11-libs/libX11 + x11-libs/libXfixes + x11-libs/libXi + x11-libs/libXinerama + x11-libs/libXScrnSaver + x11-libs/libXpresent + ) wayland? ( dev-libs/wayland ) media-libs/libpulse pipewire? ( media-video/pipewire ) gnome? ( gui-libs/libdecor ) " -DEPEND="${RDEPEND} +DEPEND=" + ${RDEPEND} app-emulation/spice-protocol wayland? ( dev-libs/wayland-protocols ) " -BDEPEND="virtual/pkgconfig" +BDEPEND=" + virtual/pkgconfig + wayland? ( dev-util/wayland-scanner ) +" CMAKE_USE_DIR="${S}"/client -src_prepare () { - default - +src_configure () { # Base on build.rst from the project # doc/build.rst - MYCMAKEARGS=( - -DENABLE_BACKTRACE=$(usex binutils) \ - -DENABLE_X11=$(usex X) -DENABLE_WAYLAND=$(usex wayland) \ - -DENABLE_PIPEWIRE=$(usex pipewire) \ - -DENABLE_PULSEAUDIO=$(usex pulseaudio) \ + local mycmakeargs=( + -DENABLE_BACKTRACE=$(usex binutils) + -DENABLE_X11=$(usex X) + -DENABLE_WAYLAND=$(usex wayland) + -DENABLE_PIPEWIRE=$(usex pipewire) + -DENABLE_PULSEAUDIO=$(usex pulseaudio) -DENABLE_LIBDECOR=$(usex gnome) ) - - cmake_src_prepare -} - -src_compile() { - cmake_src_compile + cmake_src_configure } src_install() { @@ -74,12 +90,13 @@ src_install() { } pkg_postinst() { - xdg_icon_cache_update + xdg_pkg_postinst + if use X && ! use wayland || ! use X && use wayland; then - ewarn "The desktop file located located at /usr/share/applications/LookingGlass.desktop" + ewarn "The desktop file located at /usr/share/applications/LookingGlass.desktop" fi if use X && use wayland; then - ewarn "The desktop files located located at /usr/share/applications/LookingGlass-X.desktop /usr/share/applications/LookingGlass-Wayland.desktop" + ewarn "The desktop files located at /usr/share/applications/LookingGlass-X.desktop /usr/share/applications/LookingGlass-Wayland.desktop" fi ewarn "Use the Right Control (Control_R) as the modifier key to control the action in LookingGlass" ewarn "Note: Key was change because my laptop dosent have ScrLk" From 2c36fd3324a5c88d1cc6db39d09e1a5d4118deaf Mon Sep 17 00:00:00 2001 From: Takuya Wakazono Date: Mon, 8 Jan 2024 15:03:40 +0900 Subject: [PATCH 4/5] games-emulation/yuzu: fix build with USE=-cubeb Closes: https://bugs.gentoo.org/921566 Signed-off-by: Takuya Wakazono --- games-emulation/yuzu/yuzu-0_p20230202.ebuild | 5 +---- games-emulation/yuzu/yuzu-9999.ebuild | 3 +-- 2 files changed, 2 insertions(+), 6 deletions(-) diff --git a/games-emulation/yuzu/yuzu-0_p20230202.ebuild b/games-emulation/yuzu/yuzu-0_p20230202.ebuild index 0a33404db4..90270e6114 100644 --- a/games-emulation/yuzu/yuzu-0_p20230202.ebuild +++ b/games-emulation/yuzu/yuzu-0_p20230202.ebuild @@ -1,4 +1,4 @@ -# Copyright 2020-2023 Gentoo Authors +# Copyright 2020-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=8 @@ -92,9 +92,6 @@ src_prepare() { # Allow skip submodule downloading rm .gitmodules || die - # Unbundle cubeb - use cubeb && sed -i '$afind_package(Threads REQUIRED)' CMakeLists.txt || die - if ! use discord; then sed -i -e '/^if.*discord-rpc/,/^endif()/d' externals/CMakeLists.txt || die else diff --git a/games-emulation/yuzu/yuzu-9999.ebuild b/games-emulation/yuzu/yuzu-9999.ebuild index b562223aa9..e6f42589a9 100644 --- a/games-emulation/yuzu/yuzu-9999.ebuild +++ b/games-emulation/yuzu/yuzu-9999.ebuild @@ -1,4 +1,4 @@ -# Copyright 2020-2023 Gentoo Authors +# Copyright 2020-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=8 @@ -117,7 +117,6 @@ src_prepare() { fi # Unbundle cubeb - use cubeb && sed -i '$afind_package(Threads REQUIRED)' CMakeLists.txt || die sed -i '/^if.*cubeb/,/^endif()/d' externals/CMakeLists.txt || die # Unbundle cpp-httplib From 739bcc84242f511c309a3fd873eba3b6911d1ba7 Mon Sep 17 00:00:00 2001 From: Viorel Munteanu Date: Mon, 8 Jan 2024 09:17:17 +0200 Subject: [PATCH 5/5] net-im/discord-canary-bin: add 0.0.235, drop 0.0.233 Signed-off-by: Viorel Munteanu --- net-im/discord-canary-bin/Manifest | 2 +- ...ary-bin-0.0.233.ebuild => discord-canary-bin-0.0.235.ebuild} | 0 2 files changed, 1 insertion(+), 1 deletion(-) rename net-im/discord-canary-bin/{discord-canary-bin-0.0.233.ebuild => discord-canary-bin-0.0.235.ebuild} (100%) diff --git a/net-im/discord-canary-bin/Manifest b/net-im/discord-canary-bin/Manifest index 3b82c95273..891cda7a0c 100644 --- a/net-im/discord-canary-bin/Manifest +++ b/net-im/discord-canary-bin/Manifest @@ -1 +1 @@ -DIST discord-canary-0.0.233.deb 92534522 BLAKE2B 8b75d2c77c6f80afd5ff9fc5641c219ef82d18a3baa014ed5fdd32b245edfc3b57db171e22b7b4a2a079e2b9fbdcdf5d7fa5c44385e4c7603c254cad85bb27b6 SHA512 5d8f6855e07dd275ecf40b5a7c7170256721c7564f5a40478426fef98b15ff6eea0169255f3261337e7a018359e329cdf7a768c0c36311a40dfee6e9047d766d +DIST discord-canary-0.0.235.deb 92534568 BLAKE2B 6491b5c9b7086e2399c8157a49ef767108c22a232cf6c2482b35d202ac1ca1ba8af71f62218c84ad5b4e3b85b9a544f81e1d2b6bac8b2177fcc002496109b5b8 SHA512 44b80c16d56b7892010e37e247ba848e4f9c882d341a0a832b9c09a8060548cc5b40b9b20f4de4e18765cddd284885c192bca35dad144e9552d9a0eaadd343ab diff --git a/net-im/discord-canary-bin/discord-canary-bin-0.0.233.ebuild b/net-im/discord-canary-bin/discord-canary-bin-0.0.235.ebuild similarity index 100% rename from net-im/discord-canary-bin/discord-canary-bin-0.0.233.ebuild rename to net-im/discord-canary-bin/discord-canary-bin-0.0.235.ebuild