gentoo resync : 29.12.2022

4 files changed, 5 insertions, 189 deletions

diff --git a/media-libs/fcft/Manifest b/media-libs/fcft/Manifest
index bb8dc2086de1..a3fe29c2143e 100644
--- a/media-libs/fcft/Manifest
+++ b/media-libs/fcft/Manifest
@@ -1,7 +1,3 @@
-DIST fcft-3.0.0.tar.gz 441458 BLAKE2B 9ff83691435953285f1b3f8b51dac7b17453a457eeb910f035e39c6fa3bb39098d3adbb7179f734261a4034e9ea8b034dd03a20ba0c364b7de2efe9b781dfdaa SHA512 fbf7ac7d777bdb530b90b79a0bd8b90d3f7ae8b099c2733304dbe89fbcc1a1a3493d1eac0478bcdee291d8c804da21461737fc3e34164637e86ff737023622b1
-DIST fcft-3.0.1.tar.gz 441493 BLAKE2B 79fe864edf04b21fe88fa167e3390836e5c7254710082312068ff4c39624508e086f4eed2ea5706b52421b2276a6f2d1f2211ff0b256112d989764e667c44fe2 SHA512 856bec504a253678a2962c0a7c5029e5fd3d26e305ca3fcae8d9df398bcc84a03e9d67522673d1f1bb0ec91606c0627d6ab4bf2780cbb5965a01c91e6f0aac89
-DIST fcft-3.1.1.tar.gz 741229 BLAKE2B ef3fdca8f88893f0c69ed48181dce2a185d5e67ba6fc94d2f782b64f3078700c6be909560448f2625d43517f94aac2d82f58df29804b0fae5a72372a5b4a4004 SHA512 0344fc55906dee2588162f805ad703fe0efd26f3a8ce794273721d6111dd29bdb3589bd863f24998346018932f78b4c2dc04c4e2c8b49286db1efa9ecbc5521f
-EBUILD fcft-3.0.0.ebuild 1923 BLAKE2B fd4c2103f14439e1f6efa03950724995e1a3b15847e42bea11e067d02ed98234f122071ca101c96fe5fcc3aeb41e851244355f847b7f61a450bf403033daead7 SHA512 35a61954dcb546d9cf90277e1e835133a72680d6cbcf2e6601b70eb4510943d6946c744e4bade1bb2e1fd20c0f09dca6fa01369771214c8ae44c968c040a932f
-EBUILD fcft-3.0.1.ebuild 1930 BLAKE2B 13d1c5b14964a7abb19d9951511753ebf61fe6dc868189e2a9a1fb9c690674d1b2664748e7b572de5d6230eca06eb66b57bf0f725a73a91705f8f3d71b0f9d0b SHA512 0a9b5eb6c76a1571a94ff256a58644b1595f7b00b87df6969681c5d6ccaf7cb64bf76a8a9446ff9223c973b8947e92a79c13ae134a882eac951bca0c882dc6b2
-EBUILD fcft-3.1.1.ebuild 2061 BLAKE2B caf555f515ab6c2a2553026f8500396cbf04f4635571faaefea487d07b3a1e22e8e8cbf3a3cf426043d3c3f50a03e6290de4f5ae81ecb18f9fa8577ec1223abe SHA512 b7fe11484b87835c7a93fd2aa5221bfbd941c708061a0b2b1ac57476a3ba3d2ccae1d7bb04148556f25dc0b5bde4327e66393ff2a241a78405b75564b8b7b283
+DIST fcft-3.1.2.tar.gz 741659 BLAKE2B d4c3b9ef444771f255b7b19e9645d53558caed2022a59759418fe0b9961f74833da2b760c0c961ce5fbbf91f3e0291dd87590fe00ab300ee194a497accba392e SHA512 b3874819ef90a4f1d1975cae72b925c928bc9758629e63b2083dab807166133bc68308ba4f9481c34c9e0b5262a1d2558e47cccf6ce9d34516583e48d03a5bf9
+EBUILD fcft-3.1.2-r1.ebuild 2073 BLAKE2B cb0345c7f705f89bd909f784af5b92ec01fd5ae1f76f58036274bb1970c155dc18fe7654bc61abe9ecebfbb29f847c5b01278bfb36965829ba3a1bce157da596 SHA512 038dedc345cda97558e4cfb78d27d5615fdccdbf70219b056a8a3d9116fb264cdea95854c8b5b9ce77393a60196dd5a847204e05b91b2c9cbe6d3aabf369d7cf
 MISC metadata.xml 631 BLAKE2B 464952a9c2b5959cbcb732323c54d57c4e67cb65efe87b4fe63b8369568531b0c6a0988990ea1756ee6012f81e6226600d638f2008fcdf452da36adeb5e204c0 SHA512 c2d704df7eeb25403bdbb7bd39c58c20d3c95dcf1c00051b8b558389344f9176fd4027349337ac7bb29249feefc997d0ef38e4ddc611d13a0c04a7880c048164
diff --git a/media-libs/fcft/fcft-3.0.0.ebuild b/media-libs/fcft/fcft-3.0.0.ebuild
deleted file mode 100644
index 27380210cb01..000000000000
--- a/media-libs/fcft/fcft-3.0.0.ebuild
+++ /dev/null
@@ -1,90 +0,0 @@
-# Copyright 2020-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-PYTHON_COMPAT=( python3_{8..10} )
-inherit meson python-any-r1
-
-DESCRIPTION="Simple library for font loading and glyph rasterization"
-HOMEPAGE="https://codeberg.org/dnkl/fcft"
-SRC_URI="https://codeberg.org/dnkl/fcft/archive/${PV}.tar.gz -> ${P}.tar.gz"
-S="${WORKDIR}/${PN}"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64"
-IUSE="examples +harfbuzz +libutf8proc test"
-REQUIRED_USE="
-	libutf8proc? ( harfbuzz )
-	examples? ( libutf8proc )
-"
-RESTRICT="!test? ( test )"
-
-RDEPEND="
-	media-libs/fontconfig
-	media-libs/freetype
-	x11-libs/pixman
-	examples? (
-		dev-libs/libutf8proc:=
-		dev-libs/wayland
-	)
-	harfbuzz? (
-		media-libs/harfbuzz:=
-	)
-	libutf8proc? (
-		dev-libs/libutf8proc:=
-	)
-"
-DEPEND="
-	${RDEPEND}
-	app-i18n/unicode-data
-	dev-libs/tllist
-	examples? (
-		dev-libs/wayland-protocols
-	)
-	test? (
-		dev-libs/check
-		harfbuzz? ( media-fonts/noto-emoji )
-	)
-"
-BDEPEND="
-	${PYTHON_DEPS}
-	app-text/scdoc
-	examples? (
-		dev-util/wayland-scanner
-	)
-"
-
-src_prepare() {
-	default
-
-	rm -r unicode || die "Failed removing vendored unicode-data"
-
-	sed -i "s;unicode/UnicodeData.txt;${EPREFIX}/usr/share/unicode-data/UnicodeData.txt;" \
-		meson.build || die "Failed changing UnicodeData.txt to system's copy"
-	sed -i "s;unicode/emoji-data.txt;${EPREFIX}/usr/share/unicode-data/emoji/emoji-data.txt;" \
-		meson.build || die "Failed changing emoji-data.txt to system's copy"
-}
-
-src_configure() {
-	local emesonargs=(
-		$(meson_feature harfbuzz grapheme-shaping)
-		$(meson_feature libutf8proc run-shaping)
-		$(meson_use examples)
-		$(use test && meson_use harfbuzz test-text-shaping)
-		-Ddocs=enabled
-		-Dwerror=false
-	)
-
-	meson_src_configure
-}
-
-src_install() {
-	local DOCS=( CHANGELOG.md README.md )
-	meson_src_install
-
-	rm -r "${ED}"/usr/share/doc/${PN} || die
-
-	use examples && newbin "${BUILD_DIR}/example/example" fcft-example
-}
diff --git a/media-libs/fcft/fcft-3.0.1.ebuild b/media-libs/fcft/fcft-3.0.1.ebuild
deleted file mode 100644
index f09d1c8f6801..000000000000
--- a/media-libs/fcft/fcft-3.0.1.ebuild
+++ /dev/null
@@ -1,90 +0,0 @@
-# Copyright 2020-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-PYTHON_COMPAT=( python3_{8..10} )
-inherit meson python-any-r1
-
-DESCRIPTION="Simple library for font loading and glyph rasterization"
-HOMEPAGE="https://codeberg.org/dnkl/fcft"
-SRC_URI="https://codeberg.org/dnkl/fcft/archive/${PV}.tar.gz -> ${P}.tar.gz"
-S="${WORKDIR}/${PN}"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~arm64"
-IUSE="examples +harfbuzz +libutf8proc test"
-REQUIRED_USE="
-	libutf8proc? ( harfbuzz )
-	examples? ( libutf8proc )
-"
-RESTRICT="!test? ( test )"
-
-RDEPEND="
-	media-libs/fontconfig
-	media-libs/freetype
-	x11-libs/pixman
-	examples? (
-		dev-libs/libutf8proc:=
-		dev-libs/wayland
-	)
-	harfbuzz? (
-		media-libs/harfbuzz:=
-	)
-	libutf8proc? (
-		dev-libs/libutf8proc:=
-	)
-"
-DEPEND="
-	${RDEPEND}
-	app-i18n/unicode-data
-	dev-libs/tllist
-	examples? (
-		dev-libs/wayland-protocols
-	)
-	test? (
-		dev-libs/check
-		harfbuzz? ( media-fonts/noto-emoji )
-	)
-"
-BDEPEND="
-	${PYTHON_DEPS}
-	app-text/scdoc
-	examples? (
-		dev-util/wayland-scanner
-	)
-"
-
-src_prepare() {
-	default
-
-	rm -r unicode || die "Failed removing vendored unicode-data"
-
-	sed -i "s;unicode/UnicodeData.txt;${EPREFIX}/usr/share/unicode-data/UnicodeData.txt;" \
-		meson.build || die "Failed changing UnicodeData.txt to system's copy"
-	sed -i "s;unicode/emoji-data.txt;${EPREFIX}/usr/share/unicode-data/emoji/emoji-data.txt;" \
-		meson.build || die "Failed changing emoji-data.txt to system's copy"
-}
-
-src_configure() {
-	local emesonargs=(
-		$(meson_feature harfbuzz grapheme-shaping)
-		$(meson_feature libutf8proc run-shaping)
-		$(meson_use examples)
-		$(use test && meson_use harfbuzz test-text-shaping)
-		-Ddocs=enabled
-		-Dwerror=false
-	)
-
-	meson_src_configure
-}
-
-src_install() {
-	local DOCS=( CHANGELOG.md README.md )
-	meson_src_install
-
-	rm -r "${ED}"/usr/share/doc/${PN} || die
-
-	use examples && newbin "${BUILD_DIR}/example/example" fcft-example
-}
diff --git a/media-libs/fcft/fcft-3.1.1.ebuild b/media-libs/fcft/fcft-3.1.2-r1.ebuild
index efecb5e0640c..9ecda1e5c4a3 100644
--- a/media-libs/fcft/fcft-3.1.1.ebuild
+++ b/media-libs/fcft/fcft-3.1.2-r1.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=8
 
-PYTHON_COMPAT=( python3_{8..10} )
+PYTHON_COMPAT=( python3_{8..11} )
 inherit meson python-any-r1
 
 DESCRIPTION="Simple library for font loading and glyph rasterization"
@@ -32,7 +32,7 @@ RDEPEND="
 		dev-libs/wayland
 	)
 	harfbuzz? (
-		media-libs/harfbuzz:=
+		media-libs/harfbuzz:=[truetype]
 	)
 	libutf8proc? (
 		dev-libs/libutf8proc:=
@@ -53,6 +53,7 @@ DEPEND="
 BDEPEND="
 	${PYTHON_DEPS}
 	app-text/scdoc
+	virtual/pkgconfig
 	examples? (
 		dev-util/wayland-scanner
 	)
@@ -78,7 +79,6 @@ src_configure() {
 		# bundled, tiny, I believe this means we should always include it
 		-Dsvg-backend=nanosvg
 		-Ddocs=enabled
-		-Dwerror=false
 	)
 
 	meson_src_configure