From 2ddd1a7ee414a34ed1115e9a6f857c5987a8ab80 Mon Sep 17 00:00:00 2001 From: Justin Lecher Date: Sun, 8 Aug 2010 18:13:41 +0000 Subject: Do not byte-compile scripts, 247683, Fix code for PYTHON ABI, 311677 Package-Manager: portage-2.2_rc67/cvs/Linux x86_64 --- app-office/lyx/ChangeLog | 8 +- app-office/lyx/Manifest | 14 ++- app-office/lyx/files/1.6.7-python.patch | 26 +++++ app-office/lyx/lyx-1.6.7-r1.ebuild | 167 ++++++++++++++++++++++++++++++++ 4 files changed, 213 insertions(+), 2 deletions(-) create mode 100644 app-office/lyx/files/1.6.7-python.patch create mode 100644 app-office/lyx/lyx-1.6.7-r1.ebuild (limited to 'app-office') diff --git a/app-office/lyx/ChangeLog b/app-office/lyx/ChangeLog index f99340f06041..75d1025edab1 100644 --- a/app-office/lyx/ChangeLog +++ b/app-office/lyx/ChangeLog @@ -1,6 +1,12 @@ # ChangeLog for app-office/lyx # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/app-office/lyx/ChangeLog,v 1.206 2010/07/24 15:55:48 armin76 Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-office/lyx/ChangeLog,v 1.207 2010/08/08 18:13:41 jlec Exp $ + +*lyx-1.6.7-r1 (08 Aug 2010) + + 08 Aug 2010; Justin Lecher lyx-1.6.7.ebuild, + +lyx-1.6.7-r1.ebuild: + Do not byte-compile scripts, 247683, Fix code for PYTHON ABI, 311677 24 Jul 2010; Raúl Porcel lyx-1.6.6.1.ebuild: ia64/sparc stable wrt #321447 diff --git a/app-office/lyx/Manifest b/app-office/lyx/Manifest index 54f34136e2b9..c472e182ee65 100644 --- a/app-office/lyx/Manifest +++ b/app-office/lyx/Manifest @@ -1,3 +1,7 @@ +-----BEGIN PGP SIGNED MESSAGE----- +Hash: SHA1 + +AUX 1.6.7-python.patch 906 RMD160 74a2f14445d6b011fe04d06f3bd6710d36ab6351 SHA1 a9bc180553105b61767a82280e211a2c187cfbd4 SHA256 ad4ebb8d3837536eea869e15b3759840a1153d64d74b744e956ce9bdf5e5651d AUX lyx-1.5.0-gentoo.patch 1298 RMD160 69b7ce68234e7f5c2fee708944267f1974aa10d0 SHA1 16c3e6f846c55c3eb5fd9d7da1247a3429efa7a4 SHA256 36be1ea2577cce270319a7a3b4bed92e5925c0e974edda8729bda2179ac8ffe2 AUX lyx.desktop 215 RMD160 13192f0f4e84e870565a3daff7d46c56954ed0fe SHA1 f72f3ff17a3a1b84cbb0aaf12c9e75387879a420 SHA256 b0ffd201e0a2e0cb39a52aadb9921e86fbb31c8d3cac04526371d6606246898c DIST hebrew.bind 45 RMD160 1621bd311aa053798815fd6c795406a505761531 SHA1 85c39df7cd0a3a4f95fe6101a23d44abb7641b2c SHA256 fc3b1e19560f7a22af1c6bca13c0c0d7786d6453e292201645abff54fd0b67dd @@ -12,6 +16,14 @@ EBUILD lyx-1.5.7.ebuild 3371 RMD160 9e7613bae1cba53762d7cebf2b338988aff5a843 SHA EBUILD lyx-1.6.5.ebuild 3965 RMD160 921a05214d49b77bc1d09d7fe3560c0fcfef8a4e SHA1 fb43d412f78d44390e8ac492f0a2b542387901fb SHA256 b3d33b7858900e6119aea3d9e446ac1f84e81f3682600527d3a540a3a70030e7 EBUILD lyx-1.6.6.1.ebuild 3834 RMD160 92ff857e0c2d0a777fea622eadf4af2e17c24573 SHA1 907dbe2934ca67fa48b3c37355f4d6e5b3d00d4d SHA256 e0ee3401de0675907e8d4e8a3f716b28be5684f54f183ca02dba8a4ed6e4665d EBUILD lyx-1.6.6.ebuild 4005 RMD160 ac81ec1634b3ac146d9d90a377351053bd6b0e02 SHA1 655e125bb5e0e9a1dbba9889f4148a9e4ea7e661 SHA256 4400ec26051add058753831ac7a00eeadc59c1098a4940601bb46096cd8cb5d7 +EBUILD lyx-1.6.7-r1.ebuild 4112 RMD160 60c7238ba16d3b28cb3fc84aa6cc987cc5377a91 SHA1 a620810ba40f6df18caab88e5d163c0ff8c22ed5 SHA256 f040826dcc5f26e9fb111c75ec7340115ac45e4904b9c9729a55c50071e92851 EBUILD lyx-1.6.7.ebuild 3840 RMD160 96451fd84027e3647d8c34d07644c013adef7d90 SHA1 75916e2d2daea72111bfd67f8c579d36673d8214 SHA256 e633aba23b3d4af4ff7048eff2d98e6168d41e8aacda6e605af4c1de79f68bb4 -MISC ChangeLog 28829 RMD160 4506cefa5b11826474a07747cda7a8a9c0f6f59c SHA1 bc75e0989e4c65076681ade62dc489530f36e8be SHA256 5215071a8087c8fa88004d29c44e7119acbf4e3714f4c2f3f4d8be3ff126423c +MISC ChangeLog 29016 RMD160 49155239ec51af879c9c6237e48f4100d748daec SHA1 444c97f6057c1c65958f6587c36db901a53a553f SHA256 08c14d07799537c6780b6ad4c8f8ac7db6b47afa87c40fb29ecadb321385b9ef MISC metadata.xml 942 RMD160 148a66f848d13821bf7c90fcd9204dbca57dc6c8 SHA1 e66698d5b67b9b0ea61c3a0009dba120ef00b651 SHA256 1fe516a4fd8772fab1f9399003f5ac82d7e58a37e24e85bca3adadb2dc76899d +-----BEGIN PGP SIGNATURE----- +Version: GnuPG v2.0.15 (GNU/Linux) + +iEYEARECAAYFAkxe89sACgkQgAnW8HDreRaKDACcD+bqMkFJta5vZDPAZYc8SmE9 +pTAAmwR0TaeRPicKxWb32e6b7WLCr5m0 +=3vmE +-----END PGP SIGNATURE----- diff --git a/app-office/lyx/files/1.6.7-python.patch b/app-office/lyx/files/1.6.7-python.patch new file mode 100644 index 000000000000..3717cc80185e --- /dev/null +++ b/app-office/lyx/files/1.6.7-python.patch @@ -0,0 +1,26 @@ +diff --git a/src/graphics/GraphicsConverter.cpp b/src/graphics/GraphicsConverter.cpp +index 97c4f68..8f05e62 100644 +--- a/src/graphics/GraphicsConverter.cpp ++++ b/src/graphics/GraphicsConverter.cpp +@@ -262,7 +262,7 @@ static void build_script(FileName const & from_file, + LYXERR(Debug::GRAPHICS, "build_script ... "); + typedef Graph::EdgePath EdgePath; + +- script << "#!/usr/bin/env python\n" ++ script << "#!/usr/bin/env python2\n" + "# -*- coding: utf-8 -*-\n" + "import os, shutil, sys\n\n" + "def unlinkNoThrow(file):\n" +diff --git a/src/support/os.cpp b/src/support/os.cpp +index 6984d2c..e6f17ff 100644 +--- a/src/support/os.cpp ++++ b/src/support/os.cpp +@@ -26,7 +26,7 @@ string const python() + { + // Use the -tt switch so that mixed tab/whitespace indentation is + // an error +- static string const command("python -tt"); ++ static string const command("python2 -tt"); + return command; + } + diff --git a/app-office/lyx/lyx-1.6.7-r1.ebuild b/app-office/lyx/lyx-1.6.7-r1.ebuild new file mode 100644 index 000000000000..cd6a817d0f2e --- /dev/null +++ b/app-office/lyx/lyx-1.6.7-r1.ebuild @@ -0,0 +1,167 @@ +# Copyright 1999-2010 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: /var/cvsroot/gentoo-x86/app-office/lyx/lyx-1.6.7-r1.ebuild,v 1.1 2010/08/08 18:13:41 jlec Exp $ + +EAPI=2 + +PYTHON_DEPEND="2" + +inherit qt4 eutils flag-o-matic font python toolchain-funcs + +MY_P="${P/_}" + +S="${WORKDIR}/${MY_P}" +FONT_S="${S}/lib/fonts" +FONT_SUFFIX="ttf" +DESCRIPTION="WYSIWYM frontend for LaTeX, DocBook, etc." +HOMEPAGE="http://www.lyx.org/" +SRC_URI="ftp://ftp.devel.lyx.org/pub/lyx/stable/${P}.tar.bz2" +#SRC_URI="http://www.lyx.org/~jamatos/lyx-1.6/${MY_P}.tar.bz2 #for betas +#SRC_URI="ftp://ftp.lyx.org/pub/lyx/stable/${P}.tar.bz2" +#SRC_URI="ftp://ftp.devel.lyx.org/pub/lyx/pre/${MY_P}.tar.bz2" + +LICENSE="GPL-2" +SLOT="0" +KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86" +IUSE="cups debug nls latex monolithic-build html rtf dot docbook dia subversion rcs svg" + +LANGS="ar ca cs de el en es eu fi fr gl he hu id it ja nb nn pl pt ro ru sk tr uk zh_CN zh_TW" +for X in ${LANGS}; do + IUSE="${IUSE} linguas_${X}" +done + +COMMONDEPEND="x11-libs/qt-gui:4 + x11-libs/qt-core:4 + x11-libs/libXrandr + x11-libs/libXcursor + x11-libs/libXrender + x11-libs/libXfixes + x11-libs/libXext + x11-libs/libSM + x11-libs/libICE + x11-libs/libX11 + x11-libs/libXau + x11-libs/libXdmcp + dev-libs/libxml2 + app-text/aiksaurus + virtual/aspell-dict + media-libs/fontconfig + media-libs/freetype + >=dev-libs/boost-1.34" + +RDEPEND="${COMMONDEPEND} + || ( dev-texlive/texlive-fontsextra app-text/ptex ) + || ( media-gfx/imagemagick media-gfx/graphicsmagick ) + cups? ( virtual/lpr ) + latex? ( + virtual/latex-base + app-text/ghostscript-gpl + app-text/noweb + dev-tex/dvipost + dev-tex/chktex + app-text/ps2eps + dev-texlive/texlive-latexextra + dev-texlive/texlive-pictures + dev-texlive/texlive-science + || ( + dev-tex/latex2html + dev-tex/tth + dev-tex/hevea + dev-tex/tex4ht + ) + ) + html? ( dev-tex/html2latex ) + rtf? ( + dev-tex/latex2rtf + app-text/unrtf + dev-tex/html2latex + ) + linguas_he? ( dev-tex/culmus-latex ) + docbook? ( app-text/sgmltools-lite ) + dot? ( media-gfx/graphviz ) + dia? ( app-office/dia ) + subversion? ( dev-vcs/subversion ) + rcs? ( dev-vcs/rcs ) + svg? ( || ( gnome-base/librsvg media-gfx/inkscape ) )" + +DEPEND="${COMMONDEPEND} + x11-proto/xproto + dev-util/pkgconfig + nls? ( sys-devel/gettext )" + + +pkg_setup() { + python_set_active_version 2 + font_pkg_setup +} + +src_prepare() { + epatch "${FILESDIR}"/${PV}-python.patch + echo "#!/bin/sh" > config/py-compile + sed "s:python -tt:$(PYTHON) -tt:g" -i lib/configure.py || die +} + +src_configure() { + tc-export CXX + #bug 221921 + export VARTEXFONTS=${T}/fonts + + econf \ + $(use_enable nls) \ + $(use_enable debug) \ + $(use_enable monolithic-build) \ + --with-aspell --without-included-boost --disable-stdlib-debug +} + +src_install() { + emake DESTDIR="${D}" install || die "emake install failed" + + dodoc ANNOUNCE NEWS README RELEASE-NOTES UPGRADING "${FONT_S}"/*.txt || die + + if use linguas_he ; then + echo "\bind_file cua" > "${T}"/hebrew.bind + echo "\bind \"F12\" \"language hebrew\"" >> "${T}"/hebrew.bind + + insinto /usr/share/lyx/bind + doins "${T}"/hebrew.bind || die + fi + + doicon ${PN} "$S/development/Win32/packaging/icons/lyx_32x32.png" + make_desktop_entry ${PN} "LyX" "/usr/share/pixmaps/lyx_32x32.png" "Office" + + # fix for bug 91108 + if use latex ; then + dosym ../../../lyx/tex /usr/share/texmf/tex/latex/lyx || die + fi + + # fonts needed for proper math display, see also bug #15629 + font_src_install + + python_convert_shebangs -r 2 "${D}"/usr/share/${PN} +} + +pkg_postinst() { + font_pkg_postinst + + # fix for bug 91108 + if use latex ; then + texhash + fi + + # instructions for RTL support. See also bug 168331. + if use linguas_he || use linguas_ar; then + elog + elog "Enabling RTL support in LyX:" + elog "If you intend to use a RTL language (such as Hebrew or Arabic)" + elog "You must enable RTL support in LyX. To do so start LyX and go to" + elog "Tools->Preferences->Language settings->Language" + elog "and make sure the \"Right-to-left language support\" is checked" + elog + fi +} + +pkg_postrm() { + if use latex ; then + texhash + fi +} -- cgit v1.2.3-65-gdbad