New version

5 files changed, 192 insertions, 3 deletions

diff --git a/app-office/lyx/ChangeLog b/app-office/lyx/ChangeLog
index 2e3b219f033a..316be429a9db 100644
--- a/app-office/lyx/ChangeLog
+++ b/app-office/lyx/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for app-office/lyx
 # Copyright 2002-2003 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-office/lyx/ChangeLog,v 1.32 2003/10/06 15:38:43 usata Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-office/lyx/ChangeLog,v 1.33 2003/10/07 09:14:30 obz Exp $
+
+*lyx-1.3.3 (07 Oct 2003)
+
+  07 Oct 2003; Mike Gardiner <obz@gentoo.org> lyx-1.3.3.ebuild,
+  files/lyx-1.3.3-configure-diff:
+  New version, thanks to <felix@fkurth.de> on bug #30512 for the configure 
+  patch.
 
   06 Oct 2003; Mamoru KOMACHI <usata@gentoo.org> lyx-1.2.1.ebuild,
   lyx-1.3.2.ebuild, lyx-1.3.2-r1.ebuild:
diff --git a/app-office/lyx/Manifest b/app-office/lyx/Manifest
index e1a74e6efee0..0c814d830366 100644
--- a/app-office/lyx/Manifest
+++ b/app-office/lyx/Manifest
@@ -1,8 +1,8 @@
 MD5 5297d40a92f07e3a32df9b7560362ea9 lyx-1.3.2.ebuild 2683
 MD5 0dc965c019b1fe6239c7a0ad516a6e36 lyx-1.2.1.ebuild 1563
-MD5 452390efcf26e6c4323d825824f6f6fe lyx-1.3.3.ebuild 3289
+MD5 273768b5379388e632963b32358bf180 lyx-1.3.3.ebuild 3365
 MD5 2f6d3f1c1146f3c00e3b45769ec37c09 lyx-1.3.2-r1.ebuild 3398
-MD5 58f6ff31f8f365140c409b38457f3c25 ChangeLog 5689
+MD5 c233e01c33124157975f51926cdbda8e ChangeLog 5897
 MD5 c472f5fd1646eb8bca71d8df5cb2bdcc metadata.xml 164
 MD5 363bfca924cf46b61d21faa4dbfcd43f files/lyx-1.3.3-configure-diff 1953
 MD5 935b222f056a26177177f1b7790bc318 files/lyx-1.3.2-configure.diff 439
diff --git a/app-office/lyx/files/digest-lyx-1.3.3 b/app-office/lyx/files/digest-lyx-1.3.3
new file mode 100644
index 000000000000..b692c1fd4fc5
--- /dev/null
+++ b/app-office/lyx/files/digest-lyx-1.3.3
@@ -0,0 +1,3 @@
+MD5 0f22124b000feb3c471096a1031d3722 lyx-1.3.3.tar.bz2 5524439
+MD5 f1df2f1426cca24c0dafa1dc1a832e6a hebrew.bind 45
+MD5 a0e3948595801a90d32d8b712596a5fe preferences 1669
diff --git a/app-office/lyx/files/lyx-1.3.3-configure-diff b/app-office/lyx/files/lyx-1.3.3-configure-diff
new file mode 100644
index 000000000000..c19b473524dd
--- /dev/null
+++ b/app-office/lyx/files/lyx-1.3.3-configure-diff
@@ -0,0 +1,71 @@
+diff -ru lyx-1.3.3.orig/lib/configure lyx-1.3.3/lib/configure
+--- lyx-1.3.3.orig/lib/configure	2003-09-17 15:27:27.000000000 +0200
++++ lyx-1.3.3/lib/configure	2003-10-06 23:27:02.000000000 +0200
+@@ -795,43 +795,9 @@
+ rc_entries="$rc_entries
+ \chktex_command \"$prog\""
+ 
+-# Search for a spellchecker
+-echo $ac_n "checking for a spell-checker""... $ac_c"
+-echo "$ac_t""(ispell)"
+-prog=
+-for ac_prog in ispell
+-do
+-# Extract the first word of "$ac_prog", so it can be a program name with args.
+-set dummy $ac_prog ; ac_word=$2
+-if test -n "$ac_word"; then
+-  echo $ac_n "+checking for \"$ac_word\"""... $ac_c"
+-  IFS="${IFS=	}"; ac_save_ifs="$IFS"; IFS=":"
+-  for ac_dir in $PATH; do
+-    test -z "$ac_dir" && ac_dir=.
+-    if test -x $ac_dir/$ac_word; then
+-      prog="$ac_prog"
+-      break
+-    fi
+-  done
+-  IFS="$ac_save_ifs"
+-
+-  if test -n "$prog"; then
+-    ac_result=yes
+-    
+-  else
+-    ac_result=no
+-  fi
+-  echo "$ac_t""$ac_result"
+-  test -n "$prog" && break
+-fi
+-done
+-
+-if test -z "$prog" ; then
+-  prog=none
+-fi
+-
++# In Gentooland aspell is an RDEPEND for LyX, so use it as the default.
+ rc_entries="$rc_entries
+-\spell_command \"$prog\""
++\spell_command \"aspell\""
+ 
+ # Search for computer algebra systems
+ echo $ac_n "checking for Octave""... $ac_c"
+@@ -1142,7 +1108,7 @@
+   echo "$ac_t""default values"
+ else
+   echo "$ac_t""auto"
+-  rm -f wrap_chkconfig.ltx chkconfig.vars chkconfig.classes chklayouts.tex
++  rm -f wrap_chkconfig.ltx -no-mktex=tfm chkconfig.vars chkconfig.classes chklayouts.tex
+   cat >wrap_chkconfig.ltx <<EOF
+ \\newcommand\\srcdir{${srcdir}}
+ ${linuxdoc_cmd}
+@@ -1277,6 +1243,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"
+ EOF
+ 
+ ### the graphic converter part with the predefined ones
+Nur in lyx-1.3.3/lib: configure.orig.
diff --git a/app-office/lyx/lyx-1.3.3.ebuild b/app-office/lyx/lyx-1.3.3.ebuild
new file mode 100644
index 000000000000..8e03e568bb0c
--- /dev/null
+++ b/app-office/lyx/lyx-1.3.3.ebuild
@@ -0,0 +1,108 @@
+# Copyright 1999-2003 Gentoo Technologies, Inc.
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/app-office/lyx/lyx-1.3.3.ebuild,v 1.1 2003/10/07 09:14:30 obz Exp $
+
+
+DESCRIPTION="WYSIWYM frontend for LaTeX"
+HOMEPAGE="http://www.lyx.org/"
+SRC_URI="ftp://ftp.lyx.org/pub/lyx/stable/${P}.tar.bz2
+	http://www.math.tau.ac.il/~dekelts/lyx/files/hebrew.bind
+	http://www.math.tau.ac.il/~dekelts/lyx/files/preferences"
+LICENSE="GPL-2"
+
+SLOT="0"
+KEYWORDS="~x86 ~ppc ~alpha"
+IUSE="nls cups qt debug"
+
+# 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}
+	app-text/ghostscript
+	app-text/xpdf
+	virtual/aspell-dict
+	app-text/gv
+	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"
+
+src_unpack() {
+
+	unpack ${A}
+	cd ${S}
+	epatch ${FILESDIR}/${PN}-1.3.2-nomktex.patch
+	epatch ${FILESDIR}/${P}-configure-diff
+
+}
+
+src_compile() {
+	local myconf=""
+	if [ `use qt` ]; then
+		inherit kde-functions
+		set-qtdir 3
+		myconf="$myconf --with-frontend=qt --with-qt-dir=${QTDIR}"
+	else
+		myconf="$myconf --with-frontend=xforms"
+	fi
+
+	export WANT_AUTOCONF_2_5=1
+
+	local flags="${CFLAGS}"
+	unset CFLAGS
+	unset CXXFLAGS
+	econf \
+		`use_enable nls` \
+		`use_enable debug` \
+		${myconf} \
+		--enable-optimization="$flags" \
+		|| die
+	emake || die "emake failed"
+
+}
+
+src_install() {
+	einstall
+	dodoc README* UPGRADING INSTALL* ChangeLog NEWS COPYING ANNOUNCE ABOUT-NLS $DISTDIR/preferences
+	insinto /usr/share/lyx/bind
+	doins $DISTDIR/hebrew.bind
+}
+
+pkg_postinst() {
+	if [ `use qt` ] ; then
+		einfo	"WARNING: the QT gui, together with xft2+fontconfig (which you"
+	 	einfo	"almost certainly have), suffer from one infamous bug that causes"
+		einfo	"the matheditor not to display any special characters (the ones from"
+		einfo	"the Computer Modern font family). Generated documents (.dvi, .ps...)"
+		einfo	"are ok, since tex has right fonts from the bluesky package."
+		einfo	"A proper solution was being worked on. Meanwhile you can install the"
+		einfo	"BaKoMa fonts package; however they are not licensed for redistribution"
+		einfo	"(not even embedded inside generated documents) and cannot be used in"
+		einfo	"commercial environments (without a special agreement from the author)."
+		einfo	"If that suits you, you can get them on CTAN or at ftp.lyx.org as"
+		einfo	"latex-ttf-fonts-0.1.tar.gz. I was working on an alternative, free"
+		einfo	"fonts package derived from bluesky, but got stuck; wuold be glad"
+		einfo	"to see someone continuing the effort (see the relevant threads on the"
+		einfo	"lyx-devel mailing list or mail me if you want to know more)."
+	fi
+	einfo ""
+	einfo "================"
+	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."
+}