Fixed several bugs. See bug #50703. Removed previous version.

6 files changed, 16 insertions, 141 deletions

diff --git a/app-office/lyx/ChangeLog b/app-office/lyx/ChangeLog
index 2a0f99527ca1..bbcacb214aa7 100644
--- a/app-office/lyx/ChangeLog
+++ b/app-office/lyx/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for app-office/lyx
 # Copyright 2002-2004 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-office/lyx/ChangeLog,v 1.42 2004/05/09 16:52:27 usata Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-office/lyx/ChangeLog,v 1.43 2004/05/11 06:52:36 usata Exp $
+
+  11 May 2004; Mamoru KOMACHI <usata@gentoo.org> lyx-1.3.2-r1.ebuild,
+  lyx-1.3.4.ebuild, files/lyx-1.3.2-configure.diff:
+  Fixed several bugs. See bug #50703. Removed previous version.
 
   08 May 2004; Mamoru KOMACHI <usata@gentoo.org> lyx-1.2.1.ebuild,
   lyx-1.3.2-r1.ebuild, lyx-1.3.4.ebuild:
diff --git a/app-office/lyx/Manifest b/app-office/lyx/Manifest
index 44ef7fed7741..e3db182e9008 100644
--- a/app-office/lyx/Manifest
+++ b/app-office/lyx/Manifest
@@ -1,10 +1,7 @@
-MD5 089d8806e264b7e595ececb3784d3495 lyx-1.3.4.ebuild 3037
-MD5 dd144e4ea50735149723d4ff3c1e4146 lyx-1.3.2-r1.ebuild 3550
-MD5 29578bd3c49bafaf00b9b549c2988e35 ChangeLog 7284
+MD5 76498d51a14c9cae0876b07a52fbab5e lyx-1.3.4.ebuild 3110
+MD5 bca8a57261e35bd119bdaef1f5651c78 ChangeLog 7471
 MD5 c472f5fd1646eb8bca71d8df5cb2bdcc metadata.xml 164
 MD5 4dc1e1cc2b4e056a629fbfd1334c390e files/lyx.desktop 188
 MD5 363bfca924cf46b61d21faa4dbfcd43f files/lyx-1.3.3-configure-diff 1953
-MD5 935b222f056a26177177f1b7790bc318 files/lyx-1.3.2-configure.diff 439
 MD5 f6bf30211847fb321f0000cd415d9e5b files/lyx-1.3.2-nomktex.patch 449
 MD5 296163b72f99143379e73e616ce4e728 files/digest-lyx-1.3.4 239
-MD5 8de1b633e396a6902ee47cee4a56613d files/digest-lyx-1.3.2-r1 169
diff --git a/app-office/lyx/files/digest-lyx-1.3.2-r1 b/app-office/lyx/files/digest-lyx-1.3.2-r1
deleted file mode 100644
index 2028cdfa4661..000000000000
--- a/app-office/lyx/files/digest-lyx-1.3.2-r1
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 e33cf84f7c5be4ab9bbcc6ea587d4fdc lyx-1.3.2.tar.bz2 5469070
-MD5 f1df2f1426cca24c0dafa1dc1a832e6a hebrew.bind 45
-MD5 a0e3948595801a90d32d8b712596a5fe preferences 1669
diff --git a/app-office/lyx/files/lyx-1.3.2-configure.diff b/app-office/lyx/files/lyx-1.3.2-configure.diff
deleted file mode 100644
index 013cf2c21924..000000000000
--- a/app-office/lyx/files/lyx-1.3.2-configure.diff
+++ /dev/null
@@ -1,11 +0,0 @@
---- lib/configure	2003-05-12 20:59:38.000000000 +0000
-+++ lib/configure	2003-05-12 20:59:57.000000000 +0000
-@@ -1134,7 +1134,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}
diff --git a/app-office/lyx/lyx-1.3.2-r1.ebuild b/app-office/lyx/lyx-1.3.2-r1.ebuild
deleted file mode 100644
index 8b4746924d4f..000000000000
--- a/app-office/lyx/lyx-1.3.2-r1.ebuild
+++ /dev/null
@@ -1,114 +0,0 @@
-# Copyright 1999-2004 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.2-r1.ebuild,v 1.17 2004/05/09 16:52:27 usata Exp $
-
-inherit kde-functions eutils
-
-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 ~sparc"
-IUSE="nls cups qt debug gnome"
-
-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
-	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"
-DEPEND="${DEPEND} >=sys-devel/autoconf-2.58"
-
-src_unpack() {
-	unpack ${A}
-	cd ${S}
-	epatch ${FILESDIR}/$P-nomktex.patch
-}
-
-src_compile() {
-	local myconf=""
-	if use qt ; then
-		set-qtdir 3
-		myconf="$myconf --with-frontend=qt --with-qt-dir=${QTDIR}"
-	else
-		myconf="$myconf --with-frontend=xforms"
-	fi
-
-	export WANT_AUTOCONF=2.5
-
-	# Aiksaurus.h fix, see bug #27648, by brandy.
-	# <obz@gentoo.org>
-	einfo "Checking for local Aiksaurus.h"
-	[ -d /usr/include/Aiksaurus ] \
-		&& myconf="${myconf} --with-extra-inc=/usr/include/Aiksaurus"
-
-	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 || die
-	dodoc README* UPGRADING INSTALL* ChangeLog NEWS 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
-}
-
-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."
-}
diff --git a/app-office/lyx/lyx-1.3.4.ebuild b/app-office/lyx/lyx-1.3.4.ebuild
index 7b813219f0c1..d7737af4b211 100644
--- a/app-office/lyx/lyx-1.3.4.ebuild
+++ b/app-office/lyx/lyx-1.3.4.ebuild
@@ -1,8 +1,8 @@
 # Copyright 1999-2004 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.4.ebuild,v 1.4 2004/05/09 16:52:27 usata Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-office/lyx/lyx-1.3.4.ebuild,v 1.5 2004/05/11 06:52:36 usata Exp $
 
-inherit kde-functions eutils
+inherit kde-functions eutils libtool
 
 DESCRIPTION="WYSIWYM frontend for LaTeX"
 HOMEPAGE="http://www.lyx.org/"
@@ -43,11 +43,12 @@ RDEPEND="${DEPEND}
 DEPEND="$DEPEND >=sys-devel/autoconf-2.58"
 
 src_unpack() {
-	unpack ${A}
+	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
-	elibtoolize
+	elibtoolize || die
 }
 
 src_compile() {
@@ -75,10 +76,11 @@ src_compile() {
 }
 
 src_install() {
-	einstall
-	dodoc README* UPGRADING INSTALL* ChangeLog NEWS COPYING ANNOUNCE ABOUT-NLS $DISTDIR/preferences
+	einstall || die
+	dodoc README* UPGRADING INSTALL* ChangeLog NEWS COPYING \
+		ANNOUNCE ABOUT-NLS ${DISTDIR}/preferences
 	insinto /usr/share/lyx/bind
-	doins $DISTDIR/hebrew.bind
+	doins ${DISTDIR}/hebrew.bind
 
 	# gnome menu entry
 	if [ -n "`use gnome`" ]; then