commit: 33255e52774e58107ef48bd339daa4c650ed2c4d
Author: Leonardo Hernández Hernández <leohdz172 <AT> proton <DOT> me>
AuthorDate: Sun Sep 24 17:47:24 2023 +0000
Commit: Leonardo Hernandez <leohdz172 <AT> proton <DOT> me>
CommitDate: Sun Sep 24 19:07:25 2023 +0000
URL: https://gitweb.gentoo.org/repo/proj/guru.git/commit/?id=33255e52
gui-wm/dwl: simplify ebuilds
also use the desktop file provided by upstream
Signed-off-by: Leonardo Hernández Hernández <leohdz172 <AT> proton.me>
gui-wm/dwl/dwl-0.4-r1.ebuild | 3 +--
gui-wm/dwl/dwl-9999-r1.ebuild | 29 +++++++++--------------------
gui-wm/dwl/dwl-9999.ebuild | 29 +++++++++--------------------
3 files changed, 19 insertions(+), 42 deletions(-)
diff --git a/gui-wm/dwl/dwl-0.4-r1.ebuild b/gui-wm/dwl/dwl-0.4-r1.ebuild
index e2dc6b7893..f7a7e6fab1 100644
--- a/gui-wm/dwl/dwl-0.4-r1.ebuild
+++ b/gui-wm/dwl/dwl-0.4-r1.ebuild
@@ -5,6 +5,7 @@ EAPI=8
inherit flag-o-matic savedconfig toolchain-funcs
+WLROOTS_SLOT="0/16"
if [[ ${PV} == *9999 ]]; then
EGIT_REPO_URI="https://github.com/djpohly/dwl";
inherit git-r3
@@ -14,7 +15,6 @@ if [[ ${PV} == *9999 ]]; then
case ${PVR} in
9999)
EGIT_BRANCH=main
- WLROOTS_SLOT="0/16"
;;
9999-r1)
EGIT_BRANCH=wlroots-next
@@ -22,7 +22,6 @@ if [[ ${PV} == *9999 ]]; then
;;
esac
else
- WLROOTS_SLOT="0/16"
SRC_URI="https://github.com/djpohly/${PN}/archive/v${PV}.tar.gz ->
${P}.tar.gz"
KEYWORDS="~amd64 ~x86"
fi
diff --git a/gui-wm/dwl/dwl-9999-r1.ebuild b/gui-wm/dwl/dwl-9999-r1.ebuild
index f201ca4b4d..f47bb7c415 100644
--- a/gui-wm/dwl/dwl-9999-r1.ebuild
+++ b/gui-wm/dwl/dwl-9999-r1.ebuild
@@ -3,18 +3,18 @@
EAPI=8
-inherit flag-o-matic savedconfig toolchain-funcs
+inherit savedconfig toolchain-funcs
-if [[ ${PV} == *9999 ]]; then
+WLROOTS_SLOT="0/16"
+if [[ ${PV} == *9999* ]]; then
EGIT_REPO_URI="https://github.com/djpohly/dwl";
inherit git-r3
- # 9999-r0: main (latest wlroots release)
+ # 9999-r0: main (latest stable wlroots release)
# 9999-r1: wlroots-next (wlroots-9999)
case ${PVR} in
9999)
EGIT_BRANCH=main
- WLROOTS_SLOT="0/16"
;;
9999-r1)
EGIT_BRANCH=wlroots-next
@@ -22,7 +22,6 @@ if [[ ${PV} == *9999 ]]; then
;;
esac
else
- WLROOTS_SLOT="0/16"
SRC_URI="https://github.com/djpohly/${PN}/archive/v${PV}.tar.gz ->
${P}.tar.gz"
KEYWORDS="~amd64 ~x86"
fi
@@ -57,24 +56,14 @@ src_prepare() {
default
}
-src_configure() {
- sed -i "s:/local::g" config.mk || die
-
- sed -i "s:pkg-config:$(tc-getPKG_CONFIG):g" config.mk || die
-
- tc-export CC
-
- if use X; then
- append-cppflags '-DXWAYLAND'
- append-libs '-lxcb' '-lxcb-icccm'
- fi
+src_compile() {
+ emake PKG_CONFIG="$(tc-getPKG_CONFIG)" CC="$(tc-getCC)" \
+ XWAYLAND="$(usex X -DXWAYLAND "")" XLIBS="$(usex X "xcb
xcb-icccm" "")" dwl
}
src_install() {
- default
-
- insinto /usr/share/wayland-sessions
- doins "${FILESDIR}"/dwl.desktop
+ emake DESTDIR="${D}" PREFIX="${EPREFIX}/usr" install
+ dodoc README.md
save_config config.h
}
diff --git a/gui-wm/dwl/dwl-9999.ebuild b/gui-wm/dwl/dwl-9999.ebuild
index e2dc6b7893..2b5d46c788 100644
--- a/gui-wm/dwl/dwl-9999.ebuild
+++ b/gui-wm/dwl/dwl-9999.ebuild
@@ -3,18 +3,18 @@
EAPI=8
-inherit flag-o-matic savedconfig toolchain-funcs
+inherit savedconfig toolchain-funcs
-if [[ ${PV} == *9999 ]]; then
+WLROOTS_SLOT="0/16"
+if [[ ${PV} == *9999* ]]; then
EGIT_REPO_URI="https://github.com/djpohly/dwl";
inherit git-r3
- # 9999-r0: main (latest wlroots release)
+ # 9999-r0: main (latest stable wlroots release)
# 9999-r1: wlroots-next (wlroots-9999)
case ${PVR} in
9999)
EGIT_BRANCH=main
- WLROOTS_SLOT="0/16"
;;
9999-r1)
EGIT_BRANCH=wlroots-next
@@ -22,7 +22,6 @@ if [[ ${PV} == *9999 ]]; then
;;
esac
else
- WLROOTS_SLOT="0/16"
SRC_URI="https://github.com/djpohly/${PN}/archive/v${PV}.tar.gz ->
${P}.tar.gz"
KEYWORDS="~amd64 ~x86"
fi
@@ -57,24 +56,14 @@ src_prepare() {
default
}
-src_configure() {
- sed -i "s:/local::g" config.mk || die
-
- sed -i "s:pkg-config:$(tc-getPKG_CONFIG):g" config.mk || die
-
- tc-export CC
-
- if use X; then
- append-cppflags '-DXWAYLAND'
- append-libs '-lxcb' '-lxcb-icccm'
- fi
+src_compile() {
+ emake PKG_CONFIG="$(tc-getPKG_CONFIG)" CC="$(tc-getCC)" \
+ XWAYLAND="$(usex X -DXWAYLAND "")" XLIBS="$(usex X "xcb
xcb-icccm" "")" dwl
}
src_install() {
- default
-
- insinto /usr/share/wayland-sessions
- doins "${FILESDIR}"/dwl.desktop
+ emake DESTDIR="${D}" PREFIX="${EPREFIX}/usr" install
+ dodoc README.md
save_config config.h
}
