From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id 79AD1138359 for ; Sat, 12 Sep 2020 23:48:12 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 4149CE0871; Sat, 12 Sep 2020 23:48:11 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [IPv6:2001:470:ea4a:1:5054:ff:fec7:86e4]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 0CCDAE086B for ; Sat, 12 Sep 2020 23:48:10 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id E014233FEB6 for ; Sat, 12 Sep 2020 23:48:09 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 5280435A for ; Sat, 12 Sep 2020 23:48:08 +0000 (UTC) From: "Sam James" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Sam James" Message-ID: <1599954479.cf87ee52ce0e6902e2f186aaa8d252aba60551e5.sam@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: app-office/lyx/ X-VCS-Repository: repo/gentoo X-VCS-Files: app-office/lyx/Manifest app-office/lyx/lyx-2.3.3.ebuild app-office/lyx/lyx-2.3.5.2-r1.ebuild app-office/lyx/lyx-2.3.5.2.ebuild X-VCS-Directories: app-office/lyx/ X-VCS-Committer: sam X-VCS-Committer-Name: Sam James X-VCS-Revision: cf87ee52ce0e6902e2f186aaa8d252aba60551e5 X-VCS-Branch: master Date: Sat, 12 Sep 2020 23:48:08 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply X-Archives-Salt: 363eb74e-062b-48fe-91eb-47c0924a476a X-Archives-Hash: 93d7ceb6e9bc58e5691e0c0f276998ec commit: cf87ee52ce0e6902e2f186aaa8d252aba60551e5 Author: Sam James gentoo org> AuthorDate: Sat Sep 12 23:47:59 2020 +0000 Commit: Sam James gentoo org> CommitDate: Sat Sep 12 23:47:59 2020 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=cf87ee52 app-office/lyx: switch chktex dependency Now included in texlive-core. Package-Manager: Portage-3.0.4, Repoman-3.0.1 Signed-off-by: Sam James gentoo.org> app-office/lyx/Manifest | 1 - app-office/lyx/lyx-2.3.3.ebuild | 175 --------------------- .../{lyx-2.3.5.2.ebuild => lyx-2.3.5.2-r1.ebuild} | 1 - 3 files changed, 177 deletions(-) diff --git a/app-office/lyx/Manifest b/app-office/lyx/Manifest index ccf54e3aac6..442dc33d944 100644 --- a/app-office/lyx/Manifest +++ b/app-office/lyx/Manifest @@ -1,2 +1 @@ -DIST lyx-2.3.3.tar.xz 15998188 BLAKE2B 491732d1e567dfc8372a7dc7810cfc46cbe7e3b6a67637f772adddcff96225e174fe8c3db4c7f9e663cf3423da8b4bf08f67679874c9aaf556973ad46159a6cc SHA512 7b42df9da9f2906f626d568222e559bb921d003674d70c805657488180856a77143b2a3d073686116c95034e84fe8f58ee1ff8a74d47a40bd5fda7564335a0c3 DIST lyx-2.3.5.2.tar.xz 16139804 BLAKE2B e6ea7b2fbec330bfe31b8f88e0a5cc25ff65991421f99b04e98d26945bba48a95f389e2a7e6023d4c9720d43f80136682eb40ac4be51799f01e038e4b0fad206 SHA512 90c5459ad0a77568d588e05a360482985988382927583b14914d6a23b788756e957d0237c18b9ab0681dfc2ad7aa34d21e97304e3a74d19ef047c38f692fba03 diff --git a/app-office/lyx/lyx-2.3.3.ebuild b/app-office/lyx/lyx-2.3.3.ebuild deleted file mode 100644 index 2874b162499..00000000000 --- a/app-office/lyx/lyx-2.3.3.ebuild +++ /dev/null @@ -1,175 +0,0 @@ -# Copyright 1999-2020 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 ~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:0 ) - 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-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}"/${PN}-2.3.0-python.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 || die - echo "\bind \"F12\" \"language hebrew\"" >> "${T}"/hebrew.bind || die - - 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.5.2.ebuild b/app-office/lyx/lyx-2.3.5.2-r1.ebuild similarity index 99% rename from app-office/lyx/lyx-2.3.5.2.ebuild rename to app-office/lyx/lyx-2.3.5.2-r1.ebuild index cfb1f9bc72d..4db12ad1a2e 100644 --- a/app-office/lyx/lyx-2.3.5.2.ebuild +++ b/app-office/lyx/lyx-2.3.5.2-r1.ebuild @@ -46,7 +46,6 @@ RDEPEND="${PYTHON_DEPS} app-text/ghostscript-gpl app-text/ps2eps app-text/texlive - dev-tex/chktex dev-texlive/texlive-fontsrecommended dev-texlive/texlive-latexextra dev-texlive/texlive-mathscience