gentoo resync : 25.05.2018

3 files changed, 3 insertions, 89 deletions

diff --git a/media-fonts/terminus-font/Manifest b/media-fonts/terminus-font/Manifest
index e4c89db25ad4..5f517754df0a 100644
--- a/media-fonts/terminus-font/Manifest
+++ b/media-fonts/terminus-font/Manifest
@@ -1,7 +1,5 @@
-DIST terminus-font-4.39.tar.gz 324890 BLAKE2B ed5ad839311ac08601ea78a617db285c6e9a7bee6776d4902879aa95a26c79eca4195ee58bd5b2f44d25c401222ed966b5a3cfacbcff7ccad873b3155e009c67 SHA512 d2b1c55584eabf423a455ea11d90ba8037b4e5823c677a8c604de1e41c55d829b743db2d1932cd755064db681fcd0b5be8484439ddde4394955d0af5174ff591
 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.39-r1.ebuild 2696 BLAKE2B 71a63ebe584b926b19e1da008704c0609fe4da9004cdc240f1703cae24a96c7f0bd6de464ccad6ddb9082ab2442d7787cd068a937700df0074f5793dfbeaae30 SHA512 c445efab8de32f841076128525ece1ad4ebf56108fb4d3e5c19f0a5cee970aa58e777ff09b1ca64c94390e580daa71886f1119ba494278f65a8d587b8f30b244
 EBUILD terminus-font-4.40.ebuild 2662 BLAKE2B 02446fd7b02c53f52552f8bcb73c4d0ce6f9445e2af1ba8d88865ed88b52c664d6997266c3830c70291f072ae7273d216f2098f88737fb61095061d8628c70d9 SHA512 074a9be54fb79b9e86540fef5a49d6c075d443d29b21eb7e1ab160c102ff4e8649e608f71e928f24c900c342dc0b9bc1fc3958e994f21f554308e2d2ccd33f5e
-EBUILD terminus-font-4.46.ebuild 2640 BLAKE2B 3e3ae6413e4ef2a9552f14097ae208d0cc0de2630b23a788311232c8b3c66a9455b323bbb4583b7f02f47d19f56a1febcb776b2fe807c9da9082998c77961a2e SHA512 6c670b9ff6d173fe65e6bcbaef4cdc595be0f9943b4fb5fb0a4c271b70f3998883170d6de4326bdf4021566ca8f220045537bc94afd85483ef922ab333aadd2c
+EBUILD terminus-font-4.46.ebuild 2638 BLAKE2B 705a200f18b30d3627f68323e2b1be07e65497e3f6508cf60fba0fb0aff16d7ae9883dcbdbeb22b8d04f90ebb132dc2132c555ce0d68c647bc836323444a148b SHA512 c4dc34a7033eac72e482c6cf74969184c790610c0d290e1ff7ecc0eb4261060bbe0e4bcc63e0a863d652f1f8ea2c9ee5626a51034b0626761abbdf3bd99c16b0
 MISC metadata.xml 1727 BLAKE2B 2b0553ed8023868296f4c29a97a3f27c799933af878fcbfb6b5fb6cc1f8c94c53d3581da7b7b8550b8e41e2d5f69a13f3b88e19a7b53b5b42a42e4f1c9523299 SHA512 fc2290e70f773c2418aa9a0eb58013a855eece0edb345da21ed176739a22a3344d6ec97b9f72b2480b57b4d4c68400db00bbd9dafd55b3bb02ffaaed1d788967
diff --git a/media-fonts/terminus-font/terminus-font-4.39-r1.ebuild b/media-fonts/terminus-font/terminus-font-4.39-r1.ebuild
deleted file mode 100644
index daf180b3bc5b..000000000000
--- a/media-fonts/terminus-font/terminus-font-4.39-r1.ebuild
+++ /dev/null
@@ -1,84 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-inherit eutils 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() {
-	# 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 && epatch "${S}"/alt/ao2.diff
-	use center-tilde && epatch "${S}"/alt/td1.diff
-	use distinct-l && epatch "${S}"/alt/ll2.diff
-	use ru-i     && epatch "${S}"/alt/ij1.diff
-	use ru-k     && epatch "${S}"/alt/ka2.diff
-	use ru-dv    && epatch "${S}"/alt/dv1.diff
-	use ru-g     && epatch "${S}"/alt/ge2.diff
-	use quote    && epatch "${S}"/alt/gq2.diff
-}
-
-src_configure() {
-	# selfwritten configure script without executable bit
-	chmod +x ./configure || die
-	./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 442b89128e6f..6fe4b660df39 100644
--- a/media-fonts/terminus-font/terminus-font-4.46.ebuild
+++ b/media-fonts/terminus-font/terminus-font-4.46.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -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"