From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id F3FEB13835C for ; Sat, 26 Dec 2020 22:11:17 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 3FD00E0885; Sat, 26 Dec 2020 22:11:17 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 269A9E087A for ; Sat, 26 Dec 2020 22:11:16 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id F16B53410E7 for ; Sat, 26 Dec 2020 22:11:14 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 55EF642F for ; Sat, 26 Dec 2020 22:11:13 +0000 (UTC) From: "Theo Anderson" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Theo Anderson" Message-ID: <1609020034.ba28acfb367a20fe73633d33b3b2dd6785c636da.telans@gentoo> Subject: [gentoo-commits] repo/proj/guru:dev commit in: media-fonts/unscii/ X-VCS-Repository: repo/proj/guru X-VCS-Files: media-fonts/unscii/Manifest media-fonts/unscii/unscii-2.0.ebuild media-fonts/unscii/unscii-2.1.ebuild X-VCS-Directories: media-fonts/unscii/ X-VCS-Committer: telans X-VCS-Committer-Name: Theo Anderson X-VCS-Revision: ba28acfb367a20fe73633d33b3b2dd6785c636da X-VCS-Branch: dev Date: Sat, 26 Dec 2020 22:11:13 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply X-Archives-Salt: 5ab2071a-bf92-4ce8-be7d-f3b6175e4fb7 X-Archives-Hash: d962a2d7e860047e2578cf356921516c commit: ba28acfb367a20fe73633d33b3b2dd6785c636da Author: Theo Anderson posteo de> AuthorDate: Sat Dec 26 22:00:34 2020 +0000 Commit: Theo Anderson posteo 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 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