From: Matsuu Takuto Date: Sun, 18 Feb 2007 05:05:01 +0000 (+0000) Subject: Version bumped, bug #166930. X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=45638eb93056716252b8eb60623b46e3b4560977;p=gentoo.git Version bumped, bug #166930. Package-Manager: portage-2.1.2-r9 --- diff --git a/app-office/lyx/ChangeLog b/app-office/lyx/ChangeLog index a23277cc8c7b..8841a42ddcf0 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.90 2007/01/25 05:20:47 genone Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-office/lyx/ChangeLog,v 1.91 2007/02/18 05:05:01 matsuu Exp $ + +*lyx-1.4.4 (18 Feb 2007) + + 18 Feb 2007; MATSUU Takuto + +files/lyx-1.4.4-gentoo.patch, +lyx-1.4.4.ebuild: + Version bumped, bug #166930. 25 Jan 2007; Marius Mauch lyx-1.4.1-r1.ebuild, lyx-1.4.2.ebuild: diff --git a/app-office/lyx/Manifest b/app-office/lyx/Manifest index 8fbc19b02b93..ad37a2ff7f09 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 @@ -17,16 +14,22 @@ AUX lyx-1.4.2-gentoo.patch 1938 RMD160 bd5ea056819f736df809119d3bfa8538b23ddc9f MD5 5c98a7bcb042b42b535266ec3a042853 files/lyx-1.4.2-gentoo.patch 1938 RMD160 bd5ea056819f736df809119d3bfa8538b23ddc9f files/lyx-1.4.2-gentoo.patch 1938 SHA256 a32afb34add417c5c8a3cf6a98deb427c23f54d3da3569bac30db461f58b7c12 files/lyx-1.4.2-gentoo.patch 1938 +AUX lyx-1.4.4-gentoo.patch 1989 RMD160 4e52996232d9eda92df145f719b7ba891803b80b SHA1 2e6757f7d50f779d7ac65e0419073d7370508232 SHA256 4fbcaca88c2965821deaa70f61e75ff752ad34e50744d4e908f94bc29b85c553 +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.desktop 214 RMD160 7f9b377e1345565ade15c6a6b0b1e8664ee946b3 SHA1 6d6740caaef4e9b8480d866a2a3126762585134d SHA256 2e72d8bfc3c47536665e8539ebb1a55a8067914bf649a153c39874b67b2294f8 MD5 517a1baf1371255f801e9966c0c1e90b files/lyx.desktop 214 RMD160 7f9b377e1345565ade15c6a6b0b1e8664ee946b3 files/lyx.desktop 214 SHA256 2e72d8bfc3c47536665e8539ebb1a55a8067914bf649a153c39874b67b2294f8 files/lyx.desktop 214 DIST CJK-LyX-qt-1.4.1-2.patch 420933 RMD160 f25c197fe18aebbb0d93b64e0eabc6c5298e62eb SHA1 dcfa6184fd23c401614f76663def1f91e2f23909 SHA256 b853e308619f87bcd3f9e8e3243083ebede72f3938c9c68c4fbd1816974d5f5d DIST CJK-LyX-qt-1.4.2-1.patch 420797 RMD160 d2afc2cc07f4cf6ad434e244db9264d23fd07c52 SHA1 cd3336515c38290a4016097e8ea99bb0e5af0a39 SHA256 3e1993b9beeb8e4b109c3529469e944661cfae85bceb9e103550a0bcae58e8f0 +DIST CJK-LyX-qt-1.4.4-1.patch 688282 RMD160 22676ca69c1eaef170dfb0b8d3ff67914327b27b SHA1 6f6fa5b8665b1e3b8f72c272de13bb692e7d1eac SHA256 f08d97af009cc3265414092f50c06051a85e623c929d08eebacad44f99dc2b6e DIST hebrew.bind 45 RMD160 1621bd311aa053798815fd6c795406a505761531 SHA1 85c39df7cd0a3a4f95fe6101a23d44abb7641b2c SHA256 fc3b1e19560f7a22af1c6bca13c0c0d7786d6453e292201645abff54fd0b67dd DIST latex-xft-fonts-0.1.tar.gz 91730 RMD160 0a516eeba71ddc474e97f315e45e41028efa2e4d SHA1 50edf35ff08354bdf08517add33e16ee37f769e9 SHA256 78bceea8a055bc43bd0d246ae8e69f81d2f161ae4d8f1aaaa2dfff9e293ae964 DIST lyx-1.4.1.tar.bz2 6637018 RMD160 8569859a1badb3f5f1869b61210bd743bd274c5c SHA1 7c036311891692d90dcc3d70bcf9c3cdd0c2fcdf SHA256 290b55df4d2726581b9451289b4d73e53aab733fbd0f09e22385022e84424854 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 preferences 1669 RMD160 26986d7bcc48c4ecf60f84d95490148a5e171785 SHA1 3567ad4d4a2a041c295e40fef76ca53de6cb260d SHA256 41867ac67bc729d1057253bf305aced1ff666ee4d648dfefc99fd0c3c0501d43 EBUILD lyx-1.4.1-r1.ebuild 4710 RMD160 c8777ee555743c07a354f5f8c135d07e1177aa72 SHA1 17db13b65e4654ccad0151c39675cc67c994b773 SHA256 a3a605e3d48b88d1b43db6ec093f6214ebb0d9b50c020ba2c6a54da512dd0ba6 MD5 a3ae4ada458d94da5d40188d2bbd28eb lyx-1.4.1-r1.ebuild 4710 @@ -36,10 +39,14 @@ EBUILD lyx-1.4.2.ebuild 4519 RMD160 94da51bde32f6601d54113bac5f81bba78b4a59b SHA MD5 79fd99e9b09783a5dc88cf27b5060f9a lyx-1.4.2.ebuild 4519 RMD160 94da51bde32f6601d54113bac5f81bba78b4a59b lyx-1.4.2.ebuild 4519 SHA256 9887b985d6017c8b846eb9316ec93d0862f4d0f0cdcaa02f1da21d608bd0f636 lyx-1.4.2.ebuild 4519 -MISC ChangeLog 14664 RMD160 6eee7094585734125fab3c6747afa7f293bdf774 SHA1 f9192b579e50959816d89261f685cae60cfb19a0 SHA256 9a2be8b3a7dde9f631515daa9810bb9f492fa67ef2f71f2c55debe4ff229821f -MD5 b6b94e18549284586f8c96b0b1205af7 ChangeLog 14664 -RMD160 6eee7094585734125fab3c6747afa7f293bdf774 ChangeLog 14664 -SHA256 9a2be8b3a7dde9f631515daa9810bb9f492fa67ef2f71f2c55debe4ff229821f ChangeLog 14664 +EBUILD lyx-1.4.4.ebuild 4525 RMD160 99aad18d4af16547bededa34ca08c35d3dc10ec5 SHA1 c724bbe7068442e9cd479ce7549db3f75424ac57 SHA256 9730a9ffd57f93fac36914541f3f921e3eb18c30a701e73ee8b50af3f52072bb +MD5 91a1e853adaa743e149896e0306f5651 lyx-1.4.4.ebuild 4525 +RMD160 99aad18d4af16547bededa34ca08c35d3dc10ec5 lyx-1.4.4.ebuild 4525 +SHA256 9730a9ffd57f93fac36914541f3f921e3eb18c30a701e73ee8b50af3f52072bb lyx-1.4.4.ebuild 4525 +MISC ChangeLog 14823 RMD160 6c452b224fcd5e1d5126d04a240ab7583f78d1ea SHA1 272813f5ca4cc0515a3933427724d9550e1c5c5a SHA256 b84b0a0680b21e89a5151edd11b3ca16b9b797a4748c7b8842cf75223598fa76 +MD5 395347831db1ad8c344c4ef8166c2089 ChangeLog 14823 +RMD160 6c452b224fcd5e1d5126d04a240ab7583f78d1ea ChangeLog 14823 +SHA256 b84b0a0680b21e89a5151edd11b3ca16b9b797a4748c7b8842cf75223598fa76 ChangeLog 14823 MISC metadata.xml 181 RMD160 076b1da29f7ec9ff8c71af3d300db7934a6c16c5 SHA1 5effb8ab828993de4d80369d8148ec8505a723a0 SHA256 fee59649574618944ad5be45972b6d1a8e09b75e64d07a75fbdef4c335a88fca MD5 a43370bbb57cb967dbffe1a084475550 metadata.xml 181 RMD160 076b1da29f7ec9ff8c71af3d300db7934a6c16c5 metadata.xml 181 @@ -50,10 +57,6 @@ SHA256 a2db0f2c700e4b223f6834a61521ebf10f71c03cde53b2fdc68f0029d5818a2d files/di MD5 96f038440e3578a8bf0bc882295ed2d2 files/digest-lyx-1.4.2 1154 RMD160 6c4509f7b3e5b0efc604f998adc3c3551995aec2 files/digest-lyx-1.4.2 1154 SHA256 255851134c1b170edfc08e6c10174d3285e2eeee4ac5c8c977a99493611de92f files/digest-lyx-1.4.2 1154 ------BEGIN PGP SIGNATURE----- -Version: GnuPG v2.0.1 (GNU/Linux) - -iD8DBQFFuEDX6J2i8a8J4okRAkjPAJ9r/1o8U6UZPbJ4yjbwFTdLfopNGwCgvIFC -I28LBTznngta3CdQU/PN+BU= -=rLff ------END PGP SIGNATURE----- +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 diff --git a/app-office/lyx/files/digest-lyx-1.4.4 b/app-office/lyx/files/digest-lyx-1.4.4 new file mode 100644 index 000000000000..26fb9ba072c9 --- /dev/null +++ b/app-office/lyx/files/digest-lyx-1.4.4 @@ -0,0 +1,15 @@ +MD5 d31a97c8e86270f9ed386de9ec0fec23 CJK-LyX-qt-1.4.4-1.patch 688282 +RMD160 22676ca69c1eaef170dfb0b8d3ff67914327b27b CJK-LyX-qt-1.4.4-1.patch 688282 +SHA256 f08d97af009cc3265414092f50c06051a85e623c929d08eebacad44f99dc2b6e CJK-LyX-qt-1.4.4-1.patch 688282 +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 2e778eba4191c5f9fb2cafa7901c322c lyx-1.4.4.tar.bz2 7859197 +RMD160 31f709db8e4785cb378f261355a7b2551dd38253 lyx-1.4.4.tar.bz2 7859197 +SHA256 5f48996c4217093d5cfaa9566cc4349cbfeb65ac12cd1b996ac6a5b5e4480307 lyx-1.4.4.tar.bz2 7859197 +MD5 a0e3948595801a90d32d8b712596a5fe preferences 1669 +RMD160 26986d7bcc48c4ecf60f84d95490148a5e171785 preferences 1669 +SHA256 41867ac67bc729d1057253bf305aced1ff666ee4d648dfefc99fd0c3c0501d43 preferences 1669 diff --git a/app-office/lyx/files/lyx-1.4.4-gentoo.patch b/app-office/lyx/files/lyx-1.4.4-gentoo.patch new file mode 100644 index 000000000000..b790099af849 --- /dev/null +++ b/app-office/lyx/files/lyx-1.4.4-gentoo.patch @@ -0,0 +1,42 @@ +diff -Naur lyx-1.4.4.orig/lib/configure.py lyx-1.4.4/lib/configure.py +--- lyx-1.4.4.orig/lib/configure.py 2007-02-14 08:20:29.000000000 +0900 ++++ lyx-1.4.4/lib/configure.py 2007-02-18 01:16:51.000000000 +0900 +@@ -227,7 +227,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: +@@ -364,7 +364,7 @@ + checkProg('a PS to PDF converter', ['ps2pdf13 $$i $$o'], + rc_entry = [ r'\converter ps pdf "%%" ""' ]) + # +- 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'], +@@ -613,7 +613,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 -Naur lyx-1.4.4.orig/lib/lyxrc.example lyx-1.4.4/lib/lyxrc.example +--- lyx-1.4.4.orig/lib/lyxrc.example 2005-09-08 18:20:16.000000000 +0900 ++++ lyx-1.4.4/lib/lyxrc.example 2007-02-18 01:16:51.000000000 +0900 +@@ -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/lyx-1.4.4.ebuild b/app-office/lyx/lyx-1.4.4.ebuild new file mode 100644 index 000000000000..d2b54103bb60 --- /dev/null +++ b/app-office/lyx/lyx-1.4.4.ebuild @@ -0,0 +1,178 @@ +# 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.4.4.ebuild,v 1.1 2007/02/18 05:05:01 matsuu Exp $ + +inherit kde-functions fdo-mime eutils libtool flag-o-matic font + +FONT_PN="latex-xft-fonts" +FONT_S="${WORKDIR}/${FONT_PN}" +CJK_PATCH="CJK-LyX-qt-${PV}-1.patch" +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 + qt3? ( cjk? ( ftp://cellular.phys.pusan.ac.kr/CJK-LyX/qt/${CJK_PATCH} ) )" + +LICENSE="GPL-2" +SLOT="0" +KEYWORDS="~amd64 ~ppc ~ppc64 ~sparc ~x86" +IUSE="cjk cups debug gtk nls qt3 gnome" + +RDEPEND="|| ( + virtual/x11 + ( + x11-libs/libXi + x11-libs/libXrandr + x11-libs/libXcursor + x11-libs/libXft + ) + ) + virtual/ghostscript + 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-2.2 + >=sys-devel/autoconf-2.58 + qt3? ( =x11-libs/qt-3* ) + !qt3? ( + gtk? ( + >=dev-cpp/gtkmm-2.4 + >=dev-cpp/libglademm-2.4 + ) + !gtk? ( + =x11-libs/xforms-1* + ) + )" + +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}" + # bug #125309 + epatch "${FILESDIR}"/${P}-gentoo.patch || die + if use qt3 && use cjk ; then + elog + elog "CJK-LyX now only supports the qt frontend" + elog "the xforms frontend has been removed." + elog + epatch "${DISTDIR}"/${CJK_PATCH} || die + fi + elibtoolize || die "elibtoolize failed " +} + +src_compile() { + local myconf="" + + # Choose qt over gtk, since gtk is not feature complete + if use qt3 ; 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 qt3 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 + + append-flags "$(test-flags -fno-stack-protector -fno-stack-protector-all)" + replace-flags "-Os" "-O2" + econf \ + $(use_enable nls) \ + $(use_enable debug) \ + --with-aspell \ + ${myconf} \ + || die "econf failed" + + # bug 57479 + emake || die "emake failed" + +} + +src_install() { + emake DESTDIR="${D}" install || die "emake install 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 + emake DESTDIR="${D}" install || die "Font installation failed" + + font_src_install + + # 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 + dosym ../../../lyx/tex /usr/share/texmf/tex/latex/lyx +} + +pkg_postinst() { + font_pkg_postinst + + # fix for bug 91108 + texhash + + # bug #102310 + if use gnome ; then + fdo-mime_desktop_database_update + fi + + elog + elog "How to use Hebrew in LyX:" + elog "1. emerge dev-tex/ivritex." + elog "2. gunzip /usr/share/doc/${PF}/preferences.gz into ~/.lyx/preferences" + elog "or, read http://www.math.tau.ac.il/~dekelts/lyx/instructions2.html" + elog "for instructions on using lyx's own preferences dialog to equal effect." + elog "3. use lyx's qt interface (compile with USE=qt3) for maximum effect." + elog + + if ! use qt3 ; then + elog + elog "If you have a multi-head setup not using xinerama you can only use lyx" + elog "on the 2nd head if not using qt (maybe due to a xforms bug). See bug #40392." + elog + fi +}