[gentoo-commits] repo/gentoo:master commit in: x11-libs/libQGLViewer/

["Andreas Sturmlechner" <asturm@gentoo.org>]

commit:     0a3f5bcc8a6ba9b1743401e31d2ed2f50e904b2f
Author:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Mon Jul  1 06:32:57 2019 +0000
Commit:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Mon Jul  1 07:29:15 2019 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=0a3f5bcc

x11-libs/libQGLViewer: EAPI-7 bump, missing || die

Package-Manager: Portage-2.3.68, Repoman-2.3.16
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>

 x11-libs/libQGLViewer/libQGLViewer-2.7.1.ebuild | 25 ++++++++++++++-----------
 1 file changed, 14 insertions(+), 11 deletions(-)

diff --git a/x11-libs/libQGLViewer/libQGLViewer-2.7.1.ebuild b/x11-libs/libQGLViewer/libQGLViewer-2.7.1.ebuild
index 19eae03cf76..9354dafafbb 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