Get Gentoo!
gentoo.org sites
gentoo.org Wiki Bugs Forums Packages
Planet Archives Sources
Infra Status
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--profiles/package.mask1
-rw-r--r--x11-wm/awesome/awesome-4.3-r100.ebuild137
-rw-r--r--x11-wm/awesome/awesome-9999.ebuild34
3 files changed, 157 insertions, 15 deletions
diff --git a/profiles/package.mask b/profiles/package.mask
index 5edd318c2ef7..4f1acfaf7492 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 <azamat.hackimov@gmail.com> (2020-10-06)
# 1.3.3 is broken and failing unittests for net-im/prosody. Bug #746782.
diff --git a/x11-wm/awesome/awesome-4.3-r100.ebuild b/x11-wm/awesome/awesome-4.3-r100.ebuild
new file mode 100644
index 000000000000..56bd122ae470
--- /dev/null
+++ b/x11-wm/awesome/awesome-4.3-r100.ebuild
@@ -0,0 +1,137 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+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/"
+SRC_URI="https://github.com/awesomeWM/awesome-releases/raw/master/${P}.tar.xz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~x86"
+IUSE="dbus doc gnome test"
+
+REQUIRED_USE="${LUA_REQUIRED_USE}"
+
+RESTRICT="test"
+
+RDEPEND="${LUA_DEPS}
+ dev-libs/glib:2
+ >=dev-libs/libxdg-basedir-1
+ $(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]
+ >=x11-libs/pango-1.19.3[introspection]
+ >=x11-libs/startup-notification-0.10_p20110426
+ >=x11-libs/xcb-util-0.3.8
+ x11-libs/xcb-util-cursor
+ >=x11-libs/xcb-util-keysyms-0.3.4
+ >=x11-libs/xcb-util-wm-0.3.8
+ >=x11-libs/xcb-util-xrm-1.0
+ x11-libs/libXcursor
+ x11-libs/libxkbcommon[X]
+ >=x11-libs/libX11-1.3.99.901
+ dbus? ( >=sys-apps/dbus-1 )
+"
+
+# 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
+ dev-util/gperf
+ virtual/pkgconfig
+ media-gfx/imagemagick[png]
+ >=x11-base/xcb-proto-1.5
+ x11-base/xorg-proto
+ doc? ( dev-lua/ldoc )
+ test? (
+ app-shells/zsh
+ x11-base/xorg-server[xvfb]
+ $(lua_gen_cond_dep '
+ dev-lua/busted[${LUA_USEDEP}]
+ dev-lua/luacheck[${LUA_USEDEP}]
+ ')
+ )
+"
+
+# 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
+ "${FILESDIR}/${PN}-4.0-cflag-cleanup.patch" # bug #509658
+)
+
+src_configure() {
+ # Compression of manpages is handled by portage
+ local mycmakeargs=(
+ -DSYSCONFDIR="${EPREFIX}"/etc
+ -DCOMPRESS_MANPAGES=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)"
+ )
+ cmake_src_configure
+}
+
+src_test() {
+ # awesome's test suite starts Xvfb by itself, no need for virtualx eclass
+ HEADLESS=1 cmake_src_make check -j1
+}
+
+src_install() {
+ cmake_src_install
+ rm "${ED}"/usr/share/doc/${PF}/LICENSE || die
+
+ pax-mark m "${ED}"/usr/bin/awesome
+
+ exeinto /etc/X11/Sessions
+ newexe "${FILESDIR}"/${PN}-session ${PN}
+
+ # GNOME-based awesome
+ if use gnome; then
+ # GNOME session
+ insinto /usr/share/gnome-session/sessions
+ newins "${FILESDIR}"/${PN}-gnome-3.session ${PN}-gnome.session
+
+ # Application launcher
+ domenu "${FILESDIR}"/${PN}-gnome.desktop
+
+ # X Session
+ insinto /usr/share/xsessions
+ doins "${FILESDIR}"/${PN}-gnome-xsession.desktop
+ fi
+
+ # This directory contains SVG images which we don't want to compress
+ use doc && touch "${ED}"/usr/share/doc/${PF}/doc/images.ecompress.skip
+}
+
+pkg_postinst() {
+ # bug #447308
+ if use gnome; then
+ elog "You have enabled the gnome USE flag."
+ elog "Please note that quitting awesome won't kill your gnome session."
+ elog "To really quit the session, you should bind your quit key"
+ elog "to the following command:"
+ elog " gnome-session-quit --logout"
+ elog "For more info visit"
+ elog " https://bugs.gentoo.org/show_bug.cgi?id=447308"
+ fi
+
+ # bug #440724
+ elog "If you are having issues with Java application windows being"
+ elog "completely blank, try installing"
+ elog " x11-misc/wmname"
+ elog "and setting the WM name to LG3D."
+ elog "For more info visit"
+ elog " https://bugs.gentoo.org/show_bug.cgi?id=440724"
+}
diff --git a/x11-wm/awesome/awesome-9999.ebuild b/x11-wm/awesome/awesome-9999.ebuild
index f4b885d7a540..e418a13243ae 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