Fixed bug #125309, #102310 and #93699.

(Portage version: 2.1_pre7-r2)

7 files changed, 98 insertions, 24 deletions

diff --git a/app-office/lyx/ChangeLog b/app-office/lyx/ChangeLog
index c40ee22b11a7..10213ab34841 100644
--- a/app-office/lyx/ChangeLog
+++ b/app-office/lyx/ChangeLog
@@ -1,6 +1,16 @@
 # ChangeLog for app-office/lyx
 # Copyright 2002-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-office/lyx/ChangeLog,v 1.73 2006/03/28 23:09:38 ehmsen Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-office/lyx/ChangeLog,v 1.74 2006/03/29 16:24:23 ehmsen Exp $
+
+*lyx-1.4.0-r1 (29 Mar 2006)
+
+  29 Mar 2006; Martin Ehmsen <ehmsen@gentoo.org>
+  +files/lyx-1.4.0-dvips-R0.patch, +files/gnome-mime-application-x-lyx.png,
+  files/lyx.desktop, -lyx-1.4.0.ebuild, +lyx-1.4.0-r1.ebuild:
+  Fixed -R0 dvips problem, bug #125309.
+  Added icon and nautilus/gnome support, bug #102310.
+  Rewritten very wierd C[XX]FLAGS mangling.
+  Fixed ivritex typo in einfo, bug #93699.
 
 *lyx-1.4.0 (28 Mar 2006)
 
diff --git a/app-office/lyx/Manifest b/app-office/lyx/Manifest
index 556b38277c63..9954afd711ab 100644
--- a/app-office/lyx/Manifest
+++ b/app-office/lyx/Manifest
@@ -1,6 +1,6 @@
-MD5 bc4b9029a33c6f705a46bc837ce16211 ChangeLog 11519
-RMD160 1820ead9a3eb2ce0452a5f23ca4974822ca75a46 ChangeLog 11519
-SHA256 bc2567d76133bb70dffdf6ba44e944d0794359b4965492d2291616492af6f755 ChangeLog 11519
+MD5 d68b8fa3fd8297be9f6f318bbac21910 ChangeLog 11917
+RMD160 c2b5cd5b1276f9e029212fa411f0ea7c01d245e8 ChangeLog 11917
+SHA256 e21678b27e9eee0aa1d2f01e54b4f0aed40ad7574334399a4cab96edde0888ec ChangeLog 11917
 MD5 e9e787c73da1152a63ff3caf57d8544e files/digest-lyx-1.3.4 729
 RMD160 a6ed3b2eb34077111d84860095861b4c22a37832 files/digest-lyx-1.3.4 729
 SHA256 4aa318d733b3e6e02eb07b66ef65dc830585a9f2214a28fa19b2297f54343d5a files/digest-lyx-1.3.4 729
@@ -13,9 +13,12 @@ SHA256 2633363b025c562b8d6afa5eb47f579151dfa38bb4a0c74ee7905e9701fe3dea files/di
 MD5 59ef4c27ebcfafc671cfb41e266b0967 files/digest-lyx-1.3.6 381
 RMD160 359a32cac24efc4ad653d5d62ccd3ad03c251436 files/digest-lyx-1.3.6 381
 SHA256 51a69349d62da4cb2a3c78d9d917adc8e37a8c7e28357b3178ef76eeacd41adc files/digest-lyx-1.3.6 381
-MD5 629ba1ec1f2bb554bfc60cb26e5b6753 files/digest-lyx-1.4.0 901
-RMD160 973b746481dfa68e4df0e63ac6c11bdb326925a9 files/digest-lyx-1.4.0 901
-SHA256 767c176fb22fc3601c52bd5aac1c252d6b99243269b36be2516dbb67252f369a files/digest-lyx-1.4.0 901
+MD5 629ba1ec1f2bb554bfc60cb26e5b6753 files/digest-lyx-1.4.0-r1 901
+RMD160 973b746481dfa68e4df0e63ac6c11bdb326925a9 files/digest-lyx-1.4.0-r1 901
+SHA256 767c176fb22fc3601c52bd5aac1c252d6b99243269b36be2516dbb67252f369a files/digest-lyx-1.4.0-r1 901
+MD5 01d67cd0d7c3b2bb8aae514aeb8a9200 files/gnome-mime-application-x-lyx.png 3302
+RMD160 6b59808311d032c201961c0b085e13e2aae86bef files/gnome-mime-application-x-lyx.png 3302
+SHA256 d0d16c7a835cbb8f15ea79efd27128a9c633ac56cdc06365449f389b21a0abce files/gnome-mime-application-x-lyx.png 3302
 MD5 f6bf30211847fb321f0000cd415d9e5b files/lyx-1.3.2-nomktex.patch 449
 RMD160 b9a3f7562776e764bccb37f8cadc7eab77877bbf files/lyx-1.3.2-nomktex.patch 449
 SHA256 16607c6f7bde4d9cd930c9f2d57a507d319818c00d5627a65a7e3add1ef95794 files/lyx-1.3.2-nomktex.patch 449
@@ -31,12 +34,15 @@ SHA256 d1f27072d13a7deb9b81a0d2f9a9f898181f1804d6b943a1fed50132d2f27e3b files/ly
 MD5 7fd22c8db1af17ba2d9abcb3548320ef files/lyx-1.3.6-gentoo.diff 1108
 RMD160 a1f8530e241ea403639bd9733692a706513deccc files/lyx-1.3.6-gentoo.diff 1108
 SHA256 25bff4ec262aba73c4d8423dc76ccfbb921596c080fd1df8f8e514144047662c files/lyx-1.3.6-gentoo.diff 1108
+MD5 dc630537b02512fe8fba15a3b86159cb files/lyx-1.4.0-dvips-R0.patch 2586
+RMD160 b4b6b8f213838a607d8b65c1bb3d05aa1dcbe9fa files/lyx-1.4.0-dvips-R0.patch 2586
+SHA256 3efdbcfbe11a141bd8f02903246300a010c1ea19b0cc3b64b6d3afa2236d4c2c files/lyx-1.4.0-dvips-R0.patch 2586
 MD5 214654a6554eb9a3c29cc60e8fdd2eac files/lyx-1.4.0-gentoo.patch 1042
 RMD160 3d5c5be5a9eba531bf9bbe3a18ae1f95302343df files/lyx-1.4.0-gentoo.patch 1042
 SHA256 2034507aba94f5a47d16815de658fa263330cb4b9196e350e50635d1fd875651 files/lyx-1.4.0-gentoo.patch 1042
-MD5 962a15cb903b1048986422c10e21f058 files/lyx.desktop 188
-RMD160 3b5b7f2a348145af806b6f91b5cf778e101ad0d7 files/lyx.desktop 188
-SHA256 7cd54cb12c5051d93e3bff4599cedafc51f7545fab03f156f39fe90a436d2434 files/lyx.desktop 188
+MD5 517a1baf1371255f801e9966c0c1e90b files/lyx.desktop 214
+RMD160 7f9b377e1345565ade15c6a6b0b1e8664ee946b3 files/lyx.desktop 214
+SHA256 2e72d8bfc3c47536665e8539ebb1a55a8067914bf649a153c39874b67b2294f8 files/lyx.desktop 214
 MD5 ec72613c3dec62fccd202f3c3c1ba7fb lyx-1.3.4.ebuild 3311
 RMD160 9c11be5e5eef989cb8b864f7db875926f7e00be1 lyx-1.3.4.ebuild 3311
 SHA256 26599fbbcf6efd30ba731902d5c019f1444c5b29ec71d8a41da0ed44a1c6dc74 lyx-1.3.4.ebuild 3311
@@ -49,9 +55,9 @@ SHA256 aa5670490b845d6564e76c7b8f4fb2d3aa7af6078b70e7f7996a670f5c4bdf09 lyx-1.3.
 MD5 a1a7eceb681417c93ffb9b6745fef448 lyx-1.3.6.ebuild 4464
 RMD160 71adbcae4d653ff8b06cad22a17c35c5426ee6a6 lyx-1.3.6.ebuild 4464
 SHA256 85b5b24606e369ba95b78e314d91a454b9a5e91a59a9a8f4fdcb509a10141a94 lyx-1.3.6.ebuild 4464
-MD5 cf1933fad42b7dd784298a5db154fa24 lyx-1.4.0.ebuild 4885
-RMD160 d072ecbd7fb491ad7a1d67ef8a1791307cbac084 lyx-1.4.0.ebuild 4885
-SHA256 4b4b94033ba9901f592e693bef3f162c243ee7695bccd7c6317d8cf653abdecc lyx-1.4.0.ebuild 4885
+MD5 988dd3d8d6d02898b13d91a56804a0ce lyx-1.4.0-r1.ebuild 5019
+RMD160 a71e4ba32dfedf8d5d938dde42bda61b9ecb4a91 lyx-1.4.0-r1.ebuild 5019
+SHA256 c28b1cbbe0d6f7ed5d93ec9b35f73644c63fd5a9eac7e65f1db547b79c2f217f lyx-1.4.0-r1.ebuild 5019
 MD5 a43370bbb57cb967dbffe1a084475550 metadata.xml 181
 RMD160 076b1da29f7ec9ff8c71af3d300db7934a6c16c5 metadata.xml 181
 SHA256 fee59649574618944ad5be45972b6d1a8e09b75e64d07a75fbdef4c335a88fca metadata.xml 181
diff --git a/app-office/lyx/files/digest-lyx-1.4.0 b/app-office/lyx/files/digest-lyx-1.4.0-r1
index 53e679189065..53e679189065 100644
--- a/app-office/lyx/files/digest-lyx-1.4.0
+++ b/app-office/lyx/files/digest-lyx-1.4.0-r1
diff --git a/app-office/lyx/files/gnome-mime-application-x-lyx.png b/app-office/lyx/files/gnome-mime-application-x-lyx.png
new file mode 100644
index 000000000000..0daf64611b2b
--- /dev/null
+++ b/app-office/lyx/files/gnome-mime-application-x-lyx.png
diff --git a/app-office/lyx/files/lyx-1.4.0-dvips-R0.patch b/app-office/lyx/files/lyx-1.4.0-dvips-R0.patch
new file mode 100644
index 000000000000..584f0e943756
--- /dev/null
+++ b/app-office/lyx/files/lyx-1.4.0-dvips-R0.patch
@@ -0,0 +1,48 @@
+diff -urN lyx-1.4.0.orig/lib/configure lyx-1.4.0/lib/configure
+--- lyx-1.4.0.orig/lib/configure	2006-03-07 00:49:49.000000000 +0100
++++ lyx-1.4.0/lib/configure	2006-03-29 18:07:01.000000000 +0200
+@@ -997,7 +997,7 @@
+ echo $ac_n "checking for a DVI to PS converter""... $ac_c"
+ echo "$ac_t"""
+ dvi_to_ps_command=
+-for ac_prog in "dvips -o \$\$o \$\$i"
++for ac_prog in "dvips -R0 -o \$\$o \$\$i"
+ do
+ # Extract the first word of "$ac_prog", so it can be a program name with args.
+ set dummy $ac_prog ; ac_word=$2
+diff -urN lyx-1.4.0.orig/lib/configure.m4 lyx-1.4.0/lib/configure.m4
+--- lyx-1.4.0.orig/lib/configure.m4	2006-02-03 22:47:25.000000000 +0100
++++ lyx-1.4.0/lib/configure.m4	2006-03-29 18:07:21.000000000 +0200
+@@ -302,7 +302,7 @@
+ SEARCH_PROG([for a PS to PDF converter],ps_to_pdf_command, "ps2pdf13 \$\$i")
+ 
+ # Search for a program to convert dvi to ps
+-SEARCH_PROG([for a DVI to PS converter],dvi_to_ps_command, "dvips -o \$\$o \$\$i")
++SEARCH_PROG([for a DVI to PS converter],dvi_to_ps_command, "dvips -R0 -o \$\$o \$\$i")
+ 
+ # Search for a program to convert dvi to pdf
+ SEARCH_PROG([for a DVI to PDF converter],dvi_to_pdf_command, "dvipdfm \$\$i")
+diff -urN lyx-1.4.0.orig/lib/lyxrc.defaults lyx-1.4.0/lib/lyxrc.defaults
+--- lyx-1.4.0.orig/lib/lyxrc.defaults	2006-03-07 00:50:44.000000000 +0100
++++ lyx-1.4.0/lib/lyxrc.defaults	2006-03-29 18:05:20.000000000 +0200
+@@ -53,7 +53,7 @@
+ \converter docbook    dvi        "db2dvi $$i"	""
+ \converter docbook    html       "db2html $$i"	""
+ \converter dvi        pdf3       "dvipdfm $$i"	""
+-\converter dvi        ps         "dvips -o $$o $$i"	""
++\converter dvi        ps         "dvips -R0 -o $$o $$i"	""
+ \converter fen        asciichess "python $$s/scripts/fen2ascii.py $$i $$o"	""
+ \converter fig        pdftex     "sh $$s/scripts/fig2pdftex.sh $$i $$o"	""
+ \converter fig        pstex      "sh $$s/scripts/fig2pstex.sh $$i $$o"	""
+diff -urN lyx-1.4.0.orig/lib/lyxrc.example lyx-1.4.0/lib/lyxrc.example
+--- lyx-1.4.0.orig/lib/lyxrc.example	2005-09-08 11:20:16.000000000 +0200
++++ lyx-1.4.0/lib/lyxrc.example	2006-03-29 18:06:12.000000000 +0200
+@@ -348,7 +348,7 @@
+ # The converter command has 4 arguments: The source format, the target format,
+ # the command, and additional flags.
+ # For example, the following defines a DVI->Postscript converter:
+-#\converter dvi ps "dvips -o $$o $$i" ""
++#\converter dvi ps "dvips -R0 -o $$o $$i" ""
+ # The variable name $$i is replaced with the name of the source file,
+ # and $$o is replaced with the name of the target file.
+ # The flags argument is a list of comma separated flags.
diff --git a/app-office/lyx/files/lyx.desktop b/app-office/lyx/files/lyx.desktop
index 1c1b33e8738e..8d642049cbf9 100644
--- a/app-office/lyx/files/lyx.desktop
+++ b/app-office/lyx/files/lyx.desktop
@@ -7,4 +7,4 @@ Terminal=false
 Type=Application
 StartupNotify=false
 Categories=GNOME;Application;Office;
-
+MimeType=application/x-lyx
diff --git a/app-office/lyx/lyx-1.4.0.ebuild b/app-office/lyx/lyx-1.4.0-r1.ebuild
index a31b01ef2e1d..af451a0024d7 100644
--- a/app-office/lyx/lyx-1.4.0.ebuild
+++ b/app-office/lyx/lyx-1.4.0-r1.ebuild
@@ -1,8 +1,8 @@
 # Copyright 1999-2006 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-office/lyx/lyx-1.4.0.ebuild,v 1.1 2006/03/28 23:09:40 ehmsen Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-office/lyx/lyx-1.4.0-r1.ebuild,v 1.1 2006/03/29 16:24:23 ehmsen Exp $
 
-inherit kde-functions eutils libtool flag-o-matic
+inherit kde-functions fdo-mime eutils libtool flag-o-matic
 
 DESCRIPTION="WYSIWYM frontend for LaTeX"
 HOMEPAGE="http://www.lyx.org/"
@@ -18,7 +18,7 @@ SRC_URI="ftp://ftp.lyx.org/pub/lyx/stable/${P}.tar.bz2
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="~amd64 ~ppc ~x86"
-IUSE="cjk cups debug gtk nls qt"
+IUSE="cjk cups debug gtk nls qt gnome"
 
 RDEPEND="|| (
 		virtual/x11
@@ -82,7 +82,9 @@ src_unpack() {
 	unpack ${P}.tar.bz2 || die "unpacking lyx failed"
 	unpack latex-xft-fonts-0.1.tar.gz || die "unpacking xft-fonts failed"
 	cd ${S}
-	epatch ${FILESDIR}/${P}-gentoo.patch
+	epatch ${FILESDIR}/${P}-gentoo.patch || die
+	# bug #125309
+	epatch ${FILESDIR}/${P}-dvips-R0.patch || die
 	elibtoolize || die "elibtoolize failed "
 }
 
@@ -108,14 +110,12 @@ src_compile() {
 
 	export WANT_AUTOCONF=2.5
 
-	local flags="${CXXFLAGS} $(test_flag -fno-stack-protector) $(test_flag -fno-stack-protector-all)"
-	unset CFLAGS
-	unset CXXFLAGS
+	append-flags "$(test-flags -fno-stack-protector -fno-stack-protector-all)"
+	filter-flags "-Os"
 	econf \
 		$(use_enable nls) \
 		$(use_enable debug) \
 		${myconf} \
-		--enable-optimization="${flags/-Os}" \
 		|| die "econf failed"
 
 	# bug 57479
@@ -146,6 +146,12 @@ src_install() {
 		${D}/usr/share/fonts/latex-xft-fonts
 	HOME=/root fc-cache -f ${D}/usr/share/fonts/latex-xft-fonts
 
+	# bug #102310
+	if use gnome ; then
+		insinto /usr/share/icons/gnome/48x48/mimetypes
+		doins ${FILESDIR}/gnome-mime-application-x-lyx.png
+	fi
+
 	# fix for bug 91108
 	dodir /usr/share/texmf/tex/latex
 	cd ${D}/usr/share/texmf/tex/latex
@@ -153,13 +159,17 @@ src_install() {
 }
 
 pkg_postinst() {
-
 	# fix for bug 91108
 	texhash
 
+	# bug #102310
+	if use gnome ; then
+		fdo-mime_desktop_database_update
+	fi
+
 	einfo ""
 	einfo "How to use Hebrew in LyX:"
-	einfo "1. emerge app-text/ivritex."
+	einfo "1. emerge dev-tex/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."