diff options
Diffstat (limited to 'sci-visualization/gle')
| -rw-r--r-- | sci-visualization/gle/Manifest | 2 | ||||
| -rw-r--r-- | sci-visualization/gle/gle-4.2.5-r2.ebuild (renamed from sci-visualization/gle/gle-4.2.5-r1.ebuild) | 62 |
2 files changed, 33 insertions, 31 deletions
diff --git a/sci-visualization/gle/Manifest b/sci-visualization/gle/Manifest index 518ecf32fed6..7c68b634a73d 100644 --- a/sci-visualization/gle/Manifest +++ b/sci-visualization/gle/Manifest @@ -3,5 +3,5 @@ AUX gle-4.2.5-c++14.patch 1113 BLAKE2B a75d450b3f067d3f1158618fbdbed69352e9660a6 AUX gle-4.2.5-jpeg-9c.patch 685 BLAKE2B bfcb90439c6cdd2bd75b9e5d30232dd816f348dfdf9ee7067e848741c4050a441869e04513ae04f92569ad3854a77fe9c739be6ebd1ca5ff5988af6ba5020d99 SHA512 55c1f8fd59cbe71b14d1755bceb5fb02ebfbf0e71eafc39837b513ba48be7421c51352c60d127fc4744628eb6e403eadb703bf24a49dea5652c08ae749a67590 AUX gle-4.2.5-parallel.patch 572 BLAKE2B 03617a63dac035582a90cd0d872c114cc8b4426e05483130ead443a6d136f7c54cafabd7312e0c8eae5c90b704bd4d0a475f49feea69de464deba2c47970c066 SHA512 95d2c9fb1023f6f468b7258c52c04635dfe297da579de0bf429d90bfc1849348191f0821f18b048057271260ad0a9511fd811bdb1494fe51aa1dcd84276b2259 DIST gle-graphics-4.2.5f-src.tar.gz 2330270 BLAKE2B 46435a2366a278a88786a2dd0e0cbcc48d3ba2fc6d895fb07c81216089a10b2223b2ba692b951ee01a6ab014e84cce9aa3969d063ddf7d04501820aa33084c5c SHA512 d459b24577c9c3f8825c368f864532c97d0a37c94018276a60c941d17dce0e55fe738f7eda3227a47848f2fb32fea1dcec29d9751a5be92cde4d8d38a2eeb0f5 -EBUILD gle-4.2.5-r1.ebuild 2167 BLAKE2B 1ddd7ac42774d96c9f1ab07b077b4938dc9df773a1821506e81c03a8f82bdbad5038e008d888963093c8794649b868289c393b227bf2beb3464ff9064abaf3dc SHA512 aa541e860b0bed8da5a5a1b21c7462e84b8fd68a195cc3381edc706d89c90d1dbe2403488049ce7313e30e5a46cd089dd840575c40aa78cc9d4f8259f614eaa0 +EBUILD gle-4.2.5-r2.ebuild 2155 BLAKE2B 004c8f6fc85e54660f8774cfd8a723342df9248017609a746b0db525432417bca1a90d102bad73f63bd56ce18782d3b028b4843fa15413c12d1b77a3cd789bad SHA512 2a8170ba881a50219fd465b5df290886d9d09287ef4c5aadda4653f29e985cba16555e71cabb74542dab06e4607cd2169b998aba6c225f6508534c7257a89caf MISC metadata.xml 725 BLAKE2B a9da0308b21e8f2faea7a58fcba4ed9c4d2a136fc64992768236dd3c21705f3f324abfa83a0b598234a86e7bac5539be2b527ea6efa56fd4b44e44c43428ba45 SHA512 745264b5ccf026947f5a3c0a39b4199589d7831ec1f5de7c03f82b48ebbc590d57d973a7007a09d71135b60cf8129d38eeaab2a95785b62f76fccc6727db61ee diff --git a/sci-visualization/gle/gle-4.2.5-r1.ebuild b/sci-visualization/gle/gle-4.2.5-r2.ebuild index 9c52191e544f..185bd857cbb2 100644 --- a/sci-visualization/gle/gle-4.2.5-r1.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 @@ -45,6 +50,7 @@ src_prepare() { src_configure() { # CPPFLAGS are understood as C++ flags append-cppflags ${CXXFLAGS} + append-cppflags -std=c++14 econf \ --without-rpath \ --without-qt \ @@ -57,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 |