Gentoo Archives: gentoo-commits

From: Lars Wendler <polynomial-c@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: x11-wm/i3/, x11-wm/i3/files/
Date: Tue, 26 Mar 2019 08:58:57
Message-Id: 1553590723.bbdedd01a640f44a3d11dfc9fb3def8907260f64.polynomial-c@gentoo
1 commit: bbdedd01a640f44a3d11dfc9fb3def8907260f64
2 Author: Lars Wendler <polynomial-c <AT> gentoo <DOT> org>
3 AuthorDate: Tue Mar 26 08:54:57 2019 +0000
4 Commit: Lars Wendler <polynomial-c <AT> gentoo <DOT> org>
5 CommitDate: Tue Mar 26 08:58:43 2019 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=bbdedd01
7
8 x11-wm/i3: Removed old.
9
10 Package-Manager: Portage-2.3.62, Repoman-2.3.12
11 Signed-off-by: Lars Wendler <polynomial-c <AT> gentoo.org>
12
13 x11-wm/i3/Manifest | 2 -
14 x11-wm/i3/files/i3-4.13-remove-git-polling.patch | 19 ----
15 x11-wm/i3/i3-4.13-r1.ebuild | 88 -----------------
16 x11-wm/i3/i3-4.14.1.ebuild | 114 -----------------------
17 4 files changed, 223 deletions(-)
18
19 diff --git a/x11-wm/i3/Manifest b/x11-wm/i3/Manifest
20 index 815dd064801..c2509315514 100644
21 --- a/x11-wm/i3/Manifest
22 +++ b/x11-wm/i3/Manifest
23 @@ -1,5 +1,3 @@
24 -DIST i3-4.13.tar.bz2 1121298 BLAKE2B 94f3940406d43083c8dc577b4216a32a08ad4c4b58e7707cc9e3129038f4d13043c1f86e8de03d0fdfcff73f0de582fc8b3c88d71c0161ac3eefe28329f67a64 SHA512 1bb1044e8d86e78d3ccb79d49f0eb26665dcd05a348058a5e57138151d74f57d77830efc3025893170fe1b8ec612f739f75247a427410f96286b09afd2c5f14c
25 -DIST i3-4.14.1.tar.bz2 1173560 BLAKE2B 96a0e1d75be13098fd530c3970464ce7710063f517c0d538939de6e7c799ab6b3ec005fb50216b1db4ccefd44584c584b263ac359bd9a86be53418d8f8d4beba SHA512 ef628af002947b40e1c88b0e872c6e93d4377a9674a120bd9adc3f323a38570b05124cd3047b5a26659e72070de2d00d83fb93186510c74ad8ddbf4f3df85472
26 DIST i3-4.14.tar.gz 3936748 BLAKE2B 42678130be56bc695e5700e978ddbd34bfdaeda7a65252a05568581d76fe613e80e710f3a507110e7988077fe62048bf984d4009e722d877b178206cef600221 SHA512 fe3db78813987a15ed93d182968bcd5139e1d03f29d3e8effd9fce59f87bc8309407af0b2fa5f1cd83b8583e50ea0ade6b8eafc5dda6dea9161832dc9cebfdfe
27 DIST i3-4.15.tar.bz2 1196263 BLAKE2B 36f20327202957dba30aface91af4d2c6261979e726584712a508a11cb4a612d812e771dc9f28ec4cfcbf3ebc9d92c72f5e940048516cca0f185eab20f95ae32 SHA512 60ab61b7e380342126bea12fb4371f98fcf18f6435f79a9519d3f59cfabdb170634366036e1aa20c5592da0832b03140ad1f0c72bad3cfaace0b7c57ad01dfc4
28 DIST i3-4.16.1.tar.bz2 1211532 BLAKE2B 64a6996c0b89516069b58bf1cba92908a7f61ab04d66659b612b27411eb92fa9d49a7214eccdba33e7c33605b5f9247f69c1f0e23de629552edf113ab7520747 SHA512 3e328f8c7216697c5e484ca854605350f78844e24cc6cfb9c10e71368c2c0457387a14f819abdf8be2370d437889297f452fbf63f3924766ca81c157ab27e1b0
29
30 diff --git a/x11-wm/i3/files/i3-4.13-remove-git-polling.patch b/x11-wm/i3/files/i3-4.13-remove-git-polling.patch
31 deleted file mode 100644
32 index ca226378ed7..00000000000
33 --- a/x11-wm/i3/files/i3-4.13-remove-git-polling.patch
34 +++ /dev/null
35 @@ -1,19 +0,0 @@
36 -diff -Naur a/configure.ac b/configure.ac
37 ---- a/configure.ac 2017-01-13 13:31:25.250216293 +0100
38 -+++ b/configure.ac 2017-01-13 13:31:55.930217956 +0100
39 -@@ -146,15 +146,6 @@
40 - print_BUILD_MANS=no
41 - fi
42 -
43 --git_dir=`git rev-parse --git-dir 2>/dev/null`
44 --if test -n "$git_dir"; then
45 -- srcdir=`dirname "$git_dir"`
46 -- exclude_dir=`pwd | sed "s,^$srcdir,,g"`
47 -- if ! grep -q "^$exclude_dir" "$git_dir/info/exclude"; then
48 -- echo "$exclude_dir" >> "$git_dir/info/exclude"
49 -- fi
50 --fi
51 --
52 - echo \
53 - "--------------------------------------------------------------------------------
54 - build configured:
55
56 diff --git a/x11-wm/i3/i3-4.13-r1.ebuild b/x11-wm/i3/i3-4.13-r1.ebuild
57 deleted file mode 100644
58 index 2b809ac551d..00000000000
59 --- a/x11-wm/i3/i3-4.13-r1.ebuild
60 +++ /dev/null
61 @@ -1,88 +0,0 @@
62 -# Copyright 1999-2018 Gentoo Foundation
63 -# Distributed under the terms of the GNU General Public License v2
64 -
65 -EAPI=6
66 -
67 -inherit autotools
68 -
69 -DESCRIPTION="An improved dynamic tiling window manager"
70 -HOMEPAGE="https://i3wm.org/"
71 -SRC_URI="https://i3wm.org/downloads/${P}.tar.bz2"
72 -
73 -LICENSE="BSD"
74 -SLOT="0"
75 -KEYWORDS="amd64 ~arm x86"
76 -IUSE="doc"
77 -
78 -CDEPEND="dev-libs/libev
79 - dev-libs/libpcre
80 - >=dev-libs/yajl-2.0.3
81 - x11-libs/libxcb[xkb]
82 - x11-libs/libxkbcommon[X]
83 - x11-libs/startup-notification
84 - x11-libs/xcb-util
85 - x11-libs/xcb-util-cursor
86 - x11-libs/xcb-util-keysyms
87 - x11-libs/xcb-util-wm
88 - x11-libs/xcb-util-xrm
89 - >=x11-libs/cairo-1.14.4[X,xcb]
90 - >=x11-libs/pango-1.30.0[X]"
91 -DEPEND="${CDEPEND}
92 - doc? ( app-text/asciidoc app-text/xmlto dev-lang/perl )
93 - virtual/pkgconfig"
94 -RDEPEND="${CDEPEND}
95 - dev-lang/perl
96 - dev-perl/AnyEvent-I3
97 - dev-perl/JSON-XS"
98 -
99 -DOCS=( RELEASE-NOTES-${PV} )
100 -PATCHES=(
101 - "${FILESDIR}/${P}-remove-git-polling.patch"
102 - "${FILESDIR}/${PN}-musl-GLOB_TILDE.patch"
103 -)
104 -
105 -src_prepare() {
106 - default
107 - if ! use doc ; then
108 - sed -e '/AC_PATH_PROG(\[PATH_ASCIIDOC/d' -i configure.ac || die
109 - eautoreconf
110 - fi
111 - cat <<- EOF > "${T}"/i3wm
112 - #!/bin/sh
113 - exec /usr/bin/i3
114 - EOF
115 -}
116 -
117 -src_configure() {
118 - local myeconfargs=( --enable-debug=no ) # otherwise injects -O0 -g
119 - econf "${myeconfargs[@]}"
120 -}
121 -
122 -src_compile() {
123 - emake -C "${CBUILD}"
124 -}
125 -
126 -src_install() {
127 - emake -C "${CBUILD}" DESTDIR="${D}" install
128 - if ! use doc ; then
129 - # install docs shipped with source tarball
130 - # local HTML_DOCS=( docs/. ) # TODO: install unconditionally?
131 - doman man/*.1
132 - fi
133 - einstalldocs
134 -
135 - exeinto /etc/X11/Sessions
136 - doexe "${T}"/i3wm
137 -}
138 -
139 -pkg_postinst() {
140 - # Only show the elog information on a new install
141 - if [[ ! ${REPLACING_VERSIONS} ]]; then
142 - elog "There are several packages that you may find useful with ${PN} and"
143 - elog "their usage is suggested by the upstream maintainers, namely:"
144 - elog " x11-misc/dmenu"
145 - elog " x11-misc/i3status"
146 - elog " x11-misc/i3lock"
147 - elog "Please refer to their description for additional info."
148 - fi
149 -}
150
151 diff --git a/x11-wm/i3/i3-4.14.1.ebuild b/x11-wm/i3/i3-4.14.1.ebuild
152 deleted file mode 100644
153 index a10e0a5f9e4..00000000000
154 --- a/x11-wm/i3/i3-4.14.1.ebuild
155 +++ /dev/null
156 @@ -1,114 +0,0 @@
157 -# Copyright 1999-2018 Gentoo Foundation
158 -# Distributed under the terms of the GNU General Public License v2
159 -
160 -EAPI=6
161 -
162 -AEVER=0.17
163 -
164 -inherit autotools out-of-source virtualx
165 -
166 -DESCRIPTION="An improved dynamic tiling window manager"
167 -HOMEPAGE="https://i3wm.org/"
168 -SRC_URI="https://i3wm.org/downloads/${P}.tar.bz2"
169 -
170 -LICENSE="BSD"
171 -SLOT="0"
172 -KEYWORDS="~amd64 ~x86"
173 -IUSE="doc debug test"
174 -
175 -CDEPEND="dev-libs/libev
176 - dev-libs/libpcre
177 - >=dev-libs/yajl-2.0.3
178 - x11-libs/libxcb[xkb]
179 - x11-libs/libxkbcommon[X]
180 - x11-libs/startup-notification
181 - x11-libs/xcb-util
182 - x11-libs/xcb-util-cursor
183 - x11-libs/xcb-util-keysyms
184 - x11-libs/xcb-util-wm
185 - x11-libs/xcb-util-xrm
186 - x11-misc/xkeyboard-config
187 - >=x11-libs/cairo-1.14.4[X,xcb]
188 - >=x11-libs/pango-1.30.0[X]"
189 -DEPEND="${CDEPEND}
190 - app-text/asciidoc
191 - doc? ( app-text/xmlto dev-lang/perl )
192 - test? (
193 - dev-perl/AnyEvent
194 - >=dev-perl/X11-XCB-0.120.0
195 - dev-perl/Inline
196 - dev-perl/Inline-C
197 - dev-perl/IPC-Run
198 - dev-perl/ExtUtils-PkgConfig
199 - dev-perl/local-lib
200 - >=virtual/perl-Test-Simple-0.940.0
201 - x11-base/xorg-server[xephyr]
202 - )
203 - virtual/pkgconfig"
204 -RDEPEND="${CDEPEND}
205 - dev-lang/perl
206 - dev-perl/AnyEvent-I3
207 - dev-perl/JSON-XS"
208 -
209 -# Test without debug will apply optimization levels, which results
210 -# in type-punned pointers - which in turn causes test failures.
211 -REQUIRED_USE="test? ( debug )"
212 -
213 -PATCHES=(
214 - "${FILESDIR}/${PN}-musl-GLOB_TILDE.patch"
215 -)
216 -
217 -# https://github.com/i3/i3/issues/3013
218 -RESTRICT="test"
219 -
220 -src_prepare() {
221 - default
222 -
223 - cat <<- EOF > "${T}"/i3wm
224 - #!/bin/sh
225 - exec /usr/bin/i3
226 - EOF
227 -
228 - eautoreconf
229 -}
230 -
231 -my_src_configure() {
232 - local myeconfargs=(
233 - $(use_enable debug)
234 - )
235 - econf "${myeconfargs[@]}"
236 -}
237 -
238 -my_src_test() {
239 - emake \
240 - test.commands_parser \
241 - test.config_parser \
242 - test.inject_randr15
243 -
244 - virtx perl \
245 - -I "${S}/testcases/lib" \
246 - -I "${BUILD_DIR}/testcases/lib" \
247 - testcases/complete-run.pl
248 -}
249 -
250 -my_src_install_all() {
251 - doman man/*.1
252 -
253 - einstalldocs
254 - use doc && dodoc -r docs "RELEASE-NOTES-${PV}"
255 -
256 - exeinto /etc/X11/Sessions
257 - doexe "${T}/i3wm"
258 -}
259 -
260 -pkg_postinst() {
261 - # Only show the elog information on a new install
262 - if [[ ! ${REPLACING_VERSIONS} ]]; then
263 - elog "There are several packages that you may find useful with ${PN} and"
264 - elog "their usage is suggested by the upstream maintainers, namely:"
265 - elog " x11-misc/dmenu"
266 - elog " x11-misc/i3status"
267 - elog " x11-misc/i3lock"
268 - elog "Please refer to their description for additional info."
269 - fi
270 -}