summaryrefslogtreecommitdiff
path: root/x11-wm
diff options
context:
space:
mode:
authorMarek Szuba <marecki@gentoo.org>2021-01-18 12:24:02 +0000
committerMarek Szuba <marecki@gentoo.org>2021-01-18 12:27:40 +0000
commitfbdc76f4b34925b76ddc9ca71b93db76f02a5560 (patch)
tree0a9ccd923aff17e0f50c8bdc9cc4385334ec071b /x11-wm
parentx11-wm/awesome: merge Jakov's changes into the slotted-Lua ebuild (diff)
downloadgentoo-fbdc76f4b34925b76ddc9ca71b93db76f02a5560.tar.gz
gentoo-fbdc76f4b34925b76ddc9ca71b93db76f02a5560.tar.bz2
gentoo-fbdc76f4b34925b76ddc9ca71b93db76f02a5560.zip
x11-wm/awesome-9999: sync with the latest release ebuild
Mostly cosmetic changes. Signed-off-by: Marek Szuba <marecki@gentoo.org>
Diffstat (limited to 'x11-wm')
-rw-r--r--x11-wm/awesome/awesome-9999.ebuild13
1 files changed, 6 insertions, 7 deletions
diff --git a/x11-wm/awesome/awesome-9999.ebuild b/x11-wm/awesome/awesome-9999.ebuild
index 084636a02de2..1c3583824abf 100644
--- a/x11-wm/awesome/awesome-9999.ebuild
+++ b/x11-wm/awesome/awesome-9999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=7
@@ -44,9 +44,7 @@ RDEPEND="${LUA_DEPS}
x11-libs/libxkbcommon[X]
x11-libs/libX11
dbus? ( sys-apps/dbus )"
-
-# graphicsmagick's 'convert -channel' has no Alpha support, bug #352282
-# ldoc is used by invoking its executable, hence no need for LUA_SINGLE_USEDEP
+# 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
@@ -61,8 +59,8 @@ DEPEND="${RDEPEND}
dev-lua/luacheck[${LUA_USEDEP}]
')
)"
-BDEPEND="
- app-text/asciidoc
+# graphicsmagick's 'convert -channel' has no Alpha support, bug #352282
+BDEPEND="app-text/asciidoc
media-gfx/imagemagick[png]
virtual/pkgconfig
doc? ( >=dev-lua/ldoc-1.4.6-r100 )
@@ -70,6 +68,7 @@ BDEPEND="
# Skip installation of README.md by einstalldocs, which leads to broken symlink
DOCS=()
+
PATCHES=(
"${FILESDIR}"/${PN}-4.0-convert-path.patch # bug #408025
"${FILESDIR}"/${PN}-xsession.patch # bug #408025
@@ -81,7 +80,7 @@ src_configure() {
local mycmakeargs=(
-DSYSCONFDIR="${EPREFIX}"/etc
-DCOMPRESS_MANPAGES=OFF
- -DWITH_DBUS=$(usex dbus ON OFF)
+ -DWITH_DBUS=$(usex dbus)
-DGENERATE_DOC=$(usex doc)
-DAWESOME_DOC_PATH="${EPREFIX}"/usr/share/doc/${PF}
-DLUA_INCLUDE_DIR="$(lua_get_include_dir)"