commit: ef3aec9660d277b9192b99223d62155e4ad73d8e Author: Ben Kohler <bkohler <AT> gentoo <DOT> org> AuthorDate: Thu Jan 22 18:53:02 2026 +0000 Commit: Ben Kohler <bkohler <AT> gentoo <DOT> org> CommitDate: Thu Jan 22 18:54:24 2026 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ef3aec96
x11-misc/i3blocks-contrib: add 2.0.0_p20240208 Closes: https://bugs.gentoo.org/969096 Signed-off-by: Ben Kohler <bkohler <AT> gentoo.org> x11-misc/i3blocks-contrib/Manifest | 1 + ...ks-contrib-2.0.0_p20240208-respect-CFLAGS.patch | 68 ++++++++++++++++++++++ .../i3blocks-contrib-2.0.0_p20240208.ebuild | 60 +++++++++++++++++++ 3 files changed, 129 insertions(+) diff --git a/x11-misc/i3blocks-contrib/Manifest b/x11-misc/i3blocks-contrib/Manifest index 8691957b4ef4..16f4c2cccd53 100644 --- a/x11-misc/i3blocks-contrib/Manifest +++ b/x11-misc/i3blocks-contrib/Manifest @@ -1 +1,2 @@ DIST i3blocks-contrib-2.0.0.tar.gz 840332 BLAKE2B e220566edea4249c25ac80dcba3e24fc37de842049ad072a14fd5003e298ec9a4b4f36cd3937682ab00355b1f1c3fc7ea795ac6593f24aed2438b465ad338d8f SHA512 30cf9297e710a2d685b275d424de817e7940a487c615e64ffaf15e0f90e937bedbd3921dfeece081e32f720b6add92c0790fa7a29e4e8f81f85c3a74cbcea835 +DIST i3blocks-contrib-2.0.0_p20240208.tar.gz 2940879 BLAKE2B f47074d13412b678e9bed184a0e8bbef88db461be1066c048fa6de60a66149b9c0f17c60c2eb3ee1ad17c4cabd61571430a8724a52396a347620a36ebd4e4472 SHA512 27b37d9e8827741506296a01ab6ac512441a2f3dbf222643f9973dc0ee71364449bd733c4eea3de906895a48adc2981c8cbea928233215a458557c2388b8bdf0 diff --git a/x11-misc/i3blocks-contrib/files/i3blocks-contrib-2.0.0_p20240208-respect-CFLAGS.patch b/x11-misc/i3blocks-contrib/files/i3blocks-contrib-2.0.0_p20240208-respect-CFLAGS.patch new file mode 100644 index 000000000000..437bd95a59ae --- /dev/null +++ b/x11-misc/i3blocks-contrib/files/i3blocks-contrib-2.0.0_p20240208-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 -Wno-format-truncation ++CFLAGS ?= -g -Wall -Werror -O2 -std=c11 -Wno-format-truncation + 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_p20240208.ebuild b/x11-misc/i3blocks-contrib/i3blocks-contrib-2.0.0_p20240208.ebuild new file mode 100644 index 000000000000..211c9222a7f4 --- /dev/null +++ b/x11-misc/i3blocks-contrib/i3blocks-contrib-2.0.0_p20240208.ebuild @@ -0,0 +1,60 @@ +# Copyright 2021-2026 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 +inherit optfeature toolchain-funcs + +COMMIT=9d66d81da8d521941a349da26457f4965fd6fcbd + +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/${COMMIT}.tar.gz -> ${P}.tar.gz" +S="${WORKDIR}/${PN}-${COMMIT}" + +LICENSE="GPL-3" +SLOT="0" +KEYWORDS="~amd64 ~arm64 ~x86" + +RDEPEND=">=x11-misc/i3blocks-1.5" + +PATCHES=( + "${FILESDIR}"/${P}-respect-CFLAGS.patch + "${FILESDIR}"/${PN}-2.0.0-fix-build-on-clang-llvm.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[lua] x11-misc/xclip net-misc/yt-dlp" +}
