diff options
| author |   Jakov Smolic <jakov.smolic@sartura.hr> | 2020-12-28 12:50:19 +0100 |
|---|---|---|
| committer |   David Seifert <soap@gentoo.org> | 2020-12-28 12:50:19 +0100 |
| commit | 0ddae6f0eef33c3695b4f0ef6c9868dc183bc5cd (patch) | |
| tree | 89a4830463e89ded1ad29ef4c287cd9775d71e9c | |
| parent | x11-wm/awesome: fix build with gcc-10 (diff) | |
| download | gentoo-0ddae6f0eef33c3695b4f0ef6c9868dc183bc5cd.tar.gz gentoo-0ddae6f0eef33c3695b4f0ef6c9868dc183bc5cd.tar.bz2 gentoo-0ddae6f0eef33c3695b4f0ef6c9868dc183bc5cd.zip | |
x11-wm/awesome: sync live ebuild
Closes: https://github.com/gentoo/gentoo/pull/18462
Package-Manager: Portage-3.0.9, Repoman-3.0.1
Signed-off-by: Jakov Smolic <jakov.smolic@sartura.hr>
Signed-off-by: David Seifert <soap@gentoo.org>
| -rw-r--r-- | x11-wm/awesome/awesome-9999.ebuild | 63 |
1 files changed, 33 insertions, 30 deletions
diff --git a/x11-wm/awesome/awesome-9999.ebuild b/x11-wm/awesome/awesome-9999.ebuild index e418a13243ae..f74884da2777 100644 --- a/x11-wm/awesome/awesome-9999.ebuild +++ b/x11-wm/awesome/awesome-9999.ebuild @@ -5,68 +5,71 @@ EAPI=7 LUA_COMPAT=( lua5-{1..3} luajit ) -inherit cmake desktop git-r3 lua-single pax-utils +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/" -EGIT_REPO_URI="https://github.com/awesomeWM/${PN}.git" LICENSE="GPL-2" SLOT="0" -KEYWORDS="" IUSE="dbus doc gnome test" REQUIRED_USE="${LUA_REQUIRED_USE}" -RESTRICT="test" +RESTRICT="test" # https://bugs.gentoo.org/654084 RDEPEND="${LUA_DEPS} dev-libs/glib:2 - >=dev-libs/libxdg-basedir-1 + 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-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/libxcb[xkb] + x11-libs/pango[introspection] + x11-libs/startup-notification + x11-libs/xcb-util 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/xcb-util-keysyms + x11-libs/xcb-util-wm + x11-libs/xcb-util-xrm x11-libs/libXcursor x11-libs/libxkbcommon[X] - >=x11-libs/libX11-1.3.99.901 - dbus? ( >=sys-apps/dbus-1 ) -" + 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 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/xcb-proto 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}] ') - ) -" + )" +BDEPEND=" + app-text/asciidoc + media-gfx/imagemagick[png] + virtual/pkgconfig + doc? ( dev-lua/ldoc ) + 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.0-convert-path.patch # bug #408025 + "${FILESDIR}"/${PN}-xsession.patch # bug #408025 + "${FILESDIR}"/${PN}-4.0-cflag-cleanup.patch # bug #509658 ) src_configure() { @@ -83,9 +86,9 @@ src_configure() { cmake_src_configure } -src_test() { +src_rest() { # awesome's test suite starts Xvfb by itself, no need for virtualx eclass - HEADLESS=1 cmake_src_make check -j1 + HEADLESS=1 cmake_build check -j1 } src_install() { |