From: "Marek Szuba" <marecki@gentoo.org>
To: gentoo-commits@lists.gentoo.org
Subject: [gentoo-commits] repo/gentoo:master commit in: x11-wm/awesome/
Date: Mon, 18 Jan 2021 12:27:59 +0000 (UTC) [thread overview]
Message-ID: <1610972857.dc4e7e4edabc72082a817a48818ea7be61e6cbd5.marecki@gentoo> (raw)
commit: dc4e7e4edabc72082a817a48818ea7be61e6cbd5
Author: Marek Szuba <marecki <AT> gentoo <DOT> org>
AuthorDate: Mon Jan 18 10:39:13 2021 +0000
Commit: Marek Szuba <marecki <AT> gentoo <DOT> org>
CommitDate: Mon Jan 18 12:27:37 2021 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=dc4e7e4e
x11-wm/awesome: merge Jakov's changes into the slotted-Lua ebuild
Signed-off-by: Marek Szuba <marecki <AT> gentoo.org>
...ome-4.3-r100.ebuild => awesome-4.3-r101.ebuild} | 68 +++++++++++-----------
1 file changed, 35 insertions(+), 33 deletions(-)
diff --git a/x11-wm/awesome/awesome-4.3-r100.ebuild b/x11-wm/awesome/awesome-4.3-r101.ebuild
similarity index 76%
rename from x11-wm/awesome/awesome-4.3-r100.ebuild
rename to x11-wm/awesome/awesome-4.3-r101.ebuild
index 471eeb9a939..48a04ca5686 100644
--- a/x11-wm/awesome/awesome-4.3-r100.ebuild
+++ b/x11-wm/awesome/awesome-4.3-r101.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
@@ -7,71 +7,73 @@ 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/"
-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"
+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[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/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-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 )
-"
-
-# graphicsmagick's 'convert -channel' has no Alpha support, bug #352282
+ 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}
- >=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-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}]
')
- )
-"
+ )"
+# 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
+ "${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() {
@@ -90,7 +92,7 @@ src_configure() {
src_test() {
# 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() {
next reply other threads:[~2021-01-18 12:28 UTC|newest]
Thread overview: 77+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-01-18 12:27 Marek Szuba [this message]
-- strict thread matches above, loose matches on Subject: below --
2024-11-29 13:47 [gentoo-commits] repo/gentoo:master commit in: x11-wm/awesome/ Andreas Sturmlechner
2024-03-25 10:37 Marek Szuba
2022-11-10 22:40 Marek Szuba
2022-05-24 8:55 Marek Szuba
2021-09-18 12:29 Marek Szuba
2021-02-23 9:32 Marek Szuba
2021-01-27 19:05 Conrad Kostecki
2021-01-24 3:52 Sam James
2021-01-23 22:51 Sam James
2021-01-23 4:20 Sam James
2021-01-23 4:09 Sam James
2021-01-20 1:24 Sam James
2021-01-18 14:10 Sam James
2021-01-18 12:27 Marek Szuba
2021-01-18 10:21 Marek Szuba
2021-01-18 10:02 Marek Szuba
2021-01-18 1:41 Sam James
2021-01-18 1:40 Sam James
2021-01-18 0:48 Sam James
2020-12-30 10:49 David Seifert
2020-12-29 22:16 Marek Szuba
2020-12-28 11:50 David Seifert
2020-12-28 11:50 David Seifert
2020-12-27 5:35 Sam James
2020-02-08 16:25 David Seifert
2020-01-24 23:04 Ben Kohler
2020-01-19 19:35 Mikle Kolyada
2020-01-14 22:48 Matt Turner
2019-11-24 0:44 Aaron Bauman
2019-07-29 14:41 Mikle Kolyada
2019-07-11 20:57 Robin H. Johnson
2019-05-12 20:56 Thomas Deutschmann
2019-02-02 20:11 Matthew Thode
2019-01-31 19:20 Matthew Thode
2018-05-26 11:12 Mikle Kolyada
2018-04-24 17:37 Mikle Kolyada
2018-04-24 17:24 Mikle Kolyada
2018-04-24 14:36 Marek Szuba
2018-04-21 22:56 Aaron Bauman
2018-04-21 17:31 Maxim Koltsov
2018-04-21 17:31 Maxim Koltsov
2018-04-21 17:31 Maxim Koltsov
2018-04-15 22:21 Sergei Trofimovich
2018-04-15 16:50 Mikle Kolyada
2018-03-25 22:04 Maxim Koltsov
2018-03-25 22:04 Maxim Koltsov
2018-03-18 11:38 Sergei Trofimovich
2018-03-15 20:20 Mikle Kolyada
2018-03-14 21:33 Maxim Koltsov
2018-03-14 21:33 Maxim Koltsov
2018-03-14 21:33 Maxim Koltsov
2018-03-14 10:37 Michał Górny
2018-01-27 8:23 Michał Górny
2017-12-25 19:22 Markus Meier
2017-09-02 15:17 Michael Palimaka
2017-07-23 14:36 Patrice Clement
2017-07-22 20:15 Patrice Clement
2017-05-03 19:32 David Seifert
2017-04-27 14:02 Marek Szuba
2017-04-26 14:03 Marek Szuba
2017-03-24 19:20 Göktürk Yüksek
2017-03-15 16:42 Marek Szuba
2017-03-15 16:42 Marek Szuba
2017-02-11 21:35 David Seifert
2017-01-02 9:54 Agostino Sarubbo
2016-12-23 10:11 Johannes Huber
2016-08-07 6:52 Pacho Ramos
2016-03-08 1:58 Robin H. Johnson
2016-02-14 17:24 Markus Meier
2016-02-03 5:28 Ian Delaney
2016-01-30 17:06 Robin H. Johnson
2016-01-24 17:35 Agostino Sarubbo
2016-01-15 20:34 Robin H. Johnson
2016-01-14 11:46 Ian Delaney
2015-10-08 20:33 Ian Stakenvicius
2015-10-08 20:33 Ian Stakenvicius
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1610972857.dc4e7e4edabc72082a817a48818ea7be61e6cbd5.marecki@gentoo \
--to=marecki@gentoo.org \
--cc=gentoo-commits@lists.gentoo.org \
--cc=gentoo-dev@lists.gentoo.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox