summaryrefslogtreecommitdiff
path: root/gui-wm/dwl
diff options
context:
space:
mode:
Diffstat (limited to 'gui-wm/dwl')
-rw-r--r--gui-wm/dwl/Manifest8
-rw-r--r--gui-wm/dwl/dwl-0.6.ebuild (renamed from gui-wm/dwl/dwl-0.5.ebuild)40
-rw-r--r--gui-wm/dwl/dwl-0.7_rc1.ebuild (renamed from gui-wm/dwl/dwl-9999-r1.ebuild)40
-rw-r--r--gui-wm/dwl/dwl-9999.ebuild42
4 files changed, 56 insertions, 74 deletions
diff --git a/gui-wm/dwl/Manifest b/gui-wm/dwl/Manifest
index a8360c9ce599..80805be2361a 100644
--- a/gui-wm/dwl/Manifest
+++ b/gui-wm/dwl/Manifest
@@ -1,6 +1,8 @@
DIST dwl-v0.5.tar.gz 57363 BLAKE2B 6dce89cbfa1aa1946983897bed5ac16619ac237e0f7092b588847315b849392b83643839dc5386c5bd73a36e5da55a281696a6ef13dcaec8345cb4e495c5e3b7 SHA512 7bd292559b0ecafc54bf1c1ba0c3b6b0417e8bd03bb0058f492b87295c92b50932e25621cc5f804c38ad06ffadad7bb8017872fade4a04bf617b1d4f1993aae8
+DIST dwl-v0.6.tar.gz 62677 BLAKE2B 01d010c7e5054c9a8ed0b2b03093e8eee8ff11555296819f2b42a54dd5f07507d9129e6eaf34521d5743bf172309472b52d9a0106b7badd545c75e922a115ef0 SHA512 5e5d7599438d4cdf632e7afaddb1d345c8131c9925e9e4d1b632ad52c4418b1db2c0ff6a2da4b5686607c79cf2598e26e8c7f4c8385be82b2c2355fa28c2e8fb
+DIST dwl-v0.7-rc1.tar.gz 63167 BLAKE2B e581909decd5859702903c01e91af19dbcf394337dc6d1813835b883396eb075a91dcef1bfe0c92b1c0d61fd9303d1263a3ddbac1323c594ce84d628d9f31b66 SHA512 a3214539e3b8f1df3a3fef4dd51506db1ec1c730e793fbd30e2be44a2913b47b0f87d170a4466d61bb05a0822e6c4cab12916ff667db2c8b7e8fcc0beab0a2a1
EBUILD dwl-0.5-r1.ebuild 1588 BLAKE2B 500464dc26cca333d9e506363ba356d4e6772caec2001a29cb1eca59793258238e06aa682791395961e4c4a378504b6d99d1661c8724585a3b94910955c835b6 SHA512 e461e1bf39962269890465a3a4e2774b3d772613d559f7319357a91b2a891f5a82797483c1727f7f9877661af2accfc060659cd93dd72db54ad5d1175a2d2b7f
-EBUILD dwl-0.5.ebuild 1465 BLAKE2B eca80af80978fe2d80de59f39daec8a923b6ec5d9bce6e19b08e453885e80c3852b3de3ab4f2612b8a8cd2d453adf4a312fb69a00c19414ff40690617d148f81 SHA512 efe1d7a11f10b4779aa87167f2422ef4c878c8546b1ed3557f0bc9ce61f0b1d6e56d784bbe6f646e6a885fdf85ddf7d959b4b37e7820e112af27f53f00211c89
-EBUILD dwl-9999-r1.ebuild 1595 BLAKE2B f3236da4e40f84d3bd772cfbcbfab966653b8b918b14e0fbd5e953d0dfcd28c2a36119579456946b92d513d210db7125ac1a14f73f940d7a79977628aba5ad6b SHA512 a07c5c101b8470c2a27c822aab001fd0670e25c3557c48c1af4fd7ac553641c26dd6967da9b584b8d52c202df27535ca00fb7a176317c24ca4f4e7e53ba6b833
-EBUILD dwl-9999.ebuild 1588 BLAKE2B 500464dc26cca333d9e506363ba356d4e6772caec2001a29cb1eca59793258238e06aa682791395961e4c4a378504b6d99d1661c8724585a3b94910955c835b6 SHA512 e461e1bf39962269890465a3a4e2774b3d772613d559f7319357a91b2a891f5a82797483c1727f7f9877661af2accfc060659cd93dd72db54ad5d1175a2d2b7f
+EBUILD dwl-0.6.ebuild 1468 BLAKE2B 9087b017a96ac34f437fc1abc7b3aeb7601e85afe715cc2b292d0f418ed560a9aee50159c699f493246c1c129180621e49466a516818a91b38178cd954199581 SHA512 292d747137180be2e598c6fbab1d1b3bfd9ce378c3302f6564a9c1b586de5b8bd6266d637b05e94b67722069bd919d07af39f605f317e0d2d86b2ad9bb156cd1
+EBUILD dwl-0.7_rc1.ebuild 1475 BLAKE2B 323ede1091cb06ca717a2770544bbea5da2098c3055033cc067bc37a24e829399437946ee1925a8c5d5ae7a0c3172858630a0ed85489e4ea85160a65c94bfa6b SHA512 eb312a24b339d19c12ebb54b549f0cb965337650aeb9954a2ab6b5868ed18581e2a96d0e04cc199b8e79fdaf9bf103dbb2535fbcd9709dbb747791d66fc3d7af
+EBUILD dwl-9999.ebuild 1475 BLAKE2B 3a5444db4ae0ba53f6ca4f2bbc7bd4fa9b6088e40c6c4ee60f1d2b19b815e8ba7924828c990c9ad43c781bb91d25ec77f52ee9c2444e943e44d7fd7878aec261 SHA512 2be4d1959cf1db84d4301806d15ce931efccb902762bdf5cf47589c2c599fb4cc651715dc630c69d55679f92ae4c8d79ae539657a298f1576c0e676159a8eda4
MISC metadata.xml 607 BLAKE2B 05185e10615acd19020f558e6d05305ea1df831ddb9703516bf8789108c2d5bc5d90ca75fd261674aa15f41be6518b49d45898866faa10848dafb0a28fada899 SHA512 c70b7a100380b1771385a7e398f256be391a2650df620499e43ead3acec46765c646c55671885a6bbfef7f3a87c488c135ec5f34c87bb4f2dfdb8f6c7a8f2ed8
diff --git a/gui-wm/dwl/dwl-0.5.ebuild b/gui-wm/dwl/dwl-0.6.ebuild
index d96014e0f6ec..823944d46d13 100644
--- a/gui-wm/dwl/dwl-0.5.ebuild
+++ b/gui-wm/dwl/dwl-0.6.ebuild
@@ -5,25 +5,13 @@ EAPI=8
inherit savedconfig toolchain-funcs
-MY_P="${PN}-v${PV}"
-WLROOTS_SLOT="0/17"
-if [[ ${PV} == *9999* ]]; then
+if [[ ${PV} == 9999 ]]; then
EGIT_REPO_URI="https://codeberg.org/dwl/dwl.git"
inherit git-r3
-
- # 9999-r0: main (latest stable wlroots release)
- # 9999-r1: wlroots-next (wlroots-9999)
- case ${PVR} in
- 9999)
- EGIT_BRANCH=main
- ;;
- 9999-r1)
- EGIT_BRANCH=wlroots-next
- WLROOTS_SLOT="0/9999"
- ;;
- esac
else
- SRC_URI="https://codeberg.org/${PN}/${PN}/releases/download/v${PV}/${MY_P}.tar.gz"
+ MY_PV="${PV/_rc/-rc}"
+ MY_P="${PN}-v${MY_PV}"
+ SRC_URI="https://codeberg.org/${PN}/${PN}/releases/download/v${MY_PV}/${MY_P}.tar.gz"
S="${WORKDIR}/${MY_P}"
KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86"
fi
@@ -35,20 +23,32 @@ LICENSE="CC0-1.0 GPL-3+ MIT"
SLOT="0"
IUSE="X"
-RDEPEND="
+if [[ ${PV} == 9999 ]]; then
+ COMMON_DEPEND="~gui-libs/wlroots-9999:=[libinput,session,X?]"
+else
+ COMMON_DEPEND="
+ >=gui-libs/wlroots-0.17:=[libinput,session,X?]
+ <gui-libs/wlroots-0.18:="
+fi
+
+COMMON_DEPEND+="
dev-libs/libinput:=
dev-libs/wayland
- gui-libs/wlroots:${WLROOTS_SLOT}[libinput,session,X?]
x11-libs/libxkbcommon
X? (
x11-libs/libxcb:=
x11-libs/xcb-util-wm
)
"
-
+RDEPEND="
+ ${COMMON_DEPEND}
+ X? (
+ x11-base/xwayland
+ )
+"
# uses <linux/input-event-codes.h>
DEPEND="
- ${RDEPEND}
+ ${COMMON_DEPEND}
sys-kernel/linux-headers
"
BDEPEND="
diff --git a/gui-wm/dwl/dwl-9999-r1.ebuild b/gui-wm/dwl/dwl-0.7_rc1.ebuild
index 631ff290e732..673657f8b653 100644
--- a/gui-wm/dwl/dwl-9999-r1.ebuild
+++ b/gui-wm/dwl/dwl-0.7_rc1.ebuild
@@ -5,30 +5,13 @@ EAPI=8
inherit savedconfig toolchain-funcs
-MY_P="${PN}-v${PV}"
-
-WLROOTS_DEP="
- >=gui-libs/wlroots-0.18:=[libinput,session,X?]
- <gui-libs/wlroots-0.19:=
-"
-
-if [[ ${PV} == *9999* ]]; then
+if [[ ${PV} == 9999 ]]; then
EGIT_REPO_URI="https://codeberg.org/dwl/dwl.git"
inherit git-r3
-
- # 9999-r0: main (latest stable wlroots release)
- # 9999-r1: wlroots-next (wlroots-9999)
- case ${PVR} in
- 9999)
- EGIT_BRANCH=main
- ;;
- 9999-r1)
- EGIT_BRANCH=wlroots-next
- WLROOTS_DEP="~gui-libs/wlroots-9999:=[libinput,session,X?]"
- ;;
- esac
else
- SRC_URI="https://codeberg.org/${PN}/${PN}/releases/download/v${PV}/${MY_P}.tar.gz"
+ MY_PV="${PV/_rc/-rc}"
+ MY_P="${PN}-v${MY_PV}"
+ SRC_URI="https://codeberg.org/${PN}/${PN}/releases/download/v${MY_PV}/${MY_P}.tar.gz"
S="${WORKDIR}/${MY_P}"
KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86"
fi
@@ -40,8 +23,15 @@ LICENSE="CC0-1.0 GPL-3+ MIT"
SLOT="0"
IUSE="X"
-CDEPEND="
- ${WLROOTS_DEP}
+if [[ ${PV} == 9999 ]]; then
+ COMMON_DEPEND="~gui-libs/wlroots-9999:=[libinput,session,X?]"
+else
+ COMMON_DEPEND="
+ >=gui-libs/wlroots-0.18:=[libinput,session,X?]
+ <gui-libs/wlroots-0.19:="
+fi
+
+COMMON_DEPEND+="
dev-libs/libinput:=
dev-libs/wayland
x11-libs/libxkbcommon
@@ -51,14 +41,14 @@ CDEPEND="
)
"
RDEPEND="
- ${CDEPEND}
+ ${COMMON_DEPEND}
X? (
x11-base/xwayland
)
"
# uses <linux/input-event-codes.h>
DEPEND="
- ${CDEPEND}
+ ${COMMON_DEPEND}
sys-kernel/linux-headers
"
BDEPEND="
diff --git a/gui-wm/dwl/dwl-9999.ebuild b/gui-wm/dwl/dwl-9999.ebuild
index f94a2aa83609..55db23917d62 100644
--- a/gui-wm/dwl/dwl-9999.ebuild
+++ b/gui-wm/dwl/dwl-9999.ebuild
@@ -5,30 +5,13 @@ EAPI=8
inherit savedconfig toolchain-funcs
-MY_P="${PN}-v${PV}"
-
-WLROOTS_DEP="
- >=gui-libs/wlroots-0.17:=[libinput,session,X?]
- <gui-libs/wlroots-0.18:=
-"
-
-if [[ ${PV} == *9999* ]]; then
+if [[ ${PV} == 9999 ]]; then
EGIT_REPO_URI="https://codeberg.org/dwl/dwl.git"
inherit git-r3
-
- # 9999-r0: main (latest stable wlroots release)
- # 9999-r1: wlroots-next (wlroots-9999)
- case ${PVR} in
- 9999)
- EGIT_BRANCH=main
- ;;
- 9999-r1)
- EGIT_BRANCH=wlroots-next
- WLROOTS_DEP="~gui-libs/wlroots-9999:=[libinput,session,X?]"
- ;;
- esac
else
- SRC_URI="https://codeberg.org/${PN}/${PN}/releases/download/v${PV}/${MY_P}.tar.gz"
+ MY_PV="${PV/_rc/-rc}"
+ MY_P="${PN}-v${MY_PV}"
+ SRC_URI="https://codeberg.org/${PN}/${PN}/releases/download/v${MY_PV}/${MY_P}.tar.gz"
S="${WORKDIR}/${MY_P}"
KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86"
fi
@@ -40,8 +23,15 @@ LICENSE="CC0-1.0 GPL-3+ MIT"
SLOT="0"
IUSE="X"
-CDEPEND="
- ${WLROOTS_DEP}
+if [[ ${PV} == 9999 ]]; then
+ COMMON_DEPEND="~gui-libs/wlroots-9999:=[libinput,session,X?]"
+else
+ COMMON_DEPEND="
+ >=gui-libs/wlroots-0.19:=[libinput,session,X?]
+ <gui-libs/wlroots-0.20:="
+fi
+
+COMMON_DEPEND+="
dev-libs/libinput:=
dev-libs/wayland
x11-libs/libxkbcommon
@@ -51,19 +41,19 @@ CDEPEND="
)
"
RDEPEND="
- ${CDEPEND}
+ ${COMMON_DEPEND}
X? (
x11-base/xwayland
)
"
# uses <linux/input-event-codes.h>
DEPEND="
- ${CDEPEND}
+ ${COMMON_DEPEND}
sys-kernel/linux-headers
"
BDEPEND="
>=dev-libs/wayland-protocols-1.32
- dev-util/wayland-scanner
+ >=dev-util/wayland-scanner-1.23
virtual/pkgconfig
"