From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id A43A913835A for ; Mon, 9 Nov 2020 14:43:48 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id EE620E07F2; Mon, 9 Nov 2020 14:43:47 +0000 (UTC) Received: from smtp.gentoo.org (dev.gentoo.org [IPv6:2001:470:ea4a:1:5054:ff:fec7:86e4]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id E97F6E07F2 for ; Mon, 9 Nov 2020 14:43:46 +0000 (UTC) Received: from oystercatcher.gentoo.org (unknown [IPv6:2a01:4f8:202:4333:225:90ff:fed9:fc84]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id A9AC8340C7F for ; Mon, 9 Nov 2020 14:43:45 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id ACD063AB for ; Mon, 9 Nov 2020 14:43:43 +0000 (UTC) From: "Andrew Ammerlaan" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Andrew Ammerlaan" Message-ID: <1604932949.b965f892412b0b562939cbc533ddd6e32e534d92.andrewammerlaan@gentoo> Subject: [gentoo-commits] repo/proj/guru:master commit in: x11-libs/qwtplot3d/files/, x11-libs/qwt5-qt5/, x11-libs/qwtplot3d/ X-VCS-Repository: repo/proj/guru X-VCS-Files: x11-libs/qwt5-qt5/Manifest x11-libs/qwt5-qt5/metadata.xml x11-libs/qwt5-qt5/qwt5-qt5-5.2.3_p20200902.ebuild x11-libs/qwtplot3d/Manifest x11-libs/qwtplot3d/files/qwtplot3d-doxygen.patch x11-libs/qwtplot3d/files/qwtplot3d-examples.patch x11-libs/qwtplot3d/files/qwtplot3d-gcc44.patch x11-libs/qwtplot3d/files/qwtplot3d-profile.patch x11-libs/qwtplot3d/files/qwtplot3d-qt-4.8.0.patch x11-libs/qwtplot3d/files/qwtplot3d-sys-gl2ps.patch x11-libs/qwtplot3d/metadata.xml x11-libs/qwtplot3d/qwtplot3d-0.2.7.ebuild X-VCS-Directories: x11-libs/qwt5-qt5/ x11-libs/qwtplot3d/ x11-libs/qwtplot3d/files/ X-VCS-Committer: andrewammerlaan X-VCS-Committer-Name: Andrew Ammerlaan X-VCS-Revision: b965f892412b0b562939cbc533ddd6e32e534d92 X-VCS-Branch: master Date: Mon, 9 Nov 2020 14:43:43 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply X-Archives-Salt: 2c880d5a-205f-4bda-96a2-21a784959ac8 X-Archives-Hash: c4e4929e4fab39d2a79ad8b70591979e commit: b965f892412b0b562939cbc533ddd6e32e534d92 Author: Andrew Ammerlaan riseup net> AuthorDate: Mon Nov 9 14:42:29 2020 +0000 Commit: Andrew Ammerlaan riseup net> CommitDate: Mon Nov 9 14:42:29 2020 +0000 URL: https://gitweb.gentoo.org/repo/proj/guru.git/commit/?id=b965f892 x11-libs: qwt5-qt5 and qwtplot3d moved to ::science Package-Manager: Portage-3.0.9, Repoman-3.0.2 Signed-off-by: Andrew Ammerlaan riseup.net> x11-libs/qwt5-qt5/Manifest | 1 - x11-libs/qwt5-qt5/metadata.xml | 18 --- x11-libs/qwt5-qt5/qwt5-qt5-5.2.3_p20200902.ebuild | 88 --------------- x11-libs/qwtplot3d/Manifest | 1 - x11-libs/qwtplot3d/files/qwtplot3d-doxygen.patch | 28 ----- x11-libs/qwtplot3d/files/qwtplot3d-examples.patch | 125 --------------------- x11-libs/qwtplot3d/files/qwtplot3d-gcc44.patch | 12 -- x11-libs/qwtplot3d/files/qwtplot3d-profile.patch | 27 ----- x11-libs/qwtplot3d/files/qwtplot3d-qt-4.8.0.patch | 34 ------ x11-libs/qwtplot3d/files/qwtplot3d-sys-gl2ps.patch | 31 ----- x11-libs/qwtplot3d/metadata.xml | 16 --- x11-libs/qwtplot3d/qwtplot3d-0.2.7.ebuild | 66 ----------- 12 files changed, 447 deletions(-) diff --git a/x11-libs/qwt5-qt5/Manifest b/x11-libs/qwt5-qt5/Manifest deleted file mode 100644 index 643566d2..00000000 --- a/x11-libs/qwt5-qt5/Manifest +++ /dev/null @@ -1 +0,0 @@ -DIST qwt5-qt5-5.2.3_p20200902.tar.gz 2317623 BLAKE2B 5ac4333b01eac3a0b8b2f291804408679b8173ff624932d94e85a6789ad7f966417f80acba8c8d993465703e256c9ac7c675971cffac40d5f3b2becf0e7e7460 SHA512 1980f7e21684dba36c192a08e1a3bce719dcd7b1e700ce5f8a27821af83a65fe518d078888d6ad3733d3cde1c2af40cd694537ce0193d622d7f0b3bcee1ed55e diff --git a/x11-libs/qwt5-qt5/metadata.xml b/x11-libs/qwt5-qt5/metadata.xml deleted file mode 100644 index 1306bd77..00000000 --- a/x11-libs/qwt5-qt5/metadata.xml +++ /dev/null @@ -1,18 +0,0 @@ - - - - - andrewammerlaan@riseup.net - Andrew Ammerlaan - - - The Qwt library contains GUI Components and utility classes which are - primarily useful for programs with a technical background. - 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. - - - qwt - - diff --git a/x11-libs/qwt5-qt5/qwt5-qt5-5.2.3_p20200902.ebuild b/x11-libs/qwt5-qt5/qwt5-qt5-5.2.3_p20200902.ebuild deleted file mode 100644 index a489c2d8..00000000 --- a/x11-libs/qwt5-qt5/qwt5-qt5-5.2.3_p20200902.ebuild +++ /dev/null @@ -1,88 +0,0 @@ -# Copyright 1999-2020 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -inherit qmake-utils - -COMMIT="0052f96fdd6d5f021f20a1cfc4d2fcfc605941da" - -DESCRIPTION="2D plotting library for Qt5" -HOMEPAGE="https://qwt.sourceforge.io/ https://github.com/gbm19/qwt5-qt5" -SRC_URI="https://github.com/gbm19/qwt5-qt5/archive/${COMMIT}.tar.gz -> ${P}.tar.gz" - -LICENSE="qwt" -KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~x86" -SLOT="5" -IUSE="doc examples svg" - -RDEPEND=" - dev-qt/designer:5 - dev-qt/qtgui:5 - svg? ( dev-qt/qtsvg:5 ) -" -BDEPEND="doc? ( app-doc/doxygen )" - -DOCS=( CHANGES README ) - -S="${WORKDIR}/${PN}-${COMMIT}" - -src_prepare() { - default - sed -e "/QwtVersion/s:5.2.2.:${PV}:g" -i qwt.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 QwtDesigner - VERSION = ${PV} - QWT_VERSION = ${PV/_*} - QWT_INSTALL_PLUGINS = "${EPREFIX}/usr/$(get_libdir)/qt5/plugins/designer" - QWT_INSTALL_FEATURES = "${EPREFIX}/usr/share/qt5/mkspecs/features" - EOF - sed -i -e 's/headers doc/headers/' src/src.pro || die - use svg && echo >> qwtconfig.pri "CONFIG += QwtSVGItem" -} - -src_configure() { - eqmake5 -} - -src_compile() { - default - if use doc ; then - cd doc || die - doxygen Doxyfile || die "doxygen failed" - HTML_DOCS="doc/html" - fi -} - -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/qwt5 - doins -r examples - fi - - # avoid file conflict with qwt:6 - # https://github.com/gbm19/qwt5-qt5/issues/2 - pushd "${ED}/usr/share/man/man3/" - for f in *; do mv ${f} ${f//.3/.5qt5.3}; done - popd -} diff --git a/x11-libs/qwtplot3d/Manifest b/x11-libs/qwtplot3d/Manifest deleted file mode 100644 index c241a80a..00000000 --- a/x11-libs/qwtplot3d/Manifest +++ /dev/null @@ -1 +0,0 @@ -DIST qwtplot3d-0.2.7.tgz 183836 BLAKE2B f34fafdea591b2a1440321756872eb8f5580ccf8d5785eeeb6b32e1a4ee515b48ce2cf6e97462f69c2c82b83eebd90226b73d160e1e7027695024f590c4c1c6f SHA512 88e6d270695931775f3c1c0e718118e31118dbfe9f5f582834de09ab515fdf9e8a0f90d424f276653fdf1cf0b39e2060282385701a4ab48843420fe55a1dcf0c diff --git a/x11-libs/qwtplot3d/files/qwtplot3d-doxygen.patch b/x11-libs/qwtplot3d/files/qwtplot3d-doxygen.patch deleted file mode 100644 index b0632a38..00000000 --- a/x11-libs/qwtplot3d/files/qwtplot3d-doxygen.patch +++ /dev/null @@ -1,28 +0,0 @@ ---- qwtplot3d/doc/Doxyfile.doxygen.orig 2007-11-26 22:30:57.000000000 +0000 -+++ qwtplot3d/doc/Doxyfile.doxygen 2007-11-26 22:30:03.000000000 +0000 -@@ -116,7 +116,7 @@ - HTML_ALIGN_MEMBERS = YES - GENERATE_HTMLHELP = NO - CHM_FILE = qwtplot3d.chm --HHC_LOCATION = "c:\Programme\HTML Help Workshop\hhc.exe" -+#HHC_LOCATION = "c:\Programme\HTML Help Workshop\hhc.exe" - GENERATE_CHI = NO - BINARY_TOC = YES - TOC_EXPAND = YES -@@ -181,7 +181,7 @@ - MACRO_EXPANSION = NO - EXPAND_ONLY_PREDEF = NO - SEARCH_INCLUDES = YES --INCLUDE_PATH = V:/cvs/qwtplot3d/include/ -+INCLUDE_PATH = ../include - INCLUDE_FILE_PATTERNS = *.h - PREDEFINED = QWT3D_NOT_FOR_DOXYGEN \ - QT_VERSION=0x040000 -@@ -212,7 +212,6 @@ - GRAPHICAL_HIERARCHY = YES - DIRECTORY_GRAPH = YES - DOT_IMAGE_FORMAT = png --DOT_PATH = V:/graphviz/Graphviz/bin/ - DOTFILE_DIRS = - MAX_DOT_GRAPH_WIDTH = 974 - MAX_DOT_GRAPH_HEIGHT = 10000 diff --git a/x11-libs/qwtplot3d/files/qwtplot3d-examples.patch b/x11-libs/qwtplot3d/files/qwtplot3d-examples.patch deleted file mode 100644 index f142c337..00000000 --- a/x11-libs/qwtplot3d/files/qwtplot3d-examples.patch +++ /dev/null @@ -1,125 +0,0 @@ -diff -Nur qwtplot3d.orig/examples/axes/src/axesmainwindow.cpp qwtplot3d/examples/axes/src/axesmainwindow.cpp ---- qwtplot3d.orig/examples/axes/src/axesmainwindow.cpp 2007-11-26 22:16:54.000000000 +0000 -+++ qwtplot3d/examples/axes/src/axesmainwindow.cpp 2007-11-26 22:21:56.000000000 +0000 -@@ -9,7 +9,7 @@ - - #include "axes.h" - #include "axesmainwindow.h" --#include "../../../include/qwt3d_function.h" -+#include - - using namespace std; - using namespace Qwt3D; -diff -Nur qwtplot3d.orig/examples/common.pro qwtplot3d/examples/common.pro ---- qwtplot3d.orig/examples/common.pro 2007-11-26 22:16:54.000000000 +0000 -+++ qwtplot3d/examples/common.pro 2007-11-26 23:43:33.000000000 +0000 -@@ -1,13 +1,13 @@ - TEMPLATE = app --CONFIG += qt warn_on thread debug -+CONFIG += qt warn_on thread - UI_DIR = tmp - MOC_DIR = tmp - OBJECTS_DIR = tmp --INCLUDEPATH += ../../include -+INCLUDEPATH += /usr/include/qwtplot3d - DEPENDPATH = $$INCLUDEPATH - DESTDIR = ../bin - --unix:LIBS += -lqwtplot3d -L../../lib -+unix:LIBS += -lqwtplot3d - linux-g++:QMAKE_CXXFLAGS += -fno-exceptions - - win32{ -@@ -25,7 +25,7 @@ - ISQT4 = $$find(MYVERSION, ^[2-9]) - - !isEmpty( ISQT4 ) { --RESOURCES = ../images.qrc -+#RESOURCES = ../images.qrc - QT += opengl - } - -diff -Nur qwtplot3d.orig/examples/enrichments/src/enrichmentmainwindow.cpp qwtplot3d/examples/enrichments/src/enrichmentmainwindow.cpp ---- qwtplot3d.orig/examples/enrichments/src/enrichmentmainwindow.cpp 2007-11-26 22:16:54.000000000 +0000 -+++ qwtplot3d/examples/enrichments/src/enrichmentmainwindow.cpp 2007-11-26 22:22:48.000000000 +0000 -@@ -6,7 +6,7 @@ - - #include "enrichmentmainwindow.h" - #include "enrichments.h" --#include "../../../include/qwt3d_function.h" -+#include - - using namespace Qwt3D; - -diff -Nur qwtplot3d.orig/examples/mesh2/src/colormapreader.h qwtplot3d/examples/mesh2/src/colormapreader.h ---- qwtplot3d.orig/examples/mesh2/src/colormapreader.h 2007-11-26 22:16:54.000000000 +0000 -+++ qwtplot3d/examples/mesh2/src/colormapreader.h 2007-11-26 22:23:19.000000000 +0000 -@@ -5,7 +5,7 @@ - #include - #include - --#include "../../../include/qwt3d_types.h" -+#include - - #if QT_VERSION < 0x040000 - -diff -Nur qwtplot3d.orig/examples/mesh2/src/functions.h qwtplot3d/examples/mesh2/src/functions.h ---- qwtplot3d.orig/examples/mesh2/src/functions.h 2007-11-26 22:16:54.000000000 +0000 -+++ qwtplot3d/examples/mesh2/src/functions.h 2007-11-26 22:23:47.000000000 +0000 -@@ -2,8 +2,8 @@ - #define __EXAMPLE_H__ - - #include --#include "../../../include/qwt3d_parametricsurface.h" --#include "../../../include/qwt3d_function.h" -+#include -+#include - - using namespace Qwt3D; - -diff -Nur qwtplot3d.orig/examples/mesh2/src/lightingdlg.h qwtplot3d/examples/mesh2/src/lightingdlg.h ---- qwtplot3d.orig/examples/mesh2/src/lightingdlg.h 2007-11-26 22:16:54.000000000 +0000 -+++ qwtplot3d/examples/mesh2/src/lightingdlg.h 2007-11-26 22:24:41.000000000 +0000 -@@ -3,10 +3,10 @@ - - #include - #include --#include "../../../include/qwt3d_parametricsurface.h" --#include "../../../include/qwt3d_surfaceplot.h" --#include "../../../include/qwt3d_enrichment.h" --#include "../../../include/qwt3d_color.h" -+#include -+#include -+#include -+#include - - #if QT_VERSION < 0x040000 - #include "lightingdlgbase.h" -diff -Nur qwtplot3d.orig/examples/mesh2/src/mesh2mainwindow.cpp qwtplot3d/examples/mesh2/src/mesh2mainwindow.cpp ---- qwtplot3d.orig/examples/mesh2/src/mesh2mainwindow.cpp 2007-11-26 22:16:54.000000000 +0000 -+++ qwtplot3d/examples/mesh2/src/mesh2mainwindow.cpp 2007-11-26 22:25:33.000000000 +0000 -@@ -33,9 +33,9 @@ - #include "colormapreader.h" - #include "lightingdlg.h" - #include "femreader.h" --#include "../../../include/qwt3d_io.h" --#include "../../../include/qwt3d_io_gl2ps.h" --#include "../../../include/qwt3d_io_reader.h" -+#include -+#include -+#include - - using namespace Qwt3D; - using namespace std; -diff -Nur qwtplot3d.orig/examples/mesh2/src/mesh2mainwindow.h qwtplot3d/examples/mesh2/src/mesh2mainwindow.h ---- qwtplot3d.orig/examples/mesh2/src/mesh2mainwindow.h 2007-11-26 22:16:54.000000000 +0000 -+++ qwtplot3d/examples/mesh2/src/mesh2mainwindow.h 2007-11-26 22:26:09.000000000 +0000 -@@ -1,7 +1,7 @@ - #ifndef mesh2mainwindow_h__2004_03_07_13_38_begin_guarded_code - #define mesh2mainwindow_h__2004_03_07_13_38_begin_guarded_code - --#include "../../../include/qwt3d_surfaceplot.h" -+#include - - - #if QT_VERSION < 0x040000 diff --git a/x11-libs/qwtplot3d/files/qwtplot3d-gcc44.patch b/x11-libs/qwtplot3d/files/qwtplot3d-gcc44.patch deleted file mode 100644 index a76fe831..00000000 --- a/x11-libs/qwtplot3d/files/qwtplot3d-gcc44.patch +++ /dev/null @@ -1,12 +0,0 @@ -diff -ur qwtplot3d-orig/include/qwt3d_function.h qwtplot3d/include/qwt3d_function.h ---- qwtplot3d-orig/include/qwt3d_function.h 2009-07-25 18:18:58.000000000 -0400 -+++ qwtplot3d/include/qwt3d_function.h 2009-07-25 18:19:19.000000000 -0400 -@@ -2,6 +2,7 @@ - #define qwt3d_function_h__2004_03_05_13_51_begin_guarded_code - - #include "qwt3d_gridmapping.h" -+#include - - namespace Qwt3D - { -Only in qwtplot3d/tmp: qwt3d_function.o diff --git a/x11-libs/qwtplot3d/files/qwtplot3d-profile.patch b/x11-libs/qwtplot3d/files/qwtplot3d-profile.patch deleted file mode 100644 index 831ad558..00000000 --- a/x11-libs/qwtplot3d/files/qwtplot3d-profile.patch +++ /dev/null @@ -1,27 +0,0 @@ ---- qwtplot3d.orig/qwtplot3d.pro 2007-11-26 22:16:54.000000000 +0000 -+++ qwtplot3d/qwtplot3d.pro 2007-11-26 23:45:18.000000000 +0000 -@@ -3,7 +3,7 @@ - - TARGET = qwtplot3d - TEMPLATE = lib --CONFIG += qt warn_on opengl thread zlib debug -+CONFIG += qt warn_on opengl thread zlib - MOC_DIR = tmp - OBJECTS_DIR = tmp - INCLUDEPATH = include -@@ -21,7 +21,7 @@ - win32:CONFIG -= zlib - - linux-g++:TMAKE_CXXFLAGS += -fno-exceptions --unix:VERSION = 0.2.6 -+unix:VERSION = 0.2.7 - - # Input - SOURCES += src/qwt3d_axis.cpp \ -@@ -92,4 +92,4 @@ - DEFINES += GL2PS_HAVE_ZLIB - win32:LIBS += zlib.lib - unix:LIBS += -lz --} -\ No newline at end of file -+} diff --git a/x11-libs/qwtplot3d/files/qwtplot3d-qt-4.8.0.patch b/x11-libs/qwtplot3d/files/qwtplot3d-qt-4.8.0.patch deleted file mode 100644 index ae10f48f..00000000 --- a/x11-libs/qwtplot3d/files/qwtplot3d-qt-4.8.0.patch +++ /dev/null @@ -1,34 +0,0 @@ -diff -urbN qwtplot3d/include/qwt3d_io_gl2ps.h qwtplot3d.patched/include/qwt3d_io_gl2ps.h ---- qwtplot3d/include/qwt3d_io_gl2ps.h 2005-07-10 16:54:52.000000000 +0300 -+++ qwtplot3d.patched/include/qwt3d_io_gl2ps.h 2012-01-21 22:15:20.000000000 +0200 -@@ -2,12 +2,7 @@ - #define qwt3d_io_gl2ps_h__2004_05_07_01_16_begin_guarded_code - - #include -- --#if QT_VERSION < 0x040000 --#include --#else --#include --#endif -+#include - - #include "qwt3d_types.h" - #include "qwt3d_io.h" -diff -urbN qwtplot3d/include/qwt3d_openglhelper.h qwtplot3d.patched/include/qwt3d_openglhelper.h ---- qwtplot3d/include/qwt3d_openglhelper.h 2005-07-19 17:40:28.000000000 +0300 -+++ qwtplot3d.patched/include/qwt3d_openglhelper.h 2012-01-21 22:29:56.000000000 +0200 -@@ -2,11 +2,8 @@ - #define __openglhelper_2003_06_06_15_49__ - - #include "qglobal.h" --#if QT_VERSION < 0x040000 --#include --#else --#include --#endif -+#include -+#include - - namespace Qwt3D - { diff --git a/x11-libs/qwtplot3d/files/qwtplot3d-sys-gl2ps.patch b/x11-libs/qwtplot3d/files/qwtplot3d-sys-gl2ps.patch deleted file mode 100644 index 81a77e13..00000000 --- a/x11-libs/qwtplot3d/files/qwtplot3d-sys-gl2ps.patch +++ /dev/null @@ -1,31 +0,0 @@ ---- qwtplot3d.pro.orig 2009-04-07 19:45:29.985645378 +0100 -+++ qwtplot3d.pro 2009-04-07 19:46:50.095747068 +0100 -@@ -80,13 +80,11 @@ - include/qwt3d_graphplot.h \ - include/qwt3d_multiplot.h - --# gl2ps support --HEADERS+=3rdparty/gl2ps/gl2ps.h \ -- include/qwt3d_io_gl2ps.h -+# gl2ps support taken from system libs -+HEADERS+=include/qwt3d_io_gl2ps.h - --SOURCES+=src/qwt3d_io_gl2ps.cpp \ -- 3rdparty/gl2ps/gl2ps.c -- -+SOURCES+=src/qwt3d_io_gl2ps.cpp -+unix:LIBS += -lgl2ps - # zlib support for gl2ps - zlib { - DEFINES += GL2PS_HAVE_ZLIB ---- src/qwt3d_io_gl2ps.cpp.orig 2009-04-07 19:44:38.536418391 +0100 -+++ src/qwt3d_io_gl2ps.cpp 2009-04-07 19:45:03.685133854 +0100 -@@ -4,7 +4,7 @@ - - #include - #include "qwt3d_openglhelper.h" --#include "../3rdparty/gl2ps/gl2ps.h" -+#include - #include "qwt3d_io_gl2ps.h" - #include "qwt3d_plot.h" - diff --git a/x11-libs/qwtplot3d/metadata.xml b/x11-libs/qwtplot3d/metadata.xml deleted file mode 100644 index ec1b8160..00000000 --- a/x11-libs/qwtplot3d/metadata.xml +++ /dev/null @@ -1,16 +0,0 @@ - - - - - andrewammerlaan@riseup.net - Andrew Ammerlaan - - - QwtPlot3D is a graphics extension to the Qt GUI application framework. - It provides a 3D plotting widget for scientific data and mathematical expressions. - It compares to the existing Qwt Project. - - - qwtplot3d - - diff --git a/x11-libs/qwtplot3d/qwtplot3d-0.2.7.ebuild b/x11-libs/qwtplot3d/qwtplot3d-0.2.7.ebuild deleted file mode 100644 index 0af3aa76..00000000 --- a/x11-libs/qwtplot3d/qwtplot3d-0.2.7.ebuild +++ /dev/null @@ -1,66 +0,0 @@ -# Copyright 1999-2020 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -inherit qmake-utils - -DESCRIPTION="3D plotting library for Qt5" -HOMEPAGE="http://qwtplot3d.sourceforge.net/" -SRC_URI="mirror://sourceforge/${PN}/${P}.tgz" - -LICENSE="ZLIB" -KEYWORDS="~amd64 ~x86" -SLOT="0" - -IUSE="doc examples" - -RDEPEND=" - dev-qt/qtgui:5 - dev-qt/qtopengl:5 - x11-libs/gl2ps -" -BDEPEND="doc? ( app-doc/doxygen )" - -S="${WORKDIR}/${PN}" - -PATCHES=( - "${FILESDIR}/${PN}-profile.patch" - "${FILESDIR}/${PN}-examples.patch" - "${FILESDIR}/${PN}-doxygen.patch" - "${FILESDIR}/${PN}-gcc44.patch" - "${FILESDIR}/${PN}-qt-4.8.0.patch" -) - -src_prepare() { - default - eapply -p0 "${FILESDIR}/${PN}-sys-gl2ps.patch" - cat >> ${PN}.pro <<-EOF - target.path = "${EPREFIX}/usr/$(get_libdir)" - headers.path = "${EPREFIX}/usr/include/${PN}" - headers.files = \$\$HEADERS - INSTALLS = target headers - EOF -} - -src_configure() { - eqmake5 -} - -src_compile() { - default - if use doc ; then - cd doc || die - doxygen Doxyfile.doxygen || die "doxygen failed" - HTML_DOCS="doc/web/doxygen/" - fi -} - -src_install () { - emake INSTALL_ROOT="${D}" install || die "install failed" - einstalldocs - if use examples; then - insinto /usr/share/${PN} - doins -r examples - fi -} From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id 95ACA138359 for ; Mon, 9 Nov 2020 14:43:41 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id B94D8E07D8; Mon, 9 Nov 2020 14:43:40 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 89320E07D7 for ; Mon, 9 Nov 2020 14:43:40 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id D83A7340A60 for ; Mon, 9 Nov 2020 14:43:38 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 2356E3AB for ; Mon, 9 Nov 2020 14:43:37 +0000 (UTC) From: "Andrew Ammerlaan" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Andrew Ammerlaan" Message-ID: <1604932949.b965f892412b0b562939cbc533ddd6e32e534d92.andrewammerlaan@gentoo> Subject: [gentoo-commits] repo/proj/guru:dev commit in: x11-libs/qwt5-qt5/, x11-libs/qwtplot3d/files/, x11-libs/qwtplot3d/ X-VCS-Repository: repo/proj/guru X-VCS-Files: x11-libs/qwt5-qt5/Manifest x11-libs/qwt5-qt5/metadata.xml x11-libs/qwt5-qt5/qwt5-qt5-5.2.3_p20200902.ebuild x11-libs/qwtplot3d/Manifest x11-libs/qwtplot3d/files/qwtplot3d-doxygen.patch x11-libs/qwtplot3d/files/qwtplot3d-examples.patch x11-libs/qwtplot3d/files/qwtplot3d-gcc44.patch x11-libs/qwtplot3d/files/qwtplot3d-profile.patch x11-libs/qwtplot3d/files/qwtplot3d-qt-4.8.0.patch x11-libs/qwtplot3d/files/qwtplot3d-sys-gl2ps.patch x11-libs/qwtplot3d/metadata.xml x11-libs/qwtplot3d/qwtplot3d-0.2.7.ebuild X-VCS-Directories: x11-libs/qwtplot3d/files/ x11-libs/qwt5-qt5/ x11-libs/qwtplot3d/ X-VCS-Committer: andrewammerlaan X-VCS-Committer-Name: Andrew Ammerlaan X-VCS-Revision: b965f892412b0b562939cbc533ddd6e32e534d92 X-VCS-Branch: dev Date: Mon, 9 Nov 2020 14:43:37 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply X-Archives-Salt: cefe8043-3e0a-4638-a389-f27d69357b73 X-Archives-Hash: c28aedee0cbdc3a2f056c976d52d29e6 Message-ID: <20201109144337.vsdXa76kpT3POCq_nlzXQrCq3w9dfrQ4_BVbfktKTKw@z> commit: b965f892412b0b562939cbc533ddd6e32e534d92 Author: Andrew Ammerlaan riseup net> AuthorDate: Mon Nov 9 14:42:29 2020 +0000 Commit: Andrew Ammerlaan riseup net> CommitDate: Mon Nov 9 14:42:29 2020 +0000 URL: https://gitweb.gentoo.org/repo/proj/guru.git/commit/?id=b965f892 x11-libs: qwt5-qt5 and qwtplot3d moved to ::science Package-Manager: Portage-3.0.9, Repoman-3.0.2 Signed-off-by: Andrew Ammerlaan riseup.net> x11-libs/qwt5-qt5/Manifest | 1 - x11-libs/qwt5-qt5/metadata.xml | 18 --- x11-libs/qwt5-qt5/qwt5-qt5-5.2.3_p20200902.ebuild | 88 --------------- x11-libs/qwtplot3d/Manifest | 1 - x11-libs/qwtplot3d/files/qwtplot3d-doxygen.patch | 28 ----- x11-libs/qwtplot3d/files/qwtplot3d-examples.patch | 125 --------------------- x11-libs/qwtplot3d/files/qwtplot3d-gcc44.patch | 12 -- x11-libs/qwtplot3d/files/qwtplot3d-profile.patch | 27 ----- x11-libs/qwtplot3d/files/qwtplot3d-qt-4.8.0.patch | 34 ------ x11-libs/qwtplot3d/files/qwtplot3d-sys-gl2ps.patch | 31 ----- x11-libs/qwtplot3d/metadata.xml | 16 --- x11-libs/qwtplot3d/qwtplot3d-0.2.7.ebuild | 66 ----------- 12 files changed, 447 deletions(-) diff --git a/x11-libs/qwt5-qt5/Manifest b/x11-libs/qwt5-qt5/Manifest deleted file mode 100644 index 643566d2..00000000 --- a/x11-libs/qwt5-qt5/Manifest +++ /dev/null @@ -1 +0,0 @@ -DIST qwt5-qt5-5.2.3_p20200902.tar.gz 2317623 BLAKE2B 5ac4333b01eac3a0b8b2f291804408679b8173ff624932d94e85a6789ad7f966417f80acba8c8d993465703e256c9ac7c675971cffac40d5f3b2becf0e7e7460 SHA512 1980f7e21684dba36c192a08e1a3bce719dcd7b1e700ce5f8a27821af83a65fe518d078888d6ad3733d3cde1c2af40cd694537ce0193d622d7f0b3bcee1ed55e diff --git a/x11-libs/qwt5-qt5/metadata.xml b/x11-libs/qwt5-qt5/metadata.xml deleted file mode 100644 index 1306bd77..00000000 --- a/x11-libs/qwt5-qt5/metadata.xml +++ /dev/null @@ -1,18 +0,0 @@ - - - - - andrewammerlaan@riseup.net - Andrew Ammerlaan - - - The Qwt library contains GUI Components and utility classes which are - primarily useful for programs with a technical background. - 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. - - - qwt - - diff --git a/x11-libs/qwt5-qt5/qwt5-qt5-5.2.3_p20200902.ebuild b/x11-libs/qwt5-qt5/qwt5-qt5-5.2.3_p20200902.ebuild deleted file mode 100644 index a489c2d8..00000000 --- a/x11-libs/qwt5-qt5/qwt5-qt5-5.2.3_p20200902.ebuild +++ /dev/null @@ -1,88 +0,0 @@ -# Copyright 1999-2020 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -inherit qmake-utils - -COMMIT="0052f96fdd6d5f021f20a1cfc4d2fcfc605941da" - -DESCRIPTION="2D plotting library for Qt5" -HOMEPAGE="https://qwt.sourceforge.io/ https://github.com/gbm19/qwt5-qt5" -SRC_URI="https://github.com/gbm19/qwt5-qt5/archive/${COMMIT}.tar.gz -> ${P}.tar.gz" - -LICENSE="qwt" -KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~x86" -SLOT="5" -IUSE="doc examples svg" - -RDEPEND=" - dev-qt/designer:5 - dev-qt/qtgui:5 - svg? ( dev-qt/qtsvg:5 ) -" -BDEPEND="doc? ( app-doc/doxygen )" - -DOCS=( CHANGES README ) - -S="${WORKDIR}/${PN}-${COMMIT}" - -src_prepare() { - default - sed -e "/QwtVersion/s:5.2.2.:${PV}:g" -i qwt.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 QwtDesigner - VERSION = ${PV} - QWT_VERSION = ${PV/_*} - QWT_INSTALL_PLUGINS = "${EPREFIX}/usr/$(get_libdir)/qt5/plugins/designer" - QWT_INSTALL_FEATURES = "${EPREFIX}/usr/share/qt5/mkspecs/features" - EOF - sed -i -e 's/headers doc/headers/' src/src.pro || die - use svg && echo >> qwtconfig.pri "CONFIG += QwtSVGItem" -} - -src_configure() { - eqmake5 -} - -src_compile() { - default - if use doc ; then - cd doc || die - doxygen Doxyfile || die "doxygen failed" - HTML_DOCS="doc/html" - fi -} - -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/qwt5 - doins -r examples - fi - - # avoid file conflict with qwt:6 - # https://github.com/gbm19/qwt5-qt5/issues/2 - pushd "${ED}/usr/share/man/man3/" - for f in *; do mv ${f} ${f//.3/.5qt5.3}; done - popd -} diff --git a/x11-libs/qwtplot3d/Manifest b/x11-libs/qwtplot3d/Manifest deleted file mode 100644 index c241a80a..00000000 --- a/x11-libs/qwtplot3d/Manifest +++ /dev/null @@ -1 +0,0 @@ -DIST qwtplot3d-0.2.7.tgz 183836 BLAKE2B f34fafdea591b2a1440321756872eb8f5580ccf8d5785eeeb6b32e1a4ee515b48ce2cf6e97462f69c2c82b83eebd90226b73d160e1e7027695024f590c4c1c6f SHA512 88e6d270695931775f3c1c0e718118e31118dbfe9f5f582834de09ab515fdf9e8a0f90d424f276653fdf1cf0b39e2060282385701a4ab48843420fe55a1dcf0c diff --git a/x11-libs/qwtplot3d/files/qwtplot3d-doxygen.patch b/x11-libs/qwtplot3d/files/qwtplot3d-doxygen.patch deleted file mode 100644 index b0632a38..00000000 --- a/x11-libs/qwtplot3d/files/qwtplot3d-doxygen.patch +++ /dev/null @@ -1,28 +0,0 @@ ---- qwtplot3d/doc/Doxyfile.doxygen.orig 2007-11-26 22:30:57.000000000 +0000 -+++ qwtplot3d/doc/Doxyfile.doxygen 2007-11-26 22:30:03.000000000 +0000 -@@ -116,7 +116,7 @@ - HTML_ALIGN_MEMBERS = YES - GENERATE_HTMLHELP = NO - CHM_FILE = qwtplot3d.chm --HHC_LOCATION = "c:\Programme\HTML Help Workshop\hhc.exe" -+#HHC_LOCATION = "c:\Programme\HTML Help Workshop\hhc.exe" - GENERATE_CHI = NO - BINARY_TOC = YES - TOC_EXPAND = YES -@@ -181,7 +181,7 @@ - MACRO_EXPANSION = NO - EXPAND_ONLY_PREDEF = NO - SEARCH_INCLUDES = YES --INCLUDE_PATH = V:/cvs/qwtplot3d/include/ -+INCLUDE_PATH = ../include - INCLUDE_FILE_PATTERNS = *.h - PREDEFINED = QWT3D_NOT_FOR_DOXYGEN \ - QT_VERSION=0x040000 -@@ -212,7 +212,6 @@ - GRAPHICAL_HIERARCHY = YES - DIRECTORY_GRAPH = YES - DOT_IMAGE_FORMAT = png --DOT_PATH = V:/graphviz/Graphviz/bin/ - DOTFILE_DIRS = - MAX_DOT_GRAPH_WIDTH = 974 - MAX_DOT_GRAPH_HEIGHT = 10000 diff --git a/x11-libs/qwtplot3d/files/qwtplot3d-examples.patch b/x11-libs/qwtplot3d/files/qwtplot3d-examples.patch deleted file mode 100644 index f142c337..00000000 --- a/x11-libs/qwtplot3d/files/qwtplot3d-examples.patch +++ /dev/null @@ -1,125 +0,0 @@ -diff -Nur qwtplot3d.orig/examples/axes/src/axesmainwindow.cpp qwtplot3d/examples/axes/src/axesmainwindow.cpp ---- qwtplot3d.orig/examples/axes/src/axesmainwindow.cpp 2007-11-26 22:16:54.000000000 +0000 -+++ qwtplot3d/examples/axes/src/axesmainwindow.cpp 2007-11-26 22:21:56.000000000 +0000 -@@ -9,7 +9,7 @@ - - #include "axes.h" - #include "axesmainwindow.h" --#include "../../../include/qwt3d_function.h" -+#include - - using namespace std; - using namespace Qwt3D; -diff -Nur qwtplot3d.orig/examples/common.pro qwtplot3d/examples/common.pro ---- qwtplot3d.orig/examples/common.pro 2007-11-26 22:16:54.000000000 +0000 -+++ qwtplot3d/examples/common.pro 2007-11-26 23:43:33.000000000 +0000 -@@ -1,13 +1,13 @@ - TEMPLATE = app --CONFIG += qt warn_on thread debug -+CONFIG += qt warn_on thread - UI_DIR = tmp - MOC_DIR = tmp - OBJECTS_DIR = tmp --INCLUDEPATH += ../../include -+INCLUDEPATH += /usr/include/qwtplot3d - DEPENDPATH = $$INCLUDEPATH - DESTDIR = ../bin - --unix:LIBS += -lqwtplot3d -L../../lib -+unix:LIBS += -lqwtplot3d - linux-g++:QMAKE_CXXFLAGS += -fno-exceptions - - win32{ -@@ -25,7 +25,7 @@ - ISQT4 = $$find(MYVERSION, ^[2-9]) - - !isEmpty( ISQT4 ) { --RESOURCES = ../images.qrc -+#RESOURCES = ../images.qrc - QT += opengl - } - -diff -Nur qwtplot3d.orig/examples/enrichments/src/enrichmentmainwindow.cpp qwtplot3d/examples/enrichments/src/enrichmentmainwindow.cpp ---- qwtplot3d.orig/examples/enrichments/src/enrichmentmainwindow.cpp 2007-11-26 22:16:54.000000000 +0000 -+++ qwtplot3d/examples/enrichments/src/enrichmentmainwindow.cpp 2007-11-26 22:22:48.000000000 +0000 -@@ -6,7 +6,7 @@ - - #include "enrichmentmainwindow.h" - #include "enrichments.h" --#include "../../../include/qwt3d_function.h" -+#include - - using namespace Qwt3D; - -diff -Nur qwtplot3d.orig/examples/mesh2/src/colormapreader.h qwtplot3d/examples/mesh2/src/colormapreader.h ---- qwtplot3d.orig/examples/mesh2/src/colormapreader.h 2007-11-26 22:16:54.000000000 +0000 -+++ qwtplot3d/examples/mesh2/src/colormapreader.h 2007-11-26 22:23:19.000000000 +0000 -@@ -5,7 +5,7 @@ - #include - #include - --#include "../../../include/qwt3d_types.h" -+#include - - #if QT_VERSION < 0x040000 - -diff -Nur qwtplot3d.orig/examples/mesh2/src/functions.h qwtplot3d/examples/mesh2/src/functions.h ---- qwtplot3d.orig/examples/mesh2/src/functions.h 2007-11-26 22:16:54.000000000 +0000 -+++ qwtplot3d/examples/mesh2/src/functions.h 2007-11-26 22:23:47.000000000 +0000 -@@ -2,8 +2,8 @@ - #define __EXAMPLE_H__ - - #include --#include "../../../include/qwt3d_parametricsurface.h" --#include "../../../include/qwt3d_function.h" -+#include -+#include - - using namespace Qwt3D; - -diff -Nur qwtplot3d.orig/examples/mesh2/src/lightingdlg.h qwtplot3d/examples/mesh2/src/lightingdlg.h ---- qwtplot3d.orig/examples/mesh2/src/lightingdlg.h 2007-11-26 22:16:54.000000000 +0000 -+++ qwtplot3d/examples/mesh2/src/lightingdlg.h 2007-11-26 22:24:41.000000000 +0000 -@@ -3,10 +3,10 @@ - - #include - #include --#include "../../../include/qwt3d_parametricsurface.h" --#include "../../../include/qwt3d_surfaceplot.h" --#include "../../../include/qwt3d_enrichment.h" --#include "../../../include/qwt3d_color.h" -+#include -+#include -+#include -+#include - - #if QT_VERSION < 0x040000 - #include "lightingdlgbase.h" -diff -Nur qwtplot3d.orig/examples/mesh2/src/mesh2mainwindow.cpp qwtplot3d/examples/mesh2/src/mesh2mainwindow.cpp ---- qwtplot3d.orig/examples/mesh2/src/mesh2mainwindow.cpp 2007-11-26 22:16:54.000000000 +0000 -+++ qwtplot3d/examples/mesh2/src/mesh2mainwindow.cpp 2007-11-26 22:25:33.000000000 +0000 -@@ -33,9 +33,9 @@ - #include "colormapreader.h" - #include "lightingdlg.h" - #include "femreader.h" --#include "../../../include/qwt3d_io.h" --#include "../../../include/qwt3d_io_gl2ps.h" --#include "../../../include/qwt3d_io_reader.h" -+#include -+#include -+#include - - using namespace Qwt3D; - using namespace std; -diff -Nur qwtplot3d.orig/examples/mesh2/src/mesh2mainwindow.h qwtplot3d/examples/mesh2/src/mesh2mainwindow.h ---- qwtplot3d.orig/examples/mesh2/src/mesh2mainwindow.h 2007-11-26 22:16:54.000000000 +0000 -+++ qwtplot3d/examples/mesh2/src/mesh2mainwindow.h 2007-11-26 22:26:09.000000000 +0000 -@@ -1,7 +1,7 @@ - #ifndef mesh2mainwindow_h__2004_03_07_13_38_begin_guarded_code - #define mesh2mainwindow_h__2004_03_07_13_38_begin_guarded_code - --#include "../../../include/qwt3d_surfaceplot.h" -+#include - - - #if QT_VERSION < 0x040000 diff --git a/x11-libs/qwtplot3d/files/qwtplot3d-gcc44.patch b/x11-libs/qwtplot3d/files/qwtplot3d-gcc44.patch deleted file mode 100644 index a76fe831..00000000 --- a/x11-libs/qwtplot3d/files/qwtplot3d-gcc44.patch +++ /dev/null @@ -1,12 +0,0 @@ -diff -ur qwtplot3d-orig/include/qwt3d_function.h qwtplot3d/include/qwt3d_function.h ---- qwtplot3d-orig/include/qwt3d_function.h 2009-07-25 18:18:58.000000000 -0400 -+++ qwtplot3d/include/qwt3d_function.h 2009-07-25 18:19:19.000000000 -0400 -@@ -2,6 +2,7 @@ - #define qwt3d_function_h__2004_03_05_13_51_begin_guarded_code - - #include "qwt3d_gridmapping.h" -+#include - - namespace Qwt3D - { -Only in qwtplot3d/tmp: qwt3d_function.o diff --git a/x11-libs/qwtplot3d/files/qwtplot3d-profile.patch b/x11-libs/qwtplot3d/files/qwtplot3d-profile.patch deleted file mode 100644 index 831ad558..00000000 --- a/x11-libs/qwtplot3d/files/qwtplot3d-profile.patch +++ /dev/null @@ -1,27 +0,0 @@ ---- qwtplot3d.orig/qwtplot3d.pro 2007-11-26 22:16:54.000000000 +0000 -+++ qwtplot3d/qwtplot3d.pro 2007-11-26 23:45:18.000000000 +0000 -@@ -3,7 +3,7 @@ - - TARGET = qwtplot3d - TEMPLATE = lib --CONFIG += qt warn_on opengl thread zlib debug -+CONFIG += qt warn_on opengl thread zlib - MOC_DIR = tmp - OBJECTS_DIR = tmp - INCLUDEPATH = include -@@ -21,7 +21,7 @@ - win32:CONFIG -= zlib - - linux-g++:TMAKE_CXXFLAGS += -fno-exceptions --unix:VERSION = 0.2.6 -+unix:VERSION = 0.2.7 - - # Input - SOURCES += src/qwt3d_axis.cpp \ -@@ -92,4 +92,4 @@ - DEFINES += GL2PS_HAVE_ZLIB - win32:LIBS += zlib.lib - unix:LIBS += -lz --} -\ No newline at end of file -+} diff --git a/x11-libs/qwtplot3d/files/qwtplot3d-qt-4.8.0.patch b/x11-libs/qwtplot3d/files/qwtplot3d-qt-4.8.0.patch deleted file mode 100644 index ae10f48f..00000000 --- a/x11-libs/qwtplot3d/files/qwtplot3d-qt-4.8.0.patch +++ /dev/null @@ -1,34 +0,0 @@ -diff -urbN qwtplot3d/include/qwt3d_io_gl2ps.h qwtplot3d.patched/include/qwt3d_io_gl2ps.h ---- qwtplot3d/include/qwt3d_io_gl2ps.h 2005-07-10 16:54:52.000000000 +0300 -+++ qwtplot3d.patched/include/qwt3d_io_gl2ps.h 2012-01-21 22:15:20.000000000 +0200 -@@ -2,12 +2,7 @@ - #define qwt3d_io_gl2ps_h__2004_05_07_01_16_begin_guarded_code - - #include -- --#if QT_VERSION < 0x040000 --#include --#else --#include --#endif -+#include - - #include "qwt3d_types.h" - #include "qwt3d_io.h" -diff -urbN qwtplot3d/include/qwt3d_openglhelper.h qwtplot3d.patched/include/qwt3d_openglhelper.h ---- qwtplot3d/include/qwt3d_openglhelper.h 2005-07-19 17:40:28.000000000 +0300 -+++ qwtplot3d.patched/include/qwt3d_openglhelper.h 2012-01-21 22:29:56.000000000 +0200 -@@ -2,11 +2,8 @@ - #define __openglhelper_2003_06_06_15_49__ - - #include "qglobal.h" --#if QT_VERSION < 0x040000 --#include --#else --#include --#endif -+#include -+#include - - namespace Qwt3D - { diff --git a/x11-libs/qwtplot3d/files/qwtplot3d-sys-gl2ps.patch b/x11-libs/qwtplot3d/files/qwtplot3d-sys-gl2ps.patch deleted file mode 100644 index 81a77e13..00000000 --- a/x11-libs/qwtplot3d/files/qwtplot3d-sys-gl2ps.patch +++ /dev/null @@ -1,31 +0,0 @@ ---- qwtplot3d.pro.orig 2009-04-07 19:45:29.985645378 +0100 -+++ qwtplot3d.pro 2009-04-07 19:46:50.095747068 +0100 -@@ -80,13 +80,11 @@ - include/qwt3d_graphplot.h \ - include/qwt3d_multiplot.h - --# gl2ps support --HEADERS+=3rdparty/gl2ps/gl2ps.h \ -- include/qwt3d_io_gl2ps.h -+# gl2ps support taken from system libs -+HEADERS+=include/qwt3d_io_gl2ps.h - --SOURCES+=src/qwt3d_io_gl2ps.cpp \ -- 3rdparty/gl2ps/gl2ps.c -- -+SOURCES+=src/qwt3d_io_gl2ps.cpp -+unix:LIBS += -lgl2ps - # zlib support for gl2ps - zlib { - DEFINES += GL2PS_HAVE_ZLIB ---- src/qwt3d_io_gl2ps.cpp.orig 2009-04-07 19:44:38.536418391 +0100 -+++ src/qwt3d_io_gl2ps.cpp 2009-04-07 19:45:03.685133854 +0100 -@@ -4,7 +4,7 @@ - - #include - #include "qwt3d_openglhelper.h" --#include "../3rdparty/gl2ps/gl2ps.h" -+#include - #include "qwt3d_io_gl2ps.h" - #include "qwt3d_plot.h" - diff --git a/x11-libs/qwtplot3d/metadata.xml b/x11-libs/qwtplot3d/metadata.xml deleted file mode 100644 index ec1b8160..00000000 --- a/x11-libs/qwtplot3d/metadata.xml +++ /dev/null @@ -1,16 +0,0 @@ - - - - - andrewammerlaan@riseup.net - Andrew Ammerlaan - - - QwtPlot3D is a graphics extension to the Qt GUI application framework. - It provides a 3D plotting widget for scientific data and mathematical expressions. - It compares to the existing Qwt Project. - - - qwtplot3d - - diff --git a/x11-libs/qwtplot3d/qwtplot3d-0.2.7.ebuild b/x11-libs/qwtplot3d/qwtplot3d-0.2.7.ebuild deleted file mode 100644 index 0af3aa76..00000000 --- a/x11-libs/qwtplot3d/qwtplot3d-0.2.7.ebuild +++ /dev/null @@ -1,66 +0,0 @@ -# Copyright 1999-2020 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -inherit qmake-utils - -DESCRIPTION="3D plotting library for Qt5" -HOMEPAGE="http://qwtplot3d.sourceforge.net/" -SRC_URI="mirror://sourceforge/${PN}/${P}.tgz" - -LICENSE="ZLIB" -KEYWORDS="~amd64 ~x86" -SLOT="0" - -IUSE="doc examples" - -RDEPEND=" - dev-qt/qtgui:5 - dev-qt/qtopengl:5 - x11-libs/gl2ps -" -BDEPEND="doc? ( app-doc/doxygen )" - -S="${WORKDIR}/${PN}" - -PATCHES=( - "${FILESDIR}/${PN}-profile.patch" - "${FILESDIR}/${PN}-examples.patch" - "${FILESDIR}/${PN}-doxygen.patch" - "${FILESDIR}/${PN}-gcc44.patch" - "${FILESDIR}/${PN}-qt-4.8.0.patch" -) - -src_prepare() { - default - eapply -p0 "${FILESDIR}/${PN}-sys-gl2ps.patch" - cat >> ${PN}.pro <<-EOF - target.path = "${EPREFIX}/usr/$(get_libdir)" - headers.path = "${EPREFIX}/usr/include/${PN}" - headers.files = \$\$HEADERS - INSTALLS = target headers - EOF -} - -src_configure() { - eqmake5 -} - -src_compile() { - default - if use doc ; then - cd doc || die - doxygen Doxyfile.doxygen || die "doxygen failed" - HTML_DOCS="doc/web/doxygen/" - fi -} - -src_install () { - emake INSTALL_ROOT="${D}" install || die "install failed" - einstalldocs - if use examples; then - insinto /usr/share/${PN} - doins -r examples - fi -}