From 7cc5885e6993af9eeb225171c0b439fb961bb124 Mon Sep 17 00:00:00 2001 From: Yuta Satoh Date: Wed, 10 Jan 2018 22:56:02 +0900 Subject: x11-wm/awesome: Fix dependency issue for Gentoo/FreeBSD. Bug: https://bugs.gentoo.org/489984 Closes: https://github.com/gentoo/gentoo/pull/6817 Package-Manager: Portage-2.3.13, Repoman-2.3.3 --- x11-wm/awesome/awesome-3.5.6-r2.ebuild | 4 +- x11-wm/awesome/awesome-3.5.7.ebuild | 4 +- x11-wm/awesome/awesome-3.5.8.ebuild | 4 +- x11-wm/awesome/awesome-3.5.9-r1.ebuild | 137 +++++++++++++++++++++++++++++++++ x11-wm/awesome/awesome-3.5.9.ebuild | 137 --------------------------------- x11-wm/awesome/awesome-4.0-r1.ebuild | 4 +- x11-wm/awesome/awesome-4.0.ebuild | 4 +- x11-wm/awesome/awesome-4.1.ebuild | 4 +- x11-wm/awesome/awesome-4.2.ebuild | 4 +- x11-wm/awesome/awesome-9999.ebuild | 4 +- 10 files changed, 153 insertions(+), 153 deletions(-) create mode 100644 x11-wm/awesome/awesome-3.5.9-r1.ebuild delete mode 100644 x11-wm/awesome/awesome-3.5.9.ebuild (limited to 'x11-wm/awesome') diff --git a/x11-wm/awesome/awesome-3.5.6-r2.ebuild b/x11-wm/awesome/awesome-3.5.6-r2.ebuild index ada253ff8f8e..cd7b7ca16cae 100644 --- a/x11-wm/awesome/awesome-3.5.6-r2.ebuild +++ b/x11-wm/awesome/awesome-3.5.6-r2.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2017 Gentoo Foundation +# Copyright 1999-2018 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 EAPI="5" @@ -28,7 +28,7 @@ COMMON_DEPEND=" x11-libs/libXcursor >=x11-libs/libX11-1.3.99.901 dbus? ( >=sys-apps/dbus-1 ) - elibc_FreeBSD? ( dev-libs/libexecinfo )" + elibc_FreeBSD? ( || ( dev-libs/libexecinfo >=sys-freebsd/freebsd-lib-10.0 ) )" # graphicsmagick's 'convert -channel' has no Alpha support, bug #352282 DEPEND="${COMMON_DEPEND} diff --git a/x11-wm/awesome/awesome-3.5.7.ebuild b/x11-wm/awesome/awesome-3.5.7.ebuild index c3473fd22bd5..839456e65e9c 100644 --- a/x11-wm/awesome/awesome-3.5.7.ebuild +++ b/x11-wm/awesome/awesome-3.5.7.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2017 Gentoo Foundation +# Copyright 1999-2018 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 EAPI="5" @@ -28,7 +28,7 @@ COMMON_DEPEND=" x11-libs/libXcursor >=x11-libs/libX11-1.3.99.901 dbus? ( >=sys-apps/dbus-1 ) - elibc_FreeBSD? ( dev-libs/libexecinfo )" + elibc_FreeBSD? ( || ( dev-libs/libexecinfo >=sys-freebsd/freebsd-lib-10.0 ) )" # graphicsmagick's 'convert -channel' has no Alpha support, bug #352282 DEPEND="${COMMON_DEPEND} diff --git a/x11-wm/awesome/awesome-3.5.8.ebuild b/x11-wm/awesome/awesome-3.5.8.ebuild index c3473fd22bd5..839456e65e9c 100644 --- a/x11-wm/awesome/awesome-3.5.8.ebuild +++ b/x11-wm/awesome/awesome-3.5.8.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2017 Gentoo Foundation +# Copyright 1999-2018 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 EAPI="5" @@ -28,7 +28,7 @@ COMMON_DEPEND=" x11-libs/libXcursor >=x11-libs/libX11-1.3.99.901 dbus? ( >=sys-apps/dbus-1 ) - elibc_FreeBSD? ( dev-libs/libexecinfo )" + elibc_FreeBSD? ( || ( dev-libs/libexecinfo >=sys-freebsd/freebsd-lib-10.0 ) )" # graphicsmagick's 'convert -channel' has no Alpha support, bug #352282 DEPEND="${COMMON_DEPEND} diff --git a/x11-wm/awesome/awesome-3.5.9-r1.ebuild b/x11-wm/awesome/awesome-3.5.9-r1.ebuild new file mode 100644 index 000000000000..839456e65e9c --- /dev/null +++ b/x11-wm/awesome/awesome-3.5.9-r1.ebuild @@ -0,0 +1,137 @@ +# Copyright 1999-2018 Gentoo Foundation +# 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 ~x86-fbsd" +IUSE="dbus doc elibc_FreeBSD gnome" + +COMMON_DEPEND=" + >=dev-lang/lua-5.1:0 + 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-proto/xcb-proto-1.5 + >=x11-proto/xproto-7.0.15 + doc? ( + app-doc/doxygen + media-gfx/graphviz + )" + +RDEPEND="${COMMON_DEPEND}" + +DOCS="AUTHORS BUGS PATCHES README STYLE" + +src_prepare() { + # bug #408025 + epatch "${FILESDIR}/${PN}-3.5_rc1-convert-path.patch" + epatch "${FILESDIR}/${PN}-xsession.patch" + + # bug #507604 + epatch "${FILESDIR}/${PN}-3.5.5-util.lua-xdg-icons-fix.patch" + # bug #509658 + epatch "${FILESDIR}/${PN}-3.5.5-cflag-cleanup.patch" + + # bug #571544 + # Merged upstream + #epatch "${FILESDIR}/${PN}-3.5.6-fix-multi-instances-focus.patch" + + epatch_user +} + +src_configure() { + mycmakeargs=( + -DSYSCONFDIR="${EPREFIX}"/etc + $(cmake-utils_use_with dbus DBUS) + $(cmake-utils_use doc GENERATE_DOC) + ) + + 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 || die + ) + 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" || die + # Application launcher + domenu "${FILESDIR}/${PN}-gnome.desktop" || die + # X Session + insinto /usr/share/xsessions/ + doins "${FILESDIR}/${PN}-gnome-xsession.desktop" || die + 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.ebuild b/x11-wm/awesome/awesome-3.5.9.ebuild deleted file mode 100644 index c3473fd22bd5..000000000000 --- a/x11-wm/awesome/awesome-3.5.9.ebuild +++ /dev/null @@ -1,137 +0,0 @@ -# Copyright 1999-2017 Gentoo Foundation -# 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 ~x86-fbsd" -IUSE="dbus doc elibc_FreeBSD gnome" - -COMMON_DEPEND=" - >=dev-lang/lua-5.1:0 - 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 )" - -# 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-proto/xcb-proto-1.5 - >=x11-proto/xproto-7.0.15 - doc? ( - app-doc/doxygen - media-gfx/graphviz - )" - -RDEPEND="${COMMON_DEPEND}" - -DOCS="AUTHORS BUGS PATCHES README STYLE" - -src_prepare() { - # bug #408025 - epatch "${FILESDIR}/${PN}-3.5_rc1-convert-path.patch" - epatch "${FILESDIR}/${PN}-xsession.patch" - - # bug #507604 - epatch "${FILESDIR}/${PN}-3.5.5-util.lua-xdg-icons-fix.patch" - # bug #509658 - epatch "${FILESDIR}/${PN}-3.5.5-cflag-cleanup.patch" - - # bug #571544 - # Merged upstream - #epatch "${FILESDIR}/${PN}-3.5.6-fix-multi-instances-focus.patch" - - epatch_user -} - -src_configure() { - mycmakeargs=( - -DSYSCONFDIR="${EPREFIX}"/etc - $(cmake-utils_use_with dbus DBUS) - $(cmake-utils_use doc GENERATE_DOC) - ) - - 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 || die - ) - 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" || die - # Application launcher - domenu "${FILESDIR}/${PN}-gnome.desktop" || die - # X Session - insinto /usr/share/xsessions/ - doins "${FILESDIR}/${PN}-gnome-xsession.desktop" || die - 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.0-r1.ebuild b/x11-wm/awesome/awesome-4.0-r1.ebuild index 3dddc28075a9..826268e38185 100644 --- a/x11-wm/awesome/awesome-4.0-r1.ebuild +++ b/x11-wm/awesome/awesome-4.0-r1.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2017 Gentoo Foundation +# Copyright 1999-2018 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 EAPI=6 @@ -33,7 +33,7 @@ RDEPEND=" x11-libs/libxkbcommon[X] >=x11-libs/libX11-1.3.99.901 dbus? ( >=sys-apps/dbus-1 ) - elibc_FreeBSD? ( dev-libs/libexecinfo )" + elibc_FreeBSD? ( || ( dev-libs/libexecinfo >=sys-freebsd/freebsd-lib-10.0 ) )" # graphicsmagick's 'convert -channel' has no Alpha support, bug #352282 DEPEND="${RDEPEND} diff --git a/x11-wm/awesome/awesome-4.0.ebuild b/x11-wm/awesome/awesome-4.0.ebuild index eed4554091af..ee9a7cf8b691 100644 --- a/x11-wm/awesome/awesome-4.0.ebuild +++ b/x11-wm/awesome/awesome-4.0.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2017 Gentoo Foundation +# Copyright 1999-2018 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 EAPI=6 @@ -33,7 +33,7 @@ RDEPEND=" x11-libs/libxkbcommon[X] >=x11-libs/libX11-1.3.99.901 dbus? ( >=sys-apps/dbus-1 ) - elibc_FreeBSD? ( dev-libs/libexecinfo )" + elibc_FreeBSD? ( || ( dev-libs/libexecinfo >=sys-freebsd/freebsd-lib-10.0 ) )" # graphicsmagick's 'convert -channel' has no Alpha support, bug #352282 DEPEND="${RDEPEND} diff --git a/x11-wm/awesome/awesome-4.1.ebuild b/x11-wm/awesome/awesome-4.1.ebuild index 65af18c4d489..2e8cefe90f62 100644 --- a/x11-wm/awesome/awesome-4.1.ebuild +++ b/x11-wm/awesome/awesome-4.1.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2017 Gentoo Foundation +# Copyright 1999-2018 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 EAPI=6 @@ -33,7 +33,7 @@ RDEPEND=" x11-libs/libxkbcommon[X] >=x11-libs/libX11-1.3.99.901 dbus? ( >=sys-apps/dbus-1 ) - elibc_FreeBSD? ( dev-libs/libexecinfo )" + elibc_FreeBSD? ( || ( dev-libs/libexecinfo >=sys-freebsd/freebsd-lib-10.0 ) )" # graphicsmagick's 'convert -channel' has no Alpha support, bug #352282 DEPEND="${RDEPEND} diff --git a/x11-wm/awesome/awesome-4.2.ebuild b/x11-wm/awesome/awesome-4.2.ebuild index 61644c037673..170a680ce24f 100644 --- a/x11-wm/awesome/awesome-4.2.ebuild +++ b/x11-wm/awesome/awesome-4.2.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2017 Gentoo Foundation +# Copyright 1999-2018 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 EAPI=6 @@ -33,7 +33,7 @@ RDEPEND=" x11-libs/libxkbcommon[X] >=x11-libs/libX11-1.3.99.901 dbus? ( >=sys-apps/dbus-1 ) - elibc_FreeBSD? ( dev-libs/libexecinfo )" + elibc_FreeBSD? ( || ( dev-libs/libexecinfo >=sys-freebsd/freebsd-lib-10.0 ) )" # graphicsmagick's 'convert -channel' has no Alpha support, bug #352282 DEPEND="${RDEPEND} diff --git a/x11-wm/awesome/awesome-9999.ebuild b/x11-wm/awesome/awesome-9999.ebuild index 243752a5d4a3..d26ba4a2ba97 100644 --- a/x11-wm/awesome/awesome-9999.ebuild +++ b/x11-wm/awesome/awesome-9999.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2017 Gentoo Foundation +# Copyright 1999-2018 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 EAPI=6 @@ -32,7 +32,7 @@ RDEPEND=" x11-libs/libxkbcommon[X] >=x11-libs/libX11-1.3.99.901 dbus? ( >=sys-apps/dbus-1 ) - elibc_FreeBSD? ( dev-libs/libexecinfo )" + elibc_FreeBSD? ( || ( dev-libs/libexecinfo >=sys-freebsd/freebsd-lib-10.0 ) )" # graphicsmagick's 'convert -channel' has no Alpha support, bug #352282 DEPEND="${RDEPEND} -- cgit v1.2.3-65-gdbad