From 8b3d97939d3f2615e65eeb40a79306d794007544 Mon Sep 17 00:00:00 2001
From: Flatcar Buildbot <buildbot@flatcar-linux.org>
Date: Mon, 1 Jul 2024 07:17:36 +0000
Subject: [PATCH] net-misc/rsync: Sync with Gentoo

It's from Gentoo commit e17a78ccb683fb9e30248bd72cca2d03bb29fc3b.
---
 .../portage-stable/net-misc/rsync/rsync-3.2.7-r4.ebuild   | 2 ++
 .../portage-stable/net-misc/rsync/rsync-3.3.0.ebuild      | 8 +++++---
 .../portage-stable/net-misc/rsync/rsync-9999.ebuild       | 6 ++++--
 3 files changed, 11 insertions(+), 5 deletions(-)

diff --git a/sdk_container/src/third_party/portage-stable/net-misc/rsync/rsync-3.2.7-r4.ebuild b/sdk_container/src/third_party/portage-stable/net-misc/rsync/rsync-3.2.7-r4.ebuild
index 9d19a85738..831a218e46 100644
--- a/sdk_container/src/third_party/portage-stable/net-misc/rsync/rsync-3.2.7-r4.ebuild
+++ b/sdk_container/src/third_party/portage-stable/net-misc/rsync/rsync-3.2.7-r4.ebuild
@@ -93,6 +93,8 @@ pkg_setup() {
 src_prepare() {
 	default
 
+	sed -i -e 's/AC_HEADER_MAJOR_FIXED/AC_HEADER_MAJOR/' configure.ac
+
 	if [[ ${PV} == *9999 || -n ${RSYNC_NEEDS_AUTOCONF} ]] ; then
 		eaclocal -I m4
 		eautoconf -o configure.sh
diff --git a/sdk_container/src/third_party/portage-stable/net-misc/rsync/rsync-3.3.0.ebuild b/sdk_container/src/third_party/portage-stable/net-misc/rsync/rsync-3.3.0.ebuild
index fc6198dfa4..36f1dca4b6 100644
--- a/sdk_container/src/third_party/portage-stable/net-misc/rsync/rsync-3.3.0.ebuild
+++ b/sdk_container/src/third_party/portage-stable/net-misc/rsync/rsync-3.3.0.ebuild
@@ -4,8 +4,8 @@
 EAPI=8
 
 # Uncomment when introducing a patch which touches configure
-#RSYNC_NEEDS_AUTOCONF=1
-PYTHON_COMPAT=( python3_{10..11} )
+RSYNC_NEEDS_AUTOCONF=1
+PYTHON_COMPAT=( python3_{10..12} )
 inherit flag-o-matic prefix python-single-r1 systemd
 
 DESCRIPTION="File transfer program to keep remote files into sync"
@@ -27,7 +27,7 @@ else
 		SRC_DIR="src-previews"
 	else
 		SRC_DIR="src"
-		KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris"
+		KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris"
 	fi
 
 	SRC_URI="https://rsync.samba.org/ftp/rsync/${SRC_DIR}/${P/_/}.tar.gz
@@ -87,6 +87,8 @@ pkg_setup() {
 src_prepare() {
 	default
 
+	sed -i -e 's/AC_HEADER_MAJOR_FIXED/AC_HEADER_MAJOR/' configure.ac
+
 	if [[ ${PV} == *9999 || -n ${RSYNC_NEEDS_AUTOCONF} ]] ; then
 		eaclocal -I m4
 		eautoconf -o configure.sh
diff --git a/sdk_container/src/third_party/portage-stable/net-misc/rsync/rsync-9999.ebuild b/sdk_container/src/third_party/portage-stable/net-misc/rsync/rsync-9999.ebuild
index fc6198dfa4..6ea497c2e7 100644
--- a/sdk_container/src/third_party/portage-stable/net-misc/rsync/rsync-9999.ebuild
+++ b/sdk_container/src/third_party/portage-stable/net-misc/rsync/rsync-9999.ebuild
@@ -4,8 +4,8 @@
 EAPI=8
 
 # Uncomment when introducing a patch which touches configure
-#RSYNC_NEEDS_AUTOCONF=1
-PYTHON_COMPAT=( python3_{10..11} )
+RSYNC_NEEDS_AUTOCONF=1
+PYTHON_COMPAT=( python3_{10..12} )
 inherit flag-o-matic prefix python-single-r1 systemd
 
 DESCRIPTION="File transfer program to keep remote files into sync"
@@ -87,6 +87,8 @@ pkg_setup() {
 src_prepare() {
 	default
 
+	sed -i -e 's/AC_HEADER_MAJOR_FIXED/AC_HEADER_MAJOR/' configure.ac
+
 	if [[ ${PV} == *9999 || -n ${RSYNC_NEEDS_AUTOCONF} ]] ; then
 		eaclocal -I m4
 		eautoconf -o configure.sh