Fixed bug #91108, bug #92578 and bug #89796.

(Portage version: 2.0.51.19)

5 files changed, 171 insertions, 10 deletions

diff --git a/app-office/lyx/ChangeLog b/app-office/lyx/ChangeLog
index fa1a84a0fa9b..37f82a8c004c 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.61 2005/05/17 08:38:56 pclouds Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-office/lyx/ChangeLog,v 1.62 2005/05/22 12:24:54 usata Exp $
+
+*lyx-1.3.5-r2 (22 May 2005)
+
+  22 May 2005; Mamoru KOMACHI <usata@gentoo.org> lyx-1.3.5-r1.ebuild,
+  +lyx-1.3.5-r2.ebuild:
+  Fixed bug #91108, bug #92579 and bug #89796.
 
   17 May 2005; <pclouds@gentoo.org> lyx-1.3.5-r1.ebuild:
   Fixed #92759
diff --git a/app-office/lyx/Manifest b/app-office/lyx/Manifest
index a220f90738fc..8a2e2b62afa2 100644
--- a/app-office/lyx/Manifest
+++ b/app-office/lyx/Manifest
@@ -1,13 +1,15 @@
 MD5 a9bb0709bc1751805c02f2d858c2e337 lyx-1.3.4.ebuild 3108
 MD5 5077cf22d4ab44f2ac043bade962fede lyx-1.3.5.ebuild 3354
+MD5 45d67b877a69d90f1ad4c3d6100f0a92 lyx-1.3.5-r1.ebuild 4255
 MD5 6f2e59f098acec14a096138f688fb695 ChangeLog 9908
 MD5 a43370bbb57cb967dbffe1a084475550 metadata.xml 181
-MD5 04c1419466c7bdc5b37d0de45622e820 lyx-1.3.5-r1.ebuild 4217
-MD5 b86918456f67f911e357a76308cd0fdb files/lyx-1.3.4-gcc34.patch 6589
+MD5 96eb72b060cc41626ff919491be8079f lyx-1.3.5-r2.ebuild 4377
 MD5 962a15cb903b1048986422c10e21f058 files/lyx.desktop 188
 MD5 363bfca924cf46b61d21faa4dbfcd43f files/lyx-1.3.3-configure-diff 1953
-MD5 2a779b20a7425abd5eea3b5ee01698f7 files/lyx-1.3.5-boost.patch 655
+MD5 388b0f4710d31754bd238c8bf53ae0fd files/digest-lyx-1.3.5-r2 381
 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 296163b72f99143379e73e616ce4e728 files/digest-lyx-1.3.4 239
+MD5 b86918456f67f911e357a76308cd0fdb files/lyx-1.3.4-gcc34.patch 6589
+MD5 2a779b20a7425abd5eea3b5ee01698f7 files/lyx-1.3.5-boost.patch 655
 MD5 388b0f4710d31754bd238c8bf53ae0fd files/digest-lyx-1.3.5-r1 381
diff --git a/app-office/lyx/files/digest-lyx-1.3.5-r2 b/app-office/lyx/files/digest-lyx-1.3.5-r2
new file mode 100644
index 000000000000..a262bd039b16
--- /dev/null
+++ b/app-office/lyx/files/digest-lyx-1.3.5-r2
@@ -0,0 +1,6 @@
+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
+MD5 29f551b1ead52c13f05c94280e6620e9 CJK-LyX-qt-1.3.5-1.patch 434563
+MD5 2c9c234a24620c1e359d263e3b7e2d97 CJK-LyX-xforms-1.3.5-1.patch 527079
diff --git a/app-office/lyx/lyx-1.3.5-r1.ebuild b/app-office/lyx/lyx-1.3.5-r1.ebuild
index cc62139da902..4689ffd20ca8 100644
--- a/app-office/lyx/lyx-1.3.5-r1.ebuild
+++ b/app-office/lyx/lyx-1.3.5-r1.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-r1.ebuild,v 1.4 2005/05/17 08:38:56 pclouds Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-office/lyx/lyx-1.3.5-r1.ebuild,v 1.5 2005/05/22 12:24:54 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="x86 ~ppc ~sparc ~amd64"
 IUSE="cjk nls cups qt debug gnome"
 
 # these dependencies need looking at.
@@ -38,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"
@@ -84,7 +82,7 @@ src_compile() {
 
 	export WANT_AUTOCONF=2.5
 
-	local flags="${CXXFLAGS} $(test_flag -fno-stack-protector)"
+	local flags="${CXXFLAGS} $(test_flag -fno-stack-protector) $(test_flag -fno-stack-protector-all)"
 	unset CFLAGS
 	unset CXXFLAGS
 	econf \
diff --git a/app-office/lyx/lyx-1.3.5-r2.ebuild b/app-office/lyx/lyx-1.3.5-r2.ebuild
new file mode 100644
index 000000000000..f93d0a3e7c98
--- /dev/null
+++ b/app-office/lyx/lyx-1.3.5-r2.ebuild
@@ -0,0 +1,149 @@
+# 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.1 2005/05/22 12:24:54 usata Exp $
+
+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
+	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="cjk nls cups qt debug gnome"
+
+# these dependencies need looking at.
+# does lyx only need qt to compile but not run ?
+# I'll look into it <obz@gentoo.org>
+DEPEND="virtual/x11
+	virtual/tetex
+	>=dev-lang/perl-5
+	nls? ( sys-devel/gettext )
+	app-text/aiksaurus
+	qt? ( >=x11-libs/qt-3 )
+	!qt? ( cjk? ( =x11-libs/xforms-1.0-r1 )
+		!cjk? ( =x11-libs/xforms-1* ) )"
+
+RDEPEND="${DEPEND}
+	virtual/ghostscript
+	virtual/pdfviewer
+	virtual/psviewer
+	virtual/aspell-dict
+	dev-tex/latex2html
+	media-gfx/imagemagick
+	cups? ( virtual/lpr )
+	app-text/sgmltools-lite
+	app-text/noweb
+	dev-tex/chktex"
+
+DEPEND="$DEPEND >=sys-devel/autoconf-2.58"
+
+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
+	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
+}
+
+src_compile() {
+	local myconf=""
+	if use qt ; then
+		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} $(test_flag -fno-stack-protector) $(test_flag -fno-stack-protector-all)"
+	unset CFLAGS
+	unset CXXFLAGS
+	econf \
+		$(use_enable nls) \
+		$(use_enable debug) \
+		${myconf} \
+		--enable-optimization="${flags/-Os}" \
+		|| die
+	# bug 57479
+	emake || die "emake failed"
+
+}
+
+src_install() {
+	einstall || die
+	dodoc README* UPGRADING INSTALL* ChangeLog NEWS COPYING \
+		ANNOUNCE ABOUT-NLS ${DISTDIR}/preferences
+	insinto /usr/share/lyx/bind
+	doins ${DISTDIR}/hebrew.bind
+
+	domenu ${FILESDIR}/lyx.desktop
+
+	# install the latex-xft fonts, which should fix
+	# the problems outlined in bug #15629
+	# <obz@gentoo.org>
+	cd ${WORKDIR}/latex-xft-fonts-0.1
+	make DESTDIR=${D} install || die "Font installation failed"
+
+	mkfontscale ${D}/usr/share/fonts/latex-xft-fonts
+	mkfontdir -e /usr/share/fonts/encodings \
+		-e /usr/share/fonts/encodings/large \
+		-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:"
+	einfo "1. emerge app-text/ivritex."
+	einfo "2. unzip /usr/share/doc/${P}/preferences.gz into ~/.lyx/preferences"
+	einfo "or, read http://www.math.tau.ac.il/~dekelts/lyx/instructions2.html"
+	einfo "for instructions on using lyx's own preferences dialog to equal effect."
+	einfo "3. use lyx's qt interface (compile with USE=qt) for maximum effect."
+	einfo ""
+
+	if ! useq qt ; then
+	draw_line
+	einfo ""
+	einfo "If you have a multi-head setup not using xinerama you can only use lyx"
+	einfo "on the 2nd head if not using qt (maybe due to a xforms bug). See bug #40392."
+	einfo ""
+	fi
+}