gentoo resync : 08.10.2021

6 files changed, 2 insertions, 340 deletions

diff --git a/x11-wm/i3/Manifest b/x11-wm/i3/Manifest
index a1aa12539f86..8fd30ec0ef35 100644
--- a/x11-wm/i3/Manifest
+++ b/x11-wm/i3/Manifest
@@ -1,14 +1,7 @@
 AUX i3-4.16-musl-GLOB_TILDE.patch 2783 BLAKE2B 9dea47af64b78a77006d3aa641273aa7a77846d4425e1da17424528445450112ab275cdf7098ba8c2a76f1b08561b1d1a852cb9fd4ee4c61e53832ca702ad55d SHA512 fdff65255e7c9b30eefdbf032e04ba568d5b75a5b7dfc5fce1aecaac0f0d376b6bb4f87338e1eaf5f20b1c5882ebfc7349f8ab43c804349b5f5c626f9fc1d340
-AUX i3-gaps-4.19-fix-docdir.patch 508 BLAKE2B 44aa2a2a7d0b77429345c4b62be66437714851481ca968098596c28aae8769036b8238b0295f4f80ca8e6e0f2c3e25c60130f3b941cb763d2069deb07d884dfd SHA512 8169cd9fdc2a4506af3d93eda672484a43ab30cf99afcdfc10094be36e6fcccf53d416376a475a95a80d34afb6dbec32bb657a81ccc7e5244c23b34717d5201a
-DIST i3-4.18.3.tar.bz2 1218766 BLAKE2B c394bbe9882dc893107f0c948632a3a79c52db75b75b2890f6f43fa60d80ce82d1c8a8c32a8793f59d9a6f929ab038765dbe3813c3c6bc1b79bebbbbde772451 SHA512 61599b79247ec546819bab22666a78fc8dc77eecbcf6055efb6b52720290fa7f72719ac6670396a6dfb54858781e438b5207c15fdf2cf9e2424a1b84ffeb749c
-DIST i3-4.18.tar.bz2 1218591 BLAKE2B 582b7ba3a54edf8dd2657add05eb54a64b7c004761a1a248d91dfcb061cb9df215ff35301c125b11aa69b571daeacd5732b498934c1fb17f69404a101fd16ec8 SHA512 0bbfda7f4b20a92a50ffb6abbfc3f6bfe6bb4c987ad4b5b1791192eb23b8c3389cc9949a699901797370c14de1ff8e12447a3b8ce330ab7d300fafdb60a432ec
 DIST i3-4.19.1.tar.xz 1277648 BLAKE2B a4d01d10c076da092faef2111ba0fadb481257c0011419cc911be0b63c0ff78053a39ff4a2887f6344794ea895190ebf1ac3585b598dbb90ff77d4de8fad7c53 SHA512 7a73d005e4ec438a7cf92ab719e17701948c5043cc431740b16e028e9771d1478fa539aebd1a8198fff6bec664f8bcecc17c3bd1ff35d53077d50d3ad1a8f7dc
 DIST i3-4.19.2.tar.xz 1277396 BLAKE2B 28d4dba50ae30cb620dcbd759e0ba29e284071234261aca2a217b6eef9194f72eca67d3632dc1e6a9b9879925e55c18b7a42676eaed41dd1354f772e48309d45 SHA512 58f08228d842cd3c2bc417b72f6279fcd7050879e5fd4064b2cb00edaf98b6605d5b2361608f9534991a0f8357d3294e881c7e314f33dc075241cc45ca5ed94d
-DIST i3-4.19.tar.xz 1278600 BLAKE2B 3af5eac9cb618bc3b3da0bca430e1882701802f49e092d1e6fa7a35ceb3f2c0287b66eceeb0123a7dfda9976df06227bec34d7d98873aedc2292a2ba94584d84 SHA512 e9e85dfa099751e95f05e8ed5048535bc669d73c51d3bd7e83740ee79d613f981a1130c35f54fb4725b31d18bed63d6bd5efacce8e086483e28d7c778407653a
-EBUILD i3-4.18.3.ebuild 2133 BLAKE2B f5b1ca5ab47d57102c358e72d958d4b0153d24b41573067f8760f80860150567a16839b5baf9270f80c9ac2daeb751c103a893ca4c8246e7f476f401200451d9 SHA512 6006b8efd31270c81b4ab4047ef22abc15779729d71ff6a6e3ab2a82376bf84c1e19eb80a6e5d22d7f68ea03d78ca088edd9d4c35e9aa5093a39e2d689d6648a
-EBUILD i3-4.18.ebuild 2126 BLAKE2B 29048fa9165965ccd572cbacc8fdcc15697384bb75039c2c77caa3970040b31592359c1aa4b8df9242fd8c455e0b1a44d33c76422a9e603235651828cb7020d3 SHA512 527a652e1c6e05b1730a404c38a612820aebc2619ea8baf63c3403cbaaa8a4a5608ba63586c4f5ab09d7d57225727ed3f1207da317110b2b50b31b224440820c
-EBUILD i3-4.19-r1.ebuild 2009 BLAKE2B 879d419a2519c1a9ed7d6450f2c61a2fd55e0092f372affcdf71a695b037086d02ba89563b2157cb10ed82b31abadc96e5b610a5a9d7b615256ca54da3e47b1f SHA512 1b102e92604ae0b0cb10dac8fba11f263915c87ca5572aa779d8c77be92e3bb2c9304229a2031a1cd32937d0bab56a1e7777ad70a3c8ac7bb42fa256ff93eb1b
-EBUILD i3-4.19.1.ebuild 1963 BLAKE2B c4c67cbfe2936a71dbe28975de1ba900e38c0b6e950c5d2651f0495ce79070ead37168b97ebee170c23f27e96e50b93311296360e4bd42f2c7dd056649b9133b SHA512 b3e605f591aaed7fe4281efe32fc4172988b225f6445537ec4512564e9eb2dee08baf365b7361bcac10f0d0614140d1e4ccb6395df51ca72ead2c014e40d0e02
+EBUILD i3-4.19.1.ebuild 1962 BLAKE2B afa9253da2dab6628674bc2d2b613a2c6a25dc9009840fda4029957c80d1fd61453a95dddcbf346bf5a457030735295b7dce72c62020efbe633087a027f2f9dc SHA512 67b9bac58c187654464633f205728e0000eba33cbdc965499ee4c689452b7ac4a559252c21fc271361c31bd9e0b486aab03f52b1d6fb8f3e35d25ea46640ab9a
 EBUILD i3-4.19.2.ebuild 1980 BLAKE2B b47551d40cc02e24a0c61ee99cf721cb3e2580806b3b4298648dbe6f03eecf043f619bde78735c4d24df29d94d8f37ac7e7cf7310187844475291514f6f2396b SHA512 d072a4304375e6cdb4ff2ba060f0c16ff9ea11d0d65ffe0c242f10c87933a869e49ded091441e8d0d6ca3cddf1f8f1ede82f61b832389d728d48820bed81a66a
 EBUILD i3-9999.ebuild 1973 BLAKE2B 6560c66a1e6b47f767f7b9b7711646aeab3603d4856dba9973751f12ba99019d4c0f5d45d6ab28a75f01652d300654847b7f6eea8be48efe797e0940adfd4697 SHA512 d240e390c4c7f949de52ac382421afd5cab2f507fbe2bec97756180424c098a2fb62190d595dc49c8a4d71e59a3b433cb8a0177086445315af7c82a5a7e10dc6
 MISC metadata.xml 467 BLAKE2B 698d3f7309aa859af72db95540288e3fb4a848094d0a09b2d1deb5589f814cadc664bc455c0815bd0ac3ded9129495d7a7df8f60de1f9a7b48541c100f645b46 SHA512 6eda0780c6b9962ae7111c8f1390705b987ceff160532353f27366e336cdb00499dec8acf91aefa87fdddf99117b1f4c942d8ba94be6d41c246d342c9f075364
diff --git a/x11-wm/i3/files/i3-gaps-4.19-fix-docdir.patch b/x11-wm/i3/files/i3-gaps-4.19-fix-docdir.patch
deleted file mode 100644
index 6917aa091dff..000000000000
--- a/x11-wm/i3/files/i3-gaps-4.19-fix-docdir.patch
+++ /dev/null
@@ -1,22 +0,0 @@
-diff --git a/meson.build b/meson.build
-index 11541e21..a6f8974e 100644
---- a/meson.build
-+++ b/meson.build
-@@ -642,7 +642,7 @@ if get_option('docs')
-       '@OUTPUT@',
-     ],
-     install: true,
--    install_dir: join_paths(get_option('datadir'), 'doc', 'i3'),
-+    install_dir: docdir,
-   )
- 
-   custom_target(
-@@ -655,7 +655,7 @@ if get_option('docs')
-       '@OUTPUT@',
-     ],
-     install: true,
--    install_dir: join_paths(get_option('datadir'), 'doc', 'i3'),
-+    install_dir: docdir,
-   )
- endif
- 
diff --git a/x11-wm/i3/i3-4.18.3.ebuild b/x11-wm/i3/i3-4.18.3.ebuild
deleted file mode 100644
index 58a3f832182c..000000000000
--- a/x11-wm/i3/i3-4.18.3.ebuild
+++ /dev/null
@@ -1,103 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit autotools out-of-source virtualx
-
-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 ~arm64 ~x86"
-IUSE="doc debug test"
-
-CDEPEND="dev-libs/libev
-	dev-libs/libpcre
-	dev-libs/yajl
-	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-misc/xkeyboard-config
-	x11-libs/cairo[X,xcb(+)]
-	x11-libs/pango[X]"
-DEPEND="${CDEPEND}
-	test? (
-		dev-perl/AnyEvent
-		dev-perl/X11-XCB
-		dev-perl/Inline
-		dev-perl/Inline-C
-		dev-perl/IPC-Run
-		dev-perl/ExtUtils-PkgConfig
-		dev-perl/local-lib
-		virtual/perl-Test-Simple
-		x11-base/xorg-server[xephyr]
-		x11-misc/xvfb-run
-	)"
-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}-4.16-musl-GLOB_TILDE.patch"
-)
-
-# https://github.com/i3/i3/issues/3013
-RESTRICT="test"
-
-src_prepare() {
-	default
-
-	cat <<- EOF > "${T}"/i3wm
-		#!/bin/sh
-		exec /usr/bin/i3
-	EOF
-
-	eautoreconf
-}
-
-my_src_configure() {
-	local myeconfargs=(
-		$(use_enable debug)
-	)
-	econf "${myeconfargs[@]}"
-}
-
-my_src_test() {
-	emake check
-}
-
-my_src_install_all() {
-	doman man/*.1
-
-	einstalldocs
-	use doc && dodoc -r docs "RELEASE-NOTES-${PV}"
-
-	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.18.ebuild b/x11-wm/i3/i3-4.18.ebuild
deleted file mode 100644
index ca0d08cf24a6..000000000000
--- a/x11-wm/i3/i3-4.18.ebuild
+++ /dev/null
@@ -1,103 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit autotools out-of-source virtualx
-
-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 ~arm64 x86"
-IUSE="doc debug test"
-
-CDEPEND="dev-libs/libev
-	dev-libs/libpcre
-	dev-libs/yajl
-	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-misc/xkeyboard-config
-	x11-libs/cairo[X,xcb(+)]
-	x11-libs/pango[X]"
-DEPEND="${CDEPEND}
-	test? (
-		dev-perl/AnyEvent
-		dev-perl/X11-XCB
-		dev-perl/Inline
-		dev-perl/Inline-C
-		dev-perl/IPC-Run
-		dev-perl/ExtUtils-PkgConfig
-		dev-perl/local-lib
-		virtual/perl-Test-Simple
-		x11-base/xorg-server[xephyr]
-		x11-misc/xvfb-run
-	)"
-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}-4.16-musl-GLOB_TILDE.patch"
-)
-
-# https://github.com/i3/i3/issues/3013
-RESTRICT="test"
-
-src_prepare() {
-	default
-
-	cat <<- EOF > "${T}"/i3wm
-		#!/bin/sh
-		exec /usr/bin/i3
-	EOF
-
-	eautoreconf
-}
-
-my_src_configure() {
-	local myeconfargs=(
-		$(use_enable debug)
-	)
-	econf "${myeconfargs[@]}"
-}
-
-my_src_test() {
-	emake check
-}
-
-my_src_install_all() {
-	doman man/*.1
-
-	einstalldocs
-	use doc && dodoc -r docs "RELEASE-NOTES-${PV}"
-
-	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.19-r1.ebuild b/x11-wm/i3/i3-4.19-r1.ebuild
deleted file mode 100644
index 3b3b04623bc8..000000000000
--- a/x11-wm/i3/i3-4.19-r1.ebuild
+++ /dev/null
@@ -1,103 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit meson optfeature virtualx
-if [[ "${PV}" = *9999 ]]; then
-	inherit git-r3
-fi
-
-DESCRIPTION="An improved dynamic tiling window manager"
-HOMEPAGE="https://i3wm.org/"
-if [[ "${PV}" = *9999 ]]; then
-	EGIT_REPO_URI="https://github.com/i3/i3"
-	EGIT_BRANCH="next"
-else
-	SRC_URI="https://i3wm.org/downloads/${P}.tar.xz"
-	KEYWORDS="~amd64 ~arm ~arm64 ~x86"
-fi
-
-LICENSE="BSD"
-SLOT="0"
-IUSE="doc test"
-
-COMMON_DEPEND="dev-libs/libev
-	dev-libs/libpcre
-	dev-libs/yajl
-	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-misc/xkeyboard-config
-	x11-libs/cairo[X,xcb(+)]
-	x11-libs/pango[X]"
-DEPEND="${COMMON_DEPEND}
-	test? (
-		dev-perl/AnyEvent
-		dev-perl/X11-XCB
-		dev-perl/Inline
-		dev-perl/Inline-C
-		dev-perl/IPC-Run
-		dev-perl/ExtUtils-PkgConfig
-		dev-perl/local-lib
-		virtual/perl-Test-Simple
-		x11-base/xorg-server[xephyr]
-		x11-misc/xvfb-run
-	)
-	doc? (
-		app-text/asciidoc
-		app-text/xmlto
-		dev-lang/perl
-	)"
-RDEPEND="${COMMON_DEPEND}
-	dev-lang/perl
-	dev-perl/AnyEvent-I3
-	dev-perl/JSON-XS"
-BDEPEND="virtual/pkgconfig"
-
-PATCHES=(
-	"${FILESDIR}/${PN}-4.16-musl-GLOB_TILDE.patch"
-	"${FILESDIR}/i3-gaps-4.19-fix-docdir.patch"
-)
-
-src_prepare() {
-	default
-
-	cat <<- EOF > "${T}"/i3wm
-		#!/bin/sh
-		exec /usr/bin/i3
-	EOF
-}
-
-src_configure() {
-	local emesonargs=(
-		-Ddocdir="${EPREFIX}/usr/share/doc/${PF}"
-		$(meson_use doc docs)
-		$(meson_use doc mans)
-	)
-
-	meson_src_configure
-}
-
-src_install() {
-	meson_src_install
-
-	exeinto /etc/X11/Sessions
-	doexe "${T}"/i3wm
-}
-
-src_test() {
-	virtx meson_src_test
-}
-
-pkg_postinst() {
-	optfeature_header "There are several packages that may be useful with i3:"
-	optfeature "application launcher" x11-misc/dmenu
-	optfeature "simple screen locker" x11-misc/i3lock
-	optfeature "status bar generator" x11-misc/i3status
-}
diff --git a/x11-wm/i3/i3-4.19.1.ebuild b/x11-wm/i3/i3-4.19.1.ebuild
index 8488d74426ae..b3fcd0ed53ef 100644
--- a/x11-wm/i3/i3-4.19.1.ebuild
+++ b/x11-wm/i3/i3-4.19.1.ebuild
@@ -15,7 +15,7 @@ if [[ "${PV}" = *9999 ]]; then
 	EGIT_BRANCH="next"
 else
 	SRC_URI="https://i3wm.org/downloads/${P}.tar.xz"
-	KEYWORDS="amd64 ~arm ~arm64 ~x86"
+	KEYWORDS="amd64 ~arm ~arm64 x86"
 fi
 
 LICENSE="BSD"