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

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

[Ulrich Müller]

commit:     a12860777deabfb0c8f58eb43aa3324fe5790599
Author:     Ulrich Müller <ulm <AT> gentoo <DOT> org>
AuthorDate: Fri Jun 24 19:40:07 2016 +0000
Commit:     Ulrich Müller <ulm <AT> gentoo <DOT> org>
CommitDate: Fri Jun 24 21:19:37 2016 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a1286077

media-fonts/acroread-asianfonts: Migrate from LINGUAS to L10N.

Package-Manager: portage-2.3.0

 .../acroread-asianfonts-9.1.ebuild                 | 33 +++++++++++-----------
 1 file changed, 16 insertions(+), 17 deletions(-)

diff --git a/media-fonts/acroread-asianfonts/acroread-asianfonts-9.1.ebuild b/media-fonts/acroread-asianfonts/acroread-asianfonts-9.1.ebuild
index bb0af3d..17915b2 100644
--- a/media-fonts/acroread-asianfonts/acroread-asianfonts-9.1.ebuild
+++ b/media-fonts/acroread-asianfonts/acroread-asianfonts-9.1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2012 Gentoo Foundation
+# Copyright 1999-2016 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 
@@ -12,15 +12,15 @@ SRC_SUFFIX="_i486-linux.tar.bz2"
 DESCRIPTION="Asian and Extended Language Font Packs used by Adobe Reader"
 HOMEPAGE="http://www.adobe.com/products/acrobat/acrrasianfontpack.html"
 SRC_URI="!minimal? ( ${SRC_PREFIX}xtd${SRC_SUFFIX} )
-	linguas_ja? ( ${SRC_PREFIX}jpn${SRC_SUFFIX} )
-	linguas_ko? ( ${SRC_PREFIX}kor${SRC_SUFFIX} )
-	linguas_zh_CN? ( ${SRC_PREFIX}chs${SRC_SUFFIX} )
-	linguas_zh_TW? ( ${SRC_PREFIX}cht${SRC_SUFFIX} )"
+	l10n_ja? ( ${SRC_PREFIX}jpn${SRC_SUFFIX} )
+	l10n_ko? ( ${SRC_PREFIX}kor${SRC_SUFFIX} )
+	l10n_zh-CN? ( ${SRC_PREFIX}chs${SRC_SUFFIX} )
+	l10n_zh-TW? ( ${SRC_PREFIX}cht${SRC_SUFFIX} )"
 
 SLOT="0"
 LICENSE="Adobe"
 KEYWORDS="amd64 x86"
-IUSE="minimal linguas_ja linguas_ko linguas_zh_CN linguas_zh_TW"
+IUSE="minimal l10n_ja l10n_ko l10n_zh-CN l10n_zh-TW"
 RESTRICT="strip mirror"
 
 DEPEND=""
@@ -28,7 +28,7 @@ RDEPEND="!<app-text/acroread-9.4.0"
 
 S="${WORKDIR}"
 
-REQUIRED_USE="|| ( !minimal linguas_ja linguas_ko linguas_zh_CN linguas_zh_TW )"
+REQUIRED_USE="|| ( !minimal l10n_ja l10n_ko l10n_zh-CN l10n_zh-TW )"
 
 src_install() {
 	local INSTALLDIR="/opt"
@@ -39,22 +39,22 @@ src_install() {
 	dodir "${INSTALLDIR}"
 	insinto "${RESOURCEDIR}"
 
-	if use linguas_ja ; then
+	if use l10n_ja ; then
 		tar xf JPNKIT/LANGCOM.TAR --no-same-owner -C "${D}/${INSTALLDIR}"
 		tar xf JPNKIT/LANGJPN.TAR --no-same-owner -C "${D}/${INSTALLDIR}"
 		doins JPNKIT/LICREAD.TXT
 	fi
-	if use linguas_ko ; then
+	if use l10n_ko ; then
 		tar xf KORKIT/LANGCOM.TAR --no-same-owner -C "${D}/${INSTALLDIR}"
 		tar xf KORKIT/LANGKOR.TAR --no-same-owner -C "${D}/${INSTALLDIR}"
 		doins KORKIT/LICREAD.TXT
 	fi
-	if use linguas_zh_CN ; then
+	if use l10n_zh-CN ; then
 		tar xf CHSKIT/LANGCOM.TAR --no-same-owner -C "${D}/${INSTALLDIR}"
 		tar xf CHSKIT/LANGCHS.TAR --no-same-owner -C "${D}/${INSTALLDIR}"
 		doins CHSKIT/LICREAD.TXT
 	fi
-	if use linguas_zh_TW ; then
+	if use l10n_zh-TW ; then
 		tar xf CHTKIT/LANGCOM.TAR --no-same-owner -C "${D}/${INSTALLDIR}"
 		tar xf CHTKIT/LANGCHT.TAR --no-same-owner -C "${D}/${INSTALLDIR}"
 		doins CHTKIT/LICREAD.TXT
@@ -70,21 +70,20 @@ src_install() {
 	fi
 
 	# collision with app-text/acroread, bug #152288
-	if use linguas_ja || use linguas_ko \
-			|| use linguas_zh_CN || use linguas_zh_TW; then
+	if use l10n_ja || use l10n_ko || use l10n_zh-CN || use l10n_zh-TW; then
 
 		rm "${D}/${CMAPDIR}"/Identity-{V,H}
 
-		if use !linguas_ja ; then
+		if use !l10n_ja ; then
 			rm "${D}/${CMAPDIR}"/{8*,9*,Add*,Adobe-J*,EUC*,Ext*,H,UCS2-9*,UniJ*,UniKS-UTF16*,V}
 		fi
-		#if use !linguas_ko ; then
+		#if use !l10n_ko ; then
 		#	rm "${D}/${CMAPDIR}"/{Adobe-Korea*,KSC*,UCS2-GBK*,UCS2-KSC*,UniKS*}
 		#fi
-		#if use !linguas_zh_CN ; then
+		#if use !l10n_zh-CN ; then
 		#	rm "${D}/${CMAPDIR}"/{Adobe-GB*,GB*,UCS2-GB*,UniGB*}
 		#fi
-		#if use !linguas_zh_TW ; then
+		#if use !l10n_zh-TW ; then
 		#	rm "${D}/${CMAPDIR}"/{Adobe-CNS*,B5*,CNS*,ET*,HK*,UCS2-B5*,UCS-ET*,UniCNS*}
 		#fi
 	fi

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

[Michał Górny]

commit:     b6052acfffd11bd2a14a12c27a46a3c1469dd14d
Author:     Michał Górny <mgorny <AT> gentoo <DOT> org>
AuthorDate: Thu May 18 13:12:02 2017 +0000
Commit:     Michał Górny <mgorny <AT> gentoo <DOT> org>
CommitDate: Thu May 18 13:15:34 2017 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b6052acf

media-fonts/acroread-asianfonts: Remove unused confutils inherit

 media-fonts/acroread-asianfonts/acroread-asianfonts-9.1.ebuild | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/media-fonts/acroread-asianfonts/acroread-asianfonts-9.1.ebuild b/media-fonts/acroread-asianfonts/acroread-asianfonts-9.1.ebuild
index e18d898ddc3..4285c336567 100644
--- a/media-fonts/acroread-asianfonts/acroread-asianfonts-9.1.ebuild
+++ b/media-fonts/acroread-asianfonts/acroread-asianfonts-9.1.ebuild
@@ -1,8 +1,7 @@
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=4
-inherit confutils
 
 SRC_PREFIX="http://ardownload.adobe.com/pub/adobe/reader/unix/9.x/9.1/misc/FontPack910_"
 #SRC_SUFFIX="_i386-solaris.tar.bz2"