From: Martin Ehmsen Date: Tue, 28 Mar 2006 23:09:40 +0000 (+0000) Subject: Fixed modular X for older ebuilds, and version bump to 1.4.0 (dropping CJK). X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=b9c01456f723fe93dd766be7b971a6cb29ed3bbb;p=gentoo.git Fixed modular X for older ebuilds, and version bump to 1.4.0 (dropping CJK). Package-Manager: portage-2.1_pre7-r2 --- diff --git a/app-office/lyx/ChangeLog b/app-office/lyx/ChangeLog index 1cb7a08bc2e8..c40ee22b11a7 100644 --- a/app-office/lyx/ChangeLog +++ b/app-office/lyx/ChangeLog @@ -1,6 +1,15 @@ # 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.72 2006/01/22 11:16:08 nattfodd Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-office/lyx/ChangeLog,v 1.73 2006/03/28 23:09:38 ehmsen Exp $ + +*lyx-1.4.0 (28 Mar 2006) + + 28 Mar 2006; Martin Ehmsen + +files/lyx-1.4.0-gentoo.patch, lyx-1.3.4.ebuild, lyx-1.3.5-r1.ebuild, + lyx-1.3.5-r2.ebuild, +lyx-1.4.0.ebuild: + Fixed modular X for older lyx versions (stole the deps from 1.3.6). Version + bump to 1.4.0, dropping CJK for the moment and dropping sparc because of + dvipost, thanks to Ingo Bormuth bug #118140. 22 Jan 2006; Alexandre Buisse lyx-1.3.6.ebuild: Ported to modular X, thanks to Rohan McGovern (bug #117522). diff --git a/app-office/lyx/Manifest b/app-office/lyx/Manifest index 50f956b0e93b..556b38277c63 100644 --- a/app-office/lyx/Manifest +++ b/app-office/lyx/Manifest @@ -1,16 +1,57 @@ -MD5 8e92851f6ab731ec069a9fad1bfbfd8f ChangeLog 11112 -MD5 296163b72f99143379e73e616ce4e728 files/digest-lyx-1.3.4 239 -MD5 388b0f4710d31754bd238c8bf53ae0fd files/digest-lyx-1.3.5-r1 381 -MD5 388b0f4710d31754bd238c8bf53ae0fd files/digest-lyx-1.3.5-r2 381 +MD5 bc4b9029a33c6f705a46bc837ce16211 ChangeLog 11519 +RMD160 1820ead9a3eb2ce0452a5f23ca4974822ca75a46 ChangeLog 11519 +SHA256 bc2567d76133bb70dffdf6ba44e944d0794359b4965492d2291616492af6f755 ChangeLog 11519 +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 +MD5 343504f252fc1a63bf7be0696ccf42fa files/digest-lyx-1.3.5-r1 1043 +RMD160 d829fae0c156dc9e7c799c5689d9d6c9500ddcf8 files/digest-lyx-1.3.5-r1 1043 +SHA256 2633363b025c562b8d6afa5eb47f579151dfa38bb4a0c74ee7905e9701fe3dea files/digest-lyx-1.3.5-r1 1043 +MD5 343504f252fc1a63bf7be0696ccf42fa files/digest-lyx-1.3.5-r2 1043 +RMD160 d829fae0c156dc9e7c799c5689d9d6c9500ddcf8 files/digest-lyx-1.3.5-r2 1043 +SHA256 2633363b025c562b8d6afa5eb47f579151dfa38bb4a0c74ee7905e9701fe3dea files/digest-lyx-1.3.5-r2 1043 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 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 MD5 363bfca924cf46b61d21faa4dbfcd43f files/lyx-1.3.3-configure-diff 1953 +RMD160 167345b505d01f05099b7f19ef1e5fd01ae512b9 files/lyx-1.3.3-configure-diff 1953 +SHA256 dc60740a663dfbe88a630cda3da2831d6770ba21361d9d4478dc5b4f7e65909c files/lyx-1.3.3-configure-diff 1953 MD5 b86918456f67f911e357a76308cd0fdb files/lyx-1.3.4-gcc34.patch 6589 +RMD160 ca1ef1d1cd9f404412a1b155f2a4358434c84a3d files/lyx-1.3.4-gcc34.patch 6589 +SHA256 6a508d9f1859395b1f3405d09e6b6bd7a33695cd108072cb178cab98f98b6949 files/lyx-1.3.4-gcc34.patch 6589 MD5 2a779b20a7425abd5eea3b5ee01698f7 files/lyx-1.3.5-boost.patch 655 +RMD160 75aa7c35b3dc135d86755f5a03d645eb34bf4722 files/lyx-1.3.5-boost.patch 655 +SHA256 d1f27072d13a7deb9b81a0d2f9a9f898181f1804d6b943a1fed50132d2f27e3b files/lyx-1.3.5-boost.patch 655 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 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 -MD5 895daf39c7f268ca69242ab4d5e6b185 lyx-1.3.4.ebuild 3103 -MD5 cbf7e117745080595fa57af4f76c112b lyx-1.3.5-r1.ebuild 4219 -MD5 85c91dd1e7126db67b96932bb898dcf6 lyx-1.3.5-r2.ebuild 4365 +RMD160 3b5b7f2a348145af806b6f91b5cf778e101ad0d7 files/lyx.desktop 188 +SHA256 7cd54cb12c5051d93e3bff4599cedafc51f7545fab03f156f39fe90a436d2434 files/lyx.desktop 188 +MD5 ec72613c3dec62fccd202f3c3c1ba7fb lyx-1.3.4.ebuild 3311 +RMD160 9c11be5e5eef989cb8b864f7db875926f7e00be1 lyx-1.3.4.ebuild 3311 +SHA256 26599fbbcf6efd30ba731902d5c019f1444c5b29ec71d8a41da0ed44a1c6dc74 lyx-1.3.4.ebuild 3311 +MD5 16a274dec015f5b157d3b1a0f05e92a4 lyx-1.3.5-r1.ebuild 4424 +RMD160 7d2ef5c8cb6760663eb6790b2baa380f54ef4a4c lyx-1.3.5-r1.ebuild 4424 +SHA256 03ba6d77f78aa238973c8fc7c15d715c3cdc7ecbcef6963fe93a96c0acbaeb74 lyx-1.3.5-r1.ebuild 4424 +MD5 e63708530e77254c044c60006c8d218d lyx-1.3.5-r2.ebuild 4573 +RMD160 f2951b24364cda58755893a69f59974fd326b0fb lyx-1.3.5-r2.ebuild 4573 +SHA256 aa5670490b845d6564e76c7b8f4fb2d3aa7af6078b70e7f7996a670f5c4bdf09 lyx-1.3.5-r2.ebuild 4573 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 a43370bbb57cb967dbffe1a084475550 metadata.xml 181 +RMD160 076b1da29f7ec9ff8c71af3d300db7934a6c16c5 metadata.xml 181 +SHA256 fee59649574618944ad5be45972b6d1a8e09b75e64d07a75fbdef4c335a88fca metadata.xml 181 diff --git a/app-office/lyx/files/digest-lyx-1.3.4 b/app-office/lyx/files/digest-lyx-1.3.4 index b849e36d3f7f..741ae140f5b4 100644 --- a/app-office/lyx/files/digest-lyx-1.3.4 +++ b/app-office/lyx/files/digest-lyx-1.3.4 @@ -1,4 +1,10 @@ -MD5 13fe7a7bcec0430e9a9436f2e3cfa04e lyx-1.3.4.tar.bz2 5404453 -MD5 0f3275e403be5fdbd14117dd8a26675f latex-xft-fonts-0.1.tar.gz 91730 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 13fe7a7bcec0430e9a9436f2e3cfa04e lyx-1.3.4.tar.bz2 5404453 MD5 a0e3948595801a90d32d8b712596a5fe preferences 1669 +RMD160 26986d7bcc48c4ecf60f84d95490148a5e171785 preferences 1669 +SHA256 41867ac67bc729d1057253bf305aced1ff666ee4d648dfefc99fd0c3c0501d43 preferences 1669 diff --git a/app-office/lyx/files/digest-lyx-1.3.5-r1 b/app-office/lyx/files/digest-lyx-1.3.5-r1 index a262bd039b16..3c7c71ca461a 100644 --- a/app-office/lyx/files/digest-lyx-1.3.5-r1 +++ b/app-office/lyx/files/digest-lyx-1.3.5-r1 @@ -1,6 +1,14 @@ -MD5 f4c70d2565ba9c974b1f94fc1dfd63bf lyx-1.3.5.tar.bz2 5459049 -MD5 0f3275e403be5fdbd14117dd8a26675f latex-xft-fonts-0.1.tar.gz 91730 -MD5 f1df2f1426cca24c0dafa1dc1a832e6a hebrew.bind 45 -MD5 a0e3948595801a90d32d8b712596a5fe preferences 1669 MD5 29f551b1ead52c13f05c94280e6620e9 CJK-LyX-qt-1.3.5-1.patch 434563 MD5 2c9c234a24620c1e359d263e3b7e2d97 CJK-LyX-xforms-1.3.5-1.patch 527079 +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 f4c70d2565ba9c974b1f94fc1dfd63bf lyx-1.3.5.tar.bz2 5459049 +RMD160 8e35ea173b5184bd0abaac2857fd12e45d41e2ac lyx-1.3.5.tar.bz2 5459049 +SHA256 4f3db8ce62783009e60ca0d41149b9defb335994f9f9696b5f15b838e7d20363 lyx-1.3.5.tar.bz2 5459049 +MD5 a0e3948595801a90d32d8b712596a5fe preferences 1669 +RMD160 26986d7bcc48c4ecf60f84d95490148a5e171785 preferences 1669 +SHA256 41867ac67bc729d1057253bf305aced1ff666ee4d648dfefc99fd0c3c0501d43 preferences 1669 diff --git a/app-office/lyx/files/digest-lyx-1.3.5-r2 b/app-office/lyx/files/digest-lyx-1.3.5-r2 index a262bd039b16..3c7c71ca461a 100644 --- a/app-office/lyx/files/digest-lyx-1.3.5-r2 +++ b/app-office/lyx/files/digest-lyx-1.3.5-r2 @@ -1,6 +1,14 @@ -MD5 f4c70d2565ba9c974b1f94fc1dfd63bf lyx-1.3.5.tar.bz2 5459049 -MD5 0f3275e403be5fdbd14117dd8a26675f latex-xft-fonts-0.1.tar.gz 91730 -MD5 f1df2f1426cca24c0dafa1dc1a832e6a hebrew.bind 45 -MD5 a0e3948595801a90d32d8b712596a5fe preferences 1669 MD5 29f551b1ead52c13f05c94280e6620e9 CJK-LyX-qt-1.3.5-1.patch 434563 MD5 2c9c234a24620c1e359d263e3b7e2d97 CJK-LyX-xforms-1.3.5-1.patch 527079 +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 f4c70d2565ba9c974b1f94fc1dfd63bf lyx-1.3.5.tar.bz2 5459049 +RMD160 8e35ea173b5184bd0abaac2857fd12e45d41e2ac lyx-1.3.5.tar.bz2 5459049 +SHA256 4f3db8ce62783009e60ca0d41149b9defb335994f9f9696b5f15b838e7d20363 lyx-1.3.5.tar.bz2 5459049 +MD5 a0e3948595801a90d32d8b712596a5fe preferences 1669 +RMD160 26986d7bcc48c4ecf60f84d95490148a5e171785 preferences 1669 +SHA256 41867ac67bc729d1057253bf305aced1ff666ee4d648dfefc99fd0c3c0501d43 preferences 1669 diff --git a/app-office/lyx/files/digest-lyx-1.4.0 b/app-office/lyx/files/digest-lyx-1.4.0 new file mode 100644 index 000000000000..53e679189065 --- /dev/null +++ b/app-office/lyx/files/digest-lyx-1.4.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 5ab37471339ff7dbc8f0c43282746cb0 lyx-1.4.0.tar.bz2 6736577 +RMD160 c35bf24c58820b826514c7590dc594b520267dc5 lyx-1.4.0.tar.bz2 6736577 +SHA256 09eeb2acc4676b5c400d841d3225f20c1475e16554f86a3958ddbf7c5ad0d2a6 lyx-1.4.0.tar.bz2 6736577 +MD5 a0e3948595801a90d32d8b712596a5fe preferences 1669 +RMD160 26986d7bcc48c4ecf60f84d95490148a5e171785 preferences 1669 +SHA256 41867ac67bc729d1057253bf305aced1ff666ee4d648dfefc99fd0c3c0501d43 preferences 1669 diff --git a/app-office/lyx/files/lyx-1.4.0-gentoo.patch b/app-office/lyx/files/lyx-1.4.0-gentoo.patch new file mode 100644 index 000000000000..e1051de8af1b --- /dev/null +++ b/app-office/lyx/files/lyx-1.4.0-gentoo.patch @@ -0,0 +1,33 @@ +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-28 22:52:22.000000000 +0200 +@@ -1193,7 +1193,7 @@ + echo $ac_n "checking for a spellchecker""... $ac_c" + echo "$ac_t""" + prog= +-for ac_prog in ispell ++for ac_prog in aspell + do + # Extract the first word of "$ac_prog", so it can be a program name with args. + set dummy $ac_prog ; ac_word=$2 +@@ -1634,7 +1634,7 @@ + fi ;; + esac + done > chklayouts.tex +- ${LATEX} wrap_chkconfig.ltx 2>/dev/null | grep '^\+' ++ ${LATEX} --no-mktex=tfm wrap_chkconfig.ltx 2>/dev/null | grep '^\+' + eval `cat chkconfig.vars | sed 's/-/_/g'` + test -n "${rmcopy}" && rm -f chkconfig.ltx + fi +@@ -1999,6 +1999,11 @@ + + $rc_entries + \\font_encoding "$chk_fontenc" ++ ++# Gentoo systems have TrueType fonts available, use them by default ++\\screen_font_roman "Times New Roman" ++\\screen_font_sans "Verdana" ++\\screen_font_typewriter "Courier New" + \\tex_allows_spaces $tex_allows_spaces + EOF + diff --git a/app-office/lyx/lyx-1.3.4.ebuild b/app-office/lyx/lyx-1.3.4.ebuild index cb509d441a89..6643d1a7b5e4 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-2005 Gentoo Foundation +# 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.3.4.ebuild,v 1.14 2005/07/07 04:25:32 caleb Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-office/lyx/lyx-1.3.4.ebuild,v 1.15 2006/03/28 23:09:40 ehmsen Exp $ inherit kde-functions eutils libtool @@ -19,7 +19,15 @@ IUSE="nls cups qt debug gnome" # these dependencies need looking at. # does lyx only need qt to compile but not run ? # I'll look into it -DEPEND="virtual/x11 +DEPEND="|| ( + virtual/x11 + ( + x11-libs/libX11 + x11-libs/libXt + x11-libs/libXpm + x11-proto/xproto + ) + ) virtual/tetex >=dev-lang/perl-5 nls? ( sys-devel/gettext ) @@ -27,6 +35,15 @@ DEPEND="virtual/x11 qt? ( =x11-libs/qt-3* ) !qt? ( =x11-libs/xforms-1* )" RDEPEND="${DEPEND} + || ( + virtual/x11 + ( + x11-libs/libXi + x11-libs/libXrandr + x11-libs/libXcursor + x11-libs/libXft + ) + ) virtual/ghostscript virtual/pdfviewer virtual/psviewer diff --git a/app-office/lyx/lyx-1.3.5-r1.ebuild b/app-office/lyx/lyx-1.3.5-r1.ebuild index f5c1f5923993..44009984f53a 100644 --- a/app-office/lyx/lyx-1.3.5-r1.ebuild +++ b/app-office/lyx/lyx-1.3.5-r1.ebuild @@ -1,6 +1,6 @@ -# Copyright 1999-2005 Gentoo Foundation +# 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.3.5-r1.ebuild,v 1.10 2005/07/07 12:25:06 agriffis Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-office/lyx/lyx-1.3.5-r1.ebuild,v 1.11 2006/03/28 23:09:40 ehmsen Exp $ inherit kde-functions eutils libtool flag-o-matic @@ -21,7 +21,15 @@ IUSE="cjk cups debug nls qt" # these dependencies need looking at. # does lyx only need qt to compile but not run ? # I'll look into it -DEPEND="virtual/x11 +DEPEND="|| ( + virtual/x11 + ( + x11-libs/libX11 + x11-libs/libXt + x11-libs/libXpm + x11-proto/xproto + ) + ) virtual/tetex >=dev-lang/perl-5 nls? ( sys-devel/gettext ) @@ -31,6 +39,15 @@ DEPEND="virtual/x11 !cjk? ( =x11-libs/xforms-1* ) )" RDEPEND="${DEPEND} + || ( + virtual/x11 + ( + x11-libs/libXi + x11-libs/libXrandr + x11-libs/libXcursor + x11-libs/libXft + ) + ) virtual/ghostscript virtual/pdfviewer virtual/psviewer diff --git a/app-office/lyx/lyx-1.3.5-r2.ebuild b/app-office/lyx/lyx-1.3.5-r2.ebuild index f02d04ea0c75..f4a54ba67097 100644 --- a/app-office/lyx/lyx-1.3.5-r2.ebuild +++ b/app-office/lyx/lyx-1.3.5-r2.ebuild @@ -1,6 +1,6 @@ -# Copyright 1999-2005 Gentoo Foundation +# 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.3.5-r2.ebuild,v 1.7 2005/08/28 01:26:00 cryos Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-office/lyx/lyx-1.3.5-r2.ebuild,v 1.8 2006/03/28 23:09:40 ehmsen Exp $ inherit kde-functions eutils libtool flag-o-matic @@ -21,7 +21,15 @@ IUSE="cjk cups debug nls qt" # these dependencies need looking at. # does lyx only need qt to compile but not run ? # I'll look into it -DEPEND="virtual/x11 +DEPEND="|| ( + virtual/x11 + ( + x11-libs/libX11 + x11-libs/libXt + x11-libs/libXpm + x11-proto/xproto + ) + ) virtual/tetex >=dev-lang/perl-5 nls? ( sys-devel/gettext ) @@ -31,6 +39,15 @@ DEPEND="virtual/x11 !cjk? ( =x11-libs/xforms-1* ) )" RDEPEND="${DEPEND} + || ( + virtual/x11 + ( + x11-libs/libXi + x11-libs/libXrandr + x11-libs/libXcursor + x11-libs/libXft + ) + ) virtual/ghostscript virtual/pdfviewer virtual/psviewer diff --git a/app-office/lyx/lyx-1.4.0.ebuild b/app-office/lyx/lyx-1.4.0.ebuild new file mode 100644 index 000000000000..a31b01ef2e1d --- /dev/null +++ b/app-office/lyx/lyx-1.4.0.ebuild @@ -0,0 +1,175 @@ +# 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 $ + +inherit kde-functions eutils libtool flag-o-matic + +DESCRIPTION="WYSIWYM frontend for LaTeX" +HOMEPAGE="http://www.lyx.org/" +SRC_URI="ftp://ftp.lyx.org/pub/lyx/stable/${P}.tar.bz2 + ftp://ftp.lyx.org/pub/lyx/contrib/latex-xft-fonts-0.1.tar.gz + http://www.math.tau.ac.il/~dekelts/lyx/files/hebrew.bind + http://www.math.tau.ac.il/~dekelts/lyx/files/preferences" + +# CJK +# cjk? ( qt? ( ftp://cellular.phys.pusan.ac.kr/CJK-LyX/qt/CJK-LyX-qt-${PV}-1.patch ) +# !qt? ( ftp://cellular.phys.pusan.ac.kr/CJK-LyX/xforms/CJK-LyX-xforms-${PV}-1.patch ) )" + +LICENSE="GPL-2" +SLOT="0" +KEYWORDS="~amd64 ~ppc ~x86" +IUSE="cjk cups debug gtk nls qt" + +RDEPEND="|| ( + virtual/x11 + ( + x11-libs/libXi + x11-libs/libXrandr + x11-libs/libXcursor + x11-libs/libXft + ) + ) + virtual/ghostscript + virtual/pdfviewer + virtual/psviewer + virtual/aspell-dict + dev-tex/latex2html + dev-tex/dvipost + media-gfx/imagemagick + cups? ( virtual/lpr ) + app-text/sgmltools-lite + app-text/noweb + dev-tex/chktex" + +# these dependencies need looking at. +# does lyx only need qt to compile but not run ? +# I'll look into it +DEPEND="${RDEPEND} + || ( + virtual/x11 + ( + x11-libs/libX11 + x11-libs/libXt + x11-libs/libXpm + x11-proto/xproto + ) + ) + virtual/tetex + >=dev-lang/perl-5 + nls? ( sys-devel/gettext ) + app-text/aiksaurus + dev-lang/python + >=sys-devel/autoconf-2.58 + qt? ( =x11-libs/qt-3* ) + !qt? ( =x11-libs/xforms-1* ) + gtk? ( + >=dev-cpp/gtkmm-2.4 + >=dev-cpp/libglademm-2.4 + )" + +src_unpack() { + if use cjk ; then + eerror + eerror "There is currently no CJK support for lyx-1.4.*" + eerror "If you like this to change you will either have to wait for lyx-1.5," + eerror "or help create new patches for lyx-1.4.*" + eerror "A good starting point is http://cellular.phys.pusan.ac.kr/cjk.html" + eerror + eerror "Until then, you will have to disable the cjk use flag for lyx or" + eerror "continue to use lyx-1.3.6" + die "lyx-1.4.* does not currently support CJK." + fi + 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 + elibtoolize || die "elibtoolize failed " +} + +src_compile() { + local myconf="" + + # Choose qt over gtk, since gtk is not feature complete + if use qt ; then + set-qtdir 3 + myconf="$myconf --with-frontend=qt --with-qt-dir=${QTDIR}" + elif use gtk ; then + ewarn + ewarn "GTK support for lyx is currently not feature complete." + ewarn "Don't report any bugs about missing or faulty features to gentoo," + ewarn "instead you have the option of turning GTK support off by removing" + ewarn "the gtk use flag or enable the gt use flag" + ewarn "(or help implement the missing features at lyx.org)" + ewarn + myconf="$myconf --with-frontend=gtk" + else + myconf="$myconf --with-frontend=xforms" + fi + + export WANT_AUTOCONF=2.5 + + local flags="${CXXFLAGS} $(test_flag -fno-stack-protector) $(test_flag -fno-stack-protector-all)" + unset CFLAGS + unset CXXFLAGS + econf \ + $(use_enable nls) \ + $(use_enable debug) \ + ${myconf} \ + --enable-optimization="${flags/-Os}" \ + || die "econf failed" + + # bug 57479 + emake || die "emake failed" + +} + +src_install() { + einstall || die "einstall failed" + + dodoc README* UPGRADING ChangeLog NEWS ANNOUNCE ABOUT-NLS ${DISTDIR}/preferences + + insinto /usr/share/lyx/bind + doins ${DISTDIR}/hebrew.bind + + domenu ${FILESDIR}/lyx.desktop + + # install the latex-xft fonts, which should fix + # the problems outlined in bug #15629 + # + cd ${WORKDIR}/latex-xft-fonts-0.1 + make DESTDIR=${D} install || die "Font installation failed" + + mkfontscale ${D}/usr/share/fonts/latex-xft-fonts + mkfontdir -e /usr/share/fonts/encodings \ + -e /usr/share/fonts/encodings/large \ + -e /usr/X11R6/$(get_libdir)/X11/fonts/encodings \ + ${D}/usr/share/fonts/latex-xft-fonts + HOME=/root fc-cache -f ${D}/usr/share/fonts/latex-xft-fonts + + # fix for bug 91108 + dodir /usr/share/texmf/tex/latex + cd ${D}/usr/share/texmf/tex/latex + ln -s ../../../lyx/tex lyx +} + +pkg_postinst() { + + # fix for bug 91108 + texhash + + 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." + einfo "" + + if ! useq qt ; then + einfo "" + einfo "If you have a multi-head setup not using xinerama you can only use lyx" + einfo "on the 2nd head if not using qt (maybe due to a xforms bug). See bug #40392." + einfo "" + fi +}