From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id 5558B138334 for ; Mon, 1 Jul 2019 07:29:49 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 68111E07D4; Mon, 1 Jul 2019 07:29:48 +0000 (UTC) Received: from smtp.gentoo.org (woodpecker.gentoo.org [IPv6:2001:470:ea4a:1:5054:ff:fec7:86e4]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 499BFE07D4 for ; Mon, 1 Jul 2019 07:29:48 +0000 (UTC) Received: from oystercatcher.gentoo.org (unknown [IPv6:2a01:4f8:202:4333:225:90ff:fed9:fc84]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 0FAA8346D53 for ; Mon, 1 Jul 2019 07:29:47 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 71148627 for ; Mon, 1 Jul 2019 07:29:45 +0000 (UTC) From: "Andreas Sturmlechner" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Andreas Sturmlechner" Message-ID: <1561966155.0a3f5bcc8a6ba9b1743401e31d2ed2f50e904b2f.asturm@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: x11-libs/libQGLViewer/ X-VCS-Repository: repo/gentoo X-VCS-Files: x11-libs/libQGLViewer/libQGLViewer-2.7.1.ebuild X-VCS-Directories: x11-libs/libQGLViewer/ X-VCS-Committer: asturm X-VCS-Committer-Name: Andreas Sturmlechner X-VCS-Revision: 0a3f5bcc8a6ba9b1743401e31d2ed2f50e904b2f X-VCS-Branch: master Date: Mon, 1 Jul 2019 07:29:45 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply X-Archives-Salt: 9b863fa4-3655-4c0e-a1ca-e606f3506901 X-Archives-Hash: 3a11b6f33d8cb78ee7f7f1b2192c67f2 commit: 0a3f5bcc8a6ba9b1743401e31d2ed2f50e904b2f Author: Andreas Sturmlechner gentoo org> AuthorDate: Mon Jul 1 06:32:57 2019 +0000 Commit: Andreas Sturmlechner gentoo 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 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