1 |
commit: 0ddae6f0eef33c3695b4f0ef6c9868dc183bc5cd |
2 |
Author: Jakov Smolic <jakov.smolic <AT> sartura <DOT> hr> |
3 |
AuthorDate: Mon Dec 28 11:50:19 2020 +0000 |
4 |
Commit: David Seifert <soap <AT> gentoo <DOT> org> |
5 |
CommitDate: Mon Dec 28 11:50:19 2020 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=0ddae6f0 |
7 |
|
8 |
x11-wm/awesome: sync live ebuild |
9 |
|
10 |
Closes: https://github.com/gentoo/gentoo/pull/18462 |
11 |
Package-Manager: Portage-3.0.9, Repoman-3.0.1 |
12 |
Signed-off-by: Jakov Smolic <jakov.smolic <AT> sartura.hr> |
13 |
Signed-off-by: David Seifert <soap <AT> gentoo.org> |
14 |
|
15 |
x11-wm/awesome/awesome-9999.ebuild | 63 ++++++++++++++++++++------------------ |
16 |
1 file changed, 33 insertions(+), 30 deletions(-) |
17 |
|
18 |
diff --git a/x11-wm/awesome/awesome-9999.ebuild b/x11-wm/awesome/awesome-9999.ebuild |
19 |
index e418a13243a..f74884da277 100644 |
20 |
--- a/x11-wm/awesome/awesome-9999.ebuild |
21 |
+++ b/x11-wm/awesome/awesome-9999.ebuild |
22 |
@@ -5,68 +5,71 @@ EAPI=7 |
23 |
|
24 |
LUA_COMPAT=( lua5-{1..3} luajit ) |
25 |
|
26 |
-inherit cmake desktop git-r3 lua-single pax-utils |
27 |
+inherit cmake desktop lua-single pax-utils |
28 |
+ |
29 |
+if [[ ${PV} == *9999 ]] ; then |
30 |
+ inherit git-r3 |
31 |
+ EGIT_REPO_URI="https://github.com/awesomeWM/${PN}.git" |
32 |
+else |
33 |
+ SRC_URI="https://github.com/awesomeWM/awesome-releases/raw/master/${P}.tar.xz" |
34 |
+ KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~x86" |
35 |
+fi |
36 |
|
37 |
DESCRIPTION="A dynamic floating and tiling window manager" |
38 |
HOMEPAGE="https://awesomewm.org/" |
39 |
-EGIT_REPO_URI="https://github.com/awesomeWM/${PN}.git" |
40 |
|
41 |
LICENSE="GPL-2" |
42 |
SLOT="0" |
43 |
-KEYWORDS="" |
44 |
IUSE="dbus doc gnome test" |
45 |
|
46 |
REQUIRED_USE="${LUA_REQUIRED_USE}" |
47 |
|
48 |
-RESTRICT="test" |
49 |
+RESTRICT="test" # https://bugs.gentoo.org/654084 |
50 |
|
51 |
RDEPEND="${LUA_DEPS} |
52 |
dev-libs/glib:2 |
53 |
- >=dev-libs/libxdg-basedir-1 |
54 |
+ dev-libs/libxdg-basedir |
55 |
$(lua_gen_cond_dep 'dev-lua/lgi[${LUA_USEDEP}]') |
56 |
x11-libs/cairo[X,xcb(+)] |
57 |
x11-libs/gdk-pixbuf:2 |
58 |
- >=x11-libs/libxcb-1.6[xkb] |
59 |
- >=x11-libs/pango-1.19.3[introspection] |
60 |
- >=x11-libs/startup-notification-0.10_p20110426 |
61 |
- >=x11-libs/xcb-util-0.3.8 |
62 |
+ x11-libs/libxcb[xkb] |
63 |
+ x11-libs/pango[introspection] |
64 |
+ x11-libs/startup-notification |
65 |
+ x11-libs/xcb-util |
66 |
x11-libs/xcb-util-cursor |
67 |
- >=x11-libs/xcb-util-keysyms-0.3.4 |
68 |
- >=x11-libs/xcb-util-wm-0.3.8 |
69 |
- >=x11-libs/xcb-util-xrm-1.0 |
70 |
+ x11-libs/xcb-util-keysyms |
71 |
+ x11-libs/xcb-util-wm |
72 |
+ x11-libs/xcb-util-xrm |
73 |
x11-libs/libXcursor |
74 |
x11-libs/libxkbcommon[X] |
75 |
- >=x11-libs/libX11-1.3.99.901 |
76 |
- dbus? ( >=sys-apps/dbus-1 ) |
77 |
-" |
78 |
+ x11-libs/libX11 |
79 |
+ dbus? ( sys-apps/dbus )" |
80 |
|
81 |
# graphicsmagick's 'convert -channel' has no Alpha support, bug #352282 |
82 |
# ldoc is used by invoking its executable, hence no need for LUA_SINGLE_USEDEP |
83 |
DEPEND="${RDEPEND} |
84 |
- >=app-text/asciidoc-8.4.5 |
85 |
- app-text/xmlto |
86 |
- dev-util/gperf |
87 |
- virtual/pkgconfig |
88 |
- media-gfx/imagemagick[png] |
89 |
- >=x11-base/xcb-proto-1.5 |
90 |
+ x11-base/xcb-proto |
91 |
x11-base/xorg-proto |
92 |
- doc? ( dev-lua/ldoc ) |
93 |
test? ( |
94 |
- app-shells/zsh |
95 |
x11-base/xorg-server[xvfb] |
96 |
$(lua_gen_cond_dep ' |
97 |
dev-lua/busted[${LUA_USEDEP}] |
98 |
dev-lua/luacheck[${LUA_USEDEP}] |
99 |
') |
100 |
- ) |
101 |
-" |
102 |
+ )" |
103 |
+BDEPEND=" |
104 |
+ app-text/asciidoc |
105 |
+ media-gfx/imagemagick[png] |
106 |
+ virtual/pkgconfig |
107 |
+ doc? ( dev-lua/ldoc ) |
108 |
+ test? ( app-shells/zsh )" |
109 |
|
110 |
# Skip installation of README.md by einstalldocs, which leads to broken symlink |
111 |
DOCS=() |
112 |
PATCHES=( |
113 |
- "${FILESDIR}/${PN}-4.0-convert-path.patch" # bug #408025 |
114 |
- "${FILESDIR}/${PN}-xsession.patch" # bug #408025 |
115 |
- "${FILESDIR}/${PN}-4.0-cflag-cleanup.patch" # bug #509658 |
116 |
+ "${FILESDIR}"/${PN}-4.0-convert-path.patch # bug #408025 |
117 |
+ "${FILESDIR}"/${PN}-xsession.patch # bug #408025 |
118 |
+ "${FILESDIR}"/${PN}-4.0-cflag-cleanup.patch # bug #509658 |
119 |
) |
120 |
|
121 |
src_configure() { |
122 |
@@ -83,9 +86,9 @@ src_configure() { |
123 |
cmake_src_configure |
124 |
} |
125 |
|
126 |
-src_test() { |
127 |
+src_rest() { |
128 |
# awesome's test suite starts Xvfb by itself, no need for virtualx eclass |
129 |
- HEADLESS=1 cmake_src_make check -j1 |
130 |
+ HEADLESS=1 cmake_build check -j1 |
131 |
} |
132 |
|
133 |
src_install() { |