gentoo resync : 18.08.2019

4 files changed, 97 insertions, 4 deletions

diff --git a/media-fonts/terminus-font/Manifest b/media-fonts/terminus-font/Manifest
index 11736a97b4c1..61659ffed922 100644
--- a/media-fonts/terminus-font/Manifest
+++ b/media-fonts/terminus-font/Manifest
@@ -1,5 +1,7 @@
 DIST terminus-font-4.46.tar.gz 590210 BLAKE2B 427b4878afd47cc6c1a0ba6b6116568630a618e313c24744b3465b3e301e142ccbb9bd5e336bed7d98f3d1e01a0a61c6fbdd17912f4d9332ed5430ef47bca4fe SHA512 ae221920ecff54b9575a25d30a429feee6e19ef1e9669896c34f86f80d5495c3654f5423ff1df76e86bc999d1f37c306048b44d8ca55144f0f299926d3d33b58
 DIST terminus-font-4.47.tar.gz 620344 BLAKE2B 10eaac6ff4880652ee7373374735629cada73e1cb63344b75b579532fad154b10322a7cb3691c2270c2b4d1aee0914c64338d3650625883752c7e33e5205212a SHA512 09455d107a09c422f4fedfcc70ae1483063c844fb01b0adfa3d2a0e28c9502e9ca922542b5ad735cbebb491d148c453d0213d61ebebf64c79f16cb582964fa47
-EBUILD terminus-font-4.46.ebuild 2630 BLAKE2B c20fe173e9266b4bb8dfea00e519edcfb245c4acd6cd2b8f863585d5cdefe61f51b2409575e8158c072c6e9bdac1522c916bafac6809fd0905cc792506dd5d5d SHA512 5e94f9a00710fe4f24fc7ea5fe7ca8922a160f05c9e2ee6729e40b3c647d643c409d2f9a6ca5cbd1c96fc438665d746e6e6502704889a59257bebefc101e3f45
-EBUILD terminus-font-4.47.ebuild 2637 BLAKE2B c29560133595140e6c1ebc717ac7cbfae99d56297a4ae1cbe54e1bcf577aa64a3a74e15282e4338a09de99241f875d0f2915f3b9740ca275862f9d391af505a0 SHA512 80f5a3cbcc3366887b9796a9a7049910635b658c7f0d07ef9daa8695066614ce71d8d299e22391f579c213c24ae078b7f0f01b04ab654c29d02c19be0aa7c910
+DIST terminus-font-4.48.tar.gz 620561 BLAKE2B 8ab977a0b4b529faa38d082969e10a8f0ca3860b745441ed8f45761b95869194226446c487bc7c5490d2a88d1836aa6152424d6646b63b9fbc11e43dc8e255d6 SHA512 5f45f7d0e7396f02158f4751aaafb3f0a3fb68dbe3e5501f86a5138c6d52f5106053e38c368d560e5979e29250074dbde5165702b8905a564d029663a2219af4
+EBUILD terminus-font-4.46.ebuild 2628 BLAKE2B 1b9f10db79f1c88567e57679049430ad5ded7432966c2098d36a4bb8343d4b3b5f48695fdbdc24dc046461ef70f5e7c5bdf5606338f9a9bf4bf4d7f2091aae2c SHA512 cdb46b7eb3a4e47943dce2fcdf2a4ad5ca936cdab5743b48a884ba78f1c9a5f22ab5633e3c1415f572ac54f6666be61d0bdd68ea30461d3b0b978f07c8f82e95
+EBUILD terminus-font-4.47.ebuild 2635 BLAKE2B d5e76d8442bd9042850f3510126aa1baf21df7d805be2ce3dda6be05a7742dcc6b5a5ddfe75fb25ddffe6bc1e343c6534bab0f74535a6fb0ce5483d7e0c93ea5 SHA512 7ae5d4953b8713d73927e90b1327c54bb38e9903b6d1026f0515c9d52e8f61f601f0200d759808306788c9b0c096aad2bb95f9547d915735e7c7082f6b345ec0
+EBUILD terminus-font-4.48.ebuild 2635 BLAKE2B d5e76d8442bd9042850f3510126aa1baf21df7d805be2ce3dda6be05a7742dcc6b5a5ddfe75fb25ddffe6bc1e343c6534bab0f74535a6fb0ce5483d7e0c93ea5 SHA512 7ae5d4953b8713d73927e90b1327c54bb38e9903b6d1026f0515c9d52e8f61f601f0200d759808306788c9b0c096aad2bb95f9547d915735e7c7082f6b345ec0
 MISC metadata.xml 1568 BLAKE2B 47b12c122ee6823023bbc4844474e5f2eaad16bfd5f0853ff192c60c007a3fc03353a64f26d824fd43ae96d5044bdaccbbc2fe75177080f76a9db69ff8f44b6a SHA512 6255452e74da62e7b081fdb8a3eb4069e4419503d7364cac2ff1c014858482b99713a33a18b1b8bc3bdc409a90b2d6e03421e07559f74f4c8f0ae132d9940d96
diff --git a/media-fonts/terminus-font/terminus-font-4.46.ebuild b/media-fonts/terminus-font/terminus-font-4.46.ebuild
index aa6798a4dbad..2ec48a03373b 100644
--- a/media-fonts/terminus-font/terminus-font-4.46.ebuild
+++ b/media-fonts/terminus-font/terminus-font-4.46.ebuild
@@ -17,7 +17,7 @@ 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_DEPEND}
+	${PYTHON_DEPS}
 	virtual/awk
 	pcf? ( x11-apps/bdftopcf )"
 RDEPEND=""
diff --git a/media-fonts/terminus-font/terminus-font-4.47.ebuild b/media-fonts/terminus-font/terminus-font-4.47.ebuild
index 88a3b1caad35..989749e2e555 100644
--- a/media-fonts/terminus-font/terminus-font-4.47.ebuild
+++ b/media-fonts/terminus-font/terminus-font-4.47.ebuild
@@ -17,7 +17,7 @@ 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_DEPEND}
+	${PYTHON_DEPS}
 	virtual/awk
 	pcf? ( x11-apps/bdftopcf )"
 RDEPEND=""
diff --git a/media-fonts/terminus-font/terminus-font-4.48.ebuild b/media-fonts/terminus-font/terminus-font-4.48.ebuild
new file mode 100644
index 000000000000..989749e2e555
--- /dev/null
+++ b/media-fonts/terminus-font/terminus-font-4.48.ebuild
@@ -0,0 +1,91 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+PYTHON_COMPAT=( python3_{5,6,7} )
+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 ~sh ~sparc ~x86 ~x86-fbsd ~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
+}