Gentoo Archives: gentoo-commits

From: Andrew Ammerlaan <andrewammerlaan@××××××.net>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/proj/guru:master commit in: media-fonts/unscii/
Date: Sun, 27 Dec 2020 12:48:29
Message-Id: 1609020034.ba28acfb367a20fe73633d33b3b2dd6785c636da.andrewammerlaan@gentoo
1 commit: ba28acfb367a20fe73633d33b3b2dd6785c636da
2 Author: Theo Anderson <telans <AT> posteo <DOT> de>
3 AuthorDate: Sat Dec 26 22:00:34 2020 +0000
4 Commit: Andrew Ammerlaan <andrewammerlaan <AT> riseup <DOT> net>
5 CommitDate: Sat Dec 26 22:00:34 2020 +0000
6 URL: https://gitweb.gentoo.org/repo/proj/guru.git/commit/?id=ba28acfb
7
8 media-fonts/unscii: bump to 2.1; fix license
9
10 Package-Manager: Portage-3.0.12, Repoman-3.0.2
11 Signed-off-by: Theo Anderson <telans <AT> posteo.de>
12
13 media-fonts/unscii/Manifest | 1 +
14 media-fonts/unscii/unscii-2.0.ebuild | 5 ++++-
15 .../unscii/{unscii-2.0.ebuild => unscii-2.1.ebuild} | 14 ++++++++++++--
16 3 files changed, 17 insertions(+), 3 deletions(-)
17
18 diff --git a/media-fonts/unscii/Manifest b/media-fonts/unscii/Manifest
19 index ffe80398..24d1cfd6 100644
20 --- a/media-fonts/unscii/Manifest
21 +++ b/media-fonts/unscii/Manifest
22 @@ -1 +1,2 @@
23 DIST unscii-2.0-src.tar.gz 1672906 BLAKE2B c565b09333c10fafe1d4e75124ae8346119f772b72073cc65ba7c78979693a56e6a6535634897866b138747149b68b1a59469d2f98ba87dd0e62da5630ee1314 SHA512 f13cdf2fe32bb12ccc1cf2e1789b2dfb4c459ad85ca294736707c57a6acf47db187b1921fd9ce1e7df7e1d6a4a6b0613bd7cb78ff51c64b36ca6f9d43198ace7
24 +DIST unscii-2.1.tar.gz 1277989 BLAKE2B 0f82290c2c36fb60fadfb07032775feb13469259c1ff57f2d34c2d28384f629ce48c9b1a069391e25fbc493fafe160db913c61b58d280f96ea4c3f147a0b7550 SHA512 bbcfa17b57a15d5710407507487bc33e76448b0a8b5b65d08f9a598153137933403da9183de05183a4e897a84b409c602bf751e8f6cfe141a6d63c3d310f893a
25
26 diff --git a/media-fonts/unscii/unscii-2.0.ebuild b/media-fonts/unscii/unscii-2.0.ebuild
27 index 9e987368..0dcab147 100644
28 --- a/media-fonts/unscii/unscii-2.0.ebuild
29 +++ b/media-fonts/unscii/unscii-2.0.ebuild
30 @@ -10,7 +10,10 @@ DESCRIPTION="Set of bitmapped Unicode fonts based on classic system fonts"
31 HOMEPAGE="http://pelulamu.net/${PN}/"
32 SRC_URI="${HOMEPAGE}${P}-src.tar.gz"
33
34 -LICENSE="OFL-1.1"
35 +LICENSE="
36 + public-domain
37 + unicode? ( GPL-2 )
38 +"
39 SLOT="0"
40 KEYWORDS="~amd64 ~x86"
41 IUSE="unicode"
42
43 diff --git a/media-fonts/unscii/unscii-2.0.ebuild b/media-fonts/unscii/unscii-2.1.ebuild
44 similarity index 74%
45 copy from media-fonts/unscii/unscii-2.0.ebuild
46 copy to media-fonts/unscii/unscii-2.1.ebuild
47 index 9e987368..6b699616 100644
48 --- a/media-fonts/unscii/unscii-2.0.ebuild
49 +++ b/media-fonts/unscii/unscii-2.1.ebuild
50 @@ -4,13 +4,17 @@
51 EAPI=7
52
53 FONT_SUFFIX="otf pcf ttf"
54 +
55 inherit toolchain-funcs font
56
57 DESCRIPTION="Set of bitmapped Unicode fonts based on classic system fonts"
58 HOMEPAGE="http://pelulamu.net/${PN}/"
59 -SRC_URI="${HOMEPAGE}${P}-src.tar.gz"
60 +SRC_URI="http://pelulamu.net/unscii/${P}-src.tar.gz -> ${P}.tar.gz"
61
62 -LICENSE="OFL-1.1"
63 +LICENSE="
64 + public-domain
65 + unicode? ( GPL-2 )
66 +"
67 SLOT="0"
68 KEYWORDS="~amd64 ~x86"
69 IUSE="unicode"
70 @@ -23,9 +27,15 @@ DEPEND="
71 x11-apps/bdftopcf
72 unicode? ( media-fonts/unifont[utils] )
73 "
74 +
75 S="${WORKDIR}/${P}-src"
76 DOCS=( ${PN}.txt )
77
78 +src_prepare() {
79 + default
80 + sed -i "s/gcc.*/$(tc-getCC) ${CFLAGS}/" Makefile || die
81 +}
82 +
83 src_install() {
84 font_src_install
85 dobin bm2uns