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