Version bumped, bug #168799.

Package-Manager: portage-2.1.2.9

5 files changed, 189 insertions, 15 deletions

diff --git a/app-office/lyx/ChangeLog b/app-office/lyx/ChangeLog
index 4efce88d78e7..731e81dfa92a 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.98 2007/03/12 23:39:38 nattfodd Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-office/lyx/ChangeLog,v 1.99 2007/07/27 00:26:48 matsuu Exp $
+
+*lyx-1.5.0 (27 Jul 2007)
+
+  27 Jul 2007; MATSUU Takuto <matsuu@gentoo.org>
+  +files/lyx-1.5.0-gentoo.patch, +lyx-1.5.0.ebuild:
+  Version bumped, bug #168799.
 
   12 Mar 2007; Alexandre Buisse <nattfodd@gentoo.org> metadata.xml:
   Replaced text-markup by tex as maintaining herd (text-markup split).
diff --git a/app-office/lyx/Manifest b/app-office/lyx/Manifest
index 97d6b54826cc..52e9c5ed370b 100644
--- a/app-office/lyx/Manifest
+++ b/app-office/lyx/Manifest
@@ -1,6 +1,3 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
 AUX gnome-mime-application-x-lyx.png 3302 RMD160 6b59808311d032c201961c0b085e13e2aae86bef SHA1 ccc71e9f98cfd6f6efbf550572eec89506d08349 SHA256 d0d16c7a835cbb8f15ea79efd27128a9c633ac56cdc06365449f389b21a0abce
 MD5 01d67cd0d7c3b2bb8aae514aeb8a9200 files/gnome-mime-application-x-lyx.png 3302
 RMD160 6b59808311d032c201961c0b085e13e2aae86bef files/gnome-mime-application-x-lyx.png 3302
@@ -13,6 +10,10 @@ AUX lyx-1.4.4-gentoo.patch 1989 RMD160 4e52996232d9eda92df145f719b7ba891803b80b
 MD5 007586ac8be99600c0fd1780bdfd7406 files/lyx-1.4.4-gentoo.patch 1989
 RMD160 4e52996232d9eda92df145f719b7ba891803b80b files/lyx-1.4.4-gentoo.patch 1989
 SHA256 4fbcaca88c2965821deaa70f61e75ff752ad34e50744d4e908f94bc29b85c553 files/lyx-1.4.4-gentoo.patch 1989
+AUX lyx-1.5.0-gentoo.patch 1298 RMD160 69b7ce68234e7f5c2fee708944267f1974aa10d0 SHA1 16c3e6f846c55c3eb5fd9d7da1247a3429efa7a4 SHA256 36be1ea2577cce270319a7a3b4bed92e5925c0e974edda8729bda2179ac8ffe2
+MD5 78e96de3dbce08aed997f413e710ef3c files/lyx-1.5.0-gentoo.patch 1298
+RMD160 69b7ce68234e7f5c2fee708944267f1974aa10d0 files/lyx-1.5.0-gentoo.patch 1298
+SHA256 36be1ea2577cce270319a7a3b4bed92e5925c0e974edda8729bda2179ac8ffe2 files/lyx-1.5.0-gentoo.patch 1298
 AUX lyx.desktop 214 RMD160 7f9b377e1345565ade15c6a6b0b1e8664ee946b3 SHA1 6d6740caaef4e9b8480d866a2a3126762585134d SHA256 2e72d8bfc3c47536665e8539ebb1a55a8067914bf649a153c39874b67b2294f8
 MD5 517a1baf1371255f801e9966c0c1e90b files/lyx.desktop 214
 RMD160 7f9b377e1345565ade15c6a6b0b1e8664ee946b3 files/lyx.desktop 214
@@ -23,6 +24,7 @@ DIST hebrew.bind 45 RMD160 1621bd311aa053798815fd6c795406a505761531 SHA1 85c39df
 DIST latex-xft-fonts-0.1.tar.gz 91730 RMD160 0a516eeba71ddc474e97f315e45e41028efa2e4d SHA1 50edf35ff08354bdf08517add33e16ee37f769e9 SHA256 78bceea8a055bc43bd0d246ae8e69f81d2f161ae4d8f1aaaa2dfff9e293ae964
 DIST lyx-1.4.2.tar.bz2 6874598 RMD160 af1dac6f6601ba3aae16543db4310afb990101b9 SHA1 df79126dd2cad60c15640c0218654ec22b404c77 SHA256 54de255a4ef947726b6ce7067cf149804cee82fc8d27f6749cd4c927be21b782
 DIST lyx-1.4.4.tar.bz2 7859197 RMD160 31f709db8e4785cb378f261355a7b2551dd38253 SHA1 896240ab947fb4995dab04c8ca40d3952c90e1f2 SHA256 5f48996c4217093d5cfaa9566cc4349cbfeb65ac12cd1b996ac6a5b5e4480307
+DIST lyx-1.5.0.tar.bz2 8034076 RMD160 bddfcbc889a61746281d0f18a17a56ebc1186c6b SHA1 7d13b3effc1721b24a30738b7f1ebf5125e4a19d SHA256 8305fe3e3f7c1cdf83a37f0216d6b1aea39e1f2cce75023f9fa9ff9f71ee4a99
 DIST preferences 1669 RMD160 26986d7bcc48c4ecf60f84d95490148a5e171785 SHA1 3567ad4d4a2a041c295e40fef76ca53de6cb260d SHA256 41867ac67bc729d1057253bf305aced1ff666ee4d648dfefc99fd0c3c0501d43
 EBUILD lyx-1.4.2.ebuild 4431 RMD160 81d055beb1ff4482d2239aa48af21b95c5de6fa8 SHA1 3b89f85b57382fd65c7553810c811a138e1a0fe7 SHA256 84003565c62d5ac1d12ebcdb2d376fd4c2a3474bc551d103a92de777f03d3d5d
 MD5 abf504f952e485fbf0a60ea934619995 lyx-1.4.2.ebuild 4431
@@ -32,10 +34,14 @@ EBUILD lyx-1.4.4.ebuild 4440 RMD160 0f27b1d988bcfbd6b40e243b0ec784d80f1a8ff9 SHA
 MD5 5c44085497ba3e891d8efd3585f0fde2 lyx-1.4.4.ebuild 4440
 RMD160 0f27b1d988bcfbd6b40e243b0ec784d80f1a8ff9 lyx-1.4.4.ebuild 4440
 SHA256 ae3cebdc3b10aa3e7ffbddd135c68530cf26a74ae7a628b173d853c5772eb3b3 lyx-1.4.4.ebuild 4440
-MISC ChangeLog 15737 RMD160 cb8b27360e5dae7659dd29d9fe241518896c1fbb SHA1 0dd5e62fdd3d4770ab4d7050a157e6a44a228075 SHA256 133beeda0e3cabef6a427503bab9787fb5fb19880cc454853bb5c6e931da2937
-MD5 0b3b0f0abf87797cfbd50e576858f9f4 ChangeLog 15737
-RMD160 cb8b27360e5dae7659dd29d9fe241518896c1fbb ChangeLog 15737
-SHA256 133beeda0e3cabef6a427503bab9787fb5fb19880cc454853bb5c6e931da2937 ChangeLog 15737
+EBUILD lyx-1.5.0.ebuild 2934 RMD160 376d7081478078b92c39657c7b284001a2f86ae6 SHA1 971a0330b19ec55294d85759e3d6edd3fd52d952 SHA256 df81e3ff9a3769c21f8efa59325f7ea2a4c96bcd28619b94213d6141b46e4378
+MD5 697e3f47cbf537ab6421f6bcbce2dda8 lyx-1.5.0.ebuild 2934
+RMD160 376d7081478078b92c39657c7b284001a2f86ae6 lyx-1.5.0.ebuild 2934
+SHA256 df81e3ff9a3769c21f8efa59325f7ea2a4c96bcd28619b94213d6141b46e4378 lyx-1.5.0.ebuild 2934
+MISC ChangeLog 15894 RMD160 e2b64ac9b92571939a637dd863828e1b592d7216 SHA1 d17e964693a7ba8f5c8e4dcb81abccf78b4fb4bd SHA256 15177396487235b1d783d3ae97c2bd44f86db4bd077470a7b826597a98caf4c3
+MD5 25e0d0e492e7764f7d93b1ab71f9de88 ChangeLog 15894
+RMD160 e2b64ac9b92571939a637dd863828e1b592d7216 ChangeLog 15894
+SHA256 15177396487235b1d783d3ae97c2bd44f86db4bd077470a7b826597a98caf4c3 ChangeLog 15894
 MISC metadata.xml 173 RMD160 2a5c18ac36394027f647f337410df755f5d37369 SHA1 98f3803fec9ccaf2574571b904292027095f5273 SHA256 f489b81a91c6b9b653122719caac14c4f1cfd63d26d4b100abf1a995db71d9c8
 MD5 cd383624b0ad49f4db815891a9777994 metadata.xml 173
 RMD160 2a5c18ac36394027f647f337410df755f5d37369 metadata.xml 173
@@ -46,10 +52,6 @@ SHA256 255851134c1b170edfc08e6c10174d3285e2eeee4ac5c8c977a99493611de92f files/di
 MD5 38da5d727e645d56dfe2cd12d77d9b55 files/digest-lyx-1.4.4 1154
 RMD160 2fb992dfa37a54dda180274c0e64e27e1d5986fc files/digest-lyx-1.4.4 1154
 SHA256 c11899b4dfe1210fe027ebbd2e083822e3649bd6198b9e6c9615f00e6c0f208e files/digest-lyx-1.4.4 1154
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.4.6 (GNU/Linux)
-
-iD8DBQFF9eWNwx9vvAARv2sRAk8sAJ44uoVNnnXNih7pV/9sKtYVmyUmkACg2DzF
-zMh/KKSVC0+gK+mMkbFE7ck=
-=E9UR
------END PGP SIGNATURE-----
+MD5 5c090dafbe48c0419c5530865edc20b4 files/digest-lyx-1.5.0 901
+RMD160 8003edba9262b40612def9d55bf80ef595b727c6 files/digest-lyx-1.5.0 901
+SHA256 44c76facffa2979f7ea45b37c12ab5d44c8e8a1257b3e899cba96bf3f56785ed files/digest-lyx-1.5.0 901
diff --git a/app-office/lyx/files/digest-lyx-1.5.0 b/app-office/lyx/files/digest-lyx-1.5.0
new file mode 100644
index 000000000000..254d656853d7
--- /dev/null
+++ b/app-office/lyx/files/digest-lyx-1.5.0
@@ -0,0 +1,12 @@
+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 ed1cf8963eadc78ef40533f66eaa6750 lyx-1.5.0.tar.bz2 8034076
+RMD160 bddfcbc889a61746281d0f18a17a56ebc1186c6b lyx-1.5.0.tar.bz2 8034076
+SHA256 8305fe3e3f7c1cdf83a37f0216d6b1aea39e1f2cce75023f9fa9ff9f71ee4a99 lyx-1.5.0.tar.bz2 8034076
+MD5 a0e3948595801a90d32d8b712596a5fe preferences 1669
+RMD160 26986d7bcc48c4ecf60f84d95490148a5e171785 preferences 1669
+SHA256 41867ac67bc729d1057253bf305aced1ff666ee4d648dfefc99fd0c3c0501d43 preferences 1669
diff --git a/app-office/lyx/files/lyx-1.5.0-gentoo.patch b/app-office/lyx/files/lyx-1.5.0-gentoo.patch
new file mode 100644
index 000000000000..07f397a75ee9
--- /dev/null
+++ b/app-office/lyx/files/lyx-1.5.0-gentoo.patch
@@ -0,0 +1,30 @@
+diff -Naur lyx-1.5.0.orig/lib/configure.py lyx-1.5.0/lib/configure.py
+--- lyx-1.5.0.orig/lib/configure.py	2007-07-25 06:08:25.000000000 +0900
++++ lyx-1.5.0/lib/configure.py	2007-07-27 08:05:53.000000000 +0900
+@@ -214,7 +214,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:
+@@ -386,7 +386,7 @@
+     checkProg('a DVI to TXT converter', ['catdvi $$i > $$o'],
+         rc_entry = [ r'\converter dvi        text4      "%%"	""' ])
+     #
+-    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'],
+@@ -650,7 +650,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 --git a/app-office/lyx/lyx-1.5.0.ebuild b/app-office/lyx/lyx-1.5.0.ebuild
new file mode 100644
index 000000000000..eceda9dbfbf0
--- /dev/null
+++ b/app-office/lyx/lyx-1.5.0.ebuild
@@ -0,0 +1,124 @@
+# 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.5.0.ebuild,v 1.1 2007/07/27 00:26:48 matsuu Exp $
+
+inherit qt4 eutils flag-o-matic font
+
+MY_P="${P/_}"
+S="${WORKDIR}/${MY_P}"
+FONT_P="latex-xft-fonts-0.1"
+FONT_S="${WORKDIR}/${FONT_P}"
+DESCRIPTION="WYSIWYM frontend for LaTeX, DocBook, etc."
+HOMEPAGE="http://www.lyx.org/"
+SRC_URI="ftp://ftp.devel.lyx.org/pub/lyx/stable/${MY_P}.tar.bz2
+	ftp://ftp.lyx.org/pub/lyx/contrib/${FONT_P}.tar.gz
+	linguas_he? (
+		http://cs.haifa.ac.il/~dekelts/lyx/files/hebrew.bind
+		http://cs.haifa.ac.il/~dekelts/lyx/files/preferences
+	)"
+
+LICENSE="GPL-2"
+SLOT="0"
+#KEYWORDS="~amd64 ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="~amd64 ~x86" # dev-tex/ivritex
+IUSE="cups debug nls linguas_he tetex"
+RESTRICT="test"
+
+RDEPEND="$(qt4_min_version 4.1.1)
+	x11-libs/libXi
+	x11-libs/libXrandr
+	x11-libs/libXcursor
+	x11-libs/libXft
+	virtual/aspell-dict
+	media-gfx/imagemagick
+	cups? ( virtual/lpr )
+	app-text/sgmltools-lite
+	tetex? (
+		virtual/ghostscript
+		app-text/noweb
+		dev-tex/dvipost
+		dev-tex/chktex
+		dev-tex/latex2html
+	)
+	linguas_he? ( dev-tex/ivritex )"
+
+# 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}
+	x11-libs/libX11
+	x11-libs/libXt
+	x11-libs/libXpm
+	x11-proto/xproto
+	tetex? ( virtual/tetex )
+	nls? ( sys-devel/gettext )
+	app-text/aiksaurus
+	>=dev-lang/python-2.3.4"
+
+src_unpack() {
+	unpack ${A}
+	cd "${S}"
+	# bug #125309
+	epatch "${FILESDIR}"/${P}-gentoo.patch || die
+}
+
+src_compile() {
+	append-flags "$(test-flags -fno-stack-protector -fno-stack-protector-all)"
+	replace-flags "-Os" "-O2"
+	econf \
+		$(use_enable nls) \
+		$(use_enable debug) \
+		--with-aspell || die "econf failed"
+	emake || die "emake failed"
+}
+
+src_install() {
+	emake DESTDIR="${D}" install || die "emake install failed"
+
+	dodoc ANNOUNCE ChangeLog NEWS README RELEASE-NOTES UPGRADING
+
+	if use linguas_he ; then
+		insinto /usr/share/lyx/bind
+		doins "${DISTDIR}"/hebrew.bind
+		dodoc "${DISTDIR}"/preferences
+	fi
+
+	domenu "${FILESDIR}"/lyx.desktop
+
+	# install the latex-xft fonts, which should fix
+	# the problems outlined in bug #15629
+	# <obz@gentoo.org>
+	cd "${WORKDIR}"/${FONT_P}
+	emake DESTDIR="${D}" install || die "Font installation failed"
+
+	font_src_install
+
+	# fix for bug 91108
+	if use tetex ; then
+		dosym ../../../lyx/tex /usr/share/texmf/tex/latex/lyx
+	fi
+}
+
+pkg_postinst() {
+	font_pkg_postinst
+
+	# fix for bug 91108
+	if use tetex ; then
+		texhash
+	fi
+
+	if use linguas_he ; then
+		elog
+		elog "How to use Hebrew in LyX:"
+		elog "bunzip2 /usr/share/doc/${PF}/preferences.bz2 into ~/.lyx/preferences"
+		elog "or, read http://cs.haifa.ac.il/~dekelts/lyx/instructions2.html"
+		elog "for instructions on using lyx's own preferences dialog to equal effect."
+		elog
+	fi
+}
+
+pkg_postrm() {
+	if use tetex ; then
+		texhash
+	fi
+}