Add missing dependencies. Respect LDFLAGS. Set VARTEXFONTS=${T}/fonts #223077

Package-Manager: portage-2.2.0_alpha100/cvs/Linux x86_64

3 files changed, 39 insertions, 17 deletions

diff --git a/app-i18n/canna/ChangeLog b/app-i18n/canna/ChangeLog
index ea208f5db8fe..b93ae7d87f81 100644
--- a/app-i18n/canna/ChangeLog
+++ b/app-i18n/canna/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for app-i18n/canna
-# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-i18n/canna/ChangeLog,v 1.70 2011/10/05 19:28:09 aballier Exp $
+# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/app-i18n/canna/ChangeLog,v 1.71 2012/05/17 05:30:44 naota Exp $
+
+  17 May 2012; Naohiro Aota <naota@gentoo.org> canna-3.7_p3-r2.ebuild:
+  Add missing dependencies. Respect LDFLAGS. Set VARTEXFONTS=${T}/fonts #223077
 
   05 Oct 2011; Alexis Ballier <aballier@gentoo.org> canna-3.7_p2.ebuild,
   canna-3.7_p3.ebuild, canna-3.7_p3-r1.ebuild, canna-3.7_p3-r2.ebuild:
diff --git a/app-i18n/canna/Manifest b/app-i18n/canna/Manifest
index 54f727f34065..c193a166075f 100644
--- a/app-i18n/canna/Manifest
+++ b/app-i18n/canna/Manifest
@@ -1,5 +1,5 @@
 -----BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
+Hash: SHA256
 
 AUX canna-3.7-gentoo.diff.in 5263 RMD160 ea831d20398acbb041c7eeab40da7cca9f5219e6 SHA1 14df72ddd7ff7d75a544551e5c858b2c468f8989 SHA256 f28461116339136aab7e8f48b5de00d747cc60a8a5c55d23011e2513f63d51ae
 AUX canna-3.7_p3-strip.patch 3629 RMD160 245772d78389627d742b87aa399f36f51936aca7 SHA1 98c93bdcba187e16811013c9944e6ab171f79c46 SHA256 58a4d4ed44fe42b2cd41d50712d68397b8cb3035db9f1f7a765387a63f30a3d7
@@ -14,14 +14,24 @@ DIST Canna37p2.tar.bz2 1263325 RMD160 21ed7e026cc55f1b8c76a41e7f8cdd4058380a32 S
 DIST Canna37p3.tar.bz2 1263065 RMD160 33e5eb9e2dc144835db838612897e652acbc60ed SHA1 e39eece7c70c669dd46dd74b26121a60a2496fde SHA256 7d98d925043d3af24f99a8a2a09e3b4d6dfe881efc1303ef4a7f495a0f4542a7
 EBUILD canna-3.7_p2.ebuild 3581 RMD160 7bd54f6c7638332a7768cee53979e2482de75a83 SHA1 62a10baf82e10730eb6062c820bd4b992c7426e0 SHA256 6ed1a22e9f6a2a79adaf955d12852d797c2e3fbd8d3c7dbfbbf09a6304bfd90f
 EBUILD canna-3.7_p3-r1.ebuild 3732 RMD160 eda07441452365d458e43ec6450e7f02835f3c7b SHA1 b0709725423cfc1a8fb96035ae76efa656aa9fbc SHA256 44a522e40986e70c6852e02ae11db3d8ec3589230831eaf1249038eaaf76dc91
-EBUILD canna-3.7_p3-r2.ebuild 4423 RMD160 5c40330b70afdc2635fe9c79dc73de8f7bac4556 SHA1 afc0da414bb23a95ed85287be18f4fd98eeaf870 SHA256 b01fabf7a5e4b61ac4110c87b2271032a107ea00f19c0cf01f6280113229a06b
+EBUILD canna-3.7_p3-r2.ebuild 4718 RMD160 52a818cce3a430c955e978324609602214b36207 SHA1 5e13fbc24f8c71e3177abb70bc59d0b578ab4400 SHA256 3428b14abc50da5982bafa465dc3db9f7a18f8d77f984de60f7d22edc20707d4
 EBUILD canna-3.7_p3.ebuild 3636 RMD160 a2fbc586bf7850c50411186ed5db2fdfb2e3362e SHA1 7ebba3874b3ac7d35b7ae2407f6eaac4e3706b36 SHA256 79a06db6509434b41679acef4c9ba63dd65aad352b8ef6cecdaa90d1320fb7a2
-MISC ChangeLog 10504 RMD160 5fdb8311699b4e27c3b9830ecdb0e0952d02cdc0 SHA1 39da3542ab756134584bde5f21895944571ca2ea SHA256 9cd3b3a1cd9887a98cfcf654cf44bddbc81df88243761c7b4f16fbfa124a16bd
+MISC ChangeLog 10653 RMD160 2a4845e32d9fd88710abf5d77b20754e88c4c4b7 SHA1 0836e4d146e94ee6aec017609d96428bc9a185d1 SHA256 e5c1cd05c4172e8b7fa9140b728f2f6bad37c90536d019cfa8bc9928067bbcf3
 MISC metadata.xml 156 RMD160 8adcf0a760a605cd42501f53097ca3a1c4e8daad SHA1 8ccc2b0f20743002b783b1f7b5162c71f7f54c2e SHA256 815820f2e5866d973fafb29a8b8027d022ccea43023309b6dc294cf077598215
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.18 (GNU/Linux)
+Version: GnuPG v2.0.19 (GNU/Linux)
 
-iEYEARECAAYFAk6Mr88ACgkQvFcC4BYPU0pCywCfZYWdTSR0Eci9/qhKWFHru7wi
-eqsAn17RkfK6b9R5mYqB53DmX/hXlaxi
-=z8dz
+iQIcBAEBCAAGBQJPtIz7AAoJEDYO1FT4VRUUHTsP/iiC68wK2eMBOz7rVnETfF61
+xiwyu/QgzzUDoXh/x3PR8BNwUW1Sa0EVnNH1XmV8cHRIJQQdnORLFxWvuG9WSTBJ
+hoMMHJFzNNpkpvYnpMn8JedB85yTGYD9y0pwjqvuxrxcWeWdmc7O6Z4kxYan2GWv
+HfOB2gch9ppUKOiAJQ2goXl+Ozn0iDuFAFUaT5SEarC0RTRxAUTS5iOB+m+//Lp2
+9ZCyDvLgkeIgMzolxmgfeVOLOqDAr9R8RBcmu8uLpKBA0Uz5Ik4SdSF/BaIsInsl
+UviQh/h5hOlBHc6QpvAsdzQ1ozEpsT/tEOUsoW+HWKpjJ98xG5v/dMT1I2eNNBCc
+0Oy9Y3yBVLdWTOD0OPABhIwrey6lhOI5pPo9ykOXQu730+mcN89uIkn6HPzBBcj0
+dB9Z70HNDI0mCeNMS0WYkYFuEcN1ZOwewjeqETlNRI2HT53qck2iY14S84X/Agfe
+rk595GY1w4VCbmlRu5SXGYDICPnAEPvAZ/UE9wOj7hC6ZrnNsoipwlglEhAjT0ey
+0FfYStRgSe/s3kwhios30FjRpYJVdAIAWfQ/n8A+Rz4sEtnqEPMu1g9iAce/0qkE
+Nnz2mGPITIlJKMZciWWaSWwg9OZ6CPEo9Ji3YDTwUPgp3DxnOuanz4tuQIxNAdI1
+XTjP2tlc+zybtGU5BNLu
+=y56W
 -----END PGP SIGNATURE-----
diff --git a/app-i18n/canna/canna-3.7_p3-r2.ebuild b/app-i18n/canna/canna-3.7_p3-r2.ebuild
index 763f54681dcf..01b7c938caee 100644
--- a/app-i18n/canna/canna-3.7_p3-r2.ebuild
+++ b/app-i18n/canna/canna-3.7_p3-r2.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2011 Gentoo Foundation
+# Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-i18n/canna/canna-3.7_p3-r2.ebuild,v 1.3 2011/10/05 19:28:09 aballier Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-i18n/canna/canna-3.7_p3-r2.ebuild,v 1.4 2012/05/17 05:30:44 naota Exp $
 
 inherit cannadic eutils multilib
 
@@ -19,7 +19,13 @@ IUSE="doc"
 DEPEND=">=sys-apps/sed-4
 	x11-misc/gccmakedep
 	x11-misc/imake
-	doc? ( >=dev-texlive/texlive-langcjk-2010 )"
+	doc? (
+		app-text/ghostscript-gpl
+		>=dev-texlive/texlive-langcjk-2010
+		dev-texlive/texlive-fontsextra
+		dev-texlive/texlive-genericrecommended
+		dev-texlive/texlive-latexrecommended
+	)"
 RDEPEND=""
 
 S="${WORKDIR}/${MY_P}"
@@ -53,21 +59,24 @@ src_compile() {
 	#make libCannaDir=../lib/canna canna || die
 	# bug #279706
 	emake -j1 CC="$(tc-getCC)" CDEBUGFLAGS="${CFLAGS}" \
-		LOCAL_LDFLAGS="${LDFLAGS}" canna || die
+		LOCAL_LDFLAGS="${LDFLAGS}" SHLIBGLOBALSFLAGS="${LDFLAGS}" canna || die
 
 	if use doc ; then
 		einfo "Compiling DVI, PS (and PDF) document"
 		cd doc/man/guide/tex
 		xmkmf || die
 		emake -j1 CC="$(tc-getCC)" CDEBUGFLAGS="${CFLAGS}" \
-			LOCAL_LDFLAGS="${LDFLAGS}" JLATEXCMD=platex \
-			DVI2PSCMD="dvips -f" canna.dvi canna.ps || die
+			LOCAL_LDFLAGS="${LDFLAGS}" SHLIBGLOBALSFLAGS="${LDFLAGS}" \
+			JLATEXCMD=platex \
+			DVI2PSCMD="dvips -f" VARTEXFONTS=${T}/fonts \
+			canna.dvi canna.ps || die
 		if has_version 'app-text/dvipdfmx' && \
 			( has_version 'app-text/acroread' \
 			|| has_version 'app-text/xpdf-japanese' ); then
 			emake -j1 CC="$(tc-getCC)" CDEBUGFLAGS="${CFLAGS}" \
-				LOCAL_LDFLAGS="${LDFLAGS}" JLATEXCMD=platex \
-				DVI2PSCMD="dvips -f" \
+				LOCAL_LDFLAGS="${LDFLAGS}" SHLIBGLOBALSFLAGS="${LDFLAGS}" \
+				JLATEXCMD=platex \
+				DVI2PSCMD="dvips -f" VARTEXFONTS=${T}/fonts \
 				canna.pdf || die
 		fi
 	fi