[gentoo-commits] repo/gentoo:master commit in: x11-libs/qwtplot3d/files/, profiles/, x11-libs/qwtplot3d/

[Andreas Sturmlechner]

commit:     3b7c44cdd1e605ed5e35ae26e9f898306f431b87
Author:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Tue Feb 13 21:17:45 2018 +0000
Commit:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Tue Feb 13 21:17:45 2018 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=3b7c44cd

profiles: Drop last-rited x11-libs/qwtplot3d

Closes: https://bugs.gentoo.org/630550

 profiles/package.mask                              |   4 -
 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-qt48.patch      |  19 ----
 x11-libs/qwtplot3d/files/qwtplot3d-sys-gl2ps.patch |  31 -----
 x11-libs/qwtplot3d/metadata.xml                    |  15 ---
 x11-libs/qwtplot3d/qwtplot3d-0.2.7-r2.ebuild       |  59 ----------
 10 files changed, 321 deletions(-)

diff --git a/profiles/package.mask b/profiles/package.mask
index 54829889788..28fda3a3953 100644
--- a/profiles/package.mask
+++ b/profiles/package.mask
@@ -338,10 +338,6 @@ net-im/mu-conference
 # in a month.
 dev-libs/libmcs
 
-# Pacho Ramos <pacho@g.o> (04 Jan 2018)
-# Upstream dead, QT4 consumer (#630550). Removal in a month.
-x11-libs/qwtplot3d
-
 # Pacho Ramos <pacho@g.o> (04 Jan 2018)
 # No reverse deps, fails to build (#630866). Removal in a month.
 dev-libs/libmowgli-glib

diff --git a/x11-libs/qwtplot3d/Manifest b/x11-libs/qwtplot3d/Manifest
deleted file mode 100644
index c241a80abc7..00000000000
--- 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 b0632a380a2..00000000000
--- 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 f142c337927..00000000000
--- 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 <qwt3d_function.h>
- 
- 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 <qwt3d_function.h>
- 
- 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 <qframe.h>
- #include <qpixmap.h>
- 
--#include "../../../include/qwt3d_types.h"
-+#include <qwt3d_types.h>
- 
- #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 <math.h>
--#include "../../../include/qwt3d_parametricsurface.h"
--#include "../../../include/qwt3d_function.h"
-+#include <qwt3d_parametricsurface.h>
-+#include <qwt3d_function.h>
- 
- 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 <math.h>
- #include <qapplication.h>
--#include "../../../include/qwt3d_parametricsurface.h"
--#include "../../../include/qwt3d_surfaceplot.h"
--#include "../../../include/qwt3d_enrichment.h"
--#include "../../../include/qwt3d_color.h"
-+#include <qwt3d_parametricsurface.h>
-+#include <qwt3d_surfaceplot.h>
-+#include <qwt3d_enrichment.h>
-+#include <qwt3d_color.h>
- 
- #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 <qwt3d_io.h>
-+#include <qwt3d_io_gl2ps.h>
-+#include <qwt3d_io_reader.h>
- 
- 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 <qwt3d_surfaceplot.h>
- 
- 
- #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 a76fe831ab9..00000000000
--- 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 <cstdio>
- 
- 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 831ad558d2f..00000000000
--- 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-qt48.patch b/x11-libs/qwtplot3d/files/qwtplot3d-qt48.patch
deleted file mode 100644
index 4e558eda7c9..00000000000
--- a/x11-libs/qwtplot3d/files/qwtplot3d-qt48.patch
+++ /dev/null
@@ -1,19 +0,0 @@
- include/qwt3d_openglhelper.h |    5 +++++
- 1 files changed, 5 insertions(+), 0 deletions(-)
-
-diff --git a/include/qwt3d_openglhelper.h b/include/qwt3d_openglhelper.h
-index e5499c2..a7ecddc 100644
---- a/include/qwt3d_openglhelper.h
-+++ b/include/qwt3d_openglhelper.h
-@@ -8,6 +8,11 @@
- #include <QtOpenGL/qgl.h>
- #endif
- 
-+#if QT_VERSION < 0x047999
-+#include <GL/glu.h>
-+#endif
-+
-+
- 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 81a77e13249..00000000000
--- 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 <time.h>
- #include "qwt3d_openglhelper.h"
--#include "../3rdparty/gl2ps/gl2ps.h"
-+#include <gl2ps.h>
- #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 a63bd8a60d8..00000000000
--- a/x11-libs/qwtplot3d/metadata.xml
+++ /dev/null
@@ -1,15 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="project">
-		<email>sci@g.o</email>
-		<name>Gentoo Science Project</name>
-	</maintainer>
-	<longdescription>
-		QwtPlot3D isa feature-rich Qt/OpenGL-based C++ programming library,
-		providing essentially a  bunch of 3D-widgets for programmers.
-	</longdescription>
-	<upstream>
-		<remote-id type="sourceforge">qwtplot3d</remote-id>
-	</upstream>
-</pkgmetadata>

diff --git a/x11-libs/qwtplot3d/qwtplot3d-0.2.7-r2.ebuild b/x11-libs/qwtplot3d/qwtplot3d-0.2.7-r2.ebuild
deleted file mode 100644
index 917693ee34c..00000000000
--- a/x11-libs/qwtplot3d/qwtplot3d-0.2.7-r2.ebuild
+++ /dev/null
@@ -1,59 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=4
-
-inherit qt4-r2
-
-DESCRIPTION="Qt4/OpenGL-based 3D widget library for C++"
-HOMEPAGE="http://qwtplot3d.sourceforge.net/"
-SRC_URI="mirror://sourceforge/${PN}/${P}.tgz"
-
-LICENSE="ZLIB"
-SLOT="0"
-IUSE="doc examples"
-KEYWORDS="amd64 ~ppc ~ppc64 x86"
-
-RDEPEND="dev-qt/qtgui:4
-	dev-qt/qtopengl:4
-	x11-libs/gl2ps"
-DEPEND="${RDEPEND}
-	doc? ( app-doc/doxygen )"
-
-S=${WORKDIR}/${PN}
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-profile.patch
-	"${FILESDIR}"/${PN}-examples.patch
-	"${FILESDIR}"/${PN}-doxygen.patch
-	"${FILESDIR}"/${PN}-sys-gl2ps.patch
-	"${FILESDIR}"/${PN}-gcc44.patch
-	"${FILESDIR}"/${PN}-qt48.patch
-	)
-
-src_prepare() {
-	qt4-r2_src_prepare
-	cat >> ${PN}.pro <<-EOF
-		target.path = /usr/$(get_libdir)
-		headers.path = /usr/include/${PN}
-		headers.files = \$\$HEADERS
-		INSTALLS = target headers
-	EOF
-}
-
-src_compile() {
-	qt4-r2_src_compile
-	 if use doc ; then
-		 cd doc
-		 doxygen Doxyfile.doxygen || die "doxygen failed"
-	 fi
-}
-
-src_install () {
-	qt4-r2_src_install
-	if use examples; then
-		insinto /usr/share/${PN}
-		doins -r examples
-	fi
-	use doc && dohtml -r doc/web/doxygen/*
-}