gentoo resync : 15.12.2019

2 files changed, 49 insertions, 44 deletions

diff --git a/dev-tex/cjk-latex/Manifest b/dev-tex/cjk-latex/Manifest
index ad6fa4b219cd..e53c2e8ed162 100644
--- a/dev-tex/cjk-latex/Manifest
+++ b/dev-tex/cjk-latex/Manifest
@@ -1,5 +1,5 @@
 DIST cjk-4.8.4-doc.tar.gz 2152418 BLAKE2B 09b72aa75efa01ea880a99bf0c289dd3f7d0c107080b38fb99390a39c1179884eb55fcd32f978f07fdad25898aabbc636367e3ab83d1f1c1ce95aedfeb46efb7 SHA512 453ff48554d950eeba53481e0643dcd96214627a12e685e1c39476e19aee9f5284ae347cf694df583c43cc273be44a5b56511bfc622144552f07e51d9e1e0877
 DIST cjk-4.8.4-fonts.zip 20384230 BLAKE2B 6b73b20381b6a1de91cc7de6760f9c453616857b5fe493e90944145ae16c42b85f760018f2b2a6397fd8f1b02801b58b6e35f2a5493fcf0b367be2d25463664d SHA512 ec55aa604f1e8b19936d0e22949f8100f6442c6c93a5f240a78c9891289d838dd29350dcb4d20998c3e7a13ba05d451934ed29a2d7e7cbbaf517db06a92204d1
 DIST cjk-4.8.4.tar.gz 556197 BLAKE2B c884d8482dc107344c6afd3d2eba49c84907fdeaa9bd422c1239f2c43ed643991ad7c16c3c2a6dbf7d7bb0642c8f41d707feb98a5d08fc32c40de69615eb08bc SHA512 d1dc754c176331d0694561158554072083e6b8f2bbeb2516915c8bc8b15bbcedff81f2a14655cc9d77d832121971a5f9792e3c477336f9b5bcb77c8f15f8cfa3
-EBUILD cjk-latex-4.8.4.ebuild 3632 BLAKE2B 01612ee49214478aa10b56a67d02fbdbf8c7bfb4e03dfb43271ebaccea7fa86bd7d8694e699dce6ffabb72b286c5b65aab5f105915af1ae0cef1b68cb280d6a2 SHA512 e15a19a778f2e19d5ae0c5ce9962425786f8767c86c8afaa260c2c9d850ae61a8b798d72bad20d1070e41f8d1fa4e03085d2e3d4f2aaf5cdb7f4122e4d8a338b
+EBUILD cjk-latex-4.8.4.ebuild 3676 BLAKE2B 8a2c71d38f8b5a5957d6ba7c9b343eb32541d80a62cb9382c55a75898062083e802d2e92f186ac100b995ef535b401ddc668424058d4e8e9da8e1bb9d8bd5f16 SHA512 ccd73203fc8a2d3859a28dfdf8b54adca371294762695610a696889204fff6a426559e515033e79e29332764e1617950477e8720d276f5408d35c7b476cefcb0
 MISC metadata.xml 336 BLAKE2B 3b1a7634ed8211dbf66256972325fc0227c3d03f43d9281b035909a73fd3278f5569156430c501c10545f1f8879068c533529293628bb4fe043d77256af4dfb7 SHA512 02b448b851022e1aa1e70f9b7a5e21bf0d7d8638de6e8064a98dc2f7be856af7dbaa1ab527f5fd940083e0866748819ebc0c49dde4945a383958256b02aeaefb
diff --git a/dev-tex/cjk-latex/cjk-latex-4.8.4.ebuild b/dev-tex/cjk-latex/cjk-latex-4.8.4.ebuild
index df0a850f7e88..d258be7dc29d 100644
--- a/dev-tex/cjk-latex/cjk-latex-4.8.4.ebuild
+++ b/dev-tex/cjk-latex/cjk-latex-4.8.4.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=4
+EAPI=7
 
-inherit latex-package elisp-common toolchain-funcs multilib eutils flag-o-matic
+inherit latex-package elisp-common toolchain-funcs flag-o-matic
 
 MY_P="${P/-latex/}"
 
@@ -22,13 +22,16 @@ IUSE="doc emacs"
 RDEPEND="virtual/latex-base
 	dev-libs/kpathsea
 	emacs? ( virtual/emacs )"
-DEPEND="${RDEPEND}
-	virtual/pkgconfig
-	app-arch/unzip"
+
+DEPEND="${RDEPEND}"
+
+BDEPEND="app-arch/unzip
+	virtual/pkgconfig"
 
 S="${WORKDIR}/${MY_P}"
 
 src_prepare() {
+	default
 	for i in "${WORKDIR}"/CJK/*.tar.gz; do
 		tar -xzf ${i} || die "failed to unpack $i"
 	done
@@ -40,43 +43,43 @@ src_prepare() {
 
 src_configure() {
 	has_version '>=dev-libs/kpathsea-6.2.1' && append-cppflags "$($(tc-getPKG_CONFIG) --cflags kpathsea)"
-	cd utils
+	cd utils || die
 	for d in *conv; do
-		cd $d
-		local f=`echo $d | tr '[:upper:]' '[:lower:]'`
+		cd ${d} || die
+		local f=`echo ${d} | tr '[:upper:]' '[:lower:]'`
 		echo "all: $f" >> Makefile
-		if [ $d = CEFconv ] ; then
+		if [ ${d} = CEFconv ] ; then
 			echo "all: cef5conv cefsconv" >> Makefile
 		fi
-		cd -
+		cd - || die
 	done
-	cd hbf2gf
+	cd hbf2gf || die
 	econf --with-kpathsea-lib="${EPREFIX}"/usr/$(get_libdir) \
 		--with-kpathsea-include="${EPREFIX}"/usr/include/kpathsea
 }
 
 src_compile() {
 	tc-export CC
-	cd utils
+	cd utils || die
 	for d in *conv; do
-		cd $d
-		emake || die
-		cd -
+		cd ${d} || die
+		emake
+		cd - || die
 	done
-	cd hbf2gf
-	emake || die
-	cd -
+	cd hbf2gf || die
+	emake
+	cd - || die
 
 	if use emacs ; then
-		cd lisp
+		cd lisp || die
 		elisp-compile *.el
-		cd emacs
+		cd emacs || die
 		elisp-compile *.el
-		cd ../mule-2.3
+		cd ../mule-2.3 || die
 		elisp-compile *.el
 	fi
 
-	cd "${T}"
+	cd "${T}" || die
 
 	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
@@ -90,39 +93,41 @@ src_compile() {
 }
 
 src_install() {
-	cd utils
+	cd utils || die
 	for d in *conv; do
-		cd $d
+		cd ${d} || die
 		local f=`echo $d | tr '[:upper:]' '[:lower:]'`
 		dobin *latex *conv
 		doman *.1
-		cd -
+		cd - || die
 	done
-	cd hbf2gf
-	einstall || die "einstall failed"
+	cd hbf2gf || die
+	doman hbf2gf.1
+	dobin hbf2gf
+	dodir "${TEXMF}/fonts/hbf"
 
-	cd "${S}"
+	cd "${S}" || die
 
 	# Install pk fonts
-	pushd texmf &>/dev/null
+	pushd texmf &>/dev/null || die
 	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"
+			newins ${f} `basename ${f/.pk/.500pk}`
 		done
 	done
-	popd &>/dev/null
+	popd &>/dev/null || die
 
 	insinto "${TEXMF}/tex/latex/${PN}"
-	doins -r texinput/* || die "installing texinput files failed"
-	doins -r contrib/wadalab || die "installing wadalab failed"
+	doins -r texinput
+	doins -r contrib/wadalab
 
 	if use emacs ; then
-		cd utils/lisp
+		cd utils/lisp || die
 		elisp-install ${PN} *.el{,c} emacs/*.el{,c} mule-2.3/*.el{,c}
 	fi
 
-	cd "${S}"
+	cd "${S}" || die
 
 	# uwpatch stuff
 	insinto ${TEXMF}/scripts/uwpatch
@@ -132,30 +137,30 @@ src_install() {
 
 	# jisksp40 stuff
 	insinto ${TEXMF}
-	doins -r jisksp40/texmf/*
+	doins -r jisksp40/texmf
 
 	# kanji48 stuff
 	insinto ${TEXMF}
-	doins -r kanji48/texmf/*
+	doins -r kanji48/texmf
 
 	use doc || rm -rf texmf/doc
 	insinto ${TEXMF}
-	doins -r texmf/* || die "installing texmf failed"
+	doins -r texmf
 
 	# 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/*
+	doins -r utils/hbf2gf/cfg/
 
 	insinto ${TEXMF}/scripts/subfonts
-	doins utils/subfonts/*
+	doins -r utils/subfonts/
 
-	rm -f doc/COPYING doc/INSTALL
+	rm -f doc/COPYING doc/INSTALL || die
 	dodoc ChangeLog README
 	if use doc ; then
 		insinto /usr/share/doc/${PF}
-		doins -r doc/*
+		doins -r doc
 		doins -r examples
 	fi
 	docinto uwpatch