commit: 99aa9390b3ad03b6b9590fdbc4d34eaf43aecd0b
Author: Dave Hughes <davidhughes205 <AT> gmail <DOT> com>
AuthorDate: Sat Mar 13 03:39:01 2021 +0000
Commit: Anthony G. Basile <blueness <AT> gentoo <DOT> org>
CommitDate: Sat Mar 13 16:04:32 2021 +0000
URL: https://gitweb.gentoo.org/proj/musl.git/commit/?id=99aa9390
x11-wm/i3: remove from overlay
Package-Manager: Portage-3.0.17, Repoman-3.0.2
Manifest-Sign-Key: 0xA1919C830E9498E0
Signed-off-by: Dave Hughes <davidhughes205 <AT> gmail.com>
Signed-off-by: Anthony G. Basile <blueness <AT> gentoo.org>
x11-wm/i3/Manifest | 1 -
x11-wm/i3/files/i3-4.13-GLOB_TILDE.patch | 73 --------------------
x11-wm/i3/files/i3-4.13-remove-git-polling.patch | 19 ------
x11-wm/i3/i3-4.13-r1.ebuild | 85 ------------------------
x11-wm/i3/metadata.xml | 11 ---
5 files changed, 189 deletions(-)
diff --git a/x11-wm/i3/Manifest b/x11-wm/i3/Manifest
deleted file mode 100644
index 7132850..0000000
--- a/x11-wm/i3/Manifest
+++ /dev/null
@@ -1 +0,0 @@
-DIST i3-4.13.tar.bz2 1121298 SHA256
94c13183e527a984132a3b050c8bf629626502a6e133e07b413641aec5f8cf8a SHA512
1bb1044e8d86e78d3ccb79d49f0eb26665dcd05a348058a5e57138151d74f57d77830efc3025893170fe1b8ec612f739f75247a427410f96286b09afd2c5f14c
WHIRLPOOL
c0e9b205837e30d214d525af6ceb8adcc4cbbba42d9aa0eab4e7639cbd8884d827c5783590eb23a6790e8d8d87fb81884afa369e48a7ae474613392dc6f9b371
diff --git a/x11-wm/i3/files/i3-4.13-GLOB_TILDE.patch
b/x11-wm/i3/files/i3-4.13-GLOB_TILDE.patch
deleted file mode 100644
index 82ad619..0000000
--- a/x11-wm/i3/files/i3-4.13-GLOB_TILDE.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/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 ca22637..0000000
--- 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 5e01065..0000000
--- a/x11-wm/i3/i3-4.13-r1.ebuild
+++ /dev/null
@@ -1,85 +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="http://i3wm.org/";
-SRC_URI="http://i3wm.org/downloads/${P}.tar.bz2";
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="amd64 ~arm ~arm64 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}/${P}-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() {
- 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/i3status"
- einfo " x11-misc/i3lock"
- einfo "Please refer to their description for additional info."
-}
diff --git a/x11-wm/i3/metadata.xml b/x11-wm/i3/metadata.xml
deleted file mode 100644
index 138ef82..0000000
--- a/x11-wm/i3/metadata.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd";>
-<pkgmetadata>
- <maintainer type="person">
- <email>xarthis...@gentoo.org</email>
- <name>Kacper Kowalik</name>
- </maintainer>
- <use>
- <flag name="doc">Build and install the HTML documentation and
regenerate the man pages</flag>
- </use>
-</pkgmetadata>
