x11-misc/i3status: version bump, drop old

Package-Manager: Portage-2.3.3, Repoman-2.3.1

4 files changed, 55 insertions, 49 deletions

diff --git a/x11-misc/i3status/Manifest b/x11-misc/i3status/Manifest
index edddeac9c733..5accdbd255fa 100644
--- a/x11-misc/i3status/Manifest
+++ b/x11-misc/i3status/Manifest
@@ -1,4 +1,3 @@
 DIST i3status-2.10.tar.bz2 53684 SHA256 daf5d07611b054a43da1a3d28850b05e2dbdbd6d25fd5e25ede98bb1b66e2791 SHA512 a514331d83458de15b548686d423b38a7a9198a7a31ca3001f3f136e4b873617c397a0073bb10b44fa8613bc12ed4fa4e384d099d31122a8afbd0df5de2e9c85 WHIRLPOOL 8f585e208a0764e1caf43aa99bb401261f84e7fc7973aa1448a752710e8997dd3492e686a65b2318a3d30534f6073a7e207cb366f5852a0ce63e8a86f709ccbc
+DIST i3status-2.11.tar.bz2 54970 SHA256 98db7e730f0ce908eb656ac10d713ae6a885676621391d54f00b719752f18c5f SHA512 37d2549649178122fab7411a3c714ae041d9c726c140002ec6ccd1a4f2e28af618ca28af9aa3bc45d0cafda0b25dd438c9ed4c3739ddcc0511e19305657730f0 WHIRLPOOL d676b9a66139778dcfe5ea6418bd60ebf89afe3dbce0a14d34f6d46ec52ccf0900727c4727e8fd6f03e6d0466af07f69f00a6da0b6e997bbdf9d57dbe2a8f7bc
 DIST i3status-2.7.tar.bz2 37594 SHA256 073f4e5de3bc5afc1f23c52ea52e2aa4b90ca8a012f28ba2c5fac3c33474a632 SHA512 7db6aded37e131c75e99f939102ac3b953817456921eec6b9054b6c4e0855f8d1f20638cbcd0f0b18ad24201041a01ade98c4d4cde6ff14bb11508454b8d3062 WHIRLPOOL 3bc2b599cda1d0f9e5442f03dc4e8700f84172c45d193b502f2894420c9be4a5c93022d199a718864a34c8fbbd6dc9d0d911c4c484a826fa4640514418e2f887
-DIST i3status-2.8.tar.bz2 40422 SHA256 ab06c5dd454354e6fc64354082616115082b70dc3906361bce5a02beb0f807fe SHA512 b1e3dbc480660a96a662ccb996769203fae22448f8801cabb56c339ba63ac84d30018c897e2ecac23f513cfe9d9a7d9200a351a2e6b10a42c1929c28e8e22c02 WHIRLPOOL 84444845a10bcdfd68336439c92197629b5e426e474dcfe68fd9cc11b7097476c32337c360429b344fdbe03e70d8b47c5eefd3f489bf2b78fd1df3f2f091a568
-DIST i3status-2.9.tar.bz2 46615 SHA256 42eb09500c625fcac9a7125a29e7bf532ca4b8540942418ee3253aa15e5e9de3 SHA512 67d026fcb4cc2a8af39cc268c962d49c4d3f2473bad92d99fa7fba876235ac83471663b318f890e9d7d3e9e06897286d693d352e686376a3a4876f253f309cb6 WHIRLPOOL 1a94da2c5d3bc4585908367b14ca1b18fada2a0d3c93a231969e6b92586a66bbcf5f67b0952bc6535e44f2e3ef1f66f000b55049b586821697f4fb26783da6cf
diff --git a/x11-misc/i3status/files/i3status-2.11-pulseaudio.patch b/x11-misc/i3status/files/i3status-2.11-pulseaudio.patch
new file mode 100644
index 000000000000..2447f16f9339
--- /dev/null
+++ b/x11-misc/i3status/files/i3status-2.11-pulseaudio.patch
@@ -0,0 +1,42 @@
+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.8.ebuild b/x11-misc/i3status/i3status-2.11.ebuild
index b594bbd79f53..67aa8db78b73 100644
--- a/x11-misc/i3status/i3status-2.8.ebuild
+++ b/x11-misc/i3status/i3status-2.11.ebuild
@@ -1,10 +1,10 @@
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 
-EAPI=5
+EAPI=6
 
-inherit toolchain-funcs versionator fcaps
+inherit eutils toolchain-funcs fcaps
 
 DESCRIPTION="generates a status bar for dzen2, xmobar or similar"
 HOMEPAGE="http://i3wm.org/i3status/"
@@ -13,21 +13,26 @@ SRC_URI="http://i3wm.org/${PN}/${P}.tar.bz2"
 LICENSE="BSD"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
-IUSE=""
+IUSE="pulseaudio"
 
 RDEPEND="dev-libs/confuse:=
+	dev-libs/libnl:3
 	>=dev-libs/yajl-2.0.2
 	media-libs/alsa-lib
-	net-wireless/wireless-tools"
-DEPEND="${RDEPEND}"
+	pulseaudio? ( media-sound/pulseaudio )"
+DEPEND="${RDEPEND}
+	app-text/asciidoc
+	virtual/pkgconfig"
 
 src_prepare() {
+	epatch "${FILESDIR}"/${P}-pulseaudio.patch
 	sed -e "/@echo/d" -e "s:@\$(:\$(:g" -e "/setcap/d" \
 		-e '/CFLAGS+=-g/d' -i Makefile || die
+	eapply_user
 }
 
 src_compile() {
-	emake CC="$(tc-getCC)"
+	emake V=1 CC="$(tc-getCC)" PULSE=$(usex pulseaudio 1 0)
 }
 
 pkg_postinst() {
diff --git a/x11-misc/i3status/i3status-2.9.ebuild b/x11-misc/i3status/i3status-2.9.ebuild
deleted file mode 100644
index b594bbd79f53..000000000000
--- a/x11-misc/i3status/i3status-2.9.ebuild
+++ /dev/null
@@ -1,40 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-inherit toolchain-funcs versionator fcaps
-
-DESCRIPTION="generates a status bar for dzen2, xmobar or similar"
-HOMEPAGE="http://i3wm.org/i3status/"
-SRC_URI="http://i3wm.org/${PN}/${P}.tar.bz2"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND="dev-libs/confuse:=
-	>=dev-libs/yajl-2.0.2
-	media-libs/alsa-lib
-	net-wireless/wireless-tools"
-DEPEND="${RDEPEND}"
-
-src_prepare() {
-	sed -e "/@echo/d" -e "s:@\$(:\$(:g" -e "/setcap/d" \
-		-e '/CFLAGS+=-g/d' -i Makefile || die
-}
-
-src_compile() {
-	emake CC="$(tc-getCC)"
-}
-
-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}"
-}