diff options
Diffstat (limited to 'x11-libs/qwt')
-rw-r--r-- | x11-libs/qwt/Manifest | 6 | ||||
-rw-r--r-- | x11-libs/qwt/files/qwt-5.2.3-install_qt.patch | 28 | ||||
-rw-r--r-- | x11-libs/qwt/qwt-5.2.3-r2.ebuild | 101 | ||||
-rw-r--r-- | x11-libs/qwt/qwt-6.1.3-r1.ebuild | 213 | ||||
-rw-r--r-- | x11-libs/qwt/qwt-6.1.3-r2.ebuild | 2 |
5 files changed, 2 insertions, 348 deletions
diff --git a/x11-libs/qwt/Manifest b/x11-libs/qwt/Manifest index 602015012a05..c4dc2384484b 100644 --- a/x11-libs/qwt/Manifest +++ b/x11-libs/qwt/Manifest @@ -1,9 +1,5 @@ -AUX qwt-5.2.3-install_qt.patch 963 BLAKE2B 262d227c47490c9638e8837d2f75d59c84afda7ed10cfcaa5ec67638d220d23b6723ca915bfbebdf729cf1f078610c676f4f42a40cf4daa351754c7ab4c3a28c SHA512 e4bd767fd0942dbac0a585f4c6b588faa99f1f38d02fe8db6c3be181c7a7c6955abc874df916ed446dde537f6090ca81610ae49ba55766033bd8bd801808e8e9 AUX qwt-6.0.2-invalid-read.patch 9447 BLAKE2B a3a9074113cee590bae03f0a55eb6cb2800c88ad06aa989d3293c42be8945db11982c915b775dac43d773f557dbfa57f5f3abf40a0f57c4d414f4003d09f581b SHA512 e9912ec60d062bad89ecb74c0342815f8c7b351318df88120e7510e44224f52a1c89e8ab2bcafd6d8c418a7a3e67347b159d174d417cbebf4fa3377191d0f201 AUX qwt-6.1.1-pc-destdir.patch 498 BLAKE2B 4e3fefa36daebe0c173adaae02c33a622d70cefd626998f9baf65229291be87dcd5dff175961fb2b33d794e0b3f082a36209ce682434bd3f83de6fecc585137a SHA512 a2035e27af7110a2aaf4e28f316e2c6c49b6909345ceec01eb4793ac66445594bf362fa6939506ba6d0300bde9487c83ea770299af8c3ca8d71b162cbc71e769 -DIST qwt-5.2.3.tar.bz2 1983725 BLAKE2B 24c9d5c9b660ec082266a02da59b89ec0f8f4eea085fa83a3d773a18e452f0be6845d9584d9ddb0e51aa9a2e4f7fe0980a236d36b6930abbbfa7f6b0f9d8e1a9 SHA512 60545712790699b145a54baba4c40802d9a58bf5f68f997faed5027db6773a801097be8675e00b2af1de568e36e2e498db0a0310ac4877fd9f2b52871409dd49 DIST qwt-6.1.3.tar.bz2 4245614 BLAKE2B 5461602702eb159c5c9131eb554d6a619f40c459432c3f32f98b55e4b659d37848fbc0691baeaf691155bae83f68b9c91d3fee430935dd0c1b29e6fceac7a36f SHA512 d4a73e9e7ddcb7c16c508920a298784935be2eddc8f7585993d9fffe1bb01e1787a0d5d7ea4f220398b94ea2b211a19009dccaeadce56a84410357124bcb051a -EBUILD qwt-5.2.3-r2.ebuild 2613 BLAKE2B fda982614ccab5f7b36cb731aaf3fe7788d5355407c91dec6d87e213f24b4d652cc03936af928f3d670a988c95f16f1b31e0d2a5bfd4f27f418428b6b90d1d8c SHA512 d1cde98eaebe87e74f0b40f4743d3ba0dd4a446c9998694083bd8514d125dc16cabef377c8a83a24301f51fe7013e3bd1171320a6aaeb6338eed5d0472f4356f -EBUILD qwt-6.1.3-r1.ebuild 5225 BLAKE2B 051ef65837e20d1b1a6c648c9594929d066472815bbb94ec899f08ee587bc8a86b18eae80fc72187cca46f11838911f9bd48211418f5a869d2e0870ddfcce88b SHA512 7403be5bc87671de3f4cd4da98b4e099d392cbdf65e35d8806ac17ed04a2f40da7af332fc0192215320947155734092833be2b8d138bb2c1d8a9cf27dde060f8 -EBUILD qwt-6.1.3-r2.ebuild 3830 BLAKE2B 34d1fe20e36c4d992de66dcfe7622871f7d57b5baca0e772ffc6ab636b8a79ffca6a73188390b45a963b5546721722439284dbff7222c1a29d95aadf9ed404c8 SHA512 34a8c9681c93bf4c4207a6ecd18db1eed4a96d2b03e88f56e7d1b81f5e7060af518189093f8234c6f9b3fffee56e2720ad89d2284979ec069d3b8b11574d3888 +EBUILD qwt-6.1.3-r2.ebuild 3828 BLAKE2B 9f8166cfdac2931dd2f3d384ec0aba5c55f9e3bc90e291cf6184a7ae24f8ca49ed424fd1b57dd7acfce3cf5cc46b4ec4b893cf9af0387a1a4ad9c41768c8017a SHA512 6447a35b30b0703b5c85aa6836a4e4be5b70ffd7d2f83f0070385640b872b3ec5150e18d7c97b15b8720cebe0f3a7d36497a86f88b5a327ffdec4b338d879fdf MISC metadata.xml 870 BLAKE2B 1e2262a74f86901bfdb2a897fb40885880391898e60ca6ddb001ea6f7a1bca4586e2cc2c3af28b8d3f455aac4d93204efb370d491ac6749207cf584c8b08f589 SHA512 53e10079699529613ece87ae1e2908e7f7144d041f62618512d00df0b6bf9ae2c5b70afc8309cef0523e10a6605126f3ce871589c3133d64ac52db9ff7346b43 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 48e9385811f8..000000000000 --- 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 73b753b76ec7..000000000000 --- 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 -} diff --git a/x11-libs/qwt/qwt-6.1.3-r1.ebuild b/x11-libs/qwt/qwt-6.1.3-r1.ebuild deleted file mode 100644 index dc89fab7124c..000000000000 --- a/x11-libs/qwt/qwt-6.1.3-r1.ebuild +++ /dev/null @@ -1,213 +0,0 @@ -# Copyright 1999-2018 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 - -inherit multibuild qmake-utils - -MY_P="${PN}-${PV/_/-}" - -DESCRIPTION="2D plotting library for Qt4 and Qt5" -HOMEPAGE="http://qwt.sourceforge.net/" -SRC_URI="mirror://sourceforge/project/${PN}/${PN}/${PV/_/-}/${MY_P}.tar.bz2" - -LICENSE="qwt mathml? ( LGPL-2.1 Nokia-Qt-LGPL-Exception-1.1 )" -KEYWORDS="amd64 ~arm ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~x86-macos" -SLOT="6/1.3" -IUSE="designer doc examples mathml opengl qt4 qt5 static-libs svg" - -REQUIRED_USE="|| ( qt4 qt5 )" - -DEPEND=" - opengl? ( virtual/opengl ) - qt4? ( - dev-qt/qtcore:4 - dev-qt/qtgui:4 - designer? ( dev-qt/designer:4 ) - opengl? ( dev-qt/qtopengl:4 ) - svg? ( dev-qt/qtsvg:4 ) - ) - qt5? ( - dev-qt/qtconcurrent:5 - dev-qt/qtcore:5 - dev-qt/qtgui:5 - dev-qt/qtprintsupport:5 - dev-qt/qtwidgets:5 - designer? ( dev-qt/designer:5 ) - opengl? ( dev-qt/qtopengl:5 ) - svg? ( dev-qt/qtsvg:5 ) - ) -" -RDEPEND="${DEPEND} - !<x11-libs/qwt-5.2.3 - !x11-libs/qwt:5[doc] - doc? ( !<media-libs/coin-3.1.3[doc] ) -" - -S="${WORKDIR}"/${MY_P} - -DOCS=( CHANGES-6.1 README ) - -PATCHES=( - "${FILESDIR}"/${PN}-6.0.2-invalid-read.patch - "${FILESDIR}"/${PN}-6.1.1-pc-destdir.patch -) - -src_prepare() { - cat > qwtconfig.pri <<-EOF - QWT_INSTALL_LIBS = "${EPREFIX}/usr/$(get_libdir)" - QWT_INSTALL_HEADERS = "${EPREFIX}/usr/include/qwt6" - QWT_INSTALL_DOCS = "${EPREFIX}/usr/share/doc/${PF}" - QWT_CONFIG += QwtPlot QwtWidgets QwtPkgConfig - VERSION = ${PV/_*} - QWT_VERSION = ${PV/_*} - EOF - - use designer && echo "QWT_CONFIG += QwtDesigner" >> qwtconfig.pri - use mathml && echo "QWT_CONFIG += QwtMathML" >> qwtconfig.pri - use opengl && echo "QWT_CONFIG += QwtOpenGL" >> qwtconfig.pri - use svg && echo "QWT_CONFIG += QwtSvg" >> qwtconfig.pri - - cat > qwtbuild.pri <<-EOF - QWT_CONFIG += qt warn_on thread release no_keywords - EOF - - MULTIBUILD_VARIANTS=( ) - - if use qt4; then - use static-libs && MULTIBUILD_VARIANTS+=( qt4-static ) - MULTIBUILD_VARIANTS+=( qt4-shared ) - fi - - if use qt5; then - use static-libs && MULTIBUILD_VARIANTS+=( qt5-static ) - MULTIBUILD_VARIANTS+=( qt5-shared ) - fi - - multibuild_copy_sources - - preparation() { - if [[ ${MULTIBUILD_VARIANT} == *-shared ]]; then - echo "QWT_CONFIG += QwtDll" >> qwtconfig.pri - fi - - case "${MULTIBUILD_VARIANT}" in - qt4-*) - cat >> qwtconfig.pri <<-EOF - QWT_INSTALL_PLUGINS = "${EPREFIX}$(qt4_get_plugindir)/designer" - QWT_INSTALL_FEATURES = "${EPREFIX}$(qt4_get_mkspecsdir)/features" - EOF - sed \ - -e 's/target doc/target/' \ - -e "/^TARGET/s:(qwt):(qwt6-qt4):g" \ - -e "/^TARGET/s:qwt):qwt6-qt4):g" \ - -i src/src.pro || die - - sed \ - -e '/qwtAddLibrary/s:(qwt):(qwt6-qt4):g' \ - -e '/qwtAddLibrary/s:qwt):qwt6-qt4):g' \ - -i qwt.prf designer/designer.pro examples/examples.pri \ - textengines/mathml/qwtmathml.prf textengines/textengines.pri || die - - ;; - qt5-*) - cat >> qwtconfig.pri <<-EOF - QWT_INSTALL_PLUGINS = "${EPREFIX}$(qt5_get_plugindir)/designer" - QWT_INSTALL_FEATURES = "${EPREFIX}$(qt5_get_mkspecsdir)/features" - EOF - sed \ - -e 's/target doc/target/' \ - -e "/^TARGET/s:(qwt):(qwt6-qt5):g" \ - -e "/^TARGET/s:qwt):qwt6-qt5):g" \ - -i src/src.pro || die - - sed \ - -e '/qwtAddLibrary/s:(qwt):(qwt6-qt5):g' \ - -e '/qwtAddLibrary/s:qwt):qwt6-qt5):g' \ - -i qwt.prf designer/designer.pro examples/examples.pri \ - textengines/mathml/qwtmathml.prf textengines/textengines.pri || die - ;; - esac - default - } - - multibuild_foreach_variant run_in_build_dir preparation -} - -src_configure() { - configuration() { - case "${MULTIBUILD_VARIANT}" in - qt4-*) - eqmake4 - ;; - qt5-*) - eqmake5 - ;; - esac - } - multibuild_foreach_variant run_in_build_dir configuration -} - -src_compile() { - multibuild_foreach_variant run_in_build_dir default -} - -src_test() { - testing() { - cd examples || die - case "${MULTIBUILD_VARIANT}" in - qt4-*) - eqmake4 examples.pro - ;; - qt5-*) - eqmake5 examples.pro - ;; - esac - emake - } - multibuild_foreach_variant run_in_build_dir testing -} - -src_install () { - rm -f doc/man/*/{_,deprecated}* || die - - multibuild_foreach_variant run_in_build_dir emake INSTALL_ROOT="${D}" install - - if use qt4; then - mv "${ED}"/usr/$(get_libdir)/pkgconfig/qwt6{-qt4,}.pc || die - fi - - if use mathml; then - sed \ - -e "s: -L\"${WORKDIR}\".* -lqwt6: -lqwt6:g" \ - -i "${ED}"/usr/$(get_libdir)/pkgconfig/qwtmathml.pc || die - fi - - if use doc; then - HTML_DOCS=( doc/html/. ) - else - rm -rf "${ED}"/usr/share/doc/${PF}/html || die - fi - - einstalldocs - - mkdir -p "${ED}"/usr/share/man/ || die - mv "${ED}"/usr/share/doc/${PF}/man/man3 "${ED}"/usr/share/man/ && \ - rmdir "${ED}"/usr/share/doc/${PF}/man || die - - 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/qwt6" - DEPENDPATH += "${EPREFIX}/usr/include/qwt6" - LIBS += -lqwt6 - EOF - sed -i -e 's:../qwtconfig:qwtconfig:' examples/examples.pro || die - cp *.pri examples/ || die - insinto /usr/share/${PN}6 - doins -r examples - fi -} diff --git a/x11-libs/qwt/qwt-6.1.3-r2.ebuild b/x11-libs/qwt/qwt-6.1.3-r2.ebuild index 67e6b47a6949..e651d6ffdcd0 100644 --- a/x11-libs/qwt/qwt-6.1.3-r2.ebuild +++ b/x11-libs/qwt/qwt-6.1.3-r2.ebuild @@ -12,7 +12,7 @@ HOMEPAGE="http://qwt.sourceforge.net/" SRC_URI="mirror://sourceforge/project/${PN}/${PN}/${PV/_/-}/${MY_P}.tar.bz2" LICENSE="qwt mathml? ( LGPL-2.1 Nokia-Qt-LGPL-Exception-1.1 )" -KEYWORDS="amd64 ~arm ~ppc ~ppc64 ~sparc x86 ~amd64-linux ~x86-linux ~x86-macos" +KEYWORDS="amd64 ~arm ppc ppc64 ~sparc x86 ~amd64-linux ~x86-linux ~x86-macos" SLOT="6/1.3" IUSE="designer doc examples mathml opengl static-libs svg" |