gentoo auto-resync : 02:10:2023 - 23:47:15

3 files changed, 15 insertions, 51 deletions

diff --git a/sys-apps/dmidecode/Manifest b/sys-apps/dmidecode/Manifest
index 210669e90d91..21401344372e 100644
--- a/sys-apps/dmidecode/Manifest
+++ b/sys-apps/dmidecode/Manifest
@@ -1,7 +1,7 @@
 AUX dmidecode-3.5-backport-HPE-OEM-record-137-fix.patch 1667 BLAKE2B 4657a4a77b7d1236536c2a5cd7dcf5f35a09ff9e6b658069b61850320e4c7f195f394487759c00970344a0585473b9b4209c000a21965f48d166bfc8057aab69 SHA512 8a3b3634843c2ce4de35cc922a43f53164e379be4ea32f832ee465bbde7795b50c5f9e43205869f41ca7565621c178c77f9745b7c976a7b9bd53167ab160db1e
-DIST dmidecode-3.4.tar.xz 61420 BLAKE2B f9f0429c5128692c2d1d560580552285ea900c1c9ef6f68f0e2133ae1ef05b85a943e882f915d3ef969b7a7e3f3f6bbc4ec391e7bd3d98092976ddbf02421c49 SHA512 62990b6159e5a7c8688d37e44957e7948391d2c6afeabaa4514ba9dad2d08b020297676e2dbbfcb6471efc6fb6f3682750422931a953f78f358bb3dd3745e95b
+DIST dmidecode-3.5-80de376231e903d2cbea95e51ffea31860502159.patch 1762 BLAKE2B b3b1d4232ab8089cfd405f5bf88a9e5eab7be244b70c3af663b33836c0e2d7c7bc01affa41e826ff0129b66afd6a066f51a722d8a0ab64c42990a1d1440285c4 SHA512 cb7cc66e608bfd67d1db6ba96e887b06c11526956819ea48c378edbb93af139600b41501330ae936bfbe333de461265b51d680170fb044b29d70fedfeb47f52a
+DIST dmidecode-3.5-c76ddda0ba0aa99a55945e3290095c2ec493c892.patch 1933 BLAKE2B e3aff73dc780d3d6b92a9d0de05906a620657664c3b30d40bc10a57e29522e883f671ce7658c0fdea6ee6c2b891639c1639a695f4f2f25dbe091cc93c6951cee SHA512 7caee6762b6676f4e133025cd0e68e7fbd93ae2dea773b2f6180505fda3384f60e0de40ae32322ff50a470b7986dbf6071a86dd770d7bca9df3cc601dbc0e18b
 DIST dmidecode-3.5.tar.xz 65068 BLAKE2B 07cc4c069dc1cba36160de158c4d0390df9b77b4192f5847df0756f9e097a7fbc751cd7b5b073df7661267ab78ea0d9be2831d70ddda8d1981c628f3cfee8802 SHA512 690c9bea391f6bbfc8cd48e8db408a61d5b551a07a2823c29d03a09607fc2043cc1bea44ee9fd27fd0e7bc0b287bf9de9f22a1a66053f5b1e63d77c03d93e1ae
-EBUILD dmidecode-3.4-r1.ebuild 1254 BLAKE2B 61d66053e0b1ce8067c8a9ea9f2f4bf73adabbd48de1b3681a0e9f5f87688ec91bd968f373a512df710c94c99992a3577804b106d3a730797b5b026c519de4cc SHA512 db523a6849344cd14fd6df62e29ea2f6d5efd57a4b919848da555c88e65d9ddccb2844f036998c1652a2796c978adc24b51397213432ccfa9620c6003268334e
-EBUILD dmidecode-3.5-r1.ebuild 1254 BLAKE2B 61d66053e0b1ce8067c8a9ea9f2f4bf73adabbd48de1b3681a0e9f5f87688ec91bd968f373a512df710c94c99992a3577804b106d3a730797b5b026c519de4cc SHA512 db523a6849344cd14fd6df62e29ea2f6d5efd57a4b919848da555c88e65d9ddccb2844f036998c1652a2796c978adc24b51397213432ccfa9620c6003268334e
 EBUILD dmidecode-3.5-r2.ebuild 1325 BLAKE2B 1ba8f7f528efc76c33af5b85d5420c778f76d9debe28c988e8469a2f7055cd330062404b6d29047fce008bd2c2b2509ed82210f638827e4487e08f83cfa562a1 SHA512 1b197bbea13a6ad097b48a4d0c873c449b83f10c36028cb08db92bfdccff74c57825cdf958efe59de247c5cf0a11ffc681054b092d366acb899648e7ab87641b
+EBUILD dmidecode-3.5-r3.ebuild 1561 BLAKE2B 63d0ffe6c34d64a9077149fc1843910d3334b15e5cf21064ae15cf0d19e34a459006fb8cf10c4ce8a57a6472eb4f58d4e284ab107b06804e8db4ba56cba6d0fc SHA512 09a0ad8d84658124bec2560d32fe79e8550a75c9c411a6b78aebee5995a28f0156cd77fe29b2477ccd39d46b802b4bf1b1dcba1c909240f5af63e623fbb9a489
 MISC metadata.xml 254 BLAKE2B f3a9f843cf94243d1129711770df727fcdc8808bca829ef784819cab6f5410dfa463cfed85182f8228c7de796a674dd602653ad3ef817a62c0c3e7198b23befe SHA512 b9fcd3084a7e197f6138e1ce8b0eff99c4c203c37a7d5c40de207040ba1501ef0e5b2f4e00216a567037bcd6d3394fdec6ff587484c9ba2fca9d04f431733b7c
diff --git a/sys-apps/dmidecode/dmidecode-3.5-r1.ebuild b/sys-apps/dmidecode/dmidecode-3.5-r1.ebuild
deleted file mode 100644
index 3f52315eea2e..000000000000
--- a/sys-apps/dmidecode/dmidecode-3.5-r1.ebuild
+++ /dev/null
@@ -1,47 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-# Upstream often give "recommended patches" at https://www.nongnu.org/dmidecode/
-# Check regularly after releases!
-inherit flag-o-matic toolchain-funcs
-
-DESCRIPTION="DMI (Desktop Management Interface) table related utilities"
-HOMEPAGE="https://www.nongnu.org/dmidecode/"
-SRC_URI="https://savannah.nongnu.org/download/${PN}/${P}.tar.xz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="-* ~alpha amd64 arm arm64 ~ia64 ~loong ~mips ppc ppc64 ~riscv x86"
-IUSE="selinux"
-
-RDEPEND="selinux? ( sec-policy/selinux-dmidecode )"
-
-src_prepare() {
-	default
-
-	sed -i \
-		-e "/^prefix/s:/usr/local:${EPREFIX}/usr:" \
-		-e "/^docdir/s:dmidecode:${PF}:" \
-		-e '/^PROGRAMS !=/d' \
-		Makefile || die
-}
-
-src_compile() {
-	append-lfs-flags
-
-	emake \
-		CFLAGS="${CFLAGS} ${CPPFLAGS}" \
-		LDFLAGS="${LDFLAGS}" \
-		CC="$(tc-getCC)"
-}
-
-pkg_postinst() {
-	if [[ ${CHOST} == *-solaris* ]] ; then
-		einfo "dmidecode needs root privileges to read /dev/xsvc"
-		einfo "To make dmidecode useful, either run as root, or chown and setuid the binary."
-		einfo "Note that /usr/sbin/ptrconf and /usr/sbin/ptrdiag give similar"
-		einfo "information without requiring root privileges."
-	fi
-}
diff --git a/sys-apps/dmidecode/dmidecode-3.4-r1.ebuild b/sys-apps/dmidecode/dmidecode-3.5-r3.ebuild
index 3f52315eea2e..67960f7676a5 100644
--- a/sys-apps/dmidecode/dmidecode-3.4-r1.ebuild
+++ b/sys-apps/dmidecode/dmidecode-3.5-r3.ebuild
@@ -7,13 +7,24 @@ EAPI=8
 # Check regularly after releases!
 inherit flag-o-matic toolchain-funcs
 
+
 DESCRIPTION="DMI (Desktop Management Interface) table related utilities"
 HOMEPAGE="https://www.nongnu.org/dmidecode/"
 SRC_URI="https://savannah.nongnu.org/download/${PN}/${P}.tar.xz"
+PATCHES=()
+UPSTREAM_PATCHES=(
+	c76ddda0ba0aa99a55945e3290095c2ec493c892
+	80de376231e903d2cbea95e51ffea31860502159
+)
+
+for c in "${UPSTREAM_PATCHES[@]}" ; do
+	SRC_URI+=" https://git.savannah.gnu.org/cgit/dmidecode.git/patch/?id=${c} -> ${P}-${c}.patch "
+	PATCHES+=( "${DISTDIR}"/${P}-${c}.patch )
+done
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="-* ~alpha amd64 arm arm64 ~ia64 ~loong ~mips ppc ppc64 ~riscv x86"
+KEYWORDS="-* ~alpha ~amd64 ~arm ~arm64 ~ia64 ~loong ~mips ~ppc ~ppc64 ~riscv ~x86"
 IUSE="selinux"
 
 RDEPEND="selinux? ( sec-policy/selinux-dmidecode )"