From abaa75b10f899ada8dd05b23cc03205064394bc6 Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Fri, 22 Jan 2021 20:28:19 +0000 Subject: gentoo resync : 22.01.2021 --- x11-wm/awesome/Manifest | 14 +- x11-wm/awesome/awesome-4.2-r3.ebuild | 141 -------------------- x11-wm/awesome/awesome-4.3-r100.ebuild | 142 -------------------- x11-wm/awesome/awesome-4.3-r101.ebuild | 144 +++++++++++++++++++++ x11-wm/awesome/awesome-4.3-r2.ebuild | 6 +- x11-wm/awesome/awesome-9999.ebuild | 15 +-- .../files/awesome-3.5.5-cflag-cleanup.patch | 12 -- .../awesome-3.5.5-util.lua-xdg-icons-fix.patch | 46 ------- .../awesome/files/awesome-3.5.9-slotted-lua.patch | 51 -------- .../files/awesome-3.5_rc1-convert-path.patch | 12 -- x11-wm/awesome/metadata.xml | 4 +- 11 files changed, 160 insertions(+), 427 deletions(-) delete mode 100644 x11-wm/awesome/awesome-4.2-r3.ebuild delete mode 100644 x11-wm/awesome/awesome-4.3-r100.ebuild create mode 100644 x11-wm/awesome/awesome-4.3-r101.ebuild delete mode 100644 x11-wm/awesome/files/awesome-3.5.5-cflag-cleanup.patch delete mode 100644 x11-wm/awesome/files/awesome-3.5.5-util.lua-xdg-icons-fix.patch delete mode 100644 x11-wm/awesome/files/awesome-3.5.9-slotted-lua.patch delete mode 100644 x11-wm/awesome/files/awesome-3.5_rc1-convert-path.patch (limited to 'x11-wm/awesome') diff --git a/x11-wm/awesome/Manifest b/x11-wm/awesome/Manifest index e1593db1c640..547a57da2083 100644 --- a/x11-wm/awesome/Manifest +++ b/x11-wm/awesome/Manifest @@ -1,7 +1,3 @@ -AUX awesome-3.5.5-cflag-cleanup.patch 660 BLAKE2B 0c4311d7d125161c44ed668da6ce1e2bc0e2c5a1850c2341e4caec764a2673f99570f06856c815454f6cc6204bb7b71bbd416e862156cc40c47bf0343a6e1ae6 SHA512 5711e328839ce32789fe213c2c1d6b56e476d7ba09303d52dc5c307a97b35bbdc1c9c0d673a51b5859a2c0f035002152c762e3cd725c4231bc811dfac5dad79f -AUX awesome-3.5.5-util.lua-xdg-icons-fix.patch 1756 BLAKE2B fe0ba6026faaa674f2b461d95cb6b829d31e74aad8b9e5559c598dec46c62a3218beb4cfa075ca7028d74f902ae5b16949fac7cbf4bac06f436d1460dcd457c0 SHA512 8348b51a90ac9f0423de1e5ae81aeee6dc8da8e249bcee09a0ddf89c582b34f1f420ef579d58c717078bbf7eedb6cbe36782bf9cfddbe2bd27e96c726bd493d6 -AUX awesome-3.5.9-slotted-lua.patch 1982 BLAKE2B 03665832ee2e65b40754c6989c1f5ea0993ca52cc4856960de2fabb03827ecfdd0378095905435c0aa3a73404597014af6788edd45a57671db038557672257b9 SHA512 72716903616f71de79c3f85e72f12c0abd7f353972838b8d2a74ca2739dc36ec44e24ccc3b2f6cd17514f40565f9a484dbf3194834b7f1bd7dc98316dc0b48e6 -AUX awesome-3.5_rc1-convert-path.patch 539 BLAKE2B 4904c47c165384dadf6229c1d92cbc313df1e70566b894b9b325d24d457b99d53544e885f6c086073c903aca6f2b365eb2384145c85194f1ab91740dee5142b6 SHA512 b5b8f42ddd21bf851e13fe0a0d844b055795979ae701a418780a2e0282cedd1ae745f00c13e5a0f5b9ac48a70c2ffbf7d9b7dd2856783a4b0434b09683947150 AUX awesome-4.0-cflag-cleanup.patch 395 BLAKE2B 02865c0e99fc81e00e501758d95eb47ebb3960575258c42550f1530d97aff14256911b8107eac606261ee427399934d877d9f116a624216dfee143fd9eb4a8f4 SHA512 e9ffe2b66046e0ebbc0bb3c0b8f9bd67bd7d8d351792e299730abfbd8f284dd0631e87b27a8ba22587e9059b13d13381902efb4b9423348b735021eaee779e9c AUX awesome-4.0-convert-path.patch 257 BLAKE2B 7f4504273e155c6ae70fc8aefa067513af32fa6fc38efeab1a642e8594910bbbb559dbfad33c703420b0fa64e3aef9289750f92a41aa5d76e29161f32a1cb6a3 SHA512 3eadbc1d14a18e3d669bb8ecf3769ff888d4b30328f0167166c8632498ad50bf21f004098960507a1b96c5bd5f76a4fcdc74022d820d2d809175ec2829a26f5d AUX awesome-4.3-fno-common.patch 4337 BLAKE2B 69f4e21b1fdceef56b65ed605704f0abd367e8cd78cd246387672ea64a450d94a882482e72dbfed80482e0eb2e8ec5bd8d8309e0505ae59c78679334ffa64f45 SHA512 48960ee3ca16c69f698c383ad7ad1f0fb33e79ba614b0fdb2f9e67fe00bc882ef4b257d9beb9829ed3938cf5e8f1c7f5d140066b18aca4b3159e8ccb1e0c2186 @@ -11,10 +7,8 @@ AUX awesome-gnome.desktop 191 BLAKE2B 8076b398c42443f48dc83f0cd12e56ff342713c937 AUX awesome-gnome.session 220 BLAKE2B ea84c3a24feb5c9921940dedd6f3fa05a6987b6aab96b2113be6215b0bd94d9bb73524ebaea8ad76a05b1ece0d76265aab82930048acd05912c9e127b0cdb868 SHA512 86246ddd9db41007c23735d0773b5c6d37eeda33318d9e3e33f57fb46befdd32380aaf9fb6bf539a9080e5f2400ccf5d7de55842c420c458b8e8d62a5edae09b AUX awesome-session 1999 BLAKE2B c7c784fba884ff0e579eb60cb049e695022be162a535065a172c461ec60d369415faa26be7cd60645e671ae8b2861b192ff962b803473746b567ef874bc706e9 SHA512 b6e7cc0813569b448b030cb8516d0272ebcf60b96f680b7de43dc4374e6e2d85b9bd841c6f1ab62caca52120c303332653e3de38eca0fe6a813b9bc5b68ac8b7 AUX awesome-xsession.patch 291 BLAKE2B fb8ca929487ef45cd64c44bbb3db2b7c4a1be4f5abf5f8fa7467694226bdcd1441bd5c601f0f27e7d2c8656bb4c75cb364cd6d8d641a648611ed2658b27cd389 SHA512 1d19f3ac5e9f8fd1084fd5e092d52ffbabb06fc3dc94f6f8e62834a3a03bd5bcb04adc698ac3a022c5446a07a847be35e3f3003e8bc9e7d35c6c82350517233d -DIST awesome-4.2.tar.xz 987024 BLAKE2B b2aaa993bafa83121d165d21083dfcac825e373be9547490f8b93b8e8b0f90470395a0238affaf9990f719b8bd2f36a255f6468b6422406787a3c96946c4e831 SHA512 134dd3625c86243861b3d0701cc8bfd8c00986d7027f0832016c3f5e59e6b9a1ef2f677bb0d1d66ece63449533e4b13d8d7388e96e6f9014212030a79f163e09 DIST awesome-4.3.tar.xz 1037816 BLAKE2B b4afc5e7bfb01ddc16b67776cc00dd7b0bcbefc9d17f9bec9c04256953858aef2bf0e4b15a525909029b7da771ade0d749758aba2878832f356d7b2c4f0363b7 SHA512 c5ef1e8dc593e7783b895d22143154aea8f211beeda24672a7ee4ed5112b4f4284043f848a151f3d3c4f569e91308670367a4353f705b20511b36495b22fa3f5 -EBUILD awesome-4.2-r3.ebuild 3947 BLAKE2B 30c377ec58fd84c01929d4bdb04fd3d65757a67336af701421dcd98a4853ff40bc57d443a809cd13fb4c2c93d3f203357c208b0ee150ace42116d3dbda9a99ba SHA512 81b79af79fe5dbff19bb708a98233dfc72f40057300f5dbb1608e6dc9de79662116d3d52ecbcf962c2b852884bed8db1da35dd444fbdbb64bb949c207bee4c60 -EBUILD awesome-4.3-r100.ebuild 4023 BLAKE2B ca7557098a8076be2d2328d6ac49bf1ff2c401678b25a51c0ab19471740135f9ae96ff25d44dd20c2d4daf60c8e67e80bb4569dccaec8121c1bb76441770dfcd SHA512 1c53f85c2800260732db600d066ea5a02d2957d77ec3962c8fbf97706958e8d2e3d1e99a7fb16c786527fad698d949d804ce996337f570f64ab8ab82d0821c37 -EBUILD awesome-4.3-r2.ebuild 3654 BLAKE2B 1a047847e731604f4080bd86668504434db4caa68eec9e4567bedb7395d861c81fe80bfab3539bc5a968a9d9adc7a25b4842d29103da6774829dc545c6f900d0 SHA512 b3ea15c1fc8df4a08b8db393f4042f7cfb6c39f890db10cac25f3270366505c942a72ea404951d82d491228349f8c2445e6629ddd43142b2d34b4eacde8ba87e -EBUILD awesome-9999.ebuild 3988 BLAKE2B 57c1555b20b642de88b7f50ac4c995993b95c9417160a0dbc8a8297228ca3fdbf2fe1453f1e38d9eedb6727b550c21beb3d920369cc71a1f038d50057d68b761 SHA512 42548e6ab10bbe52ce089c5281d5a27a8d5c6d4312b88a7e906700d38ada1cb018d014fdd18dc99f17636434ce680408dba477fda60f0379bdbc0707c205b902 -MISC metadata.xml 331 BLAKE2B 177b7ac838fb250b847c6a596c17e7a998715672112462c6c438ec15442b32d2402d87da6d4578e2b78d7bd2a16671a7df7974bebb645e0892bb3f785f95937a SHA512 14550c266d8de65db614c3f0893da85487656bef5166a2829e8a2bc636c50bbd1a505ff7972bc6c5ca553bdcb35caeb1dc4697171d4810ec9fe73420f880ebea +EBUILD awesome-4.3-r101.ebuild 4018 BLAKE2B d9cf27c7dc9bc200c277c7517916ac9ce444a567fefba8e83b8d73dcad68041d68c5e6c06c6300b0ef9327f5f463cd9089e1d79a0e37ea44f362f8fc0145c8a1 SHA512 6a340fcedffc2162b5029c6c04c4f5e1998096154cef36d62b1d156b8a6041dddbbd261b3d350505d3e54533f58b588adb6ea03e769a491d731b8cc343769983 +EBUILD awesome-4.3-r2.ebuild 3628 BLAKE2B 13d41fa0d81ac06d95294d603e19caa5d50d2307b482746eea0f9603b215790503cedd75490a0cab49880b66f1215f22b901748cc78e4a91bc0ede95533fda54 SHA512 c662a249779837b4397fe749113c78f87c0f2312cc76ce13926b2732fabd5e12fe97baec4c9a41816178925b3da65821dfdeab7b4a4089b69883cd6f7d1a3284 +EBUILD awesome-9999.ebuild 3959 BLAKE2B c8198273b9ad36c5dabfc202bd4d64438b8156370a9a1220f5b0b36d4422a64c493cbe9116b25a69016474e3c4ae1d7445925961f2f9d2d3ad0f7e033f9aa59b SHA512 bf6b1b79f597e476a6754c6bbd24e50311e10f137d89ec7fb65d4d4e683ca12f65f71f51bc9e6f014a65528489520b4b01891d4fc00f43289e5a80e55339880c +MISC metadata.xml 327 BLAKE2B 2b34d6e8f8e02580c16d30bf9d65e33e29447c848fe58f4fb2324d0d3adbe93e7ba7eaeb440d1bd987ce300f21116742383b59c3fe53c15176a14eda684c6a5e SHA512 4bfbb536edf61389e39e0f6ae53e7255a4f2cf78f197f44317be2e11419ddb950b2aab540d48a1552c2b4c9cc050665ba944e10da5227f95ddacac29ed741276 diff --git a/x11-wm/awesome/awesome-4.2-r3.ebuild b/x11-wm/awesome/awesome-4.2-r3.ebuild deleted file mode 100644 index adaf85cd6a08..000000000000 --- a/x11-wm/awesome/awesome-4.2-r3.ebuild +++ /dev/null @@ -1,141 +0,0 @@ -# Copyright 1999-2020 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 - -inherit cmake-utils desktop pax-utils versionator - -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 luajit test" -RESTRICT="test" - -RDEPEND=" - >=dev-lang/lua-5.1:0 - luajit? ( dev-lang/luajit:2 ) - dev-libs/glib:2 - >=dev-libs/libxdg-basedir-1 - >=dev-lua/lgi-0.8 - 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 -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] - dev-lua/busted - dev-lua/luacheck - ) -" - -# 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} - ) - 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 -} - -src_test() { - # awesome's test suite starts Xvfb by itself, no need for virtualx eclass - HEADLESS=1 cmake-utils_src_make check -j1 -} - -src_install() { - cmake-utils_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" - - for v in ${REPLACING_VERSIONS}; do - if [ "$(get_major_version ${v})" = "3" ]; then - elog "Awesome-4 introduced breaking changes. For release notes and porting guide see" - elog "https://awesomewm.org/apidoc/documentation/89-NEWS.md.html#v4 and" - elog "https://awesomewm.org/apidoc/documentation/17-porting-tips.md.html#v4" - fi - done -} diff --git a/x11-wm/awesome/awesome-4.3-r100.ebuild b/x11-wm/awesome/awesome-4.3-r100.ebuild deleted file mode 100644 index b0898a645c68..000000000000 --- a/x11-wm/awesome/awesome-4.3-r100.ebuild +++ /dev/null @@ -1,142 +0,0 @@ -# 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[introspection] - >=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. -# 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} - >=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-1.4.6-r100 ) - 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 - "${FILESDIR}/${PN}-4.3-fno-common.patch" # bug #707262 -) - -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-4.3-r101.ebuild b/x11-wm/awesome/awesome-4.3-r101.ebuild new file mode 100644 index 000000000000..48a04ca56869 --- /dev/null +++ b/x11-wm/awesome/awesome-4.3-r101.ebuild @@ -0,0 +1,144 @@ +# Copyright 1999-2021 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 + +if [[ ${PV} == *9999 ]] ; then + inherit git-r3 + EGIT_REPO_URI="https://github.com/awesomeWM/${PN}.git" +else + SRC_URI="https://github.com/awesomeWM/awesome-releases/raw/master/${P}.tar.xz" + KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~x86" +fi + +DESCRIPTION="A dynamic floating and tiling window manager" +HOMEPAGE="https://awesomewm.org/" + +LICENSE="GPL-2" +SLOT="0" +IUSE="dbus doc gnome test" + +REQUIRED_USE="${LUA_REQUIRED_USE}" + +RESTRICT="test" # https://bugs.gentoo.org/654084 + +RDEPEND="${LUA_DEPS} + dev-libs/glib:2 + dev-libs/libxdg-basedir + $(lua_gen_cond_dep 'dev-lua/lgi[${LUA_USEDEP}]') + x11-libs/cairo[X,xcb(+)] + x11-libs/gdk-pixbuf:2 + x11-libs/libxcb[xkb] + x11-libs/pango[introspection] + x11-libs/startup-notification + x11-libs/xcb-util + x11-libs/xcb-util-cursor + x11-libs/xcb-util-keysyms + x11-libs/xcb-util-wm + x11-libs/xcb-util-xrm + x11-libs/libXcursor + 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 + test? ( + x11-base/xorg-server[xvfb] + $(lua_gen_cond_dep ' + dev-lua/busted[${LUA_USEDEP}] + dev-lua/luacheck[${LUA_USEDEP}] + ') + )" +# 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 ) + test? ( app-shells/zsh )" + +# 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 + "${FILESDIR}"/${PN}-4.3-fno-common.patch # bug #707262 +) + +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_build 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 && docompress -x /usr/share/doc/${PF}/doc +} + +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-4.3-r2.ebuild b/x11-wm/awesome/awesome-4.3-r2.ebuild index 206d64b0eb27..c402663215fd 100644 --- a/x11-wm/awesome/awesome-4.3-r2.ebuild +++ b/x11-wm/awesome/awesome-4.3-r2.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 @@ -10,7 +10,7 @@ if [[ ${PV} == *9999 ]] ; then EGIT_REPO_URI="https://github.com/awesomeWM/${PN}.git" else SRC_URI="https://github.com/awesomeWM/awesome-releases/raw/master/${P}.tar.xz" - KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~x86" + KEYWORDS="amd64 arm ppc ppc64 x86" fi DESCRIPTION="A dynamic floating and tiling window manager" @@ -114,7 +114,7 @@ src_install() { 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 + use doc && docompress -x /usr/share/doc/${PF}/doc } pkg_postinst() { diff --git a/x11-wm/awesome/awesome-9999.ebuild b/x11-wm/awesome/awesome-9999.ebuild index 9c4176a67a08..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)" @@ -119,7 +118,7 @@ src_install() { 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 + use doc && docompress -x /usr/share/doc/${PF}/doc } pkg_postinst() { diff --git a/x11-wm/awesome/files/awesome-3.5.5-cflag-cleanup.patch b/x11-wm/awesome/files/awesome-3.5.5-cflag-cleanup.patch deleted file mode 100644 index 3cfeaba2df36..000000000000 --- a/x11-wm/awesome/files/awesome-3.5.5-cflag-cleanup.patch +++ /dev/null @@ -1,12 +0,0 @@ -diff -u awesome-3.5.5/awesomeConfig.cmake awesome-3.5.5.new/awesomeConfig.cmake ---- awesome-3.5.5/awesomeConfig.cmake 2014-08-24 23:28:04.178646000 -0400 -+++ awesome-3.5.5.new/awesomeConfig.cmake 2014-08-24 23:28:44.204646000 -0400 -@@ -16,7 +16,7 @@ - option(GENERATE_DOC "generate API documentation" ON) - - # {{{ CFLAGS --add_definitions(-O1 -std=gnu99 -ggdb3 -rdynamic -fno-strict-aliasing -Wall -Wextra -+add_definitions(-std=gnu99 -fno-strict-aliasing -Wall -Wextra - -Wchar-subscripts -Wundef -Wshadow -Wcast-align -Wwrite-strings - -Wsign-compare -Wunused -Wno-unused-parameter -Wuninitialized -Winit-self - -Wpointer-arith -Wformat-nonliteral diff --git a/x11-wm/awesome/files/awesome-3.5.5-util.lua-xdg-icons-fix.patch b/x11-wm/awesome/files/awesome-3.5.5-util.lua-xdg-icons-fix.patch deleted file mode 100644 index 588f9ab9ec52..000000000000 --- a/x11-wm/awesome/files/awesome-3.5.5-util.lua-xdg-icons-fix.patch +++ /dev/null @@ -1,46 +0,0 @@ -From: Uli Schlachter -Date: Sat, 12 Apr 2014 14:15:11 +0000 (+0200) -Subject: Merge git://github.com/Teknocrat/awesome -X-Git-Url: http://git.naquadah.org/?p=awesome.git;a=commitdiff_plain;h=d76d3e0b6a00b8b289b3801ba197e0dae732a92d;hp=1090719d677c86e90a1394a34f0effb418728493 - -Merge git://github.com/Teknocrat/awesome ---- - -diff --git a/lib/awful/util.lua.in b/lib/awful/util.lua.in -index 1d35f2f..123c4a6 100644 ---- a/lib/awful/util.lua.in -+++ b/lib/awful/util.lua.in -@@ -185,21 +185,24 @@ end - -- of the dirs are searched first - function util.geticonpath(iconname, exts, dirs, size) - exts = exts or { 'png', 'gif' } -- dirs = dirs or { '/usr/share/pixmaps/' } -+ dirs = dirs or { '/usr/share/pixmaps/', '/usr/share/icons/hicolor/' } -+ icontypes = { 'apps', 'actions', 'categories', 'emblems', -+ 'mimetypes', 'status', 'devices', 'extras', 'places', 'stock' } - for _, d in pairs(dirs) do -+ local icon - for _, e in pairs(exts) do -- local icon -- if size then -- icon = string.format("%s%ux%u/%s.%s", -- d, size, size, iconname, e) -- if util.file_readable(icon) then -- return icon -- end -- end - icon = d .. iconname .. '.' .. e - if util.file_readable(icon) then - return icon - end -+ if size then -+ for _, t in pairs(icontypes) do -+ icon = string.format("%s%ux%u/%s/%s.%s", d, size, size, t, iconname, e) -+ if util.file_readable(icon) then -+ return icon -+ end -+ end -+ end - end - end - end diff --git a/x11-wm/awesome/files/awesome-3.5.9-slotted-lua.patch b/x11-wm/awesome/files/awesome-3.5.9-slotted-lua.patch deleted file mode 100644 index 67f0d9810f44..000000000000 --- a/x11-wm/awesome/files/awesome-3.5.9-slotted-lua.patch +++ /dev/null @@ -1,51 +0,0 @@ -diff -Nuar awesome-3.5.9.orig/build-utils/lgi-check.sh awesome-3.5.9/build-utils/lgi-check.sh ---- awesome-3.5.9.orig/build-utils/lgi-check.sh 2016-03-06 14:05:54.000000000 +0000 -+++ awesome-3.5.9/build-utils/lgi-check.sh 2019-01-23 21:36:35.973967623 +0000 -@@ -1,5 +1,7 @@ - #!/bin/sh - -+LUA=${LUA:=lua} -+ - die() - { - exec >&2 -@@ -22,11 +24,11 @@ - } - - # Check if we have lgi --lua -e 'require("lgi")' || die -+$LUA -e 'require("lgi")' || die - - # Check the version number - # Keep this in sync with lib/gears/surface.lua.in! --lua -e 'if tonumber(string.match(require("lgi.version"), "(%d%.%d)")) < 0.7 then error("lgi too old, need at least version 0.7.0") end' || die -+$LUA -e 'if tonumber(string.match(require("lgi.version"), "(%d%.%d)")) < 0.7 then error("lgi too old, need at least version 0.7.0") end' || die - - # Check for the needed gi files --lua -e 'l = require("lgi") assert(l.cairo, l.Pango, l.PangoCairo)' || die -+$LUA -e 'l = require("lgi") assert(l.cairo, l.Pango, l.PangoCairo)' || die -diff -Nuar awesome-3.5.9.orig/awesomeConfig.cmake awesome-3.5.9/awesomeConfig.cmake ---- awesome-3.5.9.orig/awesomeConfig.cmake 2019-01-23 22:01:17.364046606 +0000 -+++ awesome-3.5.9/awesomeConfig.cmake 2019-01-23 21:50:30.152919084 +0000 -@@ -66,6 +66,7 @@ - include(FindPkgConfig) - # lua 5.1 - include(FindLua51) -+set(ENV{LUA} "${LUA_EXECUTABLE}") - # }}} - - # {{{ Check if documentation can be build -diff -Nuar awesome-3.5.9.orig/CMakeLists.txt awesome-3.5.9/CMakeLists.txt ---- awesome-3.5.9.orig/CMakeLists.txt 2016-03-06 14:05:54.000000000 +0000 -+++ awesome-3.5.9/CMakeLists.txt 2019-01-23 22:00:08.715111414 +0000 -@@ -105,7 +105,9 @@ - - # check for lgi and the needed gobject introspection files - add_custom_target(lgi-check ALL -- COMMAND ${SOURCE_DIR}/build-utils/lgi-check.sh) -+ COMMAND ${CMAKE_COMMAND} -E env LUA=${LUA_EXECUTABLE} ${SOURCE_DIR}/build-utils/lgi-check.sh -+ COMMENT "Verifying LGI module") -+# VERBATIM) - - # atoms - file(MAKE_DIRECTORY ${BUILD_DIR}/common) diff --git a/x11-wm/awesome/files/awesome-3.5_rc1-convert-path.patch b/x11-wm/awesome/files/awesome-3.5_rc1-convert-path.patch deleted file mode 100644 index e6c37b0f9c76..000000000000 --- a/x11-wm/awesome/files/awesome-3.5_rc1-convert-path.patch +++ /dev/null @@ -1,12 +0,0 @@ -diff -Nuar --exclude '*.orig' awesome-3.5-rc1.orig/awesomeConfig.cmake awesome-3.5-rc1/awesomeConfig.cmake ---- awesome-3.5-rc1.orig/awesomeConfig.cmake 2012-11-24 13:51:33.000000000 +0000 -+++ awesome-3.5-rc1/awesomeConfig.cmake 2012-11-24 20:42:23.743412441 +0000 -@@ -56,7 +56,7 @@ - a_find_program(LUA_EXECUTABLE lua FALSE) - a_find_program(LDOC_EXECUTABLE ldoc.lua FALSE) - # theme graphics --a_find_program(CONVERT_EXECUTABLE convert TRUE) -+a_find_program(CONVERT_EXECUTABLE bin/convert TRUE) - # doxygen - include(FindDoxygen) - # pkg-config diff --git a/x11-wm/awesome/metadata.xml b/x11-wm/awesome/metadata.xml index a3b3ef758905..1774e95ac49c 100644 --- a/x11-wm/awesome/metadata.xml +++ b/x11-wm/awesome/metadata.xml @@ -2,8 +2,8 @@ - maksbotan@gentoo.org - Maxim Koltsov + marecki@gentoo.org + Marek Szuba awesomeWM/awesome -- cgit v1.2.3