From ce5df77004ae21bbda90a2d68217e9ba072c112d Mon Sep 17 00:00:00 2001 From: Pavel Sanda Date: Sun, 29 Nov 2015 18:27:16 -0800 Subject: Bump lyx alpha2 --- app-office/lyx/Manifest | 5 +- app-office/lyx/files/2.1-python.patch | 29 ++++++ app-office/lyx/lyx-2.2.0_alpha1.ebuild | 179 --------------------------------- app-office/lyx/lyx-2.2.0_alpha2.ebuild | 179 +++++++++++++++++++++++++++++++++ 4 files changed, 211 insertions(+), 181 deletions(-) create mode 100644 app-office/lyx/files/2.1-python.patch delete mode 100644 app-office/lyx/lyx-2.2.0_alpha1.ebuild create mode 100644 app-office/lyx/lyx-2.2.0_alpha2.ebuild diff --git a/app-office/lyx/Manifest b/app-office/lyx/Manifest index 18b3f06..44de58d 100644 --- a/app-office/lyx/Manifest +++ b/app-office/lyx/Manifest @@ -2,6 +2,7 @@ AUX 1.6.7-python.patch 906 SHA256 ad4ebb8d3837536eea869e15b3759840a1153d64d74b74 AUX 2.0-python.patch 1036 SHA256 954f96dab553024fb128924c7ba3d70a91946f6909d203ee0902d6ec8740ded8 SHA512 81bf78b837d9a4621a230d3d1d4e45c306598b4047227b88e83054268571a496a71babdfe5152b47370a3dbf91767aed366984555225c3900bf6d55dc0e43d31 WHIRLPOOL e47a40db707b68c923bce136c72742242a974fe17c8a167fa0ca6f428bf2937feba3122737417e0902f320c0a8df1d4da72702eea4e4d4fe699b5176bbe5ed19 AUX 2.0.3-python.patch 1019 SHA256 a8f93b41bf55f823caec23487aee432bad6e7b55187c6f115decdda855380010 SHA512 039d3521bc1d646669fcccb43d04354dfe7ed32477a338c27a576c77e5ffcf15fcf0419c14df43aa37d727431cce6ab0327aa04199d09ce1749051ab12686df8 WHIRLPOOL 74ad7056a5e74a95b7150fd14d2aac410c367a1bf98d7d8e2d68b5102059951e8ec40a877b534effc9b3fea04a38acdbadc2d1ce819272cb7d5e4d63bc172404 AUX 2.0.patches 9724 SHA256 9bf26943ce4f27b4cdbfa924f3097aa1bfba6e23a10d8db494148066e9bf8a39 SHA512 99bdb8204d2f2d40adbb6280e8273b6d974ad6db5575388bedb6ed913a2afa17f693c6f35d600cc7d35d637f3426dcc485237be3548f47055588a5c199fb66db WHIRLPOOL b5c1555147329388d4bb1911712a38256c518a4d17cadba3911d125313a607e9eabd5b2f81c4831b6b9b8ae38c05ce0d9c37305b31286a0773fa3288e7c37a08 -DIST lyx-2.2.0alpha1.tar.xz 14732764 SHA256 23709001a3d9ee1b21975758d2cf36b965112232577d50cc8cfaf7dc26c63328 SHA512 1560686c0b552e43a57a62ed123ac80cba84bf9bd0fd253ccebadbcc136584235546e70f111bc2e5a223db31f2b3fcbcf01b9dcc42933c41f4c8961f7e32f660 WHIRLPOOL 08de3a71570f5daeed037ed85d85b290ee1454fc156470f2865512bc63c5bafe34c7255e8a0d6df1d501ac1b935cf0efed696746c0b2ff2f1d4a2a1297644bc0 +AUX 2.1-python.patch 1019 SHA256 a8f93b41bf55f823caec23487aee432bad6e7b55187c6f115decdda855380010 SHA512 039d3521bc1d646669fcccb43d04354dfe7ed32477a338c27a576c77e5ffcf15fcf0419c14df43aa37d727431cce6ab0327aa04199d09ce1749051ab12686df8 WHIRLPOOL 74ad7056a5e74a95b7150fd14d2aac410c367a1bf98d7d8e2d68b5102059951e8ec40a877b534effc9b3fea04a38acdbadc2d1ce819272cb7d5e4d63bc172404 +DIST lyx-2.2.0alpha2.tar.xz 14713760 SHA256 91c6baf19b7bb6b79bb88a36c299e02774a86c2ae85ad02b7fd2195ac3564793 SHA512 5cfd2f35b47402070890dd5722bc8833b8e7acc884e92cf278a65b557c9a2683fa6aa3b1db0d75727850f62c28c1b1f7112fb9c566f3ef7384a408a430eb777b WHIRLPOOL f88e61b9be8f53aa68a7a0a7fef67aac15af6cb0e5436a5f60c0da5e2e9bd17db1309e70198c4d0a80a7d15fbc1424dd91dbb34e26eec623dcebffe1d9d95e51 EBUILD lyx-2.0.9999.ebuild 4404 SHA256 787050b72267184788961c5c1eac32ebe264b07fca60d9b8c898cc8a2f169e61 SHA512 4b27205b213f4323216ca3d699dba400d2344bf1900d2394828532bc0abd6531abaf14b2d8de3100566f4e133a949e2ac6c046f166dad39fa17d2e4e0966e6a7 WHIRLPOOL ba3bc068f9b3370f7dbe3c5795713e1a5fc2d2d9956dc778cae4417f7a2783b55de5531414329e765fd9dc08429843f535ea07d6288c2acb703b6538511d0143 -EBUILD lyx-2.2.0_alpha1.ebuild 4293 SHA256 035b3f76010b4aebaff86e857edb3ea2900c5cfd0347a1c08029945e43a9ce8d SHA512 6731f90231278a2b7ccd0b00fd12274f4ee659c3be09813e7c28eb8d049d1ccdb2323d1ec45ac61b650caaf05bea4edd68fcd0c364ce201d6e0c680cf0102f04 WHIRLPOOL 39e6bdc97293ca6dea87067d10ff857e82380143cacf5241246e9c2ea1bf2b8c6c8484bfd1f330855bc572ac13c782eb0fa4ccaef2be7e1c9cc392259844db19 +EBUILD lyx-2.2.0_alpha2.ebuild 4293 SHA256 035b3f76010b4aebaff86e857edb3ea2900c5cfd0347a1c08029945e43a9ce8d SHA512 6731f90231278a2b7ccd0b00fd12274f4ee659c3be09813e7c28eb8d049d1ccdb2323d1ec45ac61b650caaf05bea4edd68fcd0c364ce201d6e0c680cf0102f04 WHIRLPOOL 39e6bdc97293ca6dea87067d10ff857e82380143cacf5241246e9c2ea1bf2b8c6c8484bfd1f330855bc572ac13c782eb0fa4ccaef2be7e1c9cc392259844db19 diff --git a/app-office/lyx/files/2.1-python.patch b/app-office/lyx/files/2.1-python.patch new file mode 100644 index 0000000..5fb2165 --- /dev/null +++ b/app-office/lyx/files/2.1-python.patch @@ -0,0 +1,29 @@ +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 8f60c68..2f1cb91 100644 +--- a/src/support/os.cpp ++++ b/src/support/os.cpp +@@ -63,9 +63,9 @@ int timeout_min() + string const python(bool reset) + { + // Check whether the first python in PATH is the right one. +- static string command = python2("python -tt"); ++ static string command = python2("python2 -tt"); + if (reset) { +- command = python2("python -tt"); ++ command = python2("python2 -tt"); + } + + if (command.empty()) { diff --git a/app-office/lyx/lyx-2.2.0_alpha1.ebuild b/app-office/lyx/lyx-2.2.0_alpha1.ebuild deleted file mode 100644 index 8d2f1aa..0000000 --- a/app-office/lyx/lyx-2.2.0_alpha1.ebuild +++ /dev/null @@ -1,179 +0,0 @@ -# Copyright 1999-2015 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Id$ - -EAPI=5 - -PYTHON_COMPAT=( python2_7 ) -inherit gnome2-utils eutils fdo-mime flag-o-matic font python-single-r1 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.lyx.org/pub/lyx/stable/2.1.x/${MY_P}.tar.xz - ftp://ftp.lyx.org/pub/lyx/devel/lyx-2.2/${MY_P}/${MY_P}.tar.xz" - -LICENSE="GPL-2" -SLOT="0" -KEYWORDS="~alpha amd64 hppa ia64 ppc ppc64 sparc x86 ~x64-macos ~x86-macos" -IUSE="cups debug nls +latex monolithic-build html rtf dot docbook dia subversion rcs svg gnumeric +hunspell aspell enchant" - -LANGS="ar ca cs de da el en es eu fi fr gl he hu ia id it ja nb nn pl pt ro ru sk sr sv tr uk zh_CN zh_TW" - -for X in ${LANGS}; do - IUSE="${IUSE} linguas_${X}" -done - -REQUIRED_USE="${PYTHON_REQUIRED_USE}" - -DOCS=( ANNOUNCE NEWS README RELEASE-NOTES UPGRADING ) - -COMMONDEPEND="dev-qt/qtgui:4 - dev-qt/qtcore:4 - >=dev-libs/boost-1.34:= - ${PYTHON_DEPS}" - -RDEPEND="${COMMONDEPEND} - dev-texlive/texlive-fontsextra - || ( media-gfx/imagemagick[png] media-gfx/graphicsmagick[png] ) - cups? ( net-print/cups ) - latex? ( - app-text/texlive - app-text/ghostscript-gpl - app-text/noweb - app-text/dvipng - dev-tex/dvipost - dev-tex/chktex - app-text/ps2eps - dev-texlive/texlive-latexextra - dev-texlive/texlive-pictures - dev-texlive/texlive-science - dev-texlive/texlive-genericextra - dev-texlive/texlive-fontsrecommended - || ( - dev-tex/latex2html - dev-tex/tth - dev-tex/hevea - dev-tex/tex4ht[java] - ) - ) - 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? ( || ( media-gfx/imagemagick[svg] media-gfx/graphicsmagick[svg] ) - || ( gnome-base/librsvg media-gfx/inkscape ) - ) - gnumeric? ( app-office/gnumeric ) - hunspell? ( app-text/hunspell ) - aspell? ( app-text/aspell ) - enchant? ( app-text/enchant )" - -DEPEND="${COMMONDEPEND} - virtual/pkgconfig - nls? ( sys-devel/gettext )" - -pkg_setup() { - python-single-r1_pkg_setup - font_pkg_setup -} - -src_prepare() { - epatch "${FILESDIR}"/2.1-python.patch - sed "s:python -tt:${EPYTHON} -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) \ - $(use_with hunspell) \ - $(use_with aspell) \ - $(use_with enchant) \ - --without-included-boost \ - --disable-stdlib-debug \ - --with-packaging=posix -} - -src_install() { - default - - 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 - - newicon -s 32 "${S}/development/Win32/packaging/icons/lyx_32x32.png" ${PN}.png - doicon -s 48 "${S}/lib/images/lyx.png" - doicon -s scalable "${S}/lib/images/lyx.svg" - - # fix for bug 91108 - if use latex ; then - dosym ../../../lyx/tex /usr/share/texmf-site/tex/latex/lyx || die - fi - - # fonts needed for proper math display, see also bug #15629 - font_src_install - - python_fix_shebang "${ED}"/usr/share/${PN} - - if use hunspell ; then - dosym /usr/share/myspell /usr/share/lyx/dicts - dosym /usr/share/myspell /usr/share/lyx/thes - fi -} - -pkg_preinst() { - gnome2_icon_savelist -} - -pkg_postinst() { - font_pkg_postinst - gnome2_icon_cache_update - fdo-mime_desktop_database_update - - # 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() { - gnome2_icon_cache_update - fdo-mime_desktop_database_update - - if use latex ; then - texhash - fi -} diff --git a/app-office/lyx/lyx-2.2.0_alpha2.ebuild b/app-office/lyx/lyx-2.2.0_alpha2.ebuild new file mode 100644 index 0000000..8d2f1aa --- /dev/null +++ b/app-office/lyx/lyx-2.2.0_alpha2.ebuild @@ -0,0 +1,179 @@ +# Copyright 1999-2015 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Id$ + +EAPI=5 + +PYTHON_COMPAT=( python2_7 ) +inherit gnome2-utils eutils fdo-mime flag-o-matic font python-single-r1 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.lyx.org/pub/lyx/stable/2.1.x/${MY_P}.tar.xz + ftp://ftp.lyx.org/pub/lyx/devel/lyx-2.2/${MY_P}/${MY_P}.tar.xz" + +LICENSE="GPL-2" +SLOT="0" +KEYWORDS="~alpha amd64 hppa ia64 ppc ppc64 sparc x86 ~x64-macos ~x86-macos" +IUSE="cups debug nls +latex monolithic-build html rtf dot docbook dia subversion rcs svg gnumeric +hunspell aspell enchant" + +LANGS="ar ca cs de da el en es eu fi fr gl he hu ia id it ja nb nn pl pt ro ru sk sr sv tr uk zh_CN zh_TW" + +for X in ${LANGS}; do + IUSE="${IUSE} linguas_${X}" +done + +REQUIRED_USE="${PYTHON_REQUIRED_USE}" + +DOCS=( ANNOUNCE NEWS README RELEASE-NOTES UPGRADING ) + +COMMONDEPEND="dev-qt/qtgui:4 + dev-qt/qtcore:4 + >=dev-libs/boost-1.34:= + ${PYTHON_DEPS}" + +RDEPEND="${COMMONDEPEND} + dev-texlive/texlive-fontsextra + || ( media-gfx/imagemagick[png] media-gfx/graphicsmagick[png] ) + cups? ( net-print/cups ) + latex? ( + app-text/texlive + app-text/ghostscript-gpl + app-text/noweb + app-text/dvipng + dev-tex/dvipost + dev-tex/chktex + app-text/ps2eps + dev-texlive/texlive-latexextra + dev-texlive/texlive-pictures + dev-texlive/texlive-science + dev-texlive/texlive-genericextra + dev-texlive/texlive-fontsrecommended + || ( + dev-tex/latex2html + dev-tex/tth + dev-tex/hevea + dev-tex/tex4ht[java] + ) + ) + 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? ( || ( media-gfx/imagemagick[svg] media-gfx/graphicsmagick[svg] ) + || ( gnome-base/librsvg media-gfx/inkscape ) + ) + gnumeric? ( app-office/gnumeric ) + hunspell? ( app-text/hunspell ) + aspell? ( app-text/aspell ) + enchant? ( app-text/enchant )" + +DEPEND="${COMMONDEPEND} + virtual/pkgconfig + nls? ( sys-devel/gettext )" + +pkg_setup() { + python-single-r1_pkg_setup + font_pkg_setup +} + +src_prepare() { + epatch "${FILESDIR}"/2.1-python.patch + sed "s:python -tt:${EPYTHON} -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) \ + $(use_with hunspell) \ + $(use_with aspell) \ + $(use_with enchant) \ + --without-included-boost \ + --disable-stdlib-debug \ + --with-packaging=posix +} + +src_install() { + default + + 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 + + newicon -s 32 "${S}/development/Win32/packaging/icons/lyx_32x32.png" ${PN}.png + doicon -s 48 "${S}/lib/images/lyx.png" + doicon -s scalable "${S}/lib/images/lyx.svg" + + # fix for bug 91108 + if use latex ; then + dosym ../../../lyx/tex /usr/share/texmf-site/tex/latex/lyx || die + fi + + # fonts needed for proper math display, see also bug #15629 + font_src_install + + python_fix_shebang "${ED}"/usr/share/${PN} + + if use hunspell ; then + dosym /usr/share/myspell /usr/share/lyx/dicts + dosym /usr/share/myspell /usr/share/lyx/thes + fi +} + +pkg_preinst() { + gnome2_icon_savelist +} + +pkg_postinst() { + font_pkg_postinst + gnome2_icon_cache_update + fdo-mime_desktop_database_update + + # 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() { + gnome2_icon_cache_update + fdo-mime_desktop_database_update + + if use latex ; then + texhash + fi +} -- cgit v1.2.3-65-gdbad