From f076b37c4e8f51cc64a2b5d76c29fdd11e9584d2 Mon Sep 17 00:00:00 2001 From: Joe Kappus Date: Fri, 22 Nov 2024 04:40:05 -0500 Subject: [PATCH 1/6] dev-build/just: update LICENSE pycargoebuild generates correct LICENSE that matches cargo-license. Old from cargo-ebuild was incorrect. Signed-off-by: Joe Kappus --- dev-build/just/just-1.37.0.ebuild | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/dev-build/just/just-1.37.0.ebuild b/dev-build/just/just-1.37.0.ebuild index 3b54bdeab3..e8cef3592c 100644 --- a/dev-build/just/just-1.37.0.ebuild +++ b/dev-build/just/just-1.37.0.ebuild @@ -174,7 +174,9 @@ HOMEPAGE=" " SRC_URI="${CARGO_CRATE_URIS}" -LICENSE="Apache-2.0 Apache-2.0-with-LLVM-exceptions BSD Boost-1.0 CC0-1.0 MIT Unicode-DFS-2016 Unlicense" +LICENSE="CC0-1.0" +# Dependent crate licenses +LICENSE+=" Apache-2.0 BSD-2 CC0-1.0 MIT MPL-2.0 Unicode-3.0" SLOT="0" KEYWORDS="~amd64 ~arm64" From cb01a8866f83a8fddb629bfa85cbf486b22f6b6f Mon Sep 17 00:00:00 2001 From: Nicolas PARLANT Date: Fri, 22 Nov 2024 11:34:48 +0100 Subject: [PATCH 2/6] gui-apps/swayr: restore marker comment for LICENSE+= Signed-off-by: Nicolas PARLANT --- gui-apps/swayr/swayr-0.27.4.ebuild | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/gui-apps/swayr/swayr-0.27.4.ebuild b/gui-apps/swayr/swayr-0.27.4.ebuild index 6db096499c..f0d5cba53f 100644 --- a/gui-apps/swayr/swayr-0.27.4.ebuild +++ b/gui-apps/swayr/swayr-0.27.4.ebuild @@ -19,7 +19,8 @@ SRC_URI+=" https://raw.githubusercontent.com/PPN-SD/vendor/refs/tags/swayr-swayr S="${WORKDIR}/swayr-swayrbar-${MY_PV}/" LICENSE="GPL-3+" -# Dependent crate licenses, autogenerated by pycargoebuild +# Autogenerated by pycargoebuild +# Dependent crate licenses LICENSE+=" Apache-2.0 BSD-2 MIT MPL-2.0 Unicode-DFS-2016" SLOT="0" KEYWORDS="~amd64" From 2cc78789e13c302e9be8ea7ca104aa4ccb6a1347 Mon Sep 17 00:00:00 2001 From: Nicolas PARLANT Date: Fri, 22 Nov 2024 11:38:19 +0100 Subject: [PATCH 3/6] gui-apps/swayrbar: restore marker comment for LICENSE+= Signed-off-by: Nicolas PARLANT --- gui-apps/swayrbar/swayrbar-0.4.2.ebuild | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/gui-apps/swayrbar/swayrbar-0.4.2.ebuild b/gui-apps/swayrbar/swayrbar-0.4.2.ebuild index 441a37d616..26a7b75149 100644 --- a/gui-apps/swayrbar/swayrbar-0.4.2.ebuild +++ b/gui-apps/swayrbar/swayrbar-0.4.2.ebuild @@ -16,7 +16,8 @@ SRC_URI+=" https://raw.githubusercontent.com/PPN-SD/vendor/refs/tags/swayr-${P}/ S="${WORKDIR}/swayr-${P}/" LICENSE="GPL-3+" -# Dependent crate licenses, autogenerated by pycargoebuild +# Autogenerated by pycargoebuild +# Dependent crate licenses LICENSE+=" Apache-2.0 BSD-2 MIT MPL-2.0 Unicode-DFS-2016" SLOT="0" KEYWORDS="~amd64" From 53099517d25930954623326de626976df43d8c1b Mon Sep 17 00:00:00 2001 From: Nicolas PARLANT Date: Fri, 22 Nov 2024 11:38:43 +0100 Subject: [PATCH 4/6] net-wireless/iwmenu: restore marker comment for LICENSE+= Signed-off-by: Nicolas PARLANT --- net-wireless/iwmenu/iwmenu-0.1.1.ebuild | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/net-wireless/iwmenu/iwmenu-0.1.1.ebuild b/net-wireless/iwmenu/iwmenu-0.1.1.ebuild index fd13c85e5b..e53b647fbd 100644 --- a/net-wireless/iwmenu/iwmenu-0.1.1.ebuild +++ b/net-wireless/iwmenu/iwmenu-0.1.1.ebuild @@ -14,7 +14,8 @@ SRC_URI="https://github.com/e-tho/${PN}/archive/refs/tags/v${PV}.tar.gz -> ${P}. SRC_URI+=" https://raw.githubusercontent.com/PPN-SD/vendor/refs/tags/${P}/${P}-crates.tar.xz" LICENSE="GPL-3" -# Dependent crate licenses, autogenerated by pycargoebuild +# Autogenerated by pycargoebuild +# Dependent crate licenses LICENSE+=" LGPL-2.1 MIT Unicode-DFS-2016 || ( Apache-2.0 Boost-1.0 ) From e77fab603291b4dc42ad4fd758c5648fac638c38 Mon Sep 17 00:00:00 2001 From: Anthony Ruhier Date: Fri, 22 Nov 2024 13:15:54 +0100 Subject: [PATCH 5/6] gui-apps/hypridle: add 0.1.5 Signed-off-by: Anthony Ruhier --- gui-apps/hypridle/Manifest | 2 +- .../hypridle-0.1.5-fix-CFLAGS-CXXFLAGS.patch | 29 ++++++++++++++ gui-apps/hypridle/hypridle-0.1.5.ebuild | 39 +++++++++++++++++++ 3 files changed, 69 insertions(+), 1 deletion(-) create mode 100644 gui-apps/hypridle/files/hypridle-0.1.5-fix-CFLAGS-CXXFLAGS.patch create mode 100644 gui-apps/hypridle/hypridle-0.1.5.ebuild diff --git a/gui-apps/hypridle/Manifest b/gui-apps/hypridle/Manifest index fbf5a67168..8a83567f41 100644 --- a/gui-apps/hypridle/Manifest +++ b/gui-apps/hypridle/Manifest @@ -1,2 +1,2 @@ -DIST hypridle-0.1.2.gh.tar.gz 13187 BLAKE2B f47b30b688a3ed920e1ca71891a5b1dc06421d3f71519830c4c2f0606fd3919fff2416f91180d3092e1d594b8caecacdc975f18566903421f14e5190d35e50c1 SHA512 d8591aa90c5621ce3d72748589845c727b5e6c3aca5aa42cede9bb238f1957e5fba107c72949097910efa9699ac031addf7ae64dfb9fde99138c56d98993eedf DIST hypridle-0.1.4.gh.tar.gz 13948 BLAKE2B 450e2505fe8c245fd120fb22662e96648c8267a2878a9e9421ae06a8f2831b7f03f3e1ec23416c37e392e3b295cfb7d0cf8a61f7f611f62dea7affa6c3aadd06 SHA512 203dd5ff6c588fb1858d660baba71ede9d2c353abd63a5273fbc4befff8b77d416d802138881bce11605b248b05145e66847b5aa5395e9c150aaf07e67c8bcd8 +DIST hypridle-0.1.5.gh.tar.gz 13946 BLAKE2B 119e3256bae56dea0c234b687e82e852cfa98c6b2f06a70ad59785900687bbbeba0ad431b4024e7c08c7fc2fd2776342b58853994a8c53a10a4eec4ef50198d8 SHA512 3574411a49da83a3f476aa5b6ee3fa7943d9c0018d0a111ca4f609d8bb5b7f485ab7006cd10e0094031c67fa6e1a754e46362ac514b58d60a66d7577d9933968 diff --git a/gui-apps/hypridle/files/hypridle-0.1.5-fix-CFLAGS-CXXFLAGS.patch b/gui-apps/hypridle/files/hypridle-0.1.5-fix-CFLAGS-CXXFLAGS.patch new file mode 100644 index 0000000000..1fa661981a --- /dev/null +++ b/gui-apps/hypridle/files/hypridle-0.1.5-fix-CFLAGS-CXXFLAGS.patch @@ -0,0 +1,29 @@ +From e2b3acf133c104574724f705f9f07007ec8bbe3b Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Gon=C3=A7alo=20Negrier=20Duarte?= + +Date: Wed, 21 Feb 2024 15:29:01 +0000 +Subject: [PATCH] Removed added CFLAGS/CXXFLAGS by CMakeLists.txt +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +Signed-off-by: Gonçalo Negrier Duarte +--- + CMakeLists.txt | 1 - + 1 file changed, 1 deletion(-) + +diff --git a/CMakeLists.txt b/CMakeLists.txt +index 3d60b42..bb37060 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -14,7 +14,6 @@ if(CMAKE_BUILD_TYPE MATCHES Debug OR CMAKE_BUILD_TYPE MATCHES DEBUG) + message(STATUS "Configuring hypridle in Debug with CMake") + add_compile_definitions(HYPRLAND_DEBUG) + else() +- add_compile_options(-O3) + message(STATUS "Configuring hypridle in Release with CMake") + endif() + +-- +2.43.2 + diff --git a/gui-apps/hypridle/hypridle-0.1.5.ebuild b/gui-apps/hypridle/hypridle-0.1.5.ebuild new file mode 100644 index 0000000000..ed1fd47e76 --- /dev/null +++ b/gui-apps/hypridle/hypridle-0.1.5.ebuild @@ -0,0 +1,39 @@ +# Copyright 2023-2024 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +inherit cmake + +DESCRIPTION="Hyprland's idle daemon" +HOMEPAGE="https://github.com/hyprwm/hypridle" + +if [[ "${PV}" = *9999 ]]; then + inherit git-r3 + EGIT_REPO_URI="https://github.com/hyprwm/${PN^}.git" +else + SRC_URI="https://github.com/hyprwm/${PN^}/archive/refs/tags/v${PV}.tar.gz -> ${P}.gh.tar.gz" + KEYWORDS="~amd64" +fi + +LICENSE="BSD" +SLOT="0" + +RDEPEND=" + dev-cpp/sdbus-c++:0/2 + >=dev-libs/hyprlang-0.4.0 + dev-libs/wayland +" +DEPEND=" + ${RDEPEND} + dev-libs/wayland-protocols +" + +BDEPEND=" + dev-util/wayland-scanner + virtual/pkgconfig +" + +PATCHES=( + "${FILESDIR}/hypridle-0.1.5-fix-CFLAGS-CXXFLAGS.patch" +) From e9f95328b86d684344d7f2b91f865937f787c1b1 Mon Sep 17 00:00:00 2001 From: David Roman Date: Fri, 22 Nov 2024 17:50:48 +0100 Subject: [PATCH 6/6] gui-apps/hypridle: drop 0.1.2-r2 Signed-off-by: David Roman --- gui-apps/hypridle/hypridle-0.1.2-r2.ebuild | 39 ---------------------- 1 file changed, 39 deletions(-) delete mode 100644 gui-apps/hypridle/hypridle-0.1.2-r2.ebuild diff --git a/gui-apps/hypridle/hypridle-0.1.2-r2.ebuild b/gui-apps/hypridle/hypridle-0.1.2-r2.ebuild deleted file mode 100644 index fc6de89e50..0000000000 --- a/gui-apps/hypridle/hypridle-0.1.2-r2.ebuild +++ /dev/null @@ -1,39 +0,0 @@ -# Copyright 2023-2024 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -inherit cmake - -DESCRIPTION="Hyprland's idle daemon" -HOMEPAGE="https://github.com/hyprwm/hypridle" - -if [[ "${PV}" = *9999 ]]; then - inherit git-r3 - EGIT_REPO_URI="https://github.com/hyprwm/${PN^}.git" -else - SRC_URI="https://github.com/hyprwm/${PN^}/archive/refs/tags/v${PV}.tar.gz -> ${P}.gh.tar.gz" - KEYWORDS="~amd64" -fi - -LICENSE="BSD" -SLOT="0" - -RDEPEND=" - dev-cpp/sdbus-c++:0/1 - >=dev-libs/hyprlang-0.4.0 - dev-libs/wayland -" -DEPEND=" - ${RDEPEND} - dev-libs/wayland-protocols -" - -BDEPEND=" - dev-util/wayland-scanner - virtual/pkgconfig -" - -PATCHES=( - "${FILESDIR}/hypridle-0.1.2-fix-CFLAGS-CXXFLAGS.patch" -)