Gentoo Archives: gentoo-commits

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