From b5f3c87acda2d15efe604d1432f1e60f2d9ae667 Mon Sep 17 00:00:00 2001 From: Takuya Wakazono Date: Mon, 27 May 2024 00:48:09 +0900 Subject: [PATCH] gui-apps/hypridle: cleanup deps, phase - it doesn't depend on hyprland (works with sway) - CMAKE_BUILD_TYPE is controlled by eclass Signed-off-by: Takuya Wakazono --- ...1.2-r1.ebuild => hypridle-0.1.2-r2.ebuild} | 27 +++---------------- gui-apps/hypridle/hypridle-9999.ebuild | 27 +++---------------- 2 files changed, 6 insertions(+), 48 deletions(-) rename gui-apps/hypridle/{hypridle-0.1.2-r1.ebuild => hypridle-0.1.2-r2.ebuild} (62%) diff --git a/gui-apps/hypridle/hypridle-0.1.2-r1.ebuild b/gui-apps/hypridle/hypridle-0.1.2-r2.ebuild similarity index 62% rename from gui-apps/hypridle/hypridle-0.1.2-r1.ebuild rename to gui-apps/hypridle/hypridle-0.1.2-r2.ebuild index 11e24b3e4e..ff76295a15 100644 --- a/gui-apps/hypridle/hypridle-0.1.2-r1.ebuild +++ b/gui-apps/hypridle/hypridle-0.1.2-r2.ebuild @@ -5,7 +5,6 @@ EAPI=8 inherit cmake -COMMIT="158c52c4a76cff7a1635be8ec1a4a369bc8674ed" DESCRIPTION="Hyprland's idle daemon" HOMEPAGE="https://github.com/hyprwm/hypridle" @@ -14,8 +13,6 @@ if [[ "${PV}" = *9999 ]]; then 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" - S="${WORKDIR}/${PN}-${PV}" - KEYWORDS="~amd64" fi @@ -23,15 +20,9 @@ LICENSE="BSD" SLOT="0" RDEPEND=" - dev-libs/wayland - gui-libs/egl-wayland - || ( - >=media-libs/mesa-24.1.0_rc1[opengl] - =gui-wm/hyprland-0.35.0 - dev-cpp/sdbus-c++ + dev-cpp/sdbus-c++:= >=dev-libs/hyprlang-0.4.0 + dev-libs/wayland " DEPEND=" ${RDEPEND} @@ -39,22 +30,10 @@ DEPEND=" " BDEPEND=" + dev-util/wayland-scanner virtual/pkgconfig - dev-build/cmake " PATCHES=( "${FILESDIR}/0001-fix-CFLAGS-CXXFLAGS-hypridle.patch" ) - -src_configure() { - local mycmakeargs=( - -DCMAKE_BUILD_TYPE:STRING=Release - ) - - cmake_src_configure -} - -src_install() { - cmake_src_install -} diff --git a/gui-apps/hypridle/hypridle-9999.ebuild b/gui-apps/hypridle/hypridle-9999.ebuild index 11e24b3e4e..ff76295a15 100644 --- a/gui-apps/hypridle/hypridle-9999.ebuild +++ b/gui-apps/hypridle/hypridle-9999.ebuild @@ -5,7 +5,6 @@ EAPI=8 inherit cmake -COMMIT="158c52c4a76cff7a1635be8ec1a4a369bc8674ed" DESCRIPTION="Hyprland's idle daemon" HOMEPAGE="https://github.com/hyprwm/hypridle" @@ -14,8 +13,6 @@ if [[ "${PV}" = *9999 ]]; then 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" - S="${WORKDIR}/${PN}-${PV}" - KEYWORDS="~amd64" fi @@ -23,15 +20,9 @@ LICENSE="BSD" SLOT="0" RDEPEND=" - dev-libs/wayland - gui-libs/egl-wayland - || ( - >=media-libs/mesa-24.1.0_rc1[opengl] - =gui-wm/hyprland-0.35.0 - dev-cpp/sdbus-c++ + dev-cpp/sdbus-c++:= >=dev-libs/hyprlang-0.4.0 + dev-libs/wayland " DEPEND=" ${RDEPEND} @@ -39,22 +30,10 @@ DEPEND=" " BDEPEND=" + dev-util/wayland-scanner virtual/pkgconfig - dev-build/cmake " PATCHES=( "${FILESDIR}/0001-fix-CFLAGS-CXXFLAGS-hypridle.patch" ) - -src_configure() { - local mycmakeargs=( - -DCMAKE_BUILD_TYPE:STRING=Release - ) - - cmake_src_configure -} - -src_install() { - cmake_src_install -}