gentoo resync : 12.01.2019

7 files changed, 99 insertions, 6 deletions

diff --git a/media-fonts/Manifest.gz b/media-fonts/Manifest.gz
index 6e0bcfc5b624..4a40795088ff 100644
--- a/media-fonts/Manifest.gz
+++ b/media-fonts/Manifest.gz
diff --git a/media-fonts/cantarell/Manifest b/media-fonts/cantarell/Manifest
index 50ac03e38397..04bb473ad5cf 100644
--- a/media-fonts/cantarell/Manifest
+++ b/media-fonts/cantarell/Manifest
@@ -1,5 +1,5 @@
 DIST cantarell-fonts-0.0.25.tar.xz 351768 BLAKE2B cfdd7570c99db9e75658369df9eb243ddb6290dfe8017bcff12edf876134ba185083e70676369962a2a9f35365e92268625b47da286aca640927fb7a47073295 SHA512 c09c3ecb3d4c50f613234398fabd327ca92b8abbc27082e8e98f2944f3dd9f0c2ff4c022ff5e5503a86e724bb8e2fbf6cd081f8a29e91b4209f5bf0e32168c3e
 DIST cantarell-fonts-0.101.tar.xz 263480 BLAKE2B 79652cf87088a8fe505895cad1f2474e0cb52e4be8a977ae06442a0e8ca6ba6a7f93c811b14e56fd5e61a17c97175b2374d180e435cbac00af8c10b272461802 SHA512 52dbd8358de7e20146e627ab0b1298efb97ee335e45d8e63bab7c3a7d05314d0bb94ac448e34af4c6f7212623185a9e03a30eb24acee4915142e40af0086bbfb
 EBUILD cantarell-0.0.25.ebuild 641 BLAKE2B 6b42a567d4f3e9c39954865a322b561ffd0a1c5652fbfff951a42376fb26f737b062ecea048edfe553323910dd6f2ac0b0b0c72d030c5dd466a60b9fd49a7ebf SHA512 a7de207b7637b77982e1aaf5a2091afca6012a6f6f7b53a4f172ffea87a063e37a511380fb5354b6e912a0875391f43a28b7c6f41302cbb1fcb36206de95fc16
-EBUILD cantarell-0.101.ebuild 1258 BLAKE2B 8dcc538146be8782a787809fe27a88f98a817bc2f23e647e7f6e2bcfebab157737b412752eb4f0e103baa7cbe834810083e43f0ecdeaf8db545cc1df9649ff12 SHA512 d7228b34b32e926911b5c8d200d8f323480f6fd244d037c743eb34900ada32d4ca6465e3b0976c62030a7745bcecb46a78ce92580763bb58673aee436fe2daa3
+EBUILD cantarell-0.101.ebuild 1257 BLAKE2B d15ca7d6cc7850ba457beccadd83e49ec2620d085956de26c8e54dce8a11f3c4e677905c0e8e0dfc6931bae287b7e394cd5edeb1bb99e8a79c89a3ead87550cf SHA512 158e28809080dd294030f2c4c81d315bc319d4f998aecba0d436f2084d623f8c1a40855f2e4bcafda1bb3b7c120aebd66e0533597fad41dc565ff1b7dd671463
 MISC metadata.xml 249 BLAKE2B e71e1b95fee768c696704acbf7e3cf0e599ed2bc8de92bae0141d1194ef9e842bdc292798904487a9b90ddfda9b0e84abd3b76b1518576c1d288240e4e46f110 SHA512 c40662134899a5c9f0369a1017806f35adf3280a0b3c91726f7a8ca6012a073a8b471583f5bfb6fe95faac1dcf607e8e2e43f8c91d48ec46f4a8824e2f551506
diff --git a/media-fonts/cantarell/cantarell-0.101.ebuild b/media-fonts/cantarell/cantarell-0.101.ebuild
index b17446c96fd3..1f065b111b71 100644
--- a/media-fonts/cantarell/cantarell-0.101.ebuild
+++ b/media-fonts/cantarell/cantarell-0.101.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Authors
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -11,7 +11,7 @@ HOMEPAGE="https://wiki.gnome.org/Projects/CantarellFonts"
 
 LICENSE="OFL-1.1"
 SLOT="0"
-KEYWORDS="alpha amd64 arm ~arm64 ~hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE=""
 
 RDEPEND="media-libs/fontconfig"
diff --git a/media-fonts/glass-tty-vt220/Manifest b/media-fonts/glass-tty-vt220/Manifest
index a41b780b817b..08bc7832a052 100644
--- a/media-fonts/glass-tty-vt220/Manifest
+++ b/media-fonts/glass-tty-vt220/Manifest
@@ -1,3 +1,3 @@
 DIST Glass_TTY_VT220-001.3.ttf 88228 BLAKE2B 0ea3b0f47f280f4b58f3a0ab844ec69c3870c9cf12d7f1cf1124ffbdcd451988aafcf9aa714d42610d3bba44c352b93791a7a2457f1ad3cd2e690a3f058cfb61 SHA512 0b3b598bbdcc8f1177b48a7cedd2ad035a8a95d17d162d868e7c988a9d918f2756a8fe674bef3f30357225a87ea4e3adde01889502540d6920210161edc37023
-EBUILD glass-tty-vt220-001.3.ebuild 572 BLAKE2B 8740e70c6d10fe612a4242b77b00cbb96f0a9edfa3ad1dfe5825c060f7261007a4f4c22e948e6eeeca3304d1de1a71c7869857438d47937f24b293e1b660248a SHA512 1d0d1c9bd022b3cc58afdc37cef4e8bf7ca69629bd5d725edb4e2fee63175426a877a9968e216a9ca9de92873338bd9513af9a4878c67f82cb0174f3d5b0868e
+EBUILD glass-tty-vt220-001.3.ebuild 568 BLAKE2B 4950e808e21d9729d741b17d6c51c5766d5c05777c1749b66463f287c9ecadf1ee0c3065d368a80ce94eb0acfeb6f3240fdfe88e8dae4dde665746adb638ff8a SHA512 de4b9991e5597c22efecfe95fde6ef053317939341f6bd65117767ab9eaf367fa93d51ada3df56857ec1c789682f1bbe5349ea68714a76ffa31ba17eea013adc
 MISC metadata.xml 857 BLAKE2B 2c79eff84b11bae387c6d591fb90551c6e6f5b31d72f14925a135c23b62c95e9e4ba81513a3ccfa44eda0da20fc2b0e432268b122dae09197e89cc7ffa97f671 SHA512 c5bc22dc0a7bb56da981b7eb9b1403f937a51f9d6e646dd6693db24aa7bb8064d206f0b51ab07f8f1358b4039c87957c6f33bca608d74880375081456e70f5cd
diff --git a/media-fonts/glass-tty-vt220/glass-tty-vt220-001.3.ebuild b/media-fonts/glass-tty-vt220/glass-tty-vt220-001.3.ebuild
index a73acda67581..704b5cb1b0f5 100644
--- a/media-fonts/glass-tty-vt220/glass-tty-vt220-001.3.ebuild
+++ b/media-fonts/glass-tty-vt220/glass-tty-vt220-001.3.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -9,7 +9,7 @@ DESCRIPTION="Hacking with Style: TrueType VT220 Font"
 HOMEPAGE="http://sensi.org/~svo/glasstty/"
 SRC_URI="http://sensi.org/~svo/glasstty/Glass_TTY_VT220.ttf -> Glass_TTY_VT220-${PV}.ttf"
 
-KEYWORDS="amd64 ~arm ~arm64 x86"
+KEYWORDS="amd64 ~arm arm64 x86"
 LICENSE="freedist"
 SLOT="0"
 
diff --git a/media-fonts/terminus-font/Manifest b/media-fonts/terminus-font/Manifest
index f0f5ed460827..9672527157ca 100644
--- a/media-fonts/terminus-font/Manifest
+++ b/media-fonts/terminus-font/Manifest
@@ -1,3 +1,5 @@
 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 2632 BLAKE2B f6212bbc817ce13639f59588a6770a63da9b8cdab9e634af2d40cf8dc43d76e94f5ea6b6bc5e1a06a131b412bd39b69462760675f35c7bd16d433c0beeb3e6c4 SHA512 5520eef30caf534abce1c5db60fa3181441ef4d8392342fd4046914fb833b47db4866dd8ddbc4b029dacf702c2cb9c4b8f31d56c80c96070f47a9882b9875c4e
+EBUILD terminus-font-4.47.ebuild 2639 BLAKE2B 0a92d8bd6f7e2ac20553765d1de74f03f1d4ac12636897cd21df8d9dd68c672d9d9e936586ef834e40278e336476e691e5670f119618288706dd09b92914f085 SHA512 1f203215affee738b7f1ed1a5b67fea5b379ffcd0007838577291c1103bc8d596ef8842c5dbd1105496b41ceb034af49bf9e48c77613f91b34b2edc7328100fc
 MISC metadata.xml 1568 BLAKE2B 47b12c122ee6823023bbc4844474e5f2eaad16bfd5f0853ff192c60c007a3fc03353a64f26d824fd43ae96d5044bdaccbbc2fe75177080f76a9db69ff8f44b6a SHA512 6255452e74da62e7b081fdb8a3eb4069e4419503d7364cac2ff1c014858482b99713a33a18b1b8bc3bdc409a90b2d6e03421e07559f74f4c8f0ae132d9940d96
diff --git a/media-fonts/terminus-font/terminus-font-4.47.ebuild b/media-fonts/terminus-font/terminus-font-4.47.ebuild
new file mode 100644
index 000000000000..d5e7073c67f4
--- /dev/null
+++ b/media-fonts/terminus-font/terminus-font-4.47.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_{4,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_DEPEND}
+	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
+}