From 23d1ca39da33bf28361b998515c008833416d11f Mon Sep 17 00:00:00 2001 From: Andreas Sturmlechner Date: Mon, 7 Dec 2020 21:37:09 +0100 Subject: x11-libs/qwt: EAPI-7 bump, use qmake-utils, drop IUSE=static-libs - Drop man files colliding with qwt:6 - Drop bogus src_test phase Package-Manager: Portage-3.0.12, Repoman-3.0.2 Signed-off-by: Andreas Sturmlechner --- x11-libs/qwt/files/qwt-5.2.3-install_qt.patch | 6 +-- x11-libs/qwt/qwt-5.2.3-r2.ebuild | 67 +++++++++------------------ 2 files changed, 25 insertions(+), 48 deletions(-) diff --git a/x11-libs/qwt/files/qwt-5.2.3-install_qt.patch b/x11-libs/qwt/files/qwt-5.2.3-install_qt.patch index 48e93858..096e1ff9 100644 --- a/x11-libs/qwt/files/qwt-5.2.3-install_qt.patch +++ b/x11-libs/qwt/files/qwt-5.2.3-install_qt.patch @@ -1,6 +1,6 @@ -diff -up qwt-5.2.2/designer/designer.pro.install_qt qwt-5.2.2/designer/designer.pro ---- qwt-5.2.2/designer/designer.pro.install_qt 2011-08-01 04:28:22.000000000 -0500 -+++ qwt-5.2.2/designer/designer.pro 2012-08-14 11:11:22.569229749 -0500 +diff -up a/designer/designer.pro b/designer/designer.pro +--- a/designer/designer.pro 2011-08-01 04:28:22.000000000 -0500 ++++ b/designer/designer.pro 2012-08-14 11:11:22.569229749 -0500 @@ -36,6 +37,7 @@ contains(CONFIG, QwtDesigner) { else { SUFFIX_STR = $${RELEASE_SUFFIX} diff --git a/x11-libs/qwt/qwt-5.2.3-r2.ebuild b/x11-libs/qwt/qwt-5.2.3-r2.ebuild index 4e584bb9..98ae9e95 100644 --- a/x11-libs/qwt/qwt-5.2.3-r2.ebuild +++ b/x11-libs/qwt/qwt-5.2.3-r2.ebuild @@ -1,30 +1,34 @@ -# Copyright 1999-2017 Gentoo Foundation +# Copyright 1999-2020 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=5 +EAPI=7 -inherit eutils multibuild qt4-r2 +inherit qmake-utils DESCRIPTION="2D plotting library for Qt4" HOMEPAGE="http://qwt.sourceforge.net/" SRC_URI="mirror://sourceforge/${PN}/${P}.tar.bz2" LICENSE="qwt" -KEYWORDS="amd64 ~arm ~ppc ~ppc64 ~sparc x86 ~x86-macos" SLOT="5" -IUSE="doc examples static-libs svg" +KEYWORDS="amd64 ~arm ~ppc ~ppc64 ~sparc x86 ~x86-macos" +IUSE="doc examples svg" DEPEND=" dev-qt/designer:4 + dev-qt/qtcore:4 dev-qt/qtgui:4 - doc? ( ! qwtconfig.pri <<-EOF @@ -41,47 +45,20 @@ src_prepare() { sed -i -e 's/headers doc/headers/' src/src.pro || die use svg && echo >> qwtconfig.pri "CONFIG += QwtSVGItem" - MULTIBUILD_VARIANTS=( ) - use static-libs && MULTIBUILD_VARIANTS+=( static ) - MULTIBUILD_VARIANTS+=( shared ) - - qt4-r2_src_prepare - - preparation() { - cp -rf "${S}" "${BUILD_DIR}" || die - [[ ${MULTIBUILD_VARIANT} == shared ]] && \ - echo "CONFIG += QwtDll" >> "${BUILD_DIR}"/qwtconfig.pri - } - - multibuild_foreach_variant preparation + echo "CONFIG += QwtDll" >> qwtconfig.pri } src_configure() { - multibuild_parallel_foreach_variant run_in_build_dir eqmake4 ${PN}.pro -} - -src_compile() { - multibuild_foreach_variant run_in_build_dir qt4-r2_src_compile -} - -src_test() { - testing() { - cd examples || die - eqmake4 examples.pro - emake - } - multibuild_foreach_variant run_in_build_dir testing + eqmake4 } -src_install () { - multibuild_foreach_variant run_in_build_dir qt4-r2_src_install +src_install() { + emake INSTALL_ROOT="${D}" install + einstalldocs if use doc; then - insinto /usr/share/doc/${PF} - rm doc/man/*/*license* || die - rm -f doc/man/*/{_,deprecated}* || die - doman doc/man/*/* - doins -r doc/html + docinto html + dodoc -r doc/html/. fi if use examples; then # don't build examples - fix the qt files to build once installed @@ -95,7 +72,7 @@ src_install () { EOF sed -i -e 's:../qwtconfig:qwtconfig:' examples/examples.pro || die cp *.pri examples/ || die - insinto /usr/share/${PN}5 - doins -r examples + docinto examples + dodoc -r examples/. fi } -- cgit v1.2.3-65-gdbad