6 files changed, 18 insertions, 74 deletions
diff --git a/app-office/lyx/ChangeLog b/app-office/lyx/ChangeLog
index 5226017f6082..2a0f99527ca1 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.41 2004/02/21 20:25:10 usata Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-office/lyx/ChangeLog,v 1.42 2004/05/09 16:52:27 usata Exp $
+
+  08 May 2004; Mamoru KOMACHI <usata@gentoo.org> lyx-1.2.1.ebuild,
+  lyx-1.3.2-r1.ebuild, lyx-1.3.4.ebuild:
+  Stable on x86 and ppc. Removed old ebuild.
 
 *lyx-1.3.4 (22 Feb 2004)
 
diff --git a/app-office/lyx/Manifest b/app-office/lyx/Manifest
index 3960976ab4d5..44ef7fed7741 100644
--- a/app-office/lyx/Manifest
+++ b/app-office/lyx/Manifest
@@ -1,12 +1,10 @@
-MD5 adf50f8b30bcf7f72ae36842b3fce02d files/digest-lyx-1.2.1 62
-MD5 296163b72f99143379e73e616ce4e728 files/digest-lyx-1.3.4 239
-MD5 8de1b633e396a6902ee47cee4a56613d files/digest-lyx-1.3.2-r1 169
+MD5 089d8806e264b7e595ececb3784d3495 lyx-1.3.4.ebuild 3037
+MD5 dd144e4ea50735149723d4ff3c1e4146 lyx-1.3.2-r1.ebuild 3550
+MD5 29578bd3c49bafaf00b9b549c2988e35 ChangeLog 7284
+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 363bfca924cf46b61d21faa4dbfcd43f files/lyx-1.3.3-configure-diff 1953
-MD5 4dc1e1cc2b4e056a629fbfd1334c390e files/lyx.desktop 188
-MD5 cec8b171d8f9619814545f4c330b4e7e ChangeLog 7130
-MD5 138f44b8e5a273ed560a15cd92bbeb92 lyx-1.2.1.ebuild 1519
-MD5 a584c95f6b96094cb35582810fc2ec83 lyx-1.3.2-r1.ebuild 3552
-MD5 c472f5fd1646eb8bca71d8df5cb2bdcc metadata.xml 164
-MD5 215c4a163efd809571eaa4d883e3a6d7 lyx-1.3.4.ebuild 3027
+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.2.1 b/app-office/lyx/files/digest-lyx-1.2.1
deleted file mode 100644
index bf8b370bb417..000000000000
--- a/app-office/lyx/files/digest-lyx-1.2.1
+++ /dev/null
@@ -1 +0,0 @@
-MD5 6797b72d306000bd1579cfea21b3f1cf lyx-1.2.1.tar.gz 6476744
diff --git a/app-office/lyx/lyx-1.2.1.ebuild b/app-office/lyx/lyx-1.2.1.ebuild
deleted file mode 100644
index 2447e5d68c10..000000000000
--- a/app-office/lyx/lyx-1.2.1.ebuild
+++ /dev/null
@@ -1,58 +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.2.1.ebuild,v 1.18 2004/01/26 00:02:19 vapier Exp $
-
-inherit flag-o-matic
-
-DESCRIPTION="WYSIWYM frontend for LaTeX"
-HOMEPAGE="http://www.lyx.org/"
-SRC_URI="ftp://ftp.lyx.org/pub/lyx/stable/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="x86 ppc"
-IUSE="nls cups debug"
-
-# This lyx-base ebuild only depends on the absolutely necessary packages.
-# The acompanying lyx-utils ebuild depends on lyx-base and on everything
-# else that lyx can use.
-DEPEND="virtual/x11
-	=x11-libs/xforms-1*
-	virtual/tetex
-	>=dev-lang/perl-5
-	nls? ( sys-devel/gettext )
-	app-text/aiksaurus"
-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"
-
-src_compile() {
-	replace-flags -O? -O2
-
-	econf \
-		`use_enable nls` \
-		`use_enable debug` \
-		|| die
-		#--infodir='$(prefix)/share/info' \
-		#--with-extra-inc=/usr/X11R6/include \
-		#--mandir='$(prefix)/share/man' \
-	emake || die "emake failed"
-}
-
-src_install() {
-	# The 'install-strip' target is provided by the LyX makefile
-	# for stripping installed binaries.  Use prefix= instead of
-	# DESTDIR=, otherwise it violates the sandbox in the po directory.
-	einstall || die
-	dodoc README* UPGRADING INSTALL* ChangeLog NEW COPYING ANNOUNCE
-}
diff --git a/app-office/lyx/lyx-1.3.2-r1.ebuild b/app-office/lyx/lyx-1.3.2-r1.ebuild
index 7233040022ed..8b4746924d4f 100644
--- a/app-office/lyx/lyx-1.3.2-r1.ebuild
+++ b/app-office/lyx/lyx-1.3.2-r1.ebuild
@@ -1,6 +1,6 @@
 # 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.16 2004/04/07 18:58:54 vapier Exp $
+# $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
 
@@ -12,7 +12,7 @@ SRC_URI="ftp://ftp.lyx.org/pub/lyx/stable/${P}.tar.bz2
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="x86 ~ppc ~sparc"
+KEYWORDS="x86 ppc ~sparc"
 IUSE="nls cups qt debug gnome"
 
 DEPEND="virtual/x11
diff --git a/app-office/lyx/lyx-1.3.4.ebuild b/app-office/lyx/lyx-1.3.4.ebuild
index f093a0da1361..7b813219f0c1 100644
--- a/app-office/lyx/lyx-1.3.4.ebuild
+++ b/app-office/lyx/lyx-1.3.4.ebuild
@@ -1,6 +1,6 @@
 # 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.3 2004/04/07 18:56:31 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-office/lyx/lyx-1.3.4.ebuild,v 1.4 2004/05/09 16:52:27 usata Exp $
 
 inherit kde-functions eutils
 
@@ -13,7 +13,7 @@ SRC_URI="ftp://ftp.lyx.org/pub/lyx/stable/${P}.tar.bz2
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~x86 ~ppc ~sparc amd64"
+KEYWORDS="x86 ppc ~sparc amd64"
 IUSE="nls cups qt debug gnome"
 
 # these dependencies need looking at.
@@ -47,6 +47,7 @@ src_unpack() {
 	cd ${S}
 	epatch ${FILESDIR}/${PN}-1.3.2-nomktex.patch
 	epatch ${FILESDIR}/${PN}-1.3.3-configure-diff
+	elibtoolize
 }
 
 src_compile() {