Version bumped.

(Portage version: 2.1.6.13/cvs/Linux x86_64)

3 files changed, 103 insertions, 90 deletions

diff --git a/media-fonts/acroread-asianfonts/ChangeLog b/media-fonts/acroread-asianfonts/ChangeLog
index 07cc865461fb..58eca34b4599 100644
--- a/media-fonts/acroread-asianfonts/ChangeLog
+++ b/media-fonts/acroread-asianfonts/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for media-fonts/acroread-asianfonts
-# Copyright 2000-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-fonts/acroread-asianfonts/ChangeLog,v 1.23 2008/12/06 14:33:10 matsuu Exp $
+# Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/media-fonts/acroread-asianfonts/ChangeLog,v 1.24 2009/06/17 23:13:27 matsuu Exp $
+
+*acroread-asianfonts-9.1 (17 Jun 2009)
+
+  17 Jun 2009; MATSUU Takuto <matsuu@gentoo.org>
+  -acroread-asianfonts-7.0.8.ebuild, +acroread-asianfonts-9.1.ebuild:
+  Version bumped. Removed old version.
 
 *acroread-asianfonts-8.1.2 (06 Dec 2008)
 
diff --git a/media-fonts/acroread-asianfonts/acroread-asianfonts-7.0.8.ebuild b/media-fonts/acroread-asianfonts/acroread-asianfonts-7.0.8.ebuild
deleted file mode 100644
index f6f521d5488e..000000000000
--- a/media-fonts/acroread-asianfonts/acroread-asianfonts-7.0.8.ebuild
+++ /dev/null
@@ -1,88 +0,0 @@
-# Copyright 1999-2007 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-fonts/acroread-asianfonts/acroread-asianfonts-7.0.8.ebuild,v 1.5 2007/07/02 15:03:37 peper Exp $
-
-inherit eutils
-
-BASE_URI="ftp://ftp.adobe.com/pub/adobe/reader/unix/7x/7.0.8/misc/FontPack708_"
-
-DESCRIPTION="Asian font packs for Adobe Acrobat Reader"
-HOMEPAGE="http://www.adobe.com/products/acrobat/acrrasianfontpack.html"
-SRC_URI="linguas_zh_CN? ( ${BASE_URI}chs_i386-linux.tar.gz )
-	linguas_zh_TW? ( ${BASE_URI}cht_i386-linux.tar.gz )
-	linguas_ja? ( ${BASE_URI}jpn_i386-linux.tar.gz )
-	linguas_ko? ( ${BASE_URI}kor_i386-linux.tar.gz )
-	!linguas_zh_CN? ( !linguas_zh_TW? ( !linguas_ja? ( !linguas_ko? (
-		${BASE_URI}chs_i386-linux.tar.gz
-		${BASE_URI}cht_i386-linux.tar.gz
-		${BASE_URI}jpn_i386-linux.tar.gz
-		${BASE_URI}kor_i386-linux.tar.gz
-	) ) ) )"
-# linguas_ce? ( ${BASE_URI}ce_i386-linux.tar.gz )
-# linguas_hatv? ( ${BASE_URI}hatv_i386-linux.tar.gz )
-SLOT="0"
-LICENSE="Adobe"
-KEYWORDS="~amd64 x86"
-IUSE="linguas_zh_CN linguas_zh_TW linguas_ja linguas_ko"
-RESTRICT="mirror"
-
-DEPEND=">=app-text/acroread-7.0.8"
-
-S="${WORKDIR}"
-
-pkg_setup() {
-	local NOUSE
-
-	if ! use linguas_zh_CN && ! use linguas_zh_TW &&
-		! use linguas_ja && ! use linguas_ko ; then
-		NOUSE=true
-	else
-		NOUSE=false
-	fi
-
-	if ! built_with_use '>=app-text/acroread-7.0.8' linguas_zh_TW && (use linguas_zh_TW || $NOUSE); then
-		INST_LANG="${INST_LANG} CHT"
-	fi
-
-	if ! built_with_use '>=app-text/acroread-7.0.8' linguas_ja && (use linguas_ja || $NOUSE); then
-		INST_LANG="${INST_LANG} JPN"
-	fi
-
-	if ! built_with_use '>=app-text/acroread-7.0.8' linguas_ko && (use linguas_ko || $NOUSE); then
-		INST_LANG="${INST_LANG} KOR"
-	fi
-
-	if ! built_with_use '>=app-text/acroread-7.0.8' linguas_zh_CN && (use linguas_zh_CN || $NOUSE); then
-		INST_LANG="${INST_LANG} CHS"
-	fi
-
-	if [ "${INST_LANG}" = "" ] ; then
-		eerror "You don't have to install acroread-asianfonts."
-		eerror "Please unmerge acroread-asianfonts."
-		einfo "# emerge -C acroread-asianfonts"
-		die "You don't have to install acroread-asianfonts."
-	fi
-}
-
-src_install() {
-	local INSTALLDIR="/opt/Acrobat7/Resource"
-
-	dodir ${INSTALLDIR}
-	for lang in ${INST_LANG}
-	do
-		einfo "Installing ${lang} pack ..."
-		tar xf "${lang}KIT/LANG${lang}.TAR" --no-same-owner -C "${D}/${INSTALLDIR}"
-	done
-
-	einfo "Installing Asian CMaps ..."
-	tar xf ${INST_LANG/* /}KIT/LANGCOM.TAR --no-same-owner -C "${D}/${INSTALLDIR}"
-	tar xf ${INST_LANG/* /}KIT/BINCOM.TAR --no-same-owner -C "${D}/${INSTALLDIR}"
-
-	# bug 152288
-	rm "${D}/${INSTALLDIR}"/CMap/Identity-{V,H}
-
-	insinto ${INSTALLDIR}
-	doins ${INST_LANG/* /}KIT/LICREAD.TXT || die
-
-	fowners -R -L --dereference 0:0 ${INSTALLDIR}
-}
diff --git a/media-fonts/acroread-asianfonts/acroread-asianfonts-9.1.ebuild b/media-fonts/acroread-asianfonts/acroread-asianfonts-9.1.ebuild
new file mode 100644
index 000000000000..8bcba880473e
--- /dev/null
+++ b/media-fonts/acroread-asianfonts/acroread-asianfonts-9.1.ebuild
@@ -0,0 +1,95 @@
+# Copyright 1999-2009 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/media-fonts/acroread-asianfonts/acroread-asianfonts-9.1.ebuild,v 1.1 2009/06/17 23:13:27 matsuu Exp $
+
+EAPI="2"
+inherit confutils
+
+SRC_PREFIX="http://ardownload.adobe.com/pub/adobe/reader/unix/9.x/9.1/misc/FontPack910_"
+#SRC_SUFFIX="_i386-solaris.tar.bz2"
+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} )"
+
+SLOT="0"
+LICENSE="Adobe"
+KEYWORDS="~amd64 ~x86"
+IUSE="minimal linguas_ja linguas_ko linguas_zh_CN linguas_zh_TW"
+RESTRICT="strip mirror"
+
+DEPEND=""
+RDEPEND="linguas_ja? ( >=app-text/acroread-9.1[-linguas_ja] )"
+#	linguas_ko? ( >=app-text/acroread-9.1[-linguas_ko] )
+#	linguas_zh_CN? ( >=app-text/acroread-9.1[-linguas_zh_CN] )
+#	linguas_zh_TW? ( >=app-text/acroread-9.1[-linguas_zh_TW] )
+
+S="${WORKDIR}"
+
+pkg_setup() {
+	confutils_require_any !minimal linguas_ja linguas_ko linguas_zh_CN linguas_zh_TW
+}
+
+src_install() {
+	local INSTALLDIR="/opt"
+	local READERDIR="${INSTALLDIR}/Adobe/Reader9"
+	local RESOURCEDIR="${READERDIR}/Resource"
+	local CMAPDIR="${RESOURCEDIR}/CMap"
+
+	dodir "${INSTALLDIR}"
+	insinto "${RESOURCEDIR}"
+
+	if use linguas_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 || die
+	fi
+	if use linguas_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 || die
+	fi
+	if use linguas_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 || die
+	fi
+	if use linguas_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 || die
+	fi
+
+	if use !minimal ; then
+		tar xf xtdfont/XTDFONT.TAR --no-same-owner -C "${D}/${INSTALLDIR}"
+		rm "${D}${RESOURCEDIR}"/Font/{MinionPro*,MyriadPro*}
+
+		doins "${D}${INSTALLDIR}"/LICREAD.TXT || die
+		rm "${D}${INSTALLDIR}"/{INSTALL,LICREAD.TXT}
+		rm -rf "${D}${READERDIR}"/Reader/intellinux
+	fi
+
+	# bug 152288
+	rm "${D}/${CMAPDIR}"/Identity-{V,H}
+
+	if use !linguas_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
+	#	rm "${D}/${CMAPDIR}"/{Adobe-Korea*,KSC*,UCS2-GBK*,UCS2-KSC*,UniKS*}
+	#fi
+	#if use !linguas_zh_CN ; then
+	#	rm "${D}/${CMAPDIR}"/{Adobe-GB*,GB*,UCS2-GB*,UniGB*}
+	#fi
+	#if use !linguas_zh_TW ; then
+	#	rm "${D}/${CMAPDIR}"/{Adobe-CNS*,B5*,CNS*,ET*,HK*,UCS2-B5*,UCS-ET*,UniCNS*}
+	#fi
+
+
+	fowners -R -L --dereference 0:0 "${INSTALLDIR}"
+}