From d87262dd706fec50cd150aab3e93883b6337466d Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Sat, 14 Jul 2018 20:56:41 +0100 Subject: gentoo resync : 14.07.2018 --- app-office/lyx/Manifest | 6 - app-office/lyx/files/lyx-2.3.0-autotools.patch | 27 ---- app-office/lyx/files/lyx-2.3.0-python.patch | 30 ----- app-office/lyx/files/lyx-2.3.0-qt-5.11.patch | 16 --- app-office/lyx/lyx-2.3.0.ebuild | 179 ------------------------- app-office/lyx/metadata.xml | 36 ----- 6 files changed, 294 deletions(-) delete mode 100644 app-office/lyx/Manifest delete mode 100644 app-office/lyx/files/lyx-2.3.0-autotools.patch delete mode 100644 app-office/lyx/files/lyx-2.3.0-python.patch delete mode 100644 app-office/lyx/files/lyx-2.3.0-qt-5.11.patch delete mode 100644 app-office/lyx/lyx-2.3.0.ebuild delete mode 100644 app-office/lyx/metadata.xml (limited to 'app-office/lyx') diff --git a/app-office/lyx/Manifest b/app-office/lyx/Manifest deleted file mode 100644 index 2372d3a99c43..000000000000 --- a/app-office/lyx/Manifest +++ /dev/null @@ -1,6 +0,0 @@ -AUX lyx-2.3.0-autotools.patch 1022 BLAKE2B 2238110e621af6b3b3964b6129ee6af55d9823eb741933b52d931cf6f2a718374326627469b744e6bb5289e265b0282f2c6cd5dd88bdf227ed5d98ab7140dba6 SHA512 49cf81e0b2a5d384f55959251f548c66edca75561c53e8a28f835eb2bb6674c496ba1e5566d192299db55d9596cdc0d90e9b62738b610e1579d648d3c12b2a1c -AUX lyx-2.3.0-python.patch 1049 BLAKE2B 94591099e6b0d52429fa1e066475283ae35ba89a5d07f190dd80aa38ad040cbf53dda3f85f4f12894fc39822309aa7b4cc2bf947d8720caf228c734b7fcee8b1 SHA512 8f2fda91c4c35ffdf3325fc6613df1c5ecd87ced88e4d690aef5c7085edda1b66c0ae704e266521627f7a82eb8b4e2f35fed0f14b37feb367422ef1c5693e31d -AUX lyx-2.3.0-qt-5.11.patch 481 BLAKE2B 86883721e9d59d0b05d465419e93038c64ee5b473e32cd182487661383ad4921e92d89fe24610046b9434c87b361e66927db385fb9faf0bc2c7e5a85fb84f416 SHA512 aac667b6b28c2053eabbd66516e59970ccfec26504185e8ebc481427c159255ef3e2434bd57aa45a9960fabf7e36549f44302c3fa146f26009e0582ee0cfa8f4 -DIST lyx-2.3.0.tar.xz 15676680 BLAKE2B 4b09f4c3979f51a8b30825c07fe3b24f080bfc8f42d54e94809e342087b683ca24edcb835994583b28d5b9c13868736f850d6c88b229e2d7f6f6bc0fd64c722c SHA512 77366d365f600069564b6d508ba2169744bbc7bc4dc9cb7e9d5f44941796dd7a027ca9ad08f5a67fd6863cbd1f6308ce5233b6e8685ebc6cf78ed19eef84ccb5 -EBUILD lyx-2.3.0.ebuild 4193 BLAKE2B 743e4af8d258ecbd42d31c93b0831e388759780fe19cf642f92eada8af58e4bae44718acb1b8837b18658c815560df2608476cb24a614cc8f26e5c3634f99110 SHA512 751af5cea41d673b4b8180de7eab01e003978132c4fcd99e26a83c7f87fd422dd3bc35b3a80cdc823b31d8d40a67154f0509174929a4bea86d94d38aa3185228 -MISC metadata.xml 1539 BLAKE2B 124b453cd6f7a6eccaa0e4db033edf451f9e21f16915de2576fb8c8920af472fe330e4b3bde2c7659d57a512f571b543b745bdb2177f6bd28b29da7e9fa703af SHA512 603a568a98ca584f5baebdfbdb6c83c892fba1df71fab12449d625e5c58b8961322bbdf1263d2493dbb68f61c747655d2b84360b7f34851c235fa10c3f3c2f52 diff --git a/app-office/lyx/files/lyx-2.3.0-autotools.patch b/app-office/lyx/files/lyx-2.3.0-autotools.patch deleted file mode 100644 index 31077ef02a6a..000000000000 --- a/app-office/lyx/files/lyx-2.3.0-autotools.patch +++ /dev/null @@ -1,27 +0,0 @@ -Index: INSTALL -=================================================================== ---- a/INSTALL (revision 9aa280993f159f065da82d5fac30eb86a6599f4d) -+++ b/INSTALL (revision 3abfd72b2720c21eba51bb2338f0b8b835dae720) -@@ -38,5 +38,5 @@ - - If you have checked this out from Git, you need to have: --* automake (supported versions are 1.14--1.15) -+* automake (supported versions are 1.14--1.16) - * autoconf (supported versions are 2.65--2.69) - Then type "./autogen.sh" to build the needed configuration -Index: autogen.sh -=================================================================== ---- a/autogen.sh (revision 86ae7dad3fc1cad3744663d0da8034625dc9ffb1) -+++ b/autogen.sh (revision 3abfd72b2720c21eba51bb2338f0b8b835dae720) -@@ -17,9 +17,9 @@ - - case $automake_version in -- *' '1.1[45]*) -+ *' '1.1[456]*) - ;; - *) - echo "This automake version is not supported by LyX." -- echo "LyX only supports automake 1.14 to 1.15." -+ echo "LyX only supports automake 1.14 through 1.16." - exit 1 - ;; diff --git a/app-office/lyx/files/lyx-2.3.0-python.patch b/app-office/lyx/files/lyx-2.3.0-python.patch deleted file mode 100644 index e41c2604bf5c..000000000000 --- a/app-office/lyx/files/lyx-2.3.0-python.patch +++ /dev/null @@ -1,30 +0,0 @@ -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 8eea49370a..d7a0f81aa3 100644 ---- a/src/support/os.cpp -+++ b/src/support/os.cpp -@@ -65,10 +65,10 @@ int timeout_min() - string const python(bool reset) - { - // Check whether the first python in PATH is the right one. -- static string command = python23("python -tt"); -+ static string command = python23("python2 -tt"); - // FIXME THREAD - if (reset) { -- command = python23("python -tt"); -+ command = python23("python2 -tt"); - } - - if (command.empty()) { diff --git a/app-office/lyx/files/lyx-2.3.0-qt-5.11.patch b/app-office/lyx/files/lyx-2.3.0-qt-5.11.patch deleted file mode 100644 index 6f1848142bb3..000000000000 --- a/app-office/lyx/files/lyx-2.3.0-qt-5.11.patch +++ /dev/null @@ -1,16 +0,0 @@ ---- a/src/frontends/qt4/GuiDocument.cpp 2018-02-25 01:11:18.000000000 +0100 -+++ b/src/frontends/qt4/GuiDocument.cpp 2018-03-30 19:45:47.283928297 +0200 -@@ -68,11 +68,12 @@ - #include "frontends/alert.h" - - #include --#include -+#include - #include - #include - #include - #include -+#include - #include - #include - #include diff --git a/app-office/lyx/lyx-2.3.0.ebuild b/app-office/lyx/lyx-2.3.0.ebuild deleted file mode 100644 index c5452baaac77..000000000000 --- a/app-office/lyx/lyx-2.3.0.ebuild +++ /dev/null @@ -1,179 +0,0 @@ -# Copyright 1999-2018 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 - -PYTHON_COMPAT=( python2_7 ) - -MY_P="${P/_}" -inherit desktop gnome2-utils flag-o-matic font python-single-r1 qmake-utils toolchain-funcs xdg-utils - -DESCRIPTION="WYSIWYM frontend for LaTeX, DocBook, etc." -HOMEPAGE="https://www.lyx.org/" -SRC_URI="ftp://ftp.lyx.org/pub/lyx/stable/2.3.x/${MY_P}.tar.xz - ftp://ftp.lyx.org/pub/lyx/devel/lyx-2.3/${MY_P}/${MY_P}.tar.xz" - -LICENSE="GPL-2" -SLOT="0" -KEYWORDS="amd64 ~hppa ~ppc ~ppc64 ~sparc x86 ~x64-macos ~x86-macos" -IUSE="aspell cups debug docbook dia dot enchant gnumeric html +hunspell +latex monolithic-build nls rcs rtf subversion svg l10n_he" -REQUIRED_USE="${PYTHON_REQUIRED_USE}" - -RDEPEND="${PYTHON_DEPS} - dev-libs/boost:= - dev-qt/qtcore:5 - dev-qt/qtgui:5 - dev-qt/qtsvg:5 - dev-qt/qtwidgets:5 - dev-qt/qtx11extras:5 - dev-texlive/texlive-fontsextra - sys-apps/file - sys-libs/zlib - virtual/imagemagick-tools[png,svg?] - aspell? ( app-text/aspell ) - cups? ( net-print/cups ) - dia? ( app-office/dia ) - docbook? ( app-text/sgmltools-lite ) - dot? ( media-gfx/graphviz ) - enchant? ( app-text/enchant ) - gnumeric? ( app-office/gnumeric ) - html? ( dev-tex/html2latex ) - hunspell? ( app-text/hunspell ) - l10n_he? ( dev-tex/culmus-latex ) - latex? ( - app-text/dvipng - app-text/ghostscript-gpl - app-text/ps2eps - app-text/texlive - dev-tex/chktex - dev-tex/dvipost - dev-texlive/texlive-fontsrecommended - dev-texlive/texlive-latexextra - dev-texlive/texlive-mathscience - dev-texlive/texlive-pictures - || ( dev-texlive/texlive-plaingeneric dev-texlive/texlive-genericextra ) - || ( - dev-tex/hevea - dev-tex/latex2html - dev-tex/tex4ht[java] - dev-tex/tth - ) - ) - rcs? ( dev-vcs/rcs ) - rtf? ( - app-text/unrtf - dev-tex/html2latex - dev-tex/latex2rtf - ) - subversion? ( dev-vcs/subversion ) - svg? ( || ( gnome-base/librsvg media-gfx/inkscape ) ) -" -DEPEND="${RDEPEND} - virtual/pkgconfig - dev-qt/qtconcurrent:5 - nls? ( sys-devel/gettext ) -" - -DOCS=( ANNOUNCE NEWS README RELEASE-NOTES UPGRADING ) - -PATCHES=( - "${FILESDIR}"/${P}-python.patch - "${FILESDIR}"/${P}-qt-5.11.patch - "${FILESDIR}"/${P}-autotools.patch -) - -S="${WORKDIR}/${MY_P}" - -FONT_S="${S}/lib/fonts" -FONT_SUFFIX="ttf" - -pkg_setup() { - python-single-r1_pkg_setup - font_pkg_setup -} - -src_prepare() { - default - 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_with aspell) \ - $(use_enable debug) \ - $(use_with enchant) \ - $(use_with hunspell) \ - $(use_enable monolithic-build) \ - $(use_enable nls) \ - --enable-qt5 \ - --with-qt-dir=$(qt5_get_libdir)/qt5 \ - --disable-stdlib-debug \ - --without-included-boost \ - --with-packaging=posix -} - -src_install() { - default - - if use l10n_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 - fi - - newicon -s 32 "development/Win32/packaging/icons/lyx_32x32.png" ${PN}.png - doicon -s 48 "lib/images/lyx.png" - doicon -s scalable "lib/images/lyx.svg" - - # fix for bug 91108 - if use latex ; then - dosym ../../../lyx/tex /usr/share/texmf-site/tex/latex/lyx - 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 ../myspell /usr/share/lyx/dicts - dosym ../myspell /usr/share/lyx/thes - fi -} - -pkg_postinst() { - font_pkg_postinst - gnome2_icon_cache_update - xdg_desktop_database_update - - # fix for bug 91108 - if use latex ; then - texhash - fi - - # instructions for RTL support. See also bug 168331. - if use l10n_he || has he ${LINGUAS} || has ar ${LINGUAS} ; 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 - xdg_desktop_database_update - - if use latex ; then - texhash - fi -} diff --git a/app-office/lyx/metadata.xml b/app-office/lyx/metadata.xml deleted file mode 100644 index 8825a0a1d5f4..000000000000 --- a/app-office/lyx/metadata.xml +++ /dev/null @@ -1,36 +0,0 @@ - - - - - aballier@gentoo.org - Alexis Ballier - - - tex@gentoo.org - Gentoo TeX Project - - - cjk@gentoo.org - Cjk - - - Add support for docbook export - Add support for diagrams (app-office/dia) - Add support for DOT import (media-gfx/graphviz) - - Add support for HTML import - This should speed up compilation significantly - when you have enough RAM (> 600 MB) - Add support for revision control via dev-vcs/rcs - - Add support for RTF import/export packages - Add support for importing Gnumeric/OpenOffice/MS Excel - spreadsheets into LyX. - Add support for spellchecking based on hunspell and - reuse system-wide OpenOffice dictionaries. This also enable thesaurus - dictionaries not accessible via aspell. - Add support for aspell spellchecking - Add support for enchant spellchecking wrapper - (both aspell and hunspell can be used by LyX). - - -- cgit v1.2.3