Version bump to 1.4.1 and added CJK support to 1.4.0.

(Portage version: 2.1_pre7-r5)

8 files changed, 314 insertions, 18 deletions

diff --git a/app-office/lyx/ChangeLog b/app-office/lyx/ChangeLog
index 6b59eab0e872..3f8277b09022 100644
--- a/app-office/lyx/ChangeLog
+++ b/app-office/lyx/ChangeLog
@@ -1,6 +1,16 @@
 # ChangeLog for app-office/lyx
 # Copyright 2002-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-office/lyx/ChangeLog,v 1.75 2006/04/05 07:32:03 ehmsen Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-office/lyx/ChangeLog,v 1.76 2006/04/11 11:55:15 ehmsen Exp $
+
+*lyx-1.4.1 (11 Apr 2006)
+*lyx-1.4.0-r2 (11 Apr 2006)
+
+  11 Apr 2006; Martin Ehmsen <ehmsen@gentoo.org>
+  +files/lyx-1.4.1-dvips-R0.patch, +files/lyx-1.4.1-gentoo.patch,
+  -lyx-1.4.0-r1.ebuild, +lyx-1.4.0-r2.ebuild, +lyx-1.4.1.ebuild:
+  Version bump to 1.4.1.
+  Added CJK support to 1.4.0 and bumped it to -r2 to notify CJK users.
+  The CJK-LyX now only supports the qt frontend, i.e., not the xforms.
 
   05 Apr 2006; Martin Ehmsen <ehmsen@gentoo.org> lyx-1.3.4.ebuild,
   lyx-1.3.5-r1.ebuild, lyx-1.3.5-r2.ebuild, lyx-1.3.6.ebuild,
diff --git a/app-office/lyx/Manifest b/app-office/lyx/Manifest
index b2302d720bf6..962d00536dd8 100644
--- a/app-office/lyx/Manifest
+++ b/app-office/lyx/Manifest
@@ -1,6 +1,6 @@
-MD5 e04684f2acd332388d8da0ccc9384862 ChangeLog 12139
-RMD160 c166bb43a52767e4791c1a730ad08a3f6315d25f ChangeLog 12139
-SHA256 9dbb57ea2b3e45ef3839dd390296eda1940b24909365970f412d3e91a5033d3f ChangeLog 12139
+MD5 2fa7986cf92a057aa5ee053bba20ffcd ChangeLog 12541
+RMD160 e63a3efbab1c882558184d7c17ce92f35024417f ChangeLog 12541
+SHA256 e8bbfcffe1393b2fc5975637ef26790efdbaae01e2e270e1674ee47bac1efec9 ChangeLog 12541
 MD5 e9e787c73da1152a63ff3caf57d8544e files/digest-lyx-1.3.4 729
 RMD160 a6ed3b2eb34077111d84860095861b4c22a37832 files/digest-lyx-1.3.4 729
 SHA256 4aa318d733b3e6e02eb07b66ef65dc830585a9f2214a28fa19b2297f54343d5a files/digest-lyx-1.3.4 729
@@ -13,9 +13,12 @@ SHA256 2633363b025c562b8d6afa5eb47f579151dfa38bb4a0c74ee7905e9701fe3dea files/di
 MD5 59ef4c27ebcfafc671cfb41e266b0967 files/digest-lyx-1.3.6 381
 RMD160 359a32cac24efc4ad653d5d62ccd3ad03c251436 files/digest-lyx-1.3.6 381
 SHA256 51a69349d62da4cb2a3c78d9d917adc8e37a8c7e28357b3178ef76eeacd41adc files/digest-lyx-1.3.6 381
-MD5 629ba1ec1f2bb554bfc60cb26e5b6753 files/digest-lyx-1.4.0-r1 901
-RMD160 973b746481dfa68e4df0e63ac6c11bdb326925a9 files/digest-lyx-1.4.0-r1 901
-SHA256 767c176fb22fc3601c52bd5aac1c252d6b99243269b36be2516dbb67252f369a files/digest-lyx-1.4.0-r1 901
+MD5 d738a6454a512195d26647b6bdf76c88 files/digest-lyx-1.4.0-r2 1154
+RMD160 ce254b0b275298b00b79f07f971dc699ef7f05de files/digest-lyx-1.4.0-r2 1154
+SHA256 4070591b9e5b81ff3064a15b53ff699e80c5f59dc4629a4cea5f9d566bfd57ee files/digest-lyx-1.4.0-r2 1154
+MD5 cad7b5b48d400f4d4c975e4a54901a87 files/digest-lyx-1.4.1 901
+RMD160 9baf3a61ffb80ad12c2f974e1e94f2b84b25c7a1 files/digest-lyx-1.4.1 901
+SHA256 addacc72a0f4b426d23f1c31d791a63c22c8ba19f8572ac37e44b641cd33ce3c files/digest-lyx-1.4.1 901
 MD5 01d67cd0d7c3b2bb8aae514aeb8a9200 files/gnome-mime-application-x-lyx.png 3302
 RMD160 6b59808311d032c201961c0b085e13e2aae86bef files/gnome-mime-application-x-lyx.png 3302
 SHA256 d0d16c7a835cbb8f15ea79efd27128a9c633ac56cdc06365449f389b21a0abce files/gnome-mime-application-x-lyx.png 3302
@@ -40,6 +43,12 @@ SHA256 3efdbcfbe11a141bd8f02903246300a010c1ea19b0cc3b64b6d3afa2236d4c2c files/ly
 MD5 214654a6554eb9a3c29cc60e8fdd2eac files/lyx-1.4.0-gentoo.patch 1042
 RMD160 3d5c5be5a9eba531bf9bbe3a18ae1f95302343df files/lyx-1.4.0-gentoo.patch 1042
 SHA256 2034507aba94f5a47d16815de658fa263330cb4b9196e350e50635d1fd875651 files/lyx-1.4.0-gentoo.patch 1042
+MD5 dc630537b02512fe8fba15a3b86159cb files/lyx-1.4.1-dvips-R0.patch 2586
+RMD160 b4b6b8f213838a607d8b65c1bb3d05aa1dcbe9fa files/lyx-1.4.1-dvips-R0.patch 2586
+SHA256 3efdbcfbe11a141bd8f02903246300a010c1ea19b0cc3b64b6d3afa2236d4c2c files/lyx-1.4.1-dvips-R0.patch 2586
+MD5 214654a6554eb9a3c29cc60e8fdd2eac files/lyx-1.4.1-gentoo.patch 1042
+RMD160 3d5c5be5a9eba531bf9bbe3a18ae1f95302343df files/lyx-1.4.1-gentoo.patch 1042
+SHA256 2034507aba94f5a47d16815de658fa263330cb4b9196e350e50635d1fd875651 files/lyx-1.4.1-gentoo.patch 1042
 MD5 517a1baf1371255f801e9966c0c1e90b files/lyx.desktop 214
 RMD160 7f9b377e1345565ade15c6a6b0b1e8664ee946b3 files/lyx.desktop 214
 SHA256 2e72d8bfc3c47536665e8539ebb1a55a8067914bf649a153c39874b67b2294f8 files/lyx.desktop 214
@@ -55,9 +64,12 @@ SHA256 3735806f428344e2ac9a67d5167f2b5ef7f69c9d93bba46f2b3a2e426710b04b lyx-1.3.
 MD5 9acaaa20c1f4c3725b97774e84d5da23 lyx-1.3.6.ebuild 4425
 RMD160 222d8753ed8525cabf843d3b6fabf334476e0d93 lyx-1.3.6.ebuild 4425
 SHA256 4272f5b36b8c469a7bdacfff3ec9f2257620a056c13914261e098b563359138c lyx-1.3.6.ebuild 4425
-MD5 33f25ec124c66bab06b76d2f289e478f lyx-1.4.0-r1.ebuild 5078
-RMD160 ef104131fc83dfe0cb5b612d22f0f213779cd857 lyx-1.4.0-r1.ebuild 5078
-SHA256 267ee847eeee7c8af2f0f1fbcc0841ff951343fcbb28bb7162aac7b06664be82 lyx-1.4.0-r1.ebuild 5078
+MD5 51fffe4b051334bde62cbefd910b0fbc lyx-1.4.0-r2.ebuild 4633
+RMD160 2d8386dd83dc1c12057346cc96db870cec5ac369 lyx-1.4.0-r2.ebuild 4633
+SHA256 99284cdf6abea23b3a512dea8976dbb55d615510142a047b778bc8ec4978072d lyx-1.4.0-r2.ebuild 4633
+MD5 2d1dff37b93b812616635acef2d32ce1 lyx-1.4.1.ebuild 4856
+RMD160 e27a174be9851457bfd8a06256d484f2ad02c880 lyx-1.4.1.ebuild 4856
+SHA256 c891e22881d0cfafce104fc238e0a97e5fd6c5e3752fe7219375d4c010ca2910 lyx-1.4.1.ebuild 4856
 MD5 a43370bbb57cb967dbffe1a084475550 metadata.xml 181
 RMD160 076b1da29f7ec9ff8c71af3d300db7934a6c16c5 metadata.xml 181
 SHA256 fee59649574618944ad5be45972b6d1a8e09b75e64d07a75fbdef4c335a88fca metadata.xml 181
diff --git a/app-office/lyx/files/digest-lyx-1.4.0-r1 b/app-office/lyx/files/digest-lyx-1.4.0-r2
index 53e679189065..acf826be5c59 100644
--- a/app-office/lyx/files/digest-lyx-1.4.0-r1
+++ b/app-office/lyx/files/digest-lyx-1.4.0-r2
@@ -1,3 +1,6 @@
+MD5 d90d69c26931ee662183c516e133167f CJK-LyX-qt-1.4.0-2.patch 420997
+RMD160 73fd4e96bbaf42cb02efe83b69d7fbe5c6342975 CJK-LyX-qt-1.4.0-2.patch 420997
+SHA256 a7b2b1f395b9095bdbf1d64fb043323653a21eef5c8a660caca23f3444b81021 CJK-LyX-qt-1.4.0-2.patch 420997
 MD5 f1df2f1426cca24c0dafa1dc1a832e6a hebrew.bind 45
 RMD160 1621bd311aa053798815fd6c795406a505761531 hebrew.bind 45
 SHA256 fc3b1e19560f7a22af1c6bca13c0c0d7786d6453e292201645abff54fd0b67dd hebrew.bind 45
diff --git a/app-office/lyx/files/digest-lyx-1.4.1 b/app-office/lyx/files/digest-lyx-1.4.1
new file mode 100644
index 000000000000..5ba3e399fab5
--- /dev/null
+++ b/app-office/lyx/files/digest-lyx-1.4.1
@@ -0,0 +1,12 @@
+MD5 f1df2f1426cca24c0dafa1dc1a832e6a hebrew.bind 45
+RMD160 1621bd311aa053798815fd6c795406a505761531 hebrew.bind 45
+SHA256 fc3b1e19560f7a22af1c6bca13c0c0d7786d6453e292201645abff54fd0b67dd hebrew.bind 45
+MD5 0f3275e403be5fdbd14117dd8a26675f latex-xft-fonts-0.1.tar.gz 91730
+RMD160 0a516eeba71ddc474e97f315e45e41028efa2e4d latex-xft-fonts-0.1.tar.gz 91730
+SHA256 78bceea8a055bc43bd0d246ae8e69f81d2f161ae4d8f1aaaa2dfff9e293ae964 latex-xft-fonts-0.1.tar.gz 91730
+MD5 368696695a05e428773626e3b0f8ae74 lyx-1.4.1.tar.bz2 6637018
+RMD160 8569859a1badb3f5f1869b61210bd743bd274c5c lyx-1.4.1.tar.bz2 6637018
+SHA256 290b55df4d2726581b9451289b4d73e53aab733fbd0f09e22385022e84424854 lyx-1.4.1.tar.bz2 6637018
+MD5 a0e3948595801a90d32d8b712596a5fe preferences 1669
+RMD160 26986d7bcc48c4ecf60f84d95490148a5e171785 preferences 1669
+SHA256 41867ac67bc729d1057253bf305aced1ff666ee4d648dfefc99fd0c3c0501d43 preferences 1669
diff --git a/app-office/lyx/files/lyx-1.4.1-dvips-R0.patch b/app-office/lyx/files/lyx-1.4.1-dvips-R0.patch
new file mode 100644
index 000000000000..584f0e943756
--- /dev/null
+++ b/app-office/lyx/files/lyx-1.4.1-dvips-R0.patch
@@ -0,0 +1,48 @@
+diff -urN lyx-1.4.0.orig/lib/configure lyx-1.4.0/lib/configure
+--- lyx-1.4.0.orig/lib/configure	2006-03-07 00:49:49.000000000 +0100
++++ lyx-1.4.0/lib/configure	2006-03-29 18:07:01.000000000 +0200
+@@ -997,7 +997,7 @@
+ echo $ac_n "checking for a DVI to PS converter""... $ac_c"
+ echo "$ac_t"""
+ dvi_to_ps_command=
+-for ac_prog in "dvips -o \$\$o \$\$i"
++for ac_prog in "dvips -R0 -o \$\$o \$\$i"
+ do
+ # Extract the first word of "$ac_prog", so it can be a program name with args.
+ set dummy $ac_prog ; ac_word=$2
+diff -urN lyx-1.4.0.orig/lib/configure.m4 lyx-1.4.0/lib/configure.m4
+--- lyx-1.4.0.orig/lib/configure.m4	2006-02-03 22:47:25.000000000 +0100
++++ lyx-1.4.0/lib/configure.m4	2006-03-29 18:07:21.000000000 +0200
+@@ -302,7 +302,7 @@
+ SEARCH_PROG([for a PS to PDF converter],ps_to_pdf_command, "ps2pdf13 \$\$i")
+ 
+ # Search for a program to convert dvi to ps
+-SEARCH_PROG([for a DVI to PS converter],dvi_to_ps_command, "dvips -o \$\$o \$\$i")
++SEARCH_PROG([for a DVI to PS converter],dvi_to_ps_command, "dvips -R0 -o \$\$o \$\$i")
+ 
+ # Search for a program to convert dvi to pdf
+ SEARCH_PROG([for a DVI to PDF converter],dvi_to_pdf_command, "dvipdfm \$\$i")
+diff -urN lyx-1.4.0.orig/lib/lyxrc.defaults lyx-1.4.0/lib/lyxrc.defaults
+--- lyx-1.4.0.orig/lib/lyxrc.defaults	2006-03-07 00:50:44.000000000 +0100
++++ lyx-1.4.0/lib/lyxrc.defaults	2006-03-29 18:05:20.000000000 +0200
+@@ -53,7 +53,7 @@
+ \converter docbook    dvi        "db2dvi $$i"	""
+ \converter docbook    html       "db2html $$i"	""
+ \converter dvi        pdf3       "dvipdfm $$i"	""
+-\converter dvi        ps         "dvips -o $$o $$i"	""
++\converter dvi        ps         "dvips -R0 -o $$o $$i"	""
+ \converter fen        asciichess "python $$s/scripts/fen2ascii.py $$i $$o"	""
+ \converter fig        pdftex     "sh $$s/scripts/fig2pdftex.sh $$i $$o"	""
+ \converter fig        pstex      "sh $$s/scripts/fig2pstex.sh $$i $$o"	""
+diff -urN lyx-1.4.0.orig/lib/lyxrc.example lyx-1.4.0/lib/lyxrc.example
+--- lyx-1.4.0.orig/lib/lyxrc.example	2005-09-08 11:20:16.000000000 +0200
++++ lyx-1.4.0/lib/lyxrc.example	2006-03-29 18:06:12.000000000 +0200
+@@ -348,7 +348,7 @@
+ # The converter command has 4 arguments: The source format, the target format,
+ # the command, and additional flags.
+ # For example, the following defines a DVI->Postscript converter:
+-#\converter dvi ps "dvips -o $$o $$i" ""
++#\converter dvi ps "dvips -R0 -o $$o $$i" ""
+ # The variable name $$i is replaced with the name of the source file,
+ # and $$o is replaced with the name of the target file.
+ # The flags argument is a list of comma separated flags.
diff --git a/app-office/lyx/files/lyx-1.4.1-gentoo.patch b/app-office/lyx/files/lyx-1.4.1-gentoo.patch
new file mode 100644
index 000000000000..e1051de8af1b
--- /dev/null
+++ b/app-office/lyx/files/lyx-1.4.1-gentoo.patch
@@ -0,0 +1,33 @@
+diff -urN lyx-1.4.0.orig/lib/configure lyx-1.4.0/lib/configure
+--- lyx-1.4.0.orig/lib/configure	2006-03-07 00:49:49.000000000 +0100
++++ lyx-1.4.0/lib/configure	2006-03-28 22:52:22.000000000 +0200
+@@ -1193,7 +1193,7 @@
+ echo $ac_n "checking for a spellchecker""... $ac_c"
+ echo "$ac_t"""
+ 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
+@@ -1634,7 +1634,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
+@@ -1999,6 +1999,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.4.0-r2.ebuild b/app-office/lyx/lyx-1.4.0-r2.ebuild
new file mode 100644
index 000000000000..ca442a10595e
--- /dev/null
+++ b/app-office/lyx/lyx-1.4.0-r2.ebuild
@@ -0,0 +1,179 @@
+# Copyright 1999-2006 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/app-office/lyx/lyx-1.4.0-r2.ebuild,v 1.1 2006/04/11 11:55:15 ehmsen Exp $
+
+inherit kde-functions fdo-mime 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
+	ftp://ftp.lyx.org/pub/lyx/contrib/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? ( ftp://cellular.phys.pusan.ac.kr/CJK-LyX/qt/CJK-LyX-qt-${PV}-2.patch )"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~x86"
+IUSE="cjk cups debug gtk nls qt gnome"
+
+RDEPEND="|| (
+		virtual/x11
+		(
+			x11-libs/libXi
+			x11-libs/libXrandr
+			x11-libs/libXcursor
+			x11-libs/libXft
+		)
+	)
+	virtual/ghostscript
+	virtual/aspell-dict
+	dev-tex/latex2html
+	dev-tex/dvipost
+	media-gfx/imagemagick
+	cups? ( virtual/lpr )
+	app-text/sgmltools-lite
+	app-text/noweb
+	dev-tex/chktex"
+
+# these dependencies need looking at.
+# does lyx only need qt to compile but not run ?
+# I'll look into it <obz@gentoo.org>
+DEPEND="${RDEPEND}
+	|| (
+		virtual/x11
+		(
+			x11-libs/libX11
+			x11-libs/libXt
+			x11-libs/libXpm
+			x11-proto/xproto
+		)
+	)
+	virtual/tetex
+	>=dev-lang/perl-5
+	nls? ( sys-devel/gettext )
+	app-text/aiksaurus
+	dev-lang/python
+	>=sys-devel/autoconf-2.58
+	cjk? ( =x11-libs/qt-3* )
+	!cjk? (
+		qt? ( =x11-libs/qt-3* )
+		!qt? ( =x11-libs/xforms-1* )
+	)
+	gtk? (
+		>=dev-cpp/gtkmm-2.4
+		>=dev-cpp/libglademm-2.4
+	)"
+
+src_unpack() {
+	unpack ${P}.tar.bz2 || die "unpacking lyx failed"
+	unpack latex-xft-fonts-0.1.tar.gz || die "unpacking xft-fonts failed"
+	cd ${S}
+	epatch ${FILESDIR}/${P}-gentoo.patch || die
+	# bug #125309
+	epatch ${FILESDIR}/${P}-dvips-R0.patch || die
+	if use cjk ; then
+		einfo
+		einfo "CJK-LyX now only supports the qt frontend"
+		einfo "the xforms frontend has been removed."
+		einfo
+		epatch ${DISTDIR}/CJK-LyX-qt-${PV}-2.patch || die
+	fi
+	elibtoolize || die "elibtoolize failed "
+}
+
+src_compile() {
+	local myconf=""
+
+	# Choose qt over gtk, since gtk is not feature complete
+	if use qt || use cjk ; then
+		set-qtdir 3
+		myconf="$myconf --with-frontend=qt --with-qt-dir=${QTDIR}"
+	elif use gtk ; then
+		ewarn
+		ewarn "GTK support for lyx is currently not feature complete."
+		ewarn "Don't report any bugs about missing or faulty features to gentoo,"
+		ewarn "instead you have the option of turning GTK support off by removing"
+		ewarn "the gtk use flag or enable the gt use flag"
+		ewarn "(or help implement the missing features at lyx.org)"
+		ewarn
+		myconf="$myconf --with-frontend=gtk"
+	else
+		myconf="$myconf --with-frontend=xforms"
+	fi
+
+	export WANT_AUTOCONF=2.5
+
+	append-flags "$(test-flags -fno-stack-protector -fno-stack-protector-all)"
+	filter-flags "-Os"
+	econf \
+		$(use_enable nls) \
+		$(use_enable debug) \
+		${myconf} \
+		|| die "econf failed"
+
+	# bug 57479
+	emake || die "emake failed"
+
+}
+
+src_install() {
+	einstall || die "einstall failed"
+
+	dodoc README* UPGRADING ChangeLog NEWS 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
+
+	# bug #102310
+	if use gnome ; then
+		insinto /usr/share/icons/gnome/48x48/mimetypes
+		doins ${FILESDIR}/gnome-mime-application-x-lyx.png
+	fi
+
+	# 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
+
+	# bug #102310
+	if use gnome ; then
+		fdo-mime_desktop_database_update
+	fi
+
+	einfo ""
+	einfo "How to use Hebrew in LyX:"
+	einfo "1. emerge dev-tex/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
+		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
+}
diff --git a/app-office/lyx/lyx-1.4.0-r1.ebuild b/app-office/lyx/lyx-1.4.1.ebuild
index 32c99d612821..22fe4d8f4d17 100644
--- a/app-office/lyx/lyx-1.4.0-r1.ebuild
+++ b/app-office/lyx/lyx-1.4.1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2006 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-office/lyx/lyx-1.4.0-r1.ebuild,v 1.2 2006/04/05 07:32:03 ehmsen Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-office/lyx/lyx-1.4.1.ebuild,v 1.1 2006/04/11 11:55:15 ehmsen Exp $
 
 inherit kde-functions fdo-mime eutils libtool flag-o-matic
 
@@ -68,14 +68,13 @@ DEPEND="${RDEPEND}
 src_unpack() {
 	if use cjk ; then
 		eerror
-		eerror "There is currently no CJK support for lyx-1.4.*"
-		eerror "If you like this to change you will either have to wait for lyx-1.5,"
-		eerror "or help create new patches for lyx-1.4.*"
-		eerror "A good starting point is http://cellular.phys.pusan.ac.kr/cjk.html"
+		eerror "There is currently no CJK support for lyx-1.4.1"
+		eerror "but there is CJK support for lyx-1.4.0."
 		eerror
-		eerror "Until then, you will have to disable the cjk use flag for lyx or"
-		eerror "continue to use lyx-1.3.6"
-		die "lyx-1.4.* does not currently support CJK."
+		eerror "Until there is support for CJK in lyx-1.4.1,"
+		eerror "you will have to disable the cjk use flag for lyx or"
+		eerror "use lyx-1.4.0."
+		die "lyx-1.4.1 does not currently support CJK."
 	fi
 	unpack ${P}.tar.bz2 || die "unpacking lyx failed"
 	unpack latex-xft-fonts-0.1.tar.gz || die "unpacking xft-fonts failed"