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 DA3341382C5 for ; Thu, 21 May 2020 19:12:04 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id ECF26E095F; Thu, 21 May 2020 19:12:03 +0000 (UTC) Received: from smtp.gentoo.org (dev.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 C6183E095F for ; Thu, 21 May 2020 19:12:03 +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 3026634F27A for ; Thu, 21 May 2020 19:12:02 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 51B0B230 for ; Thu, 21 May 2020 19:12:00 +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: <1590088312.8363d2a5defadbf903e0216ccab4fe3e11f37aaf.asturm@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: sci-electronics/qelectrotech/ X-VCS-Repository: repo/gentoo X-VCS-Files: sci-electronics/qelectrotech/qelectrotech-0.61.ebuild sci-electronics/qelectrotech/qelectrotech-9999.ebuild X-VCS-Directories: sci-electronics/qelectrotech/ X-VCS-Committer: asturm X-VCS-Committer-Name: Andreas Sturmlechner X-VCS-Revision: 8363d2a5defadbf903e0216ccab4fe3e11f37aaf X-VCS-Branch: master Date: Thu, 21 May 2020 19:12:00 +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: fe9e0fee-51a8-4c4a-9142-ea9f0e1ac6a0 X-Archives-Hash: 4f10ea7d0200a6e36f7e5a6c385bf5b3 commit: 8363d2a5defadbf903e0216ccab4fe3e11f37aaf Author: Andreas Sturmlechner gentoo org> AuthorDate: Thu May 21 19:02:45 2020 +0000 Commit: Andreas Sturmlechner gentoo org> CommitDate: Thu May 21 19:11:52 2020 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=8363d2a5 sci-electronics/qelectrotech: EAPI-7 bump Package-Manager: Portage-2.3.99, Repoman-2.3.22 Signed-off-by: Andreas Sturmlechner gentoo.org> .../qelectrotech/qelectrotech-0.61.ebuild | 25 +++++++++++----------- .../qelectrotech/qelectrotech-9999.ebuild | 25 +++++++++++----------- 2 files changed, 26 insertions(+), 24 deletions(-) diff --git a/sci-electronics/qelectrotech/qelectrotech-0.61.ebuild b/sci-electronics/qelectrotech/qelectrotech-0.61.ebuild index 5a06d6c2f6a..38d8540b0f5 100644 --- a/sci-electronics/qelectrotech/qelectrotech-0.61.ebuild +++ b/sci-electronics/qelectrotech/qelectrotech-0.61.ebuild @@ -1,11 +1,10 @@ -# Copyright 1999-2018 Gentoo Authors +# Copyright 1999-2020 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=6 - -inherit gnome2-utils qmake-utils xdg-utils +EAPI=7 MY_P=${PN}-${PV%0}-src +inherit qmake-utils xdg-utils DESCRIPTION="Qt5 application to design electric diagrams" HOMEPAGE="https://qelectrotech.org/" @@ -16,6 +15,9 @@ SLOT="0" KEYWORDS="amd64 x86" IUSE="doc" +BDEPEND=" + doc? ( app-doc/doxygen ) +" RDEPEND=" dev-qt/qtconcurrent:5 dev-qt/qtcore:5 @@ -27,13 +29,12 @@ RDEPEND=" dev-qt/qtwidgets:5 dev-qt/qtxml:5 " -DEPEND="${RDEPEND} - doc? ( app-doc/doxygen ) -" +DEPEND="${RDEPEND}" S=${WORKDIR}/${MY_P} DOCS=( CREDIT ChangeLog README ) + PATCHES=( "${FILESDIR}/${PN}-0.3-fix-paths.patch" ) src_configure() { @@ -43,22 +44,22 @@ src_configure() { src_install() { emake INSTALL_ROOT="${D}" install - einstalldocs - if use doc; then doxygen Doxyfile || die - dodoc -r doc/html + local HTML_DOCS=( doc/html/. ) fi + + einstalldocs } pkg_postinst() { xdg_desktop_database_update xdg_mimeinfo_database_update - gnome2_icon_cache_update + xdg_icon_cache_update } pkg_postrm() { xdg_desktop_database_update xdg_mimeinfo_database_update - gnome2_icon_cache_update + xdg_icon_cache_update } diff --git a/sci-electronics/qelectrotech/qelectrotech-9999.ebuild b/sci-electronics/qelectrotech/qelectrotech-9999.ebuild index beb66ed5e78..3f4b1b8d7a2 100644 --- a/sci-electronics/qelectrotech/qelectrotech-9999.ebuild +++ b/sci-electronics/qelectrotech/qelectrotech-9999.ebuild @@ -1,11 +1,10 @@ -# Copyright 2001-2018 Gentoo Authors +# Copyright 2001-2020 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=6 - -inherit gnome2-utils qmake-utils subversion xdg-utils +EAPI=7 MY_P=${PN}-${PV%0}-src +inherit qmake-utils subversion xdg-utils DESCRIPTION="Qt5 application to design electric diagrams" HOMEPAGE="https://qelectrotech.org/" @@ -16,6 +15,9 @@ SLOT="0" KEYWORDS="" IUSE="doc" +BDEPEND=" + doc? ( app-doc/doxygen ) +" RDEPEND=" dev-qt/qtconcurrent:5 dev-qt/qtcore:5 @@ -27,13 +29,12 @@ RDEPEND=" dev-qt/qtwidgets:5 dev-qt/qtxml:5 " -DEPEND="${RDEPEND} - doc? ( app-doc/doxygen ) -" +DEPEND="${RDEPEND}" S=${WORKDIR}/${MY_P} DOCS=( CREDIT ChangeLog README ) + PATCHES=( "${FILESDIR}/${PN}-0.3-fix-paths.patch" ) src_configure() { @@ -43,22 +44,22 @@ src_configure() { src_install() { emake INSTALL_ROOT="${D}" install - einstalldocs - if use doc; then doxygen Doxyfile || die - dodoc -r doc/html + local HTML_DOCS=( doc/html/. ) fi + + einstalldocs } pkg_postinst() { xdg_desktop_database_update xdg_mimeinfo_database_update - gnome2_icon_cache_update + xdg_icon_cache_update } pkg_postrm() { xdg_desktop_database_update xdg_mimeinfo_database_update - gnome2_icon_cache_update + xdg_icon_cache_update }