From 40aaaa64e86ba6710bbeb31c4615a6ce80e75e11 Mon Sep 17 00:00:00 2001
From: V3n3RiX <venerix@redcorelinux.org>
Date: Wed, 28 Apr 2021 20:21:43 +0100
Subject: gentoo resync : 28.04.2021

---
 media-fonts/x11fonts-jmk/Manifest                  |  3 +-
 .../x11fonts-jmk/x11fonts-jmk-3.0-r3.ebuild        | 33 ----------------------
 .../x11fonts-jmk/x11fonts-jmk-3.0-r4.ebuild        | 12 ++++----
 3 files changed, 7 insertions(+), 41 deletions(-)
 delete mode 100644 media-fonts/x11fonts-jmk/x11fonts-jmk-3.0-r3.ebuild

(limited to 'media-fonts/x11fonts-jmk')

diff --git a/media-fonts/x11fonts-jmk/Manifest b/media-fonts/x11fonts-jmk/Manifest
index 9c5618515b48..b7dc74087ce7 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-r3.ebuild 665 BLAKE2B fe9a6d8de5f17eea74700bc9e0310a0cd3e2da43873300659a381888a5b99c3765135ff34a27d9a02db05f6edc73420b0f25988d575f154cf5415a991f5f41e1 SHA512 7d1c644460da8ebfd9c76a811ba033187267ffbde8a5047009da5060eda015ec975eed2cfbe3f4e063eee96129f835a666374ebde7e16fe4552f0433c4c4df19
-EBUILD x11fonts-jmk-3.0-r4.ebuild 717 BLAKE2B bd210051dbb25da2b576b9215dbbb0dad63f7aa362f80019ac1fbc66d32e1078a9e8a886825422f576409a4c2be7c0ad817a66e2d081a1770da6c27608b7aa51 SHA512 301ea0d64a55edc38a66fea7e8cf3f4aa54ff5b74eafbeeb333b4987b0ba20b48376689287a539d22da6b8bd89a8741ce44cda8d5c731321d049f40951426207
+EBUILD x11fonts-jmk-3.0-r4.ebuild 818 BLAKE2B 16ffe6214ab38e3b5dfaae4f771120e4602d0f1ad7dea79e6f4b93f6e38c18ce90a4efdfb6131a175ddf3635d68bcf33d7d12968329b6c506e56ceee6a0ae8c6 SHA512 975046d54f92f5583e38cbd797c71594eeac413659031eecf5e99f33d2701b5e36f3122b64a3e9eb3fb1627c5da637e51e3ae8076466e000faf8533fe292e730
 MISC metadata.xml 234 BLAKE2B 1fff66672cffbf45f59f81eb07ced35707962cf8cd6a10b7596e848489abc2b3f6bd00f629762ac99c59c6edbe687bcaffb61442674bb94c50649e09250d6c68 SHA512 582b5859e81dd9914f3a2665bcdec86d1ba10026f0b0c8207fa0a6a621eaedd40286fc01250e8fed3d63750a4f39c6c8e4e5d358d360c0113e0904f297624ff5
diff --git a/media-fonts/x11fonts-jmk/x11fonts-jmk-3.0-r3.ebuild b/media-fonts/x11fonts-jmk/x11fonts-jmk-3.0-r3.ebuild
deleted file mode 100644
index 3e27e1485653..000000000000
--- a/media-fonts/x11fonts-jmk/x11fonts-jmk-3.0-r3.ebuild
+++ /dev/null
@@ -1,33 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-MY_P="jmk-x11-fonts-${PV}"
-
-DESCRIPTION="This package contains character-cell fonts for use with X"
-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 sparc x86"
-
-BDEPEND="
-	x11-misc/imake
-	>=x11-apps/mkfontscale-1.2.0
-	x11-apps/bdftopcf"
-
-PATCHES=( "${FILESDIR}"/gzip.patch )
-
-S="${WORKDIR}/${MY_P}"
-
-src_compile() {
-	xmkmf || die
-	default
-}
-
-src_install() {
-	emake install INSTALL_DIR="${ED}/usr/share/fonts/jmk"
-	einstalldocs
-}
diff --git a/media-fonts/x11fonts-jmk/x11fonts-jmk-3.0-r4.ebuild b/media-fonts/x11fonts-jmk/x11fonts-jmk-3.0-r4.ebuild
index 8c31d829c7ae..0673462a08fd 100644
--- a/media-fonts/x11fonts-jmk/x11fonts-jmk-3.0-r4.ebuild
+++ b/media-fonts/x11fonts-jmk/x11fonts-jmk-3.0-r4.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
-inherit font
+inherit font toolchain-funcs
 
 MY_P="jmk-x11-fonts-${PV}"
 
@@ -12,10 +12,10 @@ SRC_URI="http://www.pobox.com/~jmknoble/fonts/${MY_P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha amd64 ~arm ~ia64 ppc s390 sparc x86"
+KEYWORDS="~alpha amd64 arm ~ia64 ppc ~s390 sparc x86"
 
 BDEPEND="
-	x11-misc/imake
+	>=x11-misc/imake-1.0.8-r1
 	>=x11-apps/mkfontscale-1.2.0
 	x11-apps/bdftopcf"
 
@@ -25,9 +25,9 @@ PATCHES=( "${FILESDIR}"/gzip.patch )
 
 S="${WORKDIR}/${MY_P}"
 
-src_compile() {
-	xmkmf || die
-	default
+src_configure() {
+	CC="$(tc-getBUILD_CC)" LD="$(tc-getLD)" \
+		IMAKECPP="${IMAKECPP:-$(tc-getCPP)}" xmkmf || die
 }
 
 src_install() {
-- 
cgit v1.2.3