diff --git a/dev-perl/Socket6/Socket6-0.290.0-r1.ebuild b/dev-perl/Socket6/Socket6-0.290.0-r2.ebuild
similarity index 80%
rename from dev-perl/Socket6/Socket6-0.290.0-r1.ebuild
rename to dev-perl/Socket6/Socket6-0.290.0-r2.ebuild
index b1cdfd4c7e2a1..6a7af9c6dfd86 100644
--- a/dev-perl/Socket6/Socket6-0.290.0-r1.ebuild
+++ b/dev-perl/Socket6/Socket6-0.290.0-r2.ebuild
@@ -5,7 +5,7 @@ EAPI=8
 
 DIST_AUTHOR=UMEMOTO
 DIST_VERSION=0.29
-inherit perl-module toolchain-funcs
+inherit autotools perl-module toolchain-funcs
 
 DESCRIPTION="IPv6 related part of the C socket.h defines and structure manipulators"
 
@@ -15,9 +15,15 @@ KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv
 
 PATCHES=(
 	"${FILESDIR}"/${PN}-0.290.0-pointer-warning.patch
+	"${FILESDIR}"/${PN}-0.290.0-which.patch
 )
 
 src_unpack() {
 	default
 	tc-export CC
 }
+
+src_prepare () {
+	default
+	eautoreconf
+}
diff --git a/dev-perl/Socket6/files/Socket6-0.290.0-which.patch b/dev-perl/Socket6/files/Socket6-0.290.0-which.patch
new file mode 100644
index 0000000000000..495c0bb73d376
--- /dev/null
+++ b/dev-perl/Socket6/files/Socket6-0.290.0-which.patch
@@ -0,0 +1,23 @@
+Bug: https://bugs.gentoo.org/954831
+--- a/configure.in
++++ b/configure.in
+@@ -35,7 +35,7 @@
+ AC_PROG_CC
+ 
+ changequote(<<, >>)
+-default_perl_path=`which perl | sed -e 's/\/\/*[^\/]*$//'`
++default_perl_path=`command -v perl | sed -e 's/\/\/*[^\/]*$//'`
+ changequote([,])
+ 
+ AC_ARG_WITH(perl,[  --with-perl=path-to-perl],
+--- a/Makefile.PL
++++ b/Makefile.PL
+@@ -34,7 +34,7 @@
+     configure_mswin32();
+ } else {
+     local $ENV{TMPDIR} = $ENV{TMPDIR};
+-    my $path_perl = ($^X =~ m!^/!o) ? $^X : `which $^X`;
++    my $path_perl = ($^X =~ m!^/!o) ? $^X : `command -v $^X`;
+     my $cmd = "CC='$Config{cc}' CFLAGS='$Config{ccflags}'";
+     if ($^O eq 'android') {
+         # Work around a bug in Android's sh: