commit: 34cbddba12337afd34a28890034439748c436444 Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org> AuthorDate: Thu Jun 28 18:41:43 2018 +0000 Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org> CommitDate: Thu Jun 28 18:46:19 2018 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=34cbddba
x11-libs/qwt: Drop Qt4-based slot 5 Closes: https://bugs.gentoo.org/655382 Package-Manager: Portage-2.3.41, Repoman-2.3.9 profiles/package.mask | 1 - x11-libs/qwt/Manifest | 1 - x11-libs/qwt/files/qwt-5.2.3-install_qt.patch | 28 ------- x11-libs/qwt/qwt-5.2.3-r2.ebuild | 101 -------------------------- 4 files changed, 131 deletions(-) diff --git a/profiles/package.mask b/profiles/package.mask index 9e72cce8fda..afd01439ee6 100644 --- a/profiles/package.mask +++ b/profiles/package.mask @@ -60,7 +60,6 @@ app-eselect/eselect-qtgraphicssystem <media-sound/mumble-1.3 <media-sound/murmur-1.3 <net-analyzer/ostinato-0.9_p20180522 -x11-libs/qwt:5 # Andreas Sturmlechner <ast...@gentoo.org> (26 Jun 2018) # Depends on dead Qt4. Masked for removal. Bugs #644364, #644368, #644362 diff --git a/x11-libs/qwt/Manifest b/x11-libs/qwt/Manifest index e1795ac93e0..9486803efab 100644 --- a/x11-libs/qwt/Manifest +++ b/x11-libs/qwt/Manifest @@ -1,2 +1 @@ -DIST qwt-5.2.3.tar.bz2 1983725 BLAKE2B 24c9d5c9b660ec082266a02da59b89ec0f8f4eea085fa83a3d773a18e452f0be6845d9584d9ddb0e51aa9a2e4f7fe0980a236d36b6930abbbfa7f6b0f9d8e1a9 SHA512 60545712790699b145a54baba4c40802d9a58bf5f68f997faed5027db6773a801097be8675e00b2af1de568e36e2e498db0a0310ac4877fd9f2b52871409dd49 DIST qwt-6.1.3.tar.bz2 4245614 BLAKE2B 5461602702eb159c5c9131eb554d6a619f40c459432c3f32f98b55e4b659d37848fbc0691baeaf691155bae83f68b9c91d3fee430935dd0c1b29e6fceac7a36f SHA512 d4a73e9e7ddcb7c16c508920a298784935be2eddc8f7585993d9fffe1bb01e1787a0d5d7ea4f220398b94ea2b211a19009dccaeadce56a84410357124bcb051a 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 deleted file mode 100644 index 48e9385811f..00000000000 --- a/x11-libs/qwt/files/qwt-5.2.3-install_qt.patch +++ /dev/null @@ -1,28 +0,0 @@ -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 -@@ -36,6 +37,7 @@ contains(CONFIG, QwtDesigner) { - else { - SUFFIX_STR = $${RELEASE_SUFFIX} - } -+ LIBNAME = qwt$${SUFFIX_STR} - } - - TEMPLATE = lib -@@ -45,7 +47,6 @@ contains(CONFIG, QwtDesigner) { - INCLUDEPATH += $${QWT_ROOT}/src - DEPENDPATH += $${QWT_ROOT}/src - -- LIBNAME = qwt$${SUFFIX_STR} - contains(CONFIG, QwtDll) { - win32 { - DEFINES += QT_DLL QWT_DLL -@@ -103,7 +104,7 @@ contains(CONFIG, QwtDesigner) { - - # Qt 4 - -- TARGET = qwt_designer_plugin$${SUFFIX_STR} -+ TARGET = qwt5_designer_plugin$${SUFFIX_STR} - CONFIG += qt designer plugin - - RCC_DIR = resources diff --git a/x11-libs/qwt/qwt-5.2.3-r2.ebuild b/x11-libs/qwt/qwt-5.2.3-r2.ebuild deleted file mode 100644 index 73b753b76ec..00000000000 --- a/x11-libs/qwt/qwt-5.2.3-r2.ebuild +++ /dev/null @@ -1,101 +0,0 @@ -# Copyright 1999-2017 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI=5 - -inherit eutils multibuild qt4-r2 - -DESCRIPTION="2D plotting library for Qt4" -HOMEPAGE="http://qwt.sourceforge.net/"; -SRC_URI="mirror://sourceforge/${PN}/${P}.tar.bz2" - -LICENSE="qwt" -KEYWORDS="~alpha amd64 arm ia64 ppc ppc64 sparc x86 ~x86-macos" -SLOT="5" -IUSE="doc examples static-libs svg" - -DEPEND=" - dev-qt/designer:4 - dev-qt/qtgui:4 - doc? ( !<media-libs/coin-3.1.3[doc] ) - svg? ( dev-qt/qtsvg:4 )" -RDEPEND="${DEPEND}" - -DOCS="CHANGES README" - -src_prepare() { - epatch "${FILESDIR}"/${P}-install_qt.patch - sed -e "/QwtVersion/s:5.2.2.:${PV}:g" -i ${PN}.prf || die - - cat > qwtconfig.pri <<-EOF - target.path = "${EPREFIX}/usr/$(get_libdir)" - headers.path = "${EPREFIX}/usr/include/qwt5" - doc.path = "${EPREFIX}/usr/share/doc/${PF}" - CONFIG += qt warn_on thread release - CONFIG += QwtPlot QwtWidgets QwtDesigner - VERSION = ${PV} - QWT_VERSION = ${PV/_*} - QWT_INSTALL_PLUGINS = "${EPREFIX}/usr/$(get_libdir)/qt4/plugins/designer" - QWT_INSTALL_FEATURES = "${EPREFIX}/usr/share/qt4/mkspecs/features" - EOF - 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 -} - -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 -} - -src_install () { - multibuild_foreach_variant run_in_build_dir qt4-r2_src_install - - 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 - fi - if use examples; then - # don't build examples - fix the qt files to build once installed - cat > examples/examples.pri <<-EOF - include( qwtconfig.pri ) - TEMPLATE = app - MOC_DIR = moc - INCLUDEPATH += "${EPREFIX}/usr/include/qwt5" - DEPENDPATH += "${EPREFIX}/usr/include/qwt5" - LIBS += -lqwt - EOF - sed -i -e 's:../qwtconfig:qwtconfig:' examples/examples.pro || die - cp *.pri examples/ || die - insinto /usr/share/${PN}5 - doins -r examples - fi -}
