gentoo auto-resync : 10:10:2022 - 19:34:30

5 files changed, 67 insertions, 63 deletions

diff --git a/sys-process/btop/Manifest b/sys-process/btop/Manifest
index 35a5aee2a9b1..4844f2dba4dd 100644
--- a/sys-process/btop/Manifest
+++ b/sys-process/btop/Manifest
@@ -1,7 +1,6 @@
+AUX 876319-verbose-makefile.patch 3136 BLAKE2B 48a45db41fded1eb3b447e06f742dd3d42df65a20065da7b513bbbce9b4c0644d6344fadb152e8f68d8e10d96c2adca77a03d01c8d0fac06499d92be64a6c9cd SHA512 8febaf35c270ab513afe5bda60f42ed7866b30585df1a36b6bd257ececde7d43034cd755f15840bfd3ac13914d133b1b445d54c97cfece3cedc334660ab63e5a
 DIST btop-1.2.12.tar.gz 980406 BLAKE2B ddaa023b85a00edfb27b55e574950934cce578ad7bbf0ea03b2780a511078638c14cd2316ebce8701be76c13ed3af8f0ded703071b363fddc14bcbea040279dd SHA512 36bf329a7b9922ff5cae990f5528625280b6b3fcb83d0af2e502876a2a8f4864c3a6ecbc6cb5aaa885f637859eef66470ff0cc86036f76b499b23a7c4086ea60
-DIST btop-1.2.8.tar.gz 976370 BLAKE2B ab71ac322afd84b5b73c5deb9003f319078809d81e2725a7447d2a8fe7539af21c669e7199a3422b2a1cc2ecbd79a46179343e00311f2d56bfa30f51d6340bd3 SHA512 4b5a3685ca5cf301cd7d6556bd365892587e6811f8323ca66728022aba7cc3ff95cf591b452151c9431824dc458bc3d09e10474c7c02a944e8931c4585914f5a
 DIST btop-1.2.9.tar.gz 978265 BLAKE2B ff80079a393342a2cf3aefad6ead8be8b786fbc2b9445e8e2a8b37386f65f4060c801a6f59d216cd611783f4135a60d64b95ff2b5e1a3d62bb2d40030bde8974 SHA512 424573c8f82d0daf748cba7c82e72232773f145af9792ac78a5f5f18d98a8695f11452de106c72cf685ecb8cc89729471a494f9ea6b4300bdb2fa6acdbf4ac60
-EBUILD btop-1.2.12.ebuild 1172 BLAKE2B 2e934a30e9d173620b7b55c30865c06df45549dbfe69a1c7626df665f0587449adf7cfa883942abcd8c96d51beb6a5477246bdddacbfb82227e859b23d3075c5 SHA512 8f07db128338d196ec3a3ab6fda8f01ed3a75e15500ec6a7b8b3f498f35986205a9a370b66424055f3bd6ac3b4fbd3c2076956e1907c1a6f999df9a44b144b1b
-EBUILD btop-1.2.8.ebuild 1168 BLAKE2B 94d4fa9e2bf45294168e815e2255f2b3d1c7c6dec0b45da99b8fa89296544470e8c9f014c6f316beae03045c1d832fa1025962812f47ffb15a1b274f0f5167af SHA512 1bd52b416712b4b1d1280e0cccddd3c2a26a14ae5ac46ea995b6678d8234c2ecf33d13a9b2d836786af1a7bbae78c828c612b261b7640d8526052c1bd3553c31
-EBUILD btop-1.2.9.ebuild 1168 BLAKE2B 94d4fa9e2bf45294168e815e2255f2b3d1c7c6dec0b45da99b8fa89296544470e8c9f014c6f316beae03045c1d832fa1025962812f47ffb15a1b274f0f5167af SHA512 1bd52b416712b4b1d1280e0cccddd3c2a26a14ae5ac46ea995b6678d8234c2ecf33d13a9b2d836786af1a7bbae78c828c612b261b7640d8526052c1bd3553c31
+EBUILD btop-1.2.12.ebuild 1243 BLAKE2B babad810ce33177f59ae2f6e716fea7d46448b8ad175cd35014b531a3775b025c602c86d0dc648df193a38b7d40aaf8b603f8b230eda987f429fe98a205b09fa SHA512 9ae97bf7556f3cd4d004444df5d3ffb5992c285a2243f1cc1390a0845faf9252e8d44359cb155a1d93518d19eac12afdad71b91c9fe4255830100edc240bb49b
+EBUILD btop-1.2.9.ebuild 1239 BLAKE2B 4661502ca39f90ef261eaa201eb829386bd34c7013286146974fff7d8036a6eed11c64e8396b983a63dd0b25dfa25101b8a13a5d23e3de86ae31610ea2022ebf SHA512 e43be0619d863bae39f713673a9b79ab97fcf4f9a91e041ed9a448a26df4b40e582aecd99cb902562c87476e60609e744a3b3f6715e29115f3893f6ea31e66e2
 MISC metadata.xml 548 BLAKE2B 74762cdc63011b363a4c06de8190541f862d70f0006461c7a1cf2d734caf20601ba0769dc067e261957fe42a64bdaf26297bf3d080c3c08203eabd73165f2f8c SHA512 bb16944df9321001ca5c9e9fff49ea39069386117f0cfde67e8f19e3f44c13d360effb578d2c44c67f792d1ff574830f13cb9ef183f594e39ad3669083f2cf41
diff --git a/sys-process/btop/btop-1.2.12.ebuild b/sys-process/btop/btop-1.2.12.ebuild
index 6bf13cbd7d95..5dbb46974fd7 100644
--- a/sys-process/btop/btop-1.2.12.ebuild
+++ b/sys-process/btop/btop-1.2.12.ebuild
@@ -17,6 +17,10 @@ BDEPEND="
 	>=sys-devel/gcc-8
 "
 
+PATCHES=(
+	"${FILESDIR}/876319-verbose-makefile.patch"
+)
+
 pkg_setup() {
 	if [[ "${MERGE_TYPE}" != "binary" ]]; then
 		if ! tc-is-gcc ; then
@@ -34,7 +38,7 @@ src_prepare() {
 
 src_compile() {
 	# Disable btop optimization flags, since we have our flags in CXXFLAGS
-	emake OPTFLAGS="" CXX="$(tc-getCXX)"
+	emake VERBOSE=true OPTFLAGS="" CXX="$(tc-getCXX)"
 }
 
 src_install() {
diff --git a/sys-process/btop/btop-1.2.8.ebuild b/sys-process/btop/btop-1.2.8.ebuild
deleted file mode 100644
index ee0bbdefbd6d..000000000000
--- a/sys-process/btop/btop-1.2.8.ebuild
+++ /dev/null
@@ -1,57 +0,0 @@
-# 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 ppc64 ~riscv x86"
-
-BDEPEND="
-	>=sys-devel/gcc-8
-"
-
-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 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/btop-1.2.9.ebuild b/sys-process/btop/btop-1.2.9.ebuild
index ee0bbdefbd6d..39aa6592146f 100644
--- a/sys-process/btop/btop-1.2.9.ebuild
+++ b/sys-process/btop/btop-1.2.9.ebuild
@@ -17,6 +17,10 @@ BDEPEND="
 	>=sys-devel/gcc-8
 "
 
+PATCHES=(
+	"${FILESDIR}/876319-verbose-makefile.patch"
+)
+
 pkg_setup() {
 	if [[ "${MERGE_TYPE}" != "binary" ]]; then
 		if ! tc-is-gcc ; then
@@ -34,7 +38,7 @@ src_prepare() {
 
 src_compile() {
 	# Disable btop optimization flags, since we have our flags in CXXFLAGS
-	emake OPTFLAGS="" CXX="$(tc-getCXX)"
+	emake VERBOSE=true OPTFLAGS="" CXX="$(tc-getCXX)"
 }
 
 src_install() {
diff --git a/sys-process/btop/files/876319-verbose-makefile.patch b/sys-process/btop/files/876319-verbose-makefile.patch
new file mode 100644
index 000000000000..ef2199d728d1
--- /dev/null
+++ b/sys-process/btop/files/876319-verbose-makefile.patch
@@ -0,0 +1,54 @@
+# 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"
+