gentoo resync : 15.06.2021

3 files changed, 128 insertions, 0 deletions

diff --git a/x11-misc/i3blocks-contrib/Manifest b/x11-misc/i3blocks-contrib/Manifest
index 0426db8dfb1c..9690d5500df6 100644
--- a/x11-misc/i3blocks-contrib/Manifest
+++ b/x11-misc/i3blocks-contrib/Manifest
@@ -1,4 +1,7 @@
+AUX i3blocks-contrib-2.0.0-respect-CFLAGS.patch 1391 BLAKE2B 4d2f1d6a567074dce73aa4d5ecec38cc6cba130e94efbb3074c53ea5253f167bcb01e8b37f8d35f6802961a7e610ffa606e31d91fc9f4936ee55425b0b128719 SHA512 ab137c15781f6874cbbb731810ed8fdeb022374048670571e46048e823814e5961e9c8f8b749197478494073bf97d660d03b93edcde500da662ef90513382c23
 AUX i3blocks-contrib-respect-CFLAGS.patch 654 BLAKE2B f3633b4046a55d31d5ae694b37517ac72cffb01ff3d6c6ab58a38df5fcdce64ae3532cfb9629e7d51dc9cb5d1b399623d275456ba3ef84f9376f2a2797e003a2 SHA512 a60f83fd008deffd819a6997b0061474ead9b37b5a069c592b6afb79c0a11b360e5bfadedfa2279919990923e9283adf6c1851972cfdedfdbf27addc44fc58d0
 DIST i3blocks-contrib-1.4.0_p20201127.tar.gz 738457 BLAKE2B 1db16c40323d0c191bb44c50d6a66523391adfdf9652976f78238fffe0ee50d99d3bd6fbcfd1a0eeef8308fd466a3eeda479299f462b4d4d31ae2f2bc7ea6b31 SHA512 ff09c7b8e4b630d014f0441342835dbf03642f32de6806a1204eccb6166eade190abe43b331ef72aaa3ba5a77f9690ae8c36a9ef9aa6d312ae5e543a46b99a72
+DIST i3blocks-contrib-2.0.0.tar.gz 840332 BLAKE2B e220566edea4249c25ac80dcba3e24fc37de842049ad072a14fd5003e298ec9a4b4f36cd3937682ab00355b1f1c3fc7ea795ac6593f24aed2438b465ad338d8f SHA512 30cf9297e710a2d685b275d424de817e7940a487c615e64ffaf15e0f90e937bedbd3921dfeece081e32f720b6add92c0790fa7a29e4e8f81f85c3a74cbcea835
 EBUILD i3blocks-contrib-1.4.0_p20201127.ebuild 1624 BLAKE2B 6d3f5b71827ba487e3ac28f5cf96e78e2b989cf04365de398cf588ed028684a5e1ef7fa734d607dbb0428de3b7cf00d4a6381acdec9da6411b6c93d2074557be SHA512 6a1fc2e5d85a16d625f7d102e5727cbb6d170553fbeab8d9ccbf26c9d34ef871bd6308ab0ae008cce389f187d73fcb053a530118e428982198c24c6cc7341acd
+EBUILD i3blocks-contrib-2.0.0.ebuild 1922 BLAKE2B f803a2e88353b291057ec0cb4e02d2a17695ecc9671a8875d687562ff934301c96341593f593c3d7f195e0786a995e003caebc752efaac8cc88e75646e83696d SHA512 e1b278894d337fb1d2fa04ad00506de585f20130d8c9e99490a632e03179f70907de18a45941fd08630768d29e58f62f81939c33b9fcda0596a08ae7f8122d10
 MISC metadata.xml 332 BLAKE2B 174061304cb0b09fdc2279117f1dd3974b94104fe9926f854f149c580d6e64b4e2201f5a48f989b4f11a3db95e9e5051d393365069d95ca0f83b2db8b972b868 SHA512 911353979e4ca52a7fb5213811cfbac924f05eaa11f92313d65cc96d67eead4872deda29a5aa2572e67d63f2feb0f6e54bb4fd1d4bc41e4c9d6406e6153bb5f8
diff --git a/x11-misc/i3blocks-contrib/files/i3blocks-contrib-2.0.0-respect-CFLAGS.patch b/x11-misc/i3blocks-contrib/files/i3blocks-contrib-2.0.0-respect-CFLAGS.patch
new file mode 100644
index 000000000000..764cd4b2b73c
--- /dev/null
+++ b/x11-misc/i3blocks-contrib/files/i3blocks-contrib-2.0.0-respect-CFLAGS.patch
@@ -0,0 +1,68 @@
+--- a/bandwidth2/Makefile
++++ b/bandwidth2/Makefile
+@@ -1,6 +1,6 @@
+ P=bandwidth2
+ OBJECTS=
+-CFLAGS=-g -Wall -Werror -O2 -std=c11
++CFLAGS ?= -g -Wall -Werror -O2 -std=c11
+ LDLIBS=
+ 
+ $(P): $(OBJECTS)
+--- a/brightness/Makefile
++++ b/brightness/Makefile
+@@ -1,6 +1,6 @@
+-CC=gcc
+-AS=as
+-LD=ld
++CC ?= gcc
++AS ?= as
++LD ?= ld
+ OBJDUMP=objdump
+ OBJCOPY=objcopy
+ SIZE=size
+@@ -16,14 +16,14 @@
+ 
+ PRG = brightness
+ INCLUDES := -Iinc
+-CFLAGS := $(INCLUDES) $(DEFS) $(WARN_LEVEL) -pipe -O0 -g3 -std=c11
++CFLAGS ?= -pipe -O0 -g3 -std=c11
+ 
+ debug: CFLAGS += -O0 -g3
+ debug: all
+ 
+ release: CFLAGS += -O2
+ release: all
+-LDFLAGS = $(LIBS) -ffunction-sections -Wl,--gc-sections
++LDFLAGS ?= -ffunction-sections -Wl,--gc-sections
+ 
+ SRC_C := $(wildcard *.c) $(wildcard src/*.c)
+ SRC_A := $(wildcard src/*.s)
+@@ -41,7 +41,7 @@
+ 
+ $(OBJ_DIR)/%.o: %.c
+ 	@mkdir -p $(@D)
+-	$(CC) $(CFLAGS) -o $@ -c $<
++	$(CC) $(CFLAGS) $(INCLUDES) $(DEFS) $(WARN_LEVEL) -o $@ -c $<
+ 
+ $(BIN_DIR)/$(PRG): $(OBJECTS)
+ 	@mkdir -p $(@D)
+--- a/cpu_usage2/Makefile
++++ b/cpu_usage2/Makefile
+@@ -1,6 +1,6 @@
+ P=cpu_usage2
+ OBJECTS=
+-CFLAGS=-g -Wall -Werror -O2 -std=gnu11
++CFLAGS ?= -g -Wall -Werror -O2 -std=gnu11
+ LDLIBS=
+ 
+ $(P): $(OBJECTS)
+--- a/memory2/Makefile
++++ b/memory2/Makefile
+@@ -1,6 +1,6 @@
+ P=memory2
+ OBJECTS=
+-CFLAGS=-g -Wall -Werror -O2 -std=c11
++CFLAGS ?= -g -Wall -Werror -O2 -std=c11
+ LDLIBS=
+ 
+ $(P): $(OBJECTS)
diff --git a/x11-misc/i3blocks-contrib/i3blocks-contrib-2.0.0.ebuild b/x11-misc/i3blocks-contrib/i3blocks-contrib-2.0.0.ebuild
new file mode 100644
index 000000000000..88dab674b534
--- /dev/null
+++ b/x11-misc/i3blocks-contrib/i3blocks-contrib-2.0.0.ebuild
@@ -0,0 +1,57 @@
+# Copyright 2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+inherit optfeature toolchain-funcs
+
+DESCRIPTION="A set of scripts for i3blocks, contributed by the community"
+HOMEPAGE="https://github.com/vivien/i3blocks-contrib"
+SRC_URI="https://github.com/vivien/i3blocks-contrib/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="~amd64 ~arm64 ~x86"
+
+DEPEND=""
+RDEPEND="!<x11-misc/i3blocks-1.5
+	>=x11-misc/i3blocks-1.5"
+BDEPEND=""
+
+PATCHES=( "${FILESDIR}"/${P}-respect-CFLAGS.patch )
+
+src_prepare() {
+	sed -i -e '/^$(_BLOCKS):/ s/$/ installdirs/' Makefile
+	default
+}
+
+src_compile() {
+	tc-export AR CC LD
+	default
+}
+
+src_install() {
+	emake DESTDIR="${D}" PREFIX=/usr install
+}
+
+pkg_postinst() {
+	optfeature_header "The following deps may be required for certain ${PN} scripts:"
+	optfeature "backlight" sys-power/acpilight x11-apps/xbacklight
+	optfeature "battery{,2,bar}" sys-power/acpi
+	optfeature "colorpicker" x11-misc/grabc x11-misc/xdotool
+	optfeature "cpu_usage" app-admin/sysstat
+	optfeature "disk-io" app-admin/sysstat
+	optfeature "email" dev-python/keyring gnome-base/gnome-keyring
+	optfeature "eyedropper" media-fonts/fontawesome x11-misc/grabc x11-misc/xclip
+	optfeature "github" dev-util/github-cli media-fonts/fontawesome
+	optfeature "gpu-load" x11-drivers/nvidia-drivers app-misc/radeontop
+	optfeature "i3-focusedwindow" x11-apps/xprop
+	optfeature "kbdd_layout" x11-misc/kbdd
+	optfeature "key_light" sys-power/upower
+	optfeature "kubernetes" sys-cluster/kubectl
+	optfeature "monitor_manager" "dev-lang/python[tk] media-fonts/fontawesome x11-apps/xrandr"
+	optfeature "purpleair" app-misc/jq net-misc/curl
+	optfeature "rofi-calendar" x11-misc/rofi
+	optfeature "ssid and wlan-dbm" net-wireless/iw
+	optfeature "temperature" sys-apps/lm-sensors
+	optfeature "ytdl-mpv" "media-fonts/fontawesome media-video/mpv x11-misc/xclip net-misc/youtube-dl"
+}