gentoo auto-resync : 23:12:2022 - 13:59:28

6 files changed, 134 insertions, 55 deletions

diff --git a/sys-process/Manifest.gz b/sys-process/Manifest.gz
index e99f69970479..3f734ba43ad6 100644
--- a/sys-process/Manifest.gz
+++ b/sys-process/Manifest.gz
diff --git a/sys-process/btop/Manifest b/sys-process/btop/Manifest
index 944b90bf8713..a4717dac24c2 100644
--- a/sys-process/btop/Manifest
+++ b/sys-process/btop/Manifest
@@ -1,4 +1,6 @@
-AUX 876319-verbose-makefile.patch 3136 BLAKE2B 48a45db41fded1eb3b447e06f742dd3d42df65a20065da7b513bbbce9b4c0644d6344fadb152e8f68d8e10d96c2adca77a03d01c8d0fac06499d92be64a6c9cd SHA512 8febaf35c270ab513afe5bda60f42ed7866b30585df1a36b6bd257ececde7d43034cd755f15840bfd3ac13914d133b1b445d54c97cfece3cedc334660ab63e5a
+AUX btop-1.2.13-fix-makefile-deps.patch 1289 BLAKE2B adde21eb39016350f48fddfd98655074c6c29b3116ea5c7f19bc0373ef464ab611e6a183a8f3fd25b10eea944e6e3809596b988364796fcf26991837826444f8 SHA512 10fb0b76eac61e510bcfed4f7eda368d3e4d2935462ebe67a0355e38df0b4f503e95fe0cbf619fc3ef640ecea4d80d622d445ef57c5da16add6f89765f602a36
+AUX btop-1.2.13-verbose-mkdir.patch 669 BLAKE2B f8d4ae11816a511302a206e7ca4a32ac7704a739df69b45dd925e1fe2e572b7fc00a36c8f2c4c26f4adabddf794b478c02ba4f029a5831acbb66e5dcd31e2bdc SHA512 ef4b43c30bc286f6f96602934df32645e2b28706e824f3312fab8134a99c49cf4b8c634fadb76bc86e3e6bb9a2ef865bdcfbc0bd09933d9d833dfb4cc137089f
 DIST btop-1.2.13.tar.gz 982660 BLAKE2B 053c1ef87203b894c2cbe6007c3b5962dca232733d28f97d82a2f70e771d4cc92fe4c49d3582c80cb79974d65329d3e95e758b9e8a7fa51a2ff0cdbf6cbd9a75 SHA512 324e572d43e57e5e65e646aa743f7730e6d535fdc52e848aeb55d60c8d73945850c5b89fe0b541e98495ddf2bae71427a6ec8fe8a495b41cef885c535d01019b
+EBUILD btop-1.2.13-r1.ebuild 1380 BLAKE2B e2fc53be5650543515685db0cb9a503dcfe42263688722897d6ca244cdf1c148d24780fdfce97a2787cb7a95dd00bba959c04155c6d2c4d1239fc4a0b823d9cb SHA512 91eb2ecc3fd0cc272454182110e873f33afddee3e72a6d35dc0369e5ceee49131e0d92c78e4c14d46fc49006cc77f418a7ed91d7190173dcd3bd3c8f468ffd81
 EBUILD btop-1.2.13.ebuild 1186 BLAKE2B a32f46e360180e5ffa670093905d89935c5112201cd7b563f4b3549c307b3860f5a8dff0e0e4ff3d67852d919d359153ec5aa83ccef458fd30f2edc0a1165b80 SHA512 317625f55c5b140d1c9c4a33d6595b850ed76719fdc37860d2128c82403bc301d02a21d93bf3c458c1e957dd08bff74a4698635772e8fa599907f0c4729717e9
 MISC metadata.xml 548 BLAKE2B 74762cdc63011b363a4c06de8190541f862d70f0006461c7a1cf2d734caf20601ba0769dc067e261957fe42a64bdaf26297bf3d080c3c08203eabd73165f2f8c SHA512 bb16944df9321001ca5c9e9fff49ea39069386117f0cfde67e8f19e3f44c13d360effb578d2c44c67f792d1ff574830f13cb9ef183f594e39ad3669083f2cf41
diff --git a/sys-process/btop/btop-1.2.13-r1.ebuild b/sys-process/btop/btop-1.2.13-r1.ebuild
new file mode 100644
index 000000000000..9383842c640d
--- /dev/null
+++ b/sys-process/btop/btop-1.2.13-r1.ebuild
@@ -0,0 +1,64 @@
+# Copyright 2021-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit toolchain-funcs xdg-utils
+
+DESCRIPTION="A monitor of resources"
+HOMEPAGE="https://github.com/aristocratos/btop"
+SRC_URI="https://github.com/aristocratos/btop/archive/refs/tags/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~arm64 ~ppc ~ppc64 ~riscv ~x86"
+
+BDEPEND="
+	>=sys-devel/gcc-8
+"
+
+PATCHES=(
+	# Backported fixes for https://bugs.gentoo.org/884005,
+	# can be removed in 1.2.14 or later
+	"${FILESDIR}/${P}-fix-makefile-deps.patch"
+	"${FILESDIR}/${P}-verbose-mkdir.patch"
+)
+
+pkg_setup() {
+	if [[ "${MERGE_TYPE}" != "binary" ]]; then
+		if ! tc-is-gcc ; then
+			# https://bugs.gentoo.org/839318
+			die "$(tc-getCXX) is not a supported compiler. Please use sys-devel/gcc instead."
+		fi
+	fi
+}
+
+src_prepare() {
+	default
+	# btop installs README.md to /usr/share/btop by default
+	sed -i '/^.*cp -p README.md.*$/d' Makefile || die
+}
+
+src_compile() {
+	# Disable btop optimization flags, since we have our flags in CXXFLAGS
+	emake VERBOSE=true OPTFLAGS="" CXX="$(tc-getCXX)"
+}
+
+src_install() {
+	emake \
+		PREFIX="${EPREFIX}/usr" \
+		DESTDIR="${D}" \
+		install
+
+	dodoc README.md CHANGELOG.md
+}
+
+pkg_postinst() {
+	xdg_desktop_database_update
+	xdg_icon_cache_update
+}
+
+pkg_postrm() {
+	xdg_desktop_database_update
+	xdg_icon_cache_update
+}
diff --git a/sys-process/btop/files/876319-verbose-makefile.patch b/sys-process/btop/files/876319-verbose-makefile.patch
deleted file mode 100644
index ef2199d728d1..000000000000
--- a/sys-process/btop/files/876319-verbose-makefile.patch
+++ /dev/null
@@ -1,54 +0,0 @@
-# Backport of upstream commit 080a47e6496f12f616b811e0d2f8f36c62d397e2
-# See https://bugs.gentoo.org/876319
-diff --git a/Makefile b/Makefile
-index d1bc95d..6a36c76 100644
---- a/Makefile
-+++ b/Makefile
-@@ -18,6 +18,9 @@ else
- 	override PRE := info-quiet
- endif
- 
-+OLDCXX := $(CXXFLAGS)
-+OLDLD := $(LDFLAGS)
-+
- PREFIX ?= /usr/local
- 
- #? Detect PLATFORM and ARCH from uname/gcc if not set
-@@ -53,6 +56,10 @@ ifeq ($(STRIP),true)
- 	override ADDFLAGS += -s
- endif
- 
-+ifneq ($(VERBOSE),true)
-+	override VERBOSE := false
-+endif
-+
- #? Compiler and Linker
- ifeq ($(shell command -v g++-11 >/dev/null; echo $$?),0)
- 	CXX := g++-11
-@@ -167,8 +174,8 @@ info:
- 	@printf "\033[1;91mWARNFLAGS  \033[1;94m:| \033[0m$(WARNFLAGS)\n"
- 	@printf "\033[1;94mOPTFLAGS   \033[1;94m:| \033[0m$(OPTFLAGS)\n"
- 	@printf "\033[1;93mLDCXXFLAGS \033[1;94m:| \033[0m$(LDCXXFLAGS)\n"
--	@printf "\033[1;95mCXXFLAGS   \033[1;92m+| \033[0;37m\$$(\033[92mREQFLAGS\033[37m) \$$(\033[93mLDCXXFLAGS\033[37m) \$$(\033[94mOPTFLAGS\033[37m) \$$(\033[91mWARNFLAGS\033[37m)\n"
--	@printf "\033[1;95mLDFLAGS    \033[1;92m+| \033[0;37m\$$(\033[93mLDCXXFLAGS\033[37m) \$$(\033[94mOPTFLAGS\033[37m) \$$(\033[91mWARNFLAGS\033[37m)\n"
-+	@printf "\033[1;95mCXXFLAGS   \033[1;92m+| \033[0;37m\$$(\033[92mREQFLAGS\033[37m) \$$(\033[93mLDCXXFLAGS\033[37m) \$$(\033[94mOPTFLAGS\033[37m) \$$(\033[91mWARNFLAGS\033[37m) $(OLDCXX)\n"
-+	@printf "\033[1;95mLDFLAGS    \033[1;92m+| \033[0;37m\$$(\033[93mLDCXXFLAGS\033[37m) \$$(\033[94mOPTFLAGS\033[37m) \$$(\033[91mWARNFLAGS\033[37m) $(OLDLD)\n"
- 
- info-quiet:
- 	@sleep 0.1 2>/dev/null || true
-@@ -252,6 +259,7 @@ btop: $(OBJECTS)
- 	@sleep 0.2 2>/dev/null || true
- 	@TSTAMP=$$(date +%s 2>/dev/null || echo "0")
- 	@$(QUIET) || printf "\n\033[1;92mLinking and optimizing binary\033[37m...\033[0m\n"
-+	@$(VERBOSE) && printf "$(CXX) -o $(TARGETDIR)/btop $^ $(LDFLAGS)\n"
- 	@$(CXX) -o $(TARGETDIR)/btop $^ $(LDFLAGS) || exit 1
- 	@printf "\033[1;92m100$(P) -> \033[1;37m$(TARGETDIR)/btop \033[100D\033[38C\033[1;93m(\033[1;97m$$(du -ah $(TARGETDIR)/btop | cut -f1)iB\033[1;93m) \033[92m(\033[97m$$($(DATE_CMD) -d @$$(expr $$(date +%s 2>/dev/null || echo "0") - $${TSTAMP} 2>/dev/null) -u +%Mm:%Ss 2>/dev/null | sed 's/^00m://' || echo '')\033[92m)\033[0m\n"
- 	@printf "\n\033[1;92mBuild complete in \033[92m(\033[97m$$($(DATE_CMD) -d @$$(expr $$(date +%s 2>/dev/null || echo "0") - $(TIMESTAMP) 2>/dev/null) -u +%Mm:%Ss 2>/dev/null | sed 's/^00m://' || echo "unknown")\033[92m)\033[0m\n"
-@@ -262,6 +270,7 @@ $(BUILDDIR)/%.$(OBJEXT): $(SRCDIR)/%.$(SRCEXT)
- 	@sleep 0.3 2>/dev/null || true
- 	@TSTAMP=$$(date +%s 2>/dev/null || echo "0")
- 	@$(QUIET) || printf "\033[1;97mCompiling $<\033[0m\n"
-+	@$(VERBOSE) && printf "$(CXX) $(CXXFLAGS) $(INC) -MMD -c -o $@ $<\n"
- 	@$(CXX) $(CXXFLAGS) $(INC) -MMD -c -o $@ $< || exit 1
- 	@printf "\033[1;92m$$($(PROGRESS))$(P)\033[10D\033[5C-> \033[1;37m$@ \033[100D\033[38C\033[1;93m(\033[1;97m$$(du -ah $@ | cut -f1)iB\033[1;93m) \033[92m(\033[97m$$($(DATE_CMD) -d @$$(expr $$($(DATE_CMD) +%s 2>/dev/null || echo "0") - $${TSTAMP} 2>/dev/null) -u +%Mm:%Ss 2>/dev/null | sed 's/^00m://' || echo '')\033[92m)\033[0m\n"
- 
diff --git a/sys-process/btop/files/btop-1.2.13-fix-makefile-deps.patch b/sys-process/btop/files/btop-1.2.13-fix-makefile-deps.patch
new file mode 100644
index 000000000000..4550f3f2cdd1
--- /dev/null
+++ b/sys-process/btop/files/btop-1.2.13-fix-makefile-deps.patch
@@ -0,0 +1,40 @@
+From 0d17fb66c45aa532a26e0e9a3b179d1f57bf037f Mon Sep 17 00:00:00 2001
+From: NexAdn <nex@nexadn.de>
+Date: Thu, 15 Dec 2022 10:04:33 +0100
+Subject: [PATCH] Makefile: make build targets depend on directories
+
+Since directory creation is a requirement for writing the built
+artifacts, this commit introduces a dependency on the directories for
+all build targets (compile and link), so parallel builds can't fail
+because a build target is executed before the directories target.
+
+Closes: https://github.com/aristocratos/btop/issues/479
+---
+ Makefile | 4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/Makefile b/Makefile
+index ec9f90a..a52929c 100644
+--- a/Makefile
++++ b/Makefile
+@@ -259,7 +259,7 @@ uninstall:
+ 
+ #? Link
+ .ONESHELL:
+-btop: $(OBJECTS)
++btop: $(OBJECTS) | directories
+ 	@sleep 0.2 2>/dev/null || true
+ 	@TSTAMP=$$(date +%s 2>/dev/null || echo "0")
+ 	@$(QUIET) || printf "\n\033[1;92mLinking and optimizing binary\033[37m...\033[0m\n"
+@@ -270,7 +270,7 @@ btop: $(OBJECTS)
+ 
+ #? Compile
+ .ONESHELL:
+-$(BUILDDIR)/%.$(OBJEXT): $(SRCDIR)/%.$(SRCEXT)
++$(BUILDDIR)/%.$(OBJEXT): $(SRCDIR)/%.$(SRCEXT) | directories
+ 	@sleep 0.3 2>/dev/null || true
+ 	@TSTAMP=$$(date +%s 2>/dev/null || echo "0")
+ 	@$(QUIET) || printf "\033[1;97mCompiling $<\033[0m\n"
+-- 
+2.37.4
+
diff --git a/sys-process/btop/files/btop-1.2.13-verbose-mkdir.patch b/sys-process/btop/files/btop-1.2.13-verbose-mkdir.patch
new file mode 100644
index 000000000000..bf2b1b88dbde
--- /dev/null
+++ b/sys-process/btop/files/btop-1.2.13-verbose-mkdir.patch
@@ -0,0 +1,27 @@
+From c4ee41ebc0f7fabbf4717450c889292464dbeb6d Mon Sep 17 00:00:00 2001
+From: aristocratos <gnmjpl@gmail.com>
+Date: Thu, 15 Dec 2022 17:42:07 +0100
+Subject: [PATCH] Fixed: Makefile, VERBOSE flag now shows directory creation,
+ Issue #480
+
+---
+ Makefile | 2 ++
+ 1 file changed, 2 insertions(+)
+
+diff --git a/Makefile b/Makefile
+index a52929c..c746c00 100644
+--- a/Makefile
++++ b/Makefile
+@@ -200,7 +200,9 @@ help:
+ 
+ #? Make the Directories
+ directories:
++	@$(VERBOSE) || printf "mkdir -p $(TARGETDIR)\n"
+ 	@mkdir -p $(TARGETDIR)
++	@$(VERBOSE) || printf "mkdir -p $(BUILDDIR)/$(PLATFORM_DIR)\n"
+ 	@mkdir -p $(BUILDDIR)/$(PLATFORM_DIR)
+ 
+ #? Clean only Objects
+-- 
+2.37.4
+