commit:     e8d694c30115e924b7b5680e1c95525ebd54cb07
Author:     Sergei Trofimovich <slyfox <AT> gentoo <DOT> org>
AuthorDate: Thu Nov 26 22:18:47 2020 +0000
Commit:     Sergei Trofimovich <slyfox <AT> gentoo <DOT> org>
CommitDate: Thu Nov 26 22:18:47 2020 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e8d694c3

x11-misc/i3status: drop old

Package-Manager: Portage-3.0.10, Repoman-3.0.2
Signed-off-by: Sergei Trofimovich <slyfox <AT> gentoo.org>

 x11-misc/i3status/Manifest                         |  1 -
 .../i3status/files/i3status-2.11-pulseaudio.patch  | 42 --------------------
 x11-misc/i3status/i3status-2.12.ebuild             | 46 ----------------------
 3 files changed, 89 deletions(-)

diff --git a/x11-misc/i3status/Manifest b/x11-misc/i3status/Manifest
index 8f7a097491c..ab1c2b4c1da 100644
--- a/x11-misc/i3status/Manifest
+++ b/x11-misc/i3status/Manifest
@@ -1,2 +1 @@
-DIST i3status-2.12.tar.bz2 57162 BLAKE2B 
d3225581b628640bfb6084b390a135562c2ce052078cf014a63e106c83beb14b38270eee28d01898d478a9593ce542684252e420ffe37d07f392509ac9b2a749
 SHA512 
687a880a65cb8df46f5e9d2256b59724ba3424c502e9a0fb3ca71b070875df5f4008ee501c554bc716f2d728a5cf813a36d22d7377d42c3c46b14381d385bab3
 DIST i3status-2.13.tar.bz2 201409 BLAKE2B 
e087d69e2df3ae9348cb55739023b2164dfa3543551d173b138c72e574714069d8397716b95e92c4315aa538ea31b33aa73532d6d0f75bbc38d7db54e1f665bc
 SHA512 
6dadff19e53499d169ba4f491e1f821014b4f92fc3c93d7947c85cbbbdeaba538d02bd8ab98fe266a8f80756a287fd5803ec77a8cd874d50082b5cad309875c2

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 2447f16f933..00000000000
--- 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/i3status-2.12.ebuild 
b/x11-misc/i3status/i3status-2.12.ebuild
deleted file mode 100644
index 81f9ba7f6c6..00000000000
--- 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 )
-
-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}"
-}

Reply via email to