From c2fa81bf4b65353a04b2793b58a186edac38e664 Mon Sep 17 00:00:00 2001 From: Matt Turner Date: Tue, 14 Jan 2020 14:38:12 -0800 Subject: x11-wm/awesome: Update x11-libs/cairo dependency Signed-off-by: Matt Turner --- x11-wm/awesome/awesome-3.5.9-r2.ebuild | 132 ------------------------------ x11-wm/awesome/awesome-3.5.9-r3.ebuild | 132 ++++++++++++++++++++++++++++++ x11-wm/awesome/awesome-4.2-r2.ebuild | 142 --------------------------------- x11-wm/awesome/awesome-4.2-r3.ebuild | 142 +++++++++++++++++++++++++++++++++ x11-wm/awesome/awesome-4.3-r1.ebuild | 134 +++++++++++++++++++++++++++++++ x11-wm/awesome/awesome-4.3.ebuild | 134 ------------------------------- x11-wm/awesome/awesome-9999.ebuild | 2 +- 7 files changed, 409 insertions(+), 409 deletions(-) delete mode 100644 x11-wm/awesome/awesome-3.5.9-r2.ebuild create mode 100644 x11-wm/awesome/awesome-3.5.9-r3.ebuild delete mode 100644 x11-wm/awesome/awesome-4.2-r2.ebuild create mode 100644 x11-wm/awesome/awesome-4.2-r3.ebuild create mode 100644 x11-wm/awesome/awesome-4.3-r1.ebuild delete mode 100644 x11-wm/awesome/awesome-4.3.ebuild (limited to 'x11-wm/awesome') diff --git a/x11-wm/awesome/awesome-3.5.9-r2.ebuild b/x11-wm/awesome/awesome-3.5.9-r2.ebuild deleted file mode 100644 index 619a51c6f336..000000000000 --- a/x11-wm/awesome/awesome-3.5.9-r2.ebuild +++ /dev/null @@ -1,132 +0,0 @@ -# Copyright 1999-2019 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI="5" -inherit cmake-utils eutils - -DESCRIPTION="A dynamic floating and tiling window manager" -HOMEPAGE="http://awesome.naquadah.org/" -SRC_URI="http://awesome.naquadah.org/download/${P}.tar.xz" - -LICENSE="GPL-2" -SLOT="0" -KEYWORDS="amd64 arm ppc ppc64 x86" -IUSE="dbus doc elibc_FreeBSD gnome" - -COMMON_DEPEND=" - || ( >=dev-lang/lua-5.1:0 dev-lang/lua:5.1 ) - dev-libs/glib:2 - >=dev-libs/libxdg-basedir-1 - >=dev-lua/lgi-0.7 - 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/libXcursor - >=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="${COMMON_DEPEND} - >=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? ( - app-doc/doxygen - media-gfx/graphviz - )" - -RDEPEND="${COMMON_DEPEND}" - -DOCS="AUTHORS BUGS PATCHES README STYLE" - -PATCHES=( - "${FILESDIR}/${PN}-3.5_rc1-convert-path.patch" - "${FILESDIR}/${PN}-xsession.patch" - "${FILESDIR}/${PN}-3.5.5-util.lua-xdg-icons-fix.patch" - "${FILESDIR}/${PN}-3.5.5-cflag-cleanup.patch" - "${FILESDIR}/${PN}-3.5.9-slotted-lua.patch" -) - -src_configure() { - has_version 'dev-lang/lua:5.1' \ - && LUA=lua5.1 \ - || LUA=lua - mycmakeargs=( - -DSYSCONFDIR="${EPREFIX}"/etc - $(cmake-utils_use_with dbus DBUS) - $(cmake-utils_use doc GENERATE_DOC) - -DLUA_EXECUTABLE="${EPREFIX}"/usr/bin/${LUA} - ) - - cmake-utils_src_configure -} - -src_compile() { - local myargs="all" - - if use doc ; then - myargs="${myargs} doc" - fi - cmake-utils_src_make ${myargs} -} - -src_install() { - cmake-utils_src_install - - if use doc ; then - ( - cd "${CMAKE_BUILD_DIR}"/doc - mv html doxygen - dohtml -r doxygen - ) - fi - rm -rf "${ED}"/usr/share/doc/${PN} || die "Cleanup of dupe docs failed" - - exeinto /etc/X11/Sessions - newexe "${FILESDIR}"/${PN}-session ${PN} || die - - # 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" || die - # X Session - insinto /usr/share/xsessions/ - doins "${FILESDIR}/${PN}-gnome-xsession.desktop" - fi -} - -pkg_postinst() { - # bug #447308 - if use gnome; then - elog - 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 - 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" - elog -} diff --git a/x11-wm/awesome/awesome-3.5.9-r3.ebuild b/x11-wm/awesome/awesome-3.5.9-r3.ebuild new file mode 100644 index 000000000000..95427fd20e6f --- /dev/null +++ b/x11-wm/awesome/awesome-3.5.9-r3.ebuild @@ -0,0 +1,132 @@ +# Copyright 1999-2019 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI="5" +inherit cmake-utils eutils + +DESCRIPTION="A dynamic floating and tiling window manager" +HOMEPAGE="http://awesome.naquadah.org/" +SRC_URI="http://awesome.naquadah.org/download/${P}.tar.xz" + +LICENSE="GPL-2" +SLOT="0" +KEYWORDS="amd64 arm ppc ppc64 x86" +IUSE="dbus doc elibc_FreeBSD gnome" + +COMMON_DEPEND=" + || ( >=dev-lang/lua-5.1:0 dev-lang/lua:5.1 ) + dev-libs/glib:2 + >=dev-libs/libxdg-basedir-1 + >=dev-lua/lgi-0.7 + x11-libs/cairo[X,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/libXcursor + >=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="${COMMON_DEPEND} + >=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? ( + app-doc/doxygen + media-gfx/graphviz + )" + +RDEPEND="${COMMON_DEPEND}" + +DOCS="AUTHORS BUGS PATCHES README STYLE" + +PATCHES=( + "${FILESDIR}/${PN}-3.5_rc1-convert-path.patch" + "${FILESDIR}/${PN}-xsession.patch" + "${FILESDIR}/${PN}-3.5.5-util.lua-xdg-icons-fix.patch" + "${FILESDIR}/${PN}-3.5.5-cflag-cleanup.patch" + "${FILESDIR}/${PN}-3.5.9-slotted-lua.patch" +) + +src_configure() { + has_version 'dev-lang/lua:5.1' \ + && LUA=lua5.1 \ + || LUA=lua + mycmakeargs=( + -DSYSCONFDIR="${EPREFIX}"/etc + $(cmake-utils_use_with dbus DBUS) + $(cmake-utils_use doc GENERATE_DOC) + -DLUA_EXECUTABLE="${EPREFIX}"/usr/bin/${LUA} + ) + + cmake-utils_src_configure +} + +src_compile() { + local myargs="all" + + if use doc ; then + myargs="${myargs} doc" + fi + cmake-utils_src_make ${myargs} +} + +src_install() { + cmake-utils_src_install + + if use doc ; then + ( + cd "${CMAKE_BUILD_DIR}"/doc + mv html doxygen + dohtml -r doxygen + ) + fi + rm -rf "${ED}"/usr/share/doc/${PN} || die "Cleanup of dupe docs failed" + + exeinto /etc/X11/Sessions + newexe "${FILESDIR}"/${PN}-session ${PN} || die + + # 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" || die + # X Session + insinto /usr/share/xsessions/ + doins "${FILESDIR}/${PN}-gnome-xsession.desktop" + fi +} + +pkg_postinst() { + # bug #447308 + if use gnome; then + elog + 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 + 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" + elog +} diff --git a/x11-wm/awesome/awesome-4.2-r2.ebuild b/x11-wm/awesome/awesome-4.2-r2.ebuild deleted file mode 100644 index 5207dcc08a77..000000000000 --- a/x11-wm/awesome/awesome-4.2-r2.ebuild +++ /dev/null @@ -1,142 +0,0 @@ -# Copyright 1999-2019 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 elibc_FreeBSD 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[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-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.2-r3.ebuild b/x11-wm/awesome/awesome-4.2-r3.ebuild new file mode 100644 index 000000000000..f603b5a15c20 --- /dev/null +++ b/x11-wm/awesome/awesome-4.2-r3.ebuild @@ -0,0 +1,142 @@ +# Copyright 1999-2019 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 elibc_FreeBSD 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 ) + 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-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-r1.ebuild b/x11-wm/awesome/awesome-4.3-r1.ebuild new file mode 100644 index 000000000000..4e922c28dd5d --- /dev/null +++ b/x11-wm/awesome/awesome-4.3-r1.ebuild @@ -0,0 +1,134 @@ +# Copyright 1999-2019 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +inherit cmake-utils desktop 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 elibc_FreeBSD 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 ) + 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-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" +} diff --git a/x11-wm/awesome/awesome-4.3.ebuild b/x11-wm/awesome/awesome-4.3.ebuild deleted file mode 100644 index a6b1dd576461..000000000000 --- a/x11-wm/awesome/awesome-4.3.ebuild +++ /dev/null @@ -1,134 +0,0 @@ -# Copyright 1999-2019 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -inherit cmake-utils desktop 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 elibc_FreeBSD 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[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-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" -} diff --git a/x11-wm/awesome/awesome-9999.ebuild b/x11-wm/awesome/awesome-9999.ebuild index d3a7330d045f..a2093f7a67c9 100644 --- a/x11-wm/awesome/awesome-9999.ebuild +++ b/x11-wm/awesome/awesome-9999.ebuild @@ -21,7 +21,7 @@ RDEPEND=" dev-libs/glib:2 >=dev-libs/libxdg-basedir-1 >=dev-lua/lgi-0.8 - x11-libs/cairo[xcb] + x11-libs/cairo[X,xcb(+)] x11-libs/gdk-pixbuf:2 >=x11-libs/libxcb-1.6[xkb] >=x11-libs/pango-1.19.3[introspection] -- cgit v1.2.3-65-gdbad