| 1 |
commit: 0a3f5bcc8a6ba9b1743401e31d2ed2f50e904b2f |
| 2 |
Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Mon Jul 1 06:32:57 2019 +0000 |
| 4 |
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Mon Jul 1 07:29:15 2019 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=0a3f5bcc |
| 7 |
|
| 8 |
x11-libs/libQGLViewer: EAPI-7 bump, missing || die |
| 9 |
|
| 10 |
Package-Manager: Portage-2.3.68, Repoman-2.3.16 |
| 11 |
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org> |
| 12 |
|
| 13 |
x11-libs/libQGLViewer/libQGLViewer-2.7.1.ebuild | 25 ++++++++++++++----------- |
| 14 |
1 file changed, 14 insertions(+), 11 deletions(-) |
| 15 |
|
| 16 |
diff --git a/x11-libs/libQGLViewer/libQGLViewer-2.7.1.ebuild b/x11-libs/libQGLViewer/libQGLViewer-2.7.1.ebuild |
| 17 |
index 19eae03cf76..9354dafafbb 100644 |
| 18 |
--- a/x11-libs/libQGLViewer/libQGLViewer-2.7.1.ebuild |
| 19 |
+++ b/x11-libs/libQGLViewer/libQGLViewer-2.7.1.ebuild |
| 20 |
@@ -1,9 +1,9 @@ |
| 21 |
-# Copyright 1999-2018 Gentoo Foundation |
| 22 |
+# Copyright 1999-2019 Gentoo Authors |
| 23 |
# Distributed under the terms of the GNU General Public License v2 |
| 24 |
|
| 25 |
-EAPI="5" |
| 26 |
+EAPI=7 |
| 27 |
|
| 28 |
-inherit qmake-utils multilib flag-o-matic |
| 29 |
+inherit flag-o-matic qmake-utils |
| 30 |
|
| 31 |
DESCRIPTION="C++ library based on Qt that eases the creation of OpenGL 3D viewers" |
| 32 |
HOMEPAGE="http://www.libqglviewer.com" |
| 33 |
@@ -14,18 +14,21 @@ SLOT="0/qt5" |
| 34 |
KEYWORDS="~amd64 ~arm" |
| 35 |
IUSE="designer examples" |
| 36 |
|
| 37 |
-DEPEND="virtual/opengl |
| 38 |
- virtual/glu |
| 39 |
- dev-qt/qtopengl:5 |
| 40 |
+DEPEND=" |
| 41 |
dev-qt/qtcore:5 |
| 42 |
+ dev-qt/qtgui:5 |
| 43 |
+ dev-qt/qtopengl:5 |
| 44 |
dev-qt/qtwidgets:5 |
| 45 |
dev-qt/qtxml:5 |
| 46 |
- dev-qt/qtgui:5" |
| 47 |
+ virtual/glu |
| 48 |
+ virtual/opengl |
| 49 |
+" |
| 50 |
RDEPEND="${DEPEND} |
| 51 |
- designer? ( dev-qt/designer:5 )" |
| 52 |
+ designer? ( dev-qt/designer:5 ) |
| 53 |
+" |
| 54 |
|
| 55 |
src_configure() { |
| 56 |
- append-ldflags "-L${S}/QGLViewer" |
| 57 |
+ append-ldflags "-LQGLViewer" |
| 58 |
sed -e 's#designerPlugin##' -i ${P}.pro || die |
| 59 |
use examples || sed -e 's#examples examples/contribs##' -i ${P}.pro || die |
| 60 |
eqmake5 ${P}.pro \ |
| 61 |
@@ -33,7 +36,7 @@ src_configure() { |
| 62 |
LIB_DIR="${EPREFIX}/usr/$(get_libdir)" \ |
| 63 |
DOC_DIR="${EPREFIX}/usr/share/doc/${PF}/html" |
| 64 |
if use designer ; then |
| 65 |
- cd "${S}/designerPlugin" |
| 66 |
+ cd "designerPlugin" || die |
| 67 |
eqmake5 designerPlugin.pro |
| 68 |
fi |
| 69 |
} |
| 70 |
@@ -43,7 +46,7 @@ src_install() { |
| 71 |
dodoc README |
| 72 |
|
| 73 |
if use designer ; then |
| 74 |
- cd "${S}/designerPlugin" |
| 75 |
+ cd "${S}/designerPlugin" || die |
| 76 |
emake INSTALL_ROOT="${D}" install |
| 77 |
fi |
Archives