gentoo resync : 28.11.2020

5 files changed, 12 insertions, 98 deletions

diff --git a/x11-misc/i3status/Manifest b/x11-misc/i3status/Manifest
index 789210b7157c..bfb9ddddec5a 100644
--- a/x11-misc/i3status/Manifest
+++ b/x11-misc/i3status/Manifest
@@ -1,6 +1,3 @@
-AUX i3status-2.11-pulseaudio.patch 1085 BLAKE2B cbef3ee6b008773aff92f629468bf543bc0b574069902d085aab0787b1c50472145a7071aaf476b0b7098a4897f7cd6154bbbf03aade2b4a52de82ec59a9831b SHA512 d08f22209598567af425aea2e387dfaec0312e47a4ae9882818097e84d3ff59f671132242f6f8d6620c3d63b3b0e1c9054d26f416804608fe657872dea1c9678
-DIST i3status-2.12.tar.bz2 57162 BLAKE2B d3225581b628640bfb6084b390a135562c2ce052078cf014a63e106c83beb14b38270eee28d01898d478a9593ce542684252e420ffe37d07f392509ac9b2a749 SHA512 687a880a65cb8df46f5e9d2256b59724ba3424c502e9a0fb3ca71b070875df5f4008ee501c554bc716f2d728a5cf813a36d22d7377d42c3c46b14381d385bab3
 DIST i3status-2.13.tar.bz2 201409 BLAKE2B e087d69e2df3ae9348cb55739023b2164dfa3543551d173b138c72e574714069d8397716b95e92c4315aa538ea31b33aa73532d6d0f75bbc38d7db54e1f665bc SHA512 6dadff19e53499d169ba4f491e1f821014b4f92fc3c93d7947c85cbbbdeaba538d02bd8ab98fe266a8f80756a287fd5803ec77a8cd874d50082b5cad309875c2
-EBUILD i3status-2.12.ebuild 1045 BLAKE2B a7f9599f1d904046477a35cec6a6d51fafaa8980d1a94c7a914fe5deff90dfb7bfe529096e19434316bf0e81cf1ff17a87674b705b77db5453160d7fb037d416 SHA512 dcfc73c0f40c229966beb2df99ea306f402e895e809d248f0eb4ecc7ffa8bc001912624098db023e4ea35351c0c0175e221028050cb40032b7b4cdb94898966a
-EBUILD i3status-2.13.ebuild 924 BLAKE2B db893d3ecab8502e58927fc6afa80fb65449a29d8a80c0d47180579e443d44aacdfedf384a290a4ce5c30d3888a0a1a9387bf4836b0653cc21d2f32b9c015001 SHA512 ce6389d80cff593f78ad3f7486dcd3573080c1f5d18a82b2cbd69794f25b450b1aed4e32612677a04bc5de676076a8119983dfc6c0f2a50119d8aec5a1d7f5df
-MISC metadata.xml 923 BLAKE2B 9c815212a4cf22f000c66829c287ce86f55f9271b7e74ab55231eace1cb435092ef4539946ae598d741c34a1032f67ae23f29667499707a051fca604683c0b5a SHA512 767566a72041c13afd546301ad688053e7855fa90c036d381eb03ba4d53caa573809b9ba7433c4484004f3aed800a0b9232c6861e347a1b75ed04f56cb37240b
+EBUILD i3status-2.13.ebuild 920 BLAKE2B d8259edb35966d55a19871a8727b744c3a353d76edf243ac25049fa8992477eb599ffafc68e94138f48e82bea036e43efb997729205b55aa77fa10eb8c4a51a4 SHA512 27845022d890ff5fa2feee8978082944dab85043160b1330215458e77366469e36a056fcdd33aa5bb235ae9781b5bbbc6f3cbcc5318831b173e1bd9e53f404bf
+MISC metadata.xml 1035 BLAKE2B 0ab04f4037e04d28ccf2e2305775eb7dd15583e3fa6af85f7ad31d442bdf06db20820855297eedd9630b374fdf4a096e8c15ecf994e516a27a28b29fc132ff14 SHA512 7ad11f6cc4e572f43f6cfb6812b04886888f9b71bba7e6c38523713ee6856f36fd82eb525b5d36d97f77e1f96c93d0b6887865fc867531ba5a884f614e577ab5
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 2447f16f9339..000000000000
--- 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 81f9ba7f6c6f..000000000000
--- 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}"
-}
diff --git a/x11-misc/i3status/i3status-2.13.ebuild b/x11-misc/i3status/i3status-2.13.ebuild
index 74e0f77e8a1a..0648dee3cb59 100644
--- a/x11-misc/i3status/i3status-2.13.ebuild
+++ b/x11-misc/i3status/i3status-2.13.ebuild
@@ -38,9 +38,10 @@ src_install() {
 
 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}"
+
+	elog "${PN} can be used with any of the following programs:"
+	elog "   i3bar (x11-wm/i3)"
+	elog "   x11-misc/xmobar"
+	elog "   x11-misc/dzen"
+	elog "Please refer to manual: man ${PN}"
 }
diff --git a/x11-misc/i3status/metadata.xml b/x11-misc/i3status/metadata.xml
index 59a2a28f64b5..79925c7a5a03 100644
--- a/x11-misc/i3status/metadata.xml
+++ b/x11-misc/i3status/metadata.xml
@@ -5,6 +5,10 @@
 		<email>desktop-misc@gentoo.org</email>
 		<name>Gentoo Desktop Miscellaneous Project</name>
 	</maintainer>
+	<maintainer type="person">
+		<email>slyfox@gentoo.org</email>
+		<name>Sergei Trofimovich</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