Version bumped.

Package-Manager: portage-2.1.6.13/cvs/Linux x86_64

4 files changed, 110 insertions, 96 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/Manifest b/media-fonts/acroread-asianfonts/Manifest
index a187622a7680..4d4610c30d53 100644
--- a/media-fonts/acroread-asianfonts/Manifest
+++ b/media-fonts/acroread-asianfonts/Manifest
@@ -1,13 +1,14 @@
-DIST FontPack708_chs_i386-linux.tar.gz 14118337 RMD160 b2fb81cf31451a9cb08e6eee930f99be9ebe50ed SHA1 23c331cd2285c056200f7e5c5d6433c678aee098 SHA256 a39342d7c017315eb92b93c289bd9ef9c2601f2fd6033c7968fc34d9a50540c2
-DIST FontPack708_cht_i386-linux.tar.gz 9713040 RMD160 dbdffbf834702c0b95aca5e358fba9abb2fde83c SHA1 79716f59a02c318c81647e601b3f08a356c8c721 SHA256 48f16485c192aa5f77cb2c42869f5484b058b71c4631c6d8f1ad7c8d22ebf40d
-DIST FontPack708_jpn_i386-linux.tar.gz 11268460 RMD160 78d30b947ce6d17e56e19f6126f53fcfa43dd2c0 SHA1 2c92f2463565c87b2aa480b4e69ac5d626e3d57f SHA256 5621ce6c8e129bc530cfcb4de58bd9d618dda28a69830237dfef7acd93023238
-DIST FontPack708_kor_i386-linux.tar.gz 5938528 RMD160 c11cb71f467c3ecd8332ff3a0012989f5cfb2850 SHA1 c41879554e62bc77b0beec9dc2ad6773879c810d SHA256 2057a084d5a89dfe2f01d68a68accd09dac88e89620276dcb95a6f1c8f052e76
 DIST FontPack81_chs_i486-linux.tar.gz 14174797 RMD160 0963696c2fa804774966ec2805ba64ae16ce38f2 SHA1 ab2633e47eff1e7dbecdedab581bfa8c210e1b08 SHA256 55810b17bb5a3296ba1fbb27b9a072684324b01b1ae1645247ce50063846fcf2
 DIST FontPack81_cht_i486-linux.tar.gz 9761058 RMD160 3d4dc24e69ae87bc41e37e8e0b856c59632a00a2 SHA1 37a703d427f30d58ffe5079354a30d0046fbcfab SHA256 6d205e09254011031a57310dbc24a852a0a7a16dfc5c3e9b5f74c3768ed1400f
 DIST FontPack81_jpn_i486-linux.tar.gz 13314642 RMD160 e3411283a7ba1722285b743c8834faea3ecfdfc0 SHA1 08c13e540c101f553ab66d3948e03283bcedd655 SHA256 1de865aa1af73ad02caa14cf9bfabf9f567280cb9351c692606038200ad2a56a
 DIST FontPack81_kor_i486-linux.tar.gz 5932677 RMD160 0de18ce948eea6d45c899cbcf2b95ccb0adbfaba SHA1 3852b306e64d98876b26654663c2bc2d7b16c4e2 SHA256 4ddadb41b0ba78324c3f56e87ac2829659892694ebf6645653181a0d43927990
 DIST FontPack81_xtd_i486-linux.tar.gz 5979158 RMD160 4b39770a9bc6b845d881a2b298c8c9d4234fe7e9 SHA1 94ccafd43fca889c6163005268bffc66a3cb7884 SHA256 4dde3d44d98bb05d33325551996a849e03521344965e8cced53624ff6c635443
-EBUILD acroread-asianfonts-7.0.8.ebuild 2736 RMD160 dc1c297bd1da2f25ba0cc774a88e6ff6a4ac8ea2 SHA1 356eea9db63db770ff9ae0f7a0787fd1a8748113 SHA256 2e0ac3678d82101dbbec14177cd1f2b1e9944d97f3aeb34d92a84cdc232bca17
+DIST FontPack910_chs_i486-linux.tar.bz2 25693434 RMD160 b229c2b84198e5827f13091f5c37514aecdac14e SHA1 0bd6a275fd33856a5c9aa61c9530460582758a93 SHA256 4272e74324203504948ede5e0345b32cd1c99b2e57f0ddaad6fc1591cc0eea1a
+DIST FontPack910_cht_i486-linux.tar.bz2 11534169 RMD160 978aeb4a98d45deb5063d4e13565bcb4c3dc493e SHA1 afa011fc19341bfae731a15eda9aff5f47b54b39 SHA256 8e907e21ee15ff9f63ea4f95f6d5c24ffe927584ec1c6fd0e9c660a0d2caee48
+DIST FontPack910_jpn_i486-linux.tar.bz2 11006398 RMD160 947c00b5ed391914a14e2de9d42d0054cca3846d SHA1 0b82a27a5e0703652225a79ffd457d64a1fc11ed SHA256 712b77a5d3b36d8235e61a9efe4bd51275f65e090da658393ff78f8c4d30fb0a
+DIST FontPack910_kor_i486-linux.tar.bz2 8571757 RMD160 b33291986a78be84b53a1ef4feb33a412fa13162 SHA1 6a0ac9feedb22618bfc5784caeda197fd03aafd5 SHA256 74394114bebfdbf134a74147d68ed9a46af8f08858dd00d50002cf24a9a39077
+DIST FontPack910_xtd_i486-linux.tar.bz2 5906030 RMD160 f63255e0512d7a56374d06febe2482e38feed86c SHA1 fd62e425f01a558b4e00d0fcfc22257d62040ff4 SHA256 2180ef033d2d7ae3c758d2bb989c692ce73fb408668a3feeeeed6d05cd363f28
 EBUILD acroread-asianfonts-8.1.2.ebuild 3701 RMD160 19e1bba7a20913074d65caae4dc3757f4972b2dc SHA1 6d892ca4f18bf9296d86e8a0406c79ff4d53ceff SHA256 9f14586a73e36aaef0fdad9666fd6a37ecbe033499efc28e3ea6c3cb71dccf05
-MISC ChangeLog 3767 RMD160 68e8d4e3bd53c3ad769cffa15adf5954c3ae8ced SHA1 00a4ff7adc9054bff0c8400619cd8667bced9d42 SHA256 dc47c7c2596387df7622c850988aa5a4a2c0e4468311f9f902286faced030e5e
+EBUILD acroread-asianfonts-9.1.ebuild 3184 RMD160 1198d5b336157c4da0f4925b13e12ce8690a4e8f SHA1 4b689e93f009bca7b83a7c7c638c02896213764b SHA256 79d708f2132bcc175ae19e52ef00697153194f15bf8703f2f3830db5be6223b6
+MISC ChangeLog 3966 RMD160 867f921998516aa8411116e5734dda59e807387b SHA1 8a0755d958bebfc1594bda00bc8f7d5e5b5ae913 SHA256 46ddb20a6220ce14c42ca42c4df0d70ec62936d318d024fdec09dab04361fc0f
 MISC metadata.xml 175 RMD160 e22fbca96af27631c4910bc93f69d81280ddd96e SHA1 5f1d4ea1a9ccb9b3dbd74ddaed58f0df64f2ad63 SHA256 0dc53674ee3ca2348bedd390f639dac96f537cce8cd0c550c13917de7b61f2e8
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}"
+}