5 files changed, 153 insertions, 2 deletions
diff --git a/sys-block/Manifest.gz b/sys-block/Manifest.gz
index 5a744ac7e1b6..aa88a3032818 100644
--- a/sys-block/Manifest.gz
+++ b/sys-block/Manifest.gz
diff --git a/sys-block/parted/Manifest b/sys-block/parted/Manifest
index 2e6882d6611d..9e8d4401b2a8 100644
--- a/sys-block/parted/Manifest
+++ b/sys-block/parted/Manifest
@@ -1,7 +1,9 @@
 AUX parted-3.2-po4a-mandir.patch 275 BLAKE2B 5342cc776f557c9ef95604eb2c15ad484c4dbf102d4093dcb1d4005f2f6d4f90db2ff0fc3ceae59fd22c3442604b2abbdac48594f860ba810dc4d8dce89d6fc0 SHA512 5ef686f56d8c3939da3f24fdb6196d8858c2f980805f1cb06020d6f6996158f62b8372a233ec3ec98aae30b41034046d615e415b3abf2648db7be88e3b45a872
 AUX parted-3.3-atari.patch 421 BLAKE2B 9048176f882e66cf89cc2d79aa0ea7a550f9c649d8f54f4df102eb361c6e0be473a2e07e1ab8f63dc446422a92ced10cfb4858a27b7988c1b5a960e6e8e1d518 SHA512 59738de6f89dd6d407eef139ffe4d0925d418f4d33a30a1ead1e1f05ab7ad93e13294412d5061dd40302b9592a33b97f137089f477dc6a2febd3fe60eae77ca0
 AUX parted-3.4-posix-printf.patch 2872 BLAKE2B 55c1bef638a88f7d3b5b1f90ca28df1d0ccb40590536c0a0f10416509c3d90a2a329dd530ebbcc9945b2eefb7a3540a113d27a73c7d636b372eb9fc8e19f7eed SHA512 d16bb7e3cfccaa8b40ece90b507559857fb1a4f5a08bc93da61b7afde4b69e06de363948426cec66cbb1135d6d1d5a50206cee6cec9973e1cb02aefe50697670
+AUX parted-3.6-tests-non-bash.patch 3100 BLAKE2B 2aa7c4fcb03cdd354e85c8bd0696a07a09106cc37e482d7bcd720146964468b6d234195ba900dc2afb982f2348bd5455617072e8cace04feef959aad05ccdb30 SHA512 d0b6f9ff544255ae4240dda1d7b44385224dbbf64c8059e5cc1338a348cc2c045eb23d3f3e9c3b4d4fe2fba677a99f235232a38310e95c6565e412e44ed526dc
+AUX parted-3.6-tests-unicode.patch 2009 BLAKE2B 73e376209d1aa99d6f9988e139e2b15f68c78d3fdfc17b86113cb05b2611591d7dadabeee5a72be837bee047d898615f27dfd6e2d8e077ef05de6cf3cfeff4ed SHA512 1fe8f8155b5c155cd39fa859318066e6580497b044e31b22f8a22b8617662e35b028879e5f9bcea1ec6c7e4aad038d5803c635a3e2b57a7a769a09e3194890d8
 DIST parted-3.6.tar.xz 1896164 BLAKE2B 99b6d096e4db05144c98e9f0a9a97c647aa911ee5df031244b03d5223f709d43d9302cef12dd4b2f97f42ec476510561b7f8b3b1ef7cb09d0a7c4d512e7a6739 SHA512 034a44b25718acba175212019d24f092972a791c5bd1d921ae91e17478657a77c5c5dd0c832bed7968c3a07ec6c65c0785acfac2f90c1ca5e1692f3c141693ef
 DIST parted-3.6.tar.xz.sig 508 BLAKE2B 92fbf624cfeb474e36d43954ecf6c42cf86557b99c7cd477c648bdeefb3ca2b40c51c320b20ea91075276d9ccc1da4219cd843b2916157c564c92a34a35ec55f SHA512 7c845026937b29fb49085ef9e3354226b73a1c3b5f9082d440d9a8ac13d76b1d07dae0bc10d8c974d4e57bc582f38c0a908e80718dd1ff1adfad3b04699c672c
-EBUILD parted-3.6.ebuild 1630 BLAKE2B 7f9e5b84e53d62db6ea702f0ac0a97ad47c4a3009e0d3541a02bf02ddd006225ceffed3596d1a4bcf55c09647e1a3797b795018fe25b169caabc2d8b5392fe61 SHA512 5344457a9b568c86637f7af3d2870450cbe2e9a38019ca4d8b50fad2bfe8f6f8336a7b0603444009abb6dbfc5091dbfbeef2f5cb6a1b14bdd14779419ad97ae5
+EBUILD parted-3.6.ebuild 1789 BLAKE2B 12d898ef90d839852a47127ce09e476f68a7b2e66433d7c2dedb8c753b959bfbdecbeed06fae13723fef35332c4215b16367c98316e87babfb84744390a19760 SHA512 2cb7f550f2d67ff45d7bf0314dbecf46cff210fa64a3930a0fdeb514d5b043fc187114b3ca532cd77310c0535960c49b6d2ade95e7cc6ac31256cdc1acc28380
 MISC metadata.xml 993 BLAKE2B bb9a50448ba4bd971b4b9d9482e473004ff1b9b54a7e2dbf838e4745436da6544927c2f7e343bb1a83f2adcdf413a30ac0519b6aef2a72e4fbdde49bd89c930c SHA512 315a27fdc2a333892dcc59c39efdc7383f4752a52783f893516d66f83993c911d231d6da806dee048d8b76c96c4bccb5b2cb408ec5b0b5ffad48f7ddecf1b592
diff --git a/sys-block/parted/files/parted-3.6-tests-non-bash.patch b/sys-block/parted/files/parted-3.6-tests-non-bash.patch
new file mode 100644
index 000000000000..02c44f68998a
--- /dev/null
+++ b/sys-block/parted/files/parted-3.6-tests-non-bash.patch
@@ -0,0 +1,86 @@
+https://debbugs.gnu.org/61128
+
+From c7b5c04083b8fc21c3e0d044375631d559e122e3 Mon Sep 17 00:00:00 2001
+From: Kerin Millar <kfm@plushkava.net>
+Date: Wed, 25 Jan 2023 15:26:46 +0000
+Subject: [PATCH] Use complementation correctly in shell globs
+
+Negation should be performed by using the <exclamation-mark> character.
+Attempting to use the <circumflex> shall result in undefined behaviour.
+
+Dash used to tolerate this violation of the spec but the following
+commit put a stop to it.
+
+https://git.kernel.org/pub/scm/utils/dash/dash.git/commit/?id=8f9cca0
+
+Signed-off-by: Kerin Millar <kfm@plushkava.net>
+Link: https://pubs.opengroup.org/onlinepubs/9699919799/utilities/V3_chap02.html#tag_18_13
+Bug: https://bugs.gentoo.org/890869
+--- a/m4/o-direct.m4
++++ b/m4/o-direct.m4
+@@ -47,14 +47,14 @@ frobnozzle
+ 	      /dev/shm) ;;
+ 	      /*) case $pe_dir in
+ 		  # Accept $HOME or $TMP only if the value is nice and boring.
+-		  *[^/a-zA-Z0-9_.-]*) ;;
++		  *[!/a-zA-Z0-9_.-]*) ;;
+ 		  *) pe_cand_dirs="$pe_cand_dirs $pe_dir";;
+ 		  esac
+ 	      esac
+ 	  done
+ 
+ 	  case $PARTED_TMPDIR in
+-	      *[^/a-zA-Z0-9_.-]*) ;;
++	      *[!/a-zA-Z0-9_.-]*) ;;
+ 	      *) pe_cand_dirs="$PARTED_TMPDIR $pe_cand_dirs";;
+ 	  esac
+ 
+--- a/tests/t-local.sh
++++ b/tests/t-local.sh
+@@ -138,7 +138,7 @@ require_512_byte_sector_size_()
+ peek_()
+ {
+   case $# in 2) ;; *) echo "usage: peek_ FILE 0_BASED_OFFSET" >&2; exit 1;; esac
+-  case $2 in *[^0-9]*) echo "peek_: invalid offset: $2" >&2; exit 1 ;; esac
++  case $2 in *[!0-9]*) echo "peek_: invalid offset: $2" >&2; exit 1 ;; esac
+   dd if="$1" bs=1 skip="$2" count=1
+ }
+ 
+@@ -146,7 +146,7 @@ poke_()
+ {
+   case $# in 3) ;; *) echo "usage: poke_ FILE 0_BASED_OFFSET BYTE" >&2; exit 1;;
+     esac
+-  case $2 in *[^0-9]*) echo "poke_: invalid offset: $2" >&2; exit 1 ;; esac
++  case $2 in *[!0-9]*) echo "poke_: invalid offset: $2" >&2; exit 1 ;; esac
+   case $3 in ?) ;; *) echo "poke_: invalid byte: '$3'" >&2; exit 1 ;; esac
+   printf %s "$3" | dd of="$1" bs=1 seek="$2" count=1 conv=notrunc
+ }
+@@ -155,7 +155,7 @@ poke_()
+ gpt1_pte_name_offset_()
+ {
+   local ss=$1
+-  case $ss in *[^0-9]*) echo "$0: invalid sector size: $ss">&2; return 1;; esac
++  case $ss in *[!0-9]*) echo "$0: invalid sector size: $ss">&2; return 1;; esac
+   expr $ss \* 2 + 56
+   return 0
+ }
+@@ -167,7 +167,7 @@ gpt_corrupt_primary_table_()
+   case $# in 2) ;; *) echo "$0: expected 2 args, got $#" >&2; return 1;; esac
+   local dev=$1
+   local ss=$2
+-  case $ss in *[^0-9]*) echo "$0: invalid sector size: $ss">&2; return 1;; esac
++  case $ss in *[!0-9]*) echo "$0: invalid sector size: $ss">&2; return 1;; esac
+ 
+   # get the first byte of the name
+   local orig_pte_name_byte
+@@ -188,7 +188,7 @@ gpt_restore_primary_table_()
+   case $# in 3) ;; *) echo "$0: expected 2 args, got $#" >&2; return 1;; esac
+   local dev=$1
+   local ss=$2
+-  case $ss in *[^0-9]*) echo "$0: invalid sector size: $ss">&2; return 1;; esac
++  case $ss in *[!0-9]*) echo "$0: invalid sector size: $ss">&2; return 1;; esac
+   local orig_byte=$3
+   poke_ $dev $(gpt1_pte_name_offset_ $ss) "$orig_byte" || return 1
+ }
+-- 
+2.39.1
diff --git a/sys-block/parted/files/parted-3.6-tests-unicode.patch b/sys-block/parted/files/parted-3.6-tests-unicode.patch
new file mode 100644
index 000000000000..316c184f460d
--- /dev/null
+++ b/sys-block/parted/files/parted-3.6-tests-unicode.patch
@@ -0,0 +1,59 @@
+https://debbugs.gnu.org/61129
+
+From af8ed66e00bfac4a189ea32c62199bffaa3eb836 Mon Sep 17 00:00:00 2001
+From: Kerin Millar <kfm@plushkava.net>
+Date: Sun, 29 Jan 2023 00:34:27 +0000
+Subject: [PATCH] Use any available UTF-8 locale in t0251; skip if none found
+
+The "t0251-gpt-unicode.sh" test presently suffers from several issues
+which are addressed herewith.
+
+Do not begin by trying to match the "en_US.utf8" locale specifically.
+The only requirement for the test to be conducted correctly is that the
+system character type be set to UTF-8. For this, _any_ UTF-8 supporting
+locale will do. Simply select the first locale that ends with ".utf8"
+or "UTF-8". After all, not everyone is American, nor do all systems
+using GNU glibc yet have a C.UTF-8 locale.
+
+Escape the dot/period in the locale-matching regular expression.
+
+Skip the test outright if no UTF-8 supporting locale can be found,
+rather than spuriously fail.
+
+Assign the locale found to LC_CTYPE. There is no need to set any of the
+other locale-related environment variables for the purpose of this
+test. To guarantee that LC_CTYPE takes effect, unset LC_ALL also.
+
+Signed-off-by: Kerin Millar <kfm@plushkava.net>
+Bug: https://bugs.gentoo.org/753677
+--- a/tests/t0251-gpt-unicode.sh
++++ b/tests/t0251-gpt-unicode.sh
+@@ -17,16 +17,21 @@
+ 
+ . "${srcdir=.}/init.sh"; path_prepend_ ../parted
+ 
++# LC_CTYPE must not be overridden
++unset LC_ALL
++
++# any UTF-8 locale will suffice for setting the character type
++LC_CTYPE=$(locale -a | awk '/\.(utf8|UTF-8)$/ { print; exit; }')
++if [ -z "$LC_CTYPE" ]; then
++	skip_ 'no UTF-8 supporting locale is available'
++fi
++export LC_CTYPE
++
+ dev=loop-file
+ 
+ # create zeroed device
+ truncate -s 10m $dev || fail=1
+ 
+-LC_ALL=$(locale -a | grep en_US.utf8)
+-if [ -z "$LC_ALL" ]; then
+-   LC_ALL=C.UTF-8
+-fi
+-export LC_ALL="$LC_ALL"
+ # create gpt label with named partition
+ part_name=$(printf 'foo\341\264\244')
+ parted -s $dev mklabel gpt mkpart primary ext2 1MiB 2MiB name 1 $part_name > empty 2>&1 || fail=1
+-- 
+2.39.1
diff --git a/sys-block/parted/parted-3.6.ebuild b/sys-block/parted/parted-3.6.ebuild
index a6fac85ad7db..e70d45603592 100644
--- a/sys-block/parted/parted-3.6.ebuild
+++ b/sys-block/parted/parted-3.6.ebuild
@@ -45,6 +45,10 @@ PATCHES=(
 	"${FILESDIR}"/${PN}-3.3-atari.patch
 	# https://lists.gnu.org/archive/html/bug-parted/2022-02/msg00000.html
 	"${FILESDIR}"/${PN}-3.4-posix-printf.patch
+	# https://debbugs.gnu.org/61129
+	"${FILESDIR}"/${PN}-3.6-tests-unicode.patch
+	# https://debbugs.gnu.org/61128
+	"${FILESDIR}"/${PN}-3.6-tests-non-bash.patch
 )
 
 # false positive
@@ -52,7 +56,7 @@ QA_CONFIG_IMPL_DECL_SKIP="MIN"
 
 src_prepare() {
 	default
-	eautoconf
+	eautoreconf
 
 	touch doc/pt_BR/Makefile.in || die
 }