version bump, bug #103309, fixing bug #40354

Package-Manager: portage-2.1.3.19

4 files changed, 186 insertions, 9 deletions

diff --git a/dev-tex/cjk-latex/ChangeLog b/dev-tex/cjk-latex/ChangeLog
index 7552142fac7e..09c5e51ed116 100644
--- a/dev-tex/cjk-latex/ChangeLog
+++ b/dev-tex/cjk-latex/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for dev-tex/cjk-latex
 # Copyright 2000-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-tex/cjk-latex/ChangeLog,v 1.14 2007/03/13 00:11:50 nattfodd Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-tex/cjk-latex/ChangeLog,v 1.15 2007/11/11 09:22:50 aballier Exp $
+
+*cjk-latex-4.7.0 (11 Nov 2007)
+
+  11 Nov 2007; Alexis Ballier <aballier@gentoo.org> +cjk-latex-4.7.0.ebuild:
+  version bump, bug #103309, fixing bug #40354
 
   12 Mar 2007; Alexandre Buisse <nattfodd@gentoo.org> metadata.xml:
   Replaced text-markup by tex as maintaining herd (text-markup split).
diff --git a/dev-tex/cjk-latex/Manifest b/dev-tex/cjk-latex/Manifest
index 67829b230e01..9d5556727178 100644
--- a/dev-tex/cjk-latex/Manifest
+++ b/dev-tex/cjk-latex/Manifest
@@ -4,14 +4,21 @@ Hash: SHA1
 DIST cjk-4.5.2-doc.tar.gz 2210829 RMD160 2cdd9376778f50532d8960edb7e1ab5ca86c64a0 SHA1 eeb89e97acff9f3e6e00bb5c315cebf5f5ecb31d SHA256 94d36bf8dd304752bef1f4e8d6130062f5eb9e1ae50740f44cfff25de8ca047b
 DIST cjk-4.5.2-fonts.tar.gz 20383617 RMD160 060d3ad8ed894624c9eb6f59052c6d7b4dae3d25 SHA1 f98541b8e57f6039cc08e1ef3f7e5fbf9cf5ebb4 SHA256 c4d2c91d232ee5e9ac8aad17d20416e7a8c6a18e22542ddbb891ffcc786eff80
 DIST cjk-4.5.2.tar.gz 435805 RMD160 bfb065a874f4ea7f2fd38423594a71c964c74b7d SHA1 aa89e7d6ea2c2bd8ed92ed1e4bc3ab060c1a5766 SHA256 7200120aaf80a264621f5540dfcbdcc29c4190215f5e50a1a4385b688fb8b108
+DIST cjk-4.7.0-doc.tar.gz 2113101 RMD160 be11742dfb38eef0099e37960c6df59cdc5753f0 SHA1 7574a1edb2c5dd40a177972c4d74dfacab0d189e SHA256 b57159bb60df3c4474593804b5ffef63323ff29a2de74af13821622fea65d567
+DIST cjk-4.7.0-fonts.zip 20384230 RMD160 0c1d363af352c48bf6f24067699a9559e208f517 SHA1 f1e7ae35757241af267d2a086bfec2d82b081925 SHA256 1625582b13a5f46532b5f7d0b0f25a9f72960017ad9b1074fbcf70cbbf45efb4
+DIST cjk-4.7.0.tar.gz 535037 RMD160 5be9d397cbcb0f1f0eebf39bf6a51604cce22f96 SHA1 7488ac1879340c6147bafdabec897fe08dbc0ae6 SHA256 b3b2d9c4b1dfbbbce0a8e5fa3454edc9806ab835973b8db0245855068356e234
 EBUILD cjk-latex-4.5.2.ebuild 3063 RMD160 0fc23ba378d6ee4796df9e97e6a68bed5fada8ef SHA1 48dce0a0de5340327ecb957fd2c8ef0ab4ec794f SHA256 fd72073174be26f80e2fd052fa0c001861fcf6a179e4b7ceff2704a5a4194fb1
 MD5 a710d3a663ed2275fa203235f3315864 cjk-latex-4.5.2.ebuild 3063
 RMD160 0fc23ba378d6ee4796df9e97e6a68bed5fada8ef cjk-latex-4.5.2.ebuild 3063
 SHA256 fd72073174be26f80e2fd052fa0c001861fcf6a179e4b7ceff2704a5a4194fb1 cjk-latex-4.5.2.ebuild 3063
-MISC ChangeLog 1637 RMD160 f7d5ed56d87a23ad971c2267d05ffff4b4c0d695 SHA1 efa6ddacda76e06d63485ea0d45bfba9836042a0 SHA256 db5287a845389662e9809b3a66af7ec243d73f20651f1e9e72dd9601796aaa47
-MD5 f7836e49eef6b26f6a8e714ca7ee9556 ChangeLog 1637
-RMD160 f7d5ed56d87a23ad971c2267d05ffff4b4c0d695 ChangeLog 1637
-SHA256 db5287a845389662e9809b3a66af7ec243d73f20651f1e9e72dd9601796aaa47 ChangeLog 1637
+EBUILD cjk-latex-4.7.0.ebuild 3511 RMD160 31308ea29809dce84d17f9665d2be272ad192446 SHA1 57cae79bfaa4a1517188eafd86cb31849e07a6c0 SHA256 ce4e8a1c1d376a0ad6cab965381def654ef2a7986c5a6fb9489ae620906d1ba3
+MD5 f96db2002b587c3622cc6593fe04aaa8 cjk-latex-4.7.0.ebuild 3511
+RMD160 31308ea29809dce84d17f9665d2be272ad192446 cjk-latex-4.7.0.ebuild 3511
+SHA256 ce4e8a1c1d376a0ad6cab965381def654ef2a7986c5a6fb9489ae620906d1ba3 cjk-latex-4.7.0.ebuild 3511
+MISC ChangeLog 1794 RMD160 7a4897be6f646a3d14d1431cf2a3dd775a4794d1 SHA1 3614c2ed83f8faa77bb0ede2186e94d7cfab2e60 SHA256 f69cdc7ffbbd3df2bd3c9636faf2adb37575131ddc2b8f3e548b24a0655bdffa
+MD5 2ec769d278e63d8b7828c71a1f7d6ba2 ChangeLog 1794
+RMD160 7a4897be6f646a3d14d1431cf2a3dd775a4794d1 ChangeLog 1794
+SHA256 f69cdc7ffbbd3df2bd3c9636faf2adb37575131ddc2b8f3e548b24a0655bdffa ChangeLog 1794
 MISC metadata.xml 173 RMD160 2a5c18ac36394027f647f337410df755f5d37369 SHA1 98f3803fec9ccaf2574571b904292027095f5273 SHA256 f489b81a91c6b9b653122719caac14c4f1cfd63d26d4b100abf1a995db71d9c8
 MD5 cd383624b0ad49f4db815891a9777994 metadata.xml 173
 RMD160 2a5c18ac36394027f647f337410df755f5d37369 metadata.xml 173
@@ -19,10 +26,13 @@ SHA256 f489b81a91c6b9b653122719caac14c4f1cfd63d26d4b100abf1a995db71d9c8 metadata
 MD5 05385f940051cdb90414751f65616821 files/digest-cjk-latex-4.5.2 726
 RMD160 20d1394c5533937b2fdd0b1cc610b0ef81ee1a31 files/digest-cjk-latex-4.5.2 726
 SHA256 b880845b2ee393f8306bfb73c2b16c9d58c8a754b663a8ab2cb5b199b268cac1 files/digest-cjk-latex-4.5.2 726
+MD5 a80a1310a4fb6c666e27bf47afe0338b files/digest-cjk-latex-4.7.0 717
+RMD160 c8f0f6342a4d07b212cf92192984db0b271e03ba files/digest-cjk-latex-4.7.0 717
+SHA256 105227daca21a446f972094b3f821c115ee761f4a55b03d32751fab9ecc562ee files/digest-cjk-latex-4.7.0 717
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.4.6 (GNU/Linux)
+Version: GnuPG v2.0.7 (GNU/Linux)
 
-iD8DBQFF9e0Zwx9vvAARv2sRAq9WAKCuiRHO7sCJQjYVmN3zCaFz+kv8UACdHgDZ
-RbnDcnUXxUcyCswWruHwvsk=
-=VKj2
+iD8DBQFHNsoHvFcC4BYPU0oRAl9oAKDAuHwJX76MPof9GOXBAlEkwxR8bwCeK5eu
+Q9WYNgeSeHqaYCNIaaN8o3Q=
+=EvbS
 -----END PGP SIGNATURE-----
diff --git a/dev-tex/cjk-latex/cjk-latex-4.7.0.ebuild b/dev-tex/cjk-latex/cjk-latex-4.7.0.ebuild
new file mode 100644
index 000000000000..217a7743846e
--- /dev/null
+++ b/dev-tex/cjk-latex/cjk-latex-4.7.0.ebuild
@@ -0,0 +1,153 @@
+# Copyright 1999-2007 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.7.0.ebuild,v 1.1 2007/11/11 09:22:50 aballier Exp $
+
+inherit latex-package elisp-common toolchain-funcs multilib
+
+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="~amd64 ~ppc ~ppc64 ~sparc ~x86"
+IUSE="doc emacs"
+
+DEPEND="virtual/latex-base
+	app-arch/unzip
+	emacs? ( virtual/emacs )"
+
+S="${WORKDIR}/${MY_P}"
+
+src_unpack() {
+	unpack ${A}
+	cd "${S}"
+
+	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_compile() {
+	tc-export CC
+	cd utils
+	for d in *conv; do
+		cd $d
+		local f=`echo $d | tr '[:upper:]' '[:lower:]'`
+		echo "all: $f" >> Makefile
+		emake || die || die "building $f failed"
+		if [ $d = CEFconv ] ; then
+			echo "all: cef5conv cefsconv" >> Makefile
+			emake || die "building $d failed"
+		fi
+		cd -
+	done
+	cd hbf2gf
+	econf --with-kpathsea-lib=/usr/$(get_libdir) \
+		--with-kpathsea-include=/usr/include/kpathsea
+	emake || die "building hbf2gf failed!"
+	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 HBF_TARGET="${S}/texmf/fonts" "${S}/utils/hbf2gf/hbf2gf" $f || die
+	done
+
+	einfo "Generating pk fonts"
+	for gf in *.gf ; do
+		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
+	for d in texmf/fonts/pk/modeless/*/* ; do
+		insinto /usr/share/${d}
+		for f in "${T}"/${d##*/}*.pk ; do
+			newins $f `basename ${f/.pk/.500pk}` || die "newins failed"
+		done
+	done
+
+	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}
+		cd -
+	fi
+
+	# uwpatch stuff
+	insinto ${TEXMF}/scripts/uwpatch
+	doins uwpatch/uwpatchold.sh
+	docinto uwpatch
+	dodoc uwpatch/README
+	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 "${D}/${TEXMF}/fonts/hbf" "${D}/${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
+		dodoc doc/*
+		insinto ${TEXMF}
+		doins -r texmf/doc
+		docinto chinese; dodoc doc/chinese/*
+		docinto japanese; dodoc doc/japanese/*
+		docinto examples; dodoc examples/*
+	fi
+}
diff --git a/dev-tex/cjk-latex/files/digest-cjk-latex-4.7.0 b/dev-tex/cjk-latex/files/digest-cjk-latex-4.7.0
new file mode 100644
index 000000000000..e31a0958e950
--- /dev/null
+++ b/dev-tex/cjk-latex/files/digest-cjk-latex-4.7.0
@@ -0,0 +1,9 @@
+MD5 2c3396e1a40ca90903e8de853cc8fc5d cjk-4.7.0-doc.tar.gz 2113101
+RMD160 be11742dfb38eef0099e37960c6df59cdc5753f0 cjk-4.7.0-doc.tar.gz 2113101
+SHA256 b57159bb60df3c4474593804b5ffef63323ff29a2de74af13821622fea65d567 cjk-4.7.0-doc.tar.gz 2113101
+MD5 3d03ce98ec7772f71126c78cc30d0092 cjk-4.7.0-fonts.zip 20384230
+RMD160 0c1d363af352c48bf6f24067699a9559e208f517 cjk-4.7.0-fonts.zip 20384230
+SHA256 1625582b13a5f46532b5f7d0b0f25a9f72960017ad9b1074fbcf70cbbf45efb4 cjk-4.7.0-fonts.zip 20384230
+MD5 3c9e8c45f5cb63d59307ec3eba0e2479 cjk-4.7.0.tar.gz 535037
+RMD160 5be9d397cbcb0f1f0eebf39bf6a51604cce22f96 cjk-4.7.0.tar.gz 535037
+SHA256 b3b2d9c4b1dfbbbce0a8e5fa3454edc9806ab835973b8db0245855068356e234 cjk-4.7.0.tar.gz 535037