[gentoo-commits] repo/gentoo:master commit in: media-fonts/unifont/, media-fonts/unifont/files/
commit: 3fd1e0bcb2aa8bc561290cad8c1de22a7db21139
Author: Matt Turner gentoo org>
AuthorDate: Thu Aug 18 02:36:00 2022 +
Commit: Matt Turner gentoo org>
CommitDate: Thu Aug 18 02:53:05 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=3fd1e0bc
media-fonts/unifont: Drop old versions
Signed-off-by: Matt Turner gentoo.org>
media-fonts/unifont/Manifest | 1 -
media-fonts/unifont/files/11.0.02-make.patch | 11 -
media-fonts/unifont/unifont-13.0.01-r1.ebuild | 60 ---
3 files changed, 72 deletions(-)
diff --git a/media-fonts/unifont/Manifest b/media-fonts/unifont/Manifest
index cf35782b7cb2..924b69baf3f1 100644
--- a/media-fonts/unifont/Manifest
+++ b/media-fonts/unifont/Manifest
@@ -1,2 +1 @@
-DIST unifont-13.0.01.tar.gz 21053298 BLAKE2B
981d3d79015df9fa401823034de532840652127bc881d13244243dc0fbaabc14212b006f1e72ff65233793c7064576b51855d6a8ab1f7d889e7837c9c22d4f5d
SHA512
2987aa097f89b1287d126e44297b19e405e198bb8ede2e321e6452c60678ebf4cf0be5f059b9565f4584bad09801effabe64d01ab90f132f27b206174827b14b
DIST unifont-14.0.03.tar.gz 27451330 BLAKE2B
f0ae933fc493d7e724b0526968d63fb4209e28526346a835b918aa6a31cd1a31c15a0c00f89196f6fd42cf2a0b2db8c51d9b6f9d7648938609e8b7e4122078a3
SHA512
de80097a4e1751c6ca21775c8ffe19716a910a0d110749017eacaa50a9f8f02d80e0b402426f3c2309e64e129a0386e29015d1116ad5fd64f97e5dc7fb75bdce
diff --git a/media-fonts/unifont/files/11.0.02-make.patch
b/media-fonts/unifont/files/11.0.02-make.patch
deleted file mode 100644
index fa4e8aebb674..
--- a/media-fonts/unifont/files/11.0.02-make.patch
+++ /dev/null
@@ -1,11 +0,0 @@
a/font/Makefile
-+++ b/font/Makefile
-@@ -247,7 +247,7 @@
- # as a baseline. Remove the Plane 1 Copyleft glyph from the Plane 0
- # set of hex files.
- #
--coverage:
-+coverage: hex
- grep -v "^01F12F" $(COMPILED_DIR)/unifont_csur_lower-$(VERSION).hex \
- > $(COMPILED_DIR)/unifont_all-$(VERSION).hex
- sort plane0[1-E]/*.hex plane0Fcsur/*.hex | grep -v "^0020:" \
diff --git a/media-fonts/unifont/unifont-13.0.01-r1.ebuild
b/media-fonts/unifont/unifont-13.0.01-r1.ebuild
deleted file mode 100644
index ef3c9f52318c..
--- a/media-fonts/unifont/unifont-13.0.01-r1.ebuild
+++ /dev/null
@@ -1,60 +0,0 @@
-# Copyright 2003-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit font toolchain-funcs
-
-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 ~riscv ~s390 sparc x86"
-IUSE="fontforge utils"
-
-BDEPEND="
- 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(+)]
- )
-"
-
-PATCHES=(
- "${FILESDIR}"/11.0.02-make.patch
-)
-
-src_compile() {
- buildargs=(
- BUILDFONT=$(usex fontforge 1 '')
- CC="$(tc-getCC)"
- CFLAGS="${CFLAGS}"
- INSTALL="${INSTALL-install}"
- )
- if use fontforge || use utils; then
- emake "${buildargs[@]}"
- fi
-}
-
-src_install() {
- local installargs=(
- COMPRESS=0
- DESTDIR="${ED}"
- PCFDEST="${ED}${FONTDIR}"
- TTFDEST="${ED}${FONTDIR}"
- )
- use utils || installargs+=( -C font )
- emake "${buildargs[@]}" "${installargs[@]}" install
- font_xfont_config
- font_fontconfig
-}
[gentoo-commits] repo/gentoo:master commit in: media-fonts/unifont/, media-fonts/unifont/files/
commit: 33aa027eb4657f3400bd115a56e272481a760d86
Author: Jeroen Roovers gentoo org>
AuthorDate: Sun Oct 7 17:57:13 2018 +
Commit: Jeroen Roovers gentoo org>
CommitDate: Sun Oct 7 17:57:31 2018 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=33aa027e
media-fonts/unifont: Version 11.0.02.
Package-Manager: Portage-2.3.50, Repoman-2.3.11
Signed-off-by: Jeroen Roovers gentoo.org>
media-fonts/unifont/Manifest | 1 +
media-fonts/unifont/files/11.0.02-make.patch | 11 +
media-fonts/unifont/unifont-11.0.02.ebuild | 65
3 files changed, 77 insertions(+)
diff --git a/media-fonts/unifont/Manifest b/media-fonts/unifont/Manifest
index 10223c58426..3944240bd90 100644
--- a/media-fonts/unifont/Manifest
+++ b/media-fonts/unifont/Manifest
@@ -1,4 +1,5 @@
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
diff --git a/media-fonts/unifont/files/11.0.02-make.patch
b/media-fonts/unifont/files/11.0.02-make.patch
new file mode 100644
index 000..fa4e8aebb67
--- /dev/null
+++ b/media-fonts/unifont/files/11.0.02-make.patch
@@ -0,0 +1,11 @@
+--- a/font/Makefile
b/font/Makefile
+@@ -247,7 +247,7 @@
+ # as a baseline. Remove the Plane 1 Copyleft glyph from the Plane 0
+ # set of hex files.
+ #
+-coverage:
++coverage: hex
+ grep -v "^01F12F" $(COMPILED_DIR)/unifont_csur_lower-$(VERSION).hex \
+ > $(COMPILED_DIR)/unifont_all-$(VERSION).hex
+ sort plane0[1-E]/*.hex plane0Fcsur/*.hex | grep -v "^0020:" \
diff --git a/media-fonts/unifont/unifont-11.0.02.ebuild
b/media-fonts/unifont/unifont-11.0.02.ebuild
new file mode 100644
index 000..54818db00cf
--- /dev/null
+++ b/media-fonts/unifont/unifont-11.0.02.ebuild
@@ -0,0 +1,65 @@
+# Copyright 1999-2018 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 ~x86-fbsd"
+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(-)]
+ )
+"
+
+PATCHES=(
+ "${FILESDIR}"/11.0.02-make.patch
+)
+
+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 "${makeargs[@]}"
+ fi
+}
+
+src_install() {
+ makeargs+=(
+ DESTDIR="${ED%/}"
+ PCFDEST="${ED%/}${FONTDIR}"
+ TTFDEST="${ED%/}${FONTDIR}"
+ USRDIR=usr
+ )
+ use utils || makeargs+=( -C font )
+ emake "${makeargs[@]}" install
+ font_xfont_config
+ font_fontconfig
+}
[gentoo-commits] repo/gentoo:master commit in: media-fonts/unifont/, media-fonts/unifont/files/
commit: 63a627befb521deab6960d32f6d50d0ae3a79adc
Author: Mike Gilbert gentoo org>
AuthorDate: Tue Aug 29 12:59:16 2017 +
Commit: Mike Gilbert gentoo org>
CommitDate: Tue Aug 29 13:00:00 2017 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=63a627be
media-fonts/unifont: parallel make fix
Bug: https://bugs.gentoo.org/629278
Package-Manager: Portage-2.3.6_p39, Repoman-2.3.3_p17
media-fonts/unifont/files/10.0.06-make.patch | 26 ++
media-fonts/unifont/unifont-10.0.06.ebuild | 4
2 files changed, 30 insertions(+)
diff --git a/media-fonts/unifont/files/10.0.06-make.patch
b/media-fonts/unifont/files/10.0.06-make.patch
new file mode 100644
index 000..cf09b7715b0
--- /dev/null
+++ b/media-fonts/unifont/files/10.0.06-make.patch
@@ -0,0 +1,26 @@
+From c2e07357abc86fc0e7715ef21dc3d279e3002819 Mon Sep 17 00:00:00 2001
+From: Mike Gilbert
+Date: Tue, 29 Aug 2017 08:55:26 -0400
+Subject: [PATCH] Another parallel make fix
+
+Bug: https://bugs.gentoo.org/629278
+---
+ font/Makefile | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/font/Makefile b/font/Makefile
+index 1cd7ce3..2c85e64 100644
+--- a/font/Makefile
b/font/Makefile
+@@ -236,7 +236,7 @@ psf: bdf
+ #
+ # Print coverage of scripts in Basic Multilingual Plane in .txt file.
+ #
+-coverage:
++coverage: hex
+ sort $(HEXDIR)/*.hex | \
+ $(BINDIR)/unicoverage > $(COMPILED_DIR)/coverage.txt
+
+--
+2.14.1
+
diff --git a/media-fonts/unifont/unifont-10.0.06.ebuild
b/media-fonts/unifont/unifont-10.0.06.ebuild
index d2a020583cd..b39787f0de3 100644
--- a/media-fonts/unifont/unifont-10.0.06.ebuild
+++ b/media-fonts/unifont/unifont-10.0.06.ebuild
@@ -30,6 +30,10 @@ RDEPEND="
)
"
+PATCHES=(
+ "${FILESDIR}"/10.0.06-make.patch
+)
+
src_prepare() {
sed -i -e 's/install -s/install/' src/Makefile || die
default
