gentoo auto-resync : 03:05:2024 - 00:00:22

6 files changed, 88 insertions, 3 deletions

diff --git a/sys-fs/Manifest.gz b/sys-fs/Manifest.gz
index a539e6fa713f..5f9a100b33de 100644
--- a/sys-fs/Manifest.gz
+++ b/sys-fs/Manifest.gz
diff --git a/sys-fs/lvm2/Manifest b/sys-fs/lvm2/Manifest
index aa23936b183c..2074732bacb6 100644
--- a/sys-fs/lvm2/Manifest
+++ b/sys-fs/lvm2/Manifest
@@ -10,11 +10,12 @@ AUX lvm2-2.03.20-dmeventd-no-idle-exit.patch 2174 BLAKE2B e5b53504feeac84e045839
 AUX lvm2-2.03.20-example.conf.in.patch 1317 BLAKE2B dee2843e512bb16e4d64c7e76141133222c46a7b6776418f19af56139ed0764401cc8b49be06d18358f3e32277fbcc34b644e8e4e104a8eca25eb6f90e2b362d SHA512 1d724b75e441bd7ff0836ab1ae685401817aeccfc5c312c7ce73b3ef70bf4413829f7e07f13399cae6d7085503eaf8566df936fc79185ef9d6f9ad773fcc9fef
 AUX lvm2-2.03.20-freopen-musl.patch 1595 BLAKE2B 4e019fbf8b89f79ca19eb821bc434d84d5c986a10d82b4a33a3cc4b8b6aa30c27e912e2ab0d067cab94feb28b53826725f43dd0973a60482c20e6417149b6a35 SHA512 40e49bb34a9c07493ab6a9948e3ac1a85e22f069b69ad2a1369cb7d30a6ea6d72a27f380ad8951f55d939834e2f29c9da589ae475322ea41b4dfce72060b9557
 AUX lvm2-2.03.22-autoconf-2.72-egrep.patch 841 BLAKE2B 89f2e2766fc915091292d4e19e9ba6cdda424ff1a6d160faaf0a62fa7156ddcfd47b36ce34df5981eb91db28f5ae2755a0a67c73bce86962f455ad73289885c7 SHA512 8e8218c628e617896456caafa3f83d4a95e54bd1edd9f0e003b3f922bab2935e16d19f18b6f2514c7f7b70d3ad54787669cd3e8b9770d2f1d0a8963c759b6520
+AUX lvm2-2.03.22-thin-version-checking.patch 2619 BLAKE2B ce32b0b0dd8d7036784b100d4b7daf7eeffb2aa94db22a1bb4a7f809c77eab3baa33d1ea114be0aed0071349fc8299ec1330213da9639e262ace536b8849e966 SHA512 f5a93f85b4be3d133c30163acab90000190c50b1070619d308eb31ace8136145053e9020964459f779d4dc1b3bf9f3bcc61f74d00c5ce176b9cd695bd048025c
 AUX lvmlockd.initd-r2 390 BLAKE2B aebfa2a654eca784da24fd4e4d46b3e6c97256a42b725e015a13c9673e79c0d1a10213d1eecb6c75d4ce1ebd99e6200010f19c36d758018bdef303ea08ee5549 SHA512 6359b3cbff1fa05944fb69582234220cac593b2c8f8317162a728bac72ced4f8b492ce11e6ced6d848a7654fa4a506c1e658f546cff302344a739646479a62dc
 AUX lvmpolld.initd-r1 348 BLAKE2B cba0419add6591320dc60ef7616b66706e042b566284a4ec42002fbb5331a7173fc8b4b39be7198426fe4bbdcd3ad94b69fc3d8950705b6331c5f3f4cda4ad66 SHA512 b9b8376cbc8b6703868afab18e5baa4ef5354569e57f0596d38a8005fa725299f6858ac86b39fcca10e5a0f1adbd3a4cfa6cc6b62405e78916cc1287d8b36d0d
 DIST LVM2.2.03.21.tgz 2742294 BLAKE2B 529bc01b3d1ba6207c9ddc95309b39e6293fcd0286334240b9fdc076da0b7bc7e026338ec0243564ec153f2fb5009014149c3f8e0db0cd47a29418af62068728 SHA512 6024811c3fa92afd2fc13a10d1c3542352aa9a016f40c3ef588bd2f5f3e41245fed4b36c8a87d9f7f8dddc6e13b7253396f5c811f99665df27751676dc7b5bde
 DIST LVM2.2.03.22.tgz 2755031 BLAKE2B 79bbea84bd82f111c1bb5de336e6a9f1368b2c9e43f075dccaa90c7746a364259ad278adf650379eca75f2803ed74e74dd372be2cca8518462182657f96a0033 SHA512 17cd24ceee8026481566824b688dafd03ec816201d5cb3549cb7fc8a36f4cdaa982faaef4dcd26debfe775dea5ffa2744798164314ea6dc99a84f8ccccfc33ff
 EBUILD lvm2-2.03.21-r1.ebuild 8618 BLAKE2B a478bb8b532477c39360aa74b1146f2088677a67dd142f175a2b7790958c37b650adfc0085ed1ed27157d4160cc157dece2e3eaf6ce7afde042d303e1a9bf355 SHA512 1e43152e35dd95600c7abf695db590d5bc7dccd929d0186cb2bc24fdfb60fe37ba9b92e92d8501006b1507537c30ddbd1250fdcfafdd98128ed819213003f42f
 EBUILD lvm2-2.03.22-r1.ebuild 8578 BLAKE2B 6e751837605606ad1e4ccd4058eafe1d73f96f121b7a7ffc5cc9d1107723ae24912ba0d684f1c86a954919da37b14beb580ac64a8dc0ddcb6ea6a723bd7c0707 SHA512 a8cdbef887549d58df4b5d1654761c5c06c0943b97f6ef5147ba47cdc4cb05c531eda9d1a38db8366b171b0b09e11398469818981bbc42cbb831ddbe2475c494
-EBUILD lvm2-2.03.22-r3.ebuild 8596 BLAKE2B 4768c9289254d407580b9491e9f55ba71dad350d9a021e4aee9f28ab064f955224714466f9654757db15f5628678c3d7e04aff01e9bbff494b9ee5bbff10bc1e SHA512 6fba6ba5ce9514c53ea46e242fdc44ff4b6cc1320f02267ab79753e45a2c42e7bf405ef811f5ef22ffb9396453bbb391bd50ae87b938c77014a9063b4334d2c5
+EBUILD lvm2-2.03.22-r5.ebuild 8661 BLAKE2B 598011bebdaba76b992f2358bb883ccfcea781aa862cb83c5d69eee40514cec44ef14dec922d79b4fd9d8c7070fba41ca1da9f3b32951305446349041755c706 SHA512 d5cb3109b989b733e5c7e059a26bb0bb76ef2846bbf94021de6713941b90185645512ac67d31f275802c8a3d3c4316fd1e202c5294e6dbe1a728f93d46599d9a
 MISC metadata.xml 831 BLAKE2B c34345ee897004b3776da0cb65cb1165156ecaf1802926f1b8d77eb25c836cebbb1833fadb0af3580b127c7852ac561ac20c877bcfd0cc80ea3b6283ed1ce975 SHA512 0be91bba800fc1db6dbad68e36b7d882a6bd41124a10e759322ccc661d123a689a2c0ea5f3fa2dfa40ae197c36b3171cb99d6630967805d57aa220543f0a1623
diff --git a/sys-fs/lvm2/files/lvm2-2.03.22-thin-version-checking.patch b/sys-fs/lvm2/files/lvm2-2.03.22-thin-version-checking.patch
new file mode 100644
index 000000000000..28d901bc7d61
--- /dev/null
+++ b/sys-fs/lvm2/files/lvm2-2.03.22-thin-version-checking.patch
@@ -0,0 +1,59 @@
+From f117d47ffa781f7f1ad452505c250b4826cdcc7f Mon Sep 17 00:00:00 2001
+From: Zdenek Kabelac <zkabelac@redhat.com>
+Date: Tue, 10 Oct 2023 22:03:50 +0200
+Subject: [PATCH] configure.ac: version checking for new dmpd tools
+
+New rust version of thin_check returns now also binary name in version,
+so adapt the version checking to handle this variant.
+---
+ configure.ac | 8 +++++---
+ 1 file changed, 5 insertions(+), 3 deletions(-)
+
+diff --git a/configure.ac b/configure.ac
+index 1550f1f70..59d4b65af 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -426,6 +426,7 @@ AS_CASE(["$THIN"],
+ 	])
+ 	AS_IF([test "$THIN_CHECK_NEEDS_CHECK" = "yes" && test "$THIN_CONFIGURE_WARN" != "y"], [
+ 		THIN_CHECK_VSN=$("$THIN_CHECK_CMD" -V 2>/dev/null)
++		THIN_CHECK_VSN=${THIN_CHECK_VSN##* }  # trim away all before the first space
+ 		THIN_CHECK_VSN_MAJOR=$(echo "$THIN_CHECK_VSN" | $AWK -F '.' '{print $1}')
+ 		THIN_CHECK_VSN_MINOR=$(echo "$THIN_CHECK_VSN" | $AWK -F '.' '{print $2}')
+ 
+@@ -467,7 +468,7 @@ AS_CASE(["$THIN"],
+ 		])
+ 	])
+ 
+-	AC_MSG_CHECKING([whether thin_check supports the needs-check flag])
++	AC_MSG_CHECKING([whether $THIN_CHECK_CMD ($THIN_CHECK_VSN_MAJOR.$THIN_CHECK_VSN_MINOR) supports the needs-check flag])
+ 	AC_MSG_RESULT([$THIN_CHECK_NEEDS_CHECK])
+ 	AS_IF([test "$THIN_CHECK_NEEDS_CHECK" = "yes"], [
+ 		AC_DEFINE([THIN_CHECK_NEEDS_CHECK], 1, [Define to 1 if the external 'thin_check' tool requires the --clear-needs-check-flag option])
+@@ -537,12 +538,13 @@ AS_CASE(["$CACHE"],
+ 		])
+ 	])
+ 	AS_IF([test "$CACHE_CHECK_NEEDS_CHECK" = "yes" && test "$CACHE_CONFIGURE_WARN" != "y"], [
+-		$CACHE_CHECK_CMD -V 2>/dev/null >conftest.tmp
++		"$CACHE_CHECK_CMD" -V 2>/dev/null >conftest.tmp
+ 		read -r CACHE_CHECK_VSN < conftest.tmp
+ 		IFS=.- read -r CACHE_CHECK_VSN_MAJOR CACHE_CHECK_VSN_MINOR CACHE_CHECK_VSN_PATCH LEFTOVER < conftest.tmp
+ 		rm -f conftest.tmp
+ 
+ 		# Require version >= 0.5.4 for --clear-needs-check-flag
++		CACHE_CHECK_VSN_MAJOR=${CACHE_CHECK_VSN_MAJOR##* }
+ 		AS_IF([test -z "$CACHE_CHECK_VSN_MAJOR" \
+ 			|| test -z "$CACHE_CHECK_VSN_MINOR" \
+ 			|| test -z "$CACHE_CHECK_VSN_PATCH"], [
+@@ -590,7 +592,7 @@ AS_CASE(["$CACHE"],
+ 		])
+ 	])
+ 
+-	AC_MSG_CHECKING([whether cache_check supports the needs-check flag])
++	AC_MSG_CHECKING([whether $CACHE_CHECK_CMD ($CACHE_CHECK_VSN_MAJOR.$CACHE_CHECK_VSN_MINOR.$CACHE_CHECK_VSN_PATCH) supports the needs-check flag])
+ 	AC_MSG_RESULT([$CACHE_CHECK_NEEDS_CHECK])
+ 	AS_IF([test "$CACHE_CHECK_NEEDS_CHECK" = "yes"], [
+ 		AC_DEFINE([CACHE_CHECK_NEEDS_CHECK], 1, [Define to 1 if the external 'cache_check' tool requires the --clear-needs-check-flag option])
+-- 
+2.45.0
+
diff --git a/sys-fs/lvm2/lvm2-2.03.22-r3.ebuild b/sys-fs/lvm2/lvm2-2.03.22-r5.ebuild
index 5575480db560..5b95dd0b2940 100644
--- a/sys-fs/lvm2/lvm2-2.03.22-r3.ebuild
+++ b/sys-fs/lvm2/lvm2-2.03.22-r5.ebuild
@@ -69,6 +69,7 @@ PATCHES=(
 	"${FILESDIR}"/${PN}-2.03.20-dmeventd-no-idle-exit.patch
 	"${FILESDIR}"/${PN}-2.03.20-freopen-musl.patch
 	"${FILESDIR}"/${PN}-2.03.22-autoconf-2.72-egrep.patch
+	"${FILESDIR}"/${PN}-2.03.22-thin-version-checking.patch
 )
 
 pkg_setup() {
@@ -135,8 +136,8 @@ src_configure() {
 		myeconfargs+=( --with-thin=internal --with-cache=internal )
 		local texec
 		for texec in check dump repair restore; do
-			myeconfargs+=( --with-thin-${texec}="${EPREFIX}"/sbin/thin_${texec} )
-			myeconfargs+=( --with-cache-${texec}="${EPREFIX}"/sbin/cache_${texec} )
+			myeconfargs+=( --with-thin-${texec}="${EPREFIX}"/usr/sbin/thin_${texec} )
+			myeconfargs+=( --with-cache-${texec}="${EPREFIX}"/usr/sbin/cache_${texec} )
 		done
 	else
 		myeconfargs+=( --with-thin=none --with-cache=none )
diff --git a/sys-fs/quotatool/Manifest b/sys-fs/quotatool/Manifest
index 4321dbcd28cb..b4a3654dc92c 100644
--- a/sys-fs/quotatool/Manifest
+++ b/sys-fs/quotatool/Manifest
@@ -4,6 +4,8 @@ AUX quotatool-1.6.2-fix-autoconf.patch 4292 BLAKE2B 235b394ca499b415a5dbab75b882
 AUX quotatool-1.6.2-warnings.patch 1612 BLAKE2B 6a3f69a5b44afddc4684069f181aa06573014c23d2cd43c8c9e4dca255f24cfbd7fed3455b13fdbd71bb2c7167db90ed21f83a6b7ef7d67054cb61e299b8f02e SHA512 5a281a5fafb6364e998c76c4c269f8213daa24a0efd48a7edcd29623552e84f8dfe738d6a92dbaa7ef5506371ab27090e190a8327a9df695e0a394a3ec80dafd
 DIST quotatool-1.6.2.tar.gz 147691 BLAKE2B 22eb1f5012b0dd19d52a795a493e7a51e9bab0d6e71b10d632a4f61faf6b54db5b0b6096fdc38b0fdd2879ebc2a4cb44e7279e735e09436a9def5018814b3478 SHA512 882bdc43e49ef69b1b2899da01faf7853524f67585b716bba195ea89a250a90a7796a225b7d141b68bf45c7524d9fe506000998e6e7dc113b559f95e6ed21e2c
 DIST quotatool-1.6.3.gh.tar.gz 105408 BLAKE2B aad673bab49071122c3ddb64a6f9e3006b2fa2b958e00be35decf13b4cf8fb0d6e2f06278287275a90ae04a31e48e492e2be9f7abbc8522e9c454b86aaaa5271 SHA512 d21f41bf4d45116241885b9ba249ad49cd55043773ca1b6663b0d7ad2ad531d7411bc812338973e82b50c402987bf3910edd455ab83a8fd66c2b369c22297693
+DIST quotatool-1.6.4.gh.tar.gz 108459 BLAKE2B 78b547e70e94aebcd7355fb88c2d8ddbde539a9f6b8737d27947e88990808b59b8dad0f81eb4de5888a4d10127f9a87bf60dddd9fbeaf9c9acdd864b124434e3 SHA512 ba753085235909a6eb11332eb704cd8b1816f74e9552b77b1b34833432b95ff5f92881ea60c36be3dbe09e6b39446c575993cfe51263ea3b664852e3d023b70a
 EBUILD quotatool-1.6.2-r1.ebuild 774 BLAKE2B 492129dc61626e384a3c6ddfe8a8a9575c19b301c1cd176636b14dad461654b873b082ae7a4b5962d691a9f741899742b10a58ebd0428f0b90419b5778d48154 SHA512 45d4046fce9151538fff8eaf6323584061b710f026391342daf0e8ef208a9063667c43fcdbb66749fd02dfb99523b4f60b0dd5bbfea0d588ff2c53408a84b830
 EBUILD quotatool-1.6.3.ebuild 519 BLAKE2B ae99f8f09573b265baf26893c79e8756ff0a51f22905d27a0484dc033b8dbbeda3d738b3ca6f7fdc88bcac5ad4dde21218dba9fc5959c90d40e2de4cbd02d086 SHA512 22d25a8300992002ea36c743ff81322f43c819ca95a9fbcda6030a9d10527a2066c6eee3affc6dc8f63fab245997eeb7141520d9b20af03b051a9bfccfbddb08
+EBUILD quotatool-1.6.4.ebuild 522 BLAKE2B 4de23dfdb41918603ad3092f434e02deb00de66caa55579a5dc12f0361f47ddc29ab42e448964dcbc2af493d876a6c949d5147b17bc260f641ff158093e5d113 SHA512 1681a74fa117c03d380e9acad5ffac18d825ae12b53f327847f3c1b3c26de54ae9aa18b334da07cb89d5efb8bdddd9d2145feb00f578cc6f45419b493ea7d643
 MISC metadata.xml 341 BLAKE2B 1bf0dc2eaf87efd6d1d578e0c9d3a0743b8fd9b3610238386a1bdc1bf7cc040dc9f08261cb2bc3d1e006773b9c3d314406b66559aa33590c3ca416fa49572348 SHA512 77c0761e2ca47085ef0bd734d126e44b30a7fca25c636d5b3dbf7de8b4bcf686078f076cf86d1c868c2e557f372b87afbd97f4f47719b15710175fd55d7ae921
diff --git a/sys-fs/quotatool/quotatool-1.6.4.ebuild b/sys-fs/quotatool/quotatool-1.6.4.ebuild
new file mode 100644
index 000000000000..aef0f3146b06
--- /dev/null
+++ b/sys-fs/quotatool/quotatool-1.6.4.ebuild
@@ -0,0 +1,22 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit toolchain-funcs
+
+DESCRIPTION="Command-line utility for filesystem quotas"
+HOMEPAGE="https://quotatool.ekenberg.se/"
+#SRC_URI="https://quotatool.ekenberg.se/${P}.tar.gz"
+SRC_URI="https://github.com/ekenberg/quotatool/archive/refs/tags/v${PV}.tar.gz -> ${P}.gh.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~x86"
+
+RDEPEND="sys-fs/quota"
+
+src_configure() {
+	tc-export CC
+	default
+}