From a4e2a46beb5e4858ef27bdedbb0ff6d2ced430ad Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Sat, 28 Apr 2018 20:02:04 +0100 Subject: gentoo resync : 28.04.2018 --- app-office/lyx/Manifest | 5 +- app-office/lyx/files/2.1-python.patch | 29 ------ app-office/lyx/lyx-2.2.3-r4.ebuild | 186 ---------------------------------- app-office/lyx/lyx-2.3.0.ebuild | 2 +- 4 files changed, 2 insertions(+), 220 deletions(-) delete mode 100644 app-office/lyx/files/2.1-python.patch delete mode 100644 app-office/lyx/lyx-2.2.3-r4.ebuild (limited to 'app-office/lyx') diff --git a/app-office/lyx/Manifest b/app-office/lyx/Manifest index 85d8229b3f0e..2372d3a99c43 100644 --- a/app-office/lyx/Manifest +++ b/app-office/lyx/Manifest @@ -1,9 +1,6 @@ -AUX 2.1-python.patch 1019 BLAKE2B 1ca2692b77850998f49e93f43dc371d05e33438f867c352bdbf085a86a280e11fa5d00d738661875ede0041907683ced98407ce75676d638f35ae0a92cfd0f54 SHA512 039d3521bc1d646669fcccb43d04354dfe7ed32477a338c27a576c77e5ffcf15fcf0419c14df43aa37d727431cce6ab0327aa04199d09ce1749051ab12686df8 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.2.3.tar.xz 15501856 BLAKE2B 08606f0c18d9cb5891bd7d612361597e3efc7e7855f7607c2620f10ddb22b7078d5085f725911496198d2d8a47ece54cbfe67cfbf4ec8eb15450271cd133b095 SHA512 b5a4a16b22680022651a0f3911c2c24bcd3541a573e672e541cb0af6572089e4b0e0ec1cafb40850e75c377e7da5b286d0314886e0c57d55f57645d8e4a07708 DIST lyx-2.3.0.tar.xz 15676680 BLAKE2B 4b09f4c3979f51a8b30825c07fe3b24f080bfc8f42d54e94809e342087b683ca24edcb835994583b28d5b9c13868736f850d6c88b229e2d7f6f6bc0fd64c722c SHA512 77366d365f600069564b6d508ba2169744bbc7bc4dc9cb7e9d5f44941796dd7a027ca9ad08f5a67fd6863cbd1f6308ce5233b6e8685ebc6cf78ed19eef84ccb5 -EBUILD lyx-2.2.3-r4.ebuild 4334 BLAKE2B 9542d5a125f9ebf6f9ddedf01f2964e959205befef45f89389af8b44db68a20c86cdd724d8041e2c883511781b747e070ed75c43bac1b30d8b1a3b8d3e62fbff SHA512 42380981edccfa4cf79a03f4786895bce552e23949303eec158d4752540075424a9c3923f08b4896c91e8af8cfc8f4bfc6fd14ae99098c988f7139312caee2a9 -EBUILD lyx-2.3.0.ebuild 4195 BLAKE2B 2a27101426cfe87c3a6c3b1e51737f7cee1f5177d3fbb3d0d1582aca9cb39df28f647dcfa002a307909a5e4bff1dde4d09c3ae631edfc01f176d688ced9a5b38 SHA512 e7dfa822506b96f82dca5bd69c780e534a17d90c2eb34a0420db315c4646c568a2f085593b0347db243a127cacfec7b1fe88906e034fe913dce1665a8ffb2d1f +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/2.1-python.patch b/app-office/lyx/files/2.1-python.patch deleted file mode 100644 index 5fb21655a695..000000000000 --- a/app-office/lyx/files/2.1-python.patch +++ /dev/null @@ -1,29 +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 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.3-r4.ebuild b/app-office/lyx/lyx-2.2.3-r4.ebuild deleted file mode 100644 index fcee37e04bb1..000000000000 --- a/app-office/lyx/lyx-2.2.3-r4.ebuild +++ /dev/null @@ -1,186 +0,0 @@ -# Copyright 1999-2018 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 - -PYTHON_COMPAT=( python2_7 ) -inherit gnome2-utils xdg-utils flag-o-matic font python-single-r1 qmake-utils toolchain-funcs multilib desktop - -MY_P="${P/_}" - -S="${WORKDIR}/${MY_P}" -FONT_S="${S}/lib/fonts" -FONT_SUFFIX="ttf" -DESCRIPTION="WYSIWYM frontend for LaTeX, DocBook, etc." -HOMEPAGE="https://www.lyx.org/" -SRC_URI="ftp://ftp.lyx.org/pub/lyx/stable/2.2.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="aspell cups debug docbook dia dot enchant gnumeric html +hunspell +latex monolithic-build nls +qt5 rcs rtf subversion svg l10n_he" -REQUIRED_USE="${PYTHON_REQUIRED_USE}" - -RDEPEND="${PYTHON_DEPS} - dev-libs/boost:= - 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 ) - 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 - ) - ) - l10n_he? ( dev-tex/culmus-latex ) - !qt5? ( - dev-qt/qtcore:4 - dev-qt/qtgui:4 - ) - qt5? ( - dev-qt/qtcore:5 - dev-qt/qtgui:5 - dev-qt/qtsvg:5 - dev-qt/qtwidgets:5 - ) - 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 - nls? ( sys-devel/gettext ) - !qt5? ( dev-qt/qtsvg:4 ) - qt5? ( - dev-qt/qtconcurrent:5 - dev-qt/qtx11extras:5 - ) -" - -DOCS=( ANNOUNCE NEWS README RELEASE-NOTES UPGRADING ) - -PATCHES=( "${FILESDIR}"/2.1-python.patch ) - -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) \ - $(use_enable qt5) \ - --with-qt-dir=$(usex qt5 $(qt5_get_libdir)/qt5 $(qt4_get_libdir)) \ - --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 "${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 - 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_preinst() { - gnome2_icon_savelist -} - -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/lyx-2.3.0.ebuild b/app-office/lyx/lyx-2.3.0.ebuild index dad57fa96596..c5452baaac77 100644 --- a/app-office/lyx/lyx-2.3.0.ebuild +++ b/app-office/lyx/lyx-2.3.0.ebuild @@ -15,7 +15,7 @@ SRC_URI="ftp://ftp.lyx.org/pub/lyx/stable/2.3.x/${MY_P}.tar.xz LICENSE="GPL-2" SLOT="0" -KEYWORDS="~amd64 ~hppa ~ppc ~ppc64 ~sparc ~x86 ~x64-macos ~x86-macos" +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}" -- cgit v1.2.3