1 |
commit: 641e996d14880a2590024f7c3669b6ed1dc7d5e7 |
2 |
Author: Matthew Thode <prometheanfire <AT> gentoo <DOT> org> |
3 |
AuthorDate: Tue Jun 30 20:08:24 2020 +0000 |
4 |
Commit: Matthew Thode <prometheanfire <AT> gentoo <DOT> org> |
5 |
CommitDate: Tue Jun 30 20:08:41 2020 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=641e996d |
7 |
|
8 |
gui-wm/sway: 1.4-r2 stable amd64/x86/arm64 |
9 |
|
10 |
Closes: https://bugs.gentoo.org/730274 |
11 |
Package-Manager: Portage-2.3.99, Repoman-2.3.23 |
12 |
Signed-off-by: Matthew Thode <prometheanfire <AT> gentoo.org> |
13 |
|
14 |
gui-wm/sway/sway-1.4-r2.ebuild | 2 +- |
15 |
gui-wm/sway/sway-1.4.ebuild | 116 ----------------------------------------- |
16 |
2 files changed, 1 insertion(+), 117 deletions(-) |
17 |
|
18 |
diff --git a/gui-wm/sway/sway-1.4-r2.ebuild b/gui-wm/sway/sway-1.4-r2.ebuild |
19 |
index 6c71bb03218..80125677e21 100644 |
20 |
--- a/gui-wm/sway/sway-1.4-r2.ebuild |
21 |
+++ b/gui-wm/sway/sway-1.4-r2.ebuild |
22 |
@@ -14,7 +14,7 @@ if [[ ${PV} == 9999 ]]; then |
23 |
else |
24 |
MY_PV=${PV/_rc/-rc} |
25 |
SRC_URI="https://github.com/swaywm/${PN}/archive/${MY_PV}.tar.gz -> ${P}.tar.gz" |
26 |
- KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86" |
27 |
+ KEYWORDS="amd64 arm64 ~ppc64 x86" |
28 |
S="${WORKDIR}/${PN}-${MY_PV}" |
29 |
fi |
30 |
|
31 |
|
32 |
diff --git a/gui-wm/sway/sway-1.4.ebuild b/gui-wm/sway/sway-1.4.ebuild |
33 |
deleted file mode 100644 |
34 |
index d0fc53539b7..00000000000 |
35 |
--- a/gui-wm/sway/sway-1.4.ebuild |
36 |
+++ /dev/null |
37 |
@@ -1,116 +0,0 @@ |
38 |
-# Copyright 1999-2020 Gentoo Authors |
39 |
-# Distributed under the terms of the GNU General Public License v2 |
40 |
- |
41 |
-EAPI=7 |
42 |
- |
43 |
-inherit eutils meson |
44 |
- |
45 |
-DESCRIPTION="i3-compatible Wayland window manager" |
46 |
-HOMEPAGE="https://swaywm.org" |
47 |
- |
48 |
-if [[ ${PV} == 9999 ]]; then |
49 |
- inherit git-r3 |
50 |
- EGIT_REPO_URI="https://github.com/swaywm/${PN}.git" |
51 |
-else |
52 |
- MY_PV=${PV/_rc/-rc} |
53 |
- SRC_URI="https://github.com/swaywm/${PN}/archive/${MY_PV}.tar.gz -> ${P}.tar.gz" |
54 |
- KEYWORDS="amd64 arm64 ~ppc64 x86" |
55 |
- S="${WORKDIR}/${PN}-${MY_PV}" |
56 |
-fi |
57 |
- |
58 |
-LICENSE="MIT" |
59 |
-SLOT="0" |
60 |
-IUSE="elogind fish-completion +man +swaybar +swaybg +swayidle +swaylock +swaymsg +swaynag systemd tray wallpapers X zsh-completion" |
61 |
-REQUIRED_USE="?? ( elogind systemd ) |
62 |
- tray? ( || ( elogind systemd ) )" |
63 |
- |
64 |
-DEPEND=" |
65 |
- >=dev-libs/json-c-0.13:0= |
66 |
- >=dev-libs/libinput-1.6.0:0= |
67 |
- dev-libs/libpcre |
68 |
- dev-libs/wayland |
69 |
- x11-libs/cairo |
70 |
- x11-libs/libxkbcommon |
71 |
- x11-libs/pango |
72 |
- x11-libs/pixman |
73 |
- media-libs/mesa[gles2] |
74 |
- elogind? ( >=sys-auth/elogind-239 ) |
75 |
- swaybar? ( x11-libs/gdk-pixbuf:2 ) |
76 |
- swaybg? ( gui-apps/swaybg ) |
77 |
- swayidle? ( gui-apps/swayidle ) |
78 |
- swaylock? ( gui-apps/swaylock ) |
79 |
- systemd? ( >=sys-apps/systemd-239 ) |
80 |
- X? ( x11-libs/libxcb:0= ) |
81 |
-" |
82 |
-if [[ ${PV} == 9999 ]]; then |
83 |
- DEPEND+="~gui-libs/wlroots-9999:=[elogind=,systemd=,X=]" |
84 |
-else |
85 |
- DEPEND+=" |
86 |
- >=gui-libs/wlroots-0.10.0:=[elogind=,systemd=,X=] |
87 |
- <gui-libs/wlroots-0.11.0:=[elogind=,systemd=,X=] |
88 |
- " |
89 |
-fi |
90 |
-RDEPEND=" |
91 |
- x11-misc/xkeyboard-config |
92 |
- ${DEPEND} |
93 |
-" |
94 |
-BDEPEND=" |
95 |
- >=dev-libs/wayland-protocols-1.14 |
96 |
- virtual/pkgconfig |
97 |
-" |
98 |
-if [[ ${PV} == 9999 ]]; then |
99 |
- BDEPEND+="man? ( ~app-text/scdoc-9999 )" |
100 |
-else |
101 |
- BDEPEND+="man? ( >=app-text/scdoc-1.9.3 )" |
102 |
-fi |
103 |
- |
104 |
-src_prepare() { |
105 |
- default |
106 |
- |
107 |
- use swaybar || sed -e "s/subdir('swaybar')//g" -e "/sway-bar.[0-9].scd/d" \ |
108 |
- -e "/completions\/[a-z]\+\/_\?swaybar/d" -i meson.build || die |
109 |
- use swaymsg || sed -e "s/subdir('swaymsg')//g" -e "/swaymsg.[0-9].scd/d" \ |
110 |
- -e "/completions\/[a-z]\+\/_\?swaymsg/d" -i meson.build || die |
111 |
- use swaynag || sed -e "s/subdir('swaynag')//g" -e "/swaynag.[0-9].scd/d" \ |
112 |
- -e "/completions\/[a-z]\+\/_\?swaynag/d" -i meson.build || die |
113 |
-} |
114 |
- |
115 |
-src_configure() { |
116 |
- local emesonargs=( |
117 |
- -Dman-pages=$(usex man enabled disabled) |
118 |
- -Dtray=$(usex tray enabled disabled) |
119 |
- -Dxwayland=$(usex X enabled disabled) |
120 |
- $(meson_use wallpapers default-wallpaper) |
121 |
- $(meson_use fish-completion fish-completions) |
122 |
- $(meson_use zsh-completion zsh-completions) |
123 |
- "-Dbash-completions=true" |
124 |
- "-Dwerror=false" |
125 |
- ) |
126 |
- |
127 |
- if use swaybar; then |
128 |
- emesonargs+=("-Dgdk-pixbuf=enabled") |
129 |
- else |
130 |
- emesonargs+=("-Dgdk-pixbuf=disabled") |
131 |
- fi |
132 |
- |
133 |
- meson_src_configure |
134 |
-} |
135 |
- |
136 |
-pkg_preinst() { |
137 |
- if ! use systemd && ! use elogind; then |
138 |
- fowners root:0 /usr/bin/sway |
139 |
- fperms 4511 /usr/bin/sway |
140 |
- fi |
141 |
-} |
142 |
- |
143 |
-pkg_postinst() { |
144 |
- if ! use systemd && ! use elogind; then |
145 |
- elog "" |
146 |
- elog "If you use ConsoleKit2, remember to launch sway using:" |
147 |
- elog "exec ck-launch-session sway" |
148 |
- elog "" |
149 |
- elog "If your system does not set the XDG_RUNTIME_DIR environment" |
150 |
- elog "variable, you must set it manually to run Sway. See wiki" |
151 |
- elog "for details: https://wiki.gentoo.org/wiki/Sway" |
152 |
- fi |
153 |
-} |