[gentoo-commits] repo/gentoo:master commit in: x11-libs/qwtpolar/

2022-10-21 Thread Andrew Ammerlaan 
commit: e3baa924f2ab91f6e1ffb0151c63d7e057cb8c35
Author: Andrew Ammerlaan  gentoo  org>
AuthorDate: Fri Oct 21 12:48:33 2022 +
Commit: Andrew Ammerlaan  gentoo  org>
CommitDate: Fri Oct 21 15:04:49 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e3baa924

x11-libs/qwtpolar: restrict to qwt<6.2

Closes: https://bugs.gentoo.org/832198
Closes: https://bugs.gentoo.org/829099
Signed-off-by: Andrew Ammerlaan  gentoo.org>

 .../qwtpolar/{qwtpolar-1.1.1-r2.ebuild => qwtpolar-1.1.1-r3.ebuild}   | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/x11-libs/qwtpolar/qwtpolar-1.1.1-r2.ebuild 
b/x11-libs/qwtpolar/qwtpolar-1.1.1-r3.ebuild
similarity index 93%
rename from x11-libs/qwtpolar/qwtpolar-1.1.1-r2.ebuild
rename to x11-libs/qwtpolar/qwtpolar-1.1.1-r3.ebuild
index 39bb2faf54f9..b3cb574faa90 100644
--- a/x11-libs/qwtpolar/qwtpolar-1.1.1-r2.ebuild
+++ b/x11-libs/qwtpolar/qwtpolar-1.1.1-r3.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -20,7 +20,7 @@ RDEPEND="
dev-qt/qtprintsupport:5
dev-qt/qtsvg:5
dev-qt/qtwidgets:5
-   x11-libs/qwt:6=[designer,qt5(+),svg]
+

[gentoo-commits] repo/gentoo:master commit in: x11-libs/qwtpolar/

2020-05-21 Thread Andreas Sturmlechner 
commit: 6269a9beb9cc40240ef100a1235b3e770f34bce3
Author: Andreas Sturmlechner  gentoo  org>
AuthorDate: Thu May 21 19:29:02 2020 +
Commit: Andreas Sturmlechner  gentoo  org>
CommitDate: Thu May 21 19:29:02 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=6269a9be

x11-libs/qwtpolar: EAPI-7 bump, update HOMEPAGE

Package-Manager: Portage-2.3.99, Repoman-2.3.22
Signed-off-by: Andreas Sturmlechner  gentoo.org>

 x11-libs/qwtpolar/qwtpolar-1.1.1-r2.ebuild | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/x11-libs/qwtpolar/qwtpolar-1.1.1-r2.ebuild 
b/x11-libs/qwtpolar/qwtpolar-1.1.1-r2.ebuild
index 2206f2747bf..39bb2faf54f 100644
--- a/x11-libs/qwtpolar/qwtpolar-1.1.1-r2.ebuild
+++ b/x11-libs/qwtpolar/qwtpolar-1.1.1-r2.ebuild
@@ -1,12 +1,12 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=7
 
 inherit qmake-utils
 
 DESCRIPTION="Library for displaying values on a polar coordinate system"
-HOMEPAGE="http://qwtpolar.sourceforge.net/;
+HOMEPAGE="https://qwtpolar.sourceforge.io/;
 SRC_URI="mirror://sourceforge/${PN}/${P}.tar.bz2"
 
 LICENSE="qwt"

[gentoo-commits] repo/gentoo:master commit in: x11-libs/qwtpolar/

2018-04-12 Thread Andreas Sturmlechner 
commit: 7f9af7fd4991bc37f40ad37d911f754ea91ed452
Author: Andreas Sturmlechner  gentoo  org>
AuthorDate: Thu Apr 12 20:05:15 2018 +
Commit: Andreas Sturmlechner  gentoo  org>
CommitDate: Thu Apr 12 21:42:16 2018 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=7f9af7fd

x11-libs/qwtpolar: Drop 1.1.1-r1

Package-Manager: Portage-2.3.28, Repoman-2.3.9

 x11-libs/qwtpolar/qwtpolar-1.1.1-r1.ebuild | 62 --
 1 file changed, 62 deletions(-)

diff --git a/x11-libs/qwtpolar/qwtpolar-1.1.1-r1.ebuild 
b/x11-libs/qwtpolar/qwtpolar-1.1.1-r1.ebuild
deleted file mode 100644
index 92b8ca54a3b..000
--- a/x11-libs/qwtpolar/qwtpolar-1.1.1-r1.ebuild
+++ /dev/null
@@ -1,62 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit qmake-utils
-
-DESCRIPTION="Library for displaying values on a polar coordinate system"
-HOMEPAGE="http://qwtpolar.sourceforge.net/;
-SRC_URI="mirror://sourceforge/${PN}/${P}.tar.bz2"
-
-LICENSE="qwt"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE="+qt4 qt5"
-
-REQUIRED_USE="^^ ( qt4 qt5 )"
-
-RDEPEND="
-   qt4? ( x11-libs/qwt:6=[designer,qt4(+),svg] )
-   qt5? ( x11-libs/qwt:6=[designer,qt5,svg] )
-"
-DEPEND="${RDEPEND}"
-
-src_prepare() {
-   default
-
-   local qtplugindir="${EPREFIX}$(qt4_get_plugindir)"
-   use qt5 && qtplugindir="${EPREFIX}$(qt5_get_plugindir)"
-
-   sed \
-   -e "/QWT_POLAR_INSTALL_PREFIX /s:=.*$:= ${EPREFIX}/usr:g" \
-   -e "/QWT_POLAR_INSTALL_LIBS/s:lib:$(get_libdir):g" \
-   -e "/QWT_POLAR_INSTALL_DOCS/s:doc:share/doc/${PF}:g" \
-   -e "/QWT_POLAR_INSTALL_PLUGINS/s:=.*$:= 
${qtplugindir}/designer/:g" \
-   -e "/QWT_POLAR_INSTALL_FEATURES/s:=.*$:= 
${qtplugindir}/features/:g" \
-   -e "/= QwtPolarDesigner/ d" \
-   -e "/= QwtPolarExamples/d" \
-   -i ${PN}config.pri || die
-
-   sed \
-   -e "s:{QWT_POLAR_ROOT}/lib:{QWT_POLAR_ROOT}/$(get_libdir):" \
-   -i src/src.pro || die
-   echo "INCLUDEPATH += ${EPREFIX}/usr/include/qwt6" >> src/src.pro
-   cat >> designer/designer.pro <<- EOF
-   INCLUDEPATH += "${EPREFIX}"/usr/include/qwt6
-   LIBS += -L"${S}/$(get_libdir)"
-   EOF
-}
-
-src_configure() {
-   if use qt5; then
-   eqmake5
-   else
-   eqmake4
-   fi
-}
-
-src_install() {
-   emake DESTDIR="${D}" INSTALL_ROOT="${D}" install
-   einstalldocs
-}

[gentoo-commits] repo/gentoo:master commit in: x11-libs/qwtpolar/

2018-04-12 Thread Thomas Deutschmann 
commit: e55a60f29ce78be7a959bf025d18bfaaa1dc37fd
Author: Thomas Deutschmann  gentoo  org>
AuthorDate: Thu Apr 12 19:04:00 2018 +
Commit: Thomas Deutschmann  gentoo  org>
CommitDate: Thu Apr 12 19:06:40 2018 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e55a60f2

x11-libs/qwtpolar: x86 stable (bug #652818)

Package-Manager: Portage-2.3.28, Repoman-2.3.9

 x11-libs/qwtpolar/qwtpolar-1.1.1-r2.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/x11-libs/qwtpolar/qwtpolar-1.1.1-r2.ebuild 
b/x11-libs/qwtpolar/qwtpolar-1.1.1-r2.ebuild
index 0d0c1346e7b..2206f2747bf 100644
--- a/x11-libs/qwtpolar/qwtpolar-1.1.1-r2.ebuild
+++ b/x11-libs/qwtpolar/qwtpolar-1.1.1-r2.ebuild
@@ -11,7 +11,7 @@ SRC_URI="mirror://sourceforge/${PN}/${P}.tar.bz2"
 
 LICENSE="qwt"
 SLOT="0"
-KEYWORDS="amd64 ~x86"
+KEYWORDS="amd64 x86"
 IUSE=""
 
 RDEPEND="

[gentoo-commits] repo/gentoo:master commit in: x11-libs/qwtpolar/

2018-04-09 Thread Aaron Bauman 
commit: 65e2bb77a23667cec9aa9bdca7e93f60d5c3e15b
Author: Aaron Bauman  gentoo  org>
AuthorDate: Mon Apr  9 16:27:10 2018 +
Commit: Aaron Bauman  gentoo  org>
CommitDate: Mon Apr  9 16:27:10 2018 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=65e2bb77

x11-libs/qwtpolar: amd64 stable

Bug: https://bugs.gentoo.org/652818
Package-Manager: Portage-2.3.28, Repoman-2.3.9

 x11-libs/qwtpolar/qwtpolar-1.1.1-r2.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/x11-libs/qwtpolar/qwtpolar-1.1.1-r2.ebuild 
b/x11-libs/qwtpolar/qwtpolar-1.1.1-r2.ebuild
index 994d5637f4e..0d0c1346e7b 100644
--- a/x11-libs/qwtpolar/qwtpolar-1.1.1-r2.ebuild
+++ b/x11-libs/qwtpolar/qwtpolar-1.1.1-r2.ebuild
@@ -11,7 +11,7 @@ SRC_URI="mirror://sourceforge/${PN}/${P}.tar.bz2"
 
 LICENSE="qwt"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 ~x86"
 IUSE=""
 
 RDEPEND="

[gentoo-commits] repo/gentoo:master commit in: x11-libs/qwtpolar/

2018-03-02 Thread Michael Palimaka 
commit: 4d9883b22033932633769292ac6a2b98f8d3fd08
Author: Michael Palimaka  gentoo  org>
AuthorDate: Fri Mar  2 11:10:54 2018 +
Commit: Michael Palimaka  gentoo  org>
CommitDate: Fri Mar  2 11:11:38 2018 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=4d9883b2

x11-libs/qwtpolar: revision bump removes qt4 support and adds missing 
dependencies

Package-Manager: Portage-2.3.19, Repoman-2.3.6

 x11-libs/qwtpolar/qwtpolar-1.1.1-r2.ebuild | 61 ++
 1 file changed, 61 insertions(+)

diff --git a/x11-libs/qwtpolar/qwtpolar-1.1.1-r2.ebuild 
b/x11-libs/qwtpolar/qwtpolar-1.1.1-r2.ebuild
new file mode 100644
index 000..994d5637f4e
--- /dev/null
+++ b/x11-libs/qwtpolar/qwtpolar-1.1.1-r2.ebuild
@@ -0,0 +1,61 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit qmake-utils
+
+DESCRIPTION="Library for displaying values on a polar coordinate system"
+HOMEPAGE="http://qwtpolar.sourceforge.net/;
+SRC_URI="mirror://sourceforge/${PN}/${P}.tar.bz2"
+
+LICENSE="qwt"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+RDEPEND="
+   dev-qt/qtcore:5
+   dev-qt/qtgui:5
+   dev-qt/qtprintsupport:5
+   dev-qt/qtsvg:5
+   dev-qt/qtwidgets:5
+   x11-libs/qwt:6=[designer,qt5(+),svg]
+"
+DEPEND="${RDEPEND}
+   dev-qt/qtconcurrent:5
+"
+
+src_prepare() {
+   default
+
+   local qtplugindir="${EPREFIX}$(qt5_get_plugindir)"
+
+   sed \
+   -e "/QWT_POLAR_INSTALL_PREFIX /s:=.*$:= ${EPREFIX}/usr:g" \
+   -e "/QWT_POLAR_INSTALL_LIBS/s:lib:$(get_libdir):g" \
+   -e "/QWT_POLAR_INSTALL_DOCS/s:doc:share/doc/${PF}:g" \
+   -e "/QWT_POLAR_INSTALL_PLUGINS/s:=.*$:= 
${qtplugindir}/designer/:g" \
+   -e "/QWT_POLAR_INSTALL_FEATURES/s:=.*$:= 
${qtplugindir}/features/:g" \
+   -e "/= QwtPolarDesigner/ d" \
+   -e "/= QwtPolarExamples/d" \
+   -i ${PN}config.pri || die
+
+   sed \
+   -e "s:{QWT_POLAR_ROOT}/lib:{QWT_POLAR_ROOT}/$(get_libdir):" \
+   -i src/src.pro || die
+   echo "INCLUDEPATH += ${EPREFIX}/usr/include/qwt6" >> src/src.pro
+   cat >> designer/designer.pro <<- EOF
+   INCLUDEPATH += "${EPREFIX}"/usr/include/qwt6
+   LIBS += -L"${S}/$(get_libdir)"
+   EOF
+}
+
+src_configure() {
+   eqmake5
+}
+
+src_install() {
+   emake DESTDIR="${D}" INSTALL_ROOT="${D}" install
+   einstalldocs
+}

[gentoo-commits] repo/gentoo:master commit in: x11-libs/qwtpolar/

2017-03-02 Thread Andreas Sturmlechner 
commit: 358a3e704e09893e8d7273f95c692b63b9b47ee3
Author: Andreas Sturmlechner  gentoo  org>
AuthorDate: Mon Feb 27 00:59:17 2017 +
Commit: Andreas Sturmlechner  gentoo  org>
CommitDate: Thu Mar  2 19:39:16 2017 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=358a3e70

x11-libs/qwtpolar: Drop old

Package-Manager: Portage-2.3.3, Repoman-2.3.1
Closes: https://github.com/gentoo/gentoo/pull/4099

 x11-libs/qwtpolar/Manifest |  3 ---
 x11-libs/qwtpolar/qwtpolar-0.1.0-r1.ebuild | 42 --
 x11-libs/qwtpolar/qwtpolar-1.0.0.ebuild| 39 ---
 x11-libs/qwtpolar/qwtpolar-1.1.0.ebuild| 40 
 4 files changed, 124 deletions(-)

diff --git a/x11-libs/qwtpolar/Manifest b/x11-libs/qwtpolar/Manifest
index f71a2a0c343..067cac7e5ba 100644
--- a/x11-libs/qwtpolar/Manifest
+++ b/x11-libs/qwtpolar/Manifest
@@ -1,4 +1 @@
-DIST qwtpolar-0.1.0.tar.bz2 768348 SHA256 
af08b0106b1f7187db02dfd7e36f59ad185fbe72d72c62a6c91e9f492127a481 SHA512 
8a11a64d52547fd801a78874daa806540c5efa5828ee7783a1d468cc09667b1b87edcafa134b8c1b8c818c5bcb04f7e42ac836b10f165d002cc90e68294479f5
 WHIRLPOOL 
6ef7de2a2cf6df068e309fe0d1d60aba5f05fa2cf6733a4fd0df2205a1f029d8781623411a2100666102a51d64787a8154764a6719950881bfaf2840b5cf3b6a
-DIST qwtpolar-1.0.0.zip 636765 SHA256 
046cb0378134dbec76fc60435f93fe433c155087a03114eb1b96b605ee0e1e76 SHA512 
94536af39e3658d56758d201a29c2e0aaec109ca37b3f9a4e7e7722ea7f63f45e31026d112b384b8e75008c93d10a070ebaa85c0c745a7d11529f7d1de10d4ba
 WHIRLPOOL 
3c8a5d4ffbb8e4b9fc4cfbab3f7faaa1d7c16833c79b43633ded63f89f6efe80b2961985f0ce3d26ede52c48fae934a65616f5b18ecfd03b932225de6b0abae9
-DIST qwtpolar-1.1.0.zip 939175 SHA256 
21ba860195985bfcb4e54da6a48aba4f7db44f01a6f26bbe6ffa9123802b78df SHA512 
48bc5da93ed18aa83907651569245b77a6bce43e9e87d38f4531fecb20d74bdce4b0a18cee0722065637577cd73937ed8e3b5253df5262347ac382b1673233c0
 WHIRLPOOL 
ba09b46a9da8604feb55bee31d2d336fbe746f2c1b3fb44ec4356f50860d03c713e2049421669a0bf67656afc241e5153c8dd2619d3745b699bfae1316db641c
 DIST qwtpolar-1.1.1.tar.bz2 565546 SHA256 
6168baa9dbc8d527ae1ebf2631313291a1d545da268a05f4caa52ceadbe8b295 SHA512 
5b752e5426ae15740737277c2ba244cab947c54d573b4eedd1f54359b6eab1fa738d40f68f6c806106d01596eabc9f6d7ee825dde11a4925bebd643f42021621
 WHIRLPOOL 
e03906b22f06d6ea42ab0609d28a578be70c4d5c9a71d0cb00f40e2630f2868890085434e4f2833280db2c445eaefc16bfd321a3d4f5cc9e1538a608fd1d727b

diff --git a/x11-libs/qwtpolar/qwtpolar-0.1.0-r1.ebuild 
b/x11-libs/qwtpolar/qwtpolar-0.1.0-r1.ebuild
deleted file mode 100644
index 7870146dfaf..000
--- a/x11-libs/qwtpolar/qwtpolar-0.1.0-r1.ebuild
+++ /dev/null
@@ -1,42 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=4
-
-inherit multilib qt4-r2
-
-DESCRIPTION="Library for displaying values on a polar coordinate system"
-HOMEPAGE="http://qwtpolar.sourceforge.net/;
-SRC_URI="mirror://sourceforge/${PN}/${P}.tar.bz2"
-
-LICENSE="qwt"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE=""
-
-DEPEND="x11-libs/qwt:5[svg]"
-RDEPEND="${DEPEND}"
-
-src_prepare() {
-   sed -i \
-   -e "s:/path/to/qwt-5.2/include:${EPREFIX}/usr/include/qwt5:g" \
-   -e "s:/path/to/qwt-5.2/lib:${EPREFIX}/usr/$(get_libdir):g" \
-   -e "/= QwtPolarDesigner/ d" \
-   -e "s:/usr/local/qwtpolar-0.1.0:/usr/:g" \
-   -e "s:INSTALLBASE/lib:INSTALLBASE/$(get_libdir):g" \
-   -e "s:INSTALLBASE/include:INSTALLBASE/include/${PN}:" \
-   ${PN}.pri || die
-
-   sed -i \
-   -e "s:{QWT_POLAR_ROOT}/lib:{QWT_POLAR_ROOT}/$(get_libdir):" \
-   src/src.pro || die
-}
-
-src_install() {
-   qt4-r2_src_install
-
-   rm -rf "${ED}/usr/doc" || die
-
-   doman doc/man/man3/QwtPolar*
-   dohtml -r doc/html
-}

diff --git a/x11-libs/qwtpolar/qwtpolar-1.0.0.ebuild 
b/x11-libs/qwtpolar/qwtpolar-1.0.0.ebuild
deleted file mode 100644
index 9a8c78cb4fd..000
--- a/x11-libs/qwtpolar/qwtpolar-1.0.0.ebuild
+++ /dev/null
@@ -1,39 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=4
-
-inherit multilib qt4-r2
-
-DESCRIPTION="Library for displaying values on a polar coordinate system"
-HOMEPAGE="http://qwtpolar.sourceforge.net/;
-SRC_URI="mirror://sourceforge/${PN}/${P}.zip"
-
-LICENSE="qwt"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND="x11-libs/qwt:6[svg]"
-DEPEND="${RDEPEND}
-   app-arch/unzip"
-
-src_prepare() {
-   sed -i \
-   -e "/QWT_POLAR_INSTALL_PREFIX /s:=.*$:= ${EPREFIX}/usr:g" \
-   -e "/QWT_POLAR_INSTALL_LIBS/s:lib:$(get_libdir):g" \
-   -e "/QWT_POLAR_INSTALL_DOCS/s:doc:share/doc/${PF}:g" \
-   -e "/QWT_POLAR_INSTALL_PLUGINS/s:=.*$:= 
${EPREFIX}/usr/$(get_libdir)/qt4/plugins/designer6/:g" \
-   -e

[gentoo-commits] repo/gentoo:master commit in: x11-libs/qwtpolar/

2017-03-02 Thread Agostino Sarubbo 
commit: 43d79ba17bd35a5270f0d05f0c917d7315ca2232
Author: Agostino Sarubbo  gentoo  org>
AuthorDate: Thu Mar  2 10:45:43 2017 +
Commit: Agostino Sarubbo  gentoo  org>
CommitDate: Thu Mar  2 10:45:43 2017 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=43d79ba1

x11-libs/qwtpolar: x86 stable wrt bug #610042

Package-Manager: portage-2.3.3
RepoMan-Options: --include-arches="x86"
Signed-off-by: Agostino Sarubbo  gentoo.org>

 x11-libs/qwtpolar/qwtpolar-1.1.1-r1.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/x11-libs/qwtpolar/qwtpolar-1.1.1-r1.ebuild 
b/x11-libs/qwtpolar/qwtpolar-1.1.1-r1.ebuild
index ebea272ad3b..92b8ca54a3b 100644
--- a/x11-libs/qwtpolar/qwtpolar-1.1.1-r1.ebuild
+++ b/x11-libs/qwtpolar/qwtpolar-1.1.1-r1.ebuild
@@ -11,7 +11,7 @@ SRC_URI="mirror://sourceforge/${PN}/${P}.tar.bz2"
 
 LICENSE="qwt"
 SLOT="0"
-KEYWORDS="amd64 ~x86"
+KEYWORDS="amd64 x86"
 IUSE="+qt4 qt5"
 
 REQUIRED_USE="^^ ( qt4 qt5 )"

[gentoo-commits] repo/gentoo:master commit in: x11-libs/qwtpolar/

2017-03-02 Thread Agostino Sarubbo 
commit: 2213ee2a22380a5b4dfa6ceebf932ac3b8036b9a
Author: Agostino Sarubbo  gentoo  org>
AuthorDate: Thu Mar  2 10:29:39 2017 +
Commit: Agostino Sarubbo  gentoo  org>
CommitDate: Thu Mar  2 10:29:39 2017 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=2213ee2a

x11-libs/qwtpolar: amd64 stable wrt bug #610042

Package-Manager: portage-2.3.3
RepoMan-Options: --include-arches="amd64"
Signed-off-by: Agostino Sarubbo  gentoo.org>

 x11-libs/qwtpolar/qwtpolar-1.1.1-r1.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/x11-libs/qwtpolar/qwtpolar-1.1.1-r1.ebuild 
b/x11-libs/qwtpolar/qwtpolar-1.1.1-r1.ebuild
index c7cc6ad9fc5..ebea272ad3b 100644
--- a/x11-libs/qwtpolar/qwtpolar-1.1.1-r1.ebuild
+++ b/x11-libs/qwtpolar/qwtpolar-1.1.1-r1.ebuild
@@ -11,7 +11,7 @@ SRC_URI="mirror://sourceforge/${PN}/${P}.tar.bz2"
 
 LICENSE="qwt"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 ~x86"
 IUSE="+qt4 qt5"
 
 REQUIRED_USE="^^ ( qt4 qt5 )"

[gentoo-commits] repo/gentoo:master commit in: x11-libs/qwtpolar/

2017-01-26 Thread Andreas Sturmlechner 
commit: 3fdec5c3e5584862fd5f6528a3375bcc4c4a33b0
Author: Andreas Sturmlechner  gentoo  org>
AuthorDate: Wed Jan 25 21:45:55 2017 +
Commit: Andreas Sturmlechner  gentoo  org>
CommitDate: Thu Jan 26 11:36:55 2017 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=3fdec5c3

x11-libs/qwtpolar: Switch on qt4 by default for REQUIRED_USE

Currently there are no rdeps using qt5.

Package-Manager: portage-2.3.3

 x11-libs/qwtpolar/qwtpolar-1.1.1-r1.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/x11-libs/qwtpolar/qwtpolar-1.1.1-r1.ebuild 
b/x11-libs/qwtpolar/qwtpolar-1.1.1-r1.ebuild
index 3bc8857..4318148 100644
--- a/x11-libs/qwtpolar/qwtpolar-1.1.1-r1.ebuild
+++ b/x11-libs/qwtpolar/qwtpolar-1.1.1-r1.ebuild
@@ -13,7 +13,7 @@ SRC_URI="mirror://sourceforge/${PN}/${P}.tar.bz2"
 LICENSE="qwt"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
-IUSE="qt4 qt5"
+IUSE="+qt4 qt5"
 
 REQUIRED_USE="^^ ( qt4 qt5 )"

[gentoo-commits] repo/gentoo:master commit in: x11-libs/qwtpolar/

2017-01-23 Thread Andreas Sturmlechner 
commit: 61b3e8dfaad6b969107a289e7a44224e1c795965
Author: Andreas Sturmlechner  gentoo  org>
AuthorDate: Mon Jan 23 23:05:18 2017 +
Commit: Andreas Sturmlechner  gentoo  org>
CommitDate: Mon Jan 23 23:20:02 2017 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=61b3e8df

x11-libs/qwtpolar: Fix prefix configure

Package-Manager: portage-2.3.0

 x11-libs/qwtpolar/qwtpolar-1.1.1-r1.ebuild | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/x11-libs/qwtpolar/qwtpolar-1.1.1-r1.ebuild 
b/x11-libs/qwtpolar/qwtpolar-1.1.1-r1.ebuild
index 205777e..3bc8857 100644
--- a/x11-libs/qwtpolar/qwtpolar-1.1.1-r1.ebuild
+++ b/x11-libs/qwtpolar/qwtpolar-1.1.1-r1.ebuild
@@ -26,8 +26,8 @@ DEPEND="${RDEPEND}"
 src_prepare() {
default
 
-   local qtplugindir=$(qt4_get_plugindir)
-   use qt5 && qtplugindir=$(qt5_get_plugindir)
+   local qtplugindir="${EPREFIX}$(qt4_get_plugindir)"
+   use qt5 && qtplugindir="${EPREFIX}$(qt5_get_plugindir)"
 
sed \
-e "/QWT_POLAR_INSTALL_PREFIX /s:=.*$:= ${EPREFIX}/usr:g" \

[gentoo-commits] repo/gentoo:master commit in: x11-libs/qwtpolar/

2017-01-22 Thread Andreas Sturmlechner 
commit: 709a2bdbc33dd23fe2973106af152b63da2e854d
Author: Andreas Sturmlechner  gentoo  org>
AuthorDate: Mon Jan 23 02:30:11 2017 +
Commit: Andreas Sturmlechner  gentoo  org>
CommitDate: Mon Jan 23 02:38:00 2017 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=709a2bdb

x11-libs/qwtpolar: Drop old (1.1.1-r0)

Gentoo-bug: 597458

Package-Manager: portage-2.3.0

 x11-libs/qwtpolar/Manifest  |  1 -
 x11-libs/qwtpolar/qwtpolar-1.1.1.ebuild | 41 -
 2 files changed, 42 deletions(-)

diff --git a/x11-libs/qwtpolar/Manifest b/x11-libs/qwtpolar/Manifest
index 15f6be2..f71a2a0 100644
--- a/x11-libs/qwtpolar/Manifest
+++ b/x11-libs/qwtpolar/Manifest
@@ -2,4 +2,3 @@ DIST qwtpolar-0.1.0.tar.bz2 768348 SHA256 
af08b0106b1f7187db02dfd7e36f59ad185fbe
 DIST qwtpolar-1.0.0.zip 636765 SHA256 
046cb0378134dbec76fc60435f93fe433c155087a03114eb1b96b605ee0e1e76 SHA512 
94536af39e3658d56758d201a29c2e0aaec109ca37b3f9a4e7e7722ea7f63f45e31026d112b384b8e75008c93d10a070ebaa85c0c745a7d11529f7d1de10d4ba
 WHIRLPOOL 
3c8a5d4ffbb8e4b9fc4cfbab3f7faaa1d7c16833c79b43633ded63f89f6efe80b2961985f0ce3d26ede52c48fae934a65616f5b18ecfd03b932225de6b0abae9
 DIST qwtpolar-1.1.0.zip 939175 SHA256 
21ba860195985bfcb4e54da6a48aba4f7db44f01a6f26bbe6ffa9123802b78df SHA512 
48bc5da93ed18aa83907651569245b77a6bce43e9e87d38f4531fecb20d74bdce4b0a18cee0722065637577cd73937ed8e3b5253df5262347ac382b1673233c0
 WHIRLPOOL 
ba09b46a9da8604feb55bee31d2d336fbe746f2c1b3fb44ec4356f50860d03c713e2049421669a0bf67656afc241e5153c8dd2619d3745b699bfae1316db641c
 DIST qwtpolar-1.1.1.tar.bz2 565546 SHA256 
6168baa9dbc8d527ae1ebf2631313291a1d545da268a05f4caa52ceadbe8b295 SHA512 
5b752e5426ae15740737277c2ba244cab947c54d573b4eedd1f54359b6eab1fa738d40f68f6c806106d01596eabc9f6d7ee825dde11a4925bebd643f42021621
 WHIRLPOOL 
e03906b22f06d6ea42ab0609d28a578be70c4d5c9a71d0cb00f40e2630f2868890085434e4f2833280db2c445eaefc16bfd321a3d4f5cc9e1538a608fd1d727b
-DIST qwtpolar-1.1.1.zip 939433 SHA256 
41a820400af25190bf6a1a49d49410f9bd8423fabde2f2028b52086b640b4e27 SHA512 
d3dfffa2f305be6ee51caf42fe08b5374d78a8916e91055974565b6dc7d7fe0b3fd166de06bc7a6c634a340a94abd27774186238c4a63096522b20576bccac67
 WHIRLPOOL 
2794b99fb613c1fe33056d107b11d1252a990c464230af57c844519fcb85e2ba60958d1937f8ea0244fdc7d7923a8d85617a2efe3ecb580e8624af1ca73288bd

diff --git a/x11-libs/qwtpolar/qwtpolar-1.1.1.ebuild 
b/x11-libs/qwtpolar/qwtpolar-1.1.1.ebuild
deleted file mode 100644
index 22512e4..
--- a/x11-libs/qwtpolar/qwtpolar-1.1.1.ebuild
+++ /dev/null
@@ -1,41 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-inherit multilib qt4-r2
-
-DESCRIPTION="Library for displaying values on a polar coordinate system"
-HOMEPAGE="http://qwtpolar.sourceforge.net/;
-SRC_URI="mirror://sourceforge/${PN}/${P}.zip"
-
-LICENSE="qwt"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND="x11-libs/qwt:6[svg]"
-DEPEND="${RDEPEND}
-   app-arch/unzip"
-
-src_prepare() {
-   sed \
-   -e "/QWT_POLAR_INSTALL_PREFIX /s:=.*$:= ${EPREFIX}/usr:g" \
-   -e "/QWT_POLAR_INSTALL_LIBS/s:lib:$(get_libdir):g" \
-   -e "/QWT_POLAR_INSTALL_DOCS/s:doc:share/doc/${PF}:g" \
-   -e "/QWT_POLAR_INSTALL_PLUGINS/s:=.*$:= 
${EPREFIX}/usr/$(get_libdir)/qt4/plugins/designer6/:g" \
-   -e "/QWT_POLAR_INSTALL_FEATURES/s:=.*$:= 
${EPREFIX}/usr/$(get_libdir)/qt4/plugins/features6/:g" \
-   -e "/= QwtPolarDesigner/ d" \
-   -e "/= QwtPolarExamples/d" \
-   -i ${PN}config.pri || die
-
-   sed \
-   -e "s:{QWT_POLAR_ROOT}/lib:{QWT_POLAR_ROOT}/$(get_libdir):" \
-   -i src/src.pro || die
-   echo "INCLUDEPATH += ${EPREFIX}/usr/include/qwt6" >> src/src.pro
-   cat >> designer/designer.pro <<- EOF
-   INCLUDEPATH += "${EPREFIX}"/usr/include/qwt6
-   LIBS += -L"${S}"/$(get_libdir)
-   EOF
-}

[gentoo-commits] repo/gentoo:master commit in: x11-libs/qwtpolar/

2017-01-22 Thread Andreas Sturmlechner 
commit: 7c6a005a245baf2bfa8baaa5bed8d258e17b98f9
Author: Andreas Sturmlechner  gentoo  org>
AuthorDate: Mon Jan 23 02:29:33 2017 +
Commit: Andreas Sturmlechner  gentoo  org>
CommitDate: Mon Jan 23 02:37:59 2017 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=7c6a005a

x11-libs/qwtpolar: Add USE=qt4,qt5 and fix DEPENDs, EAPI 6

Gentoo-bug: 597458

SRC_URI: Prefer upstream's tar.bz2
Switch to qmake-utils.

Package-Manager: portage-2.3.0

 x11-libs/qwtpolar/Manifest |  1 +
 x11-libs/qwtpolar/metadata.xml | 14 +++
 x11-libs/qwtpolar/qwtpolar-1.1.1-r1.ebuild | 63 ++
 3 files changed, 71 insertions(+), 7 deletions(-)

diff --git a/x11-libs/qwtpolar/Manifest b/x11-libs/qwtpolar/Manifest
index 7060a66..15f6be2 100644
--- a/x11-libs/qwtpolar/Manifest
+++ b/x11-libs/qwtpolar/Manifest
@@ -1,4 +1,5 @@
 DIST qwtpolar-0.1.0.tar.bz2 768348 SHA256 
af08b0106b1f7187db02dfd7e36f59ad185fbe72d72c62a6c91e9f492127a481 SHA512 
8a11a64d52547fd801a78874daa806540c5efa5828ee7783a1d468cc09667b1b87edcafa134b8c1b8c818c5bcb04f7e42ac836b10f165d002cc90e68294479f5
 WHIRLPOOL 
6ef7de2a2cf6df068e309fe0d1d60aba5f05fa2cf6733a4fd0df2205a1f029d8781623411a2100666102a51d64787a8154764a6719950881bfaf2840b5cf3b6a
 DIST qwtpolar-1.0.0.zip 636765 SHA256 
046cb0378134dbec76fc60435f93fe433c155087a03114eb1b96b605ee0e1e76 SHA512 
94536af39e3658d56758d201a29c2e0aaec109ca37b3f9a4e7e7722ea7f63f45e31026d112b384b8e75008c93d10a070ebaa85c0c745a7d11529f7d1de10d4ba
 WHIRLPOOL 
3c8a5d4ffbb8e4b9fc4cfbab3f7faaa1d7c16833c79b43633ded63f89f6efe80b2961985f0ce3d26ede52c48fae934a65616f5b18ecfd03b932225de6b0abae9
 DIST qwtpolar-1.1.0.zip 939175 SHA256 
21ba860195985bfcb4e54da6a48aba4f7db44f01a6f26bbe6ffa9123802b78df SHA512 
48bc5da93ed18aa83907651569245b77a6bce43e9e87d38f4531fecb20d74bdce4b0a18cee0722065637577cd73937ed8e3b5253df5262347ac382b1673233c0
 WHIRLPOOL 
ba09b46a9da8604feb55bee31d2d336fbe746f2c1b3fb44ec4356f50860d03c713e2049421669a0bf67656afc241e5153c8dd2619d3745b699bfae1316db641c
+DIST qwtpolar-1.1.1.tar.bz2 565546 SHA256 
6168baa9dbc8d527ae1ebf2631313291a1d545da268a05f4caa52ceadbe8b295 SHA512 
5b752e5426ae15740737277c2ba244cab947c54d573b4eedd1f54359b6eab1fa738d40f68f6c806106d01596eabc9f6d7ee825dde11a4925bebd643f42021621
 WHIRLPOOL 
e03906b22f06d6ea42ab0609d28a578be70c4d5c9a71d0cb00f40e2630f2868890085434e4f2833280db2c445eaefc16bfd321a3d4f5cc9e1538a608fd1d727b
 DIST qwtpolar-1.1.1.zip 939433 SHA256 
41a820400af25190bf6a1a49d49410f9bd8423fabde2f2028b52086b640b4e27 SHA512 
d3dfffa2f305be6ee51caf42fe08b5374d78a8916e91055974565b6dc7d7fe0b3fd166de06bc7a6c634a340a94abd27774186238c4a63096522b20576bccac67
 WHIRLPOOL 
2794b99fb613c1fe33056d107b11d1252a990c464230af57c844519fcb85e2ba60958d1937f8ea0244fdc7d7923a8d85617a2efe3ecb580e8624af1ca73288bd

diff --git a/x11-libs/qwtpolar/metadata.xml b/x11-libs/qwtpolar/metadata.xml
index 86b6ec2..5b5806a 100644
--- a/x11-libs/qwtpolar/metadata.xml
+++ b/x11-libs/qwtpolar/metadata.xml
@@ -1,11 +1,11 @@
 
 http://www.gentoo.org/dtd/metadata.dtd;>
 
-  
-sci-geoscien...@gentoo.org
-Gentoo Geosciences Project
-  
-  
-qwtpolar
-  
+   
+   sci-geoscien...@gentoo.org
+   Gentoo Geosciences Project
+   
+   
+   qwtpolar
+   
 

diff --git a/x11-libs/qwtpolar/qwtpolar-1.1.1-r1.ebuild 
b/x11-libs/qwtpolar/qwtpolar-1.1.1-r1.ebuild
new file mode 100644
index ..205777e
--- /dev/null
+++ b/x11-libs/qwtpolar/qwtpolar-1.1.1-r1.ebuild
@@ -0,0 +1,63 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=6
+
+inherit qmake-utils
+
+DESCRIPTION="Library for displaying values on a polar coordinate system"
+HOMEPAGE="http://qwtpolar.sourceforge.net/;
+SRC_URI="mirror://sourceforge/${PN}/${P}.tar.bz2"
+
+LICENSE="qwt"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="qt4 qt5"
+
+REQUIRED_USE="^^ ( qt4 qt5 )"
+
+RDEPEND="
+   qt4? ( x11-libs/qwt:6=[designer,qt4(+),svg] )
+   qt5? ( x11-libs/qwt:6=[designer,qt5,svg] )
+"
+DEPEND="${RDEPEND}"
+
+src_prepare() {
+   default
+
+   local qtplugindir=$(qt4_get_plugindir)
+   use qt5 && qtplugindir=$(qt5_get_plugindir)
+
+   sed \
+   -e "/QWT_POLAR_INSTALL_PREFIX /s:=.*$:= ${EPREFIX}/usr:g" \
+   -e "/QWT_POLAR_INSTALL_LIBS/s:lib:$(get_libdir):g" \
+   -e "/QWT_POLAR_INSTALL_DOCS/s:doc:share/doc/${PF}:g" \
+   -e "/QWT_POLAR_INSTALL_PLUGINS/s:=.*$:= 
${qtplugindir}/designer/:g" \
+   -e "/QWT_POLAR_INSTALL_FEATURES/s:=.*$:= 
${qtplugindir}/features/:g" \
+   -e "/= QwtPolarDesigner/ d" \
+   -e "/= QwtPolarExamples/d" \
+   -i ${PN}config.pri || die
+
+   sed \
+   -e "s:{QWT_POLAR_ROOT}/lib:{QWT_POLAR_ROOT}/$(get_libdir):" \
+   -i src/src.pro || die
+   echo "INCLUDEPATH += ${EPREFIX}/usr/include/qwt6" >> src/src.pro
+   cat