commit: befeaae517d240e5fad8bd3947852ffbfbc722b1 Author: Gonçalo Negrier Duarte <gonegrier.duarte <AT> gmail <DOT> com> AuthorDate: Thu Aug 3 18:13:59 2023 +0000 Commit: Gonçalo Negrier Duarte <gonegrier.duarte <AT> gmail <DOT> com> CommitDate: Thu Aug 3 18:14:20 2023 +0000 URL: https://gitweb.gentoo.org/repo/proj/guru.git/commit/?id=befeaae5
gui-apps/gtklock-extras: fix /usr/local install location to /usr * update EAPI 7 -> 8 Signed-off-by: Gonçalo Negrier Duarte <gonegrier.duarte <AT> gmail.com> gui-apps/gtklock-extras/gtklock-extras-9999.ebuild | 32 ++++++++++++---------- 1 file changed, 18 insertions(+), 14 deletions(-) diff --git a/gui-apps/gtklock-extras/gtklock-extras-9999.ebuild b/gui-apps/gtklock-extras/gtklock-extras-9999.ebuild index 4968627f30..c38fd25a97 100644 --- a/gui-apps/gtklock-extras/gtklock-extras-9999.ebuild +++ b/gui-apps/gtklock-extras/gtklock-extras-9999.ebuild @@ -1,7 +1,7 @@ # Copyright 1999-2023 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=7 +EAPI=8 inherit git-r3 DESCRIPTION="Gtklock modules" @@ -26,43 +26,47 @@ DEPEND="${RDEPEND}" IUSE="playerctl powerbar userinfo" REQUIRED_USE="|| ( playerctl powerbar userinfo )" -src_compile() { +src_prepare() { if use powerbar; then - pushd gtklock-powerbar-module || die - emake - popd || die + cd "${S}/gtklock-powerbar-module" || die + eapply "${S}/gtklock-powerbar-module.patch" + cd "${S}" || die fi if use playerctl; then - pushd gtklock-playerctl-module || die - emake - popd || die + cd "${S}/gtklock-playerctl-module" || die + eapply "${S}/gtklock-playerctl-module.patch" + cd "${S}" || die fi if use userinfo; then - pushd gtklock-userinfo-module || die - emake - popd || die + cd "${S}/gtklock-userinfo-module" || die + eapply "${S}/gtklock-userinfo-module.patch" + cd "${S}" || die fi + eapply_user } src_install() { dodir /usr/local/lib/gtklock if use powerbar; then pushd gtklock-powerbar-module || die - insinto /usr/local/lib/gtklock && doins powerbar-module.so + emake + emake DESTDIR="${D}" install popd || die fi if use playerctl; then pushd gtklock-playerctl-module || die - insinto /usr/local/lib/gtklock && doins playerctl-module.so + emake + emake DESTDIR="${D}" install popd || die fi if use userinfo; then pushd gtklock-userinfo-module || die - insinto /usr/local/lib/gtklock && doins userinfo-module.so + emake + emake DESTDIR="${D}" install popd || die fi }