commit: 416341f5200b1bd5db907a5727e947c3fcb72dd6
Author: Dave Hughes <davidhughes205 <AT> gmail <DOT> com>
AuthorDate: Tue Apr 13 13:00:04 2021 +0000
Commit: Dave Hughes <davidhughes205 <AT> gmail <DOT> com>
CommitDate: Tue Apr 13 13:00:04 2021 +0000
URL: https://gitweb.gentoo.org/proj/musl.git/commit/?id=416341f5
x11-misc/i3status: remove from overlay
Package-Manager: Portage-3.0.18, Repoman-3.0.3
Signed-off-by: Dave Hughes <davidhughes205 <AT> gmail.com>
x11-misc/i3status/Manifest | 1 -
.../i3status/files/i3status-2.11-pulseaudio.patch | 42 ---------------
.../i3status/files/i3status-2.12-glob_tilde.patch | 59 ----------------------
x11-misc/i3status/i3status-2.12.ebuild | 46 -----------------
x11-misc/i3status/metadata.xml | 19 -------
5 files changed, 167 deletions(-)
diff --git a/x11-misc/i3status/Manifest b/x11-misc/i3status/Manifest
deleted file mode 100644
index 0b1283c..0000000
--- a/x11-misc/i3status/Manifest
+++ /dev/null
@@ -1 +0,0 @@
-DIST i3status-2.12.tar.bz2 57162 BLAKE2B
d3225581b628640bfb6084b390a135562c2ce052078cf014a63e106c83beb14b38270eee28d01898d478a9593ce542684252e420ffe37d07f392509ac9b2a749
SHA512
687a880a65cb8df46f5e9d2256b59724ba3424c502e9a0fb3ca71b070875df5f4008ee501c554bc716f2d728a5cf813a36d22d7377d42c3c46b14381d385bab3
diff --git a/x11-misc/i3status/files/i3status-2.11-pulseaudio.patch
b/x11-misc/i3status/files/i3status-2.11-pulseaudio.patch
deleted file mode 100644
index 2447f16..0000000
--- a/x11-misc/i3status/files/i3status-2.11-pulseaudio.patch
+++ /dev/null
@@ -1,42 +0,0 @@
-diff --git a/Makefile b/Makefile
-index 3084ae7..7ea1964 100644
---- a/Makefile
-+++ b/Makefile
-@@ -58,6 +57,10 @@ ifeq ($(OS),NetBSD)
- LIBS+=-lprop
- endif
-
-+ifeq ($(OS),OpenBSD)
-+LIBS+=-lpthread
-+endif
-+
- # This probably applies for any pkgsrc based system
- ifneq (, $(filter $(OS), NetBSD DragonFly))
- CFLAGS+=-I/usr/pkg/include/
-@@ -79,9 +82,12 @@ CFLAGS += -idirafter yajl-fallback
- OBJS:=$(sort $(wildcard src/*.c *.c))
- OBJS:=$(OBJS:.c=.o)
-
--ifeq ($(OS),OpenBSD)
-+PULSE ?= 1
-+ifeq ($(PULSE),0)
- OBJS:=$(filter-out src/pulse.o, $(OBJS))
- LIBS:=$(filter-out -lpulse, $(LIBS))
-+else
-+CPPFLAGS+=-DPULSE
- endif
-
- src/%.o: src/%.c include/i3status.h
-diff --git a/src/print_volume.c b/src/print_volume.c
-index 51e84f3..9e015c0 100644
---- a/src/print_volume.c
-+++ b/src/print_volume.c
-@@ -61,7 +61,7 @@ void print_volume(yajl_gen json_gen, char *buffer, const
char *fmt, const char *
- free(instance);
- }
-
--#ifndef __OpenBSD__
-+#if !defined(__OpenBSD__) && defined(PULSE)
- /* Try PulseAudio first */
-
- /* If the device name has the format "pulse[:N]" where N is the
diff --git a/x11-misc/i3status/files/i3status-2.12-glob_tilde.patch
b/x11-misc/i3status/files/i3status-2.12-glob_tilde.patch
deleted file mode 100644
index b1f2ba6..0000000
--- a/x11-misc/i3status/files/i3status-2.12-glob_tilde.patch
+++ /dev/null
@@ -1,59 +0,0 @@
-diff --git i/i3status.c w/i3status.c
-index 5088c96..3c18214 100644
---- i/i3status.c
-+++ w/i3status.c
-@@ -210,29 +210,19 @@ static int valid_color(const char *value) {
- *
- */
- static char *resolve_tilde(const char *path) {
-- static glob_t globbuf;
-- char *head, *tail, *result = NULL;
--
-- tail = strchr(path, '/');
-- head = strndup(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) {
-- die("glob() failed");
-- } else {
-- head = globbuf.gl_pathv[0];
-- result = scalloc(strlen(head) + (tail ? strlen(tail) : 0) + 1);
-- strncpy(result, head, strlen(head));
-- if (tail)
-- strncat(result, tail, strlen(tail));
-+ char *home, *result = NULL;
-+
-+ if (strncmp(path, "~/", 2) == 0) {
-+ home = getenv("HOME");
-+ if (home != NULL) {
-+ result = scalloc(strlen(home) + strlen(path));
-+ strcpy(result, home);
-+ strcat(result, path+1);
-+ return result;
-+ }
- }
-- globfree(&globbuf);
-
-- return result;
-+ return sstrdup(path);
- }
-
- static char *get_config_path(void) {
-diff --git i/include/i3status.h w/include/i3status.h
-index 9ac471d..27ecae4 100644
---- i/include/i3status.h
-+++ w/include/i3status.h
-@@ -236,4 +236,9 @@ extern cfg_t *cfg, *cfg_general, *cfg_section;
- extern void **cur_instance;
-
- extern pthread_t main_thread;
-+
-+#ifndef GLOB_TILDE
-+#define GLOB_TILDE 0
-+#endif
-+
- #endif
diff --git a/x11-misc/i3status/i3status-2.12.ebuild
b/x11-misc/i3status/i3status-2.12.ebuild
deleted file mode 100644
index 2d8020a..0000000
--- a/x11-misc/i3status/i3status-2.12.ebuild
+++ /dev/null
@@ -1,46 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit fcaps toolchain-funcs
-
-DESCRIPTION="generates a status bar for dzen2, xmobar or similar"
-HOMEPAGE="https://i3wm.org/i3status/";
-SRC_URI="https://i3wm.org/${PN}/${P}.tar.bz2";
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="amd64 ~arm x86"
-IUSE="pulseaudio"
-
-BDEPEND="virtual/pkgconfig"
-DEPEND="
- dev-libs/confuse:=
- dev-libs/libnl:3
- >=dev-libs/yajl-2.0.2
- media-libs/alsa-lib
- pulseaudio? ( media-sound/pulseaudio )
-"
-RDEPEND="${DEPEND}"
-
-PATCHES=( "${FILESDIR}"/${PN}-2.11-pulseaudio.patch
"${FILESDIR}"/${PN}-2.12-glob_tilde.patch )
-
-src_prepare() {
- default
- sed -e "/@echo/d" -e "s:@\$(:\$(:g" -e "/setcap/d" \
- -e '/CFLAGS+=-g/d' -i Makefile || die
-}
-
-src_compile() {
- emake V=1 CC="$(tc-getCC)" PULSE=$(usex pulseaudio 1 0)
-}
-
-pkg_postinst() {
- fcaps cap_net_admin usr/bin/${PN}
- einfo "${PN} can be used with any of the following programs:"
- einfo " i3bar (x11-wm/i3)"
- einfo " x11-misc/xmobar"
- einfo " x11-misc/dzen"
- einfo "Please refer to manual: man ${PN}"
-}
diff --git a/x11-misc/i3status/metadata.xml b/x11-misc/i3status/metadata.xml
deleted file mode 100644
index 59a2a28..0000000
--- a/x11-misc/i3status/metadata.xml
+++ /dev/null
@@ -1,19 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd";>
-<pkgmetadata>
- <maintainer type="project">
- <email>desktop-m...@gentoo.org</email>
- <name>Gentoo Desktop Miscellaneous Project</name>
- </maintainer>
- <longdescription>
- i3status is a small program (about 1500 SLOC) for generating a
status bar for
- dzen2, xmobar or similar programs. It is designed to be very
efficient by
- issuing a very small number of system calls, as one generally
wants to update
- such a status line every second. This ensures that even under
high load, your
- status bar is updated correctly. Also, it saves a bit of energy
by not hogging
- your CPU as much as spawning the corresponding amount of shell
commands would.
- </longdescription>
- <use>
- <flag name="filecaps">Linux capabilities library is required
for i3status to be able to read net bandwith</flag>
- </use>
-</pkgmetadata>
