gentoo resync : 30.06.2018

4 files changed, 3 insertions, 94 deletions

diff --git a/media-fonts/terminus-font/Manifest b/media-fonts/terminus-font/Manifest
index c5b835641cfb..f0f5ed460827 100644
--- a/media-fonts/terminus-font/Manifest
+++ b/media-fonts/terminus-font/Manifest
@@ -1,5 +1,3 @@
-DIST terminus-font-4.40.tar.gz 558440 BLAKE2B 60a9b6a62c2db82896071adee6004aeb54cefc1f1d1cc941e5322d8d318413bb1255e8219c3fb56f6568baee0998357c572348b4085dd884bf6bcf360448e9a1 SHA512 843da1f51e37d48ae88c88def965ed96c2236c183fb596705290a96eba41256a02197a298439b83913eb7679b32c2a8f44dd04de031be4db56285efd3d4c6900
 DIST terminus-font-4.46.tar.gz 590210 BLAKE2B 427b4878afd47cc6c1a0ba6b6116568630a618e313c24744b3465b3e301e142ccbb9bd5e336bed7d98f3d1e01a0a61c6fbdd17912f4d9332ed5430ef47bca4fe SHA512 ae221920ecff54b9575a25d30a429feee6e19ef1e9669896c34f86f80d5495c3654f5423ff1df76e86bc999d1f37c306048b44d8ca55144f0f299926d3d33b58
-EBUILD terminus-font-4.40.ebuild 2662 BLAKE2B 02446fd7b02c53f52552f8bcb73c4d0ce6f9445e2af1ba8d88865ed88b52c664d6997266c3830c70291f072ae7273d216f2098f88737fb61095061d8628c70d9 SHA512 074a9be54fb79b9e86540fef5a49d6c075d443d29b21eb7e1ab160c102ff4e8649e608f71e928f24c900c342dc0b9bc1fc3958e994f21f554308e2d2ccd33f5e
-EBUILD terminus-font-4.46.ebuild 2634 BLAKE2B 1f69c06c6d1ca1bb8bb96e6a7d75919e1706b5437b7eed01b4d580f3b8c73600383e4613997d7c21aeb3eee27cde15513ef20f0c2e5c32e99d57d3b295e83427 SHA512 cd5e5749453f86117d938f03e11fa96d0c003b1c326dc031103c0c593651d9f2be584d3df80046d936ef9f04611f25b6a4f41df39010d9b5faac6e1ccd8c5ef9
-MISC metadata.xml 1727 BLAKE2B 2b0553ed8023868296f4c29a97a3f27c799933af878fcbfb6b5fb6cc1f8c94c53d3581da7b7b8550b8e41e2d5f69a13f3b88e19a7b53b5b42a42e4f1c9523299 SHA512 fc2290e70f773c2418aa9a0eb58013a855eece0edb345da21ed176739a22a3344d6ec97b9f72b2480b57b4d4c68400db00bbd9dafd55b3bb02ffaaed1d788967
+EBUILD terminus-font-4.46.ebuild 2632 BLAKE2B f6212bbc817ce13639f59588a6770a63da9b8cdab9e634af2d40cf8dc43d76e94f5ea6b6bc5e1a06a131b412bd39b69462760675f35c7bd16d433c0beeb3e6c4 SHA512 5520eef30caf534abce1c5db60fa3181441ef4d8392342fd4046914fb833b47db4866dd8ddbc4b029dacf702c2cb9c4b8f31d56c80c96070f47a9882b9875c4e
+MISC metadata.xml 1568 BLAKE2B 47b12c122ee6823023bbc4844474e5f2eaad16bfd5f0853ff192c60c007a3fc03353a64f26d824fd43ae96d5044bdaccbbc2fe75177080f76a9db69ff8f44b6a SHA512 6255452e74da62e7b081fdb8a3eb4069e4419503d7364cac2ff1c014858482b99713a33a18b1b8bc3bdc409a90b2d6e03421e07559f74f4c8f0ae132d9940d96
diff --git a/media-fonts/terminus-font/metadata.xml b/media-fonts/terminus-font/metadata.xml
index c100d10f037b..0dd408f312e3 100644
--- a/media-fonts/terminus-font/metadata.xml
+++ b/media-fonts/terminus-font/metadata.xml
@@ -22,10 +22,6 @@
       Changes view of quotes: symmetric ` and '
       instead of asymmetric one (see homepage)
     </flag>
-    <flag name="raw-font-data">
-      Install RAW font data which should be compatible with most
-      UNIX systems (you don't need this on linux)
-    </flag>
     <flag name="ru-dv">
       Changes view of Russian letters 'de' and 've' (see homepage)
     </flag>
diff --git a/media-fonts/terminus-font/terminus-font-4.40.ebuild b/media-fonts/terminus-font/terminus-font-4.40.ebuild
deleted file mode 100644
index 7ce82f9a90de..000000000000
--- a/media-fonts/terminus-font/terminus-font-4.40.ebuild
+++ /dev/null
@@ -1,85 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-inherit font
-
-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
-	raw-font-data ru-dv +ru-g ru-i ru-k"
-
-DEPEND="app-arch/gzip
-	dev-lang/perl
-	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 )"
-
-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() {
-	# selfwritten configure script
-	./configure \
-		--prefix="${EPREFIX}"/usr \
-		--psfdir="${EPREFIX}"/usr/share/consolefonts \
-		--acmdir="${EPREFIX}"/usr/share/consoletrans \
-		--unidir="${EPREFIX}"/usr/share/consoletrans \
-		--x11dir="${EPREFIX}"/${FONTDIR} || die
-}
-
-src_compile() {
-	local args=(
-		$(usex psf 'psf txt' '')
-		$(usex raw-font-data 'raw' '')
-		$(usex pcf 'pcf' '')
-	)
-	[[ ${#args[@]} -gt 0 ]] && emake "${args[@]}"
-}
-
-src_install() {
-	local args=(
-		$(usex psf 'install-psf install-uni install-acm install-ref' '')
-		$(usex raw-font-data 'install.raw' '')
-		$(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
-}
diff --git a/media-fonts/terminus-font/terminus-font-4.46.ebuild b/media-fonts/terminus-font/terminus-font-4.46.ebuild
index fd6ed3a03247..6bb1a1711dad 100644
--- a/media-fonts/terminus-font/terminus-font-4.46.ebuild
+++ b/media-fonts/terminus-font/terminus-font-4.46.ebuild
@@ -12,7 +12,7 @@ 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"
+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"