[gentoo-commits] repo/gentoo:master commit in: sys-apps/util-linux/

["Sam James" <sam@gentoo.org>]

commit:     d06e93839823bc76397f693df858a685300d8c89
Author:     Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Wed Apr  5 00:34:33 2023 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Wed Apr  5 00:34:33 2023 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d06e9383

sys-apps/util-linux: add 2.39_rc2, drop 2.39_rc1

Signed-off-by: Sam James <sam <AT> gentoo.org>

 sys-apps/util-linux/Manifest                                      | 5 ++---
 .../{util-linux-2.39_rc1.ebuild => util-linux-2.39_rc2.ebuild}    | 8 --------
 2 files changed, 2 insertions(+), 11 deletions(-)

diff --git a/sys-apps/util-linux/Manifest b/sys-apps/util-linux/Manifest
index 8026f61fcccc..5cb5b3ba00c7 100644
--- a/sys-apps/util-linux/Manifest
+++ b/sys-apps/util-linux/Manifest
@@ -1,6 +1,5 @@
 DIST util-linux-2.37.4.tar.xz 6114232 BLAKE2B 7f6cd12ec9bc68a6db787be78c1ee19fdfbb37710df36d4278d869676ba531afd414097e57e5287efed6c7c80d6b6ef36d5812ff2bea611080d3ce5bf5ad4ac5 SHA512 ada2629b0a8e83ea83513e04f7b1ccceb3b8ab82acd119c5d8389d1abc48c92d0b591f39fb34b1fd65db3ab630f03a672a9f3dacf1a6e4f124bdb083fc1be6d7
 DIST util-linux-2.38.1.tar.sign 833 BLAKE2B 2468c6b8c881d7a17666aac954edfd421085111937f5d0daada37a679e9bbfe61fc98bb57cca9bf7bea20be483f38e2a758039f9baf5b1a901852e2b5dd014d8 SHA512 d8b3e936065ae1dc105b8ce773c874bb037ebf84ee571676509543f79c39950180e7f252c6b0d4500119568ed4ac3aa7117793de839f983e9287f26649e91dad
 DIST util-linux-2.38.1.tar.xz 7495904 BLAKE2B a0e86ca62f82adaccc01ad6ec5a058dac429b81c310989cbad136f96c2770c60bbd4287067817520e8e0653146a10f13128e0af32122402bab416e1c2d6680b8 SHA512 07f11147f67dfc6c8bc766dfc83266054e6ede776feada0566b447d13276b6882ee85c6fe53e8d94a17c03332106fc0549deca3cf5f2e92dda554e9bc0551957
-DIST util-linux-2.39-rc1.tar.sign 833 BLAKE2B d540ee98c09879b26a1175b00145872b518d30edc91a1d4c625da502d8fffa8a5fb7ec7f36151e5da4a0c215cc1e53acf6134d5d5842e73f43a7ad8d05d5c0c3 SHA512 00c4e573513941fcf7f254b31bdc0747df24bcfee071f27b66ebd8b30680b098ea63c0590a139bf2b29ac02033c3b1cfae126d9ac0d5829c4e85acb348a643b7
-DIST util-linux-2.39-rc1.tar.xz 8083996 BLAKE2B a74d3b40540cd31c34c37caca20a2cd6691cfdf664da0a4a5b6c04201204d2cd6d357861f15dd41532aceb1adf3def7422f2c987ea79875330ca7c09039f03e8 SHA512 e9981d7c65eed7cd3f96f590e2190c7c804b1767464c821cd9277c72aaf38b8407f324cf9e8f3b96eb96359a0746f21a01dfb6baa504f49c8c7e1aff2dc956b3
-DIST util-linux-2.39_rc1-autotools-regenerate.patch.xz 17616 BLAKE2B 8bf56506f915b7c24bb47c6591b93bc132c3a4bbee9bd8bb78df03b08723cd1103b7ea34b6e53042aa38a1822007628c26f97e8aa8efae170765cbf9e710276b SHA512 e73e5b11a52a0e8ad0bda83fa5a5b41c06f452d6f34a42ad8714968261e0990ba2afda04f9bb3389c61a5fc67182701b9d44c4ead69cae6d268083f94191a977
+DIST util-linux-2.39-rc2.tar.sign 833 BLAKE2B ec2ea0c2034b5e8f24c72610e53acc4c922d3d4b84ffd31c3b51849e60a99a6e9bf3e17b773e222f89bc1fe33fb06722e2770b981c7dcc4519bec4db797d8348 SHA512 20b1f2ec5368c74f751238451be9ec5f8f74d8c63d331365b00ed06144f6874fe3f44e062e7b52c5d0a05c650353a741c1594e150e58a16544e5ffc8ed100a5b
+DIST util-linux-2.39-rc2.tar.xz 8080452 BLAKE2B d2476d1aff1c2e4e3cb3d4b71fa3410ce4db26448139dc439865b03d108acf4c797eb92e9edc2451dca099116fda8950b529f1b22b657d47268164642fe794a6 SHA512 11f5b8ed1eb90a4e7161369eafcf0157b205aeded221cd435f95a79d01901bdef289660486849778b3d3c15500db593cad24e0a7f87f52968c9c292ea68040c0

diff --git a/sys-apps/util-linux/util-linux-2.39_rc1.ebuild b/sys-apps/util-linux/util-linux-2.39_rc2.ebuild
similarity index 97%
rename from sys-apps/util-linux/util-linux-2.39_rc1.ebuild
rename to sys-apps/util-linux/util-linux-2.39_rc2.ebuild
index 0e42fe563e2b..0baf9332ec6f 100644
--- a/sys-apps/util-linux/util-linux-2.39_rc1.ebuild
+++ b/sys-apps/util-linux/util-linux-2.39_rc2.ebuild
@@ -24,9 +24,6 @@ else
 
 	SRC_URI="https://www.kernel.org/pub/linux/utils/util-linux/v${PV:0:4}/${MY_P}.tar.xz"
 	SRC_URI+=" verify-sig? ( https://www.kernel.org/pub/linux/utils/util-linux/v${PV:0:4}/${MY_P}.tar.sign )"
-
-	# Drop on next release, it's just here for ${P}-test-build.patch
-	SRC_URI+=" https://dev.gentoo.org/~sam/distfiles/${CATEGORY}/${PN}/${P}-autotools-regenerate.patch.xz"
 fi
 
 S="${WORKDIR}/${MY_P}"
@@ -94,11 +91,6 @@ fi
 REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} ) su? ( pam )"
 RESTRICT="!test? ( test )"
 
-PATCHES=(
-	"${FILESDIR}"/${P}-test-build.patch
-	"${WORKDIR}"/${P}-autotools-regenerate.patch
-)
-
 pkg_pretend() {
 	if use su && ! use suid ; then
 		elog "su will be installed as suid despite USE=-suid (bug #832092)"