[gentoo-commits] repo/proj/guru:master commit in: media-libs/fcft/

["Andrew Ammerlaan" <andrewammerlaan@riseup.net>]

commit:     f5171352fee732f27ce67e668e5081a8c8df289f
Author:     Haelwenn (lanodan) Monnier <contact <AT> hacktivis <DOT> me>
AuthorDate: Tue May 11 01:39:41 2021 +0000
Commit:     Andrew Ammerlaan <andrewammerlaan <AT> riseup <DOT> net>
CommitDate: Thu May 13 09:17:48 2021 +0000
URL:        https://gitweb.gentoo.org/repo/proj/guru.git/commit/?id=f5171352

media-libs/fcft: Version bump, 2.4.0

- Add subslot, based on soname Major version number
- Enable test-text-shaping when test and text-shaping are enabled
- De-vendor unicode-data in favor of system's version
- Add examples option (new in 2.4.0)

Signed-off-by: Haelwenn (lanodan) Monnier <contact <AT> hacktivis.me>

 media-libs/fcft/Manifest                           |  1 +
 .../fcft/{fcft-9999.ebuild => fcft-2.4.0.ebuild}   | 43 +++++++++++++++++++---
 media-libs/fcft/fcft-9999.ebuild                   | 43 +++++++++++++++++++---
 3 files changed, 77 insertions(+), 10 deletions(-)

diff --git a/media-libs/fcft/Manifest b/media-libs/fcft/Manifest
index 6999a947f..bcfffde7d 100644
--- a/media-libs/fcft/Manifest
+++ b/media-libs/fcft/Manifest
@@ -1 +1,2 @@
 DIST fcft-2.3.3.tar.gz 313168 BLAKE2B b3dbc3af511e8a8007a17400fe6880a08a62ca0cb69795438ab7c6a86f856b25a3bd26cdef8031f1c8d66f4527d191a72ce87852f001e05b8f37285dea4befb5 SHA512 91f3c1292889c2fd1cdce439e0168a37a932d3a05ea78fff93ce69ea7b1adc33424e67a0b2c36931d26128e1169e6f784f16445475c94690dedf608f92278009
+DIST fcft-2.4.0.tar.gz 323605 BLAKE2B 1926d26b633cf768257340f093de734513678f3b5e62cb2fa89fd08496d06b36de89fe797a5328c35a5b467d3ea48214d5a3e76660d2effaea0f28fddbc7bd48 SHA512 0904344cf69875e5ed2b0543911cfcbd7fddafcc19ef611ff6abb30004515eb61a69f5add25f9576132dcd60bc0c2cc7f6461fade9124a32c4026154e56d8e64

diff --git a/media-libs/fcft/fcft-9999.ebuild b/media-libs/fcft/fcft-2.4.0.ebuild
similarity index 52%
copy from media-libs/fcft/fcft-9999.ebuild
copy to media-libs/fcft/fcft-2.4.0.ebuild
index 33f4d40d6..979d903ad 100644
--- a/media-libs/fcft/fcft-9999.ebuild
+++ b/media-libs/fcft/fcft-2.4.0.ebuild
@@ -17,28 +17,61 @@ fi
 DESCRIPTION="A simple library for font loading and glyph rasterization"
 HOMEPAGE="https://codeberg.org/dnkl/fcft"
 LICENSE="MIT"
-SLOT="0"
-IUSE="+text-shaping"
+SLOT="0/3"
+IUSE="examples +text-shaping test"
+RESTRICT="!test? ( test )"
 
 DEPEND="
 	dev-libs/tllist
 	media-libs/fontconfig
 	media-libs/freetype
-	text-shaping? ( media-libs/harfbuzz )
 	x11-libs/pixman
+	text-shaping? ( media-libs/harfbuzz )
+	examples? (
+		dev-libs/libutf8proc:=
+		dev-libs/wayland
+	)
+"
+DEPEND="
+	${RDEPEND}
+	test? (
+		text-shaping? ( media-fonts/noto-emoji )
+	)
+"
+BDEPEND="
+	app-text/scdoc
+	app-i18n/unicode-data
+	examples? (
+		dev-libs/wayland-protocols
+		dev-util/wayland-scanner
+	)
 "
-RDEPEND="${DEPEND}"
-BDEPEND="app-text/scdoc"
+
+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"
+}
 
 src_configure() {
 	local emesonargs=(
 		$(meson_feature text-shaping)
+		$(meson_use examples)
 		"-Dwerror=false"
 	)
+
+	use test && emesonargs+=(
+		$(meson_use text-shaping test-text-shaping)
+	)
+
 	meson_src_configure
 }
 
 src_install() {
 	meson_src_install
+	use examples && newbin "${BUILD_DIR}/example/example" fcft-example
 	mv "${D}/usr/share/doc/${PN}" "${D}/usr/share/doc/${PF}"
 }

diff --git a/media-libs/fcft/fcft-9999.ebuild b/media-libs/fcft/fcft-9999.ebuild
index 33f4d40d6..979d903ad 100644
--- a/media-libs/fcft/fcft-9999.ebuild
+++ b/media-libs/fcft/fcft-9999.ebuild
@@ -17,28 +17,61 @@ fi
 DESCRIPTION="A simple library for font loading and glyph rasterization"
 HOMEPAGE="https://codeberg.org/dnkl/fcft"
 LICENSE="MIT"
-SLOT="0"
-IUSE="+text-shaping"
+SLOT="0/3"
+IUSE="examples +text-shaping test"
+RESTRICT="!test? ( test )"
 
 DEPEND="
 	dev-libs/tllist
 	media-libs/fontconfig
 	media-libs/freetype
-	text-shaping? ( media-libs/harfbuzz )
 	x11-libs/pixman
+	text-shaping? ( media-libs/harfbuzz )
+	examples? (
+		dev-libs/libutf8proc:=
+		dev-libs/wayland
+	)
+"
+DEPEND="
+	${RDEPEND}
+	test? (
+		text-shaping? ( media-fonts/noto-emoji )
+	)
+"
+BDEPEND="
+	app-text/scdoc
+	app-i18n/unicode-data
+	examples? (
+		dev-libs/wayland-protocols
+		dev-util/wayland-scanner
+	)
 "
-RDEPEND="${DEPEND}"
-BDEPEND="app-text/scdoc"
+
+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"
+}
 
 src_configure() {
 	local emesonargs=(
 		$(meson_feature text-shaping)
+		$(meson_use examples)
 		"-Dwerror=false"
 	)
+
+	use test && emesonargs+=(
+		$(meson_use text-shaping test-text-shaping)
+	)
+
 	meson_src_configure
 }
 
 src_install() {
 	meson_src_install
+	use examples && newbin "${BUILD_DIR}/example/example" fcft-example
 	mv "${D}/usr/share/doc/${PN}" "${D}/usr/share/doc/${PF}"
 }