* [gentoo-commits] repo/gentoo:master commit in: x11-libs/qwt/
@ 2023-12-16 16:17 Arthur Zamarin
0 siblings, 0 replies; 60+ messages in thread
From: Arthur Zamarin @ 2023-12-16 16:17 UTC (permalink / raw
To: gentoo-commits
commit: c64610b066773331e858964ee8a3eb870c002e42
Author: Arthur Zamarin <arthurzam <AT> gentoo <DOT> org>
AuthorDate: Sat Dec 16 16:17:05 2023 +0000
Commit: Arthur Zamarin <arthurzam <AT> gentoo <DOT> org>
CommitDate: Sat Dec 16 16:17:05 2023 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c64610b0
x11-libs/qwt: Stabilize 5.2.3_p20210828 amd64, #920135
Signed-off-by: Arthur Zamarin <arthurzam <AT> gentoo.org>
x11-libs/qwt/qwt-5.2.3_p20210828.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/x11-libs/qwt/qwt-5.2.3_p20210828.ebuild b/x11-libs/qwt/qwt-5.2.3_p20210828.ebuild
index 3e7decc8a3d1..8288b8fffe3a 100644
--- a/x11-libs/qwt/qwt-5.2.3_p20210828.ebuild
+++ b/x11-libs/qwt/qwt-5.2.3_p20210828.ebuild
@@ -21,7 +21,7 @@ SRC_URI="https://github.com/SciDAVis/qwt5-qt5/archive/${COMMIT}.tar.gz -> ${P}.t
S="${WORKDIR}/${PN}5-qt5-${COMMIT}"
LICENSE="qwt"
-KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~riscv x86"
+KEYWORDS="amd64 ~arm ~ppc ~ppc64 ~riscv x86"
SLOT="5"
IUSE="designer examples"
^ permalink raw reply related [flat|nested] 60+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: x11-libs/qwt/
@ 2023-12-23 14:29 Arthur Zamarin
0 siblings, 0 replies; 60+ messages in thread
From: Arthur Zamarin @ 2023-12-23 14:29 UTC (permalink / raw
To: gentoo-commits
commit: 65680aaf05463217dd41e66c2874a9969cfdf885
Author: Arthur Zamarin <arthurzam <AT> gentoo <DOT> org>
AuthorDate: Sat Dec 23 14:29:11 2023 +0000
Commit: Arthur Zamarin <arthurzam <AT> gentoo <DOT> org>
CommitDate: Sat Dec 23 14:29:11 2023 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=65680aaf
x11-libs/qwt: Stabilize 6.2.0-r3 ppc64, #920148
Signed-off-by: Arthur Zamarin <arthurzam <AT> gentoo.org>
x11-libs/qwt/qwt-6.2.0-r3.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/x11-libs/qwt/qwt-6.2.0-r3.ebuild b/x11-libs/qwt/qwt-6.2.0-r3.ebuild
index 832d4ea5d373..c9b40bc889f6 100644
--- a/x11-libs/qwt/qwt-6.2.0-r3.ebuild
+++ b/x11-libs/qwt/qwt-6.2.0-r3.ebuild
@@ -15,7 +15,7 @@ HOMEPAGE="https://qwt.sourceforge.io/"
SRC_URI="mirror://sourceforge/project/${PN}/${PN}/${PV}/${P}.tar.bz2"
LICENSE="qwt"
-KEYWORDS="amd64 ~arm ppc ~ppc64 ~riscv ~sparc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 ~arm ppc ppc64 ~riscv ~sparc x86 ~amd64-linux ~x86-linux"
SLOT="6/2.0"
IUSE="designer doc examples opengl polar +qt5 qt6 svg"
REQUIRED_USE="|| ( qt5 qt6 )"
^ permalink raw reply related [flat|nested] 60+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: x11-libs/qwt/
@ 2023-12-22 11:03 Arthur Zamarin
0 siblings, 0 replies; 60+ messages in thread
From: Arthur Zamarin @ 2023-12-22 11:03 UTC (permalink / raw
To: gentoo-commits
commit: 1b0528cffe5f3bd292ac6c6dfce9d9a212f97829
Author: Arthur Zamarin <arthurzam <AT> gentoo <DOT> org>
AuthorDate: Fri Dec 22 11:03:43 2023 +0000
Commit: Arthur Zamarin <arthurzam <AT> gentoo <DOT> org>
CommitDate: Fri Dec 22 11:03:43 2023 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=1b0528cf
x11-libs/qwt: Stabilize 5.2.3_p20210828 ppc64, #920135
Signed-off-by: Arthur Zamarin <arthurzam <AT> gentoo.org>
x11-libs/qwt/qwt-5.2.3_p20210828.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/x11-libs/qwt/qwt-5.2.3_p20210828.ebuild b/x11-libs/qwt/qwt-5.2.3_p20210828.ebuild
index 6ea433c8935c..054f0a455778 100644
--- a/x11-libs/qwt/qwt-5.2.3_p20210828.ebuild
+++ b/x11-libs/qwt/qwt-5.2.3_p20210828.ebuild
@@ -21,7 +21,7 @@ SRC_URI="https://github.com/SciDAVis/qwt5-qt5/archive/${COMMIT}.tar.gz -> ${P}.t
S="${WORKDIR}/${PN}5-qt5-${COMMIT}"
LICENSE="qwt"
-KEYWORDS="amd64 ~arm ppc ~ppc64 ~riscv x86"
+KEYWORDS="amd64 ~arm ppc ppc64 ~riscv x86"
SLOT="5"
IUSE="designer examples"
^ permalink raw reply related [flat|nested] 60+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: x11-libs/qwt/
@ 2023-12-18 9:01 Arthur Zamarin
0 siblings, 0 replies; 60+ messages in thread
From: Arthur Zamarin @ 2023-12-18 9:01 UTC (permalink / raw
To: gentoo-commits
commit: ef052cf7ae1b0fd5cb35f774cbfaba26c81c26d2
Author: Arthur Zamarin <arthurzam <AT> gentoo <DOT> org>
AuthorDate: Mon Dec 18 09:00:52 2023 +0000
Commit: Arthur Zamarin <arthurzam <AT> gentoo <DOT> org>
CommitDate: Mon Dec 18 09:00:52 2023 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ef052cf7
x11-libs/qwt: Stabilize 6.2.0-r3 ppc, #920148
Signed-off-by: Arthur Zamarin <arthurzam <AT> gentoo.org>
x11-libs/qwt/qwt-6.2.0-r3.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/x11-libs/qwt/qwt-6.2.0-r3.ebuild b/x11-libs/qwt/qwt-6.2.0-r3.ebuild
index 52f7cc7b662a..832d4ea5d373 100644
--- a/x11-libs/qwt/qwt-6.2.0-r3.ebuild
+++ b/x11-libs/qwt/qwt-6.2.0-r3.ebuild
@@ -15,7 +15,7 @@ HOMEPAGE="https://qwt.sourceforge.io/"
SRC_URI="mirror://sourceforge/project/${PN}/${PN}/${PV}/${P}.tar.bz2"
LICENSE="qwt"
-KEYWORDS="amd64 ~arm ~ppc ~ppc64 ~riscv ~sparc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 ~arm ppc ~ppc64 ~riscv ~sparc x86 ~amd64-linux ~x86-linux"
SLOT="6/2.0"
IUSE="designer doc examples opengl polar +qt5 qt6 svg"
REQUIRED_USE="|| ( qt5 qt6 )"
^ permalink raw reply related [flat|nested] 60+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: x11-libs/qwt/
@ 2023-12-18 9:01 Arthur Zamarin
0 siblings, 0 replies; 60+ messages in thread
From: Arthur Zamarin @ 2023-12-18 9:01 UTC (permalink / raw
To: gentoo-commits
commit: e8fdeb23d9863983f92e5357ae2be9a792f2f395
Author: Arthur Zamarin <arthurzam <AT> gentoo <DOT> org>
AuthorDate: Mon Dec 18 09:00:52 2023 +0000
Commit: Arthur Zamarin <arthurzam <AT> gentoo <DOT> org>
CommitDate: Mon Dec 18 09:00:52 2023 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e8fdeb23
x11-libs/qwt: Stabilize 5.2.3_p20210828 ppc, #920135
Signed-off-by: Arthur Zamarin <arthurzam <AT> gentoo.org>
x11-libs/qwt/qwt-5.2.3_p20210828.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/x11-libs/qwt/qwt-5.2.3_p20210828.ebuild b/x11-libs/qwt/qwt-5.2.3_p20210828.ebuild
index 8288b8fffe3a..6ea433c8935c 100644
--- a/x11-libs/qwt/qwt-5.2.3_p20210828.ebuild
+++ b/x11-libs/qwt/qwt-5.2.3_p20210828.ebuild
@@ -21,7 +21,7 @@ SRC_URI="https://github.com/SciDAVis/qwt5-qt5/archive/${COMMIT}.tar.gz -> ${P}.t
S="${WORKDIR}/${PN}5-qt5-${COMMIT}"
LICENSE="qwt"
-KEYWORDS="amd64 ~arm ~ppc ~ppc64 ~riscv x86"
+KEYWORDS="amd64 ~arm ppc ~ppc64 ~riscv x86"
SLOT="5"
IUSE="designer examples"
^ permalink raw reply related [flat|nested] 60+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: x11-libs/qwt/
@ 2023-12-16 16:17 Arthur Zamarin
0 siblings, 0 replies; 60+ messages in thread
From: Arthur Zamarin @ 2023-12-16 16:17 UTC (permalink / raw
To: gentoo-commits
commit: d4ee074cc78088c52908774a02be017b31fe74c7
Author: Arthur Zamarin <arthurzam <AT> gentoo <DOT> org>
AuthorDate: Sat Dec 16 16:17:13 2023 +0000
Commit: Arthur Zamarin <arthurzam <AT> gentoo <DOT> org>
CommitDate: Sat Dec 16 16:17:13 2023 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d4ee074c
x11-libs/qwt: Stabilize 6.2.0-r3 x86, #920148
Signed-off-by: Arthur Zamarin <arthurzam <AT> gentoo.org>
x11-libs/qwt/qwt-6.2.0-r3.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/x11-libs/qwt/qwt-6.2.0-r3.ebuild b/x11-libs/qwt/qwt-6.2.0-r3.ebuild
index 56914dbd5f67..e02a64d6c6ab 100644
--- a/x11-libs/qwt/qwt-6.2.0-r3.ebuild
+++ b/x11-libs/qwt/qwt-6.2.0-r3.ebuild
@@ -15,7 +15,7 @@ HOMEPAGE="https://qwt.sourceforge.io/"
SRC_URI="mirror://sourceforge/project/${PN}/${PN}/${PV}/${P}.tar.bz2"
LICENSE="qwt"
-KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~riscv ~sparc x86 ~amd64-linux ~x86-linux"
SLOT="6/2.0"
IUSE="designer doc examples opengl polar +qt5 qt6 svg"
REQUIRED_USE="|| ( qt5 qt6 )"
^ permalink raw reply related [flat|nested] 60+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: x11-libs/qwt/
@ 2023-12-16 16:17 Arthur Zamarin
0 siblings, 0 replies; 60+ messages in thread
From: Arthur Zamarin @ 2023-12-16 16:17 UTC (permalink / raw
To: gentoo-commits
commit: cc0c087b9bb5a91bf96d7b5684ff1932eea0720c
Author: Arthur Zamarin <arthurzam <AT> gentoo <DOT> org>
AuthorDate: Sat Dec 16 16:17:14 2023 +0000
Commit: Arthur Zamarin <arthurzam <AT> gentoo <DOT> org>
CommitDate: Sat Dec 16 16:17:14 2023 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=cc0c087b
x11-libs/qwt: Stabilize 6.2.0-r3 amd64, #920148
Signed-off-by: Arthur Zamarin <arthurzam <AT> gentoo.org>
x11-libs/qwt/qwt-6.2.0-r3.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/x11-libs/qwt/qwt-6.2.0-r3.ebuild b/x11-libs/qwt/qwt-6.2.0-r3.ebuild
index e02a64d6c6ab..52f7cc7b662a 100644
--- a/x11-libs/qwt/qwt-6.2.0-r3.ebuild
+++ b/x11-libs/qwt/qwt-6.2.0-r3.ebuild
@@ -15,7 +15,7 @@ HOMEPAGE="https://qwt.sourceforge.io/"
SRC_URI="mirror://sourceforge/project/${PN}/${PN}/${PV}/${P}.tar.bz2"
LICENSE="qwt"
-KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~riscv ~sparc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 ~arm ~ppc ~ppc64 ~riscv ~sparc x86 ~amd64-linux ~x86-linux"
SLOT="6/2.0"
IUSE="designer doc examples opengl polar +qt5 qt6 svg"
REQUIRED_USE="|| ( qt5 qt6 )"
^ permalink raw reply related [flat|nested] 60+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: x11-libs/qwt/
@ 2023-12-16 16:17 Arthur Zamarin
0 siblings, 0 replies; 60+ messages in thread
From: Arthur Zamarin @ 2023-12-16 16:17 UTC (permalink / raw
To: gentoo-commits
commit: 5cb8fdf95826f191a4562eae9f5fb1799020f4fe
Author: Arthur Zamarin <arthurzam <AT> gentoo <DOT> org>
AuthorDate: Sat Dec 16 16:17:04 2023 +0000
Commit: Arthur Zamarin <arthurzam <AT> gentoo <DOT> org>
CommitDate: Sat Dec 16 16:17:04 2023 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=5cb8fdf9
x11-libs/qwt: Stabilize 5.2.3_p20210828 x86, #920135
Signed-off-by: Arthur Zamarin <arthurzam <AT> gentoo.org>
x11-libs/qwt/qwt-5.2.3_p20210828.ebuild | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/x11-libs/qwt/qwt-5.2.3_p20210828.ebuild b/x11-libs/qwt/qwt-5.2.3_p20210828.ebuild
index 30077967f4b0..3e7decc8a3d1 100644
--- a/x11-libs/qwt/qwt-5.2.3_p20210828.ebuild
+++ b/x11-libs/qwt/qwt-5.2.3_p20210828.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2022 Gentoo Authors
+# Copyright 1999-2023 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=8
@@ -21,7 +21,7 @@ SRC_URI="https://github.com/SciDAVis/qwt5-qt5/archive/${COMMIT}.tar.gz -> ${P}.t
S="${WORKDIR}/${PN}5-qt5-${COMMIT}"
LICENSE="qwt"
-KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~riscv ~x86"
+KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~riscv x86"
SLOT="5"
IUSE="designer examples"
^ permalink raw reply related [flat|nested] 60+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: x11-libs/qwt/
@ 2023-11-08 17:21 Andrew Ammerlaan
0 siblings, 0 replies; 60+ messages in thread
From: Andrew Ammerlaan @ 2023-11-08 17:21 UTC (permalink / raw
To: gentoo-commits
commit: 33dbe27a3012aa3ba4f36e8278ac1c1a3ef00afa
Author: Andrew Ammerlaan <andrewammerlaan <AT> gentoo <DOT> org>
AuthorDate: Wed Nov 8 17:20:30 2023 +0000
Commit: Andrew Ammerlaan <andrewammerlaan <AT> gentoo <DOT> org>
CommitDate: Wed Nov 8 17:21:10 2023 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=33dbe27a
x11-libs/qwt: require either qt5 or qt6
Closes: https://bugs.gentoo.org/916790
Signed-off-by: Andrew Ammerlaan <andrewammerlaan <AT> gentoo.org>
x11-libs/qwt/qwt-6.2.0-r3.ebuild | 1 +
1 file changed, 1 insertion(+)
diff --git a/x11-libs/qwt/qwt-6.2.0-r3.ebuild b/x11-libs/qwt/qwt-6.2.0-r3.ebuild
index 01157fff6808..56914dbd5f67 100644
--- a/x11-libs/qwt/qwt-6.2.0-r3.ebuild
+++ b/x11-libs/qwt/qwt-6.2.0-r3.ebuild
@@ -18,6 +18,7 @@ LICENSE="qwt"
KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux"
SLOT="6/2.0"
IUSE="designer doc examples opengl polar +qt5 qt6 svg"
+REQUIRED_USE="|| ( qt5 qt6 )"
DEPEND="
qt5? (
^ permalink raw reply related [flat|nested] 60+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: x11-libs/qwt/
@ 2023-06-15 8:43 Andrew Ammerlaan
0 siblings, 0 replies; 60+ messages in thread
From: Andrew Ammerlaan @ 2023-06-15 8:43 UTC (permalink / raw
To: gentoo-commits
commit: d38ea9a7688536c3c0e3394fa24e7f19ab45d2c9
Author: Thomas Bettler <thomas.bettler <AT> gmail <DOT> com>
AuthorDate: Wed May 31 20:04:14 2023 +0000
Commit: Andrew Ammerlaan <andrewammerlaan <AT> gentoo <DOT> org>
CommitDate: Thu Jun 15 08:42:14 2023 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d38ea9a7
x11-libs/qwt: add Qt6 support
Signed-off-by: Thomas Bettler <thomas.bettler <AT> gmail.com>
Closes: https://github.com/gentoo/gentoo/pull/31250
Signed-off-by: Andrew Ammerlaan <andrewammerlaan <AT> gentoo.org>
x11-libs/qwt/qwt-6.2.0-r2.ebuild | 128 -------------------------------
x11-libs/qwt/qwt-6.2.0-r3.ebuild | 159 +++++++++++++++++++++++++++++++++++++++
2 files changed, 159 insertions(+), 128 deletions(-)
diff --git a/x11-libs/qwt/qwt-6.2.0-r2.ebuild b/x11-libs/qwt/qwt-6.2.0-r2.ebuild
deleted file mode 100644
index cea9701a4b9a..000000000000
--- a/x11-libs/qwt/qwt-6.2.0-r2.ebuild
+++ /dev/null
@@ -1,128 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DOCS_BUILDER="doxygen"
-DOCS_DIR="doc"
-DOCS_CONFIG_NAME="Doxyfile"
-DOCS_DEPEND="media-gfx/graphviz"
-
-inherit qmake-utils docs
-
-DESCRIPTION="2D plotting library for Qt5"
-HOMEPAGE="https://qwt.sourceforge.io/"
-SRC_URI="mirror://sourceforge/project/${PN}/${PN}/${PV}/${P}.tar.bz2"
-
-LICENSE="qwt"
-KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux"
-SLOT="6/2.0"
-IUSE="designer doc examples opengl polar svg"
-
-DEPEND="
- 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
- virtual/opengl
- )
- svg? ( dev-qt/qtsvg:5 )
-"
-RDEPEND="${DEPEND}"
-
-# tests require package to be already installed
-RESTRICT="test"
-
-DOCS=( CHANGES-6.2 README )
-
-src_prepare() {
- default
-
- cat > qwtconfig.pri <<-EOF || die
- 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
- VER_MAJ = $(ver_cut 1)
- VER_MIN = $(ver_cut 2)
- VER_PAT = $(ver_cut 3)
- VERSION = ${PV/_*}
- QWT_VER_MAJ = $(ver_cut 1)
- QWT_VER_MIN = $(ver_cut 2)
- QWT_VER_PAT = $(ver_cut 3)
- QWT_VERSION = ${PV/_*}
- EOF
-
- use designer && echo "QWT_CONFIG += QwtDesigner" >> qwtconfig.pri
- use opengl && echo "QWT_CONFIG += QwtOpenGL" >> qwtconfig.pri
- use polar && echo "QWT_CONFIG += QwtPolar" >> qwtconfig.pri
- use svg && echo "QWT_CONFIG += QwtSvg" >> qwtconfig.pri
-
- cat > qwtbuild.pri <<-EOF || die
- QWT_CONFIG += qt warn_on thread release no_keywords
- DEFINES += QWT_MOC_INCLUDE=1
- EOF
-
- echo "QWT_CONFIG += QwtDll" >> qwtconfig.pri
-
- cat >> qwtconfig.pri <<-EOF || die
- 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" \
- -e "s:QWT_SONAME=libqwt.so:QWT_SONAME=libqwt6-qt5.so: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 || die
-}
-
-src_configure() {
- eqmake5
-}
-
-src_compile() {
- default
- # need doxyfilter.sh in PATH
- PATH="${PATH}:${S}/doc/" docs_compile
-}
-
-src_test() {
- cd tests || die
- eqmake5 tests.pro
- emake
-}
-
-src_install() {
- emake INSTALL_ROOT="${D}" install
- 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 || die
- 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.2.0-r3.ebuild b/x11-libs/qwt/qwt-6.2.0-r3.ebuild
new file mode 100644
index 000000000000..01157fff6808
--- /dev/null
+++ b/x11-libs/qwt/qwt-6.2.0-r3.ebuild
@@ -0,0 +1,159 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DOCS_BUILDER="doxygen"
+DOCS_DIR="doc"
+DOCS_CONFIG_NAME="Doxyfile"
+DOCS_DEPEND="media-gfx/graphviz"
+
+inherit docs multibuild qmake-utils
+
+DESCRIPTION="2D plotting library for Qt"
+HOMEPAGE="https://qwt.sourceforge.io/"
+SRC_URI="mirror://sourceforge/project/${PN}/${PN}/${PV}/${P}.tar.bz2"
+
+LICENSE="qwt"
+KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux"
+SLOT="6/2.0"
+IUSE="designer doc examples opengl polar +qt5 qt6 svg"
+
+DEPEND="
+ 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
+ virtual/opengl
+ )
+ svg? ( dev-qt/qtsvg:5 )
+ )
+ qt6? (
+ dev-qt/qtbase:6[concurrent,gui,cups,widgets]
+ designer? ( dev-qt/qttools:6[designer] )
+ opengl? (
+ dev-qt/qtbase:6[opengl]
+ virtual/opengl
+ )
+ svg? ( dev-qt/qtsvg:6 )
+ )
+"
+RDEPEND="${DEPEND}"
+
+# tests require package to be already installed
+RESTRICT="test"
+
+DOCS=( CHANGES-6.2 README )
+
+pkg_setup() {
+ MULTIBUILD_VARIANTS=( $(usev qt5) $(usev qt6) )
+}
+
+src_prepare() {
+ my_src_prepare() {
+ cat > qwtconfig.pri <<-EOF || die
+ 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
+ VER_MAJ = $(ver_cut 1)
+ VER_MIN = $(ver_cut 2)
+ VER_PAT = $(ver_cut 3)
+ VERSION = ${PV/_*}
+ QWT_VER_MAJ = $(ver_cut 1)
+ QWT_VER_MIN = $(ver_cut 2)
+ QWT_VER_PAT = $(ver_cut 3)
+ QWT_VERSION = ${PV/_*}
+ EOF
+
+ use designer && echo "QWT_CONFIG += QwtDesigner" >> qwtconfig.pri
+ use opengl && echo "QWT_CONFIG += QwtOpenGL" >> qwtconfig.pri
+ use polar && echo "QWT_CONFIG += QwtPolar" >> qwtconfig.pri
+ use svg && echo "QWT_CONFIG += QwtSvg" >> qwtconfig.pri
+
+ cat > qwtbuild.pri <<-EOF || die
+ QWT_CONFIG += qt warn_on thread release no_keywords
+ DEFINES += QWT_MOC_INCLUDE=1
+ EOF
+
+ echo "QWT_CONFIG += QwtDll" >> qwtconfig.pri
+
+ cat >> qwtconfig.pri <<-EOF || die
+ QWT_INSTALL_PLUGINS = "${EPREFIX}/usr/$(get_libdir)/${MULTIBUILD_VARIANT}/plugins/designer"
+ QWT_INSTALL_FEATURES = "${EPREFIX}/usr/$(get_libdir)/${MULTIBUILD_VARIANT}/mkspecs/features"
+ EOF
+ sed \
+ -e 's/target doc/target/' \
+ -e "/^TARGET/s:(qwt):(qwt6-${MULTIBUILD_VARIANT}):g" \
+ -e "/^TARGET/s:qwt):qwt6-${MULTIBUILD_VARIANT}):g" \
+ -e "s:QWT_SONAME=libqwt.so:QWT_SONAME=libqwt6-${MULTIBUILD_VARIANT}.so:g" \
+ -i src/src.pro || die
+
+ sed \
+ -e "/qwtAddLibrary/s:(qwt):(qwt6-${MULTIBUILD_VARIANT}):g" \
+ -e "/qwtAddLibrary/s:qwt):qwt6-${MULTIBUILD_VARIANT}):g" \
+ -i qwt.prf designer/designer.pro examples/examples.pri || die
+ }
+ default
+ multibuild_copy_sources
+ multibuild_foreach_variant run_in_build_dir my_src_prepare
+}
+
+src_configure() {
+ my_src_configure() {
+ case ${MULTIBUILD_VARIANT} in
+ qt5) eqmake5 ;;
+ qt6) eqmake6 ;;
+ esac
+ }
+ multibuild_foreach_variant run_in_build_dir my_src_configure
+}
+
+src_compile() {
+ multibuild_foreach_variant run_in_build_dir emake
+
+ # need doxyfilter.sh in PATH
+ PATH="${PATH}:${S}/doc/" docs_compile
+}
+
+src_test() {
+ my_src_test() {
+ cd "${BUILD_DIR}"/tests || die
+ case ${MULTIBUILD_VARIANT} in
+ qt5) eqmake5 tests.pro ;;
+ qt6) eqmake6 tests.pro ;;
+ esac
+ emake
+ }
+ multibuild_foreach_variant my_src_test
+}
+
+src_install() {
+ multibuild_foreach_variant run_in_build_dir emake INSTALL_ROOT="${D}" install
+ 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 || die
+ 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
+}
^ permalink raw reply related [flat|nested] 60+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: x11-libs/qwt/
@ 2022-10-21 15:05 Andrew Ammerlaan
0 siblings, 0 replies; 60+ messages in thread
From: Andrew Ammerlaan @ 2022-10-21 15:05 UTC (permalink / raw
To: gentoo-commits
commit: 82d884b2f7bca6f66cabb008ce573873df46f4ef
Author: Andrew Ammerlaan <andrewammerlaan <AT> gentoo <DOT> org>
AuthorDate: Fri Oct 21 10:53:55 2022 +0000
Commit: Andrew Ammerlaan <andrewammerlaan <AT> gentoo <DOT> org>
CommitDate: Fri Oct 21 15:04:47 2022 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=82d884b2
x11-libs/qwt: add polar use flag
Closes: https://bugs.gentoo.org/877757
Co-authored-by: Craig Tong <craigtong04 <AT> gmail.com>
Signed-off-by: Andrew Ammerlaan <andrewammerlaan <AT> gentoo.org>
x11-libs/qwt/metadata.xml | 1 +
x11-libs/qwt/qwt-6.2.0-r2.ebuild | 128 +++++++++++++++++++++++++++++++++++++++
2 files changed, 129 insertions(+)
diff --git a/x11-libs/qwt/metadata.xml b/x11-libs/qwt/metadata.xml
index 3a84e892fae0..4ae06e042f79 100644
--- a/x11-libs/qwt/metadata.xml
+++ b/x11-libs/qwt/metadata.xml
@@ -15,6 +15,7 @@
<use>
<flag name="designer">Installs <pkg>dev-qt/designer</pkg> plugin.</flag>
<flag name="mathml">Use the MathML renderer of the Qt solutions package.</flag>
+ <flag name="polar">Install the QwtPolar headers</flag>
</use>
<upstream>
<remote-id type="sourceforge">qwt</remote-id>
diff --git a/x11-libs/qwt/qwt-6.2.0-r2.ebuild b/x11-libs/qwt/qwt-6.2.0-r2.ebuild
new file mode 100644
index 000000000000..cea9701a4b9a
--- /dev/null
+++ b/x11-libs/qwt/qwt-6.2.0-r2.ebuild
@@ -0,0 +1,128 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DOCS_BUILDER="doxygen"
+DOCS_DIR="doc"
+DOCS_CONFIG_NAME="Doxyfile"
+DOCS_DEPEND="media-gfx/graphviz"
+
+inherit qmake-utils docs
+
+DESCRIPTION="2D plotting library for Qt5"
+HOMEPAGE="https://qwt.sourceforge.io/"
+SRC_URI="mirror://sourceforge/project/${PN}/${PN}/${PV}/${P}.tar.bz2"
+
+LICENSE="qwt"
+KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux"
+SLOT="6/2.0"
+IUSE="designer doc examples opengl polar svg"
+
+DEPEND="
+ 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
+ virtual/opengl
+ )
+ svg? ( dev-qt/qtsvg:5 )
+"
+RDEPEND="${DEPEND}"
+
+# tests require package to be already installed
+RESTRICT="test"
+
+DOCS=( CHANGES-6.2 README )
+
+src_prepare() {
+ default
+
+ cat > qwtconfig.pri <<-EOF || die
+ 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
+ VER_MAJ = $(ver_cut 1)
+ VER_MIN = $(ver_cut 2)
+ VER_PAT = $(ver_cut 3)
+ VERSION = ${PV/_*}
+ QWT_VER_MAJ = $(ver_cut 1)
+ QWT_VER_MIN = $(ver_cut 2)
+ QWT_VER_PAT = $(ver_cut 3)
+ QWT_VERSION = ${PV/_*}
+ EOF
+
+ use designer && echo "QWT_CONFIG += QwtDesigner" >> qwtconfig.pri
+ use opengl && echo "QWT_CONFIG += QwtOpenGL" >> qwtconfig.pri
+ use polar && echo "QWT_CONFIG += QwtPolar" >> qwtconfig.pri
+ use svg && echo "QWT_CONFIG += QwtSvg" >> qwtconfig.pri
+
+ cat > qwtbuild.pri <<-EOF || die
+ QWT_CONFIG += qt warn_on thread release no_keywords
+ DEFINES += QWT_MOC_INCLUDE=1
+ EOF
+
+ echo "QWT_CONFIG += QwtDll" >> qwtconfig.pri
+
+ cat >> qwtconfig.pri <<-EOF || die
+ 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" \
+ -e "s:QWT_SONAME=libqwt.so:QWT_SONAME=libqwt6-qt5.so: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 || die
+}
+
+src_configure() {
+ eqmake5
+}
+
+src_compile() {
+ default
+ # need doxyfilter.sh in PATH
+ PATH="${PATH}:${S}/doc/" docs_compile
+}
+
+src_test() {
+ cd tests || die
+ eqmake5 tests.pro
+ emake
+}
+
+src_install() {
+ emake INSTALL_ROOT="${D}" install
+ 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 || die
+ 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
+}
^ permalink raw reply related [flat|nested] 60+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: x11-libs/qwt/
@ 2022-10-20 3:54 Sam James
0 siblings, 0 replies; 60+ messages in thread
From: Sam James @ 2022-10-20 3:54 UTC (permalink / raw
To: gentoo-commits
commit: d638bf550f918f7bf76e36c5eebc9b07f5912c6d
Author: Petr Vaněk <arkamar <AT> atlas <DOT> cz>
AuthorDate: Wed Oct 19 09:11:31 2022 +0000
Commit: Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Thu Oct 20 03:52:54 2022 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d638bf55
x11-libs/qwt: align longdescription opening and closing tags
Signed-off-by: Petr Vaněk <arkamar <AT> atlas.cz>
Signed-off-by: Sam James <sam <AT> gentoo.org>
x11-libs/qwt/metadata.xml | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/x11-libs/qwt/metadata.xml b/x11-libs/qwt/metadata.xml
index 6e86914f12c8..3a84e892fae0 100644
--- a/x11-libs/qwt/metadata.xml
+++ b/x11-libs/qwt/metadata.xml
@@ -11,7 +11,7 @@
Besides a 2D plot widget it provides scales, sliders, dials,
compasses, thermometers, wheels and knobs to control or display
values, arrays or ranges of type double.
-</longdescription>
+ </longdescription>
<use>
<flag name="designer">Installs <pkg>dev-qt/designer</pkg> plugin.</flag>
<flag name="mathml">Use the MathML renderer of the Qt solutions package.</flag>
^ permalink raw reply related [flat|nested] 60+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: x11-libs/qwt/
@ 2022-04-30 15:53 Marek Szuba
0 siblings, 0 replies; 60+ messages in thread
From: Marek Szuba @ 2022-04-30 15:53 UTC (permalink / raw
To: gentoo-commits
commit: ef298038f69bd207216ad050336b86587e490139
Author: Marek Szuba <marecki <AT> gentoo <DOT> org>
AuthorDate: Sat Apr 30 11:14:10 2022 +0000
Commit: Marek Szuba <marecki <AT> gentoo <DOT> org>
CommitDate: Sat Apr 30 15:53:10 2022 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ef298038
x11-libs/qwt: keyword 5.2.3_p20210828 for ~riscv
Signed-off-by: Marek Szuba <marecki <AT> gentoo.org>
x11-libs/qwt/qwt-5.2.3_p20210828.ebuild | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/x11-libs/qwt/qwt-5.2.3_p20210828.ebuild b/x11-libs/qwt/qwt-5.2.3_p20210828.ebuild
index 4321491653bf..30077967f4b0 100644
--- a/x11-libs/qwt/qwt-5.2.3_p20210828.ebuild
+++ b/x11-libs/qwt/qwt-5.2.3_p20210828.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=8
@@ -21,7 +21,7 @@ SRC_URI="https://github.com/SciDAVis/qwt5-qt5/archive/${COMMIT}.tar.gz -> ${P}.t
S="${WORKDIR}/${PN}5-qt5-${COMMIT}"
LICENSE="qwt"
-KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~x86"
+KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~riscv ~x86"
SLOT="5"
IUSE="designer examples"
^ permalink raw reply related [flat|nested] 60+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: x11-libs/qwt/
@ 2022-04-30 15:53 Marek Szuba
0 siblings, 0 replies; 60+ messages in thread
From: Marek Szuba @ 2022-04-30 15:53 UTC (permalink / raw
To: gentoo-commits
commit: e4f88d042dd7829c8bc1309502f467b9f48ac422
Author: Marek Szuba <marecki <AT> gentoo <DOT> org>
AuthorDate: Sat Apr 30 11:14:01 2022 +0000
Commit: Marek Szuba <marecki <AT> gentoo <DOT> org>
CommitDate: Sat Apr 30 15:53:09 2022 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e4f88d04
x11-libs/qwt: keyword 6.2.0-r1 for ~riscv
Signed-off-by: Marek Szuba <marecki <AT> gentoo.org>
x11-libs/qwt/qwt-6.2.0-r1.ebuild | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/x11-libs/qwt/qwt-6.2.0-r1.ebuild b/x11-libs/qwt/qwt-6.2.0-r1.ebuild
index c2bc73d2417c..b3cda4ab2744 100644
--- a/x11-libs/qwt/qwt-6.2.0-r1.ebuild
+++ b/x11-libs/qwt/qwt-6.2.0-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=8
@@ -15,7 +15,7 @@ HOMEPAGE="https://qwt.sourceforge.io/"
SRC_URI="mirror://sourceforge/project/${PN}/${PN}/${PV}/${P}.tar.bz2"
LICENSE="qwt"
-KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux"
SLOT="6/2.0"
IUSE="designer doc examples opengl svg"
^ permalink raw reply related [flat|nested] 60+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: x11-libs/qwt/
@ 2021-12-16 9:08 Andrew Ammerlaan
0 siblings, 0 replies; 60+ messages in thread
From: Andrew Ammerlaan @ 2021-12-16 9:08 UTC (permalink / raw
To: gentoo-commits
commit: 18225a5960b019c589ee7f265c2ba9943ec4ea3d
Author: Andrew Ammerlaan <andrewammerlaan <AT> gentoo <DOT> org>
AuthorDate: Thu Dec 16 09:07:33 2021 +0000
Commit: Andrew Ammerlaan <andrewammerlaan <AT> gentoo <DOT> org>
CommitDate: Thu Dec 16 09:08:12 2021 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=18225a59
x11-libs/qwt: build with MOC_INCLUDE=1
also add a missing doc dep
Closes: https://bugs.gentoo.org/829301
Package-Manager: Portage-3.0.28, Repoman-3.0.3
Signed-off-by: Andrew Ammerlaan <andrewammerlaan <AT> gentoo.org>
x11-libs/qwt/{qwt-6.2.0.ebuild => qwt-6.2.0-r1.ebuild} | 2 ++
1 file changed, 2 insertions(+)
diff --git a/x11-libs/qwt/qwt-6.2.0.ebuild b/x11-libs/qwt/qwt-6.2.0-r1.ebuild
similarity index 97%
rename from x11-libs/qwt/qwt-6.2.0.ebuild
rename to x11-libs/qwt/qwt-6.2.0-r1.ebuild
index 1e6aff9a96a5..c2bc73d2417c 100644
--- a/x11-libs/qwt/qwt-6.2.0.ebuild
+++ b/x11-libs/qwt/qwt-6.2.0-r1.ebuild
@@ -6,6 +6,7 @@ EAPI=8
DOCS_BUILDER="doxygen"
DOCS_DIR="doc"
DOCS_CONFIG_NAME="Doxyfile"
+DOCS_DEPEND="media-gfx/graphviz"
inherit qmake-utils docs
@@ -62,6 +63,7 @@ src_prepare() {
cat > qwtbuild.pri <<-EOF || die
QWT_CONFIG += qt warn_on thread release no_keywords
+ DEFINES += QWT_MOC_INCLUDE=1
EOF
echo "QWT_CONFIG += QwtDll" >> qwtconfig.pri
^ permalink raw reply related [flat|nested] 60+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: x11-libs/qwt/
@ 2021-12-08 10:43 Andrew Ammerlaan
0 siblings, 0 replies; 60+ messages in thread
From: Andrew Ammerlaan @ 2021-12-08 10:43 UTC (permalink / raw
To: gentoo-commits
commit: 3bd591d52f8506a461bbeea9deaa4c3a7641ccd5
Author: Andrew Ammerlaan <andrewammerlaan <AT> gentoo <DOT> org>
AuthorDate: Wed Dec 8 10:42:55 2021 +0000
Commit: Andrew Ammerlaan <andrewammerlaan <AT> gentoo <DOT> org>
CommitDate: Wed Dec 8 10:43:07 2021 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=3bd591d5
x11-libs/qwt: add missing doc deps
Closes: https://bugs.gentoo.org/828564
Package-Manager: Portage-3.0.28, Repoman-3.0.3
Signed-off-by: Andrew Ammerlaan <andrewammerlaan <AT> gentoo.org>
x11-libs/qwt/qwt-5.2.3_p20210828.ebuild | 4 ++++
1 file changed, 4 insertions(+)
diff --git a/x11-libs/qwt/qwt-5.2.3_p20210828.ebuild b/x11-libs/qwt/qwt-5.2.3_p20210828.ebuild
index f5dc249c7a50..4321491653bf 100644
--- a/x11-libs/qwt/qwt-5.2.3_p20210828.ebuild
+++ b/x11-libs/qwt/qwt-5.2.3_p20210828.ebuild
@@ -6,6 +6,10 @@ EAPI=8
DOCS_BUILDER="doxygen"
DOCS_DIR="doc"
DOCS_CONFIG_NAME="Doxyfile"
+DOCS_DEPEND="
+ media-gfx/graphviz
+ virtual/latex-base
+"
inherit docs cmake
^ permalink raw reply related [flat|nested] 60+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: x11-libs/qwt/
@ 2021-12-07 22:40 Andrew Ammerlaan
0 siblings, 0 replies; 60+ messages in thread
From: Andrew Ammerlaan @ 2021-12-07 22:40 UTC (permalink / raw
To: gentoo-commits
commit: 5461d93b3d28cba121b6b3a618b73ab416ba89bb
Author: Andrew Ammerlaan <andrewammerlaan <AT> gentoo <DOT> org>
AuthorDate: Tue Dec 7 18:35:39 2021 +0000
Commit: Andrew Ammerlaan <andrewammerlaan <AT> gentoo <DOT> org>
CommitDate: Tue Dec 7 22:40:01 2021 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=5461d93b
x11-libs/qwt: add mew snapshot for slot 5
Package-Manager: Portage-3.0.28, Repoman-3.0.3
Signed-off-by: Andrew Ammerlaan <andrewammerlaan <AT> gentoo.org>
x11-libs/qwt/Manifest | 1 +
x11-libs/qwt/qwt-5.2.3_p20210828.ebuild | 58 +++++++++++++++++++++++++++++++++
2 files changed, 59 insertions(+)
diff --git a/x11-libs/qwt/Manifest b/x11-libs/qwt/Manifest
index 4bd6322fbbee..dab884758c08 100644
--- a/x11-libs/qwt/Manifest
+++ b/x11-libs/qwt/Manifest
@@ -1,2 +1,3 @@
DIST qwt-5.2.3_p20210211.tar.gz 2324714 BLAKE2B 86556c9cf65af80500b3cba7ef78be8aec0f2413a1d485641f8870b447a1b1370b9821ad6b4a58c74f87a73172e4b2fa3eb2f02bb525c0ab3982aec550914666 SHA512 8268213c9e809015d83f3f7d42e66c85b6c9cb16efb9586ad4e5da2fa60fdcc5bdf52e0a422adcdfe928e36df0f63d8bbed1fabded91ef36d226e6cc7fa372bb
+DIST qwt-5.2.3_p20210828.tar.gz 2324516 BLAKE2B f86ee55dab0e70bb255f90384ee920985d71ff998aa74bb087c2bd7bf3cdc23034786bce0d4e652dd4a7b1551719e4723de6689c76500e5f618838f40f7ca838 SHA512 c5eb64593a476d9ff1ec6c16593896bf3b90738a17775bd8186ffc7f86911ae0b91ceb8e7c1736329e9871fd9e1e5653a85df0a4cdb780a1f2f993f33ee07f62
DIST qwt-6.1.5.tar.bz2 4408268 BLAKE2B 5f42e0cfc95a7dade8e376438234abded91390b52a793eba6aef21027379f12ab2441fd80121e05c1fba13ac1b526bb6c1a6c0e8442c87cb06dcf2c520269373 SHA512 0dd1a8278751f0bb26e33ccbf120a20e406109a440d314e4525ce9a2d6f1fc56dccff2dc11c500fe2cfcbd42f4a641e87a231f93f321edc588d9353ffaccbd22
diff --git a/x11-libs/qwt/qwt-5.2.3_p20210828.ebuild b/x11-libs/qwt/qwt-5.2.3_p20210828.ebuild
new file mode 100644
index 000000000000..638c58e8eea8
--- /dev/null
+++ b/x11-libs/qwt/qwt-5.2.3_p20210828.ebuild
@@ -0,0 +1,58 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DOCS_BUILDER="doxygen"
+DOCS_DIR="doc"
+DOCS_CONFIG_NAME="Doxyfile"
+
+inherit docs cmake
+
+COMMIT="f7519200f102676fb04fb7bd0be555e0a419d378"
+
+DESCRIPTION="2D plotting library for Qt5"
+HOMEPAGE="https://qwt.sourceforge.io/ https://github.com/SciDAVis/qwt5-qt5"
+SRC_URI="https://github.com/SciDAVis/qwt5-qt5/archive/${COMMIT}.tar.gz -> ${P}.tar.gz"
+S="${WORKDIR}/${PN}5-qt5-${COMMIT}"
+
+LICENSE="qwt"
+KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~x86"
+SLOT="5"
+IUSE="designer examples"
+
+DEPEND="
+ dev-qt/qtconcurrent:5
+ dev-qt/qtcore:5
+ dev-qt/qtgui:5
+ dev-qt/qtprintsupport:5
+ dev-qt/qtwidgets:5
+ dev-qt/qtsvg:5
+ designer? ( dev-qt/designer:5 )
+"
+RDEPEND="${DEPEND}"
+
+src_configure() {
+ local mycmakeargs=(
+ -DBUILD_EXAMPLES=$(usex examples)
+ -DQWT_DESIGNER=$(usex designer)
+ )
+ cmake_src_configure
+}
+
+src_compile() {
+ cmake_src_compile
+ docs_compile
+}
+
+src_install() {
+ cmake_src_install
+
+ # avoid file conflict with qwt:6
+ # https://github.com/gbm19/qwt5-qt5/issues/2
+ pushd "${ED}/usr/share/man/man3/" || die
+ for f in *; do
+ mv ${f} ${f//.3/.5qt5.3} || die
+ done
+ popd || die
+}
^ permalink raw reply related [flat|nested] 60+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: x11-libs/qwt/
@ 2021-12-07 22:40 Andrew Ammerlaan
0 siblings, 0 replies; 60+ messages in thread
From: Andrew Ammerlaan @ 2021-12-07 22:40 UTC (permalink / raw
To: gentoo-commits
commit: cfb28cff9d5b8822fbdd59a9270895c7df89b23e
Author: Andrew Ammerlaan <andrewammerlaan <AT> gentoo <DOT> org>
AuthorDate: Tue Dec 7 19:20:54 2021 +0000
Commit: Andrew Ammerlaan <andrewammerlaan <AT> gentoo <DOT> org>
CommitDate: Tue Dec 7 22:40:01 2021 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=cfb28cff
x11-libs/qwt: add version 6.2.0
Closes: https://bugs.gentoo.org/828431
Package-Manager: Portage-3.0.28, Repoman-3.0.3
Signed-off-by: Andrew Ammerlaan <andrewammerlaan <AT> gentoo.org>
x11-libs/qwt/Manifest | 1 +
x11-libs/qwt/qwt-6.2.0.ebuild | 125 ++++++++++++++++++++++++++++++++++++++++++
2 files changed, 126 insertions(+)
diff --git a/x11-libs/qwt/Manifest b/x11-libs/qwt/Manifest
index dab884758c08..e33a6b4b3b9f 100644
--- a/x11-libs/qwt/Manifest
+++ b/x11-libs/qwt/Manifest
@@ -1,3 +1,4 @@
DIST qwt-5.2.3_p20210211.tar.gz 2324714 BLAKE2B 86556c9cf65af80500b3cba7ef78be8aec0f2413a1d485641f8870b447a1b1370b9821ad6b4a58c74f87a73172e4b2fa3eb2f02bb525c0ab3982aec550914666 SHA512 8268213c9e809015d83f3f7d42e66c85b6c9cb16efb9586ad4e5da2fa60fdcc5bdf52e0a422adcdfe928e36df0f63d8bbed1fabded91ef36d226e6cc7fa372bb
DIST qwt-5.2.3_p20210828.tar.gz 2324516 BLAKE2B f86ee55dab0e70bb255f90384ee920985d71ff998aa74bb087c2bd7bf3cdc23034786bce0d4e652dd4a7b1551719e4723de6689c76500e5f618838f40f7ca838 SHA512 c5eb64593a476d9ff1ec6c16593896bf3b90738a17775bd8186ffc7f86911ae0b91ceb8e7c1736329e9871fd9e1e5653a85df0a4cdb780a1f2f993f33ee07f62
DIST qwt-6.1.5.tar.bz2 4408268 BLAKE2B 5f42e0cfc95a7dade8e376438234abded91390b52a793eba6aef21027379f12ab2441fd80121e05c1fba13ac1b526bb6c1a6c0e8442c87cb06dcf2c520269373 SHA512 0dd1a8278751f0bb26e33ccbf120a20e406109a440d314e4525ce9a2d6f1fc56dccff2dc11c500fe2cfcbd42f4a641e87a231f93f321edc588d9353ffaccbd22
+DIST qwt-6.2.0.tar.bz2 4815773 BLAKE2B 30011de7ef9b555584644ccb0994bfe56af2d7efe16690b236aa1aa0860a4408800fbd31003fd7a7a0ddf8572f573b4d0ff77069f291cd2858b31a2840952b3b SHA512 d992f9dddb09ad0e1d09e23a24a9331c950ca19a413d2627cf423e1ddc2a4ad4eb951646f789e8c7a9ab42668c30d7108071f3f8bbd8e1f4118cadb67c34939d
diff --git a/x11-libs/qwt/qwt-6.2.0.ebuild b/x11-libs/qwt/qwt-6.2.0.ebuild
new file mode 100644
index 000000000000..1e6aff9a96a5
--- /dev/null
+++ b/x11-libs/qwt/qwt-6.2.0.ebuild
@@ -0,0 +1,125 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DOCS_BUILDER="doxygen"
+DOCS_DIR="doc"
+DOCS_CONFIG_NAME="Doxyfile"
+
+inherit qmake-utils docs
+
+DESCRIPTION="2D plotting library for Qt5"
+HOMEPAGE="https://qwt.sourceforge.io/"
+SRC_URI="mirror://sourceforge/project/${PN}/${PN}/${PV}/${P}.tar.bz2"
+
+LICENSE="qwt"
+KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux"
+SLOT="6/2.0"
+IUSE="designer doc examples opengl svg"
+
+DEPEND="
+ 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
+ virtual/opengl
+ )
+ svg? ( dev-qt/qtsvg:5 )
+"
+RDEPEND="${DEPEND}"
+
+# tests require package to be already installed
+RESTRICT="test"
+
+DOCS=( CHANGES-6.2 README )
+
+src_prepare() {
+ default
+
+ cat > qwtconfig.pri <<-EOF || die
+ 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
+ VER_MAJ = $(ver_cut 1)
+ VER_MIN = $(ver_cut 2)
+ VER_PAT = $(ver_cut 3)
+ VERSION = ${PV/_*}
+ QWT_VER_MAJ = $(ver_cut 1)
+ QWT_VER_MIN = $(ver_cut 2)
+ QWT_VER_PAT = $(ver_cut 3)
+ QWT_VERSION = ${PV/_*}
+ EOF
+
+ use designer && echo "QWT_CONFIG += QwtDesigner" >> qwtconfig.pri
+ use opengl && echo "QWT_CONFIG += QwtOpenGL" >> qwtconfig.pri
+ use svg && echo "QWT_CONFIG += QwtSvg" >> qwtconfig.pri
+
+ cat > qwtbuild.pri <<-EOF || die
+ QWT_CONFIG += qt warn_on thread release no_keywords
+ EOF
+
+ echo "QWT_CONFIG += QwtDll" >> qwtconfig.pri
+
+ cat >> qwtconfig.pri <<-EOF || die
+ 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" \
+ -e "s:QWT_SONAME=libqwt.so:QWT_SONAME=libqwt6-qt5.so: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 || die
+}
+
+src_configure() {
+ eqmake5
+}
+
+src_compile() {
+ default
+ # need doxyfilter.sh in PATH
+ PATH="${PATH}:${S}/doc/" docs_compile
+}
+
+src_test() {
+ cd tests || die
+ eqmake5 tests.pro
+ emake
+}
+
+src_install() {
+ emake INSTALL_ROOT="${D}" install
+ 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 || die
+ 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
+}
^ permalink raw reply related [flat|nested] 60+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: x11-libs/qwt/
@ 2021-10-20 4:03 Sam James
0 siblings, 0 replies; 60+ messages in thread
From: Sam James @ 2021-10-20 4:03 UTC (permalink / raw
To: gentoo-commits
commit: c3bd63c1123e5c42a1d8b015e7e3693811fcd807
Author: Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Wed Oct 20 04:03:21 2021 +0000
Commit: Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Wed Oct 20 04:03:21 2021 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c3bd63c1
x11-libs/qwt: Stabilize 5.2.3_p20210211 ppc, #818655
Signed-off-by: Sam James <sam <AT> gentoo.org>
x11-libs/qwt/qwt-5.2.3_p20210211.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/x11-libs/qwt/qwt-5.2.3_p20210211.ebuild b/x11-libs/qwt/qwt-5.2.3_p20210211.ebuild
index 340b50a4f89..aa64d85aa9c 100644
--- a/x11-libs/qwt/qwt-5.2.3_p20210211.ebuild
+++ b/x11-libs/qwt/qwt-5.2.3_p20210211.ebuild
@@ -12,7 +12,7 @@ HOMEPAGE="https://qwt.sourceforge.io/ https://github.com/SciDAVis/qwt5-qt5"
SRC_URI="https://github.com/SciDAVis/qwt5-qt5/archive/${COMMIT}.tar.gz -> ${P}.tar.gz"
LICENSE="qwt"
-KEYWORDS="amd64 ~arm ~ppc ppc64 x86"
+KEYWORDS="amd64 ~arm ppc ppc64 x86"
SLOT="5"
IUSE="designer examples"
^ permalink raw reply related [flat|nested] 60+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: x11-libs/qwt/
@ 2021-10-18 0:39 Sam James
0 siblings, 0 replies; 60+ messages in thread
From: Sam James @ 2021-10-18 0:39 UTC (permalink / raw
To: gentoo-commits
commit: d4bf2b4e03da1e6cc5c8a7f455db0dc0767eddb2
Author: Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Mon Oct 18 00:39:32 2021 +0000
Commit: Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Mon Oct 18 00:39:32 2021 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d4bf2b4e
x11-libs/qwt: Stabilize 5.2.3_p20210211 ppc64, #818655
Signed-off-by: Sam James <sam <AT> gentoo.org>
x11-libs/qwt/qwt-5.2.3_p20210211.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/x11-libs/qwt/qwt-5.2.3_p20210211.ebuild b/x11-libs/qwt/qwt-5.2.3_p20210211.ebuild
index 88168d04812..340b50a4f89 100644
--- a/x11-libs/qwt/qwt-5.2.3_p20210211.ebuild
+++ b/x11-libs/qwt/qwt-5.2.3_p20210211.ebuild
@@ -12,7 +12,7 @@ HOMEPAGE="https://qwt.sourceforge.io/ https://github.com/SciDAVis/qwt5-qt5"
SRC_URI="https://github.com/SciDAVis/qwt5-qt5/archive/${COMMIT}.tar.gz -> ${P}.tar.gz"
LICENSE="qwt"
-KEYWORDS="amd64 ~arm ~ppc ~ppc64 x86"
+KEYWORDS="amd64 ~arm ~ppc ppc64 x86"
SLOT="5"
IUSE="designer examples"
^ permalink raw reply related [flat|nested] 60+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: x11-libs/qwt/
@ 2021-10-17 20:04 Sam James
0 siblings, 0 replies; 60+ messages in thread
From: Sam James @ 2021-10-17 20:04 UTC (permalink / raw
To: gentoo-commits
commit: 5fe362975d9fc00e3328df9dbc54358055438c9c
Author: Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Sun Oct 17 20:03:15 2021 +0000
Commit: Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Sun Oct 17 20:04:43 2021 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=5fe36297
x11-libs/qwt: Stabilize 5.2.3_p20210211 x86, #818655
Signed-off-by: Sam James <sam <AT> gentoo.org>
x11-libs/qwt/qwt-5.2.3_p20210211.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/x11-libs/qwt/qwt-5.2.3_p20210211.ebuild b/x11-libs/qwt/qwt-5.2.3_p20210211.ebuild
index 3b32f48c65c..88168d04812 100644
--- a/x11-libs/qwt/qwt-5.2.3_p20210211.ebuild
+++ b/x11-libs/qwt/qwt-5.2.3_p20210211.ebuild
@@ -12,7 +12,7 @@ HOMEPAGE="https://qwt.sourceforge.io/ https://github.com/SciDAVis/qwt5-qt5"
SRC_URI="https://github.com/SciDAVis/qwt5-qt5/archive/${COMMIT}.tar.gz -> ${P}.tar.gz"
LICENSE="qwt"
-KEYWORDS="amd64 ~arm ~ppc ~ppc64 ~x86"
+KEYWORDS="amd64 ~arm ~ppc ~ppc64 x86"
SLOT="5"
IUSE="designer examples"
^ permalink raw reply related [flat|nested] 60+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: x11-libs/qwt/
@ 2021-10-17 19:09 Sam James
0 siblings, 0 replies; 60+ messages in thread
From: Sam James @ 2021-10-17 19:09 UTC (permalink / raw
To: gentoo-commits
commit: 1d43c16278e7c4f68aa942676916dc60c09c29c9
Author: Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Sun Oct 17 19:07:22 2021 +0000
Commit: Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Sun Oct 17 19:07:22 2021 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=1d43c162
x11-libs/qwt: Stabilize 5.2.3_p20210211 amd64, #818655
Signed-off-by: Sam James <sam <AT> gentoo.org>
x11-libs/qwt/qwt-5.2.3_p20210211.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/x11-libs/qwt/qwt-5.2.3_p20210211.ebuild b/x11-libs/qwt/qwt-5.2.3_p20210211.ebuild
index 5762259d2e3..3b32f48c65c 100644
--- a/x11-libs/qwt/qwt-5.2.3_p20210211.ebuild
+++ b/x11-libs/qwt/qwt-5.2.3_p20210211.ebuild
@@ -12,7 +12,7 @@ HOMEPAGE="https://qwt.sourceforge.io/ https://github.com/SciDAVis/qwt5-qt5"
SRC_URI="https://github.com/SciDAVis/qwt5-qt5/archive/${COMMIT}.tar.gz -> ${P}.tar.gz"
LICENSE="qwt"
-KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~x86"
+KEYWORDS="amd64 ~arm ~ppc ~ppc64 ~x86"
SLOT="5"
IUSE="designer examples"
^ permalink raw reply related [flat|nested] 60+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: x11-libs/qwt/
@ 2021-05-23 13:08 Andrew Ammerlaan
0 siblings, 0 replies; 60+ messages in thread
From: Andrew Ammerlaan @ 2021-05-23 13:08 UTC (permalink / raw
To: gentoo-commits
commit: 84849e1d8e53a0ea6d4585497be59ef6301c94e6
Author: Andrew Ammerlaan <andrewammerlaan <AT> gentoo <DOT> org>
AuthorDate: Sun May 23 13:05:38 2021 +0000
Commit: Andrew Ammerlaan <andrewammerlaan <AT> gentoo <DOT> org>
CommitDate: Sun May 23 13:08:52 2021 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=84849e1d
x11-libs/qwt: add missing die on the heredocs
Package-Manager: Portage-3.0.18, Repoman-3.0.3
Signed-off-by: Andrew Ammerlaan <andrewammerlaan <AT> gentoo.org>
x11-libs/qwt/qwt-5.2.3_p20210211.ebuild | 6 +++---
x11-libs/qwt/qwt-6.1.5.ebuild | 8 ++++----
2 files changed, 7 insertions(+), 7 deletions(-)
diff --git a/x11-libs/qwt/qwt-5.2.3_p20210211.ebuild b/x11-libs/qwt/qwt-5.2.3_p20210211.ebuild
index 3e01139e4af..5762259d2e3 100644
--- a/x11-libs/qwt/qwt-5.2.3_p20210211.ebuild
+++ b/x11-libs/qwt/qwt-5.2.3_p20210211.ebuild
@@ -33,7 +33,7 @@ src_prepare() {
default
sed -e "/QwtVersion/s:5.2.2.:${PV/_*}:g" -i ${PN}.prf || die
- cat > qwtconfig.pri <<-EOF
+ cat > qwtconfig.pri <<-EOF || die
target.path = "${EPREFIX}/usr/$(get_libdir)"
headers.path = "${EPREFIX}/usr/include/qwt5"
doc.path = "${EPREFIX}/usr/share/doc/${PF}"
@@ -46,7 +46,7 @@ src_prepare() {
# Fails to compile with MathML enabled
#use mathml && echo "CONFIG += QwtMathML" >> qwtconfig.pri
- cat >> qwtconfig.pri <<-EOF
+ cat >> qwtconfig.pri <<-EOF || die
QWT_INSTALL_PLUGINS = "${EPREFIX}$(qt5_get_plugindir)/designer"
QWT_INSTALL_FEATURES = "${EPREFIX}$(qt5_get_mkspecsdir)/features"
EOF
@@ -68,7 +68,7 @@ src_install () {
if use examples; then
# don't build examples - fix the qt files to build once installed
- cat > examples/examples.pri <<-EOF
+ cat > examples/examples.pri <<-EOF || die
include( qwtconfig.pri )
TEMPLATE = app
MOC_DIR = moc
diff --git a/x11-libs/qwt/qwt-6.1.5.ebuild b/x11-libs/qwt/qwt-6.1.5.ebuild
index fccc45df62b..96d8e6a1750 100644
--- a/x11-libs/qwt/qwt-6.1.5.ebuild
+++ b/x11-libs/qwt/qwt-6.1.5.ebuild
@@ -39,7 +39,7 @@ PATCHES=(
src_prepare() {
default
- cat > qwtconfig.pri <<-EOF
+ cat > qwtconfig.pri <<-EOF || die
QWT_INSTALL_LIBS = "${EPREFIX}/usr/$(get_libdir)"
QWT_INSTALL_HEADERS = "${EPREFIX}/usr/include/qwt6"
QWT_INSTALL_DOCS = "${EPREFIX}/usr/share/doc/${PF}"
@@ -53,13 +53,13 @@ src_prepare() {
use opengl && echo "QWT_CONFIG += QwtOpenGL" >> qwtconfig.pri
use svg && echo "QWT_CONFIG += QwtSvg" >> qwtconfig.pri
- cat > qwtbuild.pri <<-EOF
+ cat > qwtbuild.pri <<-EOF || die
QWT_CONFIG += qt warn_on thread release no_keywords
EOF
echo "QWT_CONFIG += QwtDll" >> qwtconfig.pri
- cat >> qwtconfig.pri <<-EOF
+ cat >> qwtconfig.pri <<-EOF || die
QWT_INSTALL_PLUGINS = "${EPREFIX}$(qt5_get_plugindir)/designer"
QWT_INSTALL_FEATURES = "${EPREFIX}$(qt5_get_mkspecsdir)/features"
EOF
@@ -113,7 +113,7 @@ src_install() {
if use examples; then
# don't build examples - fix the qt files to build once installed
- cat > examples/examples.pri <<-EOF
+ cat > examples/examples.pri <<-EOF || die
include( qwtconfig.pri )
TEMPLATE = app
MOC_DIR = moc
^ permalink raw reply related [flat|nested] 60+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: x11-libs/qwt/
@ 2021-05-23 12:47 Andrew Ammerlaan
0 siblings, 0 replies; 60+ messages in thread
From: Andrew Ammerlaan @ 2021-05-23 12:47 UTC (permalink / raw
To: gentoo-commits
commit: 163af06911edd0328728e5cd4ecc5966fd703812
Author: Andrew Ammerlaan <andrewammerlaan <AT> gentoo <DOT> org>
AuthorDate: Sun May 23 11:39:20 2021 +0000
Commit: Andrew Ammerlaan <andrewammerlaan <AT> gentoo <DOT> org>
CommitDate: Sun May 23 12:47:37 2021 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=163af069
x11-libs/qwt: add 5.2.3
Package-Manager: Portage-3.0.18, Repoman-3.0.3
Signed-off-by: Andrew Ammerlaan <andrewammerlaan <AT> gentoo.org>
x11-libs/qwt/Manifest | 1 +
x11-libs/qwt/metadata.xml | 1 +
x11-libs/qwt/qwt-5.2.3_p20210211.ebuild | 92 +++++++++++++++++++++++++++++++++
x11-libs/qwt/qwt-6.1.5.ebuild | 2 +-
4 files changed, 95 insertions(+), 1 deletion(-)
diff --git a/x11-libs/qwt/Manifest b/x11-libs/qwt/Manifest
index 8975bcd4c24..4bd6322fbbe 100644
--- a/x11-libs/qwt/Manifest
+++ b/x11-libs/qwt/Manifest
@@ -1 +1,2 @@
+DIST qwt-5.2.3_p20210211.tar.gz 2324714 BLAKE2B 86556c9cf65af80500b3cba7ef78be8aec0f2413a1d485641f8870b447a1b1370b9821ad6b4a58c74f87a73172e4b2fa3eb2f02bb525c0ab3982aec550914666 SHA512 8268213c9e809015d83f3f7d42e66c85b6c9cb16efb9586ad4e5da2fa60fdcc5bdf52e0a422adcdfe928e36df0f63d8bbed1fabded91ef36d226e6cc7fa372bb
DIST qwt-6.1.5.tar.bz2 4408268 BLAKE2B 5f42e0cfc95a7dade8e376438234abded91390b52a793eba6aef21027379f12ab2441fd80121e05c1fba13ac1b526bb6c1a6c0e8442c87cb06dcf2c520269373 SHA512 0dd1a8278751f0bb26e33ccbf120a20e406109a440d314e4525ce9a2d6f1fc56dccff2dc11c500fe2cfcbd42f4a641e87a231f93f321edc588d9353ffaccbd22
diff --git a/x11-libs/qwt/metadata.xml b/x11-libs/qwt/metadata.xml
index 5fa86121223..5acd8316bb0 100644
--- a/x11-libs/qwt/metadata.xml
+++ b/x11-libs/qwt/metadata.xml
@@ -18,5 +18,6 @@
</use>
<upstream>
<remote-id type="sourceforge">qwt</remote-id>
+ <remote-id type="github">SciDAVis/qwt5-qt5</remote-id>
</upstream>
</pkgmetadata>
diff --git a/x11-libs/qwt/qwt-5.2.3_p20210211.ebuild b/x11-libs/qwt/qwt-5.2.3_p20210211.ebuild
new file mode 100644
index 00000000000..3e01139e4af
--- /dev/null
+++ b/x11-libs/qwt/qwt-5.2.3_p20210211.ebuild
@@ -0,0 +1,92 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit qmake-utils
+
+COMMIT="2a9f1ae2f394abf3a000906b507a0d925b1e4b25"
+
+DESCRIPTION="2D plotting library for Qt5"
+HOMEPAGE="https://qwt.sourceforge.io/ https://github.com/SciDAVis/qwt5-qt5"
+SRC_URI="https://github.com/SciDAVis/qwt5-qt5/archive/${COMMIT}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="qwt"
+KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~x86"
+SLOT="5"
+IUSE="designer examples"
+
+DEPEND="
+ dev-qt/qtconcurrent:5
+ dev-qt/qtcore:5
+ dev-qt/qtgui:5
+ dev-qt/qtprintsupport:5
+ dev-qt/qtwidgets:5
+ dev-qt/qtsvg:5
+ designer? ( dev-qt/designer:5 )
+"
+RDEPEND="${DEPEND}"
+
+S="${WORKDIR}/${PN}5-qt5-${COMMIT}"
+
+src_prepare() {
+ default
+ 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 += QwtDll QwtPlot QwtWidgets QwtSVGItem
+ VERSION = ${PV/_*}
+ QWT_VERSION = ${PV/_*}
+ EOF
+ use designer && echo "CONFIG += QwtDesigner" >> qwtconfig.pri
+ # Fails to compile with MathML enabled
+ #use mathml && echo "CONFIG += QwtMathML" >> qwtconfig.pri
+
+ cat >> qwtconfig.pri <<-EOF
+ QWT_INSTALL_PLUGINS = "${EPREFIX}$(qt5_get_plugindir)/designer"
+ QWT_INSTALL_FEATURES = "${EPREFIX}$(qt5_get_mkspecsdir)/features"
+ EOF
+ sed -i -e 's/headers doc/headers/' src/src.pro || die
+}
+
+src_configure() {
+ eqmake5
+}
+
+src_compile() {
+ default
+}
+
+src_install () {
+ emake INSTALL_ROOT="${D}" install
+ einstalldocs
+ doman doc/man/*/*
+
+ 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
+
+ # avoid file conflict with qwt:6
+ # https://github.com/gbm19/qwt5-qt5/issues/2
+ pushd "${ED}/usr/share/man/man3/" || die
+ for f in *; do
+ mv ${f} ${f//.3/.5qt5.3} || die
+ done
+ popd || die
+}
diff --git a/x11-libs/qwt/qwt-6.1.5.ebuild b/x11-libs/qwt/qwt-6.1.5.ebuild
index 1c2423d812c..fccc45df62b 100644
--- a/x11-libs/qwt/qwt-6.1.5.ebuild
+++ b/x11-libs/qwt/qwt-6.1.5.ebuild
@@ -6,7 +6,7 @@ EAPI=7
inherit qmake-utils
DESCRIPTION="2D plotting library for Qt5"
-HOMEPAGE="https://qwt.sourceforge.net/"
+HOMEPAGE="https://qwt.sourceforge.io/"
SRC_URI="mirror://sourceforge/project/${PN}/${PN}/${PV}/${P}.tar.bz2"
LICENSE="qwt mathml? ( LGPL-2.1 Nokia-Qt-LGPL-Exception-1.1 )"
^ permalink raw reply related [flat|nested] 60+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: x11-libs/qwt/
@ 2021-01-24 13:35 Sam James
0 siblings, 0 replies; 60+ messages in thread
From: Sam James @ 2021-01-24 13:35 UTC (permalink / raw
To: gentoo-commits
commit: 09c58122d7018567b8dd6fe99d9f0d02fb0fa651
Author: Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Sun Jan 24 13:34:37 2021 +0000
Commit: Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Sun Jan 24 13:34:37 2021 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=09c58122
x11-libs/qwt: Stabilize 6.1.5 ppc, #765571
Signed-off-by: Sam James <sam <AT> gentoo.org>
x11-libs/qwt/qwt-6.1.5.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/x11-libs/qwt/qwt-6.1.5.ebuild b/x11-libs/qwt/qwt-6.1.5.ebuild
index c5d09e22bf3..1c2423d812c 100644
--- a/x11-libs/qwt/qwt-6.1.5.ebuild
+++ b/x11-libs/qwt/qwt-6.1.5.ebuild
@@ -10,7 +10,7 @@ HOMEPAGE="https://qwt.sourceforge.net/"
SRC_URI="mirror://sourceforge/project/${PN}/${PN}/${PV}/${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"
+KEYWORDS="amd64 ~arm ppc ppc64 ~sparc x86 ~amd64-linux ~x86-linux"
SLOT="6/1.5"
IUSE="designer doc examples mathml opengl svg"
^ permalink raw reply related [flat|nested] 60+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: x11-libs/qwt/
@ 2021-01-24 13:33 Sam James
0 siblings, 0 replies; 60+ messages in thread
From: Sam James @ 2021-01-24 13:33 UTC (permalink / raw
To: gentoo-commits
commit: 01c1f21289f58aa867a4e4e661c0d2539b5ca255
Author: Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Sun Jan 24 13:33:19 2021 +0000
Commit: Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Sun Jan 24 13:33:19 2021 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=01c1f212
x11-libs/qwt: Stabilize 6.1.5 ppc64, #765571
Signed-off-by: Sam James <sam <AT> gentoo.org>
x11-libs/qwt/qwt-6.1.5.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/x11-libs/qwt/qwt-6.1.5.ebuild b/x11-libs/qwt/qwt-6.1.5.ebuild
index 3328e27fd94..c5d09e22bf3 100644
--- a/x11-libs/qwt/qwt-6.1.5.ebuild
+++ b/x11-libs/qwt/qwt-6.1.5.ebuild
@@ -10,7 +10,7 @@ HOMEPAGE="https://qwt.sourceforge.net/"
SRC_URI="mirror://sourceforge/project/${PN}/${PN}/${PV}/${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"
+KEYWORDS="amd64 ~arm ~ppc ppc64 ~sparc x86 ~amd64-linux ~x86-linux"
SLOT="6/1.5"
IUSE="designer doc examples mathml opengl svg"
^ permalink raw reply related [flat|nested] 60+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: x11-libs/qwt/
@ 2021-01-22 18:45 Sam James
0 siblings, 0 replies; 60+ messages in thread
From: Sam James @ 2021-01-22 18:45 UTC (permalink / raw
To: gentoo-commits
commit: c4c3e1fb77905c00a6f6e50ba9e2925235ebebfa
Author: Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Fri Jan 22 18:45:21 2021 +0000
Commit: Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Fri Jan 22 18:45:21 2021 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c4c3e1fb
x11-libs/qwt: Stabilize 6.1.5 x86, #765571
Signed-off-by: Sam James <sam <AT> gentoo.org>
x11-libs/qwt/qwt-6.1.5.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/x11-libs/qwt/qwt-6.1.5.ebuild b/x11-libs/qwt/qwt-6.1.5.ebuild
index 6c413b32ee0..3328e27fd94 100644
--- a/x11-libs/qwt/qwt-6.1.5.ebuild
+++ b/x11-libs/qwt/qwt-6.1.5.ebuild
@@ -10,7 +10,7 @@ HOMEPAGE="https://qwt.sourceforge.net/"
SRC_URI="mirror://sourceforge/project/${PN}/${PN}/${PV}/${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"
+KEYWORDS="amd64 ~arm ~ppc ~ppc64 ~sparc x86 ~amd64-linux ~x86-linux"
SLOT="6/1.5"
IUSE="designer doc examples mathml opengl svg"
^ permalink raw reply related [flat|nested] 60+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: x11-libs/qwt/
@ 2021-01-21 9:52 Agostino Sarubbo
0 siblings, 0 replies; 60+ messages in thread
From: Agostino Sarubbo @ 2021-01-21 9:52 UTC (permalink / raw
To: gentoo-commits
commit: 1c0d97d551959e322381ecc45e8d3fbca69fbcaa
Author: Agostino Sarubbo <ago <AT> gentoo <DOT> org>
AuthorDate: Thu Jan 21 09:52:09 2021 +0000
Commit: Agostino Sarubbo <ago <AT> gentoo <DOT> org>
CommitDate: Thu Jan 21 09:52:09 2021 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=1c0d97d5
x11-libs/qwt: amd64 stable wrt bug #765571
Package-Manager: Portage-3.0.9, Repoman-3.0.2
RepoMan-Options: --include-arches="amd64"
Signed-off-by: Agostino Sarubbo <ago <AT> gentoo.org>
x11-libs/qwt/qwt-6.1.5.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/x11-libs/qwt/qwt-6.1.5.ebuild b/x11-libs/qwt/qwt-6.1.5.ebuild
index 43b1263c98c..6c413b32ee0 100644
--- a/x11-libs/qwt/qwt-6.1.5.ebuild
+++ b/x11-libs/qwt/qwt-6.1.5.ebuild
@@ -10,7 +10,7 @@ HOMEPAGE="https://qwt.sourceforge.net/"
SRC_URI="mirror://sourceforge/project/${PN}/${PN}/${PV}/${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"
+KEYWORDS="amd64 ~arm ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux"
SLOT="6/1.5"
IUSE="designer doc examples mathml opengl svg"
^ permalink raw reply related [flat|nested] 60+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: x11-libs/qwt/
@ 2021-01-06 12:01 Fabian Groffen
0 siblings, 0 replies; 60+ messages in thread
From: Fabian Groffen @ 2021-01-06 12:01 UTC (permalink / raw
To: gentoo-commits
commit: 31b682e057d24376201609d7e4a128de02841476
Author: Fabian Groffen <grobian <AT> gentoo <DOT> org>
AuthorDate: Wed Jan 6 11:58:46 2021 +0000
Commit: Fabian Groffen <grobian <AT> gentoo <DOT> org>
CommitDate: Wed Jan 6 11:58:46 2021 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=31b682e0
x11-libs/qwt: drop x86-macos
Package-Manager: Portage-3.0.12, Repoman-3.0.2
Signed-off-by: Fabian Groffen <grobian <AT> gentoo.org>
x11-libs/qwt/qwt-6.1.4.ebuild | 4 ++--
x11-libs/qwt/qwt-6.1.5.ebuild | 4 ++--
2 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/x11-libs/qwt/qwt-6.1.4.ebuild b/x11-libs/qwt/qwt-6.1.4.ebuild
index 170bfa85c87..152afdf4b6b 100644
--- a/x11-libs/qwt/qwt-6.1.4.ebuild
+++ b/x11-libs/qwt/qwt-6.1.4.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=7
@@ -10,7 +10,7 @@ HOMEPAGE="https://qwt.sourceforge.net/"
SRC_URI="mirror://sourceforge/project/${PN}/${PN}/${PV}/${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"
SLOT="6/1.4"
IUSE="designer doc examples mathml opengl svg"
diff --git a/x11-libs/qwt/qwt-6.1.5.ebuild b/x11-libs/qwt/qwt-6.1.5.ebuild
index 4ea5805f7f0..43b1263c98c 100644
--- a/x11-libs/qwt/qwt-6.1.5.ebuild
+++ b/x11-libs/qwt/qwt-6.1.5.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=7
@@ -10,7 +10,7 @@ HOMEPAGE="https://qwt.sourceforge.net/"
SRC_URI="mirror://sourceforge/project/${PN}/${PN}/${PV}/${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"
SLOT="6/1.5"
IUSE="designer doc examples mathml opengl svg"
^ permalink raw reply related [flat|nested] 60+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: x11-libs/qwt/
@ 2020-10-07 20:26 Rick Farina
0 siblings, 0 replies; 60+ messages in thread
From: Rick Farina @ 2020-10-07 20:26 UTC (permalink / raw
To: gentoo-commits
commit: 7929dbbb523b9eaefb101996e65821e25fbd2b23
Author: Rick Farina <zerochaos <AT> gentoo <DOT> org>
AuthorDate: Wed Oct 7 15:32:18 2020 +0000
Commit: Rick Farina <zerochaos <AT> gentoo <DOT> org>
CommitDate: Wed Oct 7 20:26:14 2020 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=7929dbbb
x11-libs/qwt: fix subslot
presumably correctly
Package-Manager: Portage-3.0.8, Repoman-3.0.1
Signed-off-by: Rick Farina <zerochaos <AT> gentoo.org>
x11-libs/qwt/qwt-6.1.5.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/x11-libs/qwt/qwt-6.1.5.ebuild b/x11-libs/qwt/qwt-6.1.5.ebuild
index 44c1eba26b9..4ea5805f7f0 100644
--- a/x11-libs/qwt/qwt-6.1.5.ebuild
+++ b/x11-libs/qwt/qwt-6.1.5.ebuild
@@ -11,7 +11,7 @@ SRC_URI="mirror://sourceforge/project/${PN}/${PN}/${PV}/${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.4"
+SLOT="6/1.5"
IUSE="designer doc examples mathml opengl svg"
DEPEND="
^ permalink raw reply related [flat|nested] 60+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: x11-libs/qwt/
@ 2020-10-07 20:26 Rick Farina
0 siblings, 0 replies; 60+ messages in thread
From: Rick Farina @ 2020-10-07 20:26 UTC (permalink / raw
To: gentoo-commits
commit: 2c03817db977cc9b16b95237a1449ba1abc61e7c
Author: Rick Farina <zerochaos <AT> gentoo <DOT> org>
AuthorDate: Wed Oct 7 15:23:14 2020 +0000
Commit: Rick Farina <zerochaos <AT> gentoo <DOT> org>
CommitDate: Wed Oct 7 20:26:14 2020 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=2c03817d
x11-libs/qwt: non-maintainer bump
I needed this for my testing so I figured I would share.
Apologies if that's an overstep.
Package-Manager: Portage-3.0.8, Repoman-3.0.1
Signed-off-by: Rick Farina <zerochaos <AT> gentoo.org>
x11-libs/qwt/Manifest | 1 +
x11-libs/qwt/qwt-6.1.5.ebuild | 129 ++++++++++++++++++++++++++++++++++++++++++
2 files changed, 130 insertions(+)
diff --git a/x11-libs/qwt/Manifest b/x11-libs/qwt/Manifest
index 493631909bf..67c5258709b 100644
--- a/x11-libs/qwt/Manifest
+++ b/x11-libs/qwt/Manifest
@@ -1 +1,2 @@
DIST qwt-6.1.4.tar.bz2 4227315 BLAKE2B dd7212adb3c8fda081b1feeeb9d59b3b087deb0ef56bdbc7bb95e01992e41d5d91065f0b8aaf3337e1c66d4ad431bfb313f9b04bb2e43915f4cb21fb65725e36 SHA512 6135ce47fd4f9ff5b705193fc1f7410cfd5a0b84931bb17db750f6a5486ae810c261dae32431bd52838c36eadee02487148e1efa71c465c63aa43062eec160da
+DIST qwt-6.1.5.tar.bz2 4408268 BLAKE2B 5f42e0cfc95a7dade8e376438234abded91390b52a793eba6aef21027379f12ab2441fd80121e05c1fba13ac1b526bb6c1a6c0e8442c87cb06dcf2c520269373 SHA512 0dd1a8278751f0bb26e33ccbf120a20e406109a440d314e4525ce9a2d6f1fc56dccff2dc11c500fe2cfcbd42f4a641e87a231f93f321edc588d9353ffaccbd22
diff --git a/x11-libs/qwt/qwt-6.1.5.ebuild b/x11-libs/qwt/qwt-6.1.5.ebuild
new file mode 100644
index 00000000000..44c1eba26b9
--- /dev/null
+++ b/x11-libs/qwt/qwt-6.1.5.ebuild
@@ -0,0 +1,129 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit qmake-utils
+
+DESCRIPTION="2D plotting library for Qt5"
+HOMEPAGE="https://qwt.sourceforge.net/"
+SRC_URI="mirror://sourceforge/project/${PN}/${PN}/${PV}/${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.4"
+IUSE="designer doc examples mathml opengl svg"
+
+DEPEND="
+ 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
+ virtual/opengl
+ )
+ svg? ( dev-qt/qtsvg:5 )
+"
+RDEPEND="${DEPEND}"
+
+DOCS=( CHANGES-6.1 README )
+
+PATCHES=(
+ "${FILESDIR}"/${PN}-6.0.2-invalid-read.patch
+ "${FILESDIR}"/${PN}-6.1.1-pc-destdir.patch
+)
+
+src_prepare() {
+ default
+
+ 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
+
+ echo "QWT_CONFIG += QwtDll" >> qwtconfig.pri
+
+ 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
+}
+
+src_configure() {
+ eqmake5
+}
+
+src_compile() {
+ default
+}
+
+src_test() {
+ cd examples || die
+ eqmake5 examples.pro
+ emake
+}
+
+src_install() {
+ emake INSTALL_ROOT="${D}" install
+
+ 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
+ local HTML_DOCS=( doc/html/. )
+ else
+ rm -r "${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
+}
^ permalink raw reply related [flat|nested] 60+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: x11-libs/qwt/
@ 2020-06-29 17:37 Andreas Sturmlechner
0 siblings, 0 replies; 60+ messages in thread
From: Andreas Sturmlechner @ 2020-06-29 17:37 UTC (permalink / raw
To: gentoo-commits
commit: 6191c35d6a0fd7ce1cfb502cacaaf89beede0151
Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Mon Jun 29 17:26:29 2020 +0000
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Mon Jun 29 17:36:43 2020 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=6191c35d
x11-libs/qwt: Drop 6.1.3-r2
Package-Manager: Portage-2.3.103, Repoman-2.3.23
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>
x11-libs/qwt/Manifest | 1 -
x11-libs/qwt/qwt-6.1.3-r2.ebuild | 153 ---------------------------------------
2 files changed, 154 deletions(-)
diff --git a/x11-libs/qwt/Manifest b/x11-libs/qwt/Manifest
index 90ffa05af8b..493631909bf 100644
--- a/x11-libs/qwt/Manifest
+++ b/x11-libs/qwt/Manifest
@@ -1,2 +1 @@
-DIST qwt-6.1.3.tar.bz2 4245614 BLAKE2B 5461602702eb159c5c9131eb554d6a619f40c459432c3f32f98b55e4b659d37848fbc0691baeaf691155bae83f68b9c91d3fee430935dd0c1b29e6fceac7a36f SHA512 d4a73e9e7ddcb7c16c508920a298784935be2eddc8f7585993d9fffe1bb01e1787a0d5d7ea4f220398b94ea2b211a19009dccaeadce56a84410357124bcb051a
DIST qwt-6.1.4.tar.bz2 4227315 BLAKE2B dd7212adb3c8fda081b1feeeb9d59b3b087deb0ef56bdbc7bb95e01992e41d5d91065f0b8aaf3337e1c66d4ad431bfb313f9b04bb2e43915f4cb21fb65725e36 SHA512 6135ce47fd4f9ff5b705193fc1f7410cfd5a0b84931bb17db750f6a5486ae810c261dae32431bd52838c36eadee02487148e1efa71c465c63aa43062eec160da
diff --git a/x11-libs/qwt/qwt-6.1.3-r2.ebuild b/x11-libs/qwt/qwt-6.1.3-r2.ebuild
deleted file mode 100644
index f9fd1d42359..00000000000
--- a/x11-libs/qwt/qwt-6.1.3-r2.ebuild
+++ /dev/null
@@ -1,153 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-MY_P="${PN}-${PV/_/-}"
-inherit multibuild qmake-utils
-
-DESCRIPTION="2D plotting library for Qt5"
-HOMEPAGE="https://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 static-libs svg"
-
-DEPEND="
- 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
- virtual/opengl
- )
- 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
-)
-
-pkg_setup() {
- MULTIBUILD_VARIANTS=( shared $(usev static-libs) )
-}
-
-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_copy_sources
-
- preparation() {
- if [[ ${MULTIBUILD_VARIANT} == shared ]]; then
- echo "QWT_CONFIG += QwtDll" >> qwtconfig.pri
- fi
-
- 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
-
- default
- }
-
- multibuild_foreach_variant run_in_build_dir preparation
-}
-
-src_configure() {
- multibuild_foreach_variant run_in_build_dir eqmake5
-}
-
-src_compile() {
- multibuild_foreach_variant run_in_build_dir default
-}
-
-src_test() {
- testing() {
- cd examples || die
- eqmake5 examples.pro
- 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 mathml; then
- sed \
- -e "s: -L\"${WORKDIR}\".* -lqwt6: -lqwt6:g" \
- -i "${ED}"/usr/$(get_libdir)/pkgconfig/qwtmathml.pc || die
- fi
-
- if use doc; then
- local 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
-}
^ permalink raw reply related [flat|nested] 60+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: x11-libs/qwt/
@ 2020-06-29 13:40 Agostino Sarubbo
0 siblings, 0 replies; 60+ messages in thread
From: Agostino Sarubbo @ 2020-06-29 13:40 UTC (permalink / raw
To: gentoo-commits
commit: 0681e7efcefadf1e06359c05ac4aa0a0203769a7
Author: Agostino Sarubbo <ago <AT> gentoo <DOT> org>
AuthorDate: Mon Jun 29 13:39:36 2020 +0000
Commit: Agostino Sarubbo <ago <AT> gentoo <DOT> org>
CommitDate: Mon Jun 29 13:39:36 2020 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=0681e7ef
x11-libs/qwt: x86 stable wrt bug #725666
Package-Manager: Portage-2.3.99, Repoman-2.3.22
RepoMan-Options: --include-arches="x86"
Signed-off-by: Agostino Sarubbo <ago <AT> gentoo.org>
x11-libs/qwt/qwt-6.1.4.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/x11-libs/qwt/qwt-6.1.4.ebuild b/x11-libs/qwt/qwt-6.1.4.ebuild
index 42df258aab5..170bfa85c87 100644
--- a/x11-libs/qwt/qwt-6.1.4.ebuild
+++ b/x11-libs/qwt/qwt-6.1.4.ebuild
@@ -10,7 +10,7 @@ HOMEPAGE="https://qwt.sourceforge.net/"
SRC_URI="mirror://sourceforge/project/${PN}/${PN}/${PV}/${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.4"
IUSE="designer doc examples mathml opengl svg"
^ permalink raw reply related [flat|nested] 60+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: x11-libs/qwt/
@ 2020-06-21 17:08 Agostino Sarubbo
0 siblings, 0 replies; 60+ messages in thread
From: Agostino Sarubbo @ 2020-06-21 17:08 UTC (permalink / raw
To: gentoo-commits
commit: 774c1508588289739583c10aa25d92c7757a5a2a
Author: Agostino Sarubbo <ago <AT> gentoo <DOT> org>
AuthorDate: Sun Jun 21 17:08:46 2020 +0000
Commit: Agostino Sarubbo <ago <AT> gentoo <DOT> org>
CommitDate: Sun Jun 21 17:08:46 2020 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=774c1508
x11-libs/qwt: ppc64 stable wrt bug #725666
Package-Manager: Portage-2.3.99, Repoman-2.3.22
RepoMan-Options: --include-arches="ppc64"
Signed-off-by: Agostino Sarubbo <ago <AT> gentoo.org>
x11-libs/qwt/qwt-6.1.4.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/x11-libs/qwt/qwt-6.1.4.ebuild b/x11-libs/qwt/qwt-6.1.4.ebuild
index 5c8df290973..93d71dbd9eb 100644
--- a/x11-libs/qwt/qwt-6.1.4.ebuild
+++ b/x11-libs/qwt/qwt-6.1.4.ebuild
@@ -10,7 +10,7 @@ HOMEPAGE="https://qwt.sourceforge.net/"
SRC_URI="mirror://sourceforge/project/${PN}/${PN}/${PV}/${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.4"
IUSE="designer doc examples mathml opengl svg"
^ permalink raw reply related [flat|nested] 60+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: x11-libs/qwt/
@ 2020-06-21 17:03 Agostino Sarubbo
0 siblings, 0 replies; 60+ messages in thread
From: Agostino Sarubbo @ 2020-06-21 17:03 UTC (permalink / raw
To: gentoo-commits
commit: 81faf8cb9fd393507a747ca52a9cc9e745aa026c
Author: Agostino Sarubbo <ago <AT> gentoo <DOT> org>
AuthorDate: Sun Jun 21 17:03:15 2020 +0000
Commit: Agostino Sarubbo <ago <AT> gentoo <DOT> org>
CommitDate: Sun Jun 21 17:03:50 2020 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=81faf8cb
x11-libs/qwt: ppc stable wrt bug #725666
Package-Manager: Portage-2.3.99, Repoman-2.3.22
RepoMan-Options: --include-arches="ppc"
Signed-off-by: Agostino Sarubbo <ago <AT> gentoo.org>
x11-libs/qwt/qwt-6.1.4.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/x11-libs/qwt/qwt-6.1.4.ebuild b/x11-libs/qwt/qwt-6.1.4.ebuild
index de7c9031761..5c8df290973 100644
--- a/x11-libs/qwt/qwt-6.1.4.ebuild
+++ b/x11-libs/qwt/qwt-6.1.4.ebuild
@@ -10,7 +10,7 @@ HOMEPAGE="https://qwt.sourceforge.net/"
SRC_URI="mirror://sourceforge/project/${PN}/${PN}/${PV}/${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.4"
IUSE="designer doc examples mathml opengl svg"
^ permalink raw reply related [flat|nested] 60+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: x11-libs/qwt/
@ 2020-05-22 16:08 Andreas Sturmlechner
0 siblings, 0 replies; 60+ messages in thread
From: Andreas Sturmlechner @ 2020-05-22 16:08 UTC (permalink / raw
To: gentoo-commits
commit: 38b0e54922bba32f7c1b9b52ced375e340bc7929
Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Fri May 22 14:40:24 2020 +0000
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Fri May 22 16:08:10 2020 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=38b0e549
x11-libs/qwt: EAPI-7 bump
Package-Manager: Portage-2.3.99, Repoman-2.3.22
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>
x11-libs/qwt/qwt-6.1.3-r2.ebuild | 9 ++++-----
1 file changed, 4 insertions(+), 5 deletions(-)
diff --git a/x11-libs/qwt/qwt-6.1.3-r2.ebuild b/x11-libs/qwt/qwt-6.1.3-r2.ebuild
index 539d33c4abe..f9fd1d42359 100644
--- a/x11-libs/qwt/qwt-6.1.3-r2.ebuild
+++ b/x11-libs/qwt/qwt-6.1.3-r2.ebuild
@@ -1,14 +1,13 @@
# Copyright 1999-2020 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
-EAPI=6
-
-inherit multibuild qmake-utils
+EAPI=7
MY_P="${PN}-${PV/_/-}"
+inherit multibuild qmake-utils
DESCRIPTION="2D plotting library for Qt5"
-HOMEPAGE="http://qwt.sourceforge.net/"
+HOMEPAGE="https://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 )"
@@ -125,7 +124,7 @@ src_install() {
fi
if use doc; then
- HTML_DOCS=( doc/html/. )
+ local HTML_DOCS=( doc/html/. )
else
rm -rf "${ED}"/usr/share/doc/${PF}/html || die
fi
^ permalink raw reply related [flat|nested] 60+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: x11-libs/qwt/
@ 2019-12-30 23:01 Sergei Trofimovich
0 siblings, 0 replies; 60+ messages in thread
From: Sergei Trofimovich @ 2019-12-30 23:01 UTC (permalink / raw
To: gentoo-commits
commit: f234351573529eff096f323905796b36788dad79
Author: Sergei Trofimovich <slyfox <AT> gentoo <DOT> org>
AuthorDate: Mon Dec 30 22:59:41 2019 +0000
Commit: Sergei Trofimovich <slyfox <AT> gentoo <DOT> org>
CommitDate: Mon Dec 30 22:59:41 2019 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f2343515
x11-libs/qwt: use ASCII whitespace
Package-Manager: Portage-2.3.84, Repoman-2.3.20
Signed-off-by: Sergei Trofimovich <slyfox <AT> gentoo.org>
x11-libs/qwt/qwt-6.1.3-r2.ebuild | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/x11-libs/qwt/qwt-6.1.3-r2.ebuild b/x11-libs/qwt/qwt-6.1.3-r2.ebuild
index e651d6ffdcd..652b957e006 100644
--- a/x11-libs/qwt/qwt-6.1.3-r2.ebuild
+++ b/x11-libs/qwt/qwt-6.1.3-r2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=6
@@ -127,7 +127,7 @@ src_install () {
if use doc; then
HTML_DOCS=( doc/html/. )
else
- rm -rf "${ED}"/usr/share/doc/${PF}/html || die
+ rm -rf "${ED}"/usr/share/doc/${PF}/html || die
fi
einstalldocs
^ permalink raw reply related [flat|nested] 60+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: x11-libs/qwt/
@ 2018-06-28 18:49 Andreas Sturmlechner
0 siblings, 0 replies; 60+ messages in thread
From: Andreas Sturmlechner @ 2018-06-28 18:49 UTC (permalink / raw
To: gentoo-commits
commit: 173b46182ec71ef2a555875c806d46a822f41c40
Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Thu Jun 28 18:42:17 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=173b4618
x11-libs/qwt: Drop 6.1.3-r1
Package-Manager: Portage-2.3.41, Repoman-2.3.9
x11-libs/qwt/qwt-6.1.3-r1.ebuild | 213 ---------------------------------------
1 file changed, 213 deletions(-)
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 dc89fab7124..00000000000
--- 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
-}
^ permalink raw reply related [flat|nested] 60+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: x11-libs/qwt/
@ 2018-06-07 10:13 Agostino Sarubbo
0 siblings, 0 replies; 60+ messages in thread
From: Agostino Sarubbo @ 2018-06-07 10:13 UTC (permalink / raw
To: gentoo-commits
commit: d4b9e26b122a33888ae958f126355eaf60756107
Author: Agostino Sarubbo <ago <AT> gentoo <DOT> org>
AuthorDate: Thu Jun 7 10:08:53 2018 +0000
Commit: Agostino Sarubbo <ago <AT> gentoo <DOT> org>
CommitDate: Thu Jun 7 10:08:53 2018 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d4b9e26b
x11-libs/qwt: amd64 stable wrt bug #655382
Package-Manager: Portage-2.3.40, Repoman-2.3.9
RepoMan-Options: --include-arches="amd64"
x11-libs/qwt/qwt-6.1.3-r2.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/x11-libs/qwt/qwt-6.1.3-r2.ebuild b/x11-libs/qwt/qwt-6.1.3-r2.ebuild
index 4268601a484..67e6b47a694 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"
^ permalink raw reply related [flat|nested] 60+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: x11-libs/qwt/
@ 2018-06-06 23:23 Thomas Deutschmann
0 siblings, 0 replies; 60+ messages in thread
From: Thomas Deutschmann @ 2018-06-06 23:23 UTC (permalink / raw
To: gentoo-commits
commit: 535863100073da6b67e5e3e03bb0987bdd1fbc53
Author: Thomas Deutschmann <whissi <AT> gentoo <DOT> org>
AuthorDate: Wed Jun 6 23:01:27 2018 +0000
Commit: Thomas Deutschmann <whissi <AT> gentoo <DOT> org>
CommitDate: Wed Jun 6 23:22:19 2018 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=53586310
x11-libs/qwt: x86 stable (bug #655382)
Package-Manager: Portage-2.3.40, Repoman-2.3.9
x11-libs/qwt/qwt-6.1.3-r2.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/x11-libs/qwt/qwt-6.1.3-r2.ebuild b/x11-libs/qwt/qwt-6.1.3-r2.ebuild
index 2159276a453..4268601a484 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"
^ permalink raw reply related [flat|nested] 60+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: x11-libs/qwt/
@ 2018-06-02 14:08 Andreas Sturmlechner
0 siblings, 0 replies; 60+ messages in thread
From: Andreas Sturmlechner @ 2018-06-02 14:08 UTC (permalink / raw
To: gentoo-commits
commit: 3a7dedd09531c05a33d2f2c4352ca41497ddcc16
Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Sat Jun 2 14:07:53 2018 +0000
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Sat Jun 2 14:08:23 2018 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=3a7dedd0
x11-libs/qwt: 6.1.3-r1: Drop ~alpha/~ia64 keywords
Not a single revdep in tree, USE=qt5 dependencies not keyworded,
USE=qt4 removed very soon.
Bug: https://bugs.gentoo.org/655382
Package-Manager: Portage-2.3.40, Repoman-2.3.9
x11-libs/qwt/qwt-6.1.3-r1.ebuild | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/x11-libs/qwt/qwt-6.1.3-r1.ebuild b/x11-libs/qwt/qwt-6.1.3-r1.ebuild
index 8d6468047b2..dc89fab7124 100644
--- a/x11-libs/qwt/qwt-6.1.3-r1.ebuild
+++ b/x11-libs/qwt/qwt-6.1.3-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
EAPI=6
@@ -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="~alpha amd64 ~arm ~ia64 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 qt4 qt5 static-libs svg"
^ permalink raw reply related [flat|nested] 60+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: x11-libs/qwt/
@ 2018-05-13 6:56 Andreas Sturmlechner
0 siblings, 0 replies; 60+ messages in thread
From: Andreas Sturmlechner @ 2018-05-13 6:56 UTC (permalink / raw
To: gentoo-commits
commit: 4ec4751bc2b6db26281215937509e4b476536682
Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Sat May 12 15:44:17 2018 +0000
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Sun May 13 06:56:31 2018 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=4ec4751b
x11-libs/qwt: Drop USE=qt4 and alpha/ia64
Package-Manager: Portage-2.3.36, Repoman-2.3.9
x11-libs/qwt/qwt-6.1.3-r2.ebuild | 154 +++++++++++++++++++++++++++++++++++++++
1 file changed, 154 insertions(+)
diff --git a/x11-libs/qwt/qwt-6.1.3-r2.ebuild b/x11-libs/qwt/qwt-6.1.3-r2.ebuild
new file mode 100644
index 00000000000..2159276a453
--- /dev/null
+++ b/x11-libs/qwt/qwt-6.1.3-r2.ebuild
@@ -0,0 +1,154 @@
+# 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 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 static-libs svg"
+
+DEPEND="
+ 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
+ virtual/opengl
+ )
+ 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
+)
+
+pkg_setup() {
+ MULTIBUILD_VARIANTS=( shared $(usev static-libs) )
+}
+
+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_copy_sources
+
+ preparation() {
+ if [[ ${MULTIBUILD_VARIANT} == shared ]]; then
+ echo "QWT_CONFIG += QwtDll" >> qwtconfig.pri
+ fi
+
+ 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
+
+ default
+ }
+
+ multibuild_foreach_variant run_in_build_dir preparation
+}
+
+src_configure() {
+ multibuild_foreach_variant run_in_build_dir eqmake5
+}
+
+src_compile() {
+ multibuild_foreach_variant run_in_build_dir default
+}
+
+src_test() {
+ testing() {
+ cd examples || die
+ eqmake5 examples.pro
+ 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 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
+}
^ permalink raw reply related [flat|nested] 60+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: x11-libs/qwt/
@ 2017-09-02 13:18 Michael Palimaka
0 siblings, 0 replies; 60+ messages in thread
From: Michael Palimaka @ 2017-09-02 13:18 UTC (permalink / raw
To: gentoo-commits
commit: a6887f5cc2847cfec4ac884684a2ec8e7b7dadac
Author: Michael Palimaka <kensington <AT> gentoo <DOT> org>
AuthorDate: Wed Aug 30 14:41:51 2017 +0000
Commit: Michael Palimaka <kensington <AT> gentoo <DOT> org>
CommitDate: Sat Sep 2 13:18:07 2017 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a6887f5c
x11-libs/qwt: drop hppa keywords
Package-Manager: Portage-2.3.6, Repoman-2.3.3
x11-libs/qwt/qwt-5.2.3-r2.ebuild | 4 ++--
x11-libs/qwt/qwt-6.1.3-r1.ebuild | 2 +-
2 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/x11-libs/qwt/qwt-5.2.3-r2.ebuild b/x11-libs/qwt/qwt-5.2.3-r2.ebuild
index 3251efbd6eb..73b753b76ec 100644
--- a/x11-libs/qwt/qwt-5.2.3-r2.ebuild
+++ b/x11-libs/qwt/qwt-5.2.3-r2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
EAPI=5
@@ -10,7 +10,7 @@ HOMEPAGE="http://qwt.sourceforge.net/"
SRC_URI="mirror://sourceforge/${PN}/${P}.tar.bz2"
LICENSE="qwt"
-KEYWORDS="~alpha amd64 arm hppa ia64 ppc ppc64 sparc x86 ~x86-macos"
+KEYWORDS="~alpha amd64 arm ia64 ppc ppc64 sparc x86 ~x86-macos"
SLOT="5"
IUSE="doc examples static-libs svg"
diff --git a/x11-libs/qwt/qwt-6.1.3-r1.ebuild b/x11-libs/qwt/qwt-6.1.3-r1.ebuild
index ef58cbbc9d0..8d6468047b2 100644
--- a/x11-libs/qwt/qwt-6.1.3-r1.ebuild
+++ b/x11-libs/qwt/qwt-6.1.3-r1.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="~alpha amd64 ~arm hppa ~ia64 ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~x86-macos"
+KEYWORDS="~alpha amd64 ~arm ~ia64 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"
^ permalink raw reply related [flat|nested] 60+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: x11-libs/qwt/
@ 2017-04-09 20:42 Andreas Sturmlechner
0 siblings, 0 replies; 60+ messages in thread
From: Andreas Sturmlechner @ 2017-04-09 20:42 UTC (permalink / raw
To: gentoo-commits
commit: 3cea7988d744037ad6ec0fec1876027d27adc98f
Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Thu Mar 30 20:18:06 2017 +0000
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Sun Apr 9 20:42:09 2017 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=3cea7988
x11-libs/qwt: Drop 6.1.0
Package-Manager: Portage-2.3.3, Repoman-2.3.1
x11-libs/qwt/Manifest | 1 -
x11-libs/qwt/qwt-6.1.0.ebuild | 116 ------------------------------------------
2 files changed, 117 deletions(-)
diff --git a/x11-libs/qwt/Manifest b/x11-libs/qwt/Manifest
index 388f3afcffe..352ed3160bd 100644
--- a/x11-libs/qwt/Manifest
+++ b/x11-libs/qwt/Manifest
@@ -1,3 +1,2 @@
DIST qwt-5.2.3.tar.bz2 1983725 SHA256 37feaf306753230b0d8538b4ff9b255c6fddaa3d6609ec5a5cc39a5a4d020ab7 SHA512 60545712790699b145a54baba4c40802d9a58bf5f68f997faed5027db6773a801097be8675e00b2af1de568e36e2e498db0a0310ac4877fd9f2b52871409dd49 WHIRLPOOL 01969f3e52c687b8db211c81c0865762fe908e49255f3517fc4731a8d3e6e1c738a8d18b8a43d8035314832693277cdc6303db2c5151be1385238812e6248ff6
-DIST qwt-6.1.0.tar.bz2 3468850 SHA256 a7e3d9f1db917d186a973c5f04a316bc9607c7c35794d7a16de323aba5e17402 SHA512 5c5c8309debad1829cb59cf1c941b66306153a25b2027d674a2cfa5a150bfdd3823a1b6ed9df3b326bacc1dc7d1b6c301b1fd5bcebf7ff51cfa74b76a55f30bc WHIRLPOOL 590e0078c724c1df7e9f2705f8be08973b8ea8f8aa338f1e782946360dd88c04a6b0003971eb93a6321bdcc778d73d651ee3d4c512d318d846f69a9484963964
DIST qwt-6.1.3.tar.bz2 4245614 SHA256 f3ecd34e72a9a2b08422fb6c8e909ca76f4ce5fa77acad7a2883b701f4309733 SHA512 d4a73e9e7ddcb7c16c508920a298784935be2eddc8f7585993d9fffe1bb01e1787a0d5d7ea4f220398b94ea2b211a19009dccaeadce56a84410357124bcb051a WHIRLPOOL ebcc43a29bb056d6fc4433a63b07e0dcfa6e09b5581d7ff9d96c09826faec9ea62c1d6d6f3ee2e79859c56df491ee65b29b08cb9a3b0644a0eace3351c4a322c
diff --git a/x11-libs/qwt/qwt-6.1.0.ebuild b/x11-libs/qwt/qwt-6.1.0.ebuild
deleted file mode 100644
index c0c45742999..00000000000
--- a/x11-libs/qwt/qwt-6.1.0.ebuild
+++ /dev/null
@@ -1,116 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-inherit eutils multibuild qt4-r2
-
-MY_P="${PN}-${PV/_/-}"
-
-DESCRIPTION="2D plotting library for Qt4"
-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="~alpha amd64 ~arm hppa ~ia64 ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~x86-macos"
-SLOT="6"
-IUSE="doc examples mathml static-libs svg"
-
-DEPEND="
- !<x11-libs/qwt-5.2.3
- dev-qt/designer:4
- dev-qt/qtcore:4
- dev-qt/qtgui:4
- doc? ( !<media-libs/coin-3.1.3[doc] )
- svg? ( dev-qt/qtsvg:4 )"
-RDEPEND="${DEPEND}"
-
-S="${WORKDIR}"/${MY_P}
-
-DOCS="README"
-
-PATCHES=( "${FILESDIR}"/${PN}-6.0.2-invalid-read.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 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
-
- use mathml && echo "QWT_CONFIG += QwtMathML" >> qwtconfig.pri
- use svg && echo "QWT_CONFIG += QwtSvg" >> qwtconfig.pri
-
- cat > qwtbuild.pri <<-EOF
- QWT_CONFIG += qt warn_on thread release no_keywords
- EOF
-
- sed \
- -e 's/target doc/target/' \
- -e "/^TARGET/s:(qwt):(qwt6):g" \
- -i src/src.pro || die
-
- sed \
- -e '/qwtAddLibrary/s:(qwt):(qwt6):g' \
- -i qwt.prf designer/designer.pro examples/examples.pri \
- textengines/mathml/qwtmathml.prf textengines/textengines.pri || die
-
- MULTIBUILD_VARIANTS=( )
- use static-libs && MULTIBUILD_VARIANTS+=( static )
- MULTIBUILD_VARIANTS+=( shared )
-
- qt4-r2_src_prepare
-
- multibuild_copy_sources
- preparation() {
- [[ ${MULTIBUILD_VARIANT} == shared ]] && \
- echo "QWT_CONFIG += QwtDll" >> "${BUILD_DIR}"/qwtconfig.pri
- }
-
- multibuild_foreach_variant preparation
-}
-
-src_configure() {
- multibuild_parallel_foreach_variant run_in_build_dir qt4-r2_src_configure
-}
-
-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 () {
- rm -f doc/man/*/{_,deprecated}* || die
- multibuild_foreach_variant run_in_build_dir qt4-r2_src_install
-
- use doc && dohtml -r doc/html/*
-
- 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
-}
^ permalink raw reply related [flat|nested] 60+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: x11-libs/qwt/
@ 2017-03-29 1:34 Jeroen Roovers
0 siblings, 0 replies; 60+ messages in thread
From: Jeroen Roovers @ 2017-03-29 1:34 UTC (permalink / raw
To: gentoo-commits
commit: d43809df8f68f1f8e934d479465be7da8354f199
Author: Jeroen Roovers <jer <AT> gentoo <DOT> org>
AuthorDate: Wed Mar 29 01:34:37 2017 +0000
Commit: Jeroen Roovers <jer <AT> gentoo <DOT> org>
CommitDate: Wed Mar 29 01:34:37 2017 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d43809df
x11-libs/qwt: Stable for HPPA (bug #611430).
Package-Manager: Portage-2.3.5, Repoman-2.3.2
RepoMan-Options: --ignore-arches
x11-libs/qwt/qwt-6.1.3-r1.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/x11-libs/qwt/qwt-6.1.3-r1.ebuild b/x11-libs/qwt/qwt-6.1.3-r1.ebuild
index d43c3c41824..ef58cbbc9d0 100644
--- a/x11-libs/qwt/qwt-6.1.3-r1.ebuild
+++ b/x11-libs/qwt/qwt-6.1.3-r1.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="~alpha amd64 ~arm ~hppa ~ia64 ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~x86-macos"
+KEYWORDS="~alpha amd64 ~arm hppa ~ia64 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"
^ permalink raw reply related [flat|nested] 60+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: x11-libs/qwt/
@ 2017-03-04 14:02 Agostino Sarubbo
0 siblings, 0 replies; 60+ messages in thread
From: Agostino Sarubbo @ 2017-03-04 14:02 UTC (permalink / raw
To: gentoo-commits
commit: a5acb54a0da9816246ba8d06a702968871875c89
Author: Agostino Sarubbo <ago <AT> gentoo <DOT> org>
AuthorDate: Sat Mar 4 14:01:42 2017 +0000
Commit: Agostino Sarubbo <ago <AT> gentoo <DOT> org>
CommitDate: Sat Mar 4 14:01:42 2017 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a5acb54a
x11-libs/qwt: sparc stable wrt bug #611430
Package-Manager: portage-2.3.3
RepoMan-Options: --include-arches="sparc"
Signed-off-by: Agostino Sarubbo <ago <AT> gentoo.org>
x11-libs/qwt/qwt-6.1.3-r1.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/x11-libs/qwt/qwt-6.1.3-r1.ebuild b/x11-libs/qwt/qwt-6.1.3-r1.ebuild
index 8a7c63ec5c2..e6fa3f14982 100644
--- a/x11-libs/qwt/qwt-6.1.3-r1.ebuild
+++ b/x11-libs/qwt/qwt-6.1.3-r1.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="~alpha amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc x86 ~amd64-linux ~x86-linux ~x86-macos"
+KEYWORDS="~alpha amd64 ~arm ~hppa ~ia64 ~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"
^ permalink raw reply related [flat|nested] 60+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: x11-libs/qwt/
@ 2017-03-02 19:39 Andreas Sturmlechner
0 siblings, 0 replies; 60+ messages in thread
From: Andreas Sturmlechner @ 2017-03-02 19:39 UTC (permalink / raw
To: gentoo-commits
commit: b016c7f13ac1ecc07d8be0a60c71bbc77d4afaab
Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Mon Feb 27 00:58:33 2017 +0000
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Thu Mar 2 19:39:15 2017 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b016c7f1
x11-libs/qwt: Drop old
Package-Manager: Portage-2.3.3, Repoman-2.3.1
Closes: https://github.com/gentoo/gentoo/pull/4099
x11-libs/qwt/Manifest | 1 -
x11-libs/qwt/qwt-6.1.2-r2.ebuild | 209 ---------------------------------------
2 files changed, 210 deletions(-)
diff --git a/x11-libs/qwt/Manifest b/x11-libs/qwt/Manifest
index e7d2f83b531..388f3afcffe 100644
--- a/x11-libs/qwt/Manifest
+++ b/x11-libs/qwt/Manifest
@@ -1,4 +1,3 @@
DIST qwt-5.2.3.tar.bz2 1983725 SHA256 37feaf306753230b0d8538b4ff9b255c6fddaa3d6609ec5a5cc39a5a4d020ab7 SHA512 60545712790699b145a54baba4c40802d9a58bf5f68f997faed5027db6773a801097be8675e00b2af1de568e36e2e498db0a0310ac4877fd9f2b52871409dd49 WHIRLPOOL 01969f3e52c687b8db211c81c0865762fe908e49255f3517fc4731a8d3e6e1c738a8d18b8a43d8035314832693277cdc6303db2c5151be1385238812e6248ff6
DIST qwt-6.1.0.tar.bz2 3468850 SHA256 a7e3d9f1db917d186a973c5f04a316bc9607c7c35794d7a16de323aba5e17402 SHA512 5c5c8309debad1829cb59cf1c941b66306153a25b2027d674a2cfa5a150bfdd3823a1b6ed9df3b326bacc1dc7d1b6c301b1fd5bcebf7ff51cfa74b76a55f30bc WHIRLPOOL 590e0078c724c1df7e9f2705f8be08973b8ea8f8aa338f1e782946360dd88c04a6b0003971eb93a6321bdcc778d73d651ee3d4c512d318d846f69a9484963964
-DIST qwt-6.1.2.tar.bz2 3528935 SHA256 2b08f18d1d3970e7c3c6096d850f17aea6b54459389731d3ce715d193e243d0c SHA512 ddaf265890e493554639deae8b3ba3a1673bd6bcb4a7c47931d10aaab550646d103b28dccd3c2e4fdacd56a7963837c25ab02e27c71f891fee1801bcd45d54c0 WHIRLPOOL 575f8c3665ed8075278300f625bb9b321bd2c275573bd4c22cc1b833fde7fa38c36db027216d5da43839d9c70e0ed443327af2d54ac5a4dff3643c7abee16069
DIST qwt-6.1.3.tar.bz2 4245614 SHA256 f3ecd34e72a9a2b08422fb6c8e909ca76f4ce5fa77acad7a2883b701f4309733 SHA512 d4a73e9e7ddcb7c16c508920a298784935be2eddc8f7585993d9fffe1bb01e1787a0d5d7ea4f220398b94ea2b211a19009dccaeadce56a84410357124bcb051a WHIRLPOOL ebcc43a29bb056d6fc4433a63b07e0dcfa6e09b5581d7ff9d96c09826faec9ea62c1d6d6f3ee2e79859c56df491ee65b29b08cb9a3b0644a0eace3351c4a322c
diff --git a/x11-libs/qwt/qwt-6.1.2-r2.ebuild b/x11-libs/qwt/qwt-6.1.2-r2.ebuild
deleted file mode 100644
index 7385a72df38..00000000000
--- a/x11-libs/qwt/qwt-6.1.2-r2.ebuild
+++ /dev/null
@@ -1,209 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit eutils multibuild multilib 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="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~x86-macos"
-SLOT="6/1.2"
-IUSE="designer doc examples mathml opengl qt4 qt5 static-libs svg"
-
-REQUIRED_USE="|| ( qt4 qt5 )"
-
-DEPEND="
- !<x11-libs/qwt-5.2.3
- 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 )
- )
- doc? ( !<media-libs/coin-3.1.3[doc] )
- opengl? ( virtual/opengl )
- "
-RDEPEND="${DEPEND}"
-
-S="${WORKDIR}"/${MY_P}
-
-DOCS="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}/usr/$(get_libdir)/qt4/plugins/designer"
- QWT_INSTALL_FEATURES = "${EPREFIX}/usr/share/qt4/mkspecs/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}/usr/$(get_libdir)/qt5/plugins/designer"
- QWT_INSTALL_FEATURES = "${EPREFIX}/usr/share/qt5/mkspecs/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
- dohtml -r doc/html/*
- else
- rm -rf "${ED}"/usr/share/doc/${PF}/html || die
- fi
-
- 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
-}
^ permalink raw reply related [flat|nested] 60+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: x11-libs/qwt/
@ 2017-03-02 10:47 Agostino Sarubbo
0 siblings, 0 replies; 60+ messages in thread
From: Agostino Sarubbo @ 2017-03-02 10:47 UTC (permalink / raw
To: gentoo-commits
commit: 204db4f37c6e68bead161c82a7e88f993c922701
Author: Agostino Sarubbo <ago <AT> gentoo <DOT> org>
AuthorDate: Thu Mar 2 10:45:39 2017 +0000
Commit: Agostino Sarubbo <ago <AT> gentoo <DOT> org>
CommitDate: Thu Mar 2 10:45:39 2017 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=204db4f3
x11-libs/qwt: x86 stable wrt bug #610042
Package-Manager: portage-2.3.3
RepoMan-Options: --include-arches="x86"
Signed-off-by: Agostino Sarubbo <ago <AT> gentoo.org>
x11-libs/qwt/qwt-6.1.3-r1.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/x11-libs/qwt/qwt-6.1.3-r1.ebuild b/x11-libs/qwt/qwt-6.1.3-r1.ebuild
index 2fc0cae5b7e..8a7c63ec5c2 100644
--- a/x11-libs/qwt/qwt-6.1.3-r1.ebuild
+++ b/x11-libs/qwt/qwt-6.1.3-r1.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="~alpha amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~x86-macos"
+KEYWORDS="~alpha amd64 ~arm ~hppa ~ia64 ~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"
^ permalink raw reply related [flat|nested] 60+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: x11-libs/qwt/
@ 2017-03-02 10:30 Agostino Sarubbo
0 siblings, 0 replies; 60+ messages in thread
From: Agostino Sarubbo @ 2017-03-02 10:30 UTC (permalink / raw
To: gentoo-commits
commit: 71bcd0b5c9ccef0f979916ad59de1a3d088fba37
Author: Agostino Sarubbo <ago <AT> gentoo <DOT> org>
AuthorDate: Thu Mar 2 10:29:34 2017 +0000
Commit: Agostino Sarubbo <ago <AT> gentoo <DOT> org>
CommitDate: Thu Mar 2 10:29:34 2017 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=71bcd0b5
x11-libs/qwt: amd64 stable wrt bug #610042
Package-Manager: portage-2.3.3
RepoMan-Options: --include-arches="amd64"
Signed-off-by: Agostino Sarubbo <ago <AT> gentoo.org>
x11-libs/qwt/qwt-6.1.3-r1.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/x11-libs/qwt/qwt-6.1.3-r1.ebuild b/x11-libs/qwt/qwt-6.1.3-r1.ebuild
index 208b6f603dc..2fc0cae5b7e 100644
--- a/x11-libs/qwt/qwt-6.1.3-r1.ebuild
+++ b/x11-libs/qwt/qwt-6.1.3-r1.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="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~x86-macos"
+KEYWORDS="~alpha amd64 ~arm ~hppa ~ia64 ~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"
^ permalink raw reply related [flat|nested] 60+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: x11-libs/qwt/
@ 2017-02-23 21:57 Andreas Sturmlechner
0 siblings, 0 replies; 60+ messages in thread
From: Andreas Sturmlechner @ 2017-02-23 21:57 UTC (permalink / raw
To: gentoo-commits
commit: 85419950523f0967292ddbd03d8d0eb26e7b3a04
Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Thu Feb 23 21:55:32 2017 +0000
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Thu Feb 23 21:56:47 2017 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=85419950
x11-libs/qwt: Block qwt:5[doc], move blockers where they belong
Sort deps while at it.
Gentoo-bug: 610358
Package-Manager: portage-2.3.3
x11-libs/qwt/qwt-6.1.3-r1.ebuild | 12 +++++++-----
1 file changed, 7 insertions(+), 5 deletions(-)
diff --git a/x11-libs/qwt/qwt-6.1.3-r1.ebuild b/x11-libs/qwt/qwt-6.1.3-r1.ebuild
index a198f19b45..bf11ee3733 100644
--- a/x11-libs/qwt/qwt-6.1.3-r1.ebuild
+++ b/x11-libs/qwt/qwt-6.1.3-r1.ebuild
@@ -20,7 +20,7 @@ IUSE="designer doc examples mathml opengl qt4 qt5 static-libs svg"
REQUIRED_USE="|| ( qt4 qt5 )"
DEPEND="
- !<x11-libs/qwt-5.2.3
+ opengl? ( virtual/opengl )
qt4? (
dev-qt/qtcore:4
dev-qt/qtgui:4
@@ -38,10 +38,12 @@ DEPEND="
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] )
- opengl? ( virtual/opengl )
- "
-RDEPEND="${DEPEND}"
+"
S="${WORKDIR}"/${MY_P}
@@ -50,7 +52,7 @@ 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
^ permalink raw reply related [flat|nested] 60+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: x11-libs/qwt/
@ 2017-01-23 23:21 Andreas Sturmlechner
0 siblings, 0 replies; 60+ messages in thread
From: Andreas Sturmlechner @ 2017-01-23 23:21 UTC (permalink / raw
To: gentoo-commits
commit: b688a5421ed39fb86c9ec6d3f10f08647449e9e9
Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Mon Jan 23 23:07:51 2017 +0000
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Mon Jan 23 23:20:03 2017 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b688a542
x11-libs/qwt: Drop old
Package-Manager: portage-2.3.0
x11-libs/qwt/qwt-6.1.3.ebuild | 210 ------------------------------------------
1 file changed, 210 deletions(-)
diff --git a/x11-libs/qwt/qwt-6.1.3.ebuild b/x11-libs/qwt/qwt-6.1.3.ebuild
deleted file mode 100644
index 15defdf..00000000
--- a/x11-libs/qwt/qwt-6.1.3.ebuild
+++ /dev/null
@@ -1,210 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=6
-
-inherit eutils multibuild multilib 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="~alpha ~amd64 ~arm ~hppa ~ia64 ~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="
- !<x11-libs/qwt-5.2.3
- 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 )
- )
- doc? ( !<media-libs/coin-3.1.3[doc] )
- opengl? ( virtual/opengl )
- "
-RDEPEND="${DEPEND}"
-
-S="${WORKDIR}"/${MY_P}
-
-DOCS="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}/usr/$(get_libdir)/qt4/plugins/designer"
- QWT_INSTALL_FEATURES = "${EPREFIX}/usr/share/qt4/mkspecs/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}/usr/$(get_libdir)/qt5/plugins/designer"
- QWT_INSTALL_FEATURES = "${EPREFIX}/usr/share/qt5/mkspecs/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
- dohtml -r doc/html/*
- else
- rm -rf "${ED}"/usr/share/doc/${PF}/html || die
- fi
-
- 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
-}
^ permalink raw reply related [flat|nested] 60+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: x11-libs/qwt/
@ 2017-01-23 23:21 Andreas Sturmlechner
0 siblings, 0 replies; 60+ messages in thread
From: Andreas Sturmlechner @ 2017-01-23 23:21 UTC (permalink / raw
To: gentoo-commits
commit: b38f9fedee0d1bb53ceea7e8ef7eb2f47b644ef8
Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Mon Jan 23 23:07:12 2017 +0000
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Mon Jan 23 23:20:03 2017 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b38f9fed
x11-libs/qwt: Add missing einstalldocs, drop unused eclasses
Gentoo-bug: 606452
Use qt{4,5}_get_{plugin,mkspecs}dir functions provided by qmake-utils,
changes install path for Qt5 mkspecs.
Package-Manager: portage-2.3.0
x11-libs/qwt/qwt-6.1.3-r1.ebuild | 212 +++++++++++++++++++++++++++++++++++++++
1 file changed, 212 insertions(+)
diff --git a/x11-libs/qwt/qwt-6.1.3-r1.ebuild b/x11-libs/qwt/qwt-6.1.3-r1.ebuild
new file mode 100644
index 00000000..a198f19
--- /dev/null
+++ b/x11-libs/qwt/qwt-6.1.3-r1.ebuild
@@ -0,0 +1,212 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+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="~alpha ~amd64 ~arm ~hppa ~ia64 ~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="
+ !<x11-libs/qwt-5.2.3
+ 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 )
+ )
+ doc? ( !<media-libs/coin-3.1.3[doc] )
+ opengl? ( virtual/opengl )
+ "
+RDEPEND="${DEPEND}"
+
+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
+}
^ permalink raw reply related [flat|nested] 60+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: x11-libs/qwt/
@ 2017-01-21 15:18 Lars Wendler
0 siblings, 0 replies; 60+ messages in thread
From: Lars Wendler @ 2017-01-21 15:18 UTC (permalink / raw
To: gentoo-commits
commit: 86240b12546f88bb4ed21028ddecbd00b7288fe3
Author: Lars Wendler <polynomial-c <AT> gentoo <DOT> org>
AuthorDate: Sat Jan 21 15:18:34 2017 +0000
Commit: Lars Wendler <polynomial-c <AT> gentoo <DOT> org>
CommitDate: Sat Jan 21 15:18:34 2017 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=86240b12
x11-libs/qwt: Fixed incomplete EAPI-6 conversion (bug #606700).
Package-Manager: Portage-2.3.3, Repoman-2.3.1
x11-libs/qwt/qwt-6.1.2-r2.ebuild | 2 +-
x11-libs/qwt/qwt-6.1.3.ebuild | 3 +--
2 files changed, 2 insertions(+), 3 deletions(-)
diff --git a/x11-libs/qwt/qwt-6.1.2-r2.ebuild b/x11-libs/qwt/qwt-6.1.2-r2.ebuild
index a4f1191..0e9ddbf 100644
--- a/x11-libs/qwt/qwt-6.1.2-r2.ebuild
+++ b/x11-libs/qwt/qwt-6.1.2-r2.ebuild
@@ -127,7 +127,7 @@ src_prepare() {
textengines/mathml/qwtmathml.prf textengines/textengines.pri || die
;;
esac
- epatch "${PATCHES[@]}"
+ default
}
multibuild_foreach_variant run_in_build_dir preparation
diff --git a/x11-libs/qwt/qwt-6.1.3.ebuild b/x11-libs/qwt/qwt-6.1.3.ebuild
index 4d78af5..15defdf 100644
--- a/x11-libs/qwt/qwt-6.1.3.ebuild
+++ b/x11-libs/qwt/qwt-6.1.3.ebuild
@@ -127,8 +127,7 @@ src_prepare() {
textengines/mathml/qwtmathml.prf textengines/textengines.pri || die
;;
esac
- epatch "${PATCHES[@]}"
- eapply_user
+ default
}
multibuild_foreach_variant run_in_build_dir preparation
^ permalink raw reply related [flat|nested] 60+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: x11-libs/qwt/
@ 2017-01-15 16:57 Justin Lecher
0 siblings, 0 replies; 60+ messages in thread
From: Justin Lecher @ 2017-01-15 16:57 UTC (permalink / raw
To: gentoo-commits
commit: 394fe11e002be6ec37b1b1e7f0e0c05e811885bb
Author: Justin Lecher <jlec <AT> gentoo <DOT> org>
AuthorDate: Sun Jan 15 16:07:50 2017 +0000
Commit: Justin Lecher <jlec <AT> gentoo <DOT> org>
CommitDate: Sun Jan 15 16:57:48 2017 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=394fe11e
x11-libs/qwt: Version Bump
Gentoo-Bug: https://bugs.gentoo.org/show_bug.cgi?id=605096
Package-Manager: Portage-2.3.3, Repoman-2.3.1
Signed-off-by: Justin Lecher <jlec <AT> gentoo.org>
x11-libs/qwt/Manifest | 1 +
x11-libs/qwt/qwt-6.1.3.ebuild | 211 ++++++++++++++++++++++++++++++++++++++++++
2 files changed, 212 insertions(+)
diff --git a/x11-libs/qwt/Manifest b/x11-libs/qwt/Manifest
index 0c22d28..e7d2f83 100644
--- a/x11-libs/qwt/Manifest
+++ b/x11-libs/qwt/Manifest
@@ -1,3 +1,4 @@
DIST qwt-5.2.3.tar.bz2 1983725 SHA256 37feaf306753230b0d8538b4ff9b255c6fddaa3d6609ec5a5cc39a5a4d020ab7 SHA512 60545712790699b145a54baba4c40802d9a58bf5f68f997faed5027db6773a801097be8675e00b2af1de568e36e2e498db0a0310ac4877fd9f2b52871409dd49 WHIRLPOOL 01969f3e52c687b8db211c81c0865762fe908e49255f3517fc4731a8d3e6e1c738a8d18b8a43d8035314832693277cdc6303db2c5151be1385238812e6248ff6
DIST qwt-6.1.0.tar.bz2 3468850 SHA256 a7e3d9f1db917d186a973c5f04a316bc9607c7c35794d7a16de323aba5e17402 SHA512 5c5c8309debad1829cb59cf1c941b66306153a25b2027d674a2cfa5a150bfdd3823a1b6ed9df3b326bacc1dc7d1b6c301b1fd5bcebf7ff51cfa74b76a55f30bc WHIRLPOOL 590e0078c724c1df7e9f2705f8be08973b8ea8f8aa338f1e782946360dd88c04a6b0003971eb93a6321bdcc778d73d651ee3d4c512d318d846f69a9484963964
DIST qwt-6.1.2.tar.bz2 3528935 SHA256 2b08f18d1d3970e7c3c6096d850f17aea6b54459389731d3ce715d193e243d0c SHA512 ddaf265890e493554639deae8b3ba3a1673bd6bcb4a7c47931d10aaab550646d103b28dccd3c2e4fdacd56a7963837c25ab02e27c71f891fee1801bcd45d54c0 WHIRLPOOL 575f8c3665ed8075278300f625bb9b321bd2c275573bd4c22cc1b833fde7fa38c36db027216d5da43839d9c70e0ed443327af2d54ac5a4dff3643c7abee16069
+DIST qwt-6.1.3.tar.bz2 4245614 SHA256 f3ecd34e72a9a2b08422fb6c8e909ca76f4ce5fa77acad7a2883b701f4309733 SHA512 d4a73e9e7ddcb7c16c508920a298784935be2eddc8f7585993d9fffe1bb01e1787a0d5d7ea4f220398b94ea2b211a19009dccaeadce56a84410357124bcb051a WHIRLPOOL ebcc43a29bb056d6fc4433a63b07e0dcfa6e09b5581d7ff9d96c09826faec9ea62c1d6d6f3ee2e79859c56df491ee65b29b08cb9a3b0644a0eace3351c4a322c
diff --git a/x11-libs/qwt/qwt-6.1.3.ebuild b/x11-libs/qwt/qwt-6.1.3.ebuild
new file mode 100644
index 00000000..4d78af5
--- /dev/null
+++ b/x11-libs/qwt/qwt-6.1.3.ebuild
@@ -0,0 +1,211 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=6
+
+inherit eutils multibuild multilib 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="~alpha ~amd64 ~arm ~hppa ~ia64 ~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="
+ !<x11-libs/qwt-5.2.3
+ 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 )
+ )
+ doc? ( !<media-libs/coin-3.1.3[doc] )
+ opengl? ( virtual/opengl )
+ "
+RDEPEND="${DEPEND}"
+
+S="${WORKDIR}"/${MY_P}
+
+DOCS="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}/usr/$(get_libdir)/qt4/plugins/designer"
+ QWT_INSTALL_FEATURES = "${EPREFIX}/usr/share/qt4/mkspecs/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}/usr/$(get_libdir)/qt5/plugins/designer"
+ QWT_INSTALL_FEATURES = "${EPREFIX}/usr/share/qt5/mkspecs/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
+ epatch "${PATCHES[@]}"
+ eapply_user
+ }
+
+ 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
+ dohtml -r doc/html/*
+ else
+ rm -rf "${ED}"/usr/share/doc/${PF}/html || die
+ fi
+
+ 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
+}
^ permalink raw reply related [flat|nested] 60+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: x11-libs/qwt/
@ 2017-01-15 16:57 Justin Lecher
0 siblings, 0 replies; 60+ messages in thread
From: Justin Lecher @ 2017-01-15 16:57 UTC (permalink / raw
To: gentoo-commits
commit: fe5a79f2b150f550213f8e22d41fdf0a826a0b9a
Author: Justin Lecher <jlec <AT> gentoo <DOT> org>
AuthorDate: Sun Jan 15 16:56:42 2017 +0000
Commit: Justin Lecher <jlec <AT> gentoo <DOT> org>
CommitDate: Sun Jan 15 16:57:49 2017 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=fe5a79f2
x11-libs/qwt: Backport changes
Fixes doc installation
Gentoo-Bug: https://bugs.gentoo.org/show_bug.cgi?id=595938
Package-Manager: Portage-2.3.3, Repoman-2.3.1
Signed-off-by: Justin Lecher <jlec <AT> gentoo.org>
.../qwt/{qwt-6.1.2-r1.ebuild => qwt-6.1.2-r2.ebuild} | 20 ++++++++++++++------
1 file changed, 14 insertions(+), 6 deletions(-)
diff --git a/x11-libs/qwt/qwt-6.1.2-r1.ebuild b/x11-libs/qwt/qwt-6.1.2-r2.ebuild
similarity index 91%
rename from x11-libs/qwt/qwt-6.1.2-r1.ebuild
rename to x11-libs/qwt/qwt-6.1.2-r2.ebuild
index 4bb636e..a4f1191 100644
--- a/x11-libs/qwt/qwt-6.1.2-r1.ebuild
+++ b/x11-libs/qwt/qwt-6.1.2-r2.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Id$
-EAPI=5
+EAPI=6
inherit eutils multibuild multilib qmake-utils
@@ -14,7 +14,7 @@ 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="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~x86-macos"
-SLOT="6"
+SLOT="6/1.2"
IUSE="designer doc examples mathml opengl qt4 qt5 static-libs svg"
REQUIRED_USE="|| ( qt4 qt5 )"
@@ -144,7 +144,7 @@ src_configure() {
;;
esac
}
- multibuild_parallel_foreach_variant run_in_build_dir configuration
+ multibuild_foreach_variant run_in_build_dir configuration
}
src_compile() {
@@ -178,11 +178,19 @@ src_install () {
if use mathml; then
sed \
- -e "s: -L${WORKDIR}.* -lqwt6: -lqwt6:g" \
+ -e "s: -L\"${WORKDIR}\".* -lqwt6: -lqwt6:g" \
-i "${ED}"/usr/$(get_libdir)/pkgconfig/qwtmathml.pc || die
fi
- use doc && dohtml -r doc/html/*
+ if use doc; then
+ dohtml -r doc/html/*
+ else
+ rm -rf "${ED}"/usr/share/doc/${PF}/html || die
+ fi
+
+ 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
^ permalink raw reply related [flat|nested] 60+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: x11-libs/qwt/
@ 2016-04-18 9:43 Patrice Clement
0 siblings, 0 replies; 60+ messages in thread
From: Patrice Clement @ 2016-04-18 9:43 UTC (permalink / raw
To: gentoo-commits
commit: 9e6d7d4ec90ce693ffdd7e8626bdba130ff6b790
Author: Patrice Clement <monsieurp <AT> gentoo <DOT> org>
AuthorDate: Mon Apr 18 09:28:05 2016 +0000
Commit: Patrice Clement <monsieurp <AT> gentoo <DOT> org>
CommitDate: Mon Apr 18 09:29:36 2016 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=9e6d7d4e
x11-libs/qwt: Fix metadata.xml file.
Package-Manager: portage-2.2.26
x11-libs/qwt/metadata.xml | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/x11-libs/qwt/metadata.xml b/x11-libs/qwt/metadata.xml
index 5bb4da7..5fa8612 100644
--- a/x11-libs/qwt/metadata.xml
+++ b/x11-libs/qwt/metadata.xml
@@ -13,7 +13,7 @@
values, arrays or ranges of type double.
</longdescription>
<use>
- <flag name="designer">Installs <pkg>dev-qt/designer plugin</pkg></flag>
+ <flag name="designer">Installs <pkg>dev-qt/designer</pkg> plugin.</flag>
<flag name="mathml">Use the MathML renderer of the Qt solutions package.</flag>
</use>
<upstream>
^ permalink raw reply related [flat|nested] 60+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: x11-libs/qwt/
@ 2015-11-19 12:26 Justin Lecher
0 siblings, 0 replies; 60+ messages in thread
From: Justin Lecher @ 2015-11-19 12:26 UTC (permalink / raw
To: gentoo-commits
commit: 6e6a77ea78e5e7aa8819b957ec49d6fc0dbeb0ec
Author: Justin Lecher <jlec <AT> gentoo <DOT> org>
AuthorDate: Thu Nov 19 12:25:59 2015 +0000
Commit: Justin Lecher <jlec <AT> gentoo <DOT> org>
CommitDate: Thu Nov 19 12:26:05 2015 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=6e6a77ea
x11-libs/qwt: Update DESCRIPTION for Qt5
Gentoo-Bug: https://bugs.gentoo.org/show_bug.cgi?id=566046
Package-Manager: portage-2.2.25
Signed-off-by: Justin Lecher <jlec <AT> gentoo.org>
x11-libs/qwt/qwt-6.1.2-r1.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/x11-libs/qwt/qwt-6.1.2-r1.ebuild b/x11-libs/qwt/qwt-6.1.2-r1.ebuild
index 197a369..4bb636e 100644
--- a/x11-libs/qwt/qwt-6.1.2-r1.ebuild
+++ b/x11-libs/qwt/qwt-6.1.2-r1.ebuild
@@ -8,7 +8,7 @@ inherit eutils multibuild multilib qmake-utils
MY_P="${PN}-${PV/_/-}"
-DESCRIPTION="2D plotting library for Qt4"
+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"
^ permalink raw reply related [flat|nested] 60+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: x11-libs/qwt/
@ 2015-11-19 12:26 Justin Lecher
0 siblings, 0 replies; 60+ messages in thread
From: Justin Lecher @ 2015-11-19 12:26 UTC (permalink / raw
To: gentoo-commits
commit: d8251a1840653a161f10673dbda2f1497b61686e
Author: Justin Lecher <jlec <AT> gentoo <DOT> org>
AuthorDate: Thu Nov 19 12:22:20 2015 +0000
Commit: Justin Lecher <jlec <AT> gentoo <DOT> org>
CommitDate: Thu Nov 19 12:26:05 2015 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d8251a18
x11-libs/qwt: Drop old
Package-Manager: portage-2.2.25
Signed-off-by: Justin Lecher <jlec <AT> gentoo.org>
x11-libs/qwt/Manifest | 2 -
x11-libs/qwt/qwt-6.0.0.ebuild | 90 ----------------------------
x11-libs/qwt/qwt-6.1.1.ebuild | 120 --------------------------------------
x11-libs/qwt/qwt-6.1.2.ebuild | 132 ------------------------------------------
4 files changed, 344 deletions(-)
diff --git a/x11-libs/qwt/Manifest b/x11-libs/qwt/Manifest
index bc316e3..0c22d28 100644
--- a/x11-libs/qwt/Manifest
+++ b/x11-libs/qwt/Manifest
@@ -1,5 +1,3 @@
DIST qwt-5.2.3.tar.bz2 1983725 SHA256 37feaf306753230b0d8538b4ff9b255c6fddaa3d6609ec5a5cc39a5a4d020ab7 SHA512 60545712790699b145a54baba4c40802d9a58bf5f68f997faed5027db6773a801097be8675e00b2af1de568e36e2e498db0a0310ac4877fd9f2b52871409dd49 WHIRLPOOL 01969f3e52c687b8db211c81c0865762fe908e49255f3517fc4731a8d3e6e1c738a8d18b8a43d8035314832693277cdc6303db2c5151be1385238812e6248ff6
-DIST qwt-6.0.0.tar.bz2 2723203 SHA256 d041d63029ea5f6a64d06be9bfe788e5d8bed8bac1fa129d82466aa09ab4092e SHA512 ccf662bebdef92581b14e5d0e4cf729f803c88345e9fcc7c2da0a64c55cc282386bf2eedc9bac948c74ca47b8453c7dfdeb2847b4d4cb9bdd6d1273875c6db12 WHIRLPOOL 4dee762cb956eb207f8d1fac0fc183e928783f0b1921ba87b216cf0d6dbaffa5231b902e608efaca4c9e17be92698ed2463e4c79d6306bfbd3056645143a0250
DIST qwt-6.1.0.tar.bz2 3468850 SHA256 a7e3d9f1db917d186a973c5f04a316bc9607c7c35794d7a16de323aba5e17402 SHA512 5c5c8309debad1829cb59cf1c941b66306153a25b2027d674a2cfa5a150bfdd3823a1b6ed9df3b326bacc1dc7d1b6c301b1fd5bcebf7ff51cfa74b76a55f30bc WHIRLPOOL 590e0078c724c1df7e9f2705f8be08973b8ea8f8aa338f1e782946360dd88c04a6b0003971eb93a6321bdcc778d73d651ee3d4c512d318d846f69a9484963964
-DIST qwt-6.1.1.tar.bz2 3531116 SHA256 9ac2a7f1f699a24cbd4c69b0128ce387bdfa9ed93b689c0ff4387cbc11d7c17f SHA512 7205c618ff0562aab201c3e64d181ba958695afd409b41a51880e871161ce5c932b46c7eda8110779f4fcdfb6caade15b261e64cef62b9b67b58796615f2dba1 WHIRLPOOL a0c50f9c0ce71b058f18f1f776147e719110491ece4bb5ea92a4890218378122a292c02c4405e097f9a5c5a321194c341c2e8b0e8b3bbf2ddac07803c0b8cb4e
DIST qwt-6.1.2.tar.bz2 3528935 SHA256 2b08f18d1d3970e7c3c6096d850f17aea6b54459389731d3ce715d193e243d0c SHA512 ddaf265890e493554639deae8b3ba3a1673bd6bcb4a7c47931d10aaab550646d103b28dccd3c2e4fdacd56a7963837c25ab02e27c71f891fee1801bcd45d54c0 WHIRLPOOL 575f8c3665ed8075278300f625bb9b321bd2c275573bd4c22cc1b833fde7fa38c36db027216d5da43839d9c70e0ed443327af2d54ac5a4dff3643c7abee16069
diff --git a/x11-libs/qwt/qwt-6.0.0.ebuild b/x11-libs/qwt/qwt-6.0.0.ebuild
deleted file mode 100644
index 7cd3e9f..0000000
--- a/x11-libs/qwt/qwt-6.0.0.ebuild
+++ /dev/null
@@ -1,90 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=4
-
-inherit eutils qt4-r2
-
-MY_P="${PN}-${PV/_/-}"
-
-DESCRIPTION="2D plotting library for Qt4"
-HOMEPAGE="http://qwt.sourceforge.net/"
-SRC_URI="mirror://sourceforge/project/${PN}/${PN}/${PV/_/-}/${MY_P}.tar.bz2"
-
-LICENSE="qwt"
-KEYWORDS="~alpha amd64 hppa ~ia64 ppc ppc64 sparc x86 ~x86-macos"
-SLOT="6"
-IUSE="doc examples svg"
-
-DEPEND="
- dev-qt/qtgui:4
- doc? ( !<media-libs/coin-3.1.3[doc] )
- svg? ( dev-qt/qtsvg:4 )"
-RDEPEND="${DEPEND}"
-
-S="${WORKDIR}"/${MY_P}
-
-DOCS="CHANGES README"
-
-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 += QwtDll QwtPlot QwtWidgets QwtDesigner
- VERSION = ${PV/_*}
- QWT_INSTALL_PLUGINS = "${EPREFIX}/usr/$(get_libdir)/qt4/plugins/designer6"
- QWT_INSTALL_FEATURES = "${EPREFIX}/usr/$(get_libdir)/qt4/features6"
- EOF
-
- cat > qwtbuild.pri <<-EOF
- QWT_CONFIG += qt warn_on thread release no_keywords
- EOF
-
- # 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 += -lqwt
- EOF
- sed -i -e 's:../qwtconfig:qwtconfig:' examples/examples.pro || die
- sed \
- -e 's/target doc/target/' \
- -i src/src.pro || die
-
- # Renaming lib to libqwt6.so to enable slotting
- sed \
- -e "/^TARGET/s:qwt:qwt6:g" \
- -i src/src.pro || die
- sed \
- -e '/qtAddLibrary/s:qwt:qwt6:g' \
- -i qwt.prf designer/designer.pro || die
- sed \
- -e 's:libqwt:libqwt6:g' \
- -i qwtbuild.pri || die
-
- use svg && echo "QWT_CONFIG += QwtSvg" >> qwtconfig.pri
- cp *.pri examples/ || die
-}
-
-src_compile() {
- # split compilation to allow parallel building
- emake sub-src
- emake
-}
-
-src_install () {
- rm -f doc/man/*/{_,deprecated}* || die
- qt4-r2_src_install
- if use doc; then
- dohtml -r doc/html/*
- fi
- if use examples; then
- insinto /usr/share/doc/${PF}
- doins -r examples
- fi
-}
diff --git a/x11-libs/qwt/qwt-6.1.1.ebuild b/x11-libs/qwt/qwt-6.1.1.ebuild
deleted file mode 100644
index 60bfa84..0000000
--- a/x11-libs/qwt/qwt-6.1.1.ebuild
+++ /dev/null
@@ -1,120 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-inherit eutils multibuild qt4-r2
-
-MY_P="${PN}-${PV/_/-}"
-
-DESCRIPTION="2D plotting library for Qt4"
-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="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~x86-macos"
-SLOT="6"
-IUSE="doc examples mathml static-libs svg"
-
-DEPEND="
- !<x11-libs/qwt-5.2.3
- dev-qt/designer:4
- dev-qt/qtcore:4
- dev-qt/qtgui:4
- doc? ( !<media-libs/coin-3.1.3[doc] )
- svg? ( dev-qt/qtsvg:4 )"
-RDEPEND="${DEPEND}"
-
-S="${WORKDIR}"/${MY_P}
-
-DOCS="README"
-
-PATCHES=(
- "${FILESDIR}"/${PN}-6.0.2-invalid-read.patch
- "${FILESDIR}"/${P}-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 QwtDesigner QwtPkgConfig
- 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
-
- use mathml && echo "QWT_CONFIG += QwtMathML" >> qwtconfig.pri
- use svg && echo "QWT_CONFIG += QwtSvg" >> qwtconfig.pri
-
- cat > qwtbuild.pri <<-EOF
- QWT_CONFIG += qt warn_on thread release no_keywords
- EOF
-
- sed \
- -e 's/target doc/target/' \
- -e "/^TARGET/s:(qwt):(qwt6):g" \
- -i src/src.pro || die
-
- sed \
- -e '/qwtAddLibrary/s:(qwt):(qwt6):g' \
- -i qwt.prf designer/designer.pro examples/examples.pri \
- textengines/mathml/qwtmathml.prf textengines/textengines.pri || die
-
- MULTIBUILD_VARIANTS=( )
- use static-libs && MULTIBUILD_VARIANTS+=( static )
- MULTIBUILD_VARIANTS+=( shared )
-
- qt4-r2_src_prepare
-
- multibuild_copy_sources
- preparation() {
- [[ ${MULTIBUILD_VARIANT} == shared ]] && \
- echo "QWT_CONFIG += QwtDll" >> "${BUILD_DIR}"/qwtconfig.pri
- }
-
- multibuild_foreach_variant preparation
-}
-
-src_configure() {
- multibuild_parallel_foreach_variant run_in_build_dir qt4-r2_src_configure
-}
-
-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 () {
- rm -f doc/man/*/{_,deprecated}* || die
- multibuild_foreach_variant run_in_build_dir qt4-r2_src_install
-
- use doc && dohtml -r doc/html/*
-
- 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.2.ebuild b/x11-libs/qwt/qwt-6.1.2.ebuild
deleted file mode 100644
index 0f2ea3b..0000000
--- a/x11-libs/qwt/qwt-6.1.2.ebuild
+++ /dev/null
@@ -1,132 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-inherit eutils multibuild qt4-r2
-
-MY_P="${PN}-${PV/_/-}"
-
-DESCRIPTION="2D plotting library for Qt4"
-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="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~x86-macos"
-SLOT="6"
-IUSE="doc examples mathml opengl static-libs svg"
-
-DEPEND="
- !<x11-libs/qwt-5.2.3
- dev-qt/designer:4
- dev-qt/qtcore:4
- dev-qt/qtgui:4
- doc? ( !<media-libs/coin-3.1.3[doc] )
- opengl? (
- dev-qt/qtopengl:4
- virtual/opengl
- )
- svg? ( dev-qt/qtsvg:4 )"
-RDEPEND="${DEPEND}"
-
-S="${WORKDIR}"/${MY_P}
-
-DOCS="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 QwtDesigner QwtPkgConfig
- 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
-
- 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
-
- sed \
- -e 's/target doc/target/' \
- -e "/^TARGET/s:(qwt):(qwt6):g" \
- -i src/src.pro || die
-
- sed \
- -e '/qwtAddLibrary/s:qwt):qwt6):g' \
- -i qwt.prf designer/designer.pro examples/examples.pri \
- textengines/mathml/qwtmathml.prf textengines/textengines.pri \
- designer/designer.pro || die
-
- MULTIBUILD_VARIANTS=( )
- use static-libs && MULTIBUILD_VARIANTS+=( static )
- MULTIBUILD_VARIANTS+=( shared )
-
- qt4-r2_src_prepare
-
- multibuild_copy_sources
- preparation() {
- [[ ${MULTIBUILD_VARIANT} == shared ]] && \
- echo "QWT_CONFIG += QwtDll" >> "${BUILD_DIR}"/qwtconfig.pri
- }
-
- multibuild_foreach_variant preparation
-}
-
-src_configure() {
- multibuild_parallel_foreach_variant run_in_build_dir qt4-r2_src_configure
-}
-
-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 () {
- rm -f doc/man/*/{_,deprecated}* || die
- multibuild_foreach_variant run_in_build_dir qt4-r2_src_install
-
- if use mathml; then
- sed \
- -e "s: -L${WORKDIR}.* -lqwt6: -lqwt6:g" \
- -i "${ED}"/usr/$(get_libdir)/pkgconfig/qwtmathml.pc || die
- fi
-
- use doc && dohtml -r doc/html/*
-
- 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
-}
^ permalink raw reply related [flat|nested] 60+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: x11-libs/qwt/
@ 2015-09-23 9:33 Justin Lecher
0 siblings, 0 replies; 60+ messages in thread
From: Justin Lecher @ 2015-09-23 9:33 UTC (permalink / raw
To: gentoo-commits
commit: 21983fc25c2a6ea401efa64f77746ccfff2dad1f
Author: Justin Lecher <jlec <AT> gentoo <DOT> org>
AuthorDate: Wed Sep 23 09:33:10 2015 +0000
Commit: Justin Lecher <jlec <AT> gentoo <DOT> org>
CommitDate: Wed Sep 23 09:33:26 2015 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=21983fc2
x11-libs/qwt: Add missing dep
Gentoo-Bug: https://bugs.gentoo.org/show_bug.cgi?id=560488
Package-Manager: portage-2.2.21
Signed-off-by: Justin Lecher <jlec <AT> gentoo.org>
x11-libs/qwt/metadata.xml | 1 +
x11-libs/qwt/qwt-6.1.2-r1.ebuild | 3 ++-
2 files changed, 3 insertions(+), 1 deletion(-)
diff --git a/x11-libs/qwt/metadata.xml b/x11-libs/qwt/metadata.xml
index df37d0e..afa034e 100644
--- a/x11-libs/qwt/metadata.xml
+++ b/x11-libs/qwt/metadata.xml
@@ -10,6 +10,7 @@
values, arrays or ranges of type double.
</longdescription>
<use>
+ <flag name="designer">Installs <pkg>dev-qt/designer plugin</pkg></flag>
<flag name="mathml">Use the MathML renderer of the Qt solutions package.</flag>
</use>
<upstream>
diff --git a/x11-libs/qwt/qwt-6.1.2-r1.ebuild b/x11-libs/qwt/qwt-6.1.2-r1.ebuild
index 52d528e..197a369 100644
--- a/x11-libs/qwt/qwt-6.1.2-r1.ebuild
+++ b/x11-libs/qwt/qwt-6.1.2-r1.ebuild
@@ -29,9 +29,10 @@ DEPEND="
svg? ( dev-qt/qtsvg:4 )
)
qt5? (
+ dev-qt/qtconcurrent:5
dev-qt/qtcore:5
dev-qt/qtgui:5
- dev-qt/qtconcurrent:5
+ dev-qt/qtprintsupport:5
dev-qt/qtwidgets:5
designer? ( dev-qt/designer:5 )
opengl? ( dev-qt/qtopengl:5 )
^ permalink raw reply related [flat|nested] 60+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: x11-libs/qwt/
@ 2015-09-07 18:08 Justin Lecher
0 siblings, 0 replies; 60+ messages in thread
From: Justin Lecher @ 2015-09-07 18:08 UTC (permalink / raw
To: gentoo-commits
commit: d83a0e556a92ff2af5313b57ee6b6feb9237a841
Author: Luis Ressel <aranea <AT> aixah <DOT> de>
AuthorDate: Mon Sep 7 14:03:37 2015 +0000
Commit: Justin Lecher <jlec <AT> gentoo <DOT> org>
CommitDate: Mon Sep 7 18:08:07 2015 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d83a0e55
x11-libs/qwt: Build Designer plugin conditionally
Thanks Luis Ressel for the patch
Gentoo-Bug: https://bugs.gentoo.org/show_bug.cgi?id=557438
Signed-off-by: Justin Lecher <jlec <AT> gentoo.org>
x11-libs/qwt/qwt-6.1.2-r1.ebuild | 9 +++++----
1 file changed, 5 insertions(+), 4 deletions(-)
diff --git a/x11-libs/qwt/qwt-6.1.2-r1.ebuild b/x11-libs/qwt/qwt-6.1.2-r1.ebuild
index 0b678c3..52d528e 100644
--- a/x11-libs/qwt/qwt-6.1.2-r1.ebuild
+++ b/x11-libs/qwt/qwt-6.1.2-r1.ebuild
@@ -15,25 +15,25 @@ 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="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~x86-macos"
SLOT="6"
-IUSE="doc examples mathml opengl qt4 qt5 static-libs svg"
+IUSE="designer doc examples mathml opengl qt4 qt5 static-libs svg"
REQUIRED_USE="|| ( qt4 qt5 )"
DEPEND="
!<x11-libs/qwt-5.2.3
qt4? (
- dev-qt/designer:4
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/designer:5
dev-qt/qtcore:5
dev-qt/qtgui:5
dev-qt/qtconcurrent:5
dev-qt/qtwidgets:5
+ designer? ( dev-qt/designer:5 )
opengl? ( dev-qt/qtopengl:5 )
svg? ( dev-qt/qtsvg:5 )
)
@@ -56,11 +56,12 @@ src_prepare() {
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 QwtDesigner QwtPkgConfig
+ 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
^ permalink raw reply related [flat|nested] 60+ messages in thread
end of thread, other threads:[~2023-12-23 14:29 UTC | newest]
Thread overview: 60+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2023-12-16 16:17 [gentoo-commits] repo/gentoo:master commit in: x11-libs/qwt/ Arthur Zamarin
-- strict thread matches above, loose matches on Subject: below --
2023-12-23 14:29 Arthur Zamarin
2023-12-22 11:03 Arthur Zamarin
2023-12-18 9:01 Arthur Zamarin
2023-12-18 9:01 Arthur Zamarin
2023-12-16 16:17 Arthur Zamarin
2023-12-16 16:17 Arthur Zamarin
2023-12-16 16:17 Arthur Zamarin
2023-11-08 17:21 Andrew Ammerlaan
2023-06-15 8:43 Andrew Ammerlaan
2022-10-21 15:05 Andrew Ammerlaan
2022-10-20 3:54 Sam James
2022-04-30 15:53 Marek Szuba
2022-04-30 15:53 Marek Szuba
2021-12-16 9:08 Andrew Ammerlaan
2021-12-08 10:43 Andrew Ammerlaan
2021-12-07 22:40 Andrew Ammerlaan
2021-12-07 22:40 Andrew Ammerlaan
2021-10-20 4:03 Sam James
2021-10-18 0:39 Sam James
2021-10-17 20:04 Sam James
2021-10-17 19:09 Sam James
2021-05-23 13:08 Andrew Ammerlaan
2021-05-23 12:47 Andrew Ammerlaan
2021-01-24 13:35 Sam James
2021-01-24 13:33 Sam James
2021-01-22 18:45 Sam James
2021-01-21 9:52 Agostino Sarubbo
2021-01-06 12:01 Fabian Groffen
2020-10-07 20:26 Rick Farina
2020-10-07 20:26 Rick Farina
2020-06-29 17:37 Andreas Sturmlechner
2020-06-29 13:40 Agostino Sarubbo
2020-06-21 17:08 Agostino Sarubbo
2020-06-21 17:03 Agostino Sarubbo
2020-05-22 16:08 Andreas Sturmlechner
2019-12-30 23:01 Sergei Trofimovich
2018-06-28 18:49 Andreas Sturmlechner
2018-06-07 10:13 Agostino Sarubbo
2018-06-06 23:23 Thomas Deutschmann
2018-06-02 14:08 Andreas Sturmlechner
2018-05-13 6:56 Andreas Sturmlechner
2017-09-02 13:18 Michael Palimaka
2017-04-09 20:42 Andreas Sturmlechner
2017-03-29 1:34 Jeroen Roovers
2017-03-04 14:02 Agostino Sarubbo
2017-03-02 19:39 Andreas Sturmlechner
2017-03-02 10:47 Agostino Sarubbo
2017-03-02 10:30 Agostino Sarubbo
2017-02-23 21:57 Andreas Sturmlechner
2017-01-23 23:21 Andreas Sturmlechner
2017-01-23 23:21 Andreas Sturmlechner
2017-01-21 15:18 Lars Wendler
2017-01-15 16:57 Justin Lecher
2017-01-15 16:57 Justin Lecher
2016-04-18 9:43 Patrice Clement
2015-11-19 12:26 Justin Lecher
2015-11-19 12:26 Justin Lecher
2015-09-23 9:33 Justin Lecher
2015-09-07 18:08 Justin Lecher
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox