commit: 5b3cc8e821857eedf95d55ac99f4262928c83aa8 Author: Marek Szuba <marecki <AT> gentoo <DOT> org> AuthorDate: Thu Dec 3 21:49:11 2020 +0000 Commit: Marek Szuba <marecki <AT> gentoo <DOT> org> CommitDate: Thu Dec 3 21:52:41 2020 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=5b3cc8e8
x11-wm/awesome: migrate to lua-single.eclass Both the latest release and the live ebuild. In addition to supporting slotted Lua, this should also ensure Lua-version consistency between Awesome and dev-lua/lgi. Explicitly invoking maintainer time-out on this one. Closes: https://bugs.gentoo.org/508682 Closes: https://bugs.gentoo.org/752969 Signed-off-by: Marek Szuba <marecki <AT> gentoo.org> profiles/package.mask | 1 + ...awesome-9999.ebuild => awesome-4.3-r100.ebuild} | 40 ++++++++++++---------- x11-wm/awesome/awesome-9999.ebuild | 34 ++++++++++-------- 3 files changed, 42 insertions(+), 33 deletions(-) diff --git a/profiles/package.mask b/profiles/package.mask index 5edd318c2ef..4f1acfaf749 100644 --- a/profiles/package.mask +++ b/profiles/package.mask @@ -594,6 +594,7 @@ dev-lua/luacrypto >=www-client/luakit-2.2.1-r100 >=www-servers/lighttpd-1.4.55-r100 >=x11-misc/devilspie2-0.43-r100 +>=x11-wm/awesome-4.3-r100 # Azamat H. Hackimov <[email protected]> (2020-10-06) # 1.3.3 is broken and failing unittests for net-im/prosody. Bug #746782. diff --git a/x11-wm/awesome/awesome-9999.ebuild b/x11-wm/awesome/awesome-4.3-r100.ebuild similarity index 81% copy from x11-wm/awesome/awesome-9999.ebuild copy to x11-wm/awesome/awesome-4.3-r100.ebuild index f4b885d7a54..56bd122ae47 100644 --- a/x11-wm/awesome/awesome-9999.ebuild +++ b/x11-wm/awesome/awesome-4.3-r100.ebuild @@ -3,24 +3,27 @@ EAPI=7 -inherit cmake-utils desktop git-r3 pax-utils +LUA_COMPAT=( lua5-{1..3} luajit ) + +inherit cmake desktop lua-single pax-utils DESCRIPTION="A dynamic floating and tiling window manager" HOMEPAGE="https://awesomewm.org/"; -EGIT_REPO_URI="https://github.com/awesomeWM/${PN}.git"; +SRC_URI="https://github.com/awesomeWM/awesome-releases/raw/master/${P}.tar.xz"; LICENSE="GPL-2" SLOT="0" -KEYWORDS="" -IUSE="dbus doc gnome luajit test" +KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~x86" +IUSE="dbus doc gnome test" + +REQUIRED_USE="${LUA_REQUIRED_USE}" + RESTRICT="test" -RDEPEND=" - >=dev-lang/lua-5.1:0 - luajit? ( dev-lang/luajit:2 ) +RDEPEND="${LUA_DEPS} dev-libs/glib:2 >=dev-libs/libxdg-basedir-1 - >=dev-lua/lgi-0.8 + $(lua_gen_cond_dep 'dev-lua/lgi[${LUA_USEDEP}]') x11-libs/cairo[X,xcb(+)] x11-libs/gdk-pixbuf:2 >=x11-libs/libxcb-1.6[xkb] @@ -38,6 +41,7 @@ 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 DEPEND="${RDEPEND} >=app-text/asciidoc-8.4.5 app-text/xmlto @@ -50,8 +54,10 @@ DEPEND="${RDEPEND} test? ( app-shells/zsh x11-base/xorg-server[xvfb] - dev-lua/busted - dev-lua/luacheck + $(lua_gen_cond_dep ' + dev-lua/busted[${LUA_USEDEP}] + dev-lua/luacheck[${LUA_USEDEP}] + ') ) " @@ -68,24 +74,22 @@ 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)" + -DLUA_LIBRARY="$(lua_get_shared_lib)" ) - if use luajit; then - mycmakeargs+=("-DLUA_INCLUDE_DIR=${EPREFIX}/usr/include/luajit-2.0") - mycmakeargs+=("-DLUA_LIBRARY=${EPREFIX}/usr/$(get_libdir)/libluajit-5.1.so") - fi - cmake-utils_src_configure + cmake_src_configure } src_test() { # awesome's test suite starts Xvfb by itself, no need for virtualx eclass - HEADLESS=1 cmake-utils_src_make check -j1 + HEADLESS=1 cmake_src_make check -j1 } src_install() { - cmake-utils_src_install + cmake_src_install rm "${ED}"/usr/share/doc/${PF}/LICENSE || die pax-mark m "${ED}"/usr/bin/awesome diff --git a/x11-wm/awesome/awesome-9999.ebuild b/x11-wm/awesome/awesome-9999.ebuild index f4b885d7a54..e418a13243a 100644 --- a/x11-wm/awesome/awesome-9999.ebuild +++ b/x11-wm/awesome/awesome-9999.ebuild @@ -3,7 +3,9 @@ EAPI=7 -inherit cmake-utils desktop git-r3 pax-utils +LUA_COMPAT=( lua5-{1..3} luajit ) + +inherit cmake desktop git-r3 lua-single pax-utils DESCRIPTION="A dynamic floating and tiling window manager" HOMEPAGE="https://awesomewm.org/"; @@ -12,15 +14,16 @@ EGIT_REPO_URI="https://github.com/awesomeWM/${PN}.git"; LICENSE="GPL-2" SLOT="0" KEYWORDS="" -IUSE="dbus doc gnome luajit test" +IUSE="dbus doc gnome test" + +REQUIRED_USE="${LUA_REQUIRED_USE}" + RESTRICT="test" -RDEPEND=" - >=dev-lang/lua-5.1:0 - luajit? ( dev-lang/luajit:2 ) +RDEPEND="${LUA_DEPS} dev-libs/glib:2 >=dev-libs/libxdg-basedir-1 - >=dev-lua/lgi-0.8 + $(lua_gen_cond_dep 'dev-lua/lgi[${LUA_USEDEP}]') x11-libs/cairo[X,xcb(+)] x11-libs/gdk-pixbuf:2 >=x11-libs/libxcb-1.6[xkb] @@ -38,6 +41,7 @@ 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 DEPEND="${RDEPEND} >=app-text/asciidoc-8.4.5 app-text/xmlto @@ -50,8 +54,10 @@ DEPEND="${RDEPEND} test? ( app-shells/zsh x11-base/xorg-server[xvfb] - dev-lua/busted - dev-lua/luacheck + $(lua_gen_cond_dep ' + dev-lua/busted[${LUA_USEDEP}] + dev-lua/luacheck[${LUA_USEDEP}] + ') ) " @@ -71,21 +77,19 @@ src_configure() { -DWITH_DBUS=$(usex dbus ON OFF) -DGENERATE_DOC=$(usex doc) -DAWESOME_DOC_PATH="${EPREFIX}"/usr/share/doc/${PF} + -DLUA_INCLUDE_DIR="$(lua_get_include_dir)" + -DLUA_LIBRARY="$(lua_get_shared_lib)" ) - if use luajit; then - mycmakeargs+=("-DLUA_INCLUDE_DIR=${EPREFIX}/usr/include/luajit-2.0") - mycmakeargs+=("-DLUA_LIBRARY=${EPREFIX}/usr/$(get_libdir)/libluajit-5.1.so") - fi - cmake-utils_src_configure + cmake_src_configure } src_test() { # awesome's test suite starts Xvfb by itself, no need for virtualx eclass - HEADLESS=1 cmake-utils_src_make check -j1 + HEADLESS=1 cmake_src_make check -j1 } src_install() { - cmake-utils_src_install + cmake_src_install rm "${ED}"/usr/share/doc/${PF}/LICENSE || die pax-mark m "${ED}"/usr/bin/awesome
