6 files changed, 0 insertions, 509 deletions
diff --git a/x11-wm/i3/Manifest b/x11-wm/i3/Manifest
index 231429f4aa1e..1f67acc92cdd 100644
--- a/x11-wm/i3/Manifest
+++ b/x11-wm/i3/Manifest
@@ -1,7 +1,3 @@
-DIST i3-4.14.tar.gz 3936748 BLAKE2B 42678130be56bc695e5700e978ddbd34bfdaeda7a65252a05568581d76fe613e80e710f3a507110e7988077fe62048bf984d4009e722d877b178206cef600221 SHA512 fe3db78813987a15ed93d182968bcd5139e1d03f29d3e8effd9fce59f87bc8309407af0b2fa5f1cd83b8583e50ea0ade6b8eafc5dda6dea9161832dc9cebfdfe
-DIST i3-4.17.1.tar.bz2 1218418 BLAKE2B eb798eee2b618691ceb47b72c08fe09b09e2913c17fe667fab95426069c86497bff67278bea5fc97fdf90ebdfc6574e68cad36b21036a63d053edced1edf8592 SHA512 af397dc1768ea6530e4b2ce8ef21b20ecff8ab9eebf380df224456173eea4c3bacf28b55c8efcdc70f76f0d66543c163564a94cfd66028221ace481fa3c2913f
-DIST i3-4.18.1.tar.bz2 1217703 BLAKE2B 469a6ac09004f95861655858c47d9e6b2f378152bec7b7c6e7b08f06ee387043b8e2c382f888f14daf806ae8764d934025118e997f072709eee23c5cc52de21d SHA512 b001f539b1daf78be6dd9335a7c0474d30f8d969f79d131391ebd9ca310a058a1cc1234e4a9e60552efd520fc4983571f3c0b8cbd7be978e45957daaf86b3e90
-DIST i3-4.18.2.tar.bz2 1218440 BLAKE2B 55fba66b2399730cb3bc63d76efff18a439aad755c943f06d7622bd7c4d91502b3750cff638b98ef86d6f99746bc1858ffbd9396e2d89a7220f513575879e08a SHA512 997c7cdf32f95ba25cfcd483a09f7e37e5219e4501baefa5c1865ddffd206bc9725211e4082663fab4174dc947b663ff454d343a7e30340ac3ea451f999417fc
 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.tar.xz 1278600 BLAKE2B 3af5eac9cb618bc3b3da0bca430e1882701802f49e092d1e6fa7a35ceb3f2c0287b66eceeb0123a7dfda9976df06227bec34d7d98873aedc2292a2ba94584d84 SHA512 e9e85dfa099751e95f05e8ed5048535bc669d73c51d3bd7e83740ee79d613f981a1130c35f54fb4725b31d18bed63d6bd5efacce8e086483e28d7c778407653a
diff --git a/x11-wm/i3/files/i3-musl-GLOB_TILDE.patch b/x11-wm/i3/files/i3-musl-GLOB_TILDE.patch
deleted file mode 100644
index d241a748186e..000000000000
--- a/x11-wm/i3/files/i3-musl-GLOB_TILDE.patch
+++ /dev/null
@@ -1,86 +0,0 @@
-From: Natanael Copa <ncopa@alpinelinux.org>
-Patch-Source: https://git.alpinelinux.org/cgit/aports/tree/community/i3wm/musl.patch
-Project-Bug-URL: https://github.com/i3/i3/issues/1859
-Gentoo-Bug-URL: https://bugs.gentoo.org/show_bug.cgi?id=609306
-
-Musl doesn't implement GLOB_TILDE, which is used by i3 when expanding paths.
-
-This patch replaces usage of GLOB_TILDE in glob() by replacing tilde
-with the content of $HOME - if set - manually.
-
-As mentioned in the i3 bugtracker this is an issue that should be solved by musl.
-
-A patch has been sent to musl upstream, but it hasn't been merged yet:
-http://www.openwall.com/lists/musl/2017/01/17/1
----
---- i3-4.11/i3bar/src/main.c
-+++ i3-4.11/i3bar/src/main.c
-@@ -45,14 +45,20 @@ void debuglog(char *fmt, ...) {
-  *
-  */
- char *expand_path(char *path) {
--    static glob_t globbuf;
--    if (glob(path, GLOB_NOCHECK | GLOB_TILDE, NULL, &globbuf) < 0) {
--        ELOG("glob() failed\n");
--        exit(EXIT_FAILURE);
-+    char *home, *expanded;
-+
-+    if (strncmp(path, "~/", 2) == 0) {
-+        home = getenv("HOME");
-+        if (home != NULL) {
-+            /* new length: sum - 1 (omit '~') + 1 (for '\0') */
-+            expanded = scalloc(strlen(home)+strlen(path), 1);
-+            strcpy(expanded, home);
-+            strcat(expanded, path+1);
-+            return expanded;
-+        }
-     }
--    char *result = sstrdup(globbuf.gl_pathc > 0 ? globbuf.gl_pathv[0] : path);
--    globfree(&globbuf);
--    return result;
-+
-+    return sstrdup(path);
- }
-
- void print_usage(char *elf_name) {
---- i3-4.11/libi3/resolve_tilde.c
-+++ i3-4.11/libi3/resolve_tilde.c
-@@ -19,27 +19,18 @@
-  *
-  */
- char *resolve_tilde(const char *path) {
--    static glob_t globbuf;
--    char *head, *tail, *result;
-+    char *home, *expanded;
-
--    tail = strchr(path, '/');
--    head = sstrndup(path, tail ? (size_t)(tail - path) : strlen(path));
--
--    int res = glob(head, GLOB_TILDE, NULL, &globbuf);
--    free(head);
--    /* no match, or many wildcard matches are bad */
--    if (res == GLOB_NOMATCH || globbuf.gl_pathc != 1)
--        result = sstrdup(path);
--    else if (res != 0) {
--        err(EXIT_FAILURE, "glob() failed");
--    } else {
--        head = globbuf.gl_pathv[0];
--        result = scalloc(strlen(head) + (tail ? strlen(tail) : 0) + 1, 1);
--        strncpy(result, head, strlen(head));
--        if (tail)
--            strncat(result, tail, strlen(tail));
-+    if (strncmp(path, "~/", 2) == 0) {
-+        home = getenv("HOME");
-+        if (home != NULL) {
-+            /* new length: sum - 1 (omit '~') + 1 (for '\0') */
-+            expanded = scalloc(strlen(home)+strlen(path), 1);
-+            strcpy(expanded, home);
-+            strcat(expanded, path+1);
-+            return expanded;
-+        }
-     }
--    globfree(&globbuf);
-
--    return result;
-+    return sstrdup(path);
- }
diff --git a/x11-wm/i3/i3-4.14-r1.ebuild b/x11-wm/i3/i3-4.14-r1.ebuild
deleted file mode 100644
index 8f1c907d1b10..000000000000
--- a/x11-wm/i3/i3-4.14-r1.ebuild
+++ /dev/null
@@ -1,103 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# 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/"
-# iw3m.org tarball for 4.14 is broken, see https://github.com/i3/i3/issues/2905
-SRC_URI="https://github.com/i3/i3/archive/${PV}.tar.gz -> ${P}.tar.gz"
-S="${WORKDIR}/${P}"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~x86"
-IUSE="doc debug test"
-RESTRICT="!test? ( test )"
-
-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}
-	app-text/asciidoc
-	doc? ( app-text/xmlto dev-lang/perl )
-	test? (
-		dev-perl/Module-Install
-	)
-	virtual/pkgconfig"
-RDEPEND="${CDEPEND}
-	dev-lang/perl
-	dev-perl/AnyEvent-I3
-	dev-perl/JSON-XS"
-
-# Test without debug will apply optimization levels, which results
-# in type-punned pointers - which in turn causes test failures.
-REQUIRED_USE="test? ( debug )"
-
-DOCS=(
-	"RELEASE-NOTES-${PV}"
-	docs
-)
-PATCHES=(
-	"${FILESDIR}/${PN}-musl-GLOB_TILDE.patch"
-)
-
-src_test() {
-	emake -C "${CBUILD}" check
-}
-
-src_prepare() {
-	default
-
-	cat <<- EOF > "${T}"/i3wm
-		#!/bin/sh
-		exec /usr/bin/i3
-	EOF
-
-	eautoreconf
-}
-
-src_configure() {
-	local myeconfargs=(
-		$(use_enable debug)
-	)
-	econf "${myeconfargs[@]}"
-}
-
-src_compile() {
-	emake -C "${CBUILD}"
-}
-
-src_install() {
-	emake -C "${CBUILD}" DESTDIR="${D}" install
-	doman "${CBUILD}"/man/*.1
-
-	use doc && 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.17.1-r1.ebuild b/x11-wm/i3/i3-4.17.1-r1.ebuild
deleted file mode 100644
index ef11b20be559..000000000000
--- a/x11-wm/i3/i3-4.17.1-r1.ebuild
+++ /dev/null
@@ -1,110 +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-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-misc/xkeyboard-config
-	>=x11-libs/cairo-1.14.4[X,xcb(+)]
-	>=x11-libs/pango-1.30.0[X]"
-DEPEND="${CDEPEND}
-	test? (
-		dev-perl/AnyEvent
-		>=dev-perl/X11-XCB-0.120.0
-		dev-perl/Inline
-		dev-perl/Inline-C
-		dev-perl/IPC-Run
-		dev-perl/ExtUtils-PkgConfig
-		dev-perl/local-lib
-		>=virtual/perl-Test-Simple-0.940.0
-		x11-base/xorg-server[xephyr]
-	)"
-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 \
-		test.commands_parser \
-		test.config_parser \
-		test.inject_randr15
-
-	virtx perl \
-		-I "${S}/testcases/lib" \
-		-I "${BUILD_DIR}/testcases/lib" \
-		testcases/complete-run.pl
-}
-
-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.1.ebuild b/x11-wm/i3/i3-4.18.1.ebuild
deleted file mode 100644
index 58a3f832182c..000000000000
--- a/x11-wm/i3/i3-4.18.1.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.2.ebuild b/x11-wm/i3/i3-4.18.2.ebuild
deleted file mode 100644
index 58a3f832182c..000000000000
--- a/x11-wm/i3/i3-4.18.2.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
-}