Version bumped, bug #166930.

(Portage version: 2.1.2-r9)

4 files changed, 242 insertions, 1 deletions

diff --git a/app-office/lyx/ChangeLog b/app-office/lyx/ChangeLog
index a23277cc8c7b..8841a42ddcf0 100644
--- a/app-office/lyx/ChangeLog
+++ b/app-office/lyx/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for app-office/lyx
 # Copyright 2002-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-office/lyx/ChangeLog,v 1.90 2007/01/25 05:20:47 genone Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-office/lyx/ChangeLog,v 1.91 2007/02/18 05:05:01 matsuu Exp $
+
+*lyx-1.4.4 (18 Feb 2007)
+
+  18 Feb 2007; MATSUU Takuto <matsuu@gentoo.org>
+  +files/lyx-1.4.4-gentoo.patch, +lyx-1.4.4.ebuild:
+  Version bumped, bug #166930.
 
   25 Jan 2007; Marius Mauch <genone@gentoo.org> lyx-1.4.1-r1.ebuild,
   lyx-1.4.2.ebuild:
diff --git a/app-office/lyx/files/digest-lyx-1.4.4 b/app-office/lyx/files/digest-lyx-1.4.4
new file mode 100644
index 000000000000..26fb9ba072c9
--- /dev/null
+++ b/app-office/lyx/files/digest-lyx-1.4.4
@@ -0,0 +1,15 @@
+MD5 d31a97c8e86270f9ed386de9ec0fec23 CJK-LyX-qt-1.4.4-1.patch 688282
+RMD160 22676ca69c1eaef170dfb0b8d3ff67914327b27b CJK-LyX-qt-1.4.4-1.patch 688282
+SHA256 f08d97af009cc3265414092f50c06051a85e623c929d08eebacad44f99dc2b6e CJK-LyX-qt-1.4.4-1.patch 688282
+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 2e778eba4191c5f9fb2cafa7901c322c lyx-1.4.4.tar.bz2 7859197
+RMD160 31f709db8e4785cb378f261355a7b2551dd38253 lyx-1.4.4.tar.bz2 7859197
+SHA256 5f48996c4217093d5cfaa9566cc4349cbfeb65ac12cd1b996ac6a5b5e4480307 lyx-1.4.4.tar.bz2 7859197
+MD5 a0e3948595801a90d32d8b712596a5fe preferences 1669
+RMD160 26986d7bcc48c4ecf60f84d95490148a5e171785 preferences 1669
+SHA256 41867ac67bc729d1057253bf305aced1ff666ee4d648dfefc99fd0c3c0501d43 preferences 1669
diff --git a/app-office/lyx/files/lyx-1.4.4-gentoo.patch b/app-office/lyx/files/lyx-1.4.4-gentoo.patch
new file mode 100644
index 000000000000..b790099af849
--- /dev/null
+++ b/app-office/lyx/files/lyx-1.4.4-gentoo.patch
@@ -0,0 +1,42 @@
+diff -Naur lyx-1.4.4.orig/lib/configure.py lyx-1.4.4/lib/configure.py
+--- lyx-1.4.4.orig/lib/configure.py	2007-02-14 08:20:29.000000000 +0900
++++ lyx-1.4.4/lib/configure.py	2007-02-18 01:16:51.000000000 +0900
+@@ -227,7 +227,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:
+@@ -364,7 +364,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'],
+@@ -613,7 +613,7 @@
+         cl.close()
+         #
+         # we have chklayouts.tex, then process it
+-        fout = os.popen(LATEX + ' wrap_chkconfig.ltx')
++        fout = os.popen(LATEX + ' --no-mktex=tfm wrap_chkconfig.ltx')
+         while True:
+             line = fout.readline()
+             if not line:
+diff -Naur lyx-1.4.4.orig/lib/lyxrc.example lyx-1.4.4/lib/lyxrc.example
+--- lyx-1.4.4.orig/lib/lyxrc.example	2005-09-08 18:20:16.000000000 +0900
++++ lyx-1.4.4/lib/lyxrc.example	2007-02-18 01:16:51.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.4.ebuild b/app-office/lyx/lyx-1.4.4.ebuild
new file mode 100644
index 000000000000..d2b54103bb60
--- /dev/null
+++ b/app-office/lyx/lyx-1.4.4.ebuild
@@ -0,0 +1,178 @@
+# Copyright 1999-2007 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/app-office/lyx/lyx-1.4.4.ebuild,v 1.1 2007/02/18 05:05:01 matsuu Exp $
+
+inherit kde-functions fdo-mime eutils libtool flag-o-matic font
+
+FONT_PN="latex-xft-fonts"
+FONT_S="${WORKDIR}/${FONT_PN}"
+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 ~ppc64 ~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-2.2
+	>=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
+		elog
+		elog "CJK-LyX now only supports the qt frontend"
+		elog "the xforms frontend has been removed."
+		elog
+		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"
+
+	font_src_install
+
+	# 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() {
+	font_pkg_postinst
+
+	# fix for bug 91108
+	texhash
+
+	# bug #102310
+	if use gnome ; then
+		fdo-mime_desktop_database_update
+	fi
+
+	elog
+	elog "How to use Hebrew in LyX:"
+	elog "1. emerge dev-tex/ivritex."
+	elog "2. gunzip /usr/share/doc/${PF}/preferences.gz into ~/.lyx/preferences"
+	elog "or, read http://www.math.tau.ac.il/~dekelts/lyx/instructions2.html"
+	elog "for instructions on using lyx's own preferences dialog to equal effect."
+	elog "3. use lyx's qt interface (compile with USE=qt3) for maximum effect."
+	elog
+
+	if ! use qt3 ; then
+		elog
+		elog "If you have a multi-head setup not using xinerama you can only use lyx"
+		elog "on the 2nd head if not using qt (maybe due to a xforms bug). See bug #40392."
+		elog
+	fi
+}