Version bumped, bug #168799.

Package-Manager: portage-2.1.2.11

4 files changed, 167 insertions, 5 deletions

diff --git a/app-office/lyx/ChangeLog b/app-office/lyx/ChangeLog
index 30b5cb46971c..35d017006619 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.100 2007/07/27 12:55:05 fmccor Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-office/lyx/ChangeLog,v 1.101 2007/08/06 16:32:29 matsuu Exp $
+
+*lyx-1.5.1 (06 Aug 2007)
+
+  06 Aug 2007; MATSUU Takuto <matsuu@gentoo.org> +lyx-1.5.1.ebuild:
+  Version bumped, bug #168799.
+  Fixed dependency, bug #186991.
 
   27 Jul 2007; Ferris McCormick <fmccor@gentoo.org> lyx-1.5.0.ebuild:
   Add ~sparc keyword --- Bug #168799 --- builds and appears to work.
diff --git a/app-office/lyx/Manifest b/app-office/lyx/Manifest
index 0bbcdb4bf1f1..caa57506df0f 100644
--- a/app-office/lyx/Manifest
+++ b/app-office/lyx/Manifest
@@ -25,6 +25,7 @@ DIST latex-xft-fonts-0.1.tar.gz 91730 RMD160 0a516eeba71ddc474e97f315e45e41028ef
 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 lyx-1.5.1.tar.bz2 7823886 RMD160 f146b6f7654245f777367c86b8c449fa1ff2e4c6 SHA1 d6fab5c00afe35fdafb6104fbd74d76107438367 SHA256 d720ff082ed29d385c52e7ad370499d23275e595e9d7a321b383609f68acf23e
 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
@@ -38,10 +39,14 @@ EBUILD lyx-1.5.0.ebuild 2941 RMD160 b3ca7ae26bcf54c1c84f18b5a2d36f8269604baf SHA
 MD5 6aa6257f4731d9d5ffa4683665fbfe0f lyx-1.5.0.ebuild 2941
 RMD160 b3ca7ae26bcf54c1c84f18b5a2d36f8269604baf lyx-1.5.0.ebuild 2941
 SHA256 c8399032154797c5c376dbf50053b74e5fd3c1c819841985e08c0e8712524a05 lyx-1.5.0.ebuild 2941
-MISC ChangeLog 16035 RMD160 107b7f42bfafd83efc5073f015f0fc19729cf4ca SHA1 162405fc2c302c7b7f65e4be0fff228b5b20ded0 SHA256 f19140111808ee1d8f668148a2eba74bb5f12748886e82fb83526fbe1d700e12
-MD5 a7c5344611c9989901b4ec5af6972e66 ChangeLog 16035
-RMD160 107b7f42bfafd83efc5073f015f0fc19729cf4ca ChangeLog 16035
-SHA256 f19140111808ee1d8f668148a2eba74bb5f12748886e82fb83526fbe1d700e12 ChangeLog 16035
+EBUILD lyx-1.5.1.ebuild 3088 RMD160 0904ea2b68c89c5d8e6d40ccd002030418607a9d SHA1 4467278b07a533552192f8a636eece451c34a18d SHA256 8e1d60417a9ca9e1d3ff1496a7b1864a8f6fff6bc14d5c6630ff25ea89155ea3
+MD5 8f34815214f35932d1a55a3b166e9e67 lyx-1.5.1.ebuild 3088
+RMD160 0904ea2b68c89c5d8e6d40ccd002030418607a9d lyx-1.5.1.ebuild 3088
+SHA256 8e1d60417a9ca9e1d3ff1496a7b1864a8f6fff6bc14d5c6630ff25ea89155ea3 lyx-1.5.1.ebuild 3088
+MISC ChangeLog 16194 RMD160 1bd07702a4a13cf2d869b0518f4478119d617ccf SHA1 b8bd2fd591a84bd32b234e5dd4b50cf080eec4dd SHA256 686d72635d50c1aa40a99ca712e55c6f958627139df8a014c07d1364622bec32
+MD5 01d70bad9ea2702c4a6d97bedd24cb63 ChangeLog 16194
+RMD160 1bd07702a4a13cf2d869b0518f4478119d617ccf ChangeLog 16194
+SHA256 686d72635d50c1aa40a99ca712e55c6f958627139df8a014c07d1364622bec32 ChangeLog 16194
 MISC metadata.xml 173 RMD160 2a5c18ac36394027f647f337410df755f5d37369 SHA1 98f3803fec9ccaf2574571b904292027095f5273 SHA256 f489b81a91c6b9b653122719caac14c4f1cfd63d26d4b100abf1a995db71d9c8
 MD5 cd383624b0ad49f4db815891a9777994 metadata.xml 173
 RMD160 2a5c18ac36394027f647f337410df755f5d37369 metadata.xml 173
@@ -55,3 +60,6 @@ SHA256 c11899b4dfe1210fe027ebbd2e083822e3649bd6198b9e6c9615f00e6c0f208e files/di
 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
+MD5 5ab0da9e6fb1c42e42cd1b588eec1cd1 files/digest-lyx-1.5.1 901
+RMD160 f43c8db58344ac14c5c43e98acfa4eebb4b61770 files/digest-lyx-1.5.1 901
+SHA256 5b402829e857494887d07d414f55ceb84cae0c312c6e55a1c5a776eee4f7c674 files/digest-lyx-1.5.1 901
diff --git a/app-office/lyx/files/digest-lyx-1.5.1 b/app-office/lyx/files/digest-lyx-1.5.1
new file mode 100644
index 000000000000..fa6f8a3c0ee3
--- /dev/null
+++ b/app-office/lyx/files/digest-lyx-1.5.1
@@ -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 0ae3b9ccb2aa74776be4af8c199dbbe9 lyx-1.5.1.tar.bz2 7823886
+RMD160 f146b6f7654245f777367c86b8c449fa1ff2e4c6 lyx-1.5.1.tar.bz2 7823886
+SHA256 d720ff082ed29d385c52e7ad370499d23275e595e9d7a321b383609f68acf23e lyx-1.5.1.tar.bz2 7823886
+MD5 a0e3948595801a90d32d8b712596a5fe preferences 1669
+RMD160 26986d7bcc48c4ecf60f84d95490148a5e171785 preferences 1669
+SHA256 41867ac67bc729d1057253bf305aced1ff666ee4d648dfefc99fd0c3c0501d43 preferences 1669
diff --git a/app-office/lyx/lyx-1.5.1.ebuild b/app-office/lyx/lyx-1.5.1.ebuild
new file mode 100644
index 000000000000..c1180e53b545
--- /dev/null
+++ b/app-office/lyx/lyx-1.5.1.ebuild
@@ -0,0 +1,136 @@
+# 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.1.ebuild,v 1.1 2007/08/06 16:32:29 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.lyx.org/pub/lyx/stable/${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 ~sparc ~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
+			dev-tex/tth
+			dev-tex/hevea
+			dev-tex/tex4ht
+		)
+	)
+	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}"/${PN}-1.5.0-gentoo.patch || die
+}
+
+src_compile() {
+	append-flags "$(test-flags -fno-stack-protector -fno-stack-protector-all)"
+	replace-flags "-Os" "-O2"
+
+	unset LINGUAS
+	econf \
+		$(use_enable nls) \
+		$(use_enable debug) \
+		--with-aspell || die "econf failed"
+	emake || die "emake failed"
+}
+
+src_install() {
+	local mylinguas="${LINGUAS}"
+
+	unset LINGUAS
+	emake DESTDIR="${D}" install || die "emake install failed"
+
+	LINGUAS="${mylinguas}"
+
+	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
+}