gui-wm/dwl: simplify ebuilds

also use the desktop file provided by upstream

Signed-off-by: Leonardo Hernández Hernández <leohdz172@proton.me>
This commit is contained in:
Leonardo Hernández Hernández
2023-09-24 11:47:24 -06:00
parent 8abe8b5829
commit 33255e5277
3 changed files with 19 additions and 42 deletions

View File

@@ -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

View File

@@ -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
}

View File

@@ -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
}