From 51af5f0eb4cddbe6aa7953717873691d77aae9ff Mon Sep 17 00:00:00 2001
From: V3n3RiX <venerix@redcorelinux.org>
Date: Wed, 10 Jul 2019 23:40:16 +0100
Subject: gentoo resync : 11.07.2019

---
 x11-libs/libQGLViewer/Manifest                  |  2 +-
 x11-libs/libQGLViewer/libQGLViewer-2.7.1.ebuild | 25 ++++++++++++++-----------
 2 files changed, 15 insertions(+), 12 deletions(-)

(limited to 'x11-libs/libQGLViewer')

diff --git a/x11-libs/libQGLViewer/Manifest b/x11-libs/libQGLViewer/Manifest
index 1941ed2568d1..6e25da847c88 100644
--- a/x11-libs/libQGLViewer/Manifest
+++ b/x11-libs/libQGLViewer/Manifest
@@ -1,3 +1,3 @@
 DIST libQGLViewer-2.7.1.tar.gz 3078737 BLAKE2B 0374c60374af0f4594ee79fafd53440654e9bb5114cef38e50deba86584cc55eef03d2177b5d54829f5b111d4d029384fff19f8a5bebf750cac1ab8cfe6afaa5 SHA512 1f597d737614f07682bde0d886c9c2eee57f478607a4caeac40922f66a6310ff30ea32e8ab44de0b23e0d1e5db2e6deea8c4fe3bc2cddc78ed5b971f638b09bd
-EBUILD libQGLViewer-2.7.1.ebuild 1291 BLAKE2B 711010c65c0a0cebe90f239d1f223ee3a66cce014770e712b9997eca165bd39af562a44d000f5271aec7df0cb303c924ffe0785166b4ed0dc567940d9a011f7a SHA512 6620cba4f14e98f4b827ded73d98a9ef935fd7da30a8908005cad327b339f4a962a6476b2890f27565e129adf9a326058d8f644acaf7d50d69ed0259cf0e87ed
+EBUILD libQGLViewer-2.7.1.ebuild 1285 BLAKE2B 9ce932050319d865cadff1ee5d8521774f5391fe761e61bda3af5566e4d26d1a3ffacc9e68e6d899bfb569d71bd7ddd4f96383f0437b3870d000b6c8a92af48c SHA512 db5405f9bde9c3a516dc27a17f1041b3b3ea499ab4f63428d03a1142e00cbdfa3b04d8264ba0ddbefb3b2dc41eda0983e4878370d165f6a7cb832dc5501184e5
 MISC metadata.xml 337 BLAKE2B d41f3f134ae930728e76d4924cd145a6a958482a008c047deda9e0ac8864496ceed43f939792583cc49bb572785a4924fb3e44da738b6ea2c84e43ca592844f4 SHA512 a699f6197293d6a53643064a2bcb524626e70c2f9557e8599ceadcf16b8d0fceeb98da2eb3691ed4b2fae0385416b1c238b3eff76228c3f420995b1d62f05e4e
diff --git a/x11-libs/libQGLViewer/libQGLViewer-2.7.1.ebuild b/x11-libs/libQGLViewer/libQGLViewer-2.7.1.ebuild
index 19eae03cf769..9354dafafbbd 100644
--- a/x11-libs/libQGLViewer/libQGLViewer-2.7.1.ebuild
+++ b/x11-libs/libQGLViewer/libQGLViewer-2.7.1.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI="5"
+EAPI=7
 
-inherit qmake-utils multilib flag-o-matic
+inherit flag-o-matic qmake-utils
 
 DESCRIPTION="C++ library based on Qt that eases the creation of OpenGL 3D viewers"
 HOMEPAGE="http://www.libqglviewer.com"
@@ -14,18 +14,21 @@ SLOT="0/qt5"
 KEYWORDS="~amd64 ~arm"
 IUSE="designer examples"
 
-DEPEND="virtual/opengl
-	virtual/glu
-	dev-qt/qtopengl:5
+DEPEND="
 	dev-qt/qtcore:5
+	dev-qt/qtgui:5
+	dev-qt/qtopengl:5
 	dev-qt/qtwidgets:5
 	dev-qt/qtxml:5
-	dev-qt/qtgui:5"
+	virtual/glu
+	virtual/opengl
+"
 RDEPEND="${DEPEND}
-	designer? ( dev-qt/designer:5 )"
+	designer? ( dev-qt/designer:5 )
+"
 
 src_configure() {
-	append-ldflags "-L${S}/QGLViewer"
+	append-ldflags "-LQGLViewer"
 	sed -e 's#designerPlugin##' -i ${P}.pro || die
 	use examples || sed -e 's#examples examples/contribs##' -i ${P}.pro || die
 	eqmake5 ${P}.pro \
@@ -33,7 +36,7 @@ src_configure() {
 		LIB_DIR="${EPREFIX}/usr/$(get_libdir)" \
 		DOC_DIR="${EPREFIX}/usr/share/doc/${PF}/html"
 	if use designer ; then
-		cd "${S}/designerPlugin"
+		cd "designerPlugin" || die
 		eqmake5 designerPlugin.pro
 	fi
 }
@@ -43,7 +46,7 @@ src_install() {
 	dodoc README
 
 	if use designer ; then
-		cd "${S}/designerPlugin"
+		cd "${S}/designerPlugin" || die
 		emake INSTALL_ROOT="${D}" install
 	fi
 
-- 
cgit v1.2.3