gentoo resync : 16.01.2018

5 files changed, 40 insertions, 112 deletions

diff --git a/sci-visualization/gle/Manifest b/sci-visualization/gle/Manifest
index a17ec4e710e2..0deb347d0de5 100644
--- a/sci-visualization/gle/Manifest
+++ b/sci-visualization/gle/Manifest
@@ -1,6 +1,6 @@
 AUX 64gle-gentoo.el 161 BLAKE2B 89fd74e68819e2f4653861a110ba977f205e2a200810c03f81297c87ea55167aec2dfcee87b187d310516fd36dd04e365afcaf8fa17c4691b4847071f2a35ad0 SHA512 eda9f1f3ef933aa9f43054c7eae6ec9200022723d91259fb6ba42ddbfbd01f8953d4dcd9aa541211b054c6c93947d7cada1db599db046443b90451cce9e3d7f8
-AUX gle-4.2.4b-parallel.patch 464 BLAKE2B 93348570ff1eb5d489ca6ed9eb3b5092c85a9e2e92dafc9dd208d580bd294603571cea8f2f2c4a04089805b2025faaeb425e4f576fb826c58519b7b428af74e3 SHA512 aeb1c1df07716844105cab33d84ffc5837a4a8b0452872360eaa169157ffdba88720783d421a0fd236a8ac89d128a1e75349d96566dc92f89b50a47352375cab
+AUX gle-4.2.5-c++14.patch 1113 BLAKE2B a75d450b3f067d3f1158618fbdbed69352e9660a60662de730a73b5c7917f1f64a6a2c10472a7f4ba8ae49f8860ba72e919385b863de74878933e3c8022e246b SHA512 aef210745cbf2deb265fde3839e5156eadd52d28029583b52bb53a9e2db26f6dfc6fd2243626be67ae6d00b1e0dbd1b03ed32f594541a569b1df289e78d8d367
+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 2091 BLAKE2B 36a1c0489a6fe3c0e7b814d0b04d5a973559cb44c4e6ac83b79efb76a633c85058b7d65aedd1932c20fbf4a8e01d14f448a9582ca85118cb4f780f1e12604ca4 SHA512 f8ecf99e0d53b2bfe71ad18b6ffb7c485c68cc027e236ea50d350dc1c7f20942d5f7c33d0f5c182d323d355432ff51fa23f5138672662a08df755928888762ae
-EBUILD gle-4.2.5.ebuild 2314 BLAKE2B e90414a83df92d6be1313726d7c2b5c9074b4e3da697c95b944fe5bed07eb4133301ffe8d1b69e027d4dc440578171ea34dac4d76ec7fca22604c96f8b16e08f SHA512 b1a4be632e722a9aa6fb6f9b344076cc45738e34e961a5e3071b1868204450208700901d0a04bd6e450514a4ffa046d09c4a0bb049bb8f5b77d14d43d769c96d
+EBUILD gle-4.2.5-r1.ebuild 2134 BLAKE2B bf4ea6ed5aed48ee23ea93bfbeceb9ff4031acf648629a1725d11dee5d0111af625fd502ac8ec5cf4ad02845e81500e2e4b5315f1458fd72fa9835fca1c23c96 SHA512 b8b7a648fb506ffc380dc287881def9116295a1447339268c9f064ca73f3410847c8468db4bf0682a34509c01a2a790555512d0cac880c4a3402e422678cb5af
 MISC metadata.xml 725 BLAKE2B a9da0308b21e8f2faea7a58fcba4ed9c4d2a136fc64992768236dd3c21705f3f324abfa83a0b598234a86e7bac5539be2b527ea6efa56fd4b44e44c43428ba45 SHA512 745264b5ccf026947f5a3c0a39b4199589d7831ec1f5de7c03f82b48ebbc590d57d973a7007a09d71135b60cf8129d38eeaab2a95785b62f76fccc6727db61ee
diff --git a/sci-visualization/gle/files/gle-4.2.5-c++14.patch b/sci-visualization/gle/files/gle-4.2.5-c++14.patch
new file mode 100644
index 000000000000..b548816ae065
--- /dev/null
+++ b/sci-visualization/gle/files/gle-4.2.5-c++14.patch
@@ -0,0 +1,27 @@
+diff -r -U2 gle-graphics-4.2.5.orig/src/gle/fitcf.h gle-graphics-4.2.5/src/gle/fitcf.h
+--- gle-graphics-4.2.5.orig/src/gle/fitcf.h	2015-08-16 13:51:24.000000000 +0600
++++ gle-graphics-4.2.5/src/gle/fitcf.h	2018-01-13 13:57:23.140749391 +0700
+@@ -182,8 +182,8 @@
+ typedef struct Namelist Namelist;
+ 
+-#define abs(x) ((x) >= 0 ? (x) : -(x))
++/*#define abs(x) ((x) >= 0 ? (x) : -(x))*/
+ #define dabs(x) (doublereal)abs(x)
+-#define min(a,b) ((a) <= (b) ? (a) : (b))
+-#define max(a,b) ((a) >= (b) ? (a) : (b))
++/*#define min(a,b) ((a) <= (b) ? (a) : (b))*/
++/*#define max(a,b) ((a) >= (b) ? (a) : (b))*/
+ #define dmin(a,b) (doublereal)min(a,b)
+ #define dmax(a,b) (doublereal)max(a,b)
+diff -r -U2 gle-graphics-4.2.5.orig/src/gle/surface/ffitcontour.cpp gle-graphics-4.2.5/src/gle/surface/ffitcontour.cpp
+--- gle-graphics-4.2.5.orig/src/gle/surface/ffitcontour.cpp	2015-08-16 13:51:24.000000000 +0600
++++ gle-graphics-4.2.5/src/gle/surface/ffitcontour.cpp	2018-01-13 14:08:08.169722265 +0700
+@@ -49,7 +49,7 @@
+ #include "f2c.h"
+ #else
+-#include "f2c.h"
+ #include <stdio.h>
+ #include <math.h>
++#include "f2c.h"
+ #endif
+ 
diff --git a/sci-visualization/gle/files/gle-4.2.4b-parallel.patch b/sci-visualization/gle/files/gle-4.2.5-parallel.patch
index 1eff8c067102..eeca1f5946ba 100644
--- a/sci-visualization/gle/files/gle-4.2.4b-parallel.patch
+++ b/sci-visualization/gle/files/gle-4.2.5-parallel.patch
@@ -1,7 +1,7 @@
---- src/gui/MakefileAC.in.orig	2010-01-06 20:10:04.000000000 +0000
-+++ src/gui/MakefileAC.in	2010-01-06 20:21:15.000000000 +0000
-@@ -84,14 +84,14 @@
- qmake:
+diff -r -U2 gle-graphics-4.2.5.orig/src/gui/MakefileAC.in gle-graphics-4.2.5/src/gui/MakefileAC.in
+--- gle-graphics-4.2.5.orig/src/gui/MakefileAC.in	2015-08-16 13:51:24.000000000 +0600
++++ gle-graphics-4.2.5/src/gui/MakefileAC.in	2018-01-13 14:23:09.066684378 +0700
+@@ -83,12 +83,12 @@
  	$(QMAKE_PROG) $(QMAKE_OPTS)
  
 -domake:
@@ -18,4 +18,3 @@
 +	-$(MAKE) clean
  	-@$(RM) qgle install_qgle_name_mac Makefile
  	-@$(RMDIR) moc
- 	-@$(RMDIR) objects
diff --git a/sci-visualization/gle/gle-4.2.5-r1.ebuild b/sci-visualization/gle/gle-4.2.5-r1.ebuild
index b16b4ee3425d..c9157c018093 100644
--- a/sci-visualization/gle/gle-4.2.5-r1.ebuild
+++ b/sci-visualization/gle/gle-4.2.5-r1.ebuild
@@ -1,7 +1,7 @@
 # Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
+EAPI=6
 inherit eutils elisp-common flag-o-matic autotools
 
 DESCRIPTION="Graphics Layout Engine"
@@ -30,8 +30,12 @@ RDEPEND="${DEPEND}
 
 S="${WORKDIR}"/${MY_P}
 
+PATCHES=( "${FILESDIR}"/${P}-parallel.patch
+		  "${FILESDIR}"/${P}-c++14.patch
+		)
+
 src_prepare() {
-	epatch "${FILESDIR}"/${PN}-4.2.4b-parallel.patch
+	default
 	eaclocal
 	eautoconf
 }
diff --git a/sci-visualization/gle/gle-4.2.5.ebuild b/sci-visualization/gle/gle-4.2.5.ebuild
deleted file mode 100644
index 178b6e82de0c..000000000000
--- a/sci-visualization/gle/gle-4.2.5.ebuild
+++ /dev/null
@@ -1,102 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-inherit eutils elisp-common qt4-r2 flag-o-matic autotools
-
-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"
-LICENSE="BSD-2 emacs? ( GPL-2 ) qt4? ( GPL-2 )"
-IUSE="X qt4 jpeg png tiff doc emacs vim-syntax"
-KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
-
-DEPEND="
-	sys-libs/ncurses:0=
-	X? ( x11-libs/libX11 )
-	qt4? ( dev-qt/qtopengl:4 )
-	jpeg? ( virtual/jpeg:0 )
-	png? ( media-libs/libpng:0= )
-	tiff? ( media-libs/tiff:0 )
-	doc? ( dev-texlive/texlive-latexextra )
-	emacs? ( virtual/emacs )"
-
-RDEPEND="${DEPEND}
-	app-text/ghostscript-gpl
-	virtual/latex-base
-	vim-syntax? ( || ( app-editors/vim app-editors/gvim ) )"
-
-S="${WORKDIR}"/${MY_P}
-
-src_prepare() {
-	epatch "${FILESDIR}"/${PN}-4.2.4b-parallel.patch
-	eaclocal
-	eautoconf
-}
-
-src_configure() {
-	# CPPFLAGS are understood as C++ flags
-	append-cppflags ${CXXFLAGS}
-	econf \
-		--without-rpath \
-		--with-manip \
-		$(use_with qt4 qt "${EPREFIX}"/usr) \
-		$(use_with X x) \
-		$(use_with jpeg) \
-		$(use_with png) \
-		$(use_with tiff)
-}
-
-src_compile() {
-	emake
-	if use doc; then
-		emake -j1 doc
-	fi
-	if use emacs; then
-		cd contrib/editors/highlighting
-		mv ${PN}-emacs.el ${PN}-mode.el
-		elisp-compile ${PN}-mode.el || die
-	fi
-}
-
-src_install() {
-	# -jN failed to install some data files
-	emake -j1 DESTDIR="${D}" install
-	rm -rf "${ED}"/usr/share/doc/gle-graphics
-	dodoc README.txt
-
-	if use qt4; then
-		newicon src/gui/images/gle_icon.png gle.png
-		make_desktop_entry qgle GLE gle
-		newdoc src/gui/readme.txt gui_readme.txt
-	fi
-
-	if use doc; then
-		insinto /usr/share/doc/${PF}
-		doins build/doc/gle-manual.pdf
-	fi
-
-	if use emacs; then
-		elisp-install ${PN} contrib/editors/highlighting/gle-mode.{el,elc} || die
-		elisp-site-file-install "${FILESDIR}"/64gle-gentoo.el || die
-	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/*
-		insinto /usr/share/vim/vimfiles
-		doins -r ftplugin indent syntax
-	fi
-}
-
-pkg_postinst() {
-	use emacs && elisp-site-regen
-}
-
-pkg_postrm() {
-	use emacs && elisp-site-regen
-}