gentoo Easter resync : 12.04.2020

6 files changed, 25 insertions, 219 deletions

diff --git a/media-fonts/unifont/Manifest b/media-fonts/unifont/Manifest
index fa66f50199e2..ded923ea8dc4 100644
--- a/media-fonts/unifont/Manifest
+++ b/media-fonts/unifont/Manifest
@@ -1,13 +1,7 @@
 AUX 10.0.06-make.patch 645 BLAKE2B 7aea0a47997233e54f150d4a25f3fb376106378b93e86a68c8623d0c66e3650c6fb4bd4a6c98441f14f2ef176b40bfc23addc4168c78e34797b75b6e17b565cc SHA512 b205457eb2ffe1f4693e82a5597f1a95b95a62744101bd5a73a36060030541a855a62f84fafe255fafaf1e89b7f89c707dace2eccbe7b2746c3059404e7bd38d
 AUX 11.0.02-make.patch 366 BLAKE2B 1d857d76826b5906c6405aa41728121624b345ad1f9bf2e8239691af1e5506dbad7eab1f590bf3bbfea45f174af0e8f8fa9d85b11542ea91edc218cdaa08d13b SHA512 f8a286c4ecd9af7ec32f2f90ba0ae91e2f9f4111cb1f65dbc4cef07dff787eae4ee96aca7e15a61d2ae8930f3537dd6fa77393dc720a4fc91300a2c9a5c1d9ea
-DIST unifont-10.0.04.tar.gz 15651848 BLAKE2B 6308298244c45b51647e7eeb41cf19e085be89677688402b3fa384f423c27cb666ad8254ab98d052a93e5f928f490890d767fd96fe4c963f6f628cf14c3d9983 SHA512 0f9bb622e469ed340cc5ff465f6922b32eed2115014cad3ff445e8b17cedbf7c4c7f0025825e14ec4d046d9a28edb6a90eb9d9e402c38ed22b10303141f473b9
-DIST unifont-10.0.05.tar.gz 15645240 BLAKE2B 2707891d66e7ee71b3bf68aa63ebfb303c6f2f85f39a48fb281484fedccfef02d76b05d9ce5ee5305c39336f26750dbf4b766db700b8f1a87046328be171efd7 SHA512 fa9ee669ecebf8ae86d4b972e66997fa8455ee37c0e95b3528394e7e10046fc0083950fca2fe84b265ae6066bbc9ed02dde1d7795f2fa5f34bdf8ffa47ecc042
 DIST unifont-10.0.06.tar.gz 15651257 BLAKE2B e146ffe9ab591e5d90d399d37e068f0c3002a67699698b3f6b22a14ca91fe0415a507d855b56caae4e50183d97978667edca2fa2095209abbc7d02a4f17c20b8 SHA512 36f1eed24b37aad2f2ef100c8d2be01363a5438e76771e9ae82fa61ce58a4dd51566063b8e7b1265696cfe2335f1017842fecac2a5a801913f82ac9bf24caa54
-DIST unifont-11.0.02.tar.gz 15874967 BLAKE2B ee3c887ae441e70a95aad9a8f11d955ef848a5d4921d9c4c340d2f91a4c795503f2ef514bae93899591978afb797bee9d03bc222801f7d2daed199fb6045769b SHA512 d0dc8ce079feb282f53c444df5819751a7c97788feed480dc5c5b8a239c8cc13ef258876ffe2830994e404c0a6f524481a405b273c7341703ceef5854c12a68d
-DIST unifont-9.0.06.tar.gz 14785468 BLAKE2B 9d2328eb8918e9af82235279b9d01bb3a0487480123f77d8d7a4618742c0938a3f62c33b7b148657ab83c7e6a79209ac959d4875b686083fb15167b254c8fa81 SHA512 767dc107d9a33008116b6939facbf31db6c7942acad257ad52a1a249f04b6215b41da928ef00e8308c2cc19924257cb0219d4eddd2b99502621ebd82e8673988
-EBUILD unifont-10.0.04.ebuild 1135 BLAKE2B 554f63191b97233aef18333a88952d38ce71ca268678b3db153403ee373beae7162d4f17c4bfff1a1a09e9b06644599cba228c7c19295552fb099f0bd1870915 SHA512 42596d03d88b89fdfb71294432452d0869e719eaf40d9a7d81142ba96dbc30c407845af1f5c755a10f3d8b55a14d923beefe0d2d815b77ecfe30a3b78676af9c
-EBUILD unifont-10.0.05.ebuild 1135 BLAKE2B 554f63191b97233aef18333a88952d38ce71ca268678b3db153403ee373beae7162d4f17c4bfff1a1a09e9b06644599cba228c7c19295552fb099f0bd1870915 SHA512 42596d03d88b89fdfb71294432452d0869e719eaf40d9a7d81142ba96dbc30c407845af1f5c755a10f3d8b55a14d923beefe0d2d815b77ecfe30a3b78676af9c
-EBUILD unifont-10.0.06.ebuild 1165 BLAKE2B 1c4ea9249f2da57d6de0f4980c9c964a295f6d14d0cd20f8666022d6c51dea48ee24eefb50a5df47bd1f3f62c5f9bf0248b4f58d9dcde5b51d623508bf9b5747 SHA512 017a9cc2700cee96bd60a3ad116b6ada5ee35d13ccbbec819dd0e1a7d9d3c7971fecd48cf805658fb01befa269504775c1cf855b4b1dbdac9ce6e4c6af7103f2
-EBUILD unifont-11.0.02.ebuild 1172 BLAKE2B 7a94de448b285688d0f77b425021d5ef52e4c30e595c7c676522e7e080034f8be3b725da26cb78921f44eacb683879f2ee452a53236f3c00fbcdaa964c67af1d SHA512 6c6bbc5026395ca585f690d0f7eb4a3fba420f9c3d80f92508713797a30103c3f547e00c8d23c6e745008e69eb9d0c884a010f3bd4a3985b53102f0c330388ac
-EBUILD unifont-9.0.06.ebuild 1125 BLAKE2B 777e3a44d0414b18efb905a8c6d8cf5dfd5d5965367e62d5b941edce31ffa3428101b102aedaea29362e66480e1dea053490895eb61ed345b5dfc030b1c21d8f SHA512 0dc03a28043afe0f4e7e2a1b8cab1985341d49ecd6433c8926e487d2447fc43c3381d69bbb61cc59ef25357f14d19acb2d2bfd0a2b682bb0fefeef70cdfafd38
+DIST unifont-13.0.01.tar.gz 21053298 BLAKE2B 981d3d79015df9fa401823034de532840652127bc881d13244243dc0fbaabc14212b006f1e72ff65233793c7064576b51855d6a8ab1f7d889e7837c9c22d4f5d SHA512 2987aa097f89b1287d126e44297b19e405e198bb8ede2e321e6452c60678ebf4cf0be5f059b9565f4584bad09801effabe64d01ab90f132f27b206174827b14b
+EBUILD unifont-10.0.06.ebuild 1173 BLAKE2B d7337cdda06f108bdab2ea4073537624fb604de5be3b9184f14d305413c9c21558cd7c105f3e6ff7ee33e83b51414161457d37d4464d9c086d9d1f9ee6177bcc SHA512 7474d5a58330937d9d0dea0efc657da9e5d48d65be4408818ee6ef5f40c264587e33d74030b98ec21c626dbe5447f1caedd76e4a3f8bbf48ea69c48ca0b7cb69
+EBUILD unifont-13.0.01.ebuild 1110 BLAKE2B 9b8d83517204cc8685321b3c67c06405a2ffbfb6f03841c41e07d8a7a9eeb74ed52b782732cd670ed680ecfc3c3445b1f602cd6cf4f05c706afe5b1e9319194a SHA512 fcd272f0c7fd3ce1961c956b4a7218586982c645c880cb146a39b70c694b8e85dabdcb9b2e14c828e2eef704062f4f35a01ce4a93b3f2d2d2bd90381b1bb77ed
 MISC metadata.xml 587 BLAKE2B f8ce31f7041e62e483b63f7883239f52fc45b1a91c9c35563df48791a19d2ba354dd4b192520486e11ef4d66eb36dc58f8a309dca5f73a2edb4786632bb06ed5 SHA512 1cbde4c79a99908c900a5283ca99249440477623c557859f1663bed14c8a3513cda8767e50606a38f8f3e2db1f270454a37a4e793f20124922239a61a497fcbc
diff --git a/media-fonts/unifont/unifont-10.0.04.ebuild b/media-fonts/unifont/unifont-10.0.04.ebuild
deleted file mode 100644
index c7f38721c874..000000000000
--- a/media-fonts/unifont/unifont-10.0.04.ebuild
+++ /dev/null
@@ -1,61 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit font toolchain-funcs xdg-utils
-
-DESCRIPTION="GNU Unifont - a Pan-Unicode X11 bitmap iso10646 font"
-HOMEPAGE="http://unifoundry.com/"
-SRC_URI="mirror://gnu/${PN}/${P}/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
-IUSE="fontforge utils"
-
-DEPEND="
-	fontforge? (
-		app-text/bdf2psf
-		dev-lang/perl
-		dev-perl/GD[png(-)]
-		media-gfx/fontforge
-		x11-apps/bdftopcf
-	)
-"
-RDEPEND="
-	utils? (
-		dev-lang/perl
-		dev-perl/GD[png(-)]
-	)
-"
-
-src_prepare() {
-	sed -i -e 's/install -s/install/' src/Makefile || die
-	default
-}
-
-src_compile() {
-	if use fontforge || use utils; then
-		tc-export CC
-		xdg_environment_reset
-		makeargs=(
-			CFLAGS="${CFLAGS}"
-			BUILDFONT=$(usex fontforge 1 '')
-		)
-		emake -j1 "${makeargs[@]}"
-	fi
-}
-
-src_install() {
-	makeargs+=(
-		DESTDIR="${ED%/}"
-		PCFDEST="${ED%/}${FONTDIR}"
-		TTFDEST="${ED%/}${FONTDIR}"
-		USRDIR=usr
-	)
-	use utils || makeargs+=( -C font )
-	emake -j1 "${makeargs[@]}" install
-	font_xfont_config
-	font_fontconfig
-}
diff --git a/media-fonts/unifont/unifont-10.0.05.ebuild b/media-fonts/unifont/unifont-10.0.05.ebuild
deleted file mode 100644
index c7f38721c874..000000000000
--- a/media-fonts/unifont/unifont-10.0.05.ebuild
+++ /dev/null
@@ -1,61 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit font toolchain-funcs xdg-utils
-
-DESCRIPTION="GNU Unifont - a Pan-Unicode X11 bitmap iso10646 font"
-HOMEPAGE="http://unifoundry.com/"
-SRC_URI="mirror://gnu/${PN}/${P}/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
-IUSE="fontforge utils"
-
-DEPEND="
-	fontforge? (
-		app-text/bdf2psf
-		dev-lang/perl
-		dev-perl/GD[png(-)]
-		media-gfx/fontforge
-		x11-apps/bdftopcf
-	)
-"
-RDEPEND="
-	utils? (
-		dev-lang/perl
-		dev-perl/GD[png(-)]
-	)
-"
-
-src_prepare() {
-	sed -i -e 's/install -s/install/' src/Makefile || die
-	default
-}
-
-src_compile() {
-	if use fontforge || use utils; then
-		tc-export CC
-		xdg_environment_reset
-		makeargs=(
-			CFLAGS="${CFLAGS}"
-			BUILDFONT=$(usex fontforge 1 '')
-		)
-		emake -j1 "${makeargs[@]}"
-	fi
-}
-
-src_install() {
-	makeargs+=(
-		DESTDIR="${ED%/}"
-		PCFDEST="${ED%/}${FONTDIR}"
-		TTFDEST="${ED%/}${FONTDIR}"
-		USRDIR=usr
-	)
-	use utils || makeargs+=( -C font )
-	emake -j1 "${makeargs[@]}" install
-	font_xfont_config
-	font_fontconfig
-}
diff --git a/media-fonts/unifont/unifont-10.0.06.ebuild b/media-fonts/unifont/unifont-10.0.06.ebuild
index 809688e7153e..6c00044c786c 100644
--- a/media-fonts/unifont/unifont-10.0.06.ebuild
+++ b/media-fonts/unifont/unifont-10.0.06.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 2003-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -11,7 +11,7 @@ SRC_URI="mirror://gnu/${PN}/${P}/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm ia64 ppc ppc64 ~s390 ~sh sparc x86"
+KEYWORDS="~alpha amd64 arm ~ia64 ppc ppc64 ~s390 sparc x86"
 IUSE="fontforge utils"
 
 DEPEND="
@@ -59,7 +59,7 @@ src_install() {
 		USRDIR=usr
 	)
 	use utils || makeargs+=( -C font )
-	emake "${makeargs[@]}" install
+	emake "${makeargs[@]}" COMPRESS=0 install
 	font_xfont_config
 	font_fontconfig
 }
diff --git a/media-fonts/unifont/unifont-11.0.02.ebuild b/media-fonts/unifont/unifont-13.0.01.ebuild
index 09349057d2fa..edbacdbfdcaa 100644
--- a/media-fonts/unifont/unifont-11.0.02.ebuild
+++ b/media-fonts/unifont/unifont-13.0.01.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2018 Gentoo Authors
+# Copyright 2003-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=7
 
-inherit font toolchain-funcs xdg-utils
+inherit font toolchain-funcs
 
 DESCRIPTION="GNU Unifont - a Pan-Unicode X11 bitmap iso10646 font"
 HOMEPAGE="http://unifoundry.com/"
@@ -11,10 +11,10 @@ SRC_URI="mirror://gnu/${PN}/${P}/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
+KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~s390 ~sparc ~x86"
 IUSE="fontforge utils"
 
-DEPEND="
+BDEPEND="
 	fontforge? (
 		app-text/bdf2psf
 		dev-lang/perl
@@ -34,32 +34,27 @@ PATCHES=(
 	"${FILESDIR}"/11.0.02-make.patch
 )
 
-src_prepare() {
-	sed -i -e 's/install -s/install/' src/Makefile || die
-	default
-}
-
 src_compile() {
+	buildargs=(
+		BUILDFONT=$(usex fontforge 1 '')
+		CC="$(tc-getCC)"
+		CFLAGS="${CFLAGS}"
+		INSTALL="${INSTALL-install}"
+	)
 	if use fontforge || use utils; then
-		tc-export CC
-		xdg_environment_reset
-		makeargs=(
-			CFLAGS="${CFLAGS}"
-			BUILDFONT=$(usex fontforge 1 '')
-		)
-		emake  "${makeargs[@]}"
+		emake "${buildargs[@]}"
 	fi
 }
 
 src_install() {
-	makeargs+=(
-		DESTDIR="${ED%/}"
-		PCFDEST="${ED%/}${FONTDIR}"
-		TTFDEST="${ED%/}${FONTDIR}"
-		USRDIR=usr
+	local installargs=(
+		COMPRESS=0
+		DESTDIR="${ED}"
+		PCFDEST="${ED}${FONTDIR}"
+		TTFDEST="${ED}${FONTDIR}"
 	)
-	use utils || makeargs+=( -C font )
-	emake "${makeargs[@]}" install
+	use utils || installargs+=( -C font )
+	emake "${buildargs[@]}" "${installargs[@]}" install
 	font_xfont_config
 	font_fontconfig
 }
diff --git a/media-fonts/unifont/unifont-9.0.06.ebuild b/media-fonts/unifont/unifont-9.0.06.ebuild
deleted file mode 100644
index 2f51aa949a30..000000000000
--- a/media-fonts/unifont/unifont-9.0.06.ebuild
+++ /dev/null
@@ -1,61 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit font toolchain-funcs xdg-utils
-
-DESCRIPTION="GNU Unifont - a Pan-Unicode X11 bitmap iso10646 font"
-HOMEPAGE="http://unifoundry.com/"
-SRC_URI="mirror://gnu/${PN}/${P}/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm ia64 ppc ppc64 ~s390 ~sh sparc x86"
-IUSE="fontforge utils"
-
-DEPEND="
-	fontforge? (
-		app-text/bdf2psf
-		dev-lang/perl
-		dev-perl/GD[png(-)]
-		media-gfx/fontforge
-		x11-apps/bdftopcf
-	)
-"
-RDEPEND="
-	utils? (
-		dev-lang/perl
-		dev-perl/GD[png(-)]
-	)
-"
-
-src_prepare() {
-	sed -i -e 's/install -s/install/' src/Makefile || die
-	default
-}
-
-src_compile() {
-	if use fontforge || use utils; then
-		tc-export CC
-		xdg_environment_reset
-		makeargs=(
-			CFLAGS="${CFLAGS}"
-			BUILDFONT=$(usex fontforge 1 '')
-		)
-		emake -j1 "${makeargs[@]}"
-	fi
-}
-
-src_install() {
-	makeargs+=(
-		DESTDIR="${ED%/}"
-		PCFDEST="${ED%/}${FONTDIR}"
-		TTFDEST="${ED%/}${FONTDIR}"
-		USRDIR=usr
-	)
-	use utils || makeargs+=( -C font )
-	emake -j1 "${makeargs[@]}" install
-	font_xfont_config
-	font_fontconfig
-}