Merge updates from master

10 files changed, 28 insertions, 89 deletions

diff --git a/app-arch/gzip/gzip-1.11.ebuild b/app-arch/gzip/gzip-1.11.ebuild
index 1c68d7110487..0d00a0f7aad3 100644
--- a/app-arch/gzip/gzip-1.11.ebuild
+++ b/app-arch/gzip/gzip-1.11.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -20,15 +20,6 @@ PATCHES=(
 	"${FILESDIR}/${PN}-1.3.8-install-symlinks.patch"
 )
 
-src_prepare() {
-	default
-	if [[ ${CHOST} == *darwin* && ${CHOST##*darwin} -le 17 ]] ; then
-		# Fix older Darwin inline definition problem
-		sed -i -e '/define _GL_EXTERN_INLINE_STDHEADER_BUG/s/_BUG/_DISABLE/' \
-			lib/config.hin || die
-	fi
-}
-
 src_configure() {
 	use static && append-flags -static
 	# avoid text relocation in gzip
diff --git a/app-emulation/cloud-init/metadata.xml b/app-emulation/cloud-init/metadata.xml
index b713df4f675f..f64358336851 100644
--- a/app-emulation/cloud-init/metadata.xml
+++ b/app-emulation/cloud-init/metadata.xml
@@ -5,10 +5,6 @@
     <email>prometheanfire@gentoo.org</email>
     <name>Matthew Thode</name>
   </maintainer>
-  <maintainer type="person">
-    <email>eva@gentoo.org</email>
-    <name>Gilles Dartiguelongue</name>
-  </maintainer>
   <longdescription lang="en">
     Cloud-init is the industry standard multi-distribution method for cross-platform cloud instance initialization. It is supported across all major public cloud providers, provisioning systems for private cloud infrastructure, and bare-metal installations.
   </longdescription>
diff --git a/app-emulation/virt-what/metadata.xml b/app-emulation/virt-what/metadata.xml
index b6f3d9b49e57..d25679ed78c7 100644
--- a/app-emulation/virt-what/metadata.xml
+++ b/app-emulation/virt-what/metadata.xml
@@ -2,10 +2,6 @@
 <!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<maintainer type="person">
-		<email>eva@gentoo.org</email>
-		<name>Gilles Dartiguelongue</name>
-	</maintainer>
-	<maintainer type="person">
 		<email>prometheanfire@gentoo.org</email>
 		<name>Matthew Thode</name>
 	</maintainer>
diff --git a/games-board/gnome-chess/gnome-chess-40.1.ebuild b/games-board/gnome-chess/gnome-chess-40.1.ebuild
index 9db81c60f9dc..2a78f8ca2322 100644
--- a/games-board/gnome-chess/gnome-chess-40.1.ebuild
+++ b/games-board/gnome-chess/gnome-chess-40.1.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
-PYTHON_COMPAT=( python3_{7..9} )
+PYTHON_COMPAT=( python3_{7..10} )
 VALA_MIN_API_VERSION="0.52"
 
 inherit gnome.org gnome2-utils meson python-any-r1 readme.gentoo-r1 vala xdg
diff --git a/games-puzzle/gnome-sudoku/Manifest b/games-puzzle/gnome-sudoku/Manifest
index 667231ff642d..2209a8bea509 100644
--- a/games-puzzle/gnome-sudoku/Manifest
+++ b/games-puzzle/gnome-sudoku/Manifest
@@ -1,2 +1 @@
-DIST gnome-sudoku-40.1.tar.xz 358076 BLAKE2B 03a53827956a40a7ce54eef3dfa2d27c455d716cdd7f395c8c1e6b0e1f4e07cccad766b9a5cb23de81ef384b56296dfb117867672ade87fa5efffca740add1ef SHA512 29f97a0f9c7b990cffe66fe99c909822c1050c3c01c703e7967f9aa214824f153b6fba619e2c084dfa66aa66a3d3fd034659a8f0995ae69a9d2a85435e0e38d6
 DIST gnome-sudoku-40.2.tar.xz 358260 BLAKE2B cf48bedee61ee808820a6e7ac3a368f215d6f0370edc83f06d62a3a28c79fb6c024411f9acace3db547a246f721e47c8c8c4ef63c7b07517c587f2b3b1de114b SHA512 5baaba3bba714eb90c9d1597f83c310c9ef59693d5372b3871afd34b2f1c48a3257cb61f220d3cdf624cb29ad80015e0f5ec88485020b7e351540c69374131fa
diff --git a/games-puzzle/gnome-sudoku/gnome-sudoku-40.1.ebuild b/games-puzzle/gnome-sudoku/gnome-sudoku-40.1.ebuild
deleted file mode 100644
index be8d649a0e28..000000000000
--- a/games-puzzle/gnome-sudoku/gnome-sudoku-40.1.ebuild
+++ /dev/null
@@ -1,49 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-PYTHON_COMPAT=( python3_{7..9} )
-VALA_MIN_API_VERSION="0.40"
-
-inherit gnome.org gnome2-utils meson python-any-r1 vala xdg
-
-DESCRIPTION="Test your logic skills in this number grid puzzle"
-HOMEPAGE="https://wiki.gnome.org/Apps/Sudoku"
-
-LICENSE="GPL-3+ CC-BY-SA-3.0"
-SLOT="0"
-KEYWORDS="amd64 ~arm ~arm64 x86"
-
-RDEPEND="
-	>=dev-libs/glib-2.40:2
-	dev-libs/libgee:0.8=[introspection]
-	>=x11-libs/gtk+-3.24.0:3[introspection]
-	dev-libs/json-glib
-	>=dev-libs/qqwing-1.3.4
-	x11-libs/gdk-pixbuf:2[introspection]
-	x11-libs/pango[introspection]
-"
-DEPEND="${RDEPEND}"
-BDEPEND="
-	${PYTHON_DEPS}
-	$(vala_depend)
-	dev-libs/appstream-glib
-	dev-util/itstool
-	>=sys-devel/gettext-0.19.8
-	virtual/pkgconfig
-"
-
-src_prepare() {
-	xdg_src_prepare
-	vala_src_prepare
-}
-
-pkg_postinst() {
-	xdg_pkg_postinst
-	gnome2_schemas_update
-}
-
-pkg_postrm() {
-	xdg_pkg_postrm
-	gnome2_schemas_update
-}
diff --git a/games-puzzle/gnome-tetravex/gnome-tetravex-3.38.2.ebuild b/games-puzzle/gnome-tetravex/gnome-tetravex-3.38.2.ebuild
index 6a823f1e4683..1c9ab8809a6e 100644
--- a/games-puzzle/gnome-tetravex/gnome-tetravex-3.38.2.ebuild
+++ b/games-puzzle/gnome-tetravex/gnome-tetravex-3.38.2.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
-PYTHON_COMPAT=( python3_{7..9} )
+PYTHON_COMPAT=( python3_{7..10} )
 VALA_MIN_API_VERSION="0.40"
 
 inherit gnome.org gnome2-utils meson python-any-r1 vala xdg
diff --git a/net-misc/wget/wget-1.21.2.ebuild b/net-misc/wget/wget-1.21.2.ebuild
index 63faba88832d..88a127f8983f 100644
--- a/net-misc/wget/wget-1.21.2.ebuild
+++ b/net-misc/wget/wget-1.21.2.ebuild
@@ -67,14 +67,6 @@ src_prepare() {
 			-e 's/^  LIBICONV=$/:/' \
 			configure || die
 	fi
-
-	if [[ ${CHOST} == *-darwin* && ${CHOST##*-darwin} -le 17 ]] ; then
-		# Fix older Darwin inline definition problem
-		# fixed upstream
-		# https://git.savannah.gnu.org/gitweb/?p=gnulib.git;a=commit;h=29d79d473f52b0ec58f50c95ef782c66fc0ead21
-		sed -i -e '/define _GL_EXTERN_INLINE_STDHEADER_BUG/s/_BUG/_DISABLE/' \
-			src/config.h.in || die
-	fi
 }
 
 src_configure() {
diff --git a/profiles/prefix/darwin/macos/package.mask b/profiles/prefix/darwin/macos/package.mask
index 1d194495f268..0b90c5562381 100644
--- a/profiles/prefix/darwin/macos/package.mask
+++ b/profiles/prefix/darwin/macos/package.mask
@@ -4,12 +4,3 @@
 # Fabian Groffen <grobian@gentoo.org> (2022-01-08)
 # malloc crash during install on >=11.0, bug #830425
 =dev-util/cmake-3.22.1
-
-# Sam James <sam@gentoo.org> (2021-12-23)
-# Fails to build due to gnulib errors on >=11.0:
-# ```timespec.h:52:21: error: expected identifier or ‘(’ before ‘struct’
-# 52 | _GL_TIMESPEC_INLINE struct timespec```
-# bug #829847
-=app-editors/nano-5.9
-=app-editors/nano-6.0
-=app-arch/gzip-1.11
diff --git a/profiles/prefix/darwin/macos/profile.bashrc b/profiles/prefix/darwin/macos/profile.bashrc
new file mode 100644
index 000000000000..fc81d01031c4
--- /dev/null
+++ b/profiles/prefix/darwin/macos/profile.bashrc
@@ -0,0 +1,23 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+if [[ ${EBUILD_PHASE} == prepare ]]; then
+	# workaround for Gnulib bug that affects multiple packages: gzip, wget,
+	# nano, etc
+	# https://lists.gnu.org/archive/html/bug-gnulib/2021-09/msg00053.html
+	# https://bugs.gentoo.org/829847
+	# https://bugs.gentoo.org/831026
+	find "${S}" -name "config.h*" \
+		| xargs grep -l "define _GL_INLINE static _GL_UNUSED" \
+		| while read file
+	do
+		einfo "fixing gnulib inline bug in ${file#${S}/}"
+		origfile="${file}".gnulib-fix.$$
+		mv "${file}" "${origfile}"
+		sed -e 's/define _GL_INLINE static _GL_UNUSED/define _GL_INLINE _GL_UNUSED static/' \
+			-e 's/define _GL_EXTERN_INLINE static _GL_UNUSED/define _GL_EXTERN_INLINE _GL_UNUSED static/' \
+			"${origfile}" > "${file}"
+		touch -r "${origfile}" "${file}"
+	done
+fi
+