[gentoo-commits] repo/proj/guru:dev commit in: media-fonts/unscii/

[Theo Anderson]

commit:     ba28acfb367a20fe73633d33b3b2dd6785c636da
Author:     Theo Anderson <telans <AT> posteo <DOT> de>
AuthorDate: Sat Dec 26 22:00:34 2020 +0000
Commit:     Theo Anderson <telans <AT> posteo <DOT> de>
CommitDate: Sat Dec 26 22:00:34 2020 +0000
URL:        https://gitweb.gentoo.org/repo/proj/guru.git/commit/?id=ba28acfb

media-fonts/unscii: bump to 2.1; fix license

Package-Manager: Portage-3.0.12, Repoman-3.0.2
Signed-off-by: Theo Anderson <telans <AT> posteo.de>

 media-fonts/unscii/Manifest                                |  1 +
 media-fonts/unscii/unscii-2.0.ebuild                       |  5 ++++-
 .../unscii/{unscii-2.0.ebuild => unscii-2.1.ebuild}        | 14 ++++++++++++--
 3 files changed, 17 insertions(+), 3 deletions(-)

diff --git a/media-fonts/unscii/Manifest b/media-fonts/unscii/Manifest
index ffe80398..24d1cfd6 100644
--- a/media-fonts/unscii/Manifest
+++ b/media-fonts/unscii/Manifest
@@ -1 +1,2 @@
 DIST unscii-2.0-src.tar.gz 1672906 BLAKE2B 
c565b09333c10fafe1d4e75124ae8346119f772b72073cc65ba7c78979693a56e6a6535634897866b138747149b68b1a59469d2f98ba87dd0e62da5630ee1314
 SHA512 
f13cdf2fe32bb12ccc1cf2e1789b2dfb4c459ad85ca294736707c57a6acf47db187b1921fd9ce1e7df7e1d6a4a6b0613bd7cb78ff51c64b36ca6f9d43198ace7
+DIST unscii-2.1.tar.gz 1277989 BLAKE2B 
0f82290c2c36fb60fadfb07032775feb13469259c1ff57f2d34c2d28384f629ce48c9b1a069391e25fbc493fafe160db913c61b58d280f96ea4c3f147a0b7550
 SHA512 
bbcfa17b57a15d5710407507487bc33e76448b0a8b5b65d08f9a598153137933403da9183de05183a4e897a84b409c602bf751e8f6cfe141a6d63c3d310f893a

diff --git a/media-fonts/unscii/unscii-2.0.ebuild 
b/media-fonts/unscii/unscii-2.0.ebuild
index 9e987368..0dcab147 100644
--- a/media-fonts/unscii/unscii-2.0.ebuild
+++ b/media-fonts/unscii/unscii-2.0.ebuild
@@ -10,7 +10,10 @@ DESCRIPTION="Set of bitmapped Unicode fonts based on classic 
system fonts"
 HOMEPAGE="http://pelulamu.net/${PN}/";
 SRC_URI="${HOMEPAGE}${P}-src.tar.gz"
 
-LICENSE="OFL-1.1"
+LICENSE="
+       public-domain
+       unicode? ( GPL-2 )
+"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
 IUSE="unicode"

diff --git a/media-fonts/unscii/unscii-2.0.ebuild 
b/media-fonts/unscii/unscii-2.1.ebuild
similarity index 74%
copy from media-fonts/unscii/unscii-2.0.ebuild
copy to media-fonts/unscii/unscii-2.1.ebuild
index 9e987368..6b699616 100644
--- a/media-fonts/unscii/unscii-2.0.ebuild
+++ b/media-fonts/unscii/unscii-2.1.ebuild
@@ -4,13 +4,17 @@
 EAPI=7
 
 FONT_SUFFIX="otf pcf ttf"
+
 inherit toolchain-funcs font
 
 DESCRIPTION="Set of bitmapped Unicode fonts based on classic system fonts"
 HOMEPAGE="http://pelulamu.net/${PN}/";
-SRC_URI="${HOMEPAGE}${P}-src.tar.gz"
+SRC_URI="http://pelulamu.net/unscii/${P}-src.tar.gz -> ${P}.tar.gz"
 
-LICENSE="OFL-1.1"
+LICENSE="
+       public-domain
+       unicode? ( GPL-2 )
+"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
 IUSE="unicode"
@@ -23,9 +27,15 @@ DEPEND="
        x11-apps/bdftopcf
        unicode? ( media-fonts/unifont[utils] )
 "
+
 S="${WORKDIR}/${P}-src"
 DOCS=( ${PN}.txt )
 
+src_prepare() {
+       default
+       sed -i "s/gcc.*/$(tc-getCC) ${CFLAGS}/" Makefile || die
+}
+
 src_install() {
        font_src_install
        dobin bm2uns