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 A1B651382C5 for ; Tue, 25 May 2021 14:55:14 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 87AEBE076B; Tue, 25 May 2021 14:55:13 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (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 EA40EE076B for ; Tue, 25 May 2021 14:55:12 +0000 (UTC) Received: from oystercatcher.gentoo.org (unknown [IPv6:2a01:4f8:202:4333:225:90ff:fed9:fc84]) (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 7CD88340D59 for ; Tue, 25 May 2021 14:55:10 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id E0A4C59C for ; Tue, 25 May 2021 14:55:08 +0000 (UTC) From: "David Seifert" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "David Seifert" Message-ID: <1621954496.4ac43a527d53faebcbc76a88dfc1fde1b40d1e80.soap@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: sci-visualization/gle/ X-VCS-Repository: repo/gentoo X-VCS-Files: sci-visualization/gle/gle-4.2.5-r2.ebuild X-VCS-Directories: sci-visualization/gle/ X-VCS-Committer: soap X-VCS-Committer-Name: David Seifert X-VCS-Revision: 4ac43a527d53faebcbc76a88dfc1fde1b40d1e80 X-VCS-Branch: master Date: Tue, 25 May 2021 14:55: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: 94483287-c4cc-418c-90e9-39285c18bf80 X-Archives-Hash: 013f14471b00f0c51daaafff06ded2df commit: 4ac43a527d53faebcbc76a88dfc1fde1b40d1e80 Author: David Seifert gentoo org> AuthorDate: Tue May 25 14:54:56 2021 +0000 Commit: David Seifert gentoo org> CommitDate: Tue May 25 14:54:56 2021 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=4ac43a52 sci-visualization/gle: [QA] Major cleanup Package-Manager: Portage-3.0.19, Repoman-3.0.3 Signed-off-by: David Seifert gentoo.org> sci-visualization/gle/gle-4.2.5-r2.ebuild | 61 ++++++++++++++++--------------- 1 file changed, 31 insertions(+), 30 deletions(-) diff --git a/sci-visualization/gle/gle-4.2.5-r2.ebuild b/sci-visualization/gle/gle-4.2.5-r2.ebuild index ff7853dd3b7..185bd857cbb 100644 --- a/sci-visualization/gle/gle-4.2.5-r2.ebuild +++ b/sci-visualization/gle/gle-4.2.5-r2.ebuild @@ -1,34 +1,39 @@ # Copyright 1999-2021 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=6 -inherit elisp-common flag-o-matic autotools +EAPI=7 + +inherit autotools elisp-common flag-o-matic + +MY_P=${PN}-graphics-${PV} DESCRIPTION="Graphics Layout Engine" HOMEPAGE="http://glx.sourceforge.net/" -MY_P=${PN}-graphics-${PV} -MAN_V=4.2.2 SRC_URI="mirror://sourceforge/glx/${MY_P}f-src.tar.gz" -SLOT="0" +S="${WORKDIR}/${MY_P}" + LICENSE="BSD-2 emacs? ( GPL-2 )" -IUSE="X jpeg png tiff doc emacs vim-syntax" +SLOT="0" KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux" +IUSE="doc emacs jpeg png tiff vim-syntax X" DEPEND=" - sys-libs/ncurses:0= - X? ( x11-libs/libX11 ) + sys-libs/ncurses:= + emacs? ( >=app-editors/emacs-23.1:* ) jpeg? ( virtual/jpeg:0 ) - png? ( media-libs/libpng:0= ) - tiff? ( media-libs/tiff:0 ) - doc? ( dev-texlive/texlive-latexextra ) - emacs? ( >=app-editors/emacs-23.1:* )" - + png? ( media-libs/libpng:= ) + tiff? ( media-libs/tiff:= ) + X? ( x11-libs/libX11 )" RDEPEND="${DEPEND} app-text/ghostscript-gpl virtual/latex-base - vim-syntax? ( || ( app-editors/vim app-editors/gvim ) )" - -S="${WORKDIR}"/${MY_P} + vim-syntax? ( + || ( + app-editors/vim + app-editors/gvim + ) + )" +BDEPEND="doc? ( dev-texlive/texlive-latexextra )" PATCHES=( "${FILESDIR}"/${P}-parallel.patch @@ -58,36 +63,32 @@ src_configure() { src_compile() { emake - if use doc; then - emake -j1 doc - fi + use doc && emake -j1 doc + if use emacs; then - cd contrib/editors/highlighting - mv ${PN}-emacs.el ${PN}-mode.el - elisp-compile ${PN}-mode.el || die + cd contrib/editors/highlighting || die + mv ${PN}-emacs.el ${PN}-mode.el || die + elisp-compile ${PN}-mode.el fi } src_install() { # -jN failed to install some data files emake -j1 DESTDIR="${D}" install - rm -rf "${ED}"/usr/share/doc/gle-graphics + rm -rf "${ED}"/usr/share/doc/gle-graphics || die dodoc README.txt - if use doc; then - insinto /usr/share/doc/${PF} - doins build/doc/gle-manual.pdf - fi + use doc && dodoc build/doc/gle-manual.pdf if use emacs; then - elisp-install ${PN} contrib/editors/highlighting/gle-mode.{el,elc} || die - elisp-site-file-install "${FILESDIR}"/64gle-gentoo.el || die + elisp-install ${PN} contrib/editors/highlighting/gle-mode.{el,elc} + elisp-site-file-install "${FILESDIR}"/64gle-gentoo.el fi if use vim-syntax ; then dodir /usr/share/vim/vimfiles/{ftplugins,indent,syntax} cd contrib/editors/highlighting/vim || die - chmod 644 ftplugin/* indent/* syntax/* + chmod 644 ftplugin/* indent/* syntax/* || die insinto /usr/share/vim/vimfiles doins -r ftplugin indent syntax fi