8 files changed, 2 insertions, 239 deletions
diff --git a/sys-apps/Manifest.gz b/sys-apps/Manifest.gz
index 33196f8e5730..efed2d3d43fc 100644
--- a/sys-apps/Manifest.gz
+++ b/sys-apps/Manifest.gz
diff --git a/sys-apps/merge-usr/Manifest b/sys-apps/merge-usr/Manifest
index 6fd4501dc7fa..ea69842a792b 100644
--- a/sys-apps/merge-usr/Manifest
+++ b/sys-apps/merge-usr/Manifest
@@ -1,3 +1,3 @@
-DIST merge-usr-3.tar.gz 9364 BLAKE2B c6302ee9a819c2779d3de2d2ceca05311bc4733f4e8a2fb294b582fa92241b61179e5b92957761a10a1157ec766cf64da9c9a9486c90599442fffb8974c439bf SHA512 606bfab1b7494f8475f41e514cb4dc071837ac9b0b96205ca832198c742c937dd1dcadc9bf48b69524422131873ace56362804380682dbed08a18515adfc9080
-EBUILD merge-usr-3.ebuild 627 BLAKE2B 4cc257f8e5f7acf4b4eb9491e8ff63af699ff52060cc430003686973a38739ae2eb49b7f11fa603f9fb53d4f7a7e591802cc035d9241c2820b4e4dd2ef8c058b SHA512 b21913c55e3839dfb8d6490b67b964efb5020364feb90773d7ebdea11e8609cc995183a0a9e6fbe1d50cc135d3a4e7532b22324a347cd39d4d9ce9f6276369e7
+DIST merge-usr-4.tar.gz 9494 BLAKE2B d431a276c04ba56996b63a6c93381f9f325c2107ca35b2cc5e9e6ba8f11b37fceab1ef5209fbd52178ca6c991d82c259220cc22e45856632f331e61d6f256592 SHA512 de614d9e15edbdb62c362dc022939d3f85622cd6c98a31d30cf41698b5c717d3b4978941b3793a320dc7a44ee29676e431d5b021b03c34d11ad60619aa34dabe
+EBUILD merge-usr-4.ebuild 627 BLAKE2B 4cc257f8e5f7acf4b4eb9491e8ff63af699ff52060cc430003686973a38739ae2eb49b7f11fa603f9fb53d4f7a7e591802cc035d9241c2820b4e4dd2ef8c058b SHA512 b21913c55e3839dfb8d6490b67b964efb5020364feb90773d7ebdea11e8609cc995183a0a9e6fbe1d50cc135d3a4e7532b22324a347cd39d4d9ce9f6276369e7
 MISC metadata.xml 329 BLAKE2B fdb965403d89b88b2bb3c1bbb5ae8dd614dfce3f8ebc379aeee60c2d55b529887e3663b3db98a0e1fd078cf62762888bd71685eaa052c73b821d944da16413de SHA512 8a55a22b7e45363c1e2b964cb80324584814a28b6aae34f88e061f6ab137d869905be1bc16590391b082bed98602b69e06def88ea90dde0be92279733fff2890
diff --git a/sys-apps/merge-usr/merge-usr-3.ebuild b/sys-apps/merge-usr/merge-usr-4.ebuild
index 07055e4c6985..07055e4c6985 100644
--- a/sys-apps/merge-usr/merge-usr-3.ebuild
+++ b/sys-apps/merge-usr/merge-usr-4.ebuild
diff --git a/sys-apps/qdirstat/Manifest b/sys-apps/qdirstat/Manifest
index bd8fc5ec3afa..5b31b9bfd2cf 100644
--- a/sys-apps/qdirstat/Manifest
+++ b/sys-apps/qdirstat/Manifest
@@ -1,6 +1,3 @@
-AUX qdirstat-1.8-musl.patch 3034 BLAKE2B d2e2d5c6a5c56f3d06153dd5076b32f4c1ef322c98fbc6cc24894bf2dd7e1a0c7a87051f1c4aee506e3076f0c446a247f1b677d41a8e10c625aa36d6e3d643e2 SHA512 668ca90e441284dcca1f1fa3f1841806e0a2b23cfeb04ccd1b1d3a43c5feacb582d70b021d40d3506d998b38886df71ea39ce7d780836adce7db9007fe0f71e1
 DIST qdirstat-1.8.1.tar.gz 8726725 BLAKE2B 5592f6c551cd218faa6bc82433707c6eff531b142d2c5b11f85eb7212a57a4e0c9e8dcc58f76237dee45357628c7076da07849d134805d255dd10b27c5f330a0 SHA512 af7043d52154cfb148d7365eb24d3d728ad7ac03f9e0bd9e33bcd03d040793624f7eba0061c72ba53d4828c5a9f2e717663dc84e01d33ee4d471b7a6a1d7f7e1
-DIST qdirstat-1.8.tar.gz 8720791 BLAKE2B fd1da935e82c7cdb2880e3a1e2902627c7f3e2972d08ae83a7ca49c4f641c07184c791471fb7a62211660f6e9bfb6fd0dc309c26c0fcffa1cad98de029e2b384 SHA512 fb7b757cf08c6b6ec0c14be9b08b8b6784a36e100c3ac89dbaef176ef908e43c47c2788fc4002a5e5f7308c990518cb3a104166e12cec605ff1a586bd7a4af10
 EBUILD qdirstat-1.8.1.ebuild 991 BLAKE2B fd0b0f269d1093473355d44fa86e3685450d567f6f2a5902b0ba1c70d0f7816256b21aff9a4b5468e6f22e8ca8ef45ae6e1a179e0ed69a0ea70d9343554747c3 SHA512 adbcdf665cbe8e22b7a10e94cc8363faeb1f617c922d5556cd82852abfc7b1fc74b8fa488507695187286d7945252113cf97429ddc2351145bebc0f51e9d0221
-EBUILD qdirstat-1.8.ebuild 1039 BLAKE2B 0e0dea4df65d195532203ff52ce96a5e670d4aa64a00e1a45bed6c1e285cb2c90a08677f77acd8a5d382a2f315fe805a1aaa818d4b2200c6a326c24279a7ba2f SHA512 7d185f56aa24aff8b0cca6a12e9a66610c8039c6039191ef30a8d31fbabb996e586d74d38ee289d793d4641f17ffb364939335a6094188dd21cdd3b7e5600e25
 MISC metadata.xml 883 BLAKE2B b5a3c4f300c991de6174a8e46c9dfe672e9293713d5174b182d9cce2354840c9afa63aea8d5335e1bae365c12440ac93290a3abe46f7cff5264179835ba0a719 SHA512 5b23f2d2bd68dc0562df3cd78a066980cccedb5f7f3dca98b200b7b0ccf739a4a01a2fe84accd6fa96b2ceed5b35087db915b3cdd0d9af2cd080d4a590f4ce08
diff --git a/sys-apps/qdirstat/files/qdirstat-1.8-musl.patch b/sys-apps/qdirstat/files/qdirstat-1.8-musl.patch
deleted file mode 100644
index e730352a8040..000000000000
--- a/sys-apps/qdirstat/files/qdirstat-1.8-musl.patch
+++ /dev/null
@@ -1,102 +0,0 @@
-From ca2c6c4a0a90ed467af9c4c73b918dd4bf720f2a Mon Sep 17 00:00:00 2001
-From: Stefan Hundhammer <Stefan.Hundhammer@gmx.de>
-Date: Wed, 9 Feb 2022 11:05:31 +0100
-Subject: [PATCH] Fixed GitHub issue #187: ALLPERMS not defined in libc-musl
-
----
- src/BrokenLibc.h   | 45 +++++++++++++++++++++++++++++++++++++++++++++
- src/FileInfo.cpp   |  1 +
- src/FormatUtil.cpp |  1 +
- src/src.pro        |  3 ++-
- 4 files changed, 49 insertions(+), 1 deletion(-)
- create mode 100644 src/BrokenLibc.h
-
-diff --git a/src/BrokenLibc.h b/src/BrokenLibc.h
-new file mode 100644
-index 00000000..8bdf2a84
---- /dev/null
-+++ b/src/BrokenLibc.h
-@@ -0,0 +1,45 @@
-+/*
-+ *   File name: BrokenLibc.h
-+ *   Summary:	Substitutes for common system-level defines
-+ *   License:	GPL V2 - See file LICENSE for details.
-+ *
-+ *   Author:	Stefan Hundhammer <Stefan.Hundhammer@gmx.de>
-+ */
-+
-+#ifndef BrokenLibc_h
-+#define BrokenLibc_h
-+
-+// This contains common #defines that are present on modern systems, but
-+// sometimes not on systems that insist to exchange known working subsystems
-+// such as glibc with their own version, commonly because of the "not invented
-+// here" syndrome.
-+
-+
-+// Make sure the original defines are available regardless of include order
-+
-+#include <sys/stat.h>   // ALLPERMS
-+
-+
-+#ifndef ALLPERMS
-+#  define ALLPERMS 07777
-+
-+// Uncomment for debugging:
-+// #  warning "Using ALLPERMS replacement"
-+
-+// Not available in musl-libc used on Gentoo:
-+//
-+//   https://github.com/shundhammer/qdirstat/issues/187
-+//
-+// Original from Linux / glibc /usr/include/x86_64-linux-gnu/sys/stat.h :
-+//
-+//   #define ALLPERMS (S_ISUID|S_ISGID|S_ISVTX|S_IRWXU|S_IRWXG|S_IRWXO)/* 07777 */
-+//
-+// But that might induce more complaints because any of S_IRWXU, S_IRWXG
-+// etc. may also not be defined on such a system. So let's keep it simple.
-+// If they also use a different bit pattern for those permissions, that's their
-+// problem.
-+#endif
-+
-+
-+
-+#endif  // BrokenLibc_h
-diff --git a/src/FileInfo.cpp b/src/FileInfo.cpp
-index 6be13a8d..d8195819 100644
---- a/src/FileInfo.cpp
-+++ b/src/FileInfo.cpp
-@@ -26,6 +26,7 @@
- #include "SysUtil.h"
- #include "Logger.h"
- #include "Exception.h"
-+#include "BrokenLibc.h"     // ALLPERMS
- 
- // Some filesystems (NTFS seems to be among them) may handle block fragments
- // well. Don't report files as "sparse" files if the block size is only a few
-diff --git a/src/FormatUtil.cpp b/src/FormatUtil.cpp
-index 6c755d79..43ca9ec4 100644
---- a/src/FormatUtil.cpp
-+++ b/src/FormatUtil.cpp
-@@ -11,6 +11,7 @@
- #include <QTextStream>
- 
- #include "FormatUtil.h"
-+#include "BrokenLibc.h"     // ALLPERMS
- 
- using namespace QDirStat;
- 
-diff --git a/src/src.pro b/src/src.pro
-index c9616462..50b51ca4 100644
---- a/src/src.pro
-+++ b/src/src.pro
-@@ -157,7 +157,8 @@ HEADERS	  =				\
- 	    ActionManager.h		\
- 	    AdaptiveTimer.h		\
- 	    Attic.h			\
--	    BreadcrumbNavigator.h	\
-+            BreadcrumbNavigator.h	\
-+            BrokenLibc.h                \
- 	    BucketsTableModel.h		\
- 	    BusyPopup.h			\
- 	    Cleanup.h			\
diff --git a/sys-apps/qdirstat/qdirstat-1.8.ebuild b/sys-apps/qdirstat/qdirstat-1.8.ebuild
deleted file mode 100644
index 62fb4a2c928d..000000000000
--- a/sys-apps/qdirstat/qdirstat-1.8.ebuild
+++ /dev/null
@@ -1,57 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit qmake-utils xdg-utils
-
-DESCRIPTION="Qt-based directory statistics"
-HOMEPAGE="https://github.com/shundhammer/qdirstat"
-SRC_URI="https://github.com/shundhammer/qdirstat/archive/refs/tags/${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 x86"
-
-DEPEND="
-	dev-qt/qtgui:5
-	dev-qt/qtcore:5
-	dev-qt/qtwidgets:5
-	sys-libs/zlib
-"
-
-RDEPEND="
-	${DEPEND}
-	dev-lang/perl
-	dev-perl/URI
-"
-
-PATCHES=( "${FILESDIR}/${PN}-1.8-musl.patch" )
-
-src_prepare() {
-	default
-
-	# Fix QA warning about incorrect use of doc path
-	sed -e "/doc.path/s/${PN}/${PF}/" -i doc/doc.pro doc/stats/stats.pro || die
-
-	# Don't install compressed man pages
-	sed -e '/gzip/d' -e 's/.gz//g' -i man/man.pro || die
-}
-
-src_configure() {
-	eqmake5
-}
-
-src_install() {
-	emake INSTALL_ROOT="${ED}" install
-}
-
-pkg_postinst() {
-	xdg_desktop_database_update
-	xdg_icon_cache_update
-}
-
-pkg_postrm() {
-	xdg_desktop_database_update
-	xdg_icon_cache_update
-}
diff --git a/sys-apps/smc-sum/Manifest b/sys-apps/smc-sum/Manifest
index d929d40f70f8..1e3ca758d81a 100644
--- a/sys-apps/smc-sum/Manifest
+++ b/sys-apps/smc-sum/Manifest
@@ -1,7 +1,5 @@
 AUX makefile 298 BLAKE2B 58431440f52821bf8f1a6070075eace33f173dc1cbe19722c033cc6525b2ae4a6890aec2870f68b282368c9722b87796a14b53d364ce3e7002dfac452480e74e SHA512 862b6a2ae684da3b864eacef8b645c27ef4a6ccc4f577ccc9c5d88cd0426ce66a6462bcaaf01bdd0082898f7e3801cd6a00bc1c702af83faf7ca31b9de1c14e9
 AUX smc-sum-2.7.0.20210903-missing-include.patch 264 BLAKE2B 977008b43b91ff7ee7a1c32ac6ce4221d078c782b36479f5319818c143d99eec0ef69c787e8e170badb54c45bde4bf10f7359bf7e30e84141de816de4334f1e1 SHA512 c75b04f7c44cb273d781648e57c7339eb16c23e37b6cdfe3387444e0f5a4dcb72097d03a78d5f6ec327ba4b739444c93c378f0d2212c845873a387d30517328b
-DIST sum_2.8.0_Linux_x86_64_20220126.tar.gz 14852916 BLAKE2B a65243878ec41c05fc8c71f147883fea29517e93ef0e1460a39827a98e1fd9e533be2f4a6cfceed29562ba2d0e798cac64645bbf4d2b23267396d86516277df9 SHA512 4e11a9916b3386229eb5cfc15830bd1ecab7d79cdc3280f4a736b8882554170e6d1579531c441d0966c816e1f9c98d256d7fbb2c0a6e8c03770a1053860a06f5
 DIST sum_2.8.1_Linux_x86_64_20220506.tar.gz 15414174 BLAKE2B 939e338f7ae3223bcd970dfdabb1e5a0bb2388d21b8fdf3666b82cf77e6c415869518d15675f2a6b4a15312bdb6d44c5b13366d1173e4ac5343ec13c65a8cdec SHA512 7350fefee12c7272d568049d07b18ef5736afc8602cb563691f8887ba046cc19aadbf57c0328e593a797d641cc515ea322de8dfb7a63ecff9b089f463dfb223e
-EBUILD smc-sum-2.8.0.20220126.ebuild 1513 BLAKE2B 71326c2b86218846ff457ea92cee67c0efb390e1a5e970acda131043fd948cc3966b338d693e132d2a997f79b221b4d2b8edf8cdb205ce4f9dd344963982e3d5 SHA512 fbb2b85600c6a5c391b157506d15841eb2538e166bf2ecff2b3a92e919dfb43c69ca4852bd2df44df4756c972ea11540d5b9878f0d275a335f84abde7091c1cc
 EBUILD smc-sum-2.8.1.20220506.ebuild 1513 BLAKE2B 71326c2b86218846ff457ea92cee67c0efb390e1a5e970acda131043fd948cc3966b338d693e132d2a997f79b221b4d2b8edf8cdb205ce4f9dd344963982e3d5 SHA512 fbb2b85600c6a5c391b157506d15841eb2538e166bf2ecff2b3a92e919dfb43c69ca4852bd2df44df4756c972ea11540d5b9878f0d275a335f84abde7091c1cc
 MISC metadata.xml 1098 BLAKE2B af888334fb5709cdaf9ee12821a8d006e4343d27ae89d51683b30c32820a6250b75b762946a6c7d1f23b7c1383eb66ba4d6b450d5d366bdac42d4df350f5e5fc SHA512 aef30566e58c8781faed28eee5e8574fa7017f90c20065a13868a0c6abaa9e069f425c4826cddbbbbbb84c37b3ef83c13eb46ce1eb829dca0380a2f5ed72729c
diff --git a/sys-apps/smc-sum/smc-sum-2.8.0.20220126.ebuild b/sys-apps/smc-sum/smc-sum-2.8.0.20220126.ebuild
deleted file mode 100644
index e309a7ad7f47..000000000000
--- a/sys-apps/smc-sum/smc-sum-2.8.0.20220126.ebuild
+++ /dev/null
@@ -1,73 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit linux-mod
-
-MY_DATE="$(ver_cut 4)"
-MY_PN="${PN/smc-/}"
-MY_PV="$(ver_cut 1-3)"
-
-DESCRIPTION="Updates the BIOS and IPMI firmware and system settings on Supermicro mainboards"
-HOMEPAGE="https://www.supermicro.com"
-SRC_URI="${MY_PN}_${MY_PV}_Linux_x86_64_${MY_DATE}.tar.gz"
-S="${WORKDIR}/${MY_PN}_${MY_PV}_Linux_x86_64"
-
-LICENSE="supermicro"
-SLOT="0"
-KEYWORDS="-* ~amd64"
-IUSE="module"
-
-RDEPEND="
-	sys-libs/zlib
-	sys-power/iasl
-	module? ( !sys-apps/smc-sum-driver )
-"
-
-RESTRICT="bindist fetch mirror"
-
-DOCS=(
-	"PlatformFeatureSupportMatrix.pdf"
-	"ReleaseNote.txt"
-	"SUM_UserGuide.pdf"
-	"sumrc.sample"
-	"ExternalData/SMCIPID.txt"
-	"ExternalData/VENID.txt"
-)
-
-PATCHES=( "${FILESDIR}/${PN}-2.7.0.20210903-missing-include.patch" )
-
-BUILD_TARGETS="default"
-MODULE_NAMES="sum_bios(misc:${S}/driver/Source/Linux)"
-
-QA_PREBUILT="usr/bin/smc-sum"
-
-pkg_nofetch() {
-	elog "Please download ${A} from"
-	elog "https://www.supermicro.com/SwDownload/UserInfo.aspx?sw=0&cat=SUM"
-	elog "and place it in your DISTDIR directory."
-}
-
-src_prepare() {
-	default
-
-	# Install new Makefile to respect users CFLAGS and LDFLAGS
-	cp "${FILESDIR}"/makefile driver/Source/Linux/Makefile || die
-}
-
-src_compile() {
-	if use module; then
-		BUILD_PARAMS="KDIR=${KV_OUT_DIR} M=${S}/driver/Source/Linux"
-		linux-mod_src_compile
-	else
-		:;
-	fi
-}
-
-src_install() {
-	newbin sum smc-sum
-	einstalldocs
-
-	use module && linux-mod_src_install
-}