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

[Akinori Hattori]

commit:     af630e2e0b78588794c9d05c5443946e5f041c6c
Author:     Akinori Hattori <hattya <AT> gentoo <DOT> org>
AuthorDate: Tue Dec 12 14:30:56 2017 +0000
Commit:     Akinori Hattori <hattya <AT> gentoo <DOT> org>
CommitDate: Tue Dec 12 15:00:43 2017 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=af630e2e

media-fonts/baekmuk-fonts: update to EAPI 6

Package-Manager: Portage-2.3.13, Repoman-2.3.4

 .../baekmuk-fonts/baekmuk-fonts-2.2-r2.ebuild      | 24 ++++++++++------------
 1 file changed, 11 insertions(+), 13 deletions(-)

diff --git a/media-fonts/baekmuk-fonts/baekmuk-fonts-2.2-r2.ebuild b/media-fonts/baekmuk-fonts/baekmuk-fonts-2.2-r2.ebuild
index 2763f1db1e3..5d4babf322d 100644
--- a/media-fonts/baekmuk-fonts/baekmuk-fonts-2.2-r2.ebuild
+++ b/media-fonts/baekmuk-fonts/baekmuk-fonts-2.2-r2.ebuild
@@ -1,33 +1,32 @@
 # Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
+EAPI="6"
+
 inherit font font-ebdftopcf
 
-TTF_P="${P/fonts/ttf}"
 BDF_P="${P/fonts/bdf}"
+TTF_P="${P/fonts/ttf}"
 UNI_P="20020418"
 
 DESCRIPTION="Korean Baekmuk Font"
 HOMEPAGE="http://kldp.net/projects/baekmuk/"
-SRC_URI="http://kldp.net/download.php/1429/${TTF_P}.tar.gz
-	http://kldp.net/download.php/1428/${BDF_P}.tar.gz
+SRC_URI="http://kldp.net/download.php/1428/${BDF_P}.tar.gz
+	http://kldp.net/download.php/1429/${TTF_P}.tar.gz
 	unicode? ( http://chem.skku.ac.kr/~wkpark/baekmuk/iso10646/${UNI_P}.tar.bz2 )"
 
 LICENSE="BSD"
 SLOT="0"
 KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos"
 IUSE="unicode"
+RESTRICT="binchecks strip"
 
-S=${WORKDIR}
-
-# Only installs fonts
-RESTRICT="strip binchecks"
+S="${WORKDIR}"
 
 src_unpack() {
 	unpack ${BDF_P}.tar.gz ${TTF_P}.tar.gz
-
-	if use unicode ; then
-		cd "${WORKDIR}/${BDF_P}/bdf"
+	if use unicode; then
+		cd "${WORKDIR}"/${BDF_P}/bdf
 		unpack ${UNI_P}.tar.bz2
 	fi
 }
@@ -38,7 +37,6 @@ src_compile() {
 }
 
 src_install () {
-	FONT_S="${S}/${TTF_P}/ttf" FONT_SUFFIX="ttf" font_src_install
-	use X && FONT_S="${S}/${BDF_P}/bdf" FONT_SUFFIX="pcf.gz" font_src_install
-	use X || FONT_S="${S}/${BDF_P}/bdf" FONT_SUFFIX="bdf" font_src_install
+	FONT_S="${S}"/${TTF_P}/ttf FONT_SUFFIX="ttf" font_src_install
+	FONT_S="${S}"/${BDF_P}/bdf font_src_install
 }