gentoo resync : 05.04.2019

4 files changed, 8 insertions, 121 deletions

diff --git a/x11-wm/i3/Manifest b/x11-wm/i3/Manifest
index cc8cf833f2c7..9025da525b81 100644
--- a/x11-wm/i3/Manifest
+++ b/x11-wm/i3/Manifest
@@ -1,15 +1,12 @@
-AUX i3-4.13-remove-git-polling.patch 580 BLAKE2B d1597903a553231a953e87381ca3462d9e4f4f0ced231308861e6cd8e3740008fdebe8f78cc40f9b615354f06e4a66d3be3ae5c8c5e294154cb6a42674a57f42 SHA512 169eafa91f9499944f65c3b016d6760780d7ada21d718bb96e3bd822741f0d5b30e13dd7493233338e193f1f565872cf896e3e4344a1228fed596c33ed68db8b
 AUX i3-4.16-musl-GLOB_TILDE.patch 2783 BLAKE2B 9dea47af64b78a77006d3aa641273aa7a77846d4425e1da17424528445450112ab275cdf7098ba8c2a76f1b08561b1d1a852cb9fd4ee4c61e53832ca702ad55d SHA512 fdff65255e7c9b30eefdbf032e04ba568d5b75a5b7dfc5fce1aecaac0f0d376b6bb4f87338e1eaf5f20b1c5882ebfc7349f8ab43c804349b5f5c626f9fc1d340
 AUX i3-musl-GLOB_TILDE.patch 2828 BLAKE2B 6ab0b8e92aacfe648891da99ad6ae7058b7abcd9bb0d54d062ccfe45d6b1b56039b38272afb725605df77eaefc0e82167588637dd60204abc1b22a59ced9e8e7 SHA512 8ccf5c558327f099ac6881bc3a5b2006aac491f21fea429a4b7184594974815836f3eea517a33b8e852ba30b913bcd3637b08ea92c0bc1f5d3d9f778c2ce087a
-DIST i3-4.13.tar.bz2 1121298 BLAKE2B 94f3940406d43083c8dc577b4216a32a08ad4c4b58e7707cc9e3129038f4d13043c1f86e8de03d0fdfcff73f0de582fc8b3c88d71c0161ac3eefe28329f67a64 SHA512 1bb1044e8d86e78d3ccb79d49f0eb26665dcd05a348058a5e57138151d74f57d77830efc3025893170fe1b8ec612f739f75247a427410f96286b09afd2c5f14c
-DIST i3-4.14.1.tar.bz2 1173560 BLAKE2B 96a0e1d75be13098fd530c3970464ce7710063f517c0d538939de6e7c799ab6b3ec005fb50216b1db4ccefd44584c584b263ac359bd9a86be53418d8f8d4beba SHA512 ef628af002947b40e1c88b0e872c6e93d4377a9674a120bd9adc3f323a38570b05124cd3047b5a26659e72070de2d00d83fb93186510c74ad8ddbf4f3df85472
 DIST i3-4.14.tar.gz 3936748 BLAKE2B 42678130be56bc695e5700e978ddbd34bfdaeda7a65252a05568581d76fe613e80e710f3a507110e7988077fe62048bf984d4009e722d877b178206cef600221 SHA512 fe3db78813987a15ed93d182968bcd5139e1d03f29d3e8effd9fce59f87bc8309407af0b2fa5f1cd83b8583e50ea0ade6b8eafc5dda6dea9161832dc9cebfdfe
 DIST i3-4.15.tar.bz2 1196263 BLAKE2B 36f20327202957dba30aface91af4d2c6261979e726584712a508a11cb4a612d812e771dc9f28ec4cfcbf3ebc9d92c72f5e940048516cca0f185eab20f95ae32 SHA512 60ab61b7e380342126bea12fb4371f98fcf18f6435f79a9519d3f59cfabdb170634366036e1aa20c5592da0832b03140ad1f0c72bad3cfaace0b7c57ad01dfc4
+DIST i3-4.16.1.tar.bz2 1211532 BLAKE2B 64a6996c0b89516069b58bf1cba92908a7f61ab04d66659b612b27411eb92fa9d49a7214eccdba33e7c33605b5f9247f69c1f0e23de629552edf113ab7520747 SHA512 3e328f8c7216697c5e484ca854605350f78844e24cc6cfb9c10e71368c2c0457387a14f819abdf8be2370d437889297f452fbf63f3924766ca81c157ab27e1b0
 DIST i3-4.16.tar.bz2 1213251 BLAKE2B a65d15278a83bac9903a611628ea53c64cd554ab9fff2a8864e649fd962858b2f3e77fe69d0dc70affc93dc69b3cbbd7b3ee670a2af9d697e28e9e4ea3323f67 SHA512 99abd15349ee8e61c084b3664ef3a189c92ea07812ac59eb6a5441df7cebea8211be52204e39bddcc33d8c714447fddbbe2c5c8a25b756a96e2dc6732526cbf8
-EBUILD i3-4.13-r1.ebuild 1993 BLAKE2B 60d2df3b1f17b4e0fe0a547a736c64dd46ab46642f68837730498038348615e69dde8a80f035591ef1486cb6d8b07127fb4cbfd299ea6ef9795eeaf7412e3697 SHA512 d56ad669b2c30627401cce39b4a8489e3657aa9ec42a3443305a4d3453dd876ec969544ff2a862fafcb84d17c9ebe3074bbb2ba8176a30c88ea5181a0225362c
-EBUILD i3-4.14.1.ebuild 2376 BLAKE2B 00f9ca5d7c45ee211a834a50da364a72c0968a778a4846065bec847a927c52b066e2e673d96d372ecd6f10fa70fddf49631f4c806dd5009207850b572ff67f87 SHA512 03a988ac0ab63792d7712e18eb622077b29bbd280030bf435096741a65024a1f9ea6ac01cacd64e09b336c3c2e792319ae1f18b8e03938268aeb00a0381a70ab
 EBUILD i3-4.14.ebuild 2113 BLAKE2B c602bbb48b166ffa70d735f9181ec81a4174fe7df08830bff5c2cd955f668d2e34453f421dd1c8fb616497be5cc5707332f412d73397287ed55ea5468ffc755d SHA512 709efb5ca49d7e2e1aa6426c631e653b66f15e261eb1462036b4bdef61cd68a690a03a71ae787d221939808b9b15f3d7604551c1cc3227b9194efea076b1390e
 EBUILD i3-4.15.ebuild 2323 BLAKE2B bf5ead0f91a4a040866f00f3dfe4b0c71a2d4e41eb9480c27e464790c37cbf641069729d34e48152223e4f7545a6b6b43be3f45213774219fe49eaa594491ad2 SHA512 95cf2e6f2053ffe180418dda38535a08ed8447085d65cd3ac342ba0e0468e8320d95ed8468bdcc11ec637ea2f2ef4926a0df8bacad186109fc5f2c42330e3692
+EBUILD i3-4.16.1.ebuild 2325 BLAKE2B 8b944e98274f9b573712f90906f5c44f4770107743ec2742fb90d9076209b4b8db2ce4e0cc530a95b2064b969f5cde30b1af494d3b00bb6e9d5b8bf363ed2923 SHA512 325c3129b367ddace668f1f162466f94f970b8f0a3cde9f2d9d0be2506ae2389fb6946a94952035e5a8a8912e4b618dbda04e2ee72c9351a3fc851d2b042acd1
 EBUILD i3-4.16.ebuild 2318 BLAKE2B 5897090120c632fc6385196d48e8bb14c9c1346699df738230b28c954842a8cf192adc9e690fdee208003e4d514b76d850970e8e12624c7ff17ef7dff0d1046b SHA512 ec02ae998edfa9f4188b51d4038f44cf3a910b5ac7a1e75552bce5387d3b93b77bfa5770adcb04bf4bd82d2b25c79dee6420561d18f9a7ad2062eda3969884a8
 EBUILD i3-9999.ebuild 1814 BLAKE2B 4bc786cad1c87f351da34303c63fa0d5e1874bb97852df7bef3ba4c9837a524c4abd18294c3be46752fe66c66efeb40f781e9964f0c1207c76b4145aa7d7583d SHA512 b3a4429575ac3440f026a73be0dc2d412bc4292a0e1640d20e4042f72c59ed7ade740f8f45fb7b6d7daf69f4cb09b863db923ad7f82b181caadfe2d57aa4bf60
 MISC metadata.xml 470 BLAKE2B 1c4fd7b44860934e88fb5165254fe0e8ca7e647c11af9af7d959f240e51002e6a454d9b93b30da8944891a1aa6a989f7a3e2a8af44ba41de174e78745393dd79 SHA512 52eddb56541d1172b04ca3ae646d01e52fb300dd62f5dfeaf2abe9d791965813e87b24a1477743797227bf8d407051f79076d54edb599524f89f3cfc716cc47e
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
deleted file mode 100644
index ca226378ed7f..000000000000
--- a/x11-wm/i3/files/i3-4.13-remove-git-polling.patch
+++ /dev/null
@@ -1,19 +0,0 @@
-diff -Naur a/configure.ac b/configure.ac
---- a/configure.ac	2017-01-13 13:31:25.250216293 +0100
-+++ b/configure.ac	2017-01-13 13:31:55.930217956 +0100
-@@ -146,15 +146,6 @@
- 	print_BUILD_MANS=no
- fi
- 
--git_dir=`git rev-parse --git-dir 2>/dev/null`
--if test -n "$git_dir"; then
--	srcdir=`dirname "$git_dir"`
--	exclude_dir=`pwd | sed "s,^$srcdir,,g"`
--	if ! grep -q "^$exclude_dir" "$git_dir/info/exclude"; then
--		echo "$exclude_dir" >> "$git_dir/info/exclude"
--	fi
--fi
--
- echo \
- "--------------------------------------------------------------------------------
- build configured:
diff --git a/x11-wm/i3/i3-4.13-r1.ebuild b/x11-wm/i3/i3-4.13-r1.ebuild
deleted file mode 100644
index 2b809ac551d6..000000000000
--- a/x11-wm/i3/i3-4.13-r1.ebuild
+++ /dev/null
@@ -1,88 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit autotools
-
-DESCRIPTION="An improved dynamic tiling window manager"
-HOMEPAGE="https://i3wm.org/"
-SRC_URI="https://i3wm.org/downloads/${P}.tar.bz2"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="amd64 ~arm x86"
-IUSE="doc"
-
-CDEPEND="dev-libs/libev
-	dev-libs/libpcre
-	>=dev-libs/yajl-2.0.3
-	x11-libs/libxcb[xkb]
-	x11-libs/libxkbcommon[X]
-	x11-libs/startup-notification
-	x11-libs/xcb-util
-	x11-libs/xcb-util-cursor
-	x11-libs/xcb-util-keysyms
-	x11-libs/xcb-util-wm
-	x11-libs/xcb-util-xrm
-	>=x11-libs/cairo-1.14.4[X,xcb]
-	>=x11-libs/pango-1.30.0[X]"
-DEPEND="${CDEPEND}
-	doc? ( app-text/asciidoc app-text/xmlto dev-lang/perl )
-	virtual/pkgconfig"
-RDEPEND="${CDEPEND}
-	dev-lang/perl
-	dev-perl/AnyEvent-I3
-	dev-perl/JSON-XS"
-
-DOCS=( RELEASE-NOTES-${PV} )
-PATCHES=(
-	"${FILESDIR}/${P}-remove-git-polling.patch"
-	"${FILESDIR}/${PN}-musl-GLOB_TILDE.patch"
-)
-
-src_prepare() {
-	default
-	if ! use doc ; then
-		sed -e '/AC_PATH_PROG(\[PATH_ASCIIDOC/d' -i configure.ac || die
-		eautoreconf
-	fi
-	cat <<- EOF > "${T}"/i3wm
-		#!/bin/sh
-		exec /usr/bin/i3
-	EOF
-}
-
-src_configure() {
-	local myeconfargs=( --enable-debug=no )  # otherwise injects -O0 -g
-	econf "${myeconfargs[@]}"
-}
-
-src_compile() {
-	emake -C "${CBUILD}"
-}
-
-src_install() {
-	emake -C "${CBUILD}" DESTDIR="${D}" install
-	if ! use doc ; then
-		# install docs shipped with source tarball
-		# local HTML_DOCS=( docs/. ) # TODO: install unconditionally?
-		doman man/*.1
-	fi
-	einstalldocs
-
-	exeinto /etc/X11/Sessions
-	doexe "${T}"/i3wm
-}
-
-pkg_postinst() {
-	# Only show the elog information on a new install
-	if [[ ! ${REPLACING_VERSIONS} ]]; then
-		elog "There are several packages that you may find useful with ${PN} and"
-		elog "their usage is suggested by the upstream maintainers, namely:"
-		elog "  x11-misc/dmenu"
-		elog "  x11-misc/i3status"
-		elog "  x11-misc/i3lock"
-		elog "Please refer to their description for additional info."
-	fi
-}
diff --git a/x11-wm/i3/i3-4.14.1.ebuild b/x11-wm/i3/i3-4.16.1.ebuild
index a10e0a5f9e40..40e2cfb9d89d 100644
--- a/x11-wm/i3/i3-4.14.1.ebuild
+++ b/x11-wm/i3/i3-4.16.1.ebuild
@@ -1,9 +1,7 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
-
-AEVER=0.17
+EAPI=7
 
 inherit autotools out-of-source virtualx
 
@@ -13,7 +11,7 @@ SRC_URI="https://i3wm.org/downloads/${P}.tar.bz2"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="~amd64 ~arm64 ~x86"
 IUSE="doc debug test"
 
 CDEPEND="dev-libs/libev
@@ -31,8 +29,6 @@ CDEPEND="dev-libs/libev
 	>=x11-libs/cairo-1.14.4[X,xcb]
 	>=x11-libs/pango-1.30.0[X]"
 DEPEND="${CDEPEND}
-	app-text/asciidoc
-	doc? ( app-text/xmlto dev-lang/perl )
 	test? (
 		dev-perl/AnyEvent
 		>=dev-perl/X11-XCB-0.120.0
@@ -44,18 +40,19 @@ DEPEND="${CDEPEND}
 		>=virtual/perl-Test-Simple-0.940.0
 		x11-base/xorg-server[xephyr]
 	)
-	virtual/pkgconfig"
+"
 RDEPEND="${CDEPEND}
 	dev-lang/perl
 	dev-perl/AnyEvent-I3
 	dev-perl/JSON-XS"
+BDEPEND="virtual/pkgconfig"
 
 # Test without debug will apply optimization levels, which results
 # in type-punned pointers - which in turn causes test failures.
 REQUIRED_USE="test? ( debug )"
 
 PATCHES=(
-	"${FILESDIR}/${PN}-musl-GLOB_TILDE.patch"
+	"${FILESDIR}/${PN}-4.16-musl-GLOB_TILDE.patch"
 )
 
 # https://github.com/i3/i3/issues/3013