diff --git a/gui-apps/hyprlock/hyprlock-0.3.0-r2.ebuild b/gui-apps/hyprlock/hyprlock-0.3.0-r3.ebuild similarity index 78% rename from gui-apps/hyprlock/hyprlock-0.3.0-r2.ebuild rename to gui-apps/hyprlock/hyprlock-0.3.0-r3.ebuild index 07fbc35d00..a855737c5e 100644 --- a/gui-apps/hyprlock/hyprlock-0.3.0-r2.ebuild +++ b/gui-apps/hyprlock/hyprlock-0.3.0-r3.ebuild @@ -13,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}.tar.gz" - S="${WORKDIR}/${PN}-${PV}" - KEYWORDS="~amd64" fi @@ -22,19 +20,17 @@ LICENSE="BSD" SLOT="0" RDEPEND=" + dev-libs/date dev-libs/wayland - gui-libs/egl-wayland media-libs/mesa[opengl] sys-libs/pam - >=gui-wm/hyprland-0.35.0 - dev-libs/glib + dev-libs/glib:2 >=dev-libs/hyprlang-0.4.0 media-libs/libglvnd x11-libs/cairo x11-libs/libxkbcommon x11-libs/libdrm x11-libs/pango - " DEPEND=" ${RDEPEND} @@ -42,8 +38,7 @@ DEPEND=" " BDEPEND=" - dev-build/cmake - dev-libs/date + dev-util/wayland-scanner virtual/pkgconfig " @@ -51,15 +46,3 @@ PATCHES=( "${FILESDIR}/0001-fix-CFLAGS-CXXFLAGS-hyprlock.patch" "${FILESDIR}/0002-cmake-install-pam-file-fix.patch" ) - -src_configure() { - local mycmakeargs=( - -DCMAKE_BUILD_TYPE:STRING=Release - ) - - cmake_src_configure -} - -src_install() { - cmake_src_install -} diff --git a/gui-apps/hyprlock/hyprlock-9999.ebuild b/gui-apps/hyprlock/hyprlock-9999.ebuild index 07fbc35d00..a855737c5e 100644 --- a/gui-apps/hyprlock/hyprlock-9999.ebuild +++ b/gui-apps/hyprlock/hyprlock-9999.ebuild @@ -13,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}.tar.gz" - S="${WORKDIR}/${PN}-${PV}" - KEYWORDS="~amd64" fi @@ -22,19 +20,17 @@ LICENSE="BSD" SLOT="0" RDEPEND=" + dev-libs/date dev-libs/wayland - gui-libs/egl-wayland media-libs/mesa[opengl] sys-libs/pam - >=gui-wm/hyprland-0.35.0 - dev-libs/glib + dev-libs/glib:2 >=dev-libs/hyprlang-0.4.0 media-libs/libglvnd x11-libs/cairo x11-libs/libxkbcommon x11-libs/libdrm x11-libs/pango - " DEPEND=" ${RDEPEND} @@ -42,8 +38,7 @@ DEPEND=" " BDEPEND=" - dev-build/cmake - dev-libs/date + dev-util/wayland-scanner virtual/pkgconfig " @@ -51,15 +46,3 @@ PATCHES=( "${FILESDIR}/0001-fix-CFLAGS-CXXFLAGS-hyprlock.patch" "${FILESDIR}/0002-cmake-install-pam-file-fix.patch" ) - -src_configure() { - local mycmakeargs=( - -DCMAKE_BUILD_TYPE:STRING=Release - ) - - cmake_src_configure -} - -src_install() { - cmake_src_install -}