Added cjk USE flag to build CJK-LyX. Thanks to Josh Glover <jmglov@gentoo.org>, Jackey Yang <043936y@acadiau.ca>, Matsui Tetsushi <VED03370@nifty.ne.jp>, and Ulrich Plate <plate@gentoo.org>. This closes bug #14751.

(Portage version: 2.0.51.19)

5 files changed, 167 insertions, 6 deletions

diff --git a/app-office/lyx/ChangeLog b/app-office/lyx/ChangeLog
index 221fc975b902..c8b4d45489ba 100644
--- a/app-office/lyx/ChangeLog
+++ b/app-office/lyx/ChangeLog
@@ -1,6 +1,14 @@
 # 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.57 2005/02/08 11:22:34 usata Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-office/lyx/ChangeLog,v 1.58 2005/04/03 05:05:35 usata Exp $
+
+*lyx-1.3.5-r1 (03 Apr 2005)
+
+  03 Apr 2005; Mamoru KOMACHI <usata@gentoo.org> +lyx-1.3.5-r1.ebuild:
+  Added cjk USE flag to build CJK-LyX. Thanks to Josh Glover
+  <jmglov@gentoo.org>, Jackey Yang <043936y@acadiau.ca>, Matsui Tetsushi
+  <VED03370@nifty.ne.jp>, and Ulrich Plate <plate@gentoo.org>.
+  This closes bug #14751.
 
   08 Feb 2005; Mamoru KOMACHI <usata@gentoo.org> lyx-1.3.5.ebuild:
   Filters -Os (may result in compilation failure on some systems); bug #73984.
diff --git a/app-office/lyx/Manifest b/app-office/lyx/Manifest
index 7fc3a0b91f20..1c5f2de517b2 100644
--- a/app-office/lyx/Manifest
+++ b/app-office/lyx/Manifest
@@ -1,11 +1,13 @@
-MD5 a9bb0709bc1751805c02f2d858c2e337 lyx-1.3.4.ebuild 3108
-MD5 5077cf22d4ab44f2ac043bade962fede lyx-1.3.5.ebuild 3354
 MD5 5999f7d01da01aa8175d22a9ce87f333 ChangeLog 9177
+MD5 5077cf22d4ab44f2ac043bade962fede lyx-1.3.5.ebuild 3354
+MD5 914c906926a9bf759f8ce0c7c3a5d581 lyx-1.3.5-r1.ebuild 4143
 MD5 c472f5fd1646eb8bca71d8df5cb2bdcc metadata.xml 164
-MD5 962a15cb903b1048986422c10e21f058 files/lyx.desktop 188
-MD5 363bfca924cf46b61d21faa4dbfcd43f files/lyx-1.3.3-configure-diff 1953
-MD5 f6bf30211847fb321f0000cd415d9e5b files/lyx-1.3.2-nomktex.patch 449
+MD5 a9bb0709bc1751805c02f2d858c2e337 lyx-1.3.4.ebuild 3108
 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 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
diff --git a/app-office/lyx/files/digest-lyx-1.3.5-r1 b/app-office/lyx/files/digest-lyx-1.3.5-r1
new file mode 100644
index 000000000000..a262bd039b16
--- /dev/null
+++ b/app-office/lyx/files/digest-lyx-1.3.5-r1
@@ -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
new file mode 100644
index 000000000000..17e209c95993
--- /dev/null
+++ b/app-office/lyx/lyx-1.3.5-r1.ebuild
@@ -0,0 +1,144 @@
+# 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.1 2005/04/03 05:05:35 usata Exp $
+
+inherit kde-functions eutils libtool
+
+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? ( =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/rcs
+	dev-util/cvs
+	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' 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
+	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} -fno-stack-protector"
+	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
+
+	# gnome menu entry
+	if use gnome; then
+		insinto /usr/share/applications
+		doins ${FILESDIR}/lyx.desktop
+	fi
+
+	# 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
+}
+
+pkg_postinst() {
+
+	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
+}
diff --git a/app-office/lyx/metadata.xml b/app-office/lyx/metadata.xml
index 06689a1a9114..3a525bc0e09e 100644
--- a/app-office/lyx/metadata.xml
+++ b/app-office/lyx/metadata.xml
@@ -2,4 +2,5 @@
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 <herd>text-markup</herd>
+<herd>cjk</herd>
 </pkgmetadata>