summaryrefslogtreecommitdiff
path: root/x11-wm
diff options
context:
space:
mode:
authorMarek Szuba <marecki@gentoo.org>2022-05-24 09:17:07 +0100
committerAndreas Sturmlechner <asturm@gentoo.org>2024-11-29 14:47:36 +0100
commit9757098712e1103f0bacf652708d165c040f33ce (patch)
treea0aa4fa7aec78fba3bb0b24e95441e28975978f5 /x11-wm
parentapp-emulation/nemu: drop 3.0.0 (diff)
downloadgentoo-9757098712e1103f0bacf652708d165c040f33ce.tar.gz
gentoo-9757098712e1103f0bacf652708d165c040f33ce.tar.bz2
gentoo-9757098712e1103f0bacf652708d165c040f33ce.zip
x11-wm/awesome: Sync live ebuild EAPI-8 change to 4.3-r103
1. EAPI 7 -> 8 2. Tests require x11-apps/xeyes Signed-off-by: Andreas Sturmlechner <asturm@gentoo.org>
Diffstat (limited to 'x11-wm')
-rw-r--r--x11-wm/awesome/awesome-4.3-r103.ebuild25
-rw-r--r--x11-wm/awesome/awesome-9999.ebuild5
2 files changed, 16 insertions, 14 deletions
diff --git a/x11-wm/awesome/awesome-4.3-r103.ebuild b/x11-wm/awesome/awesome-4.3-r103.ebuild
index 90d138a59712..c2a60148b3c9 100644
--- a/x11-wm/awesome/awesome-4.3-r103.ebuild
+++ b/x11-wm/awesome/awesome-4.3-r103.ebuild
@@ -1,13 +1,12 @@
# Copyright 1999-2024 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
-EAPI=7
+EAPI=8
LUA_COMPAT=( lua5-{1..3} luajit )
-
inherit cmake desktop lua-single pax-utils
-if [[ ${PV} == *9999 ]] ; then
+if [[ ${PV} == *9999* ]] ; then
inherit git-r3
EGIT_REPO_URI="https://github.com/awesomeWM/${PN}.git"
else
@@ -15,7 +14,7 @@ else
KEYWORDS="amd64 arm ppc ppc64 ~riscv x86"
fi
-DESCRIPTION="A dynamic floating and tiling window manager"
+DESCRIPTION="Dynamic floating and tiling window manager"
HOMEPAGE="https://awesomewm.org/"
LICENSE="GPL-2"
@@ -24,7 +23,8 @@ IUSE="dbus doc gnome test"
REQUIRED_USE="${LUA_REQUIRED_USE}"
-RESTRICT="test" # https://bugs.gentoo.org/654084
+# Doesn't play nicely with the sandbox + requires an active D-BUS session
+RESTRICT="test"
RDEPEND="${LUA_DEPS}
dev-libs/glib:2
@@ -44,11 +44,6 @@ RDEPEND="${LUA_DEPS}
x11-libs/libxkbcommon[X]
x11-libs/libX11
dbus? ( sys-apps/dbus )"
-# ldoc is used by invoking its executable, hence no need for LUA_SINGLE_USEDEP.
-# On the other hand, it means that we should explicitly depend on a version
-# migrated to Lua eclasses so that during the upgrade from unslotted
-# to slotted dev-lang/lua, the package manager knows to emerge migrated
-# ldoc before migrated awesome.
DEPEND="${RDEPEND}
x11-base/xcb-proto
x11-base/xorg-proto
@@ -60,11 +55,19 @@ DEPEND="${RDEPEND}
')
)"
# graphicsmagick's 'convert -channel' has no Alpha support, bug #352282
+# ldoc is used by invoking its executable, hence no need for LUA_SINGLE_USEDEP.
+# On the other hand, it means that we should explicitly depend on a version
+# migrated to Lua eclasses so that during the upgrade from unslotted
+# to slotted dev-lang/lua, the package manager knows to emerge migrated
+# ldoc before migrated awesome.
BDEPEND="app-text/asciidoc
media-gfx/imagemagick[png]
virtual/pkgconfig
doc? ( >=dev-lua/ldoc-1.4.6-r100 )
- test? ( app-shells/zsh )"
+ test? (
+ app-shells/zsh
+ x11-apps/xeyes
+ )"
# Skip installation of README.md by einstalldocs, which leads to broken symlink
DOCS=()
diff --git a/x11-wm/awesome/awesome-9999.ebuild b/x11-wm/awesome/awesome-9999.ebuild
index 65e430dedbbb..083278c15231 100644
--- a/x11-wm/awesome/awesome-9999.ebuild
+++ b/x11-wm/awesome/awesome-9999.ebuild
@@ -4,10 +4,9 @@
EAPI=8
LUA_COMPAT=( lua5-{1..4} luajit )
-
inherit cmake desktop lua-single pax-utils
-if [[ ${PV} == *9999 ]] ; then
+if [[ ${PV} == *9999* ]] ; then
inherit git-r3
EGIT_REPO_URI="https://github.com/awesomeWM/${PN}.git"
else
@@ -15,7 +14,7 @@ else
KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~riscv ~x86"
fi
-DESCRIPTION="A dynamic floating and tiling window manager"
+DESCRIPTION="Dynamic floating and tiling window manager"
HOMEPAGE="https://awesomewm.org/"
LICENSE="GPL-2"