Merge updates from master

10 files changed, 259 insertions, 0 deletions

diff --git a/eclass/flag-o-matic.eclass b/eclass/flag-o-matic.eclass
index 0e427649c015..500ceb5941a8 100644
--- a/eclass/flag-o-matic.eclass
+++ b/eclass/flag-o-matic.eclass
@@ -81,6 +81,7 @@ _setup-allowed-flags() {
 		-gstabs -gstabs+
 		-gz
 		-glldb
+		'-fdebug-default-version=*'
 
 		# Cosmetic/output related, see e.g. bug #830534
 		-fno-diagnostics-color '-fmessage-length=*'
diff --git a/games-puzzle/nudoku/Manifest b/games-puzzle/nudoku/Manifest
index 62c4b2763e6d..4a7268524ad8 100644
--- a/games-puzzle/nudoku/Manifest
+++ b/games-puzzle/nudoku/Manifest
@@ -1 +1,2 @@
 DIST nudoku-2.1.0.tar.gz 31592 BLAKE2B 997ae3931fec3b6605858a35cdf6bc88296138c01a9138d229ed43a5262fdd5d15eb8a96dfdcf02e8eb6f7f416b84e4752edbb57319be50bfdae6c952217446b SHA512 dde16d1dccc1cae8d156f57fccf8b112f3fee7d23b912b5cd7ecc092ecbf04a8e85f469e53fa02e6bd2d0b9498e4a65a219e1aad8091f82638dceab32f320670
+DIST nudoku-3.0.0.tar.gz 31578 BLAKE2B ff75b02e87b231c2ae3f1109e5f6c39efd37b5f9bc6cf11247dfc1098399e8dc647b144a186b3b9f62ffcb1e7c9dd37ba1a1ce4fa917829e8498e2eed48f80ea SHA512 7a87bb73d2a440b361544681c7924c62284fc3d6ac0122ddda51f5539a837ceb89fc7fcef06b134599cd7a11e2ba37fa49df0f89d5d8ab4cd454551492cb6d6e
diff --git a/games-puzzle/nudoku/nudoku-3.0.0.ebuild b/games-puzzle/nudoku/nudoku-3.0.0.ebuild
new file mode 100644
index 000000000000..777e7d97c8d9
--- /dev/null
+++ b/games-puzzle/nudoku/nudoku-3.0.0.ebuild
@@ -0,0 +1,33 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit autotools
+
+DESCRIPTION="ncurses based sudoku game"
+HOMEPAGE="https://jubalh.github.io/nudoku/"
+SRC_URI="https://github.com/jubalh/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="GPL-3+"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="cairo"
+
+BDEPEND="virtual/pkgconfig"
+DEPEND="
+	cairo? ( x11-libs/cairo )
+	>=sys-devel/gettext-0.20
+	sys-libs/ncurses:=
+	virtual/libintl
+"
+RDEPEND="${DEPEND}"
+
+src_prepare() {
+	default
+	eautoreconf
+}
+
+src_configure() {
+	econf $(use_enable cairo)
+}
diff --git a/media-gfx/panini/Manifest b/media-gfx/panini/Manifest
index 4a386db423d7..643b50d1467a 100644
--- a/media-gfx/panini/Manifest
+++ b/media-gfx/panini/Manifest
@@ -1 +1,2 @@
 DIST panini-0.73.0.tar.gz 329164 BLAKE2B 1cd592d7c5cf230398a6496a27f8389375a670b1de1a0f6acdb2027884bc5059798ad86ad4deb7795402654b3eb9edf112c3c177c7c716d55a186e48e1567f1c SHA512 4c12c0af5f94079f0da8f08dd19d99fd06c16c653b21532eba01022ed5b78afdcea2a042902fd50d0ea442483699cfdf9b10fd7f4592e3bae60abd5d2dabf657
+DIST panini-0.74.0.tar.gz 329344 BLAKE2B b94f774004eeb2a1b1531d92ae69141134367c6a87665d3f83944ff38a8761a41813bc023a5ec8e61131a6e193e0bfdc10ccf7100fb0ac518619b9bf94ebeee1 SHA512 e9158040cc985f088902169a2357da1bba5bda5510acec43a8edc95f5cc8033b4f8933f2b5f1b6a651872b467abc4fc3735d1565bae8a8650abd4aa8919f27b7
diff --git a/media-gfx/panini/panini-0.74.0.ebuild b/media-gfx/panini/panini-0.74.0.ebuild
new file mode 100644
index 000000000000..aaf6d2f25332
--- /dev/null
+++ b/media-gfx/panini/panini-0.74.0.ebuild
@@ -0,0 +1,52 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit desktop qmake-utils xdg-utils
+
+MY_P="${P/p/P}-src"
+DESCRIPTION="OpenGL-based panoramic image viewer"
+HOMEPAGE="https://github.com/lazarus-pkgs/panini"
+SRC_URI="https://github.com/lazarus-pkgs/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+RDEPEND="
+	dev-qt/qtcore:5
+	dev-qt/qtgui:5
+	dev-qt/qtopengl:5
+	dev-qt/qtwidgets:5
+	sys-libs/zlib
+	virtual/glu
+"
+DEPEND="${RDEPEND}
+	app-arch/unzip
+"
+
+DOCS=( NEWS {BUILD,README,USAGE}.md )
+
+src_prepare() {
+	default
+	eqmake5 ${PN}.pro
+}
+
+src_install() {
+	einstalldocs
+	dobin panini
+	domenu "${FILESDIR}"/${PN}.desktop
+	newicon ui/panini-icon-blue.jpg ${PN}.jpg
+}
+
+pkg_postinst() {
+	xdg_mimeinfo_database_update
+	xdg_desktop_database_update
+}
+
+pkg_postrm() {
+	xdg_mimeinfo_database_update
+	xdg_desktop_database_update
+}
diff --git a/net-wireless/iw/Manifest b/net-wireless/iw/Manifest
index 279d5a6782f8..89fc63d9bc7f 100644
--- a/net-wireless/iw/Manifest
+++ b/net-wireless/iw/Manifest
@@ -1,2 +1,3 @@
 DIST iw-5.19.tar.xz 152044 BLAKE2B 57c14b3be0b171b80abcbc71a45f392115f62cc0c3f8440185cb05b42f7a7c901653969a4d5200878b7ceb7aea356d9cf02e07a9fbb282b34372c23561f4fe0a SHA512 ff5c23543806c91eda27c91da923737c74cbccd6acc55f1f45114338f518cd959ca292c9255fd75b91dc127ed016eb235dd97af319e30631578eba6cb0823c6c
 DIST iw-5.9.tar.xz 145296 BLAKE2B d7abe6c65d408a7570227dbe69fe11e1d72a1f502de21d1fcb7dcff6bfe229804020d5c1ebdda42a3694e31cf87c631faf089746f8df4733b0b1a459c185e2af SHA512 08b0c8d92c7e695bb2a107b89c3cc406e8386393b65ecbf96ded6fd757043ccd12bedaa90c14138e03e53f107365d04e229633c1cfa024ecab5fe993578491be
+DIST iw-6.7.tar.xz 158928 BLAKE2B f0ed86c35edb9a70549f1fcc1bccc33ca18e20051f8c4db94d7199b6ac51ecae601afd6d6389c94c63337cdda1247a9ca7fbb19c7e27fd7e36b54ee319bace8c SHA512 7370d3b55ce43691ba84913be334c04dcdf9aa44e9556e4214d8016ddf9733b2c555ebdfbdfc814d2eba7da68501503d267ad6353b14f87b81f064f629afbef5
diff --git a/net-wireless/iw/iw-6.7.ebuild b/net-wireless/iw/iw-6.7.ebuild
new file mode 100644
index 000000000000..f1bbe2108630
--- /dev/null
+++ b/net-wireless/iw/iw-6.7.ebuild
@@ -0,0 +1,40 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit toolchain-funcs
+
+DESCRIPTION="nl80211 configuration utility for wireless devices using the mac80211 stack"
+HOMEPAGE="https://wireless.wiki.kernel.org/en/users/Documentation/iw"
+SRC_URI="https://mirrors.edge.kernel.org/pub/software/network/${PN}/${P}.tar.xz"
+
+LICENSE="ISC"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~loong ~ppc ~ppc64 ~riscv ~x86 ~amd64-linux ~x86-linux"
+
+DEPEND="dev-libs/libnl:="
+RDEPEND="
+	${DEPEND}
+	net-wireless/wireless-regdb
+"
+BDEPEND="virtual/pkgconfig"
+
+src_prepare() {
+	default
+	tc-export CC LD PKG_CONFIG
+
+	# do not compress man pages by default.
+	sed 's@\(iw\.8\)\.gz@\1@' -i Makefile || die
+}
+
+src_compile() {
+	# Set flags prior so they are honored
+	CFLAGS="${CFLAGS:+${CFLAGS} }${CPPFLAGS}"
+	LDFLAGS="${CFLAGS:+${CFLAGS} }${LDFLAGS}"
+	emake V=1
+}
+
+src_install() {
+	emake V=1 DESTDIR="${D}" PREFIX="${EPREFIX}/usr" install
+}
diff --git a/sys-devel/gcc/Manifest b/sys-devel/gcc/Manifest
index 4611ee7e62b1..13c9590f095b 100644
--- a/sys-devel/gcc/Manifest
+++ b/sys-devel/gcc/Manifest
@@ -8,6 +8,7 @@ DIST gcc-11-20231123.tar.xz 76227160 BLAKE2B 20fb3d3ec58c0c78a795ffbd154d76b2036
 DIST gcc-11-20231130.tar.xz 76233368 BLAKE2B c5675854585458e94b743eb98f6cf43b72f672fb2cdbd2f185b411f8943f70fff97f5613863bbe6a9eb85d4d8469ee13f2c0a601540c791dc249e2bd5e6f9373 SHA512 c1e611e2dee35448ff162c0be32a67937db45535e2f93c3fc7bfbb24dd57e2cd6bf840b47cc8d60183e5aec9ff87de56e85ddf491b3304307ca584e911d1b1f0
 DIST gcc-11-20231207.tar.xz 76225664 BLAKE2B a5e8391a23b5f8769b49f64a92f770b591990d9e2c2cc2b32bbb75f4342144a99cd9880e1e364b55fbfcc8b511a56ff68e2463f7588a4e5593059fbb784a24bf SHA512 2359e2fb379a5573ddd05b9cdea1c3d7fd531014d436f32ed49c8cd8b830c722b7a4e03b2c51d871c880795762df70aeb9d9ebde0f05fd74483e75e89e80fefb
 DIST gcc-11-20231214.tar.xz 76228348 BLAKE2B fded6ed91e9376d23652490f6b36cf847d1e01c449a26f756a7aee753dd82af37e3583f0cdae3c987923bb8938ed5a199db2b9a7a0c7fe7c8ceb6c8046029c4a SHA512 4e7a644fcd6c51d82b7b4fea368f0c26a887ccc694cddc0ca80af8dad289fe05f92b8036403075e62302a03f6f93a41291e2e925dd6f63e738772ea8f67b432a
+DIST gcc-11-20231221.tar.xz 76242656 BLAKE2B 279076c197fc9f666985c3f0a5f7e1dc0879ef2fa677e2fb5aeecbd605f52727f5591c58e8e9380f98c4de43f4aedfacd10ee78e450f6f549ac8424df901784d SHA512 004f5380a558f03195fd2988a03d6f1988d5ef13ab8be99a1ca0560950764019001fcd09178bc587e7c0a5c90cd7c147538d3e68d9194d1bf1888011e5565c1f
 DIST gcc-11.4.0-musl-patches-2.tar.xz 4308 BLAKE2B a2335e155fc57816fed822a648e0eaefafcba9d04e1ad0fd7baeea5a694ab6f5e3c1678cb406f2a1bd17bab25cb01699d032713a1ccf337948dfda2093844607 SHA512 17b84f907cb1bd763873655e6f35fd3ed55a40b602b70a626f04f83b4cc89c6261db1661de78d4d969187a8c56e9f6305b742515a3836b962248a21df0df5d0c
 DIST gcc-11.4.0-patches-10.tar.xz 13852 BLAKE2B 54937d13e30e2a5303c7e197fae09eeed35ca0b9783625e02578fcee829b5503fb22d664366322b304df7d01ae807d00af7c93db3e3ceebe4851e15647724f87 SHA512 31b4d7a2e7cc589e92e12c3583d13d41c523cafbd309bc0532df9b68ea2473c89daef4c0edd3ce2917b5823d81a7792f145b9449f16277d0d64c22ceff50bbb9
 DIST gcc-11.4.0-patches-11.tar.xz 14268 BLAKE2B 7650366a8ff48855efb7ff7e7e61b2ccada669f95154bb176d6422fb6d2da3c3f332987338164350295683687283004733dae90ef5e0a11fb0803b0e37e1dfad SHA512 707f741977de0f13abf45e90595ecfbdcd6a94d0583a7568a69333d5a717d3f82a08c1c1b695cdbf956b1eea3b6d325fdb27bba4b931216c03f591684d93b959
@@ -18,6 +19,7 @@ DIST gcc-12-20231124.tar.xz 79820140 BLAKE2B 8a4ea2e35955d72d6b87c3f352d2fadc859
 DIST gcc-12-20231201.tar.xz 79793864 BLAKE2B b5c19bb9cb5c03138f20baa1d199f8784ddf52980a30d8c22a69a4e7885d976da9b94f139c6d82fc520c033ee29992e3aabb23c8508c6b1a8913ec3d89b2db51 SHA512 c17383259cbf7bda6b10be954430676846cc443e0d83309dbe4e2f5b4ea53006c6d7cb1ce3d564a2a5d5b773af59cf2a0c7ce7f82cfd8da71060be233d7a986f
 DIST gcc-12-20231208.tar.xz 79805176 BLAKE2B 6c280bafb849a59d68f77b52703686967230eb7ee56628160a955dfd45c32c2c7492f0f2eebdfe9985b96b670615e6e01af103d9f4c033245a0c699b6c8c3a18 SHA512 b53a83f13b2583466b135e4bbf868a59970ec17f779b1b333ce45e506380308a439ea2a8e1e9adc10c777ef1f6498c8011f3a340e90c326e9e323d908bf1abdf
 DIST gcc-12-20231215.tar.xz 79804016 BLAKE2B 547def0a166db31d8654a8b85ec1320f0dfe30f3f340968a67761e7907f56eb135d5a7e28c582d74dabc835027e09eb282c2f01a7be1e830f5f73145739a3084 SHA512 72a0d0721c9d09b6afaf8f6214dec1a577debf0167569166f0fc7c808d90bece35bb088f810b36dc873cbf199b1ae91d5c64e1d6557c92abbf6cf3feb6fbcbfa
+DIST gcc-12-20231222.tar.xz 79814136 BLAKE2B b50d336adb38d4c45d4097cc8772246d75646e2a3731af65c0b58eb1289508c4e08227eed15b6b1e88843b94933fd241388e5c634ecaa0cf432fc3d4fc71e618 SHA512 78886eb891ed89d9047e12222d7211e4c4e184554c8ce71274314f42afd2c573b8e4a512dab4d013aa26332e02cd1bf90b56607a0437a912d6e0bc2a096ea52f
 DIST gcc-12.3.0-musl-patches-1.tar.xz 3572 BLAKE2B c7bf65f7c9ea8023ddaac821ee2b778622fa310ac72a72b2f7032494a8f304eac86217f9204622e6c21aaef9952bece0d09bc126facd4f42b602927909815ab5 SHA512 babc279fea2c1fd4c018815f2f5630214fd46015ce9f365c28af242681d51818eaca30ce298eddcab1eed5ac5f2759e2b47b2335afab9d722b4469a6d4fec326
 DIST gcc-12.3.0-patches-2.tar.xz 14236 BLAKE2B 06c43662c9abb0fa3cf90d5e2273c69aecb9158e6cf6f23c04754ed5d686be2616e81e2502eb16f4298ddd50518ca7677e13249da9e9b091162d3931ff65e4fe SHA512 b0d4b85dbf1a54aaaa1997203b872e3106906b4ad49cde57e1428bc22b2f8e2d73b8cb10ae0d0b792aebaf664594da4d1dea04c44ddc34e59047410766db04d1
 DIST gcc-13-20230826.tar.xz 84285788 BLAKE2B c25be594e322dd7145245c42ae21b98aa9e3e6ae69f1fa313830e40bf2e8fcb8435762f1c9d3f1ca1dbf31653bdc76a658bec708b7850fe40a7c55504ac30618 SHA512 3d47632e90651bd50a881c727c1ef2aa3322b4fc3e082919ae430270901abf8a05a34fe93f8b678c10dc9a0758f93dc3b33ed5947c8743dab453d2b50c063722
diff --git a/sys-devel/gcc/gcc-11.4.1_p20231221.ebuild b/sys-devel/gcc/gcc-11.4.1_p20231221.ebuild
new file mode 100644
index 000000000000..0a84d9888218
--- /dev/null
+++ b/sys-devel/gcc/gcc-11.4.1_p20231221.ebuild
@@ -0,0 +1,64 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+TOOLCHAIN_PATCH_DEV="sam"
+PATCH_GCC_VER="11.4.0"
+PATCH_VER="12"
+MUSL_VER="2"
+MUSL_GCC_VER="11.4.0"
+
+if [[ ${PV} == *.9999 ]] ; then
+	MY_PV_2=$(ver_cut 2)
+	MY_PV_3=1
+	if [[ ${MY_PV_2} == 0 ]] ; then
+		MY_PV_2=0
+		MY_PV_3=0
+	else
+		MY_PV_2=$((${MY_PV_2} - 1))
+	fi
+
+	# e.g. 12.2.9999 -> 12.1.1
+	TOOLCHAIN_GCC_PV=$(ver_cut 1).${MY_PV_2}.${MY_PV_3}
+elif [[ -n ${TOOLCHAIN_GCC_RC} ]] ; then
+	# Cheesy hack for RCs
+	MY_PV=$(ver_cut 1).$((($(ver_cut 2) + 1))).$((($(ver_cut 3) - 1)))-RC-$(ver_cut 5)
+	MY_P=${PN}-${MY_PV}
+	GCC_TARBALL_SRC_URI="mirror://gcc/snapshots/${MY_PV}/${MY_P}.tar.xz"
+	TOOLCHAIN_SET_S=no
+	S="${WORKDIR}"/${MY_P}
+fi
+
+inherit toolchain
+
+if tc_is_live ; then
+	# Needs to be after inherit (for now?), bug #830908
+	EGIT_BRANCH=releases/gcc-$(ver_cut 1)
+elif [[ -z ${TOOLCHAIN_USE_GIT_PATCHES} ]] ; then
+	# Don't keyword live ebuilds
+	#KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+	:;
+fi
+
+if [[ ${CATEGORY} != cross-* ]] ; then
+	# Technically only if USE=hardened *too* right now, but no point in complicating it further.
+	# If GCC is enabling CET by default, we need glibc to be built with support for it.
+	# bug #830454
+	RDEPEND="elibc_glibc? ( sys-libs/glibc[cet(-)?] )"
+	DEPEND="${RDEPEND}"
+	BDEPEND=">=${CATEGORY}/binutils-2.30[cet(-)?]"
+fi
+
+src_prepare() {
+	local p upstreamed_patches=(
+		# add them here
+	)
+	for p in "${upstreamed_patches[@]}"; do
+		rm -v "${WORKDIR}/patch/${p}" || die
+	done
+
+	toolchain_src_prepare
+
+	eapply_user
+}
diff --git a/sys-devel/gcc/gcc-12.3.1_p20231222.ebuild b/sys-devel/gcc/gcc-12.3.1_p20231222.ebuild
new file mode 100644
index 000000000000..1ffe2b97a4bf
--- /dev/null
+++ b/sys-devel/gcc/gcc-12.3.1_p20231222.ebuild
@@ -0,0 +1,64 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+TOOLCHAIN_PATCH_DEV="sam"
+PATCH_GCC_VER="12.3.0"
+PATCH_VER="2"
+MUSL_VER="1"
+MUSL_GCC_VER="12.3.0"
+
+if [[ ${PV} == *.9999 ]] ; then
+	MY_PV_2=$(ver_cut 2)
+	MY_PV_3=1
+	if [[ ${MY_PV_2} == 0 ]] ; then
+		MY_PV_2=0
+		MY_PV_3=0
+	else
+	        MY_PV_2=$((${MY_PV_2} - 1))
+	fi
+
+	# e.g. 12.2.9999 -> 12.1.1
+	TOOLCHAIN_GCC_PV=$(ver_cut 1).${MY_PV_2}.${MY_PV_3}
+elif [[ -n ${TOOLCHAIN_GCC_RC} ]] ; then
+	# Cheesy hack for RCs
+	MY_PV=$(ver_cut 1).$((($(ver_cut 2) + 1))).$((($(ver_cut 3) - 1)))-RC-$(ver_cut 5)
+	MY_P=${PN}-${MY_PV}
+	GCC_TARBALL_SRC_URI="mirror://gcc/snapshots/${MY_PV}/${MY_P}.tar.xz"
+	TOOLCHAIN_SET_S=no
+	S="${WORKDIR}"/${MY_P}
+fi
+
+inherit toolchain
+
+if tc_is_live ; then
+	# Needs to be after inherit (for now?), bug #830908
+	EGIT_BRANCH=releases/gcc-$(ver_cut 1)
+elif [[ -z ${TOOLCHAIN_USE_GIT_PATCHES} ]] ; then
+	# Don't keyword live ebuilds
+	#KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+	:;
+fi
+
+if [[ ${CATEGORY} != cross-* ]] ; then
+	# Technically only if USE=hardened *too* right now, but no point in complicating it further.
+	# If GCC is enabling CET by default, we need glibc to be built with support for it.
+	# bug #830454
+	RDEPEND="elibc_glibc? ( sys-libs/glibc[cet(-)?] )"
+	DEPEND="${RDEPEND}"
+	BDEPEND=">=${CATEGORY}/binutils-2.30[cet(-)?]"
+fi
+
+src_prepare() {
+	local p upstreamed_patches=(
+		# add them here
+	)
+	for p in "${upstreamed_patches[@]}"; do
+		rm -v "${WORKDIR}/patch/${p}" || die
+	done
+
+	toolchain_src_prepare
+
+	eapply_user
+}