From 6abbf81ef2f298e3221ff5e67a1f3c5f23958212 Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Mon, 14 Dec 2020 13:26:14 +0000 Subject: gentoo resync : 14.12.2020 --- x11-wm/awesome/Manifest | 3 +- x11-wm/awesome/awesome-4.3-r100.ebuild | 137 +++++++++++++++++++++++++++++++++ x11-wm/awesome/awesome-9999.ebuild | 34 ++++---- 3 files changed, 158 insertions(+), 16 deletions(-) create mode 100644 x11-wm/awesome/awesome-4.3-r100.ebuild (limited to 'x11-wm/awesome') diff --git a/x11-wm/awesome/Manifest b/x11-wm/awesome/Manifest index ceb4acb4b127..827446952a40 100644 --- a/x11-wm/awesome/Manifest +++ b/x11-wm/awesome/Manifest @@ -16,5 +16,6 @@ DIST awesome-4.3.tar.xz 1037816 BLAKE2B b4afc5e7bfb01ddc16b67776cc00dd7b0bcbefc9 EBUILD awesome-3.5.9-r3.ebuild 3179 BLAKE2B d7b5a660e5f32bb5bfed3f177aac14dbd1b1c879cb4a6ae9c57cb9676e1e4e17ac327e846d263ef88ee7297c1fa43a11450aadf557a107fb9e592e57a757b066 SHA512 547fb63ae5779f4046b3e3cc1a84d052a71d74a70aa4b9d42c595dd443c7f56f74d3f2121596b0a312dce98b26247ca967d45f236f73deae2879827dd9d121c5 EBUILD awesome-4.2-r3.ebuild 3947 BLAKE2B 30c377ec58fd84c01929d4bdb04fd3d65757a67336af701421dcd98a4853ff40bc57d443a809cd13fb4c2c93d3f203357c208b0ee150ace42116d3dbda9a99ba SHA512 81b79af79fe5dbff19bb708a98233dfc72f40057300f5dbb1608e6dc9de79662116d3d52ecbcf962c2b852884bed8db1da35dd444fbdbb64bb949c207bee4c60 EBUILD awesome-4.3-r1.ebuild 3596 BLAKE2B 60a3a026cef8d75ea7feff3154821e09c849f394d26b1a55d8280cec0b43628d4c870748537cba9ef66db76a433b30c7d8637843d2972225fe621efdf03ec4e1 SHA512 f4b0e1ae8980ce71204a72bf37b730cb080532595d568310d8fabd830f21c48d6c4a00ff6ed382f27ef7c9203cc8697f9a8ec912cff013682286e92bc4d30b72 -EBUILD awesome-9999.ebuild 3558 BLAKE2B 8838870e76af67a7fea184bc82d6a3099820d96d18a69b028d1191a47cab895152a4d80ddc18a4a28b2b70699d0ddd169763fbcfe20d626d527bc8cdd4106845 SHA512 cc4678cd1820b7ac927332dfc6bd400157c1a76fb1536d15308c1da09f89f37c00dfd3790e0f8d1c707e2f6db2ea90592ab905c08aae3dcb843840664a1e7fe6 +EBUILD awesome-4.3-r100.ebuild 3686 BLAKE2B 34a092c1333c1a6e05488141e278acab83ebf0a0c81fae08cd9e8ee75eeb2f6bd7e3af7711b6cdc611f31d51d318636611c55cc7c8e62e6a9d66dd9d8ad0b29f SHA512 742ecb30a5b78e844201d25d9cb5ad419e3372ae60813ca227da5085f9142c7023bb3655b5b16a42d22a72df8f003349a077f725e3be563ea9a4e8aff31ddb5b +EBUILD awesome-9999.ebuild 3648 BLAKE2B 0e83667767a33e68bb84940682f89d0e1c36b8d80e769b244c8cd78d5b87ffa591e15d4fdf793f25ceb6587948109d434f3e882b4cd665f33ff5f68b88681742 SHA512 c6b74266d83b42df45d5c9ecea4604fb9ce372e243013ee896bc5f34dbc377ee115221fc9276e5f23b0c946bd6022b782ae363c3720842ce1f50256c57f97208 MISC metadata.xml 331 BLAKE2B 177b7ac838fb250b847c6a596c17e7a998715672112462c6c438ec15442b32d2402d87da6d4578e2b78d7bd2a16671a7df7974bebb645e0892bb3f785f95937a SHA512 14550c266d8de65db614c3f0893da85487656bef5166a2829e8a2bc636c50bbd1a505ff7972bc6c5ca553bdcb35caeb1dc4697171d4810ec9fe73420f880ebea 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 -- cgit v1.2.3