version bump

Signed-off-by: Alexis Ballier <aballier@gentoo.org>
Package-Manager: portage-2.2.18/cvs/Linux x86_64
Manifest-Sign-Key: 0x160F534A

3 files changed, 177 insertions, 17 deletions

diff --git a/dev-tex/cjk-latex/ChangeLog b/dev-tex/cjk-latex/ChangeLog
index 8ff870fee1c8..a09ae0d4119c 100644
--- a/dev-tex/cjk-latex/ChangeLog
+++ b/dev-tex/cjk-latex/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for dev-tex/cjk-latex
-# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-tex/cjk-latex/ChangeLog,v 1.70 2014/01/26 12:12:39 ago Exp $
+# Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/dev-tex/cjk-latex/ChangeLog,v 1.71 2015/04/29 15:38:32 aballier Exp $
+
+*cjk-latex-4.8.4 (29 Apr 2015)
+
+  29 Apr 2015; Alexis Ballier <aballier@gentoo.org> +cjk-latex-4.8.4.ebuild:
+  version bump
 
   26 Jan 2014; Agostino Sarubbo <ago@gentoo.org> cjk-latex-4.8.3-r1.ebuild:
   Stable for sparc, wrt bug #495650
diff --git a/dev-tex/cjk-latex/Manifest b/dev-tex/cjk-latex/Manifest
index c1c77eac08ce..0a67593b70ef 100644
--- a/dev-tex/cjk-latex/Manifest
+++ b/dev-tex/cjk-latex/Manifest
@@ -8,25 +8,19 @@ DIST cjk-4.8.2.tar.gz 553425 SHA256 2108856bafbf6eb44b65500122ae540d863fb1e41964
 DIST cjk-4.8.3-doc.tar.gz 2045004 SHA256 d7a39b532f318b210ee650be0389145973029ffaebcb3e731a3e1fd90440d8b5 SHA512 06cab391ebd7d92a120dc493101bd3f9aef585e9f8be26d5c510c1b2266fe8dd6dd83aa6b41a4a58b8a97b294431193e05350485d4480019acab388b4a25f0a7 WHIRLPOOL 566db0371595a25352e36a35b294aa19f0df7c704e36c3a682bec25d2f5edaa6517f84e0791433e0e457015f4d0444cf2a1babb7e0a39f64a27711eec3d2a63b
 DIST cjk-4.8.3-fonts.zip 20384230 SHA256 1625582b13a5f46532b5f7d0b0f25a9f72960017ad9b1074fbcf70cbbf45efb4 SHA512 ec55aa604f1e8b19936d0e22949f8100f6442c6c93a5f240a78c9891289d838dd29350dcb4d20998c3e7a13ba05d451934ed29a2d7e7cbbaf517db06a92204d1 WHIRLPOOL 0876b7908b1f0c164a3e28888e97b4b7d8f251ea56e84f0268053bd6b3cc7877ca4e1543c9afb4534b1a5a4860187bb038ef08a9d66567b4937eb46ee8ae0a45
 DIST cjk-4.8.3.tar.gz 562787 SHA256 fd8847d7494110a318f222276f8026bc9723f4728ad1fd5ec72e0494a20f4837 SHA512 b3ff2761f86de900abcf678cb85886fa3bd2ec80a205e042ccdf44d432f699b0e8fb45e56aff4368b534b187c46de2eb4e2657098bab877b11a2bc13d099bee9 WHIRLPOOL 00ab9a67bccc2bcc3737b1e739b6526a0ef0dc33bf997f89e42245f243b1f711b24dd570d41470b8cba135369feddca349c86d7d9f84b4c58fb17ab271c0fc0a
+DIST cjk-4.8.4-doc.tar.gz 2152418 SHA256 73775aec5a9006acecca45acaf7f3f59cbdeab7f3d2dfe3a1d983d6791fbf987 SHA512 453ff48554d950eeba53481e0643dcd96214627a12e685e1c39476e19aee9f5284ae347cf694df583c43cc273be44a5b56511bfc622144552f07e51d9e1e0877 WHIRLPOOL 494c1a7fa00e73fdbafe503842b44dc928edf6fd19426a7a5c623427a6e4a7e77edc5944a31ce7ef1b4a4e02d39f2e37c1a91b8918018791171240fe2fea0ea0
+DIST cjk-4.8.4-fonts.zip 20384230 SHA256 1625582b13a5f46532b5f7d0b0f25a9f72960017ad9b1074fbcf70cbbf45efb4 SHA512 ec55aa604f1e8b19936d0e22949f8100f6442c6c93a5f240a78c9891289d838dd29350dcb4d20998c3e7a13ba05d451934ed29a2d7e7cbbaf517db06a92204d1 WHIRLPOOL 0876b7908b1f0c164a3e28888e97b4b7d8f251ea56e84f0268053bd6b3cc7877ca4e1543c9afb4534b1a5a4860187bb038ef08a9d66567b4937eb46ee8ae0a45
+DIST cjk-4.8.4.tar.gz 556197 SHA256 17b3978a1558dbcb23a041076673c4b26856bfe975839a17363e35cd2f93a6ea SHA512 d1dc754c176331d0694561158554072083e6b8f2bbeb2516915c8bc8b15bbcedff81f2a14655cc9d77d832121971a5f9792e3c477336f9b5bcb77c8f15f8cfa3 WHIRLPOOL 9c1d94f676b86f91bf0496047b7bc3fd9f5ae70eae49390dc1e52a313fad8e342ed9cc254f58e7b5ba109ddbfc027145fe1caae1659fd2cd2234a10de5dc0871
 EBUILD cjk-latex-4.8.2.ebuild 3643 SHA256 fa71dfed8fae74ac140f1dd9189c8e5a443471d050da4da51871638269dcfea7 SHA512 b0fb7e04c7b770ea562ee50521a3e600bf541391b6445d9ee0ed8b416f184bcd5e42948d77480a78361d0ea86ec6a0f15f3686f5368d4812692cac5b18b7fbb3 WHIRLPOOL a5067d1a6f722a75b63f362ab413ff6b57cd06e7422205bd78994446cce3d32904fc8537fbd55e8828d46a0fc095db518bf92e7987df9af445567babcf31955b
 EBUILD cjk-latex-4.8.3-r1.ebuild 3599 SHA256 b5fb6ef0dc4a97b3f7ac943e09cd8dd86f4e79244d0c62d0c96d783edb73f01a SHA512 77585f0c27ea12fbfe0b72f5562621f85c6207ad50ae8f9e80efd3a92e1174d374ba417e32f30f0c5ffda7a98d77fa507e1bc5feead0c3d12319d0425f070ad3 WHIRLPOOL c0d7995e686ee3064fa64f6e23edbe5b1f1f3c6bb2a16fd433a97772b9e487f493e2fcfde43c19315931a134f5006fa0797fd92e3ca31eb9b0d3aa9e5e7096a9
 EBUILD cjk-latex-4.8.3.ebuild 3599 SHA256 65174be1cbc406c23724f1df16daa1442cbf251b797ce4fae17a888af5b9f19d SHA512 1585ecac7d04aef39bf8581c688127a27495c55d51311170ef94d2a1239619e9d647c61fe86c91bb40d7755127b333a2d01055c2d080f5d6104d96673f842b27 WHIRLPOOL 6aba17e5c9bcac835962088b68472194d6c4cd570fdf0ba3593dd4702291fcabde1a006297220deb5f21ecac84064986c317a3f0065d9566241570f962753d31
-MISC ChangeLog 8028 SHA256 1ee12c0c821b875c9363e3100fdfd4833b3013e3a39ac8bf9f8173e381992ad1 SHA512 35df8e42df808776e98d3e8c36098c678e2ab01c2c1d16f6b753eecf3c433f2e42c21e34f4512f9c430dcdfcd7ccc998ee358037caf964882e3c2e015febf28a WHIRLPOOL 1c44c1db9d48b3343b14ca9e0c29c795ab343aebd5e83558c76a3bb4bcf83825cb69f70c200057e1fa17f4a701d378f3ebd227906ceb1ac38f0b827aad55fc05
+EBUILD cjk-latex-4.8.4.ebuild 3609 SHA256 f11654193fa25a8a36bfe38ecd9d364b6a1a3e007b2318204fd088ab5447056e SHA512 2446efffe6b81b01917ba15808b764eb1e6862d9054e798812f37c478344fa77fb38799f9083555f44ea8589c578ecd9c186452afd99b8cc4615d6b19e63be90 WHIRLPOOL a776aa84716271cb146c0c152f7db93824b9963af3fb0cc9d999cd966b812f118700dee24985f749bedd11ea18c8434889bfcf47ded3ac9b3b98fd0580de91f2
+MISC ChangeLog 8158 SHA256 d9171ce4bd61db68a6716489d3cd3395d4438b3d98cae160324e366f4091823d SHA512 7a7aff6135eb91e7b52d61e4a53f515f21ef4263808f33a6fab95d8df27075c4861a0fa64b37e388e682b009d865884ea514e5d503d2714e3213121129ad4fd1 WHIRLPOOL 6731664374e0a591763db2088ca4e35b7f663518d07300d33f31ec3e21abeae07bc64f0d2a90d8733e58b6ed0e2c939105384d97e226ecced1d0ea1fb7d7c17b
 MISC metadata.xml 173 SHA256 f489b81a91c6b9b653122719caac14c4f1cfd63d26d4b100abf1a995db71d9c8 SHA512 d6228b72cd89fb05fcf5edc3e7f6abc21d90df6ab598c43d2b753450f096349d99f65c524344707f685f07883e9bf434c9a33875734965eb316ae837d8c3ef25 WHIRLPOOL 3b03e35eb022fc1ce244b82b623186d70ff30c809cae2369d00b609281a65180851a3988058995790a8a1971fdb1674c60107ae3e08750b8a58164c830933299
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.22 (GNU/Linux)
+Version: GnuPG v2
 
-iQIcBAEBCAAGBQJS5Pu4AAoJELp701BxlEWfHvkP/3YiB+yHFAzA/B3aaVNh7LYq
-d6Ia75RfaVONRIVbIigHW76qYGweCLetkxa/9X+ZyMLVhWDgMIUPT3Blly0zSnLH
-VHXXkhSbCjwbyXyiEHLBuVlu9f9K/eEClAU6CqxfkXtuD7lfFp/JWsj6iQDuHLtf
-qr3PR/VeqzPNo5BvhUNIeQB9f8kVgKf0AkmnG51G/mRmou7RFSitOjwOu6pk5klN
-XrS34TaHnotHmgkCs3Ly6wLrlLw44hol+8qi4xSTAG8xPDf6tehG3asy1w6RSiGR
-l8lAxog5z2tpKW0nnBa6CqNzJvP646KYkFfQz3qnnVM20F1oq4MNex64IzLD2zCW
-4zB3HJYcfu3Fvbv0cC05YH1kUB3vA/C1H+Ri+V7XaGWnT3OYti/OIHxKTbg/QA9n
-OPuD1U7PwpC01Na+8odyFpPlA+1CvgfYwLhFW+bDWKb1zNz1MIb0XnjNFI15kCFI
-Nh2AL1ZkByRjPlu4MEvydhAhQRTonS66Xk8HelW1Okny1ZQv901Eluuv2CzFxULf
-SpXhC3V+8kjVhFpCBmNxo+DXnDLKWFx+IHE7NkdKM3aStBAzHWZIAOmU/oHfSEP4
-14ou4+Wj5r5CQuSuRRyUYcXgiXPxCaZL4iY96RQ6fKabqFouZ7CycDPeSjw22qox
-mmKnDSy0U1W8bHLP3Gtz
-=U59e
+iEYEAREIAAYFAlVA+vkACgkQvFcC4BYPU0p6HwCfUFjjdHKlK1N1RvjeStOD/vIj
+J2sAn2iBl/vxxcVwZ61iVywq+tY+WRDK
+=23HQ
 -----END PGP SIGNATURE-----
diff --git a/dev-tex/cjk-latex/cjk-latex-4.8.4.ebuild b/dev-tex/cjk-latex/cjk-latex-4.8.4.ebuild
new file mode 100644
index 000000000000..32860809a877
--- /dev/null
+++ b/dev-tex/cjk-latex/cjk-latex-4.8.4.ebuild
@@ -0,0 +1,161 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-tex/cjk-latex/cjk-latex-4.8.4.ebuild,v 1.1 2015/04/29 15:38:32 aballier Exp $
+
+EAPI=4
+
+inherit latex-package elisp-common toolchain-funcs multilib eutils
+
+MY_P="${P/-latex/}"
+
+DESCRIPTION="A LaTeX 2e macro package which enables the use of CJK scripts in various encodings"
+HOMEPAGE="http://cjk.ffii.org/"
+# fonts are taken from ftp://ftp.ctan.org/tex-archive/fonts/CJK.zip
+SRC_URI="ftp://ftp.ffii.org/pub/cjk/${MY_P}.tar.gz
+	mirror://gentoo/${MY_P}-fonts.zip
+	doc? ( ftp://ftp.ffii.org/pub/cjk/${MY_P}-doc.tar.gz )"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux"
+IUSE="doc emacs"
+
+DEPEND="virtual/latex-base
+	emacs? ( virtual/emacs )"
+RDEPEND="${DEPEND}
+	app-arch/unzip"
+
+S="${WORKDIR}/${MY_P}"
+
+src_prepare() {
+	for i in "${WORKDIR}"/CJK/*.tar.gz; do
+		tar -xzf ${i} || die "failed to unpack $i"
+	done
+	find texmf/fonts/hbf -type f -exec cp {} "${T}" \; || die
+	sed -i -e "/^pk_files/s/no/yes/" \
+		-e "/^dpi_x/s/300/500/" \
+		texmf/hbf2gf/*.cfg || die
+}
+
+src_configure() {
+	cd utils
+	for d in *conv; do
+		cd $d
+		local f=`echo $d | tr '[:upper:]' '[:lower:]'`
+		echo "all: $f" >> Makefile
+		if [ $d = CEFconv ] ; then
+			echo "all: cef5conv cefsconv" >> Makefile
+		fi
+		cd -
+	done
+	cd hbf2gf
+	econf --with-kpathsea-lib="${EPREFIX}"/usr/$(get_libdir) \
+		--with-kpathsea-include="${EPREFIX}"/usr/include/kpathsea
+}
+
+src_compile() {
+	tc-export CC
+	cd utils
+	for d in *conv; do
+		cd $d
+		emake || die
+		cd -
+	done
+	cd hbf2gf
+	emake || die
+	cd -
+
+	if use emacs ; then
+		cd lisp
+		elisp-compile *.el
+		cd emacs
+		elisp-compile *.el
+		cd ../mule-2.3
+		elisp-compile *.el
+	fi
+
+	cd "${T}"
+
+	for f in "${S}"/texmf/hbf2gf/*.cfg ; do
+	env TEXMFCNF="${EPREFIX}/etc/texmf/web2c" HBF_TARGET="${S}/texmf/fonts" "${S}/utils/hbf2gf/hbf2gf" $f || die
+	done
+
+	einfo "Generating pk fonts"
+	for gf in *.gf ; do
+		einfo "${gf}"
+		gftopk $gf || die
+	done
+}
+
+src_install() {
+	cd utils
+	for d in *conv; do
+		cd $d
+		local f=`echo $d | tr '[:upper:]' '[:lower:]'`
+		dobin *latex *conv
+		doman *.1
+		cd -
+	done
+	cd hbf2gf
+	einstall || die "einstall failed"
+
+	cd "${S}"
+
+	# Install pk fonts
+	pushd texmf &>/dev/null
+	for d in fonts/pk/modeless/*/* ; do
+		insinto ${TEXMF}/${d}
+		for f in "${T}"/${d##*/}*.pk ; do
+			newins $f `basename ${f/.pk/.500pk}` || die "newins failed"
+		done
+	done
+	popd &>/dev/null
+
+	insinto "${TEXMF}/tex/latex/${PN}"
+	doins -r texinput/* || die "installing texinput files failed"
+	doins -r contrib/wadalab || die "installing wadalab failed"
+
+	if use emacs ; then
+		cd utils/lisp
+		elisp-install ${PN} *.el{,c} emacs/*.el{,c} mule-2.3/*.el{,c}
+	fi
+
+	cd "${S}"
+
+	# uwpatch stuff
+	insinto ${TEXMF}/scripts/uwpatch
+	doins uwpatch/uwpatchold.sh
+	insinto ${TEXMF}/fonts/afm/uwpatch
+	doins uwpatch/*.afm
+
+	# jisksp40 stuff
+	insinto ${TEXMF}
+	doins -r jisksp40/texmf/*
+
+	# kanji48 stuff
+	insinto ${TEXMF}
+	doins -r kanji48/texmf/*
+
+	use doc || rm -rf texmf/doc
+	insinto ${TEXMF}
+	doins -r texmf/* || die "installing texmf failed"
+
+	# Move fonts because hbf2gf expects them in MISCFONTS
+	mv "${ED}/${TEXMF}/fonts/hbf" "${ED}/${TEXMF}/fonts/misc" || die "mv font failed"
+
+	insinto ${TEXMF}/hbf2gf
+	doins utils/hbf2gf/cfg/*
+
+	insinto ${TEXMF}/scripts/subfonts
+	doins utils/subfonts/*
+
+	rm -f doc/COPYING doc/INSTALL
+	dodoc ChangeLog README
+	if use doc ; then
+		insinto /usr/share/doc/${PF}
+		doins -r doc/*
+		doins -r examples
+	fi
+	docinto uwpatch
+	dodoc uwpatch/README
+}