public inbox for gentoo-commits@lists.gentoo.org
 help / color / mirror / Atom feed
From: "Justin Lecher" <jlec@gentoo.org>
To: gentoo-commits@lists.gentoo.org
Subject: [gentoo-commits] repo/gentoo:master commit in: x11-libs/qwt/
Date: Sun, 15 Jan 2017 16:57:50 +0000 (UTC)	[thread overview]
Message-ID: <1484499468.394fe11e002be6ec37b1b1e7f0e0c05e811885bb.jlec@gentoo> (raw)

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
+}


             reply	other threads:[~2017-01-15 16:57 UTC|newest]

Thread overview: 63+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2017-01-15 16:57 Justin Lecher [this message]
  -- strict thread matches above, loose matches on Subject: below --
2025-02-12 17:28 [gentoo-commits] repo/gentoo:master commit in: x11-libs/qwt/ Andreas Sturmlechner
2024-11-18 21:42 Andreas Sturmlechner
2024-11-18 21:42 Andreas Sturmlechner
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-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
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

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=1484499468.394fe11e002be6ec37b1b1e7f0e0c05e811885bb.jlec@gentoo \
    --to=jlec@gentoo.org \
    --cc=gentoo-commits@lists.gentoo.org \
    --cc=gentoo-dev@lists.gentoo.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox