Version bumped

(Portage version: 2.1-r1)

4 files changed, 250 insertions, 2 deletions

diff --git a/app-office/lyx/ChangeLog b/app-office/lyx/ChangeLog
index bc97cf36e2f0..f4aa8cc82bbd 100644
--- a/app-office/lyx/ChangeLog
+++ b/app-office/lyx/ChangeLog
@@ -1,6 +1,18 @@
 # 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.85 2006/06/24 01:17:29 cardoe Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-office/lyx/ChangeLog,v 1.86 2006/08/17 23:02:01 matsuu Exp $
+
+*lyx-1.4.2 (17 Aug 2006)
+
+  17 Aug 2006; MATSUU Takuto <matsuu@gentoo.org>
+  -files/lyx-1.3.2-nomktex.patch, -files/lyx-1.3.3-configure-diff,
+  -files/lyx-1.3.4-gcc34.patch, -files/lyx-1.3.5-boost.patch,
+  -files/lyx-1.3.6-gentoo.diff, +files/lyx-1.4.2-gentoo.patch,
+  -lyx-1.3.4.ebuild, -lyx-1.3.5-r1.ebuild, -lyx-1.3.5-r2.ebuild,
+  -lyx-1.3.6.ebuild, +lyx-1.4.2.ebuild:
+  Version bumped, bug 140989.
+  ebuild cleanup, bug 142336.
+  Removed old versions.
 
   24 Jun 2006; Doug Goldstein <cardoe@gentoo.org> lyx-1.3.4.ebuild,
   lyx-1.3.5-r1.ebuild, lyx-1.3.5-r2.ebuild, lyx-1.3.6.ebuild,
@@ -16,7 +28,7 @@
   21 May 2006; <nixnut@gentoo.org> lyx-1.4.1-r1.ebuild:
   Stable on ppc. bug #133942
 
-  21 May 2006; Olivier Crête <tester@gentoo.org> lyx-1.4.1-r1.ebuild:
+  21 May 2006; Olivier Cr棚te <tester@gentoo.org> lyx-1.4.1-r1.ebuild:
   Stable on amd64 per bug #133942
 
   21 May 2006; Martin Ehmsen <ehmsen@gentoo.org>
diff --git a/app-office/lyx/files/digest-lyx-1.4.2 b/app-office/lyx/files/digest-lyx-1.4.2
new file mode 100644
index 000000000000..f5d92c5c3f44
--- /dev/null
+++ b/app-office/lyx/files/digest-lyx-1.4.2
@@ -0,0 +1,15 @@
+MD5 e421fc7d282b4794c4c6eab7d8907bd8 CJK-LyX-qt-1.4.2-1.patch 420797
+RMD160 d2afc2cc07f4cf6ad434e244db9264d23fd07c52 CJK-LyX-qt-1.4.2-1.patch 420797
+SHA256 3e1993b9beeb8e4b109c3529469e944661cfae85bceb9e103550a0bcae58e8f0 CJK-LyX-qt-1.4.2-1.patch 420797
+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 e828dbb01e3a05b1ae9dfb28884463e2 lyx-1.4.2.tar.bz2 6874598
+RMD160 af1dac6f6601ba3aae16543db4310afb990101b9 lyx-1.4.2.tar.bz2 6874598
+SHA256 54de255a4ef947726b6ce7067cf149804cee82fc8d27f6749cd4c927be21b782 lyx-1.4.2.tar.bz2 6874598
+MD5 a0e3948595801a90d32d8b712596a5fe preferences 1669
+RMD160 26986d7bcc48c4ecf60f84d95490148a5e171785 preferences 1669
+SHA256 41867ac67bc729d1057253bf305aced1ff666ee4d648dfefc99fd0c3c0501d43 preferences 1669
diff --git a/app-office/lyx/files/lyx-1.4.2-gentoo.patch b/app-office/lyx/files/lyx-1.4.2-gentoo.patch
new file mode 100644
index 000000000000..4a912e52f207
--- /dev/null
+++ b/app-office/lyx/files/lyx-1.4.2-gentoo.patch
@@ -0,0 +1,42 @@
+diff -Naur lyx-1.4.2.orig/lib/configure.py lyx-1.4.2/lib/configure.py
+--- lyx-1.4.2.orig/lib/configure.py	2006-07-08 11:53:50.000000000 +0900
++++ lyx-1.4.2/lib/configure.py	2006-08-17 17:07:17.000000000 +0900
+@@ -185,7 +185,7 @@
+ \\@@end
+ ''')
+     # run latex on chklatex.ltx and check result
+-    if cmdOutput(LATEX + ' chklatex.ltx').find('ThisIsLaTeX2e') != -1:
++    if cmdOutput(LATEX + ' --no-mktex=tfm chklatex.ltx').find('ThisIsLaTeX2e') != -1:
+       # valid latex2e
+       return LATEX
+     else:
+@@ -321,7 +321,7 @@
+   checkProg('a PS to PDF converter', ['ps2pdf13 $$i $$o'],
+     rc_entry = [ r'\converter ps         pdf        "%%"	""' ])
+   #
+-  checkProg('a DVI to PS converter', ['dvips -o $$o $$i'],
++  checkProg('a DVI to PS converter', ['dvips -R0 -o $$o $$i'],
+     rc_entry = [ r'\converter dvi        ps         "%%"	""' ])
+   #
+   checkProg('a DVI to PDF converter', ['dvipdfmx -o $$o $$i', 'dvipdfm -o $$o $$i'],
+@@ -549,7 +549,7 @@
+     cl.close()
+     #
+     # we have chklayouts.tex, then process it
+-    for line in cmdOutput(LATEX + ' wrap_chkconfig.ltx').splitlines():
++    for line in cmdOutput(LATEX + ' --no-mktex=tfm wrap_chkconfig.ltx').splitlines():
+       if re.match('^\+', line):
+         print line
+     #
+diff -Naur lyx-1.4.2.orig/lib/lyxrc.example lyx-1.4.2/lib/lyxrc.example
+--- lyx-1.4.2.orig/lib/lyxrc.example	2005-09-08 18:20:16.000000000 +0900
++++ lyx-1.4.2/lib/lyxrc.example	2006-08-17 16:53:24.000000000 +0900
+@@ -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/lyx-1.4.2.ebuild b/app-office/lyx/lyx-1.4.2.ebuild
new file mode 100644
index 000000000000..831147093a69
--- /dev/null
+++ b/app-office/lyx/lyx-1.4.2.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.2.ebuild,v 1.1 2006/08/17 23:02:01 matsuu Exp $
+
+inherit kde-functions fdo-mime eutils libtool flag-o-matic
+
+CJK_PATCH="CJK-LyX-qt-${PV}-1.patch"
+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
+	qt3? ( cjk? ( ftp://cellular.phys.pusan.ac.kr/CJK-LyX/qt/${CJK_PATCH} ) )"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~sparc ~x86"
+IUSE="cjk cups debug gtk nls qt3 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
+	qt3? ( =x11-libs/qt-3* )
+	!qt3? (
+		gtk? (
+			>=dev-cpp/gtkmm-2.4
+			>=dev-cpp/libglademm-2.4
+		)
+		!gtk? (
+			=x11-libs/xforms-1*
+		)
+	)"
+
+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}"
+	# bug #125309
+	epatch "${FILESDIR}"/${P}-gentoo.patch || die
+	if use qt3 && use cjk ; then
+		einfo
+		einfo "CJK-LyX now only supports the qt frontend"
+		einfo "the xforms frontend has been removed."
+		einfo
+		epatch "${DISTDIR}"/${CJK_PATCH} || die
+	fi
+	elibtoolize || die "elibtoolize failed "
+}
+
+src_compile() {
+	local myconf=""
+
+	# Choose qt over gtk, since gtk is not feature complete
+	if use qt3 ; 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 qt3 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)"
+	replace-flags "-Os" "-O2"
+	econf \
+		$(use_enable nls) \
+		$(use_enable debug) \
+		--with-aspell \
+		${myconf} \
+		|| die "econf failed"
+
+	# bug 57479
+	emake || die "emake failed"
+
+}
+
+src_install() {
+	emake DESTDIR="${D}" install || die "emake install 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
+	emake 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
+	dosym ../../../lyx/tex /usr/share/texmf/tex/latex/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. gunzip /usr/share/doc/${PF}/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=qt3) for maximum effect."
+	einfo ""
+
+	if ! use qt3 ; 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
+}