Version bumped; bug #99784.

(Portage version: 2.0.51.22-r2)

7 files changed, 100 insertions, 43 deletions

diff --git a/app-office/lyx/ChangeLog b/app-office/lyx/ChangeLog
index c211c108e1d6..3ed1d4e733cb 100644
--- a/app-office/lyx/ChangeLog
+++ b/app-office/lyx/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for app-office/lyx
 # Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-office/lyx/ChangeLog,v 1.66 2005/07/07 04:25:32 caleb Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-office/lyx/ChangeLog,v 1.67 2005/07/31 10:23:53 usata Exp $
+
+*lyx-1.3.6 (31 Jul 2005)
+
+  31 Jul 2005; Mamoru KOMACHI <usata@gentoo.org>
+  +files/lyx-1.3.6-gentoo.diff, lyx-1.3.5-r2.ebuild, +lyx-1.3.6.ebuild:
+  Version bumped; bug #99784.
 
   07 Jul 2005; Caleb Tennis <caleb@gentoo.org> lyx-1.3.4.ebuild,
   lyx-1.3.5.ebuild, lyx-1.3.5-r1.ebuild, lyx-1.3.5-r2.ebuild:
diff --git a/app-office/lyx/Manifest b/app-office/lyx/Manifest
index 9c70e2064ca7..2fb9ea11f54a 100644
--- a/app-office/lyx/Manifest
+++ b/app-office/lyx/Manifest
@@ -1,25 +1,17 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
-MD5 895daf39c7f268ca69242ab4d5e6b185 lyx-1.3.4.ebuild 3103
-MD5 c3224fac4458d23a4dd24e572401e5f4 lyx-1.3.5-r2.ebuild 4372
-MD5 7bd52da63c833b53a75a0df24fae7051 lyx-1.3.5.ebuild 3354
 MD5 e78e495fd7e6d2afe3f264a95a91f089 ChangeLog 10516
-MD5 a43370bbb57cb967dbffe1a084475550 metadata.xml 181
+MD5 7bd52da63c833b53a75a0df24fae7051 lyx-1.3.5.ebuild 3354
 MD5 cbf7e117745080595fa57af4f76c112b lyx-1.3.5-r1.ebuild 4219
+MD5 a43370bbb57cb967dbffe1a084475550 metadata.xml 181
+MD5 895daf39c7f268ca69242ab4d5e6b185 lyx-1.3.4.ebuild 3103
+MD5 c3224fac4458d23a4dd24e572401e5f4 lyx-1.3.6.ebuild 4372
+MD5 c3224fac4458d23a4dd24e572401e5f4 lyx-1.3.5-r2.ebuild 4372
+MD5 5ccd191a3dc796feeda9dcee291d2863 files/digest-lyx-1.3.5 239
+MD5 296163b72f99143379e73e616ce4e728 files/digest-lyx-1.3.4 239
+MD5 388b0f4710d31754bd238c8bf53ae0fd files/digest-lyx-1.3.5-r1 381
 MD5 b86918456f67f911e357a76308cd0fdb files/lyx-1.3.4-gcc34.patch 6589
-MD5 962a15cb903b1048986422c10e21f058 files/lyx.desktop 188
+MD5 f6bf30211847fb321f0000cd415d9e5b files/lyx-1.3.2-nomktex.patch 449
 MD5 363bfca924cf46b61d21faa4dbfcd43f files/lyx-1.3.3-configure-diff 1953
+MD5 962a15cb903b1048986422c10e21f058 files/lyx.desktop 188
 MD5 2a779b20a7425abd5eea3b5ee01698f7 files/lyx-1.3.5-boost.patch 655
-MD5 f6bf30211847fb321f0000cd415d9e5b files/lyx-1.3.2-nomktex.patch 449
-MD5 296163b72f99143379e73e616ce4e728 files/digest-lyx-1.3.4 239
-MD5 5ccd191a3dc796feeda9dcee291d2863 files/digest-lyx-1.3.5 239
-MD5 388b0f4710d31754bd238c8bf53ae0fd files/digest-lyx-1.3.5-r1 381
+MD5 59ef4c27ebcfafc671cfb41e266b0967 files/digest-lyx-1.3.6 381
 MD5 388b0f4710d31754bd238c8bf53ae0fd files/digest-lyx-1.3.5-r2 381
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.4.1 (GNU/Linux)
-
-iD8DBQFCzR81BXaUFmZvwyMRAsGCAKDdeZeH8iFfLMMQb9w9byhvMsw6wwCgnYYu
-YYyni47rt11LO616YMxklF8=
-=l6Io
------END PGP SIGNATURE-----
diff --git a/app-office/lyx/files/digest-lyx-1.3.5 b/app-office/lyx/files/digest-lyx-1.3.5
deleted file mode 100644
index 66a6b93deef0..000000000000
--- a/app-office/lyx/files/digest-lyx-1.3.5
+++ /dev/null
@@ -1,4 +0,0 @@
-MD5 f4c70d2565ba9c974b1f94fc1dfd63bf lyx-1.3.5.tar.bz2 5459049
-MD5 0f3275e403be5fdbd14117dd8a26675f latex-xft-fonts-0.1.tar.gz 91730
-MD5 f1df2f1426cca24c0dafa1dc1a832e6a hebrew.bind 45
-MD5 a0e3948595801a90d32d8b712596a5fe preferences 1669
diff --git a/app-office/lyx/files/digest-lyx-1.3.6 b/app-office/lyx/files/digest-lyx-1.3.6
new file mode 100644
index 000000000000..07ea6a705439
--- /dev/null
+++ b/app-office/lyx/files/digest-lyx-1.3.6
@@ -0,0 +1,6 @@
+MD5 26d745b98bdc32e9edfc28e581583f80 lyx-1.3.6.tar.bz2 5745377
+MD5 0f3275e403be5fdbd14117dd8a26675f latex-xft-fonts-0.1.tar.gz 91730
+MD5 f1df2f1426cca24c0dafa1dc1a832e6a hebrew.bind 45
+MD5 a0e3948595801a90d32d8b712596a5fe preferences 1669
+MD5 ceac73e1d8cc66776e6a54c3c92c6812 CJK-LyX-qt-1.3.6-1.patch 433879
+MD5 fa2b787379d76fc9b3589621f2bdf831 CJK-LyX-xforms-1.3.6-1.patch 526007
diff --git a/app-office/lyx/files/lyx-1.3.6-gentoo.diff b/app-office/lyx/files/lyx-1.3.6-gentoo.diff
new file mode 100644
index 000000000000..711ff41d0c68
--- /dev/null
+++ b/app-office/lyx/files/lyx-1.3.6-gentoo.diff
@@ -0,0 +1,36 @@
+diff -urN lyx-1.3.6/lib/configure lyx-1.3.6-gentoo/lib/configure
+--- lyx-1.3.6/lib/configure	2005-07-17 01:07:13.000000000 +0900
++++ lyx-1.3.6-gentoo/lib/configure	2005-07-31 18:17:06.000000000 +0900
+@@ -779,9 +779,9 @@
+ 
+ # Search for a spellchecker
+ echo $ac_n "checking for a spell-checker""... $ac_c"
+-echo "$ac_t""(ispell)"
++echo "$ac_t""(aspell)"
+ prog=
+-for ac_prog in ispell
++for ac_prog in aspell
+ do
+ # Extract the first word of "$ac_prog", so it can be a program name with args.
+ set dummy $ac_prog ; ac_word=$2
+@@ -1221,7 +1221,7 @@
+ 	 fi ;;
+     esac
+   done > chklayouts.tex
+-  ${LATEX} wrap_chkconfig.ltx 2>/dev/null | grep '^\+'
++  ${LATEX} --no-mktex=tfm wrap_chkconfig.ltx 2>/dev/null | grep '^\+'
+   eval `cat chkconfig.vars | sed 's/-/_/g'`
+   test -n "${rmcopy}" && rm -f chkconfig.ltx
+ fi
+@@ -1351,6 +1351,11 @@
+ 
+ $rc_entries
+ \\font_encoding "$chk_fontenc"
++
++# Gentoo systems have TrueType fonts available, use them by default
++\\screen_font_roman "Times New Roman"
++\\screen_font_sans "Verdana"
++\\screen_font_typewriter "Courier New"
+ \\tex_allows_spaces $tex_allows_spaces
+ EOF
+ 
diff --git a/app-office/lyx/lyx-1.3.5-r2.ebuild b/app-office/lyx/lyx-1.3.5-r2.ebuild
index 4ec96c4a0152..5883941b6ade 100644
--- a/app-office/lyx/lyx-1.3.5-r2.ebuild
+++ b/app-office/lyx/lyx-1.3.5-r2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-office/lyx/lyx-1.3.5-r2.ebuild,v 1.3 2005/07/07 12:25:06 agriffis Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-office/lyx/lyx-1.3.5-r2.ebuild,v 1.4 2005/07/31 10:23:53 usata Exp $
 
 inherit kde-functions eutils libtool flag-o-matic
 
@@ -15,7 +15,7 @@ SRC_URI="ftp://ftp.lyx.org/pub/lyx/stable/${P}.tar.bz2
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~x86 ~ppc ~sparc ~amd64"
+KEYWORDS="~amd64 ~ppc ~sparc x86"
 IUSE="cjk cups debug nls qt"
 
 # these dependencies need looking at.
diff --git a/app-office/lyx/lyx-1.3.5.ebuild b/app-office/lyx/lyx-1.3.6.ebuild
index 85ba9d09661c..abc15b07e26b 100644
--- a/app-office/lyx/lyx-1.3.5.ebuild
+++ b/app-office/lyx/lyx-1.3.6.ebuild
@@ -1,20 +1,22 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-office/lyx/lyx-1.3.5.ebuild,v 1.11 2005/07/07 04:25:32 caleb Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-office/lyx/lyx-1.3.6.ebuild,v 1.1 2005/07/31 10:23:53 usata Exp $
 
-inherit kde-functions eutils libtool
+inherit kde-functions eutils libtool flag-o-matic
 
 DESCRIPTION="WYSIWYM frontend for LaTeX"
 HOMEPAGE="http://www.lyx.org/"
 SRC_URI="ftp://ftp.lyx.org/pub/lyx/stable/${P}.tar.bz2
 	http://movementarian.org/latex-xft-fonts-0.1.tar.gz
 	http://www.math.tau.ac.il/~dekelts/lyx/files/hebrew.bind
-	http://www.math.tau.ac.il/~dekelts/lyx/files/preferences"
+	http://www.math.tau.ac.il/~dekelts/lyx/files/preferences
+	cjk? ( qt? ( ftp://cellular.phys.pusan.ac.kr/CJK-LyX/qt/CJK-LyX-qt-${PV}-1.patch )
+		!qt? ( ftp://cellular.phys.pusan.ac.kr/CJK-LyX/xforms/CJK-LyX-xforms-${PV}-1.patch ) )"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="x86 ppc sparc amd64"
-IUSE="nls cups qt debug gnome"
+KEYWORDS="~amd64 ~ppc ~sparc ~x86"
+IUSE="cjk cups debug nls qt"
 
 # these dependencies need looking at.
 # does lyx only need qt to compile but not run ?
@@ -24,7 +26,9 @@ DEPEND="virtual/x11
 	>=dev-lang/perl-5
 	nls? ( sys-devel/gettext )
 	app-text/aiksaurus
-	qt? ( =x11-libs/qt-3* ) !qt? ( =x11-libs/xforms-1* )"
+	qt? ( =x11-libs/qt-3* )
+	!qt? ( cjk? ( =x11-libs/xforms-1.0-r1 )
+		!cjk? ( =x11-libs/xforms-1* ) )"
 
 RDEPEND="${DEPEND}
 	virtual/ghostscript
@@ -34,8 +38,6 @@ RDEPEND="${DEPEND}
 	dev-tex/latex2html
 	media-gfx/imagemagick
 	cups? ( virtual/lpr )
-	app-text/rcs
-	dev-util/cvs
 	app-text/sgmltools-lite
 	app-text/noweb
 	dev-tex/chktex"
@@ -46,9 +48,23 @@ src_unpack() {
 	unpack ${P}.tar.bz2
 	unpack latex-xft-fonts-0.1.tar.gz
 	cd ${S}
-	epatch ${FILESDIR}/${PN}-1.3.2-nomktex.patch
-	epatch ${FILESDIR}/${PN}-1.3.3-configure-diff
-	epatch ${FILESDIR}/${P}-boost.patch
+	epatch ${FILESDIR}/${P}-gentoo.diff
+	if use cjk && use qt ; then
+		epatch ${DISTDIR}/CJK-LyX-qt-${PV}-1.patch
+	elif use cjk && built_with_use '=x11-libs/xforms-1.0-r1' cjk ; then
+		epatch ${DISTDIR}/CJK-LyX-xforms-${PV}-1.patch
+	elif use cjk ; then
+		eerror
+		eerror 'CJK-LyX requires qt USE flag enabled or x11-libs/xforms-1.0-r1'
+		eerror 'built with cjk USE flag. You should either'
+		eerror '1) USE="cjk qt" emerge lyx'
+		eerror 'or'
+		eerror '2) USE="cjk" emerge xforms-1.0-r1; USE="cjk -qt" emerge lyx'
+		eerror 'or'
+		eerror '3) USE="-cjk" emerge lyx (normal LyX will be built)'
+		eerror
+		die "Please remerge xforms-1.0-r1 with cjk USE flag enabled."
+	fi
 	elibtoolize || die
 }
 
@@ -58,12 +74,13 @@ src_compile() {
 		set-qtdir 3
 		myconf="$myconf --with-frontend=qt --with-qt-dir=${QTDIR}"
 	else
+		export CPPFLAGS="${CPPFLAGS} -I/usr/X11R6/include/X11"
 		myconf="$myconf --with-frontend=xforms"
 	fi
 
 	export WANT_AUTOCONF=2.5
 
-	local flags="${CXXFLAGS} -fno-stack-protector"
+	local flags="${CXXFLAGS} $(test_flag -fno-stack-protector) $(test_flag -fno-stack-protector-all)"
 	unset CFLAGS
 	unset CXXFLAGS
 	econf \
@@ -84,11 +101,7 @@ src_install() {
 	insinto /usr/share/lyx/bind
 	doins ${DISTDIR}/hebrew.bind
 
-	# gnome menu entry
-	if use gnome; then
-		insinto /usr/share/applications
-		doins ${FILESDIR}/lyx.desktop
-	fi
+	domenu ${FILESDIR}/lyx.desktop
 
 	# install the latex-xft fonts, which should fix
 	# the problems outlined in bug #15629
@@ -102,10 +115,18 @@ src_install() {
 		-e /usr/X11R6/$(get_libdir)/X11/fonts/encodings \
 		${D}/usr/share/fonts/latex-xft-fonts
 	HOME=/root fc-cache -f ${D}/usr/share/fonts/latex-xft-fonts
+
+	# fix for bug 91108
+	dodir /usr/share/texmf/tex/latex
+	cd ${D}/usr/share/texmf/tex/latex
+	ln -s ../../../lyx/tex lyx
 }
 
 pkg_postinst() {
 
+	# fix for bug 91108
+	texhash
+
 	draw_line
 	einfo ""
 	einfo "How to use Hebrew in LyX:"