[gentoo-commits] repo/gentoo:master commit in: media-fonts/fgdc-emergency/

[gentoo-commits] repo/gentoo:master commit in: media-fonts/fgdc-emergency/

[Michał Górny]

commit:     f0d295732ae7c8ebdda342be19f8a7a1fda8f327
Author:     Michał Górny <mgorny <AT> gentoo <DOT> org>
AuthorDate: Sat Oct 19 18:50:29 2019 +0000
Commit:     Michał Górny <mgorny <AT> gentoo <DOT> org>
CommitDate: Sat Oct 19 18:53:52 2019 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f0d29573

media-fonts/fgdc-emergency: Bump to EAPI 7

Bug: https://bugs.gentoo.org/697302
Signed-off-by: Michał Górny <mgorny <AT> gentoo.org>

 media-fonts/fgdc-emergency/fgdc-emergency-2.20.ebuild | 18 ++++++------------
 1 file changed, 6 insertions(+), 12 deletions(-)

diff --git a/media-fonts/fgdc-emergency/fgdc-emergency-2.20.ebuild b/media-fonts/fgdc-emergency/fgdc-emergency-2.20.ebuild
index 96616704936..72a40222609 100644
--- a/media-fonts/fgdc-emergency/fgdc-emergency-2.20.ebuild
+++ b/media-fonts/fgdc-emergency/fgdc-emergency-2.20.ebuild
@@ -1,15 +1,15 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=0
+EAPI=7
 
 inherit font
 
 DESCRIPTION="FGDC Emergency Response Symbology Prototype"
 HOMEPAGE="http://www.fgdc.gov/HSWG/"
 SRC_URI="http://www.fgdc.gov/HSWG/symbol_downloads/ers_v${PV//./}.zip"
-LICENSE="public-domain"
 
+LICENSE="public-domain"
 SLOT="0"
 KEYWORDS="amd64 x86"
 IUSE=""
@@ -18,18 +18,12 @@ DEPEND="app-arch/unzip"
 RDEPEND=""
 
 S="${WORKDIR}/ersSymbolsVersion0202"
-
+FONT_S="${S}"
 FONT_SUFFIX="ttf"
 
-DOCS="readme.txt"
-
-FONT_S="${S}"
+DOCS=( readme.txt )
 
 src_install(){
-
-	cd "${FONT_S}"
-	cp ersV2sym/*.ttf .
-	cp ersV2txt/*.ttf .
-
+	cp ersV2{sym,txt}/*.ttf . || die
 	font_src_install
 }