gentoo resync : 03.11.2019

3 files changed, 16 insertions, 61 deletions

diff --git a/media-fonts/x11fonts-jmk/Manifest b/media-fonts/x11fonts-jmk/Manifest
index 4a5375c695f1..db946fe56c47 100644
--- a/media-fonts/x11fonts-jmk/Manifest
+++ b/media-fonts/x11fonts-jmk/Manifest
@@ -1,5 +1,4 @@
 AUX gzip.patch 472 BLAKE2B 3804de127898501b76be41a8bf016bc1eb224b19a1d56ee1dbe6345352de5f6634692d2c45c1747bf38bb9a90fdaa42cb359e711b7591398576e51e624940099 SHA512 b3ba5684c9d60435032f69e22f74feda6d4a49689db9ef28acd5ca8fbc8190c344e8cb7991ea707f21317f55dd2edaaf12b6e0bb14d70d204d252a63b184a280
 DIST jmk-x11-fonts-3.0.tar.gz 624357 BLAKE2B 5513e46116cb7ac63e69d4d0fe03f627e437a11ea378c4213b1cbf13035a5e1c14dc4c1bf230e6490829b4cafc2ba3dd1b733f8549d28aeaa1e7389e527e8b85 SHA512 7a99689be59eaf50742932ce27c8b41a99d10076adf9c2990e11745a873eec610257d50e844f8380658d340cf821724d459dc9b6b189666180596f2bf255957f
-EBUILD x11fonts-jmk-3.0-r1.ebuild 756 BLAKE2B af8c310da7119c996013917e4d7c82cecc2ae53ce0faa99587ad196a87855a51fc45b6c9c2ca1fabf6267e93498a9f73171989fe027416d1ff224c2ef21f5012 SHA512 d847b0f2fd8b3950c541d226452d1183ea6a98537eca1d90f3a96578136d83bae5de350a3bd52b9fc2d81ab63c5bea867fc1d90316234d21465ab240508d1dbc
-EBUILD x11fonts-jmk-3.0-r3.ebuild 745 BLAKE2B 4870507346612029d634acf11c8eecc199abbc03c0c6499ff7ef7a21fcb358dc5c918c7a66c5a14e28c595a51d76ccab54c211278f78c5b9155171dc659009e2 SHA512 4af811442061cf18d724951059b88c458a8a8eb3d7ffdafe8776f94f30a5f995ef385539273555d3b084332b201d3b489f4406481926c90e6f8e5984576834f9
+EBUILD x11fonts-jmk-3.0-r3.ebuild 666 BLAKE2B f7762171821b04761f7db7dcc56ae36d6c3da84e4304354a4be8d9056fe379229c4b8ca9b8c22e0c16a959a5de418641c44f11c9e2e376bf30a348d7678b32c0 SHA512 607dbedf33fa5b8b0d31462a766b5dc160e7e6b56124d45ef39683525e4acb96a41b329d1c6a081068106d56134e63e42b8bea65874c51e935f14949f83cd454
 MISC metadata.xml 234 BLAKE2B 1fff66672cffbf45f59f81eb07ced35707962cf8cd6a10b7596e848489abc2b3f6bd00f629762ac99c59c6edbe687bcaffb61442674bb94c50649e09250d6c68 SHA512 582b5859e81dd9914f3a2665bcdec86d1ba10026f0b0c8207fa0a6a621eaedd40286fc01250e8fed3d63750a4f39c6c8e4e5d358d360c0113e0904f297624ff5
diff --git a/media-fonts/x11fonts-jmk/x11fonts-jmk-3.0-r1.ebuild b/media-fonts/x11fonts-jmk/x11fonts-jmk-3.0-r1.ebuild
deleted file mode 100644
index 1f561ed25693..000000000000
--- a/media-fonts/x11fonts-jmk/x11fonts-jmk-3.0-r1.ebuild
+++ /dev/null
@@ -1,39 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=0
-
-inherit eutils
-
-MY_P=jmk-x11-fonts-${PV}
-S=${WORKDIR}/${MY_P}
-DESCRIPTION="This package contains character-cell fonts for use with X"
-SRC_URI="http://www.pobox.com/~jmknoble/fonts/${MY_P}.tar.gz"
-HOMEPAGE="http://www.jmknoble.net/fonts/"
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="alpha amd64 arm ia64 ppc s390 sh sparc x86"
-IUSE=""
-
-DEPEND="x11-misc/imake
-	x11-apps/mkfontdir
-	x11-apps/bdftopcf"
-RDEPEND=""
-
-FONTPATH="/usr/share/fonts/jmk"
-
-src_unpack() {
-	unpack ${A}
-	cd ${S}
-	epatch ${FILESDIR}/gzip.patch
-}
-
-src_compile() {
-	xmkmf || die
-	emake || die
-}
-
-src_install() {
-	make install INSTALL_DIR="${D}${FONTPATH}" || die
-	dodoc README NEWS
-}
diff --git a/media-fonts/x11fonts-jmk/x11fonts-jmk-3.0-r3.ebuild b/media-fonts/x11fonts-jmk/x11fonts-jmk-3.0-r3.ebuild
index bbb83bf52277..5b4c856ce68c 100644
--- a/media-fonts/x11fonts-jmk/x11fonts-jmk-3.0-r3.ebuild
+++ b/media-fonts/x11fonts-jmk/x11fonts-jmk-3.0-r3.ebuild
@@ -1,38 +1,33 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
-FONT_PN=jmk
+EAPI=7
 
-inherit font
+MY_P="jmk-x11-fonts-${PV}"
 
-MY_P=jmk-x11-fonts-${PV}
-S=${WORKDIR}/${MY_P}
 DESCRIPTION="This package contains character-cell fonts for use with X"
-SRC_URI="http://www.pobox.com/~jmknoble/fonts/${MY_P}.tar.gz"
 HOMEPAGE="http://www.jmknoble.net/fonts/"
+SRC_URI="http://www.pobox.com/~jmknoble/fonts/${MY_P}.tar.gz"
+
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~ppc ~s390 ~sh ~sparc ~x86"
-IUSE=""
+KEYWORDS="alpha amd64 arm ia64 ppc s390 sh sparc x86"
 
-DEPEND="x11-misc/imake
-	x11-apps/mkfontdir
+BDEPEND="
+	x11-misc/imake
+	>=x11-apps/mkfontscale-1.2.0
 	x11-apps/bdftopcf"
-RDEPEND=""
 
-src_unpack() {
-	unpack ${A}
-	cd "${S}"
-	eapply "${FILESDIR}"/gzip.patch
-}
+PATCHES=( "${FILESDIR}"/gzip.patch )
+
+S="${WORKDIR}/${MY_P}"
 
 src_compile() {
 	xmkmf || die
-	emake || die
+	default
 }
 
 src_install() {
-	make install INSTALL_DIR="${D}${FONTDIR}" || die
-	dodoc README NEWS
+	emake install INSTALL_DIR="${ED}/usr/share/fonts/jmk"
+	einstalldocs
 }