gentoo resync : 08.07.2021

4 files changed, 8 insertions, 103 deletions

diff --git a/media-fonts/terminus-font/Manifest b/media-fonts/terminus-font/Manifest
index 6b7131224976..55352814bdaf 100644
--- a/media-fonts/terminus-font/Manifest
+++ b/media-fonts/terminus-font/Manifest
@@ -1,5 +1,3 @@
 DIST terminus-font-4.49.1.tar.gz 648345 BLAKE2B 8c2edff7e57572361cf9a4907a165f8af69cbd5a3ae15817d02d43ab5134278ab64b269e6bd8c79d2107e5c8c51b58f07ab45c308891464cbc8e3e15767efadb SHA512 2e3a99960c459a453b5879bebbebeb653f0a22060177bf75c67bbeb7d32cfe1acce9e74a88fdc42e299b6dc402e0708552487abd26e80e985c7d6059b0d445a8
-DIST terminus-font-4.49.tar.gz 648477 BLAKE2B 67bddaae88b7411381bce5e8fe5c1b0dab334a33f1371a33038556beffa779afec8706f27b156e5660bfab5b8b7aeda75267c68945e1be3b41dbea7e9345f164 SHA512 27d396e7fe399728b5e9228c901922588eab0b344ea438fcf98f18f80ce816d838a42d5a3da0b5644d895747bcbda0e30bb8dabf342c0439d1f6b51f7acf8496
-EBUILD terminus-font-4.49.1.ebuild 2722 BLAKE2B 77655c67ffb24927e56afc3faa5968f22e5f91a8b5b287968aad08ade1df6c30105293a37b956b38ebc53aebecf88997051fdcf56944fd2119eec299880d865d SHA512 c49c0b21aa5ef18083d7447f04bc5b603a0a59180659de1b7a9267bc8ad65ca6793cf6f1353414c5be0e0253b4aa67bcd1577507e4fbc9fd783c691e3425603d
-EBUILD terminus-font-4.49.ebuild 2692 BLAKE2B e4c34d0d5ce30238b52837946b5c6279efe0a54597dbd531914b8cfa343b0fb32654368fe52b4dcee8e83182267ca240bcb9669f53fbfd83536bb469c5c3a12d SHA512 fcf8edfd26105d8c4e0037b9f8b32031d1e3cbe25e8ef99d2e03c7b36d3cddf8a53236bbb27ebc894241cd9184b9516f46317f3119559a824c7c66d4aae1b5c2
-MISC metadata.xml 1900 BLAKE2B fd9959aeb2c59a0c96453e37f39efeab0e3a35af8bc4335c9373df175c4e502656d7a31e9c091814b32c69a4c83c088c1754149debe7432a27247ea3b877ec9b SHA512 d8ac7b4f8ec5a24e525aec0ff6268704e33b56c4e50e0bb1734b8d135aad4bc00572a288f405721114eeddbe963ac87ca9c06de02026520e05d38830713e3d44
+EBUILD terminus-font-4.49.1.ebuild 2725 BLAKE2B 9bfdf6b6888fc1f1cb35551b03d1136b76743cf36a59d4daa1ef9dc38db250cbac572a8c99542baf6a202f5f825b3c157d2c234ca78b3e14b353c80f5aa27773 SHA512 fc6dbe24f63f683734ea36cd80108599e2ba51087fd396c2c10011539539d5a4becfc80f5f0c493add1ac68d111885025117c9c3cb8e8f64a738f864cebd426b
+MISC metadata.xml 1925 BLAKE2B d80e4a334efca11b8446d575026f1cb8ae828a8fc809e9d10d82af6048f8a09ae46cb6d95b41179708c9b5179c7fc0f7e162cf852f2c5ef6fe7bd58e2d3cb90d SHA512 9279bbd00606410c1f36c00a69f3f226da3be9f3a14165d2e56ed4b8e315ba6c7d9c720731029c0899b0bd2c357465ca5ebdcc0eb4a11456fb89d3fc900c01d3
diff --git a/media-fonts/terminus-font/metadata.xml b/media-fonts/terminus-font/metadata.xml
index 3c5accf8462c..ba130008fda5 100644
--- a/media-fonts/terminus-font/metadata.xml
+++ b/media-fonts/terminus-font/metadata.xml
@@ -13,6 +13,7 @@
     <email>slashbeast@gentoo.org</email>
     <name>Piotr Karbowski</name>
   </maintainer>
+  <stabilize-allarches/>
   <use>
     <flag name="a-like-o">
       Changes view of letter 'a' - a looks like o (see homepage)
@@ -24,7 +25,7 @@
       Install Open Type Font (OTF) (required for HarfBuzz backend)
     </flag>
     <flag name="pcf">
-      Install Portable Compiled Font (PCF) (required for X11)
+      Install Portable Compiled Font (PCF) (X11 bitmap fonts)
     </flag>
     <flag name="psf">
       Install PC Screen Font (PSF) with unicode data (for linux console)
diff --git a/media-fonts/terminus-font/terminus-font-4.49.1.ebuild b/media-fonts/terminus-font/terminus-font-4.49.1.ebuild
index 04fed52ebaeb..7fbe98e86d71 100644
--- a/media-fonts/terminus-font/terminus-font-4.49.1.ebuild
+++ b/media-fonts/terminus-font/terminus-font-4.49.1.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-PYTHON_COMPAT=( python3_{7,8,9,10} )
+PYTHON_COMPAT=( python3_{8..10} )
 inherit font python-any-r1
 
 DESCRIPTION="A clean fixed font for the console and X11"
@@ -12,11 +12,11 @@ SRC_URI="mirror://sourceforge/project/${PN}/${PN}-$(ver_cut 1-2)/${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"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~ppc-macos"
 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
+BDEPEND="app-arch/gzip
 	${PYTHON_DEPS}
 	virtual/awk
 	pcf? ( x11-apps/bdftopcf )"
@@ -26,7 +26,7 @@ FONTDIR=/usr/share/fonts/terminus
 FONT_CONF=( 75-yes-terminus.conf )
 DOCS=( README README-BG AUTHORS CHANGES )
 
-REQUIRED_USE="X? ( pcf )"
+REQUIRED_USE="X? ( || ( otf pcf ) )"
 
 pkg_setup() {
 	python_setup
diff --git a/media-fonts/terminus-font/terminus-font-4.49.ebuild b/media-fonts/terminus-font/terminus-font-4.49.ebuild
deleted file mode 100644
index 7f8326f79edb..000000000000
--- a/media-fonts/terminus-font/terminus-font-4.49.ebuild
+++ /dev/null
@@ -1,94 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{7,8,9,10} )
-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"
-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
-	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' '')
-		$(usex otf otb '')
-	)
-	[[ ${#args[@]} -gt 0 ]] && emake "${args[@]}"
-}
-
-src_install() {
-	local args=(
-		$(usex psf 'install-psf install-psf-vgaw install-psf-ref' '')
-		$(usex pcf 'install-pcf' '')
-		$(usex otf 'install-otb' '')
-	)
-	# 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
-
-	use otf && FONT_SUFFIX=otb
-	font_src_install
-
-	einstalldocs
-}