gentoo resync : 31.12.2017 (final resync this year)

2 files changed, 12 insertions, 22 deletions

diff --git a/sci-visualization/gle/Manifest b/sci-visualization/gle/Manifest
index 7ff2862de203..ec6f8a39fc62 100644
--- a/sci-visualization/gle/Manifest
+++ b/sci-visualization/gle/Manifest
@@ -1,9 +1,6 @@
 AUX 64gle-gentoo.el 161 BLAKE2B 89fd74e68819e2f4653861a110ba977f205e2a200810c03f81297c87ea55167aec2dfcee87b187d310516fd36dd04e365afcaf8fa17c4691b4847071f2a35ad0 SHA512 eda9f1f3ef933aa9f43054c7eae6ec9200022723d91259fb6ba42ddbfbd01f8953d4dcd9aa541211b054c6c93947d7cada1db599db046443b90451cce9e3d7f8
 AUX gle-4.2.4b-parallel.patch 464 BLAKE2B 93348570ff1eb5d489ca6ed9eb3b5092c85a9e2e92dafc9dd208d580bd294603571cea8f2f2c4a04089805b2025faaeb425e4f576fb826c58519b7b428af74e3 SHA512 aeb1c1df07716844105cab33d84ffc5837a4a8b0452872360eaa169157ffdba88720783d421a0fd236a8ac89d128a1e75349d96566dc92f89b50a47352375cab
-DIST GLEusersguide.pdf 2244780 BLAKE2B c00f6788b8cd27b0c76731f3aee5717efded726555ad68d97f7bc54be51526a259baf7580dfcbc86decf566eb75b846f44545f98389e6716c81afb5055721551 SHA512 cce76a83d09a68d449f4e3717e9dfcaa6c0866a1c36eb58f7180c2602f8a780804278804fee555ae6360bcf8b10b34c2124408975ea49824ab5d8ae23685fc71
-DIST gle-graphics-4.2.4cf-src.tar.gz 2321647 BLAKE2B a48759c0181fc34a8f235e39e06352b85e5717ea650588cfeb08342eea1b4ba56e7ace54cc8e6970b40423b31c0c70a832579cc11c0f5c6b20679d955a68137c SHA512 961205fcb763ef0fd0b59cfffd144440ea7dea8a54a19e79caa97712245a51ceaaeda5b92ce2571852cec14357af696861bf9cd588aa08622cc8f1f5ebf3959a
 DIST gle-graphics-4.2.5f-src.tar.gz 2330270 BLAKE2B 46435a2366a278a88786a2dd0e0cbcc48d3ba2fc6d895fb07c81216089a10b2223b2ba692b951ee01a6ab014e84cce9aa3969d063ddf7d04501820aa33084c5c SHA512 d459b24577c9c3f8825c368f864532c97d0a37c94018276a60c941d17dce0e55fe738f7eda3227a47848f2fb32fea1dcec29d9751a5be92cde4d8d38a2eeb0f5
-DIST gle-manual-4.2.2.pdf 2238766 BLAKE2B 0998b0172d6d4039bd8f5942414dddb6200258975bd3267582b7a38bc2dae1e1af6dd4756d483b274e1a3189809f36c7a432b14a24a59ef2e360749e2446d997 SHA512 0eaa10f1f13c2f65145cbeb8f713b6de787dcc7dd3c3a30e27514b1cc8e74007d38adc12fc7666d665677354c7c14db521dea05126614def4ec30f3429cd1a41
-EBUILD gle-4.2.4c.ebuild 2428 BLAKE2B 05977b0c6913e8c83b8cae8203ea9f60d3362f652e9162f3441f50e2f0fec9acb1243150950fc114d955956b25bc20cd133cfbc1d12a401b5f663b85f559d5e1 SHA512 ee4b18afcbd8fd31e950a4e8ed8675e7b119ec52e31cbaae4e3c405cc6ed4e50e851278522c9abb21eec2bc1fc35dfc1d0384b8181fdf8934f432f7752caa49c
+EBUILD gle-4.2.5-r1.ebuild 2074 BLAKE2B 102370cbf7b9238be08a3c9eaf3ae6fd278f58b229e5fe361634732a104c56223ff22d14cd96cac7ef4d235c59f7a3b070bf55cf76e72bc7bd90b3d41d4b43be SHA512 b31d30f09e3d33aad156357ee3e36051da86a5c0117792114389376ef1a31fde40e841bb45140a275c29fbb80ad6b74be3e2a8b17588cbadf3c6c2eb6b407986
 EBUILD gle-4.2.5.ebuild 2314 BLAKE2B e90414a83df92d6be1313726d7c2b5c9074b4e3da697c95b944fe5bed07eb4133301ffe8d1b69e027d4dc440578171ea34dac4d76ec7fca22604c96f8b16e08f SHA512 b1a4be632e722a9aa6fb6f9b344076cc45738e34e961a5e3071b1868204450208700901d0a04bd6e450514a4ffa046d09c4a0bb049bb8f5b77d14d43d769c96d
 MISC metadata.xml 725 BLAKE2B a9da0308b21e8f2faea7a58fcba4ed9c4d2a136fc64992768236dd3c21705f3f324abfa83a0b598234a86e7bac5539be2b527ea6efa56fd4b44e44c43428ba45 SHA512 745264b5ccf026947f5a3c0a39b4199589d7831ec1f5de7c03f82b48ebbc590d57d973a7007a09d71135b60cf8129d38eeaab2a95785b62f76fccc6727db61ee
diff --git a/sci-visualization/gle/gle-4.2.4c.ebuild b/sci-visualization/gle/gle-4.2.5-r1.ebuild
index 5df58681d2a3..322a1e5c6b24 100644
--- a/sci-visualization/gle/gle-4.2.4c.ebuild
+++ b/sci-visualization/gle/gle-4.2.5-r1.ebuild
@@ -1,28 +1,26 @@
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2017 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
+inherit eutils elisp-common 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
-	doc? ( mirror://sourceforge/glx/${PN}-manual-${MAN_V}.pdf
-		   mirror://sourceforge/glx/GLEusersguide.pdf )"
+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"
+LICENSE="BSD-2 emacs? ( GPL-2 )"
+IUSE="X 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}
@@ -44,7 +42,6 @@ src_configure() {
 	econf \
 		--without-rpath \
 		--with-manip \
-		$(use_with qt4 qt "${EPREFIX}"/usr) \
 		$(use_with X x) \
 		$(use_with jpeg) \
 		$(use_with png) \
@@ -53,6 +50,9 @@ src_configure() {
 
 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
@@ -63,19 +63,12 @@ src_compile() {
 src_install() {
 	# -jN failed to install some data files
 	emake -j1 DESTDIR="${D}" install
-	rmdir "${ED}"/usr/share/doc/gle-graphics || die "rmdir gle-graphics failed"
+	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 "${DISTDIR}"/${PN}-manual-${MAN_V}.pdf \
-			"${DISTDIR}"/GLEusersguide.pdf
+		doins build/doc/gle-manual.pdf
 	fi
 
 	if use emacs; then