From 8c364c784966be1700ea39ae45028f3e9be9cae0 Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Tue, 27 Mar 2018 22:40:05 +0100 Subject: gentoo resync : 27.03.2018 --- x11-wm/Manifest.gz | Bin 9287 -> 9288 bytes x11-wm/awesome/Manifest | 4 +- x11-wm/awesome/awesome-4.2-r2.ebuild | 144 +++++++++++++++++++++++++++++++++++ x11-wm/awesome/awesome-4.2.ebuild | 112 --------------------------- x11-wm/awesome/metadata.xml | 3 - 5 files changed, 146 insertions(+), 117 deletions(-) create mode 100644 x11-wm/awesome/awesome-4.2-r2.ebuild delete mode 100644 x11-wm/awesome/awesome-4.2.ebuild (limited to 'x11-wm') diff --git a/x11-wm/Manifest.gz b/x11-wm/Manifest.gz index 5ede18b0dc3e..915ac38a81d6 100644 Binary files a/x11-wm/Manifest.gz and b/x11-wm/Manifest.gz differ diff --git a/x11-wm/awesome/Manifest b/x11-wm/awesome/Manifest index fe805fd91628..f1b1c4d5a07e 100644 --- a/x11-wm/awesome/Manifest +++ b/x11-wm/awesome/Manifest @@ -16,6 +16,6 @@ DIST awesome-4.2.tar.xz 987024 BLAKE2B b2aaa993bafa83121d165d21083dfcac825e373be EBUILD awesome-3.5.6-r2.ebuild 3296 BLAKE2B 175df7a0d594d5e75bbfab520e08279a1bd5457f2db16350f94c298489591362c56ef863b835aee5f2cfc4cc06b3230a6cc5118d222c1a47987f2db410a7dc16 SHA512 c86b35ccb4a459bcef7c63af82a0de219148d2f0da1cad713c605e762a6d9ea3bc191807cf3994643989c12a341d08c5223122c406470ae60fa5c68bc39b092a EBUILD awesome-3.5.9-r2.ebuild 3130 BLAKE2B ccf73c3decf133861a943da63e7118dff9af80aa23f5b516a6bc92e92685abd3137fea28fea2e6e1c6acf10c163f57629317730afaa3ff8022dfd3fb9884863e SHA512 62f3998c2edf952d000359d75b72f2fb01b039d79ce34eae51a90c86bbefcc3b7fda86da24bbc50c44333d4d0a5ea19f49db68522e13bc7d3fcbc70ec54306bf EBUILD awesome-4.2-r1.ebuild 3461 BLAKE2B 6afee1b8d9cd40f04076d25c69afd5ee961164a973efbbf1256b752f45de81a5d03e3953d6ac3ad37a10290dcc3c095b13a044157ec2064ad6739e3f2a8ff290 SHA512 bfdd945a477a1e8275fa8e51afa00a3a6f0d56712746c2c2a6fb7d06ee6150496ebbaaa1d7f16b81081521ec9ef5f92b80f61998da98e786a8f089178fc7d41a -EBUILD awesome-4.2.ebuild 3095 BLAKE2B 49ee43f2bbfb1cac33aa4b578572ba9a587a11a70188a607a4ed2ee91ebc44df591baf8731a064f0bff90d717733e03983f8a1f21d18c0c33a2cb14e37ff2c1a SHA512 eb5cfe31b1f06b26392f0963dac10857dee8fb8fd7ee6b07dddcca411028198b1f2e063c47aa4dc477fa3d238aa1c1905ae1d2e9e3fa05f7257a68f6918ca232 +EBUILD awesome-4.2-r2.ebuild 4119 BLAKE2B 53422a9c7312d2bcfd208d404c73fde5742fbef2416dc4594382d121887ec81d2f5a0d720150a80ba112c3fd0c46f13d88163769b93c05044c5c20f9dd2d48cf SHA512 9fa2e633683546c49c728411b257c4931eec8fd5b146e2830a94de464d3ac431a1e7b3068e66864245ed9a82aa901cd64723d82d14442e372aef4473674efab5 EBUILD awesome-9999.ebuild 3036 BLAKE2B 5d5697c6cf1e558131aaa87617c1d95d8e4730e7bc27e05682156aecdfc101f27c3ba93ed597e93fb2b42a6a61c3c4b7a93e791bc93fd7290550922f53c370a5 SHA512 8741e66a1e5667485b017925d4b1648c2ecd2fe108bbb2d18d0c3c301849d9d3eaea643bb2c600e3a9f003711eabc167cb313485d2932cc478cadaae3c3d79ab -MISC metadata.xml 678 BLAKE2B 4ef555e57fed17cdc504cb597fbc7702d617d506dcefc3a25471bdaf947209e9a973ef21b49dbf46c678b6da7a1d2a9881e6439a438ac842e4b325b789b62759 SHA512 c50888d616bc887cdf1aec26469da7d8a0041f7f1904e7aeed4b763866827def72f5a06d30ac2da3d04b7d0c05929d87fac60b45c9e6aa5d107e464b92ee6ff9 +MISC metadata.xml 568 BLAKE2B 2a3b777ad5eca2e372536b4ad13b3861b67f88d1cd7746c9a5c0d5b42ff2aec908d53ffd338a5eed7f146f74602017ec67a3d1e1cedcd61d57741af9c599d754 SHA512 6f46bf6d3ba0d5d7917e6d54fa4b98309a7cca66da2299b3206544b90ff1322a2705fb11cdee31808d91a3a59149811c9c25436cf204787278c03f620ef3b105 diff --git a/x11-wm/awesome/awesome-4.2-r2.ebuild b/x11-wm/awesome/awesome-4.2-r2.ebuild new file mode 100644 index 000000000000..0a12509b3fcc --- /dev/null +++ b/x11-wm/awesome/awesome-4.2-r2.ebuild @@ -0,0 +1,144 @@ +# Copyright 1999-2018 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 + +EAPI=6 + +inherit cmake-utils eutils 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 ~x86-fbsd" +IUSE="dbus doc elibc_FreeBSD gnome luajit 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[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 ) + elibc_FreeBSD? ( || ( dev-libs/libexecinfo >=sys-freebsd/freebsd-lib-10.0 ) ) +" + +# 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-proto/xcb-proto-1.5 + >=x11-proto/xproto-7.0.15 + doc? ( dev-lua/ldoc ) + test? ( + app-shells/zsh + x11-base/xorg-server[xvfb] + ) +" +# Uncomment when these are keyworded on ppc/ppc64 (automagic deps) +# 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.2.ebuild b/x11-wm/awesome/awesome-4.2.ebuild deleted file mode 100644 index a579c0907b8d..000000000000 --- a/x11-wm/awesome/awesome-4.2.ebuild +++ /dev/null @@ -1,112 +0,0 @@ -# Copyright 1999-2018 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 - -inherit cmake-utils eutils 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 ~x86" -IUSE="dbus doc elibc_FreeBSD gnome luajit" - -RDEPEND=" - >=dev-lang/lua-5.1:0 - dev-libs/glib:2 - >=dev-libs/libxdg-basedir-1 - >=dev-lua/lgi-0.8 - x11-libs/cairo[xcb] - x11-libs/gdk-pixbuf:2 - >=x11-libs/libxcb-1.6 - >=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 ) - elibc_FreeBSD? ( || ( dev-libs/libexecinfo >=sys-freebsd/freebsd-lib-10.0 ) )" - -# 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-proto/xcb-proto-1.5 - >=x11-proto/xproto-7.0.15 - doc? ( dev-lua/ldoc ) - luajit? ( dev-lang/luajit:2 )" - -DOCS=( docs/{00-authors,01-readme,02-contributing}.md ) -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() { - local mycmakeargs=( - -DSYSCONFDIR="${EPREFIX}"/etc - -DWITH_DBUS=$(usex dbus) - -DWITH_GENERATE_DOC=$(usex doc $(usex doc) n) - ) - 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_install() { - cmake-utils_src_install - - 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 -} - -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/metadata.xml b/x11-wm/awesome/metadata.xml index c00247f3126c..6798285a96fc 100644 --- a/x11-wm/awesome/metadata.xml +++ b/x11-wm/awesome/metadata.xml @@ -13,9 +13,6 @@ maksbotan@gentoo.org Maxim Koltsov - - Use dev-lang/luajit instead of dev-lang/lua - awesomeWM/awesome -- cgit v1.2.3