gentoo resync : 18.05.2019

4 files changed, 2 insertions, 165 deletions

diff --git a/x11-wm/i3-gaps/Manifest b/x11-wm/i3-gaps/Manifest
index 4fd2e6f7f739..4cbdee3fc85b 100644
--- a/x11-wm/i3-gaps/Manifest
+++ b/x11-wm/i3-gaps/Manifest
@@ -1,7 +1,4 @@
-AUX i3-gaps-4.15-musl.patch 2473 BLAKE2B acb148b7a7f14f7e75523ade9ae4374d6b18d3397f97d6b639f416f86abfd114bddd97fab19a61385fff5504bcd0f614c53175da4c30cf31e00f6b612dfb3d0d SHA512 8ce7d00371c43b93dabbe0dadf9caf7c58a68f4a0079f5a9b9552c15c55bfa0df16d7e87a281595af2ac5254632ba28ccf82a467cea16159b41490f6f2910299
 AUX i3-gaps-4.16-musl.patch 2783 BLAKE2B 9dea47af64b78a77006d3aa641273aa7a77846d4425e1da17424528445450112ab275cdf7098ba8c2a76f1b08561b1d1a852cb9fd4ee4c61e53832ca702ad55d SHA512 fdff65255e7c9b30eefdbf032e04ba568d5b75a5b7dfc5fce1aecaac0f0d376b6bb4f87338e1eaf5f20b1c5882ebfc7349f8ab43c804349b5f5c626f9fc1d340
-DIST i3-gaps-4.15.0.1.tar.gz 3965631 BLAKE2B ea65886c40f377125bafbd80e2d56c1d66a4c5c06d942d645b2cb226323a0903e98aa58b67da9c31c60240b5d99d10ecc20864aeede95a5039ea0ffdff8dcb8b SHA512 76ff860e4ca0edd0e22bdff9ae9b1bc150df2b5bc15b0d7ea7a63d373e8d156a43bd91f8a40c48b4c771603f7de7c18c6d16c53fef582e53f51c53a197fa7a0a
 DIST i3-gaps-4.16.1.tar.gz 3983420 BLAKE2B f0d5a85b06ce33e1cc177af6da29f9cdf42ed754bb767aa9eaa5ab52f3b9f4f688d251f2a16fb222fc8cf5052e79859891c4185b1325b2ef6c1a813aa220468c SHA512 904c2f63c6a35573f13fd216625c1349ac71de70ae8f0440667c9d76048cdaf30a398ab358f2366d5f46502d87e801713b625cb509a05f39dbca1371d2b8d0e9
-EBUILD i3-gaps-4.15.0.1.ebuild 1751 BLAKE2B bd1da83f5652b82ca30f1fe6b3eafcb582f1359d29e88066ef82469e5bb30900ecbc490f9758b1d31455aa204ed859e4e40ccf20d2f5a2b005cf45bdef90afd1 SHA512 57a83814bc1758ef00930c1fd05b1636314360a6f183238920257a1d7870c25b225f2e78477dca2fc9223dfe0b685580662326bd2ffaea8757fc730076d0eb7b
-EBUILD i3-gaps-4.16.1.ebuild 1728 BLAKE2B 63314cf555b99ce93e0449b5f7e37ef7aa598adfbee710a2b1925a48689f86ac1c69aa5e18a86dacbead104d0c2d2c3e64c91f9a253649cd66e7d2f06d216889 SHA512 b656d1844ce8b6f5bc70486f88b980a4914b6103658f8153983d08c73f68e9b0b1db27b96ecab21eff6ebc6213be994b5f9c52fb5998d71b49fb423914a1f973
+EBUILD i3-gaps-4.16.1.ebuild 1727 BLAKE2B baceb7766ffb3113638ac33ba2bc24135dc067649dff1be81911f56d697247f6f1c95edfed41c5b3f2ff70ccf189997676a53d0a3ba7b8b0c78077da979c447d SHA512 d17165aaeef4e73552052d6cb2c8e3877ae7978836eee3d349a20966ff70544fccbd3155778cf0e400ffe17be358b053f7a50b58f2166850f9ce04a477050516
 MISC metadata.xml 322 BLAKE2B bdba5a4519158f97944784fc4e2813c1b8e8d4f6f90d43b3a935e8b2565ecc5d2444c4b7b4d11266263d25a76b5c2dba55ec6535fdaab03129bb022206abbce2 SHA512 d3ca96f88473d21b81c420795c6eee5dd41f43354de85fd549a9ae8127e46f10d00034730bf850ddd6df8607821d30fce17aa349b1b2575f43fd3303a2da1cf6
diff --git a/x11-wm/i3-gaps/files/i3-gaps-4.15-musl.patch b/x11-wm/i3-gaps/files/i3-gaps-4.15-musl.patch
deleted file mode 100644
index 82ad6195b8e5..000000000000
--- a/x11-wm/i3-gaps/files/i3-gaps-4.15-musl.patch
+++ /dev/null
@@ -1,73 +0,0 @@
-diff -urp i3-4.11/i3bar/src/main.c i3-4.11.new/i3bar/src/main.c
---- i3-4.11/i3bar/src/main.c	2015-09-30 07:55:10.000000000 +0100
-+++ i3-4.11.new/i3bar/src/main.c	2016-02-08 20:03:41.777392482 +0000
-@@ -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) {
-diff -urp i3-4.11/libi3/resolve_tilde.c i3-4.11.new/libi3/resolve_tilde.c
---- i3-4.11/libi3/resolve_tilde.c	2015-09-30 07:55:10.000000000 +0100
-+++ i3-4.11.new/libi3/resolve_tilde.c	2016-02-08 20:03:47.849230953 +0000
-@@ -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-gaps/i3-gaps-4.15.0.1.ebuild b/x11-wm/i3-gaps/i3-gaps-4.15.0.1.ebuild
deleted file mode 100644
index a4357937c21a..000000000000
--- a/x11-wm/i3-gaps/i3-gaps-4.15.0.1.ebuild
+++ /dev/null
@@ -1,87 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit autotools eapi7-ver
-
-DESCRIPTION="i3 fork with gaps and some more features"
-HOMEPAGE="https://github.com/Airblader/i3"
-SRC_URI="https://github.com/Airblader/i3/archive/${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE=""
-
-CDEPEND="
-	dev-libs/glib:2
-	dev-libs/libev
-	dev-libs/libpcre
-	dev-libs/yajl
-	x11-libs/cairo[X,xcb]
-	x11-libs/libxcb[xkb]
-	x11-libs/libxkbcommon[X]
-	x11-libs/pango[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
-"
-DEPEND="${CDEPEND}
-	virtual/pkgconfig
-"
-RDEPEND="${CDEPEND}
-	dev-lang/perl
-	dev-perl/AnyEvent-I3
-	dev-perl/JSON-XS
-	!x11-wm/i3
-"
-
-S=${WORKDIR}/i3-${PV}
-
-DOCS=( RELEASE-NOTES-$(ver_cut 1-2) )
-
-PATCHES=( "${FILESDIR}/${PN}-$(ver_cut 1-2)-musl.patch" )
-
-src_prepare() {
-	default
-	sed -e '/AC_PATH_PROG(\[PATH_ASCIIDOC/d' -i configure.ac || die
-	eautoreconf
-	cat <<- EOF > "${T}"/i3wm
-		#!/bin/sh
-		exec /usr/bin/i3
-	EOF
-}
-
-src_configure() {
-	# disable sanitizer: otherwise injects -O0 -g
-	local myeconfargs=(
-		--enable-debug=no
-		--disable-sanitizers
-	)
-	econf "${myeconfargs[@]}"
-}
-
-src_compile() {
-	emake -C "${CBUILD}"
-}
-
-src_install() {
-	emake -C "${CBUILD}" DESTDIR="${D}" install
-	einstalldocs
-
-	exeinto /etc/X11/Sessions
-	doexe "${T}"/i3wm
-}
-
-pkg_postinst() {
-	einfo "There are several packages that you may find useful with ${PN} and"
-	einfo "their usage is suggested by the upstream maintainers, namely:"
-	einfo "  x11-misc/dmenu"
-	einfo "  x11-misc/i3lock"
-	einfo "  x11-misc/i3status"
-	einfo "Please refer to their description for additional info."
-}
diff --git a/x11-wm/i3-gaps/i3-gaps-4.16.1.ebuild b/x11-wm/i3-gaps/i3-gaps-4.16.1.ebuild
index 7a503f28a2e2..c0e648622171 100644
--- a/x11-wm/i3-gaps/i3-gaps-4.16.1.ebuild
+++ b/x11-wm/i3-gaps/i3-gaps-4.16.1.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/Airblader/i3/archive/${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="amd64 ~x86"
+KEYWORDS="amd64 x86"
 IUSE=""
 
 DEPEND="