Added CJK support to lyx-1.4.1, fixed digests and cleaned up versions.

(Portage version: 2.1_pre10)

4 files changed, 205 insertions, 1 deletions

diff --git a/app-office/lyx/ChangeLog b/app-office/lyx/ChangeLog
index 43fe8d0a7e5d..51068e2c5835 100644
--- a/app-office/lyx/ChangeLog
+++ b/app-office/lyx/ChangeLog
@@ -1,6 +1,14 @@
 # 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.78 2006/04/28 22:44:17 weeve Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-office/lyx/ChangeLog,v 1.79 2006/04/30 12:29:06 ehmsen Exp $
+
+*lyx-1.4.1-r1 (30 Apr 2006)
+
+  30 Apr 2006; Martin Ehmsen <ehmsen@gentoo.org>
+  -files/lyx-1.4.0-dvips-R0.patch, -files/lyx-1.4.0-gentoo.patch,
+  -lyx-1.4.0-r2.ebuild, -lyx-1.4.1.ebuild, +lyx-1.4.1-r1.ebuild:
+  Added CJK support to lyx-1.4.1
+  Fixed bad digest for lyx-1.3.6
 
   28 Apr 2006; Jason Wever <weeve@gentoo.org> lyx-1.4.0-r2.ebuild:
   Added ~sparc keyword wrt bug #131548.
diff --git a/app-office/lyx/files/digest-lyx-1.3.6 b/app-office/lyx/files/digest-lyx-1.3.6
index 1b932cfaa28e..910be64e5448 100644
--- a/app-office/lyx/files/digest-lyx-1.3.6
+++ b/app-office/lyx/files/digest-lyx-1.3.6
@@ -2,6 +2,8 @@ MD5 ceac73e1d8cc66776e6a54c3c92c6812 CJK-LyX-qt-1.3.6-1.patch 433879
 RMD160 76c0b8d301726b324dd7f61dcb8e2ebfe96e8b1c CJK-LyX-qt-1.3.6-1.patch 433879
 SHA256 3f158c61751d9273c94b9f0e449fd491c36d1db13b3bbfbe2f83ffa3862ceb29 CJK-LyX-qt-1.3.6-1.patch 433879
 MD5 fa2b787379d76fc9b3589621f2bdf831 CJK-LyX-xforms-1.3.6-1.patch 526007
+RMD160 bc3a1429d8d1fa810a1d1e7b2efb91b96e57b8c1 CJK-LyX-xforms-1.3.6-1.patch 526007
+SHA256 158a1edd992e59fdba619865954931b5f3bdc46632e4f7113661a7b598156437 CJK-LyX-xforms-1.3.6-1.patch 526007
 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-r1 b/app-office/lyx/files/digest-lyx-1.4.1-r1
new file mode 100644
index 000000000000..6f27d72b27e2
--- /dev/null
+++ b/app-office/lyx/files/digest-lyx-1.4.1-r1
@@ -0,0 +1,15 @@
+MD5 56a96428e726190a92e35ad9cf0afa8b CJK-LyX-qt-1.4.1-2.patch 420933
+RMD160 f25c197fe18aebbb0d93b64e0eabc6c5298e62eb CJK-LyX-qt-1.4.1-2.patch 420933
+SHA256 b853e308619f87bcd3f9e8e3243083ebede72f3938c9c68c4fbd1816974d5f5d CJK-LyX-qt-1.4.1-2.patch 420933
+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/lyx-1.4.1-r1.ebuild b/app-office/lyx/lyx-1.4.1-r1.ebuild
new file mode 100644
index 000000000000..2deff848438d
--- /dev/null
+++ b/app-office/lyx/lyx-1.4.1-r1.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.1-r1.ebuild,v 1.1 2006/04/30 12:29:06 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 ~sparc ~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
+}