gentoo resync : 24.07.2021

3 files changed, 25 insertions, 31 deletions

diff --git a/media-fonts/terminus-font/Manifest b/media-fonts/terminus-font/Manifest
index 55352814bdaf..37bd026cc9dd 100644
--- a/media-fonts/terminus-font/Manifest
+++ b/media-fonts/terminus-font/Manifest
@@ -1,3 +1,3 @@
 DIST terminus-font-4.49.1.tar.gz 648345 BLAKE2B 8c2edff7e57572361cf9a4907a165f8af69cbd5a3ae15817d02d43ab5134278ab64b269e6bd8c79d2107e5c8c51b58f07ab45c308891464cbc8e3e15767efadb SHA512 2e3a99960c459a453b5879bebbebeb653f0a22060177bf75c67bbeb7d32cfe1acce9e74a88fdc42e299b6dc402e0708552487abd26e80e985c7d6059b0d445a8
-EBUILD terminus-font-4.49.1.ebuild 2725 BLAKE2B 9bfdf6b6888fc1f1cb35551b03d1136b76743cf36a59d4daa1ef9dc38db250cbac572a8c99542baf6a202f5f825b3c157d2c234ca78b3e14b353c80f5aa27773 SHA512 fc6dbe24f63f683734ea36cd80108599e2ba51087fd396c2c10011539539d5a4becfc80f5f0c493add1ac68d111885025117c9c3cb8e8f64a738f864cebd426b
-MISC metadata.xml 1925 BLAKE2B d80e4a334efca11b8446d575026f1cb8ae828a8fc809e9d10d82af6048f8a09ae46cb6d95b41179708c9b5179c7fc0f7e162cf852f2c5ef6fe7bd58e2d3cb90d SHA512 9279bbd00606410c1f36c00a69f3f226da3be9f3a14165d2e56ed4b8e315ba6c7d9c720731029c0899b0bd2c357465ca5ebdcc0eb4a11456fb89d3fc900c01d3
+EBUILD terminus-font-4.49.1.ebuild 2589 BLAKE2B 2776be8ef617cc89f25a437cf9c2e5e84e13372d03af62e117148fd0812aa076b7e36a4ace481004cfcd808a220eea0cc1d64154ffaa245f7c370f40d1d6c3df SHA512 0ff50ac3845e37e9d6929a24b80cb000124f92fbff2335918773a9e89bd32477a8400373498cb3f1af585a69e3e5e5c7d99dc080cdc5a8f294bac8d221f8f003
+MISC metadata.xml 1944 BLAKE2B daba3c48ac7cf44de9d97f4a7cd652ccb1579945b1cd5a8971b28a58c98888497b745fb3552c1cbfeba47ae60b31e03b6992876d7f08b2370bda346e71077134 SHA512 f81cb538bf9144fc233eff9ec466dbc33fb27aadec4e76039469a8c0a0dd982c26d4240515cc17867378e9a2f4ea37182501e52f880db9d8fac8d3cd7ae6fe6e
diff --git a/media-fonts/terminus-font/metadata.xml b/media-fonts/terminus-font/metadata.xml
index ba130008fda5..627ca1e213a0 100644
--- a/media-fonts/terminus-font/metadata.xml
+++ b/media-fonts/terminus-font/metadata.xml
@@ -18,14 +18,21 @@
     <flag name="a-like-o">
       Changes view of letter 'a' - a looks like o (see homepage)
     </flag>
+    <flag name="center-tilde">
+      Place the '~' character vertically centered on the line instead of to the
+      top.
+    </flag>
     <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) (X11 bitmap fonts)
+    <flag name="pcf-8bit">
+      Install Portable Compiled Font (PCF) (X11 bitmap fonts), 8-bit encodings
+    </flag>
+    <flag name="pcf-unicode">
+      Install Portable Compiled Font (PCF) (X11 bitmap fonts), Unicode encodings
     </flag>
     <flag name="psf">
       Install PC Screen Font (PSF) with unicode data (for linux console)
@@ -47,13 +54,6 @@
     <flag name="ru-k">
       Changes view of Russian letter 'k' (see homepage)
     </flag>
-    <flag name="center-tilde">
-      Place the '~' character vertically centered on the line instead of to the
-      top.
-    </flag>
-    <flag name="pcf-unicode-only">
-      Remove non-unicode PCF fonts that could be problematic. See bug #520222.
-    </flag>
   </use>
   <upstream>
     <remote-id type="sourceforge">terminus-font</remote-id>
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 7fbe98e86d71..6c5eb7ba0f45 100644
--- a/media-fonts/terminus-font/terminus-font-4.49.1.ebuild
+++ b/media-fonts/terminus-font/terminus-font-4.49.1.ebuild
@@ -13,20 +13,21 @@ 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"
-IUSE="a-like-o +center-tilde distinct-l +otf +pcf +pcf-unicode-only +psf quote
+IUSE="a-like-o +center-tilde distinct-l +otf pcf-8bit +pcf-unicode +psf quote
 	ru-dv +ru-g ru-i ru-k"
 
 BDEPEND="app-arch/gzip
 	${PYTHON_DEPS}
 	virtual/awk
-	pcf? ( x11-apps/bdftopcf )"
+	pcf-8bit? ( x11-apps/bdftopcf )
+	pcf-unicode? ( x11-apps/bdftopcf )"
 RDEPEND=""
 
 FONTDIR=/usr/share/fonts/terminus
 FONT_CONF=( 75-yes-terminus.conf )
 DOCS=( README README-BG AUTHORS CHANGES )
 
-REQUIRED_USE="X? ( || ( otf pcf ) )"
+REQUIRED_USE="X? ( || ( otf pcf-8bit pcf-unicode ) )"
 
 pkg_setup() {
 	python_setup
@@ -62,33 +63,26 @@ src_configure() {
 
 src_compile() {
 	local args=(
-		$(usex psf 'psf psf-vgaw' '')
-		$(usex pcf 'pcf pcf-8bit' '')
-		$(usex otf otb '')
+		$(usex otf otb "")
+		$(usex pcf-8bit "pcf-8bit" "")
+		$(usex pcf-unicode "pcf" "")
+		$(usex psf "psf psf-vgaw" "")
 	)
 	[[ ${#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' '')
+		$(usex otf "install-otb" "")
+		$(usex pcf-8bit "install-pcf-8bit" "")
+		$(usex pcf-unicode "install-pcf" "")
+		$(usex psf "install-psf install-psf-vgaw install-psf-ref" "")
 	)
 	# 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[@]}"
+	[[ ${#args[@]} -gt 0 ]] && emake DESTDIR="${ED}" CHECKDIR="${ED}" "${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
+	use otf && FONT_SUFFIX=otb font_src_install
 
 	einstalldocs
 }