gentoo resync : 21.06.2020

4 files changed, 49 insertions, 99 deletions

diff --git a/media-fonts/terminus-font/Manifest b/media-fonts/terminus-font/Manifest
index 39ecba31f724..5fa2e40e2b63 100644
--- a/media-fonts/terminus-font/Manifest
+++ b/media-fonts/terminus-font/Manifest
@@ -1,7 +1,4 @@
-DIST terminus-font-4.46.tar.gz 590210 BLAKE2B 427b4878afd47cc6c1a0ba6b6116568630a618e313c24744b3465b3e301e142ccbb9bd5e336bed7d98f3d1e01a0a61c6fbdd17912f4d9332ed5430ef47bca4fe SHA512 ae221920ecff54b9575a25d30a429feee6e19ef1e9669896c34f86f80d5495c3654f5423ff1df76e86bc999d1f37c306048b44d8ca55144f0f299926d3d33b58
-DIST terminus-font-4.47.tar.gz 620344 BLAKE2B 10eaac6ff4880652ee7373374735629cada73e1cb63344b75b579532fad154b10322a7cb3691c2270c2b4d1aee0914c64338d3650625883752c7e33e5205212a SHA512 09455d107a09c422f4fedfcc70ae1483063c844fb01b0adfa3d2a0e28c9502e9ca922542b5ad735cbebb491d148c453d0213d61ebebf64c79f16cb582964fa47
 DIST terminus-font-4.48.tar.gz 620561 BLAKE2B 8ab977a0b4b529faa38d082969e10a8f0ca3860b745441ed8f45761b95869194226446c487bc7c5490d2a88d1836aa6152424d6646b63b9fbc11e43dc8e255d6 SHA512 5f45f7d0e7396f02158f4751aaafb3f0a3fb68dbe3e5501f86a5138c6d52f5106053e38c368d560e5979e29250074dbde5165702b8905a564d029663a2219af4
-EBUILD terminus-font-4.46.ebuild 2609 BLAKE2B 5b7d71a268c473e7a2a610c8128912e84ef6b8f6b2979589bd2a551acd0df74962a1b29080198d61be0ad760e400940e33c18dc24feee3e85fb5a56ac53f4718 SHA512 eff0f4526b709be6e08b98a397f545207486eb0b6381f6c3ed8d44e18dcf0f9384a595bf265b3eb79527b1a9f46281c10b244c9a1e2bfd57172091476662e900
-EBUILD terminus-font-4.47.ebuild 2619 BLAKE2B 1cf9adc9fa5222739e04c8dd9b159d4897a131bf509d74d3f631520db480847dd84003d523536bdbe55de20153e9827bd7a967ba7f1e49770522d09533c439a0 SHA512 366a3fcb139755d46be6cda7d2d7d2dbaed5cb8fa0f5d6b8c72f92e5c81ad591e69b5d008670976b7c6d363e88951a77e09175abfa7767709167f172e5dc5b7c
+EBUILD terminus-font-4.48-r2.ebuild 4067 BLAKE2B 0fdb04e8ff8b62f1f6b48cf9bb3470b400d0aa81e89cb2ae197340d973bed31ab76d85fc26f77f57a4da13a0a269ffc63dcac3b05675a3d3f12f05cfc40aed3e SHA512 398fbf47ae0163db467e98837f2764655de0738b7cb1bbcaa64e3fa0f12dbec3a001cad4a557f593b1fa9eb06e04ad35727e74cc06fb77519a3b2b8aff1202c7
 EBUILD terminus-font-4.48.ebuild 2615 BLAKE2B 59fd038e23e2df28f9af2e8b14aa438a1af5ed1e172e15788b07da8035357d72fcfafa3c406ee5e42e1fc67d1066c2be2f29fbfacacb3d18383ca1d2a27e6498 SHA512 205c101eeafdca6b04e8fccff95782cbc45ef8d05805bec1c12cb697d55e9af004a747c455204013c768d5cebc24bdbc2a94160fc8843de008d6d634ac29c0be
-MISC metadata.xml 1568 BLAKE2B 47b12c122ee6823023bbc4844474e5f2eaad16bfd5f0853ff192c60c007a3fc03353a64f26d824fd43ae96d5044bdaccbbc2fe75177080f76a9db69ff8f44b6a SHA512 6255452e74da62e7b081fdb8a3eb4069e4419503d7364cac2ff1c014858482b99713a33a18b1b8bc3bdc409a90b2d6e03421e07559f74f4c8f0ae132d9940d96
+MISC metadata.xml 1787 BLAKE2B f83cf459e35bae521d4f6176c7d873cbde7413ca52241feaf442c818a9e1c30640cca1127788737da53eb659ab73913471d830f0234198880fca33aafe811678 SHA512 8dbb13ccb276600255a0188254098e78540f54b4ff5a481909c94e15519b1cbf58dd58f5f4c44adbd48252da22579fff8d1d4301eb798c466132ab820609affe
diff --git a/media-fonts/terminus-font/metadata.xml b/media-fonts/terminus-font/metadata.xml
index 0dd408f312e3..8663bbf27f9f 100644
--- a/media-fonts/terminus-font/metadata.xml
+++ b/media-fonts/terminus-font/metadata.xml
@@ -5,6 +5,10 @@
     <email>fonts@gentoo.org</email>
     <name>Fonts</name>
   </maintainer>
+  <maintainer type="person">
+    <email>slyfox@gentoo.org</email>
+    <name>Sergei Trofimovich</name>
+  </maintainer>
   <use>
     <flag name="a-like-o">
       Changes view of letter 'a' - a looks like o (see homepage)
@@ -12,6 +16,9 @@
     <flag name="distinct-l">
       ll2 variant with more distinctive l (lowercase L)
     </flag>
+    <flag name="otf">
+      Install Open Type Font (OTF) (required for HarfBuzz backend)
+    </flag>
     <flag name="pcf">
       Install Portable Compiled Font (PCF) (required for X11)
     </flag>
diff --git a/media-fonts/terminus-font/terminus-font-4.46.ebuild b/media-fonts/terminus-font/terminus-font-4.46.ebuild
deleted file mode 100644
index 017cb8d501b9..000000000000
--- a/media-fonts/terminus-font/terminus-font-4.46.ebuild
+++ /dev/null
@@ -1,91 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python3_6 )
-inherit font python-any-r1
-
-DESCRIPTION="A clean fixed font for the console and X11"
-HOMEPAGE="http://terminus-font.sourceforge.net/"
-SRC_URI="mirror://sourceforge/${PN}/${P}/${P}.tar.gz"
-
-LICENSE="OFL-1.1 GPL-2"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos"
-IUSE="a-like-o +center-tilde distinct-l +pcf +pcf-unicode-only +psf quote
-	ru-dv +ru-g ru-i ru-k"
-
-DEPEND="app-arch/gzip
-	${PYTHON_DEPS}
-	virtual/awk
-	pcf? ( x11-apps/bdftopcf )"
-RDEPEND=""
-
-FONTDIR=/usr/share/fonts/terminus
-FONT_CONF=( 75-yes-terminus.conf )
-DOCS=( README README-BG AUTHORS CHANGES )
-
-REQUIRED_USE="X? ( pcf )"
-
-pkg_setup() {
-	python_setup
-}
-
-src_prepare() {
-	default
-
-	# Upstream patches. Some of them are suggested to be applied by default
-	# dv - de NOT like latin g, but like caps greek delta
-	#      ve NOT like greek beta, but like caps latin B
-	# ge - ge NOT like "mirrored" latin s, but like caps greek gamma
-	# ka - small ka NOT like minimised caps latin K, but like small latin k
-	use a-like-o 		&& eapply "${S}"/alt/ao2.diff
-	use center-tilde 	&& eapply "${S}"/alt/td1.diff
-	use distinct-l 		&& eapply "${S}"/alt/ll2.diff
-	use ru-i     		&& eapply "${S}"/alt/ij1.diff
-	use ru-k     		&& eapply "${S}"/alt/ka2.diff
-	use ru-dv    		&& eapply "${S}"/alt/dv1.diff
-	use ru-g     		&& eapply "${S}"/alt/ge2.diff
-	use quote    		&& eapply "${S}"/alt/gq2.diff
-}
-
-src_configure() {
-	local configure_args=(
-		--prefix="${EPREFIX}"/usr
-		--psfdir="${EPREFIX}"/usr/share/consolefonts
-		--x11dir="${EPREFIX}"/${FONTDIR}
-	)
-	# selfwritten configure script
-	./configure "${configure_args[@]}" || die
-}
-
-src_compile() {
-	local args=(
-		$(usex psf 'psf psf-vgaw' '')
-		$(usex pcf 'pcf pcf-8bit' '')
-	)
-	[[ ${#args[@]} -gt 0 ]] && emake "${args[@]}"
-}
-
-src_install() {
-	local args=(
-		$(usex psf 'install-psf install-psf-vgaw install-psf-ref' '')
-		$(usex pcf 'install-pcf' '')
-	)
-	# Set the CHECKDIR to a dummy location so we always get the same set of
-	# files installed regardless of what is in / or ROOT or wherever.
-	[[ ${#args[@]} -gt 0 ]] && emake DESTDIR="${D}" CHECKDIR="${D}" "${args[@]}"
-
-	# Remove trans files that the kbd package takes care of installing.
-	rm -f "${ED}"/usr/share/consoletrans/*.trans
-
-	if use pcf-unicode-only; then
-		# Only the ter-x* fonts are unicode (ISO-10646-1) based
-		rm -f "${ED}"/usr/share/fonts/terminus/ter-[0-9a-wy-z]* || die
-	fi
-
-	font_src_install
-
-	einstalldocs
-}
diff --git a/media-fonts/terminus-font/terminus-font-4.47.ebuild b/media-fonts/terminus-font/terminus-font-4.48-r2.ebuild
index 40ce47872db1..97c8223d54e4 100644
--- a/media-fonts/terminus-font/terminus-font-4.47.ebuild
+++ b/media-fonts/terminus-font/terminus-font-4.48-r2.ebuild
@@ -1,9 +1,9 @@
 # Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=7
 
-PYTHON_COMPAT=( python3_{6,7} )
+PYTHON_COMPAT=( python3_{6,7,8} )
 inherit font python-any-r1
 
 DESCRIPTION="A clean fixed font for the console and X11"
@@ -13,12 +13,13 @@ SRC_URI="mirror://sourceforge/${PN}/${P}/${P}.tar.gz"
 LICENSE="OFL-1.1 GPL-2"
 SLOT="0"
 KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos"
-IUSE="a-like-o +center-tilde distinct-l +pcf +pcf-unicode-only +psf quote
+IUSE="a-like-o +center-tilde distinct-l otf +pcf +pcf-unicode-only +psf quote
 	ru-dv +ru-g ru-i ru-k"
 
 DEPEND="app-arch/gzip
 	${PYTHON_DEPS}
 	virtual/awk
+	otf? ( media-gfx/fontforge )
 	pcf? ( x11-apps/bdftopcf )"
 RDEPEND=""
 
@@ -66,6 +67,41 @@ src_compile() {
 		$(usex pcf 'pcf pcf-8bit' '')
 	)
 	[[ ${#args[@]} -gt 0 ]] && emake "${args[@]}"
+
+	# Follow https://bugs.gentoo.org/728308#c5
+	# build ".otf" (bitmap-only) fonts out of .bdf ones
+	#
+	# Important details (copying notes as-is):
+	#
+	# 0. Pango 1.44 now returns floating point ascent and
+	# descent, instead of integer. The functions were always returning float,
+	# all right... but so far, without a fractional part. Which makes problems
+	# too, for example in Scintilla based editors such as SciTE and Geany
+	# (there is a quick and dirty fix).
+	#
+	# 1. 'fonttosfnt' adds 0.5 to at least the logical (OpenType-scaled)
+	# character width, ascent and height. Haven't checked the physical (pixel)
+	# metrics yet. With some sizes/applications, the fonttosfnt converted
+	# fonts do indeed have extra wrong spacing, 1 pixel horizontal or
+	# vertical. It has other bugs too, but they don't seem important.
+	#
+	# 2. If you pack 2+ terminus sizes into a single .otb font file, KDE will
+	# (may? YMMV) use *only the first size*.
+	#
+	# 3. OTB has a single set of logical metrics. So, for example, the logical
+	# character width (which is relative to height) can never be correct for
+	# an .otb file including both 8x14 and 8x16.
+
+	if use otf; then
+		local source_bdf
+		for source_bdf in ter-u*n.bdf ter-u*b.bdf; do
+			set -- 	fontforge -lang=ff -c 'Open($1); ScaleToEm(1024); Generate($2)' \
+				"${source_bdf}" "${source_bdf%.bdf}.otb"
+			einfo "$@"
+			"$@" || die
+		done
+	fi
+
 }
 
 src_install() {
@@ -85,6 +121,7 @@ src_install() {
 		rm -f "${ED}"/usr/share/fonts/terminus/ter-[0-9a-wy-z]* || die
 	fi
 
+	use otf && FONT_SUFFIX=otb
 	font_src_install
 
 	einstalldocs