gentoo auto-resync : 10:11:2022 - 09:27:33

26 files changed, 813 insertions, 44 deletions

diff --git a/media-libs/Manifest.gz b/media-libs/Manifest.gz
index 1cc229110785..5c7c0c8b1630 100644
--- a/media-libs/Manifest.gz
+++ b/media-libs/Manifest.gz
diff --git a/media-libs/freetype/Manifest b/media-libs/freetype/Manifest
index 8ffc48dd4efd..5cac759e79f3 100644
--- a/media-libs/freetype/Manifest
+++ b/media-libs/freetype/Manifest
@@ -1,6 +1,8 @@
+AUX freetype-2.12.1-strict-prototypes-clang16.patch 1151 BLAKE2B 93a06eef003acdf4ca164b849dec970a3a3d1fad01d250edf4f2b3162ac4e5a3aea6aee558fdbf48ffcde5fb68d2423894f1b41645e2fb9ec505d8ffc6486a9c SHA512 0b300ea2f60536bb66b4c742f9f0bc4a46cdb79a5a71040d77f66a8dad3d897b0fda80fb43ded60b71bacf6d603852b983cf001bb7b61a8f2c70df34be79bd21
 DIST freetype-2.12.1.tar.xz 2471916 BLAKE2B c4737dc0c6e44e0a911545d604fdb2e8e8b3f5185d3f5dfe4e4561ee2d75b3e5a31afcbb2089306fec4b31ba10324a6ec6499c3735b2b7591c71e96fee4ed278 SHA512 6482de1748dc2cc01e033d21a3b492dadb1f039d13d9179685fdcf985e24d7f587cbca4c27ed8a7fdb7d9ad59612642ac5f4db062443154753295363f45c052f
 DIST freetype-doc-2.12.1.tar.xz 2038632 BLAKE2B 81225caf1a2c586a8a282a22eaaf23412270d19002bc5b07e94d946d41d089f798724982e354d1701488de37c35bf68f36de88796565f0ebaa3f9fb35c51f532 SHA512 276b91b93e375096bc0f9fa76408a6ea9fa89d4d06e9c9179f88d27d41df3f3bc0ce6939ea7a3fd7c93cb694e78fd6bfb154e969188279e2bca82dcc3afd108d
 DIST ft2demos-2.12.1.tar.xz 263656 BLAKE2B fd48dc68bd832e7532e9fae869a19699ab3337e599118bb9f1b76c3bcdcecec3cd3f55f7387508d29baf85b8de4a549aaa0e8af34d988743b1737458e255bdcf SHA512 cd9356152a64d807c75b797d005ca1dd0bde69cc2fadedec101d125cb54b2aaff1f7afa2f20839caba7db66325df7c11ed4883b7e906110356b28d9900caaae7
 EBUILD freetype-2.12.1-r1.ebuild 7496 BLAKE2B fcc0d3e6f1653833dd198ef64b8963209bc3bd4d1f797a55279b4e767fb38b029b159a4ce6074d783ce508e9d5a1697c9c2bf73390fdadba7bea5473884c0592 SHA512 c24692f86ca40baeba2b8edaff0a606ccbe1c9e28fb6d3e24b171a79c090da5bd7811594d1b6420769ec059307e721335d090752588413b7958ba6cc83cdc2f1
-EBUILD freetype-9999.ebuild 7164 BLAKE2B 89a5d64416841616e8b5508580bab7ad8d8903183abd8438daa55dadb536ffd3a82b460d5179de2d16adefade8a31a9f4e5a4ec7547e783a0df8c8b57fb7e43e SHA512 17dd4ff427348b166932e1b7614591eb382f50befdcc8c967f621db08005631356176198df7dde3a63e035dbb67023a7d40f38f849cb5a13ba70002251971b07
+EBUILD freetype-2.12.1-r2.ebuild 7556 BLAKE2B 0b0a9714c5d78f95856d6eceec212f441e30936f8d2e1155e61428cecd404455dd8457e30ec1a4b6436dfd7154d220e2273391b57c4ae46fe4aed1e62221e943 SHA512 2331e55ac709f698e417743c5fdc7019cc5562e02d0f66f64baadd3b3380345f978417ef095bfedacd67373fdee67d5a2b37bb08fff9a8176929af1a95da933c
+EBUILD freetype-9999.ebuild 7504 BLAKE2B 19574db1f788fd487789fde4f15d6fdc43d71e02aaf83bd9b174a2112bed101b6374073b3267ae8dee732428fb733755fa8417c846b2f7ec5e2f5d51e788bbe3 SHA512 8a96642149771c2fd4b0e6fb0e1d0d9e3205a889e93aa1b072e1c19142f671c91a59a9c2485fb808d8c669c3dad7420140cbe2412303554f12f0c8e1182c9f94
 MISC metadata.xml 1306 BLAKE2B db0f9487a62f002883a1850bbf90f5df4007215ce432440023a9c637ec79333576db4ebe4d3275f088a9225848eb508ef1b409c4c67ade051663d822ad5cb9ec SHA512 464c6f6810572f9f9194adba7b85ed8dfbe1c1b3dccafd5370fb555547b7a708768e2f302baa437cd5ab06a9da34a00d5aec7a48bc2903b24b8dab9f42aaa493
diff --git a/media-libs/freetype/files/freetype-2.12.1-strict-prototypes-clang16.patch b/media-libs/freetype/files/freetype-2.12.1-strict-prototypes-clang16.patch
new file mode 100644
index 000000000000..0526c27df405
--- /dev/null
+++ b/media-libs/freetype/files/freetype-2.12.1-strict-prototypes-clang16.patch
@@ -0,0 +1,36 @@
+https://gitlab.freedesktop.org/freetype/freetype/-/commit/e82371bf6ec2efdf79f9ed2d00e633ba0bbf7830
+
+From e82371bf6ec2efdf79f9ed2d00e633ba0bbf7830 Mon Sep 17 00:00:00 2001
+From: Sam James <sam@gentoo.org>
+Date: Sun, 6 Nov 2022 05:18:59 +0000
+Subject: [PATCH] Fix `-Wstrict-prototypes`.
+
+* builds/unix/configure.raw: Fix `-Wstrict-prototypes`.
+Clang 16 warns on these and they will be dropped in C23.
+
+* builds/unix/freetype2.m4: Ditto.
+
+Signed-off-by: Sam James <sam@gentoo.org>
+--- a/builds/unix/configure.raw
++++ b/builds/unix/configure.raw
+@@ -50,7 +50,7 @@ if test ${cross_compiling} = yes; then
+ 
+   AC_MSG_CHECKING([for suffix of native executables])
+   rm -f a.* b.* a_out.exe conftest.*
+-  echo > conftest.c "int main() { return 0;}"
++  echo > conftest.c "int main(void) { return 0;}"
+   ${CC_BUILD} conftest.c || AC_MSG_ERROR([native C compiler is not working])
+   rm -f conftest.c
+   if test -x a.out -o -x b.out -o -x conftest; then
+--- a/builds/unix/freetype2.m4
++++ b/builds/unix/freetype2.m4
+@@ -121,7 +121,7 @@ AC_DEFUN([AC_CHECK_FT2],
+ #include <stdlib.h>
+ 
+ int
+-main()
++main(void)
+ {
+   FT_Library library;
+   FT_Error  error;
+GitLab
diff --git a/media-libs/freetype/freetype-2.12.1-r2.ebuild b/media-libs/freetype/freetype-2.12.1-r2.ebuild
new file mode 100644
index 000000000000..a42c32a28638
--- /dev/null
+++ b/media-libs/freetype/freetype-2.12.1-r2.ebuild
@@ -0,0 +1,261 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit autotools flag-o-matic libtool multilib-build multilib-minimal toolchain-funcs
+
+DESCRIPTION="High-quality and portable font engine"
+HOMEPAGE="https://www.freetype.org/"
+IUSE="X +adobe-cff brotli bzip2 +cleartype-hinting debug fontforge harfbuzz infinality +png static-libs svg utils"
+
+if [[ "${PV}" != 9999 ]] ; then
+	SRC_URI="mirror://sourceforge/freetype/${P/_/}.tar.xz
+		mirror://nongnu/freetype/${P/_/}.tar.xz
+		utils?	( mirror://sourceforge/freetype/ft2demos-${PV}.tar.xz
+			mirror://nongnu/freetype/ft2demos-${PV}.tar.xz )
+		doc?	( mirror://sourceforge/freetype/${PN}-doc-${PV}.tar.xz
+			mirror://nongnu/freetype/${PN}-doc-${PV}.tar.xz )"
+	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt"
+	IUSE+=" doc"
+else
+	inherit git-r3
+fi
+
+LICENSE="|| ( FTL GPL-2+ )"
+SLOT="2"
+
+RDEPEND="
+	>=sys-libs/zlib-1.2.8-r1[${MULTILIB_USEDEP}]
+	brotli? ( app-arch/brotli[${MULTILIB_USEDEP}] )
+	bzip2? ( >=app-arch/bzip2-1.0.6-r4[${MULTILIB_USEDEP}] )
+	harfbuzz? ( >=media-libs/harfbuzz-1.3.0[truetype,${MULTILIB_USEDEP}] )
+	png? ( >=media-libs/libpng-1.2.51:0=[${MULTILIB_USEDEP}] )
+	utils? (
+		svg? ( >=gnome-base/librsvg-2.46.0[${MULTILIB_USEDEP}] )
+		X? ( >=x11-libs/libX11-1.6.2[${MULTILIB_USEDEP}] )
+	)
+"
+DEPEND="${RDEPEND}"
+BDEPEND="
+	virtual/pkgconfig
+"
+
+PATCHES=(
+	"${FILESDIR}"/${P}-strict-prototypes-clang16.patch
+)
+
+_egit_repo_handler() {
+	if [[ "${PV}" == 9999 ]] ; then
+		local phase="${1}"
+		case ${phase} in
+			fetch|unpack)
+				:;
+			;;
+			*)
+				die "Please use this function with either \"fetch\" or \"unpack\""
+			;;
+		esac
+
+		local EGIT_REPO_URI
+		EGIT_REPO_URI="https://gitlab.freedesktop.org/freetype/freetype.git"
+		git-r3_src_${phase}
+		if use utils ; then
+			EGIT_REPO_URI="https://gitlab.freedesktop.org/freetype/freetype-demos.git"
+			local EGIT_CHECKOUT_DIR="${WORKDIR}/ft2demos-${PV}"
+			git-r3_src_${phase}
+		fi
+	else
+		default
+	fi
+}
+
+pkg_pretend() {
+	if use svg && ! use utils ; then
+		einfo "The \"svg\" USE flag only has effect when the \"utils\" USE flag is also enabled."
+	fi
+}
+
+src_fetch() {
+	_egit_repo_handler ${EBUILD_PHASE}
+}
+
+src_unpack() {
+	_egit_repo_handler ${EBUILD_PHASE}
+
+	if [[ "${PV}" == 9999 ]] ; then
+		# Need to copy stuff from dlg subproject (#758902)
+		local dlg_inc_dir="${S}/subprojects/dlg/include/dlg"
+		local dlg_src_dir="${S}/subprojects/dlg/src/dlg"
+		local dlg_dest_dir="${S}/include"
+		mkdir -p "${dlg_dest_dir}/dlg" || die
+		cp "${dlg_inc_dir}"/{dlg,output}.h "${dlg_dest_dir}/dlg" || die
+		cp "${dlg_src_dir}"/* "${dlg_dest_dir}" || die
+	fi
+}
+
+src_prepare() {
+	if [[ "${PV}" == 9999 ]] ; then
+		# Do NOT automagically mess with submodules!!!
+		sed '/setup: copy_submodule/d' -i builds/toplevel.mk || die
+		# inspired by shipped autogen.sh script
+		eval $(sed -n \
+			-e 's/^#define  *\(FREETYPE_MAJOR\)  *\([0-9][0-9]*\).*/\1=\2/p' \
+			-e 's/^#define  *\(FREETYPE_MINOR\)  *\([0-9][0-9]*\).*/\1=\2/p' \
+			-e 's/^#define  *\(FREETYPE_PATCH\)  *\([0-9][0-9]*\).*/\1=\2/p' \
+			include/freetype/freetype.h || die)
+		FREETYPE="${FREETYPE_MAJOR}.${FREETYPE_MINOR}"
+		[[ "${FREETYPE_PATCH}" != 0 ]] && FREETYPE+=".${FREETYPE_PATCH}"
+		pushd builds/unix &>/dev/null || die
+		sed -e "s;@VERSION@;${FREETYPE};" \
+			< configure.raw > configure.ac || die
+		# eautoheader produces broken ftconfig.in
+		AT_NOEAUTOHEADER="yes" AT_M4DIR="." eautoreconf
+		unset FREETYPE_MAJOR FREETYPE_MINOR FREETYPE_PATCH FREETYPE
+		popd &>/dev/null || die
+	fi
+
+	default
+
+	pushd builds/unix &>/dev/null || die
+	# eautoheader produces broken ftconfig.in
+	AT_NOEAUTOHEADER="yes" AT_M4DIR="." eautoreconf
+	popd &>/dev/null || die
+
+	# This is the same as the 01 patch from infinality
+	sed '/AUX_MODULES += \(gx\|ot\)valid/s@^# @@' -i modules.cfg || die
+
+	enable_option() {
+		sed -i -e "/#define $1/ { s:/\* ::; s: \*/:: }" \
+			include/${PN}/config/ftoption.h \
+			|| die "unable to enable option $1"
+	}
+
+	disable_option() {
+		sed -i -e "/#define $1/ { s:^:/* :; s:$: */: }" \
+			include/${PN}/config/ftoption.h \
+			|| die "unable to disable option $1"
+	}
+
+	# Will be the new default for >=freetype-2.7.0
+	disable_option "TT_CONFIG_OPTION_SUBPIXEL_HINTING  2"
+
+	if use infinality && use cleartype-hinting ; then
+		enable_option "TT_CONFIG_OPTION_SUBPIXEL_HINTING  ( 1 | 2 )"
+	elif use infinality ; then
+		enable_option "TT_CONFIG_OPTION_SUBPIXEL_HINTING  1"
+	elif use cleartype-hinting ; then
+		enable_option "TT_CONFIG_OPTION_SUBPIXEL_HINTING  2"
+	fi
+
+	# Can be disabled with FREETYPE_PROPERTIES="pcf:no-long-family-names=1"
+	# via environment (new since v2.8)
+	enable_option PCF_CONFIG_OPTION_LONG_FAMILY_NAMES
+
+	# See https://freetype.org/patents.html (expired!)
+	enable_option FT_CONFIG_OPTION_SUBPIXEL_RENDERING
+
+	if ! use adobe-cff ; then
+		enable_option CFF_CONFIG_OPTION_OLD_ENGINE
+	fi
+
+	if use debug ; then
+		enable_option FT_DEBUG_LEVEL_TRACE
+		enable_option FT_DEBUG_MEMORY
+	fi
+
+	if use utils ; then
+		cd "${WORKDIR}/ft2demos-${PV}" || die
+		# Disable tests needing X11 when USE="-X". (bug #177597)
+		if ! use X ; then
+			sed -i -e "/EXES\ +=\ ftdiff/ s:^:#:" Makefile || die
+		fi
+		cd "${S}" || die
+	fi
+
+	# bug #869803
+	rm docs/reference/sitemap.xml.gz || die
+
+	# we need non-/bin/sh to run configure
+	if [[ -n ${CONFIG_SHELL} ]] ; then
+		sed -i -e "1s:^#![[:space:]]*/bin/sh:#!${CONFIG_SHELL}:" \
+			"${S}"/builds/unix/configure || die
+	fi
+
+	elibtoolize --patch-only
+}
+
+multilib_src_configure() {
+	append-flags -fno-strict-aliasing
+	type -P gmake &> /dev/null && export GNUMAKE=gmake
+
+	local myeconfargs=(
+		--disable-freetype-config
+		--enable-shared
+		--with-zlib
+		$(use_with brotli)
+		$(use_with bzip2)
+		$(use_with harfbuzz)
+		$(use_with png)
+		$(use_enable static-libs static)
+		$(usex utils $(use_with svg librsvg) --without-librsvg)
+
+		# avoid using libpng-config
+		LIBPNG_CFLAGS="$($(tc-getPKG_CONFIG) --cflags libpng)"
+		LIBPNG_LDFLAGS="$($(tc-getPKG_CONFIG) --libs libpng)"
+	)
+
+	case ${CHOST} in
+		mingw*|*-mingw*) ;;
+		# Workaround windows mis-detection: bug #654712
+		# Have to do it for both ${CHOST}-windres and windres
+		*) myeconfargs+=( ac_cv_prog_RC= ac_cv_prog_ac_ct_RC= ) ;;
+	esac
+
+	export CC_BUILD="$(tc-getBUILD_CC)"
+
+	ECONF_SOURCE="${S}" econf "${myeconfargs[@]}"
+}
+
+multilib_src_compile() {
+	default
+
+	if multilib_is_native_abi && use utils ; then
+		einfo "Building utils"
+		# fix for Prefix, bug #339334
+		emake \
+			X11_PATH="${EPREFIX}/usr/$(get_libdir)" \
+			FT2DEMOS=1 TOP_DIR_2="${WORKDIR}/ft2demos-${PV}"
+	fi
+}
+
+multilib_src_install() {
+	default
+
+	if multilib_is_native_abi && use utils ; then
+		einfo "Installing utils"
+		emake DESTDIR="${D}" FT2DEMOS=1 \
+			TOP_DIR_2="${WORKDIR}/ft2demos-${PV}" install
+	fi
+}
+
+multilib_src_install_all() {
+	if use fontforge ; then
+		# Probably fontforge needs less but this way makes things simplier...
+		einfo "Installing internal headers required for fontforge"
+		local header
+		find src/truetype include/freetype/internal -name '*.h' | \
+		while read header ; do
+			mkdir -p "${ED}/usr/include/freetype2/internal4fontforge/$(dirname ${header})" || die
+			cp ${header} "${ED}/usr/include/freetype2/internal4fontforge/$(dirname ${header})" || die
+		done
+	fi
+
+	dodoc docs/{CHANGES,CUSTOMIZE,DEBUG,INSTALL.UNIX,*.txt,PROBLEMS,TODO}
+	if [[ "${PV}" != 9999 ]] && use doc ; then
+		docinto html
+		dodoc -r docs/*
+	fi
+
+	find "${ED}" -type f -name '*.la' -delete || die
+}
diff --git a/media-libs/freetype/freetype-9999.ebuild b/media-libs/freetype/freetype-9999.ebuild
index 011cc4310aba..4b80a7e3b439 100644
--- a/media-libs/freetype/freetype-9999.ebuild
+++ b/media-libs/freetype/freetype-9999.ebuild
@@ -3,11 +3,11 @@
 
 EAPI=8
 
-inherit flag-o-matic libtool multilib-build multilib-minimal toolchain-funcs
+inherit autotools flag-o-matic libtool multilib-build multilib-minimal toolchain-funcs
 
 DESCRIPTION="High-quality and portable font engine"
 HOMEPAGE="https://www.freetype.org/"
-IUSE="X +adobe-cff brotli bzip2 +cleartype-hinting debug fontforge harfbuzz infinality +png static-libs utils"
+IUSE="X +adobe-cff brotli bzip2 +cleartype-hinting debug fontforge harfbuzz infinality +png static-libs svg utils"
 
 if [[ "${PV}" != 9999 ]] ; then
 	SRC_URI="mirror://sourceforge/freetype/${P/_/}.tar.xz
@@ -16,10 +16,10 @@ if [[ "${PV}" != 9999 ]] ; then
 			mirror://nongnu/freetype/ft2demos-${PV}.tar.xz )
 		doc?	( mirror://sourceforge/freetype/${PN}-doc-${PV}.tar.xz
 			mirror://nongnu/freetype/${PN}-doc-${PV}.tar.xz )"
-	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt"
+	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt"
 	IUSE+=" doc"
 else
-	inherit autotools git-r3
+	inherit git-r3
 fi
 
 LICENSE="|| ( FTL GPL-2+ )"
@@ -32,17 +32,18 @@ RDEPEND="
 	harfbuzz? ( >=media-libs/harfbuzz-1.3.0[truetype,${MULTILIB_USEDEP}] )
 	png? ( >=media-libs/libpng-1.2.51:0=[${MULTILIB_USEDEP}] )
 	utils? (
-		X? (
-			>=x11-libs/libX11-1.6.2[${MULTILIB_USEDEP}]
-			>=x11-libs/libXau-1.0.7-r1[${MULTILIB_USEDEP}]
-			>=x11-libs/libXdmcp-1.1.1-r1[${MULTILIB_USEDEP}]
-		)
-	)"
+		svg? ( >=gnome-base/librsvg-2.46.0[${MULTILIB_USEDEP}] )
+		X? ( >=x11-libs/libX11-1.6.2[${MULTILIB_USEDEP}] )
+	)
+"
 DEPEND="${RDEPEND}"
 BDEPEND="
 	virtual/pkgconfig
 "
 
+PATCHES=(
+)
+
 _egit_repo_handler() {
 	if [[ "${PV}" == 9999 ]] ; then
 		local phase="${1}"
@@ -68,6 +69,12 @@ _egit_repo_handler() {
 	fi
 }
 
+pkg_pretend() {
+	if use svg && ! use utils ; then
+		einfo "The \"svg\" USE flag only has effect when the \"utils\" USE flag is also enabled."
+	fi
+}
+
 src_fetch() {
 	_egit_repo_handler ${EBUILD_PHASE}
 }
@@ -109,6 +116,11 @@ src_prepare() {
 
 	default
 
+	pushd builds/unix &>/dev/null || die
+	# eautoheader produces broken ftconfig.in
+	AT_NOEAUTOHEADER="yes" AT_M4DIR="." eautoreconf
+	popd &>/dev/null || die
+
 	# This is the same as the 01 patch from infinality
 	sed '/AUX_MODULES += \(gx\|ot\)valid/s@^# @@' -i modules.cfg || die
 
@@ -185,6 +197,7 @@ multilib_src_configure() {
 		$(use_with harfbuzz)
 		$(use_with png)
 		$(use_enable static-libs static)
+		$(usex utils $(use_with svg librsvg) --without-librsvg)
 
 		# avoid using libpng-config
 		LIBPNG_CFLAGS="$($(tc-getPKG_CONFIG) --cflags libpng)"
diff --git a/media-libs/harfbuzz/Manifest b/media-libs/harfbuzz/Manifest
index 36a77e5ee713..397be560af39 100644
--- a/media-libs/harfbuzz/Manifest
+++ b/media-libs/harfbuzz/Manifest
@@ -1,3 +1,4 @@
+AUX harfbuzz-5.3.1-meson-freetype-icu.patch 5077 BLAKE2B e8eee50d555f7d12b374885e56d946b6283b2a041c4aa0d42bbb0463eca6a039aaef329ca9900f939dbc8a8797784d4e1719be3717e07c1d101827c11ce7f70d SHA512 5a6e3eb18153b87610c0cd14cefb4decf23183b4bebe439edacd3f61d3cfebb0863727dab395aef8bbd38264bf2e741181d0949c78b89cfdb353eb6fa08586cc
 DIST harfbuzz-4.4.1.tar.gz 29231251 BLAKE2B 3947084ea2eedd76d64acfc5286ecd14d772ce0507163bc2c54a86579556a8799959ff4d47ea2919ee8472f8fe50d0266d325e3d0a7024f2ae8dcdf48d14f37e SHA512 bbc415d7b74408b1e8d34bfbc19a3cab002471fdd56d71b469c3129f0eae5532d5c7aaae7bb5cc3942fea6008d2ed9e96a7b20b10f4f5e46db63cecfa5c0248e
 DIST harfbuzz-5.1.0.tar.gz 29358116 BLAKE2B 006e66e9c76b505214b948c7c8756af38171b85cc865923e4665a4dd3eb14d89d20456ad4490b11208d57d056b087da78e1742141e41f8a22e644f20d3ea4851 SHA512 bdd7c2ca0b6f2a3a3fffbf0324d3c8bfd64a1753314048f6f67f901d4098e90054eeda9155d134f03c5d3ddefb15e087f872d2d87b2ace07bac6625fb43c7f3e
 DIST harfbuzz-5.3.0.tar.xz 17921224 BLAKE2B a220c1d4912487012f30942280651bcb63b5109e49be778a210bf26f4a0bcc7dc5ab7247775286b75cbe5b8fad7c439ae420d2085c6719088f028679242f9269 SHA512 0eae94769ac0157bf1df9b001223b30d40104ac448b1062f34ac793edb27ed1e459ac99954498c4b3cfb65c8cda29f2214a300f11523826b378ab67deec1a5f3
@@ -5,6 +6,7 @@ DIST harfbuzz-5.3.1.tar.xz 17874260 BLAKE2B e4d3926daca4f5c95441a9b99e10acd4b95b
 EBUILD harfbuzz-4.4.1.ebuild 2568 BLAKE2B 7e139034f21f106e2d3df102161487d788b49e6f52d2d109a922c0d38a9821fe090f71f5d844e04f495e16c69328b5b75c37dfd2faa05d1e120b19f4ccca66dd SHA512 0548def0efedc11cf90c9b57090e835a2f83a9e7f5b679166c04c16fc011dcf7919d5399c0ccbff1c7c8371c2480771d7a92da60573c3aa530e451cf5c2726c3
 EBUILD harfbuzz-5.1.0.ebuild 2574 BLAKE2B 2793ad1bf84ab388d2d5efddb74cd1431e2d4db4789273314e1824fd8c9fff9ea3f1489253b15703295fb46fd8509712cdd3cafe1a9e3aa07d2d9d9170bdd022 SHA512 80cd15636bc586ff84796bd0fb2d4b4b607e94335ad7eb83f6901164f4236c1cbb5db0533532b500638f25eb615da725ffd82aab5dc2cfdef50432597c1cf62d
 EBUILD harfbuzz-5.3.0.ebuild 2588 BLAKE2B f1a74063855a9437e2b3ff5322d03ef90bb6432721cb223373a8a088362db51f9819ea09179f2a7e1ee2b23ed783b8daebca8f689044d89f86ef1f114ad3fbae SHA512 398bc8ba0dd4f9b04157e7b842bbd6f2c7ea51699a47249192e5c31f78167eaa47bd1cc9c9cbb56ef7ead2626a754f2ef75124aea14d59cd5f4f701c8589b879
+EBUILD harfbuzz-5.3.1-r1.ebuild 2646 BLAKE2B 0132fbdda5e3d2e6f245fc2219d3153c3bb496139d73ad393002e9074a3a1f379bae8bccb4977007b59e160db903c6af52566539f4e0bf663d530a142fac2da6 SHA512 6975a84b548a031b5b143f0bb66effabb8dc09e4199b820e7e1c4adf0ef3be03298362bc1fd0a25924747a721b281fb92750ac24ee0d8e79b2f246e0bdc88b2f
 EBUILD harfbuzz-5.3.1.ebuild 2582 BLAKE2B 578a1f1d8d3e252587ec45d6b7bc07a78bb0284647226d3160ebb1a38f0e276579bc333038c7cd3bffb3bc9eae1aa5b1c6308ce1a51678bf2966bb7e3aa1a29c SHA512 d799301c05dfdaa20a10cc8c179240feec5bface78d3aec751cfe27e4066ddfb5b0d1ff1575928fde7f53599312d7ab35b4d04d3c90a23643a237bebfe9ea6d7
 EBUILD harfbuzz-9999.ebuild 2588 BLAKE2B f1a74063855a9437e2b3ff5322d03ef90bb6432721cb223373a8a088362db51f9819ea09179f2a7e1ee2b23ed783b8daebca8f689044d89f86ef1f114ad3fbae SHA512 398bc8ba0dd4f9b04157e7b842bbd6f2c7ea51699a47249192e5c31f78167eaa47bd1cc9c9cbb56ef7ead2626a754f2ef75124aea14d59cd5f4f701c8589b879
 MISC metadata.xml 763 BLAKE2B cb8679b8a67d692c73f1dc48facf6a98a442d34b51a90b2236070919b737d22e38a15babe5847cf4d30d4630c66d803f9d6e684c5e8b8b87a199d5d471a9e35c SHA512 0d87926c3e7a475bc84859d630cc8ed1b62e5766856e15b9aa74c87b5fd22345a9c05951508ccecadbea3513afdfd2244b1dbfbec8b41022d413a1401701e55e
diff --git a/media-libs/harfbuzz/files/harfbuzz-5.3.1-meson-freetype-icu.patch b/media-libs/harfbuzz/files/harfbuzz-5.3.1-meson-freetype-icu.patch
new file mode 100644
index 000000000000..3e0a7beece9c
--- /dev/null
+++ b/media-libs/harfbuzz/files/harfbuzz-5.3.1-meson-freetype-icu.patch
@@ -0,0 +1,120 @@
+https://bugs.gentoo.org/880479
+https://bugs.gentoo.org/880405
+https://github.com/harfbuzz/harfbuzz/pull/3870
+
+From 2c14943fb06ffd6de4e270454501ff5d305ede6e Mon Sep 17 00:00:00 2001
+From: Eli Schwartz <eschwartz93@gmail.com>
+Date: Tue, 8 Nov 2022 16:24:08 -0500
+Subject: [PATCH] meson: fix regression in detecting freetype2/icu-uc when
+ explicitly disabled
+
+In #3811 / commit 53a194aa3f5f7de0b40e879e41fcbe0de6e9fefe a broken and
+half-implemented approach to kind of sort of handling the detection of
+both pkg-config and cmake names for dependencies, was implemented. It
+just checked for both versions with required: false, but when the build
+was configured with *disabled* options, it was still found because it
+was treated as auto.
+
+Really, the problem here is trying to outsmart Meson, which handles a
+lot of edge cases correctly. But it's possible, albeit very wordy, to
+manually implement Meson's internal logic via if/else fallbacks. Do so
+here.
+--- a/meson.build
++++ b/meson.build
+@@ -83,20 +83,35 @@ check_funcs = [
+ 
+ m_dep = cpp.find_library('m', required: false)
+ 
+-
+-# Try pkgconfig name
+-freetype_dep = dependency('freetype2', required: false)
+-if not freetype_dep.found()
+-  # Try cmake name
+-  freetype_dep = dependency('freetype', required: false)
+-endif
+-if not freetype_dep.found()
+-  # Subproject fallback, `allow_fallback: true` means the fallback will be
+-  # tried even if the freetype option is set to `auto`.
+-  freetype_dep = dependency('freetype2',
++if meson.version().version_compare('>=0.60.0')
++  # pkg-config: freetype2, cmake: Freetype
++  freetype_dep = dependency('freetype2', 'Freetype',
+                             required: get_option('freetype'),
+                             default_options: ['harfbuzz=disabled'],
+                             allow_fallback: true)
++else
++  # painful hack to handle multiple dependencies but also respect options
++  freetype_opt = get_option('freetype')
++  # we want to handle enabled manually after fallbacks, but also handle disabled normally
++  if freetype_opt.enabled()
++    freetype_opt = false
++  endif
++  # try pkg-config name
++  freetype_dep = dependency('freetype2', method: 'pkg-config', required: freetype_opt)
++  # when disabled, leave it not-found
++  if not freetype_dep.found() and not get_option('freetype').disabled()
++    # Try cmake name
++    freetype_dep = dependency('Freetype', method: 'cmake', required: false)
++    # Subproject fallback, `allow_fallback: true` means the fallback will be
++    # tried even if the freetype option is set to `auto`.
++    if not freetype_dep.found()
++      freetype_dep = dependency('freetype2',
++                                method: 'pkg-config',
++                                required: get_option('freetype'),
++                                default_options: ['harfbuzz=disabled'],
++                                allow_fallback: true)
++    endif
++  endif
+ endif
+ 
+ glib_dep = dependency('glib-2.0', required: get_option('glib'))
+@@ -104,18 +119,36 @@ gobject_dep = dependency('gobject-2.0', required: get_option('gobject'))
+ graphite2_dep = dependency('graphite2', required: get_option('graphite2'))
+ graphite_dep = dependency('graphite2', required: get_option('graphite'))
+ 
+-# Try pkgconfig name
+-icu_dep = dependency('icu-uc', required: false)
+-if not icu_dep.found()
+-  # Try cmake name
+-  icu_dep = dependency('ICU',
+-                       required: false,
+-                       components: 'uc',
+-                       method: 'cmake')
+-endif
+-if not icu_dep.found()
+-  # Subproject fallback if icu option is enabled
+-  icu_dep = dependency('icu-uc', required: get_option('icu'))
++if meson.version().version_compare('>=0.60.0')
++  # pkg-config: icu-uc, cmake: ICU but with components
++  icu_dep = dependency('icu-uc', 'ICU',
++                            components: 'uc',
++                            required: get_option('icu'),
++                            default_options: ['harfbuzz=disabled'],
++                            allow_fallback: true)
++else
++  # painful hack to handle multiple dependencies but also respect options
++  icu_opt = get_option('icu')
++  # we want to handle enabled manually after fallbacks, but also handle disabled normally
++  if icu_opt.enabled()
++    icu_opt = false
++  endif
++  # try pkg-config name
++  icu_dep = dependency('icu-uc', method: 'pkg-config', required: icu_opt)
++  # when disabled, leave it not-found
++  if not icu_dep.found() and not get_option('icu').disabled()
++    # Try cmake name
++    icu_dep = dependency('ICU', method: 'cmake', components: 'uc', required: false)
++    # Try again with subproject fallback. `allow_fallback: true` means the
++    # fallback will be tried even if the icu option is set to `auto`, but
++    # we cannot pass this option until Meson 0.59.0, because no wrap file
++    # is checked into git.
++    if not icu_dep.found()
++      icu_dep = dependency('icu-uc',
++                           method: 'pkg-config',
++                           required: get_option('icu'))
++    endif
++  endif
+ endif
+ 
+ if icu_dep.found() and icu_dep.type_name() == 'pkgconfig'
+
diff --git a/media-libs/harfbuzz/harfbuzz-5.3.1-r1.ebuild b/media-libs/harfbuzz/harfbuzz-5.3.1-r1.ebuild
new file mode 100644
index 000000000000..fe93f48bc581
--- /dev/null
+++ b/media-libs/harfbuzz/harfbuzz-5.3.1-r1.ebuild
@@ -0,0 +1,104 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{8..11} )
+
+inherit flag-o-matic meson-multilib python-any-r1 xdg-utils
+
+DESCRIPTION="An OpenType text shaping engine"
+HOMEPAGE="https://www.freedesktop.org/wiki/Software/HarfBuzz"
+
+if [[ ${PV} = 9999 ]] ; then
+	EGIT_REPO_URI="https://github.com/harfbuzz/harfbuzz.git"
+	inherit git-r3
+else
+	SRC_URI="https://github.com/harfbuzz/harfbuzz/releases/download/${PV}/${P}.tar.xz"
+	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+fi
+
+LICENSE="Old-MIT ISC icu"
+# 0.9.18 introduced the harfbuzz-icu split; bug #472416
+# 3.0.0 dropped some unstable APIs; bug #813705
+SLOT="0/4.0.0"
+
+IUSE="+cairo debug doc experimental +glib +graphite icu +introspection test +truetype"
+RESTRICT="!test? ( test )"
+REQUIRED_USE="introspection? ( glib )"
+
+RDEPEND="
+	cairo? ( x11-libs/cairo:= )
+	glib? ( >=dev-libs/glib-2.38:2[${MULTILIB_USEDEP}] )
+	graphite? ( >=media-gfx/graphite2-1.2.1:=[${MULTILIB_USEDEP}] )
+	icu? ( >=dev-libs/icu-51.2-r1:=[${MULTILIB_USEDEP}] )
+	introspection? ( >=dev-libs/gobject-introspection-1.34:= )
+	truetype? ( >=media-libs/freetype-2.5.0.1:2=[${MULTILIB_USEDEP}] )
+"
+DEPEND="${RDEPEND}
+	>=dev-libs/gobject-introspection-common-1.34
+"
+BDEPEND="
+	${PYTHON_DEPS}
+	virtual/pkgconfig
+	doc? ( dev-util/gtk-doc )
+	introspection? ( dev-util/glib-utils )
+"
+
+PATCHES=(
+	"${FILESDIR}"/${P}-meson-freetype-icu.patch
+)
+
+pkg_setup() {
+	python-any-r1_pkg_setup
+	if ! use debug ; then
+		append-cppflags -DHB_NDEBUG
+	fi
+}
+
+src_prepare() {
+	default
+
+	xdg_environment_reset
+
+	# bug #726120
+	sed -i \
+		-e '/tests\/macos\.tests/d' \
+		test/shape/data/in-house/Makefile.sources \
+		|| die
+
+	# bug #618772
+	append-cxxflags -std=c++14
+
+	# bug #790359
+	filter-flags -fexceptions -fthreadsafe-statics
+
+	# bug #762415
+	local pyscript
+	for pyscript in $(find -type f -name "*.py") ; do
+		python_fix_shebang -q "${pyscript}"
+	done
+}
+
+multilib_src_configure() {
+	# harfbuzz-gobject only used for introspection, bug #535852
+	local emesonargs=(
+		-Dcoretext="disabled"
+		-Dchafa="disabled"
+
+		$(meson_feature glib)
+		$(meson_feature graphite graphite2)
+		$(meson_feature icu)
+		$(meson_feature introspection gobject)
+		$(meson_feature test tests)
+		$(meson_feature truetype freetype)
+
+		$(meson_native_use_feature cairo)
+		$(meson_native_use_feature doc docs)
+		$(meson_native_use_feature introspection)
+
+		$(meson_use experimental experimental_api)
+	)
+
+	meson_src_configure
+}
diff --git a/media-libs/sdl-image/Manifest b/media-libs/sdl-image/Manifest
index 1aae0ac7bc02..cb55e205dde2 100644
--- a/media-libs/sdl-image/Manifest
+++ b/media-libs/sdl-image/Manifest
@@ -1,3 +1,3 @@
 DIST SDL_image-1.2.12_p20210314.tar.gz 10890897 BLAKE2B ddc3e0a49e4ce8fc3c46c5dabe277f9bd2db81f43880aadc8fbd3b6fa09254669fdac90ee4c3c7b92d5c7ec97747944c3953ea2dca065e646416391730cb22dd SHA512 f087472593cbaa9e65c5d643d7801e2ff5e49bee66502d8c094ea18bcd5f66e6da153d39bff7bc81ed20556c909fc4cce279275ff55ee00aebf07d39c27fd543
-EBUILD sdl-image-1.2.12_p20210314.ebuild 1691 BLAKE2B 2902fd64c3c900456501d516f5bf1964867aa038b26bbf475d04ac23a81506ff16449d5fe1004215c7aa29dc3ee01c7b3a784307eb3204201a7a5a44d8d6ac59 SHA512 cc199e3bfb7f7ebfa84c25fdf247dc2cd89d6b740c97a91eceb9f191ba78a46758306db3805efadfe37ad2b64952d123fbed815143bc8c42d58a58732108d1f3
-MISC metadata.xml 254 BLAKE2B 4e6c8e1f126f76233a38aba6f5388488656795cb1d7d4767ccb1349772f5e78d59fc5663d4f1933dbe4633c2fbb90cd1d42d4b4d4f5ededc53653e7df13c7187 SHA512 2b82da849e3b0dec378f3fb497014f5d1dbc7aceb8a1f9d1638e83fe69448b1c5151eb4b1187154d828e4a296609ce5125b40977b2581d95b5588e353ca75135
+EBUILD sdl-image-1.2.12_p20210314.ebuild 1853 BLAKE2B 5bc24961cf0fc3761bc2b46063efab70291846113d8df52b7e0b06ac75439bb69be7d615a823b7e6f931ea294e9a596c91830a9e33e0a66b081aa983d33797d1 SHA512 9732a99c744d03622e1b4ceb908514d97ac3cf4e8f19a31bd9900ded8a7713e301ff028bf423914e3787e4dd4778e188c9faf43b2b45a5c74758c2ffb42a09fe
+MISC metadata.xml 365 BLAKE2B e7adf1771a0e52171d5ace8c77b8fb4b65019796c885f279e813b22f5a1abbefcee1fa9189a479788db4e5d1d2b96cf61f79e6881c816a19f0270fb69521e8d6 SHA512 80cc2d8d6af06bd4a43448c91747a2f04c477a59e19c9b46007b444c949e60664c26b8dc51755b67d7dfbd13a218b4126301f10fa3074d65740a8bfc7a0fe477
diff --git a/media-libs/sdl-image/metadata.xml b/media-libs/sdl-image/metadata.xml
index 7c730d47817a..b9962e96bc14 100644
--- a/media-libs/sdl-image/metadata.xml
+++ b/media-libs/sdl-image/metadata.xml
@@ -5,4 +5,8 @@
 		<email>games@gentoo.org</email>
 		<name>Gentoo Games Project</name>
 	</maintainer>
+	<upstream>
+		<!-- SDL-1.2 branch -->
+		<remote-id type="github">libsdl-org/SDL_image</remote-id>
+	</upstream>
 </pkgmetadata>
diff --git a/media-libs/sdl-image/sdl-image-1.2.12_p20210314.ebuild b/media-libs/sdl-image/sdl-image-1.2.12_p20210314.ebuild
index 3fe9ea4a9024..16f9cc515aad 100644
--- a/media-libs/sdl-image/sdl-image-1.2.12_p20210314.ebuild
+++ b/media-libs/sdl-image/sdl-image-1.2.12_p20210314.ebuild
@@ -1,7 +1,12 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
+
+# We may want to grab backports from the SDL-1.2 branch upstream or
+# or take new snapshots every so often as no SDL 1 / 1.2.x releases
+# will be made anymore.
+
 inherit toolchain-funcs multilib-minimal
 
 MY_P="${P/sdl-/SDL_}"
diff --git a/media-libs/sdl-mixer/Manifest b/media-libs/sdl-mixer/Manifest
index c7eb7eb7b902..960c3c1f6be7 100644
--- a/media-libs/sdl-mixer/Manifest
+++ b/media-libs/sdl-mixer/Manifest
@@ -1,9 +1,11 @@
 AUX sdl-mixer-1.2.12-Fix-compiling-against-libmodplug-0.8.8.5.patch 553 BLAKE2B 9967bfa5cabffe68691fbb1002d01dafb14626596bc3fe0e15dcfd159dca4e542eb3998b08376b24870150beae7927fa3be7822cb9b68ad443544345a042cd6c SHA512 c411f372a817696838ef590db21579da96ca4f7f3170fdd6497ab204c3058138023d89ef379c810b8675091ae9e8c15bc3681085ca56a026cc1d3d22fdbef687
 AUX sdl-mixer-1.2.12-clang.patch 276 BLAKE2B 242e261861bab476d7f83148fc265daee990965cad8c3247dcf7e9e28e6b3aa9b2f491ac51c3517e3db4ab043ac8f8a118ca18c170f826f200df757de303e8db SHA512 2f318a73991783c75b32d05c9f81a42a7fd145a9d78e1cef00d1f2184f7c498e4c0a5a578bd2866315a940af76d4296de660ee94488530815694b7524d1d452e
+AUX sdl-mixer-1.2.12-incompatible-func-clang16.patch 2381 BLAKE2B 30fbae0d2453b67a8e263f970658b9ec309bbb476900b5187a571cf74224bc162e8174b20350615d55facfba13e0071b890334b002d4651157a6ca0b284fb21b SHA512 2d71a48566997eaa693b375f9a1e5136cf0cf14aea6545203c7d13685efca0851a26a2da407c7ad351e80554b7a435f9e0182c497a7d4d2c3a4e3e5a21e5099f
 AUX sdl-mixer-1.2.12-mikmod-r587.patch 1416 BLAKE2B b353de5432714f3968c5f69ff4397cd3fd284f2f39102879f5cf4956603075ba79cf0753822a8cbdcf4d1196ac9839f59211e0128bf97c0a1f36f00e70cc7682 SHA512 64ad577331eceea0eb060d0c2b333b664d4edb62cb3336f97b53e5c88f6b4ecdc4004136fef0461cdf999b282064b5809e79308591239bfafbdc3df8360bf123
 AUX sdl-mixer-1.2.12-mikmod-r588.patch 1128 BLAKE2B cc6ff884b3e157064a583d64adf978a091c7786a3c5417c5efd911f80407d30c866c527400122866bcffea25ab645533ae8e972834a2085a4bd8563ef5e8607b SHA512 36bbc5d10a63a73b7860a6f381a88849cc465dcabbfe3db21d6bd156110eb01e03e8369f0ed234f72f0227566919f5f823d0350d431575f0ae0f2a4b244cf704
 AUX sdl-mixer-1.2.12-parallel-build-slibtool.patch 4288 BLAKE2B 3beaeddf4e3ff97dc2778dfc79f800b3749a0b0fa511872f353587a3e01ded1cdc9c57c3a89cb3e1a6a34d6848b19aaacba5a2a81c3129906f521c2afc71e2c0 SHA512 b6e42b2ee43b57a3a4f3e8b47b96aa5d94b37f0326cbecca7128eb8b34f0ac00dded506a4d5164156ca23cf1aeaca6aa92f40ec43991fa73a97274a2262fe679
 AUX sdl-mixer-1.2.12-wav.patch 796 BLAKE2B a0b310db2b789d24fd60927d23859582a8ab1449ba0934e10abdd1361a0d92fb5925625d9c3a0885f812dde12af9931cbae06c652b51e76d18759db03cacfc2a SHA512 9fed330d6bcae546752434a0ea29168e2a8fa432c8670d7290e70905f3431746b15126e5ce05820e4dd4dd09c982c880a6ce901ab9b3cff298e7f2c8d6a8b491
 DIST SDL_mixer-1.2.12.tar.gz 3707781 BLAKE2B b2fa822204fdaad860ff30307120bff7badbcc042d0b891563973794f715099aa961983e0dbf7e3d936179cbc615517c268f01f4619fcdcd48f18ff66dc49bd1 SHA512 230f6c5a73f4bea364f8aa3d75f76694305571dea45f357def742b2b50849b2d896af71e08689981207edc99a9836088bee2d0bd98d92c7f4ca52b12b3d8cf96
-EBUILD sdl-mixer-1.2.12-r5.ebuild 3438 BLAKE2B bbc1c4b67af067f344be5fb91c72b610065916a5f0a66362049a16cdd813532b0a93d525d25e695b1c8f2fd5b14bdd3b9f4a3ddea7d8e0ffd0520b6bc27f9fde SHA512 c7e8022f9960b8ae369805e62c55b2bec8c6c078f37427c94d44f014303cae0e463ca0218bc919ffb9554e7101f809665b659c91f1d2ba54f86883c9ec21ba53
-MISC metadata.xml 664 BLAKE2B 95d73b3e7ecc6b155cfad0d5043b63e245ccae5666b80d7ca6acccc71df7c1e76def7ede91a0bfd87b4084a14d3a7b2407a6f5ab537e619ed3cc32c5658248db SHA512 c8d112e07ceaa7c3ca71f023147024ead1fbda761fbb290fa5c1e7a76d17de48a69a8a4859e19df7ac5e36f08bc42805df768bcfe81f3c06afca0d00173cd46a
+EBUILD sdl-mixer-1.2.12-r5.ebuild 3601 BLAKE2B f51bbe3d0cc2c60b47ddf3626a07b45bbfcc5334adf4f1fef0d6fd681b9fac44d47e3e879397329355539288c6d983cc31a600f9e9c4403143688c221e1df881 SHA512 dd3969be4a66304acbf4366dfd387a00ae4558ad7d595f62c7e7790d6206be5fede4ae807abec8a5baaa9484c98b158e5431f4c663306bf6f120cd4b25aefcce
+EBUILD sdl-mixer-1.2.12-r6.ebuild 3660 BLAKE2B 8b140bae4093ad4cfb2d8f69890ec72735e20037033a17fbacb889e749e61d609bb3b252cfa58edb77dbf6d0f3413e6389d70ce5a1b50096606c7cba67274c30 SHA512 570cfd9dce65dfe49f1303d89a0eeb1e6ffb6c0582fd144b1900f274068bae76a9c7e52c04e2c5e80913f862df7deebde79f46696e966641389782c722b7bc3f
+MISC metadata.xml 787 BLAKE2B 4a9a04b0b88ec853de52f1cc7f6ad63e6bd4e5a421906daa2e0935c32d756538ef9aee8631e5be96665dd37ec6c4e47d256e30b01f7cc6ca56f29baaaa5ef27d SHA512 46520c6a56e9d6ff2137e71bf728349ed167f7ec10417345528e6da051e482b3a27158e46ae973d1bd0f348cac9e3f65e8a02eef984b8e00fbb2aced256ad2bd
diff --git a/media-libs/sdl-mixer/files/sdl-mixer-1.2.12-incompatible-func-clang16.patch b/media-libs/sdl-mixer/files/sdl-mixer-1.2.12-incompatible-func-clang16.patch
new file mode 100644
index 000000000000..0f104d5d6ffe
--- /dev/null
+++ b/media-libs/sdl-mixer/files/sdl-mixer-1.2.12-incompatible-func-clang16.patch
@@ -0,0 +1,64 @@
+https://github.com/libsdl-org/SDL_mixer/commit/03bd4ca6aa38c1a382c892cef86296cd621ecc1d
+https://github.com/libsdl-org/SDL_mixer/commit/9e6d7b67a00656a68ea0c2eace75c587871549b9
+https://github.com/libsdl-org/SDL_mixer/commit/d28cbc34d63dd20b256103c3fe506ecf3d34d379
+
+From 03bd4ca6aa38c1a382c892cef86296cd621ecc1d Mon Sep 17 00:00:00 2001
+From: Ozkan Sezer <sezeroz@gmail.com>
+Date: Sun, 7 Oct 2018 10:15:50 +0300
+Subject: [PATCH] backported a warning fix. (from 2.0 branch commit
+ 6fa075aa693e).
+
+---
+ dynamic_ogg.h | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/dynamic_ogg.h b/dynamic_ogg.h
+index 822458d4..8eb91656 100644
+--- a/dynamic_ogg.h
++++ b/dynamic_ogg.h
+@@ -31,7 +31,7 @@ typedef struct {
+ 	void *handle;
+ 	int (*ov_clear)(OggVorbis_File *vf);
+ 	vorbis_info *(*ov_info)(OggVorbis_File *vf,int link);
+-	int (*ov_open_callbacks)(void *datasource, OggVorbis_File *vf, char *initial, long ibytes, ov_callbacks callbacks);
++	int (*ov_open_callbacks)(void *datasource, OggVorbis_File *vf, const char *initial, long ibytes, ov_callbacks callbacks);
+ 	ogg_int64_t (*ov_pcm_total)(OggVorbis_File *vf,int i);
+ #ifdef OGG_USE_TREMOR
+ 	long (*ov_read)(OggVorbis_File *vf,char *buffer,int length, int *bitstream);
+
+From 9e6d7b67a00656a68ea0c2eace75c587871549b9 Mon Sep 17 00:00:00 2001
+From: Ozkan Sezer <sezeroz@gmail.com>
+Date: Sun, 7 Oct 2018 12:41:20 +0300
+Subject: [PATCH] fixed a warning after commit cb08fb0976e6
+
+--- a/dynamic_ogg.c
++++ b/dynamic_ogg.c
+@@ -52,7 +52,7 @@ int Mix_InitOgg()
+ 			return -1;
+ 		}
+ 		vorbis.ov_open_callbacks =
+-			(int (*)(void *, OggVorbis_File *, char *, long, ov_callbacks))
++			(int (*)(void *, OggVorbis_File *, const char *, long, ov_callbacks))
+ 			SDL_LoadFunction(vorbis.handle, "ov_open_callbacks");
+ 		if ( vorbis.ov_open_callbacks == NULL ) {
+ 			SDL_UnloadObject(vorbis.handle);
+
+From d28cbc34d63dd20b256103c3fe506ecf3d34d379 Mon Sep 17 00:00:00 2001
+From: Ozkan Sezer <sezeroz@gmail.com>
+Date: Mon, 25 Nov 2019 03:28:02 +0300
+Subject: [PATCH] dynamic_ogg.c: fixed ov_time_seek() signature for
+ libvorbisidec.
+
+reported by Vitaly Novichkov.
+--- a/dynamic_ogg.c
++++ b/dynamic_ogg.c
+@@ -78,7 +78,7 @@ int Mix_InitOgg()
+ 		}
+ 		vorbis.ov_time_seek =
+ #ifdef OGG_USE_TREMOR
+-			(long (*)(OggVorbis_File *,ogg_int64_t))
++			(int (*)(OggVorbis_File *,ogg_int64_t))
+ #else
+ 			(int (*)(OggVorbis_File *,double))
+ #endif
+
diff --git a/media-libs/sdl-mixer/metadata.xml b/media-libs/sdl-mixer/metadata.xml
index e21b7d3404e3..164919840177 100644
--- a/media-libs/sdl-mixer/metadata.xml
+++ b/media-libs/sdl-mixer/metadata.xml
@@ -1,16 +1,20 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<maintainer type="project">
- <email>games@gentoo.org</email>
- <name>Gentoo Games Project</name>
-</maintainer>
-<use>
- <flag name="fluidsynth">Use <pkg>media-sound/fluidsynth</pkg> for MIDI support</flag>
- <flag name="midi">basic support for MIDI files</flag>
- <flag name="mod">basic support for MOD files</flag>
- <flag name="playtools">Install playwave and playmus tools (useful for testing)</flag>
- <flag name="smpeg">Use <pkg>media-libs/smpeg</pkg> for MP3 support</flag>
- <flag name="wav">support WAVE files</flag>
-</use>
+	<maintainer type="project">
+		<email>games@gentoo.org</email>
+		<name>Gentoo Games Project</name>
+	</maintainer>
+	<use>
+		<flag name="fluidsynth">Use <pkg>media-sound/fluidsynth</pkg> for MIDI support</flag>
+		<flag name="midi">basic support for MIDI files</flag>
+		<flag name="mod">basic support for MOD files</flag>
+		<flag name="playtools">Install playwave and playmus tools (useful for testing)</flag>
+		<flag name="smpeg">Use <pkg>media-libs/smpeg</pkg> for MP3 support</flag>
+		<flag name="wav">support WAVE files</flag>
+	</use>
+	<upstream>
+		<!-- SDL-1.2 branch -->
+		<remote-id type="github">libsdl-org/SDL_mixer</remote-id>
+	</upstream>
 </pkgmetadata>
diff --git a/media-libs/sdl-mixer/sdl-mixer-1.2.12-r5.ebuild b/media-libs/sdl-mixer/sdl-mixer-1.2.12-r5.ebuild
index 1e21b42d4cad..45fe1cea8182 100644
--- a/media-libs/sdl-mixer/sdl-mixer-1.2.12-r5.ebuild
+++ b/media-libs/sdl-mixer/sdl-mixer-1.2.12-r5.ebuild
@@ -3,6 +3,10 @@
 
 EAPI=7
 
+# We may want to grab backports from the SDL-1.2 branch upstream or
+# even take snapshots from it in future, as no SDL 1 / 1.2.x releases
+# will be made anymore.
+
 MY_P=${P/sdl-/SDL_}
 inherit autotools multilib-minimal
 
diff --git a/media-libs/sdl-mixer/sdl-mixer-1.2.12-r6.ebuild b/media-libs/sdl-mixer/sdl-mixer-1.2.12-r6.ebuild
new file mode 100644
index 000000000000..04a69cf22ab4
--- /dev/null
+++ b/media-libs/sdl-mixer/sdl-mixer-1.2.12-r6.ebuild
@@ -0,0 +1,128 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+# We may want to grab backports from the SDL-1.2 branch upstream or
+# even take snapshots from it in future, as no SDL 1 / 1.2.x releases
+# will be made anymore.
+
+MY_P=${P/sdl-/SDL_}
+inherit autotools multilib-minimal
+
+DESCRIPTION="Simple Direct Media Layer Mixer Library"
+HOMEPAGE="https://www.libsdl.org/projects/SDL_mixer/"
+SRC_URI="https://www.libsdl.org/projects/SDL_mixer/release/${MY_P}.tar.gz"
+
+LICENSE="ZLIB"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-solaris"
+IUSE="flac fluidsynth mad midi mikmod mod modplug mp3 playtools smpeg static-libs timidity vorbis +wav"
+
+REQUIRED_USE="
+	midi? ( || ( timidity fluidsynth ) )
+	timidity? ( midi )
+	fluidsynth? ( midi )
+	mp3? ( || ( smpeg mad ) )
+	smpeg? ( mp3 )
+	mad? ( mp3 )
+	mod? ( || ( mikmod modplug ) )
+	mikmod? ( mod )
+	modplug? ( mod )
+"
+
+RDEPEND="
+	>=media-libs/libsdl-1.2.15-r4[${MULTILIB_USEDEP}]
+	flac? ( >=media-libs/flac-1.2.1-r5:=[${MULTILIB_USEDEP}] )
+	midi? (
+		fluidsynth? ( >=media-sound/fluidsynth-1.1.6-r1:=[${MULTILIB_USEDEP}] )
+		timidity? ( media-sound/timidity++ )
+	)
+	mod? (
+		mikmod? ( >=media-libs/libmikmod-3.3.6-r1[${MULTILIB_USEDEP}] )
+		modplug? ( >=media-libs/libmodplug-0.8.8.4-r1[${MULTILIB_USEDEP}] )
+	)
+	mp3? (
+		mad? ( >=media-libs/libmad-0.15.1b-r8[${MULTILIB_USEDEP}] )
+		smpeg? ( >=media-libs/smpeg-0.4.4-r10[${MULTILIB_USEDEP}] )
+	)
+	vorbis? (
+		>=media-libs/libogg-1.3.0[${MULTILIB_USEDEP}]
+		>=media-libs/libvorbis-1.3.3-r1[${MULTILIB_USEDEP}]
+	)
+"
+DEPEND="${RDEPEND}"
+
+S="${WORKDIR}/${MY_P}"
+
+PATCHES=(
+	"${FILESDIR}"/${P}-wav.patch
+	"${FILESDIR}"/${P}-clang.patch
+	"${FILESDIR}"/${P}-Fix-compiling-against-libmodplug-0.8.8.5.patch
+	"${FILESDIR}"/${P}-mikmod-r58{7,8}.patch # bug 445980
+	"${FILESDIR}"/${P}-parallel-build-slibtool.patch
+	"${FILESDIR}"/${P}-incompatible-func-clang16.patch
+)
+
+src_prepare() {
+	default
+	sed -e '/link.*play/s/-o/$(LDFLAGS) -o/' -i Makefile.in || die
+
+	# Hack to get eautoconf working
+	# eautoreconf dies with gettext mismatch errors for now
+	cat acinclude/* >aclocal.m4 || die
+	eautoconf
+}
+
+multilib_src_configure() {
+	local myeconfargs=(
+		--disable-music-flac-shared
+		--disable-music-fluidsynth-shared
+		--disable-music-mod-shared
+		--disable-music-mp3-shared
+		--disable-music-ogg-shared
+		$(use_enable wav music-wave)
+		$(use_enable vorbis music-ogg)
+		$(use_enable mikmod music-mod)
+		$(use_enable modplug music-mod-modplug)
+		$(use_enable flac music-flac)
+		$(use_enable static-libs static)
+		$(use_enable smpeg music-mp3)
+		$(use_enable mad music-mp3-mad-gpl)
+		$(use_enable timidity music-timidity-midi)
+		$(use_enable fluidsynth music-fluidsynth-midi)
+		LIBMIKMOD_CONFIG="${EPREFIX}"/usr/bin/${CHOST}-libmikmod-config
+	)
+	ECONF_SOURCE=${S} \
+		econf "${myeconfargs[@]}"
+}
+
+multilib_src_install() {
+	emake DESTDIR="${D}" install
+	if multilib_is_native_abi && use playtools; then
+		emake DESTDIR="${D}" install-bin
+	fi
+}
+
+multilib_src_install_all() {
+	dodoc CHANGES README
+	find "${ED}" -name '*.la' -delete || die
+}
+
+pkg_postinst() {
+	# bug 412035
+	# https://bugs.gentoo.org/show_bug.cgi?id=412035
+	if use midi ; then
+		if use fluidsynth; then
+			ewarn "FluidSynth support requires you to set the SDL_SOUNDFONTS"
+			ewarn "environment variable to the location of a SoundFont file"
+			ewarn "unless the game or application happens to do this for you."
+
+			if use timidity; then
+				ewarn "Failing to do so will result in Timidity being used instead."
+			else
+				ewarn "Failing to do so will result in silence."
+			fi
+		fi
+	fi
+}
diff --git a/media-libs/sdl-net/Manifest b/media-libs/sdl-net/Manifest
index 99ce53e7a2b0..f7f704b3672e 100644
--- a/media-libs/sdl-net/Manifest
+++ b/media-libs/sdl-net/Manifest
@@ -1,3 +1,3 @@
 DIST SDL_net-1.2.8.tar.gz 360958 BLAKE2B 656fb9c86949bc962656edc7b950e64eee9b9b1ce1b257e6c4974c2d9be99714128c5556d3a3b7ea92cc6d294846af7a51a1925d17418afc8409e44a7b71099a SHA512 2766ca55343127c619958ab3a3ae3052a27a676839f10a158f7dfc071b8db38c2f1fc853e8add32b9fef94ab07eaa986f46a68e264e8087b57c990af30ea9a0b
-EBUILD sdl-net-1.2.8-r2.ebuild 735 BLAKE2B d60dc361d443cb770b582b98684252a4b1eee4baaa3d014e07eeab8a2267950f49f4fe1bd40ae27417508380f8ec8a423700ad65ea35d018224b13dc112753b1 SHA512 6d16a932eca8f89532dd9722562b2d2f05e67db42b2cbd967910f061ba5ea6a68b70de8ef663dc64c38608bef590e711ecae7b75e5d2287c98194dd61dd75e48
+EBUILD sdl-net-1.2.8-r2.ebuild 898 BLAKE2B fee3f7d5d3ffbadb653f5a3af448c7497a0a4d4ef30ec0dfa00800bbf305b0e5deb31b8a8fb3019451078b1560a07c580b83408605c997ff78ca95726b656dfa SHA512 1073b06c9a4c1b1b39b61e2128350b60d99ab96751ebda9a641720582bfc746c0066d7cbbf6e718615fa8bf41770afe2b10a94d019aa4a9ff477b78340b95cf8
 MISC metadata.xml 250 BLAKE2B 8d44bd4c6e7d6491273e2015e36ddac74af7b94a124fd240ff030e16430f5c85e53ab812f0e3e94bb2e6d138f39b512bbe01ff98b0081cacc21a02d648ec7643 SHA512 80ac07a3cac10ad2e72e9989a130b7d2073934fe92914a9db2af4d0e769d4bf537770f8faba0654bbd64a7e85ee38cf1f9d03b4b9cd322864b1b2bb35087d610
diff --git a/media-libs/sdl-net/sdl-net-1.2.8-r2.ebuild b/media-libs/sdl-net/sdl-net-1.2.8-r2.ebuild
index 7cfc2935b429..e03f1e258a2e 100644
--- a/media-libs/sdl-net/sdl-net-1.2.8-r2.ebuild
+++ b/media-libs/sdl-net/sdl-net-1.2.8-r2.ebuild
@@ -1,8 +1,12 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
 
+# We may want to grab backports from the SDL-1.2 branch upstream or
+# even take snapshots from it in future, as no SDL 1 / 1.2.x releases
+# will be made anymore.
+
 inherit multilib-minimal
 
 MY_P="${P/sdl-/SDL_}"
diff --git a/media-libs/sdl-sound/Manifest b/media-libs/sdl-sound/Manifest
index 079dcf8e6b6e..738e678e9baf 100644
--- a/media-libs/sdl-sound/Manifest
+++ b/media-libs/sdl-sound/Manifest
@@ -2,5 +2,5 @@ AUX sdl-sound-1.0.3-automake-1.13.patch 231 BLAKE2B cc17a9d7a9f8ea42f84b6a65505d
 AUX sdl-sound-1.0.3-physfs-3.0.1.patch 1574 BLAKE2B 9829f6429041322c0eaa41d547dbebfe03bf730e80d76b5b15afc66c123a87e0ab1fd9819372e37ed505c1a9e214c27583cb56e12920b3fe0c88a211177c79bc SHA512 ac228520e1c8e682b58919335ea117289087962b4b98fae23e743830709d8dca60a3d22c7171ee13bdbf84f528cfddcad70231edbba64a7cec88c7dd77295eca
 AUX sdl-sound-1.0.3-underlinking.patch 413 BLAKE2B 594339dae9a0230ddc1b821ca90d1650800610b0a7904fc00e33f1e3ff183ece1c8715b1d27b0c80cecbf5bda9e7b15255fba00fdc293f5e0841452efde447ef SHA512 1f67d72313abc44080a47b70c210bd6c03b2a204e85e2f5d1eb95f40367470bab4f14956f0404c5025fb4af7d72731dd1df3196ee316a2c5d9bb775e27d58a8c
 DIST SDL_sound-1.0.3.tar.gz 1127100 BLAKE2B 6fff5ea22ae82f9692a51910d5415288d5a1ebc1c463b2c741f9ee9fabeabb385de12f781d4f40aaf0628598824758376c51b442f434d77d96d0376379908ff6 SHA512 3e60671777d804e6104d7d441f4a29866492c9412040eea3fd2283c0914a0a1ebc550260631c2bf500e7d982e05a6f9feeda81e9eeef8257303750c1be582824
-EBUILD sdl-sound-1.0.3-r3.ebuild 1973 BLAKE2B 2d974028041ac4bfdece43556dfac3cb7438b054c14f4fe63dcaa2ae21d9f874b735423dbe4b47d83d34ff2f8f54e87403958e05aad636dfaba96009f252f050 SHA512 1da80c71270781faa3a33c8ea8fd66c916f706de850f31284595e1a84ceb204602326b56a40e94ea5fbaec7ef8c4ae3bbb26919c076ba354bf84fe0ca14a0b99
-MISC metadata.xml 444 BLAKE2B 5a67655b6e48cd4bbbb1f985a879d5060a7b1ae25a336d837d25001b2a15bcca1ef257ac1425467cf1b89f9a3eb5ad555639709e470e91aec7712a1920bdd4ea SHA512 2d6709b7fc8eefdfa5cd403eecff74a3f54ab08bf7043f5b966bdb09194eabc4d6aae4b4225c77210f6e452a9297fcf4b03a0cc6998d0967bc437e505c9133e3
+EBUILD sdl-sound-1.0.3-r3.ebuild 2134 BLAKE2B f1f5429dfb243da26936fa89ee47e50cd171defc1b470b75af1ad3666071ceba5ee1bf580d75c425370984d87a6e36507332bb8d6b6712ff72d8c8dbb506fa04 SHA512 05794ef14e799d102fc2354c4f3e02106b66c5ee8dee1c5a6a30f28a95a6294e7bc0b61b0e859d9c286b9f885a043dd361767fbbc8e532459d930c347b064d70
+MISC metadata.xml 530 BLAKE2B 1927045e4dd57e0b2ac63cc6ef1165009aafe2a981c2d8bc0ff9ea3e3b9473fdca4945b8b7227a285a425bfd97fa4a65809e7ebe6477ac95bfa0952ea5a6190d SHA512 cc8d087914c0ab7689a7cc9ce230de1d531c4e424bed3b73c21a215a8b681314c9e0fad95039cbf4ec2e4e93911ac876821505ac7f0872c251240121d8e77b77
diff --git a/media-libs/sdl-sound/metadata.xml b/media-libs/sdl-sound/metadata.xml
index adf47d033fce..f155573d634e 100644
--- a/media-libs/sdl-sound/metadata.xml
+++ b/media-libs/sdl-sound/metadata.xml
@@ -10,5 +10,7 @@
 	</use>
 	<upstream>
 		<bugs-to>mailto:sdlsound@icculus.org</bugs-to>
+		<!-- stable-1.0 branch -->
+		<remote-id type="github">icculus/SDL_sound</remote-id>
 	</upstream>
 </pkgmetadata>
diff --git a/media-libs/sdl-sound/sdl-sound-1.0.3-r3.ebuild b/media-libs/sdl-sound/sdl-sound-1.0.3-r3.ebuild
index eb34c69194cf..7380edd37f8e 100644
--- a/media-libs/sdl-sound/sdl-sound-1.0.3-r3.ebuild
+++ b/media-libs/sdl-sound/sdl-sound-1.0.3-r3.ebuild
@@ -3,6 +3,10 @@
 
 EAPI=8
 
+# We may want to grab backports from the SDL-1.2 branch upstream or
+# even take snapshots from it in future, as no SDL 1 / 1.x releases
+# will be made anymore.
+
 inherit autotools multilib-minimal
 
 MY_P="${P/sdl-/SDL_}"
diff --git a/media-libs/sdl-ttf/Manifest b/media-libs/sdl-ttf/Manifest
index 78a7f3a5ef3e..f4f22ee8ad07 100644
--- a/media-libs/sdl-ttf/Manifest
+++ b/media-libs/sdl-ttf/Manifest
@@ -1,5 +1,5 @@
 AUX sdl-ttf-2.0.11-freetype_pkgconfig.patch 1229 BLAKE2B 79ee75681d33ba925a29066b818cd32409c1eff159cd827606c6ea893a739eb698586d8cc292b1d3c21b3963112a26f5685aba532b47d1e83bc21fcce6995253 SHA512 abb3fd400c5d44789b891bad53124ca135ea3125affb95621623ab22fc43f5fbfeb79c63a97648936faf4698180837f76ca57143ee401610106d08741610e937
 AUX sdl-ttf-2.0.11-underlink.patch 244 BLAKE2B 2eb1782f89a72c94a1d90e4560895aafc9beda72a1537d41186de0e2816b6d37486b1211ac274d72c1b369f82d2b977c173443145a4a49b9592379e667881d32 SHA512 22495819ad0972183d850496acdcae1358bd37d25191e62c293f8d5fc50c617507631a202d46bd1ec380c70d89c61d050763919d48912b9a527908e8ad1ef1ac
 DIST SDL_ttf-2.0.11.tar.gz 4053686 BLAKE2B 3a78eeec91d7f6983b851cdd52925890c168cdf85dd34c7722183cc5a8848dab530c0c2d76493e0a380aa7e4f81967eeefd7cb34dc74faafc40497ffcb0e577b SHA512 64e04d1cd77e525e0f2413ad928841e5d3d09d551c030fc577b50777116580e430cb272b2aeb6191dfcc464669cf2f7a5a50d10e7c75637a3b1e8c8fca7fc78b
-EBUILD sdl-ttf-2.0.11-r1.ebuild 1235 BLAKE2B 6f93b3d4de10ab94a9db942992dda52abb4e70d2ea8bb5fa60cf9f81927c8650146ff986f61bb78b3775d4a3fbcaf671558d1019f1eff8b71e061cdc62f01c20 SHA512 64e5cff1522b743417d1f2122e16d469b39bcc6ac83ebd3eb2072fde8fec4e48fa056b4a1bf440a472f4ae60b87ee888384ed85ba14629c7c8ee3f0c373e4d59
-MISC metadata.xml 488 BLAKE2B f68c35cf8344372cd48c32170cb5aa7fcd8110773f6319a5cee824c1b8a7f95ab7a8e7d8c84df38fc25ddb4fac6b2ac59b59b1a4365b0876bad258b79e6c1d84 SHA512 c641f45fae365c6880180d51187ec8f247e81a2addf6eda5752fc428526b737fd2ac58244adc3792b69c9e0cf21f8c75f29f6f762f64607ccf0e10d8367bafb2
+EBUILD sdl-ttf-2.0.11-r1.ebuild 1399 BLAKE2B eb11423354a01c4a258f91f6b57666ab08c7fc1235640366fb365fd21fc9a75cd39812cdfe721eee5b8ee817264f97abddf16e5403bbb4c7c165f9d4f930c3f6 SHA512 9d5a9a3f19bd5d2f7f70b59613cff3fb2c6501cd91c3930a1b2801d33735a13479b13d1e83f268a27a89981a601f8916aed0f8ceeb9ed462ad467cc1298cbd92
+MISC metadata.xml 604 BLAKE2B 28ad2d239df5d6096bbc586e3842b9b41739a76a740995955e08e7a324cca40566fed84a4050447cb9cb8edfbe14562f62bdfe7aa6b5b1c407104a0912dfc013 SHA512 07e5dc681f113e2657bb37307e4a28b1630e142d42685403f04af8505f9eb52dc6bae513710ca0b94170174d75455d0315dd75c784d99ae0cd1ac79fde3cf793
diff --git a/media-libs/sdl-ttf/metadata.xml b/media-libs/sdl-ttf/metadata.xml
index a569823703ad..f82bde12e798 100644
--- a/media-libs/sdl-ttf/metadata.xml
+++ b/media-libs/sdl-ttf/metadata.xml
@@ -1,13 +1,17 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<maintainer type="project">
-	<email>games@gentoo.org</email>
-	<name>Gentoo Games Project</name>
-</maintainer>
-<longdescription>
-This is a sample library which allows you to use TrueType fonts in your SDL applications. It 
-comes with an example program "showfont" which displays an example string for a given 
-TrueType font file.
-</longdescription>
+	<maintainer type="project">
+		<email>games@gentoo.org</email>
+		<name>Gentoo Games Project</name>
+	</maintainer>
+	<longdescription>
+	This is a sample library which allows you to use TrueType fonts in your SDL applications. It
+	comes with an example program "showfont" which displays an example string for a given
+	TrueType font file.
+	</longdescription>
+	<upstream>
+		<!-- SDL-1.2 branch -->
+		<remote-id type="github">libsdl-org/SDL_ttf</remote-id>
+	</upstream>
 </pkgmetadata>
diff --git a/media-libs/sdl-ttf/sdl-ttf-2.0.11-r1.ebuild b/media-libs/sdl-ttf/sdl-ttf-2.0.11-r1.ebuild
index a2068af4c79a..040210674b8a 100644
--- a/media-libs/sdl-ttf/sdl-ttf-2.0.11-r1.ebuild
+++ b/media-libs/sdl-ttf/sdl-ttf-2.0.11-r1.ebuild
@@ -2,6 +2,11 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
+
+# We may want to grab backports from the SDL-1.2 branch upstream or
+# even take snapshots from it in future, as no SDL 1 / 1.2.x releases
+# will be made anymore.
+
 inherit autotools multilib-minimal
 
 MY_P="${P/sdl-/SDL_}"
diff --git a/media-libs/sdl2-net/Manifest b/media-libs/sdl2-net/Manifest
index 55adefcc4a41..dd4c09e077e9 100644
--- a/media-libs/sdl2-net/Manifest
+++ b/media-libs/sdl2-net/Manifest
@@ -1,3 +1,3 @@
 DIST SDL2_net-2.0.1.tar.gz 347436 BLAKE2B 9c7bb46cf97581f75543b9e2695e4ce87b78c66dada3ac1a3ddf7b8e6eeaf2540532aece3e7a6dc7f6dfcfd3ecf5148d5bfb9a84bc2775e57f68b3adf32e5828 SHA512 d27faee3cddc3592dae38947e6c1df0cbaa95f82fde9c87db6d11f6312d868cea74f6830ad07ceeb3d0d75e9424cebf39e54fddf9a1147e8d9e664609de92b7a
 EBUILD sdl2-net-2.0.1.ebuild 824 BLAKE2B e7ec9b5ba6548415108eeaa22043969112bc3d61cd330637669272f4987dedf3b0900a1a1ec40f6696f03aef5c46afa7a6b9f74b605939fe927d5c0d9a7c5d71 SHA512 04911606d152393946e55e49ffbf5ca65ff46a472a90a4eaebc2f539726d31cd362ba69b251c3b97f53b4828b267266973d9f47aee5ffa11b2290cda98ebbcb6
-MISC metadata.xml 337 BLAKE2B 48ae83a7d75050dc1fc90dcd86e5f56d347f356af4c7d7e6bf0e7bd58a3cb56cc9a1d20391a195066f2198651e41c0af832b427490aad18c15d21250cd598f88 SHA512 9cf8aeb4bb0d72403d3c13e45bac9dbb54f791d1e783f384c5b87c014fa8b25696c29679479aa40d9ea96a2c6c71263bf1f3e3094f2930bc28fb11c32e36254a
+MISC metadata.xml 363 BLAKE2B eee15854dacbfd1d5c7d7d8adf277d52e5d839681cc29e9969710d0f642c7f04bce10954676a88d34e3f1f472bf30b12a37da3216e09eefae73919032c8c90ba SHA512 40f6f80d29e1a1cff805b9cd74779b03f249f27ce81872c52e27b86753edd0a0e01baa8f2a5928fd9c0c38c8c6cabeb14b91fc98e7bd3b8a720e7bf6fd6fee36
diff --git a/media-libs/sdl2-net/metadata.xml b/media-libs/sdl2-net/metadata.xml
index 56790c9e6201..53042ad2a247 100644
--- a/media-libs/sdl2-net/metadata.xml
+++ b/media-libs/sdl2-net/metadata.xml
@@ -6,6 +6,7 @@
 		<name>Gentoo Games Project</name>
 	</maintainer>
 	<upstream>
+		<!-- SDL-1.2 branch -->
 		<remote-id type="github">libsdl-org/SDL_net</remote-id>
 	</upstream>
 </pkgmetadata>