diff options
author | V3n3RiX <venerix@redcorelinux.org> | 2019-08-18 18:16:17 +0100 |
---|---|---|
committer | V3n3RiX <venerix@redcorelinux.org> | 2019-08-18 18:16:17 +0100 |
commit | fc637fb28da700da71ec2064d65ca5a7a31b9c6c (patch) | |
tree | 326613a08f25851c388715e205576a2e7d25dc4f /app-office/lyx | |
parent | b24bd25253fe093f722ab576d29fdc41d04cb1ee (diff) |
gentoo resync : 18.08.2019
Diffstat (limited to 'app-office/lyx')
-rw-r--r-- | app-office/lyx/Manifest | 7 | ||||
-rw-r--r-- | app-office/lyx/files/lyx-2.3.0-autotools.patch | 27 | ||||
-rw-r--r-- | app-office/lyx/files/lyx-2.3.0-qt-5.11.patch | 16 | ||||
-rw-r--r-- | app-office/lyx/lyx-2.3.0-r1.ebuild | 180 | ||||
-rw-r--r-- | app-office/lyx/lyx-2.3.0.ebuild | 179 | ||||
-rw-r--r-- | app-office/lyx/lyx-2.3.3.ebuild | 2 |
6 files changed, 2 insertions, 409 deletions
diff --git a/app-office/lyx/Manifest b/app-office/lyx/Manifest index 86986819d223..ef35d67357c3 100644 --- a/app-office/lyx/Manifest +++ b/app-office/lyx/Manifest @@ -1,9 +1,4 @@ -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 DIST lyx-2.3.3.tar.xz 15998188 BLAKE2B 491732d1e567dfc8372a7dc7810cfc46cbe7e3b6a67637f772adddcff96225e174fe8c3db4c7f9e663cf3423da8b4bf08f67679874c9aaf556973ad46159a6cc SHA512 7b42df9da9f2906f626d568222e559bb921d003674d70c805657488180856a77143b2a3d073686116c95034e84fe8f58ee1ff8a74d47a40bd5fda7564335a0c3 -EBUILD lyx-2.3.0-r1.ebuild 4150 BLAKE2B c6f7626285d58ed7c49d8820bc1384d7ac000fbcfefc81d6efb20ab6527737ec24ed3da0cbe2bed575077be8bb17f19df7c8983b42f63f8a43063fdffa091ee5 SHA512 44503cf7df0e30500f1183df390e1de961f94a3fcead0d0ace8a7f05a3d31a86203fdb79e1c3d5bc3e96f442fd78329fb5a73f2ac6050e30e4892e0b1e484cf2 -EBUILD lyx-2.3.0.ebuild 4153 BLAKE2B 70acac07e3bb81db76fc06793e3e926f93950da5029dadf28be8422bc962558d6c2c394294a43d1c4da132c90b0b1925fb56992f400afea855812ed285cf713b SHA512 fa01460363dde26c2e772fcdd2a5ddecdd3da26569866251bcd57a802d9f3f9ca1ca4dd6b3dd8a8f0b66d2d99ca460a1da6db7ac3a0bd43e6d62c46885e1ef23 -EBUILD lyx-2.3.3.ebuild 4102 BLAKE2B e5fcfa19253976468a1c8b00a227a9462cda0c6737ce308f8a3a7d887c1c961e47bf73ec39a83d7643fd8dc89a3f6491ea9958117e3a1686bb19ea278269a9c4 SHA512 7c30d7f236928e1586988c67d471666e56bb8dd0e6158bc70a99fd3d37cb5893b8dd0d56d8e0e8ca6504ed6772d9199e90ba557588ccdb9e49e3c93b2f33f121 +EBUILD lyx-2.3.3.ebuild 4100 BLAKE2B 3dd38e0a1562f7eeff43408a8e559d8788401082cf3d7192ebb9673a2c695e8f7487e970190d4053b18ca53f97303830f46616874ade4b9d5bf1cd54e90d8c57 SHA512 b1c120536eb09d1289f52c4a90d124e5e0f7b74c0d26bae84d6b87aef235073d5bbd186fc50a1be165dcc7d601b7bfe7df0d1ee2bac0cc30b70707c4c8aac0a2 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-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 <QAbstractItemModel> --#include <QHeaderView> -+#include <QButtonGroup> - #include <QColor> - #include <QColorDialog> - #include <QCloseEvent> - #include <QFontDatabase> -+#include <QHeaderView> - #include <QScrollBar> - #include <QTextBoundaryFinder> - #include <QTextCursor> diff --git a/app-office/lyx/lyx-2.3.0-r1.ebuild b/app-office/lyx/lyx-2.3.0-r1.ebuild deleted file mode 100644 index 560ae6538cad..000000000000 --- a/app-office/lyx/lyx-2.3.0-r1.ebuild +++ /dev/null @@ -1,180 +0,0 @@ -# Copyright 1999-2019 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 - -PYTHON_COMPAT=( python2_7 ) - -MY_P="${P/_}" -inherit desktop 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} - app-text/mythes - 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-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 - xdg_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() { - xdg_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 deleted file mode 100644 index d98d6f051aef..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-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/lyx-2.3.3.ebuild b/app-office/lyx/lyx-2.3.3.ebuild index 3054f51d728b..fab590d38203 100644 --- a/app-office/lyx/lyx-2.3.3.ebuild +++ b/app-office/lyx/lyx-2.3.3.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}" |