Remove USE="doc" to fix deptree for stable because of bugs 319509 and 323559.

Package-Manager: portage-2.2_rc67/cvs/Linux x86_64

4 files changed, 56 insertions, 51 deletions

diff --git a/app-i18n/canna/ChangeLog b/app-i18n/canna/ChangeLog
index eef5595f0b23..7eb9095cc449 100644
--- a/app-i18n/canna/ChangeLog
+++ b/app-i18n/canna/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for app-i18n/canna
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-i18n/canna/ChangeLog,v 1.67 2010/01/31 15:39:36 armin76 Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-i18n/canna/ChangeLog,v 1.68 2010/07/04 19:09:00 ssuominen Exp $
+
+  04 Jul 2010; Samuli Suominen <ssuominen@gentoo.org> canna-3.7_p2.ebuild,
+  canna-3.7_p3-r1.ebuild:
+  Remove USE="doc" to fix deptree for stable because of bugs 319509 and
+  323559.
 
   31 Jan 2010; Raúl Porcel <armin76@gentoo.org> canna-3.7_p3-r1.ebuild:
   sparc stable wrt #297441
diff --git a/app-i18n/canna/Manifest b/app-i18n/canna/Manifest
index a79bfadad352..22c074da0365 100644
--- a/app-i18n/canna/Manifest
+++ b/app-i18n/canna/Manifest
@@ -9,9 +9,9 @@ AUX canna.initd 999 RMD160 52031c9fff687e3f8411e757d01fd049ed03e080 SHA1 536aebd
 AUX update-canna-dics_dir 1101 RMD160 8c73fa6c6814a4032eea45bab19321f579715f3d SHA1 389b96aa9ba069af43c56283f584ce4a84eecf02 SHA256 d1114dce288e815f897b20eabd177bb5b77e0d479bcb4b7eff9afb0d65607f11
 DIST Canna37p2.tar.bz2 1263325 RMD160 21ed7e026cc55f1b8c76a41e7f8cdd4058380a32 SHA1 2bfbd119e4a470463fc68ae36f70cf4ed39dba83 SHA256 ab163cb90acb33ce2c3a2293329ac3cd1ce2a25e0a8e337518e7fab5b28b52c3
 DIST Canna37p3.tar.bz2 1263065 RMD160 33e5eb9e2dc144835db838612897e652acbc60ed SHA1 e39eece7c70c669dd46dd74b26121a60a2496fde SHA256 7d98d925043d3af24f99a8a2a09e3b4d6dfe881efc1303ef4a7f495a0f4542a7
-EBUILD canna-3.7_p2.ebuild 3590 RMD160 9573abeb5ef9a1cd942f7490a92f5c3da116db5a SHA1 ebe1340c170922bad100ce0410422cb5c1f6633b SHA256 0081813c9a4b98e141ccf5f0a307cb391e4bbc17956d0a4102f31dbddf6b8fe5
-EBUILD canna-3.7_p3-r1.ebuild 3738 RMD160 766d6e221c19807f3d6124655842f0c1b00918cd SHA1 0569fce50e4069d772fe6b8eb979404d3dc4ebcd SHA256 7ce72ed05981015e4b1415ee81bac47badf20868fdd9d8eb0e81a0b7262f05c0
+EBUILD canna-3.7_p2.ebuild 3608 RMD160 f5879a399ebe561303339b96c5d859e1397f14b1 SHA1 35bdde00b52edcc950c00728fd25cadb1a249273 SHA256 b489a0211ad379dd29be1b0d7e9c87f6fe3373821ec1ad60729de8c6bb666dd1
+EBUILD canna-3.7_p3-r1.ebuild 3757 RMD160 3161b1aa785e023152d32ae9017740e6a65636da SHA1 86a7d5a7a01d9a700dd78911f119c8253e051633 SHA256 4e5218c2194710068ff8e86f9d6e6eaff337155b525c05a02b3eef187d2af76f
 EBUILD canna-3.7_p3-r2.ebuild 4400 RMD160 c62c0301ad5a03576f3ab9c37c8786bb85b189fd SHA1 a0bdcd47d97f444179c4a78b8ec7afdfe7dd9625 SHA256 da6cbfa8c79ee4f1934bc67d7c716b8a924e2fc66ece796d82cf5b2e8953a72d
 EBUILD canna-3.7_p3.ebuild 3616 RMD160 ec65f1ce77e20b328c4a02628645309541e705d7 SHA1 2afd4fddeda2759be4db266b6f684bc53fbce79a SHA256 81c541a857e2e332757f2c612d0a951043de362d4164d8085c8a7162ac6ba2d0
-MISC ChangeLog 9976 RMD160 8cd037cda4dd8767e8ce8a3d1bd68e01b719f05c SHA1 1edc350c5b205937d2e06a55368cc67db72c15ba SHA256 ac0839dda70d8651edbd23de804737d44dcffd66f9c1c564645a32671eea40d6
+MISC ChangeLog 10162 RMD160 12e01b6225c948afc58e6aa65c243fc643644bd0 SHA1 cd2c78e13ab9282b12a0cac2dc05629c76f78b70 SHA256 e65c240f9db4dd469365e5b9b0195e0f95c34430388500027295765ae81859d7
 MISC metadata.xml 156 RMD160 8adcf0a760a605cd42501f53097ca3a1c4e8daad SHA1 8ccc2b0f20743002b783b1f7b5162c71f7f54c2e SHA256 815820f2e5866d973fafb29a8b8027d022ccea43023309b6dc294cf077598215
diff --git a/app-i18n/canna/canna-3.7_p2.ebuild b/app-i18n/canna/canna-3.7_p2.ebuild
index dac50972b27e..bfa9d4e4cf98 100644
--- a/app-i18n/canna/canna-3.7_p2.ebuild
+++ b/app-i18n/canna/canna-3.7_p2.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2009 Gentoo Foundation
+# Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-i18n/canna/canna-3.7_p2.ebuild,v 1.20 2009/12/31 21:39:49 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-i18n/canna/canna-3.7_p2.ebuild,v 1.21 2010/07/04 19:09:00 ssuominen Exp $
 
 inherit cannadic eutils multilib
 
@@ -13,12 +13,12 @@ SRC_URI="mirror://sourceforge.jp/canna/9558/${MY_P/_/}.tar.bz2"
 LICENSE="MIT"
 SLOT="0"
 KEYWORDS="alpha amd64 hppa ppc ppc64 sparc x86"
-IUSE="doc"
+IUSE=""
 
 DEPEND=">=sys-apps/sed-4
 	x11-misc/gccmakedep
-	x11-misc/imake
-	doc? ( app-text/ptex )"
+	x11-misc/imake"
+#	doc? ( app-text/ptex )"
 RDEPEND=""
 
 S="${WORKDIR}/${MY_P/_/}"
@@ -47,21 +47,21 @@ src_compile() {
 	#make libCannaDir=../lib/canna canna || die
 	make canna || die
 
-	if use doc ; then
-		einfo "Compiling DVI, PS (and PDF) document"
-		cd doc/man/guide/tex
-		xmkmf || die
-		make JLATEXCMD=platex \
-			DVI2PSCMD="dvips -f" \
-			canna.dvi canna.ps || die
-		if has_version 'app-text/dvipdfmx' && \
-			( has_version 'app-text/acroread' \
-			|| has_version 'app-text/xpdf-japanese' ); then
-			make JLATEXCMD=platex \
-				DVI2PSCMD="dvips -f" \
-				canna.pdf || die
-		fi
-	fi
+	#if use doc ; then
+	#	einfo "Compiling DVI, PS (and PDF) document"
+	#	cd doc/man/guide/tex
+	#	xmkmf || die
+	#	make JLATEXCMD=platex \
+	#		DVI2PSCMD="dvips -f" \
+	#		canna.dvi canna.ps || die
+	#	if has_version 'app-text/dvipdfmx' && \
+	#		( has_version 'app-text/acroread' \
+	#		|| has_version 'app-text/xpdf-japanese' ); then
+	#		make JLATEXCMD=platex \
+	#			DVI2PSCMD="dvips -f" \
+	#			canna.pdf || die
+	#	fi
+	#fi
 }
 
 src_install() {
@@ -84,10 +84,10 @@ src_install() {
 
 	dodoc CHANGES.jp ChangeLog INSTALL* README* WHATIS*
 
-	if use doc ; then
-		insinto /usr/share/doc/${PF}
-		doins doc/man/guide/tex/canna.{dvi,ps,pdf}
-	fi
+	#if use doc ; then
+	#	insinto /usr/share/doc/${PF}
+	#	doins doc/man/guide/tex/canna.{dvi,ps,pdf}
+	#fi
 
 	newinitd "${FILESDIR}"/canna.initd canna || die
 	newconfd "${FILESDIR}"/canna.confd canna || die
diff --git a/app-i18n/canna/canna-3.7_p3-r1.ebuild b/app-i18n/canna/canna-3.7_p3-r1.ebuild
index e22e4188afd4..81dc1736997d 100644
--- a/app-i18n/canna/canna-3.7_p3-r1.ebuild
+++ b/app-i18n/canna/canna-3.7_p3-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2010 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-r1.ebuild,v 1.8 2010/01/31 15:39:36 armin76 Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-i18n/canna/canna-3.7_p3-r1.ebuild,v 1.9 2010/07/04 19:09:00 ssuominen Exp $
 
 inherit cannadic eutils multilib
 
@@ -14,12 +14,12 @@ SRC_URI="mirror://sourceforge.jp/canna/9565/${MY_P}.tar.bz2"
 LICENSE="MIT"
 SLOT="0"
 KEYWORDS="alpha amd64 hppa ppc ppc64 sparc x86"
-IUSE="doc"
+IUSE=""
 
 DEPEND=">=sys-apps/sed-4
 	x11-misc/gccmakedep
-	x11-misc/imake
-	doc? ( app-text/ptex )"
+	x11-misc/imake"
+#	doc? ( app-text/ptex )
 RDEPEND=""
 
 S="${WORKDIR}/${MY_P}"
@@ -54,21 +54,21 @@ src_compile() {
 	# bug #279706
 	emake -j1 CDEBUGFLAGS="${CFLAGS}" canna || die
 
-	if use doc ; then
-		einfo "Compiling DVI, PS (and PDF) document"
-		cd doc/man/guide/tex
-		xmkmf || die
-		emake -j1 JLATEXCMD=platex \
-			DVI2PSCMD="dvips -f" \
-			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 JLATEXCMD=platex \
-				DVI2PSCMD="dvips -f" \
-				canna.pdf || die
-		fi
-	fi
+	#if use doc ; then
+	#	einfo "Compiling DVI, PS (and PDF) document"
+	#	cd doc/man/guide/tex
+	#	xmkmf || die
+	#	emake -j1 JLATEXCMD=platex \
+	#		DVI2PSCMD="dvips -f" \
+	#		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 JLATEXCMD=platex \
+	#			DVI2PSCMD="dvips -f" \
+	#			canna.pdf || die
+	#	fi
+	#fi
 }
 
 src_install() {
@@ -91,10 +91,10 @@ src_install() {
 
 	dodoc CHANGES.jp ChangeLog INSTALL* README* WHATIS*
 
-	if use doc ; then
-		insinto /usr/share/doc/${PF}
-		doins doc/man/guide/tex/canna.{dvi,ps,pdf}
-	fi
+	#if use doc ; then
+	#	insinto /usr/share/doc/${PF}
+	#	doins doc/man/guide/tex/canna.{dvi,ps,pdf}
+	#fi
 
 	newinitd "${FILESDIR}"/${P}.initd canna || die
 	newconfd "${FILESDIR}"/${P}.confd canna || die