commit: 77403f5eeb80036e4ea9cd700a12a0cabb69e889
Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Sun Jul 1 16:46:06 2018 +0000
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Tue Aug 7 07:27:03 2018 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=77403f5e
dev-python/*: Remove last-rited
dev-python/PyQt4/Manifest | 1 -
dev-python/PyQt4/PyQt4-4.12.1.ebuild | 193 -----------------
dev-python/PyQt4/files/PyQt4-4.11.2-phonon.patch | 25 ---
.../files/PyQt4-4.7.3-qreal_float_support.patch | 239 ---------------------
dev-python/PyQt4/metadata.xml | 36 ----
dev-python/pyqwt/Manifest | 1 -
dev-python/pyqwt/metadata.xml | 18 --
dev-python/pyqwt/pyqwt-5.2.0-r2.ebuild | 90 --------
dev-python/pyside/Manifest | 1 -
dev-python/pyside/files/qgtkstyle-1.2.2.patch | 33 ---
dev-python/pyside/files/rpath.cmake | 10 -
dev-python/pyside/metadata.xml | 23 --
dev-python/pyside/pyside-1.2.2-r2.ebuild | 138 ------------
dev-python/shiboken/Manifest | 1 -
.../files/1.2.2-Fix-tests-with-Python-3.patch | 49 -----
dev-python/shiboken/files/rpath.cmake | 10 -
.../shiboken/files/shiboken-1.2.2-gcc6.patch | 20 --
dev-python/shiboken/metadata.xml | 8 -
dev-python/shiboken/shiboken-1.2.2.ebuild | 91 --------
profiles/package.mask | 7 -
20 files changed, 994 deletions(-)
diff --git a/dev-python/PyQt4/Manifest b/dev-python/PyQt4/Manifest
deleted file mode 100644
index f3ad733e4cc..00000000000
--- a/dev-python/PyQt4/Manifest
+++ /dev/null
@@ -1 +0,0 @@
-DIST PyQt4_gpl_x11-4.12.1.tar.gz 11328010 BLAKE2B
b1261318eed18faa4eb94b1b3db9d2ba9f4d000f295eab6985ce2e6e39f3c94ab5b524a1d437406b8154d6b9ada1da710d427af0a1c410579eb9194b36aeb4cf
SHA512
0651816ed5a371c24827e182eac5b2a2afe67928d95a09f63bd8158117aacd3e835b1efa06d4fc0c147a28038613a5bc088bd736a1348de68199da7952299af1
diff --git a/dev-python/PyQt4/PyQt4-4.12.1.ebuild
b/dev-python/PyQt4/PyQt4-4.12.1.ebuild
deleted file mode 100644
index aa304f2326a..00000000000
--- a/dev-python/PyQt4/PyQt4-4.12.1.ebuild
+++ /dev/null
@@ -1,193 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-PYTHON_COMPAT=( python2_7 python3_{4,5,6} )
-
-inherit multibuild python-r1 qmake-utils toolchain-funcs
-
-DESCRIPTION="Python bindings for the Qt framework"
-HOMEPAGE="https://www.riverbankcomputing.com/software/pyqt/intro";
-
-MY_P=${PN}_gpl_x11-${PV/_pre/.dev}
-if [[ ${PV} == *_pre* ]]; then
- SRC_URI="https://dev.gentoo.org/~pesa/distfiles/${MY_P}.tar.xz";
-else
- SRC_URI="mirror://sourceforge/pyqt/${MY_P}.tar.gz"
-fi
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="alpha amd64 ~arm ~arm64 ia64 ppc ppc64 ~sparc x86 ~amd64-linux
~x86-linux"
-
-IUSE="X compat dbus debug declarative designer doc examples help multimedia
- opengl phonon script scripttools sql svg testlib webkit xmlpatterns"
-REQUIRED_USE="
- ${PYTHON_REQUIRED_USE}
- sql? ( X )
- testlib? ( X )
-"
-
-# Minimal supported version of Qt.
-QT_PV="4.8.5:4"
-
-RDEPEND="
- ${PYTHON_DEPS}
- >=dev-python/sip-4.19.1:=[${PYTHON_USEDEP}]
- >=dev-qt/qtcore-${QT_PV}
- X? ( >=dev-qt/qtgui-${QT_PV} )
- dbus? (
- dev-python/dbus-python[${PYTHON_USEDEP}]
- >=dev-qt/qtdbus-${QT_PV}
- )
- declarative? ( >=dev-qt/qtdeclarative-${QT_PV} )
- designer? ( >=dev-qt/designer-${QT_PV} )
- help? ( >=dev-qt/qthelp-${QT_PV} )
- multimedia? ( >=dev-qt/qtmultimedia-${QT_PV} )
- opengl? ( >=dev-qt/qtopengl-${QT_PV} )
- phonon? ( >=media-libs/phonon-4.7[qt4] )
- script? ( >=dev-qt/qtscript-${QT_PV} )
- scripttools? ( >=dev-qt/qtgui-${QT_PV} )
- sql? ( >=dev-qt/qtsql-${QT_PV} )
- svg? ( >=dev-qt/qtsvg-${QT_PV} )
- testlib? ( >=dev-qt/qttest-${QT_PV} )
- webkit? ( >=dev-qt/qtwebkit-${QT_PV} )
- xmlpatterns? ( >=dev-qt/qtxmlpatterns-${QT_PV} )
-"
-DEPEND="${RDEPEND}
- dbus? ( virtual/pkgconfig )
-"
-
-S=${WORKDIR}/${MY_P}
-
-DOCS=( "${S}"/{ChangeLog,NEWS,THANKS} )
-PATCHES=(
- # Allow building against KDE's phonon (bug 525354)
- "${FILESDIR}/${PN}-4.11.2-phonon.patch"
-)
-
-src_prepare() {
- # Support qreal on arm architecture (bug 322349)
- use arm &&
PATCHES+=("${FILESDIR}/${PN}-4.7.3-qreal_float_support.patch")
-
- default
-}
-
-pyqt_run() {
- echo "$@"
- "${PYTHON}" "$@"
-}
-
-pyqt_use_enable() {
- use "$1" || return
-
- echo --enable=${2:-Qt$(tr 'a-z' 'A-Z' <<< ${1:0:1})${1:1}}
-}
-
-src_configure() {
- configuration() {
- local myconf=(
- $(usex debug '--debug --trace' '')
- --verbose
- --confirm-license
- --qmake="$(qt4_get_bindir)"/qmake
- --bindir="${EPREFIX}/usr/bin"
- --destdir="$(python_get_sitedir)"
- --qsci-api
- --enable=QtCore
- --enable=QtNetwork
- --enable=QtXml
- $(pyqt_use_enable X QtGui)
- $(pyqt_use_enable dbus QtDBus)
- $(pyqt_use_enable declarative)
- $(pyqt_use_enable designer)
- $(usex designer '' --no-designer-plugin)
- $(pyqt_use_enable help)
- $(pyqt_use_enable multimedia)
- $(pyqt_use_enable opengl QtOpenGL)
- $(pyqt_use_enable phonon phonon)
- $(pyqt_use_enable script)
- $(pyqt_use_enable scripttools QtScriptTools)
- $(pyqt_use_enable sql)
- $(pyqt_use_enable svg)
- $(pyqt_use_enable testlib QtTest)
- $(pyqt_use_enable webkit QtWebKit)
- $(pyqt_use_enable xmlpatterns QtXmlPatterns)
- )
-
- if use compat; then
- local compat_build_dir=${BUILD_DIR%/}-compat
- cp -Rp "${S}" "${compat_build_dir}" || die
- pushd "${compat_build_dir}" >/dev/null || die
-
- local mycompatconf=(
- "${myconf[@]}"
- AR="$(tc-getAR) cqs"
- CC="$(tc-getCC)"
- CFLAGS="${CFLAGS}"
- CFLAGS_RELEASE=
- CXX="$(tc-getCXX)"
- CXXFLAGS="${CXXFLAGS}"
- CXXFLAGS_RELEASE=
- LINK="$(tc-getCXX)"
- LINK_SHLIB="$(tc-getCXX)"
- LFLAGS="${LDFLAGS}"
- LFLAGS_RELEASE=
- RANLIB=
- STRIP=
- )
- pyqt_run configure.py "${mycompatconf[@]}" || die
-
- popd >/dev/null || die
- fi
-
- myconf+=(
- --sip-incdir="$(python_get_includedir)"
- $(usex dbus '' --no-python-dbus)
- )
- pyqt_run "${S}"/configure-ng.py "${myconf[@]}" || die
-
- eqmake4 -recursive ${PN}.pro
- }
- python_foreach_impl run_in_build_dir configuration
-}
-
-src_compile() {
- python_foreach_impl run_in_build_dir default
-}
-
-src_install() {
- installation() {
- local tmp_root=${D%/}/tmp
- emake INSTALL_ROOT="${tmp_root}" install
-
- local uic_dir=${tmp_root}$(python_get_sitedir)/${PN}/uic
- if python_is_python3; then
- rm -r "${uic_dir}"/port_v2 || die
- else
- rm -r "${uic_dir}"/port_v3 || die
- fi
-
- python_doexe "${tmp_root}${EPREFIX}"/usr/bin/pyuic4
- rm "${tmp_root}${EPREFIX}"/usr/bin/pyuic4 || die
-
- multibuild_merge_root "${tmp_root}" "${D}"
-
- if use compat; then
- local compat_build_dir=${BUILD_DIR%/}-compat
- python_moduleinto ${PN}
- python_domodule "${compat_build_dir}"/pyqtconfig.py
- fi
-
- python_optimize
- }
- python_foreach_impl run_in_build_dir installation
-
- einstalldocs
- use doc && dodoc -r doc/html
-
- if use examples; then
- insinto /usr/share/doc/${PF}
- doins -r examples
- fi
-}
diff --git a/dev-python/PyQt4/files/PyQt4-4.11.2-phonon.patch
b/dev-python/PyQt4/files/PyQt4-4.11.2-phonon.patch
deleted file mode 100644
index e3449b3b4bf..00000000000
--- a/dev-python/PyQt4/files/PyQt4-4.11.2-phonon.patch
+++ /dev/null
@@ -1,25 +0,0 @@
-From e8931ed7f49eb55d6259328a5a78f3fc18472d48 Mon Sep 17 00:00:00 2001
-From: Davide Pesavento <p...@gentoo.org>
-Date: Tue, 14 Oct 2014 04:30:29 +0200
-Subject: [PATCH] Support building against KDE's phonon variant.
-
----
- configure-ng.py | 2 ++
- 1 file changed, 2 insertions(+)
-
-diff --git a/configure-ng.py b/configure-ng.py
-index a80cb57..fd2c56c 100644
---- a/configure-ng.py
-+++ b/configure-ng.py
-@@ -2256,6 +2256,8 @@ def generate_sip_module_code(target_config, verbose,
no_timestamp, parts, tracin
- if mname == 'QtCore':
- includepath = target_config.vend_inc_dir
- libs = '-L%s -lvendorid' % target_config.vend_lib_dir
-+ if mname == 'phonon':
-+ includepath = os.path.join(sys.prefix, 'include', 'phonon')
-
- generate_module_makefile(target_config, verbose, mname,
- includepath=includepath, libs=libs, qpy_sources=qpy_sources,
---
-2.1.2
-
diff --git a/dev-python/PyQt4/files/PyQt4-4.7.3-qreal_float_support.patch
b/dev-python/PyQt4/files/PyQt4-4.7.3-qreal_float_support.patch
deleted file mode 100644
index 37e1e69eb3f..00000000000
--- a/dev-python/PyQt4/files/PyQt4-4.7.3-qreal_float_support.patch
+++ /dev/null
@@ -1,239 +0,0 @@
-#! /bin/sh /usr/share/dpatch/dpatch-run
-## 03_qreal_float_support.dpatch by Michael Casadevall <sonicmcta...@gmail.com>
-##
-## DP: Corrects a configure test, and adds explicate double handling
-## to qlist.sip on architectures where qreal != double
-
-@DPATCH@
-Index: python-qt4-4.7.2/sip/QtCore/qlist.sip
-===================================================================
---- python-qt4-4.7.2.orig/sip/QtCore/qlist.sip 2010-03-17 19:29:26.000000000
+0100
-+++ python-qt4-4.7.2/sip/QtCore/qlist.sip 2010-03-25 23:53:55.468631945
+0100
-@@ -749,3 +749,227 @@
- return sipGetState(sipTransferObj);
- %End
- };
-+
-+// If we're on an architecture where qreal != double, then we need to also
-+// explicately handle doubles. On architectures where qreal == double, they
-+// will automaticially be cast upwards
-+
-+%If (!PyQt_qreal_double)
-+
-+%If (Qt_4_3_0 -)
-+// QList<QPair<double, double> > is implemented as a Python list of 2-element
tuples.
-+%MappedType QList<QPair<double, double> >
-+{
-+%TypeHeaderCode
-+#include <qlist.h>
-+#include <qpair.h>
-+%End
-+
-+%ConvertFromTypeCode
-+ // Create the list.
-+ PyObject *l;
-+
-+ if ((l = PyList_New(sipCpp->size())) == NULL)
-+ return NULL;
-+
-+ // Set the list elements.
-+ for (int i = 0; i < sipCpp->size(); ++i)
-+ {
-+ const QPair<double, double> &p = sipCpp->at(i);
-+ PyObject *pobj;
-+
-+ if ((pobj = Py_BuildValue((char *)"dd", p.first, p.second)) == NULL)
-+ {
-+ Py_DECREF(l);
-+
-+ return NULL;
-+ }
-+
-+ PyList_SET_ITEM(l, i, pobj);
-+ }
-+
-+ return l;
-+%End
-+
-+%ConvertToTypeCode
-+ SIP_SSIZE_T len;
-+
-+ // Check the type if that is all that is required.
-+ if (sipIsErr == NULL)
-+ {
-+ if (!PySequence_Check(sipPy) || (len = PySequence_Size(sipPy)) < 0)
-+ return 0;
-+
-+ for (SIP_SSIZE_T i = 0; i < len; ++i)
-+ {
-+ PyObject *tup = PySequence_ITEM(sipPy, i);
-+
-+ if (!PySequence_Check(tup) || PySequence_Size(tup) != 2)
-+ return 0;
-+ }
-+
-+ return 1;
-+ }
-+
-+ QList<QPair<double, double> > *ql = new QList<QPair<double, double> >;
-+ len = PySequence_Size(sipPy);
-+
-+ for (SIP_SSIZE_T i = 0; i < len; ++i)
-+ {
-+ PyObject *tup = PySequence_ITEM(sipPy, i);
-+
-+ double first = PyFloat_AsDouble(PySequence_ITEM(tup, 0));
-+ double second = PyFloat_AsDouble(PySequence_ITEM(tup, 1));
-+
-+ ql->append(QPair<double, double>(first, second));
-+ }
-+
-+ *sipCppPtr = ql;
-+
-+ return sipGetState(sipTransferObj);
-+%End
-+};
-+%End
-+%If (Qt_4_3_0 -)
-+// QList<QPair<double, TYPE> > is implemented as a Python list of 2-element
tuples.
-+template<double, TYPE>
-+%MappedType QList<QPair<double, TYPE> >
-+{
-+%TypeHeaderCode
-+#include <qlist.h>
-+#include <qpair.h>
-+%End
-+
-+%ConvertFromTypeCode
-+ // Create the list.
-+ PyObject *l;
-+
-+ if ((l = PyList_New(sipCpp->size())) == NULL)
-+ return NULL;
-+
-+ // Set the list elements.
-+ for (int i = 0; i < sipCpp->size(); ++i)
-+ {
-+ const QPair<double, TYPE> &p = sipCpp->at(i);
-+ TYPE *t = new TYPE(p.second);
-+ PyObject *pobj;
-+
-+ if ((pobj = sipBuildResult(NULL, "(dB)", p.first, t, sipClass_TYPE,
sipTransferObj)) == NULL)
-+ {
-+ Py_DECREF(l);
-+ delete t;
-+
-+ return NULL;
-+ }
-+
-+ PyList_SET_ITEM(l, i, pobj);
-+ }
-+
-+ return l;
-+%End
-+
-+%ConvertToTypeCode
-+ SIP_SSIZE_T len;
-+
-+ // Check the type if that is all that is required.
-+ if (sipIsErr == NULL)
-+ {
-+ if (!PySequence_Check(sipPy) || (len = PySequence_Size(sipPy)) < 0)
-+ return 0;
-+
-+ for (SIP_SSIZE_T i = 0; i < len; ++i)
-+ {
-+ PyObject *tup = PySequence_ITEM(sipPy, i);
-+
-+ if (!PySequence_Check(tup) || PySequence_Size(tup) != 2)
-+ return 0;
-+
-+ if (!sipCanConvertToInstance(PySequence_ITEM(tup, 1),
sipClass_TYPE, SIP_NOT_NONE))
-+ return 0;
-+ }
-+
-+ return 1;
-+ }
-+
-+ QList<QPair<double, TYPE> > *ql = new QList<QPair<double, TYPE> >;
-+ len = PySequence_Size(sipPy);
-+
-+ for (SIP_SSIZE_T i = 0; i < len; ++i)
-+ {
-+ PyObject *tup = PySequence_ITEM(sipPy, i);
-+ double d;
-+ int state;
-+
-+ d = PyFloat_AsDouble(PySequence_ITEM(tup, 0));
-+ TYPE *t = reinterpret_cast<TYPE
*>(sipConvertToInstance(PySequence_ITEM(tup, 1), sipClass_TYPE, sipTransferObj,
SIP_NOT_NONE, &state, sipIsErr));
-+
-+ if (*sipIsErr)
-+ {
-+ sipReleaseInstance(t, sipClass_TYPE, state);
-+
-+ delete ql;
-+ return 0;
-+ }
-+
-+ ql->append(QPair<double, TYPE>(d, *t));
-+
-+ sipReleaseInstance(t, sipClass_TYPE, state);
-+ }
-+
-+ *sipCppPtr = ql;
-+
-+ return sipGetState(sipTransferObj);
-+%End
-+};
-+%End
-+
-+// QList<double> is implemented as a Python list of doubles.
-+%MappedType QList<double>
-+{
-+%TypeHeaderCode
-+#include <qlist.h>
-+%End
-+
-+%ConvertFromTypeCode
-+ // Create the list.
-+ PyObject *l;
-+
-+ if ((l = PyList_New(sipCpp->size())) == NULL)
-+ return NULL;
-+
-+ // Set the list elements.
-+ for (int i = 0; i < sipCpp->size(); ++i)
-+ {
-+ PyObject *pobj;
-+
-+ if ((pobj = PyFloat_FromDouble(sipCpp->value(i))) == NULL)
-+ {
-+ Py_DECREF(l);
-+
-+ return NULL;
-+ }
-+
-+ PyList_SET_ITEM(l, i, pobj);
-+ }
-+
-+ return l;
-+%End
-+
-+%ConvertToTypeCode
-+ // Check the type if that is all that is required.
-+ if (sipIsErr == NULL)
-+ return (PySequence_Check(sipPy) && PySequence_Size(sipPy) >= 0);
-+
-+ QList<double> *ql = new QList<double>;
-+ SIP_SSIZE_T len = PySequence_Size(sipPy);
-+
-+ for (SIP_SSIZE_T i = 0; i < len; ++i)
-+ ql->append(PyFloat_AsDouble(PySequence_ITEM(sipPy, i)));
-+
-+ *sipCppPtr = ql;
-+
-+ return sipGetState(sipTransferObj);
-+%End
-+};
-+
-+%End
diff --git a/dev-python/PyQt4/metadata.xml b/dev-python/PyQt4/metadata.xml
deleted file mode 100644
index 7cc6900ee95..00000000000
--- a/dev-python/PyQt4/metadata.xml
+++ /dev/null
@@ -1,36 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd";>
-<pkgmetadata>
- <maintainer type="project">
- <email>q...@gentoo.org</email>
- <name>Gentoo Qt Project</name>
- </maintainer>
- <use>
- <flag name="X">Build bindings for the QtGui module</flag>
- <flag name="compat">Install the deprecated pyqtconfig module
for backward compatibility</flag>
- <flag name="dbus">Build bindings for the QtDBus module</flag>
- <flag name="declarative">Build bindings for the QtDeclarative
module</flag>
- <flag name="designer">Build bindings for the QtDesigner module
and enable the designer plugin</flag>
- <flag name="help">Build bindings for the QtHelp module</flag>
- <flag name="multimedia">Build bindings for the QtMultimedia
module</flag>
- <flag name="opengl">Build bindings for the QtOpenGL
module</flag>
- <flag name="phonon">Build bindings for the phonon module</flag>
- <flag name="script">Build bindings for the QtScript
module</flag>
- <flag name="scripttools">Build bindings for the QtScriptTools
module</flag>
- <flag name="sql">Build bindings for the QtSql module</flag>
- <flag name="svg">Build bindings for the QtSvg module</flag>
- <flag name="testlib">Build bindings for the QtTest module</flag>
- <flag name="webkit">Build bindings for the QtWebKit
module</flag>
- <flag name="xmlpatterns">Build bindings for the QtXmlPatterns
module</flag>
- </use>
- <upstream>
- <maintainer status="active">
- <email>p...@riverbankcomputing.com</email>
- <name>Phil Thompson</name>
- </maintainer>
- <bugs-to>mailto:p...@riverbankcomputing.com</bugs-to>
- <doc>http://pyqt.sourceforge.net/Docs/PyQt4/</doc>
- <remote-id type="pypi">PyQt4</remote-id>
- <remote-id type="sourceforge">pyqt</remote-id>
- </upstream>
-</pkgmetadata>
diff --git a/dev-python/pyqwt/Manifest b/dev-python/pyqwt/Manifest
deleted file mode 100644
index 13b2ee12a9f..00000000000
--- a/dev-python/pyqwt/Manifest
+++ /dev/null
@@ -1 +0,0 @@
-DIST PyQwt-5.2.0.tar.gz 2670893 BLAKE2B
bcd0e0c427abcc5713c3c7af8e3cb39511708b7219af99de0bf31c47117f7e5a3a9e45a1ae19ed6b5bd81d279c2332117ebfa5aee689d873320967f4c4164e54
SHA512
8c409ee228d91d625bf9bd8a5704c3d41f70613b420bc8f1527312dd1ebb686b8482bd68c4b3d1a72edd80673533a4f5a39378221967bea70f389c9dde14f265
diff --git a/dev-python/pyqwt/metadata.xml b/dev-python/pyqwt/metadata.xml
deleted file mode 100644
index 7f74fabb62c..00000000000
--- a/dev-python/pyqwt/metadata.xml
+++ /dev/null
@@ -1,18 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd";>
-<pkgmetadata>
- <maintainer type="project">
- <email>pyt...@gentoo.org</email>
- <name>Python</name>
- </maintainer>
- <longdescription lang="en">
- PyQwt is a set of Python bindings for the Qwt C++ class library
which
- extends the Qt framework with widgets for scientific and
engineering
- applications. It provides a widget to plot 2-dimensional data
and
- various widgets to display and control bounded or unbounded
floating
- point values.
- </longdescription>
- <upstream>
- <remote-id type="sourceforge">pyqwt</remote-id>
- </upstream>
-</pkgmetadata>
diff --git a/dev-python/pyqwt/pyqwt-5.2.0-r2.ebuild
b/dev-python/pyqwt/pyqwt-5.2.0-r2.ebuild
deleted file mode 100644
index 5f7e7a76026..00000000000
--- a/dev-python/pyqwt/pyqwt-5.2.0-r2.ebuild
+++ /dev/null
@@ -1,90 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-PYTHON_COMPAT=( python2_7 )
-
-inherit flag-o-matic python-r1 qmake-utils
-
-DESCRIPTION="Python bindings for the Qwt library"
-HOMEPAGE="http://pyqwt.sourceforge.net/";
-MY_P="PyQwt-${PV}"
-SRC_URI="mirror://sourceforge/${PN}/${MY_P}.tar.gz"
-
-SLOT="5"
-LICENSE="GPL-2"
-KEYWORDS="amd64 ~arm ia64 x86"
-IUSE="debug doc examples svg"
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-
-RDEPEND="${PYTHON_DEPS}
- dev-python/numpy[${PYTHON_USEDEP}]
- dev-python/PyQt4[${PYTHON_USEDEP},compat(+)]
- dev-python/sip[${PYTHON_USEDEP}]
- x11-libs/qwt:5[svg?]"
-DEPEND="${RDEPEND}
- doc? ( dev-python/sphinx[${PYTHON_USEDEP}] )"
-
-S=${WORKDIR}/${MY_P}/configure
-
-src_prepare() {
- sed -i -e "s|configuration.qt_dir, 'bin'|'$(qt4_get_bindir)'|"
configure.py || die
- python_copy_sources
- append-flags -fPIC
-}
-
-src_configure() {
- configuration() {
- local myconf=()
- use debug && myconf+=( --debug )
-
- cd "${BUILD_DIR}" || die
- # '-j' option can be buggy.
- "${PYTHON}" configure.py \
- --extra-cflags="${CFLAGS}" \
- --extra-cxxflags="${CXXFLAGS}" \
- --extra-lflags="${LDFLAGS}" \
- --disable-numarray \
- --disable-numeric \
- -I/usr/include/qwt5 \
- -lqwt \
- ${myconf[@]} \
- || die "configure.py failed"
-
- # Avoid stripping of the libraries.
- sed -i -e "/strip/d" {iqt5qt4,qwt5qt4}/Makefile || die "sed
failed"
- }
- python_foreach_impl configuration
-}
-
-src_compile() {
- compilation() {
- cd "${BUILD_DIR}" || die
- default
- }
- python_foreach_impl compilation
-
- if use doc; then
- cd "${S}"/../sphinx || die
- emake
- fi
-}
-
-src_install() {
- installation() {
- cd "${BUILD_DIR}" || die
- emake DESTDIR="${D}" install
- }
- python_foreach_impl installation
-
- cd "${S}"/.. || die
-
- dodoc ANNOUNCEMENT-${PV} README
-
- use doc && dodoc -r sphinx/build/.
- if use examples; then
- docinto examples
- dodoc -r qt4examples/.
- fi
-}
diff --git a/dev-python/pyside/Manifest b/dev-python/pyside/Manifest
deleted file mode 100644
index a6f00b9e833..00000000000
--- a/dev-python/pyside/Manifest
+++ /dev/null
@@ -1 +0,0 @@
-DIST pyside-qt4.8+1.2.2.tar.bz2 3765472 BLAKE2B
bd28e196b01ddbbe6f005453ec7504d90b3f3789ab17faf1eedd78f5b05cefd1926f8df8261093d4acef429a04fa81bf9e02e83f01bfe2a3e58f18dd07568f57
SHA512
3a1d46c48ac71c3b138e1dc398d1d2a87aff558eace275303e233f78d03e32c6d53cf390db5e7112f44da9b17aa88ed16a30f6f83b2073c1f494e61b962e4c46
diff --git a/dev-python/pyside/files/qgtkstyle-1.2.2.patch
b/dev-python/pyside/files/qgtkstyle-1.2.2.patch
deleted file mode 100644
index d782276aba6..00000000000
--- a/dev-python/pyside/files/qgtkstyle-1.2.2.patch
+++ /dev/null
@@ -1,33 +0,0 @@
-diff --git a/PySide/QtGui/CMakeLists.txt b/PySide/QtGui/CMakeLists.txt
-index 6e14706..bd60775 100644
---- a/PySide/QtGui/CMakeLists.txt
-+++ b/PySide/QtGui/CMakeLists.txt
-@@ -71,7 +71,6 @@ set(QtGui_OPTIONAL_SRC )
- set(QtGui_DROPPED_ENTRIES )
- check_qt_class(QtGui QAbstractPageSetupDialog QtGui_OPTIONAL_SRC
QtGui_DROPPED_ENTRIES)
- check_qt_class(QtGui QAbstractPrintDialog QtGui_OPTIONAL_SRC
QtGui_DROPPED_ENTRIES)
--check_qt_class(QtGui QGtkStyle QtGui_OPTIONAL_SRC
QtGui_DROPPED_ENTRIES)
- check_qt_class(QtGui QPageSetupDialog QtGui_OPTIONAL_SRC
QtGui_DROPPED_ENTRIES)
- check_qt_class(QtGui QPrintDialog QtGui_OPTIONAL_SRC
QtGui_DROPPED_ENTRIES)
- check_qt_class(QtGui QPrintEngine QtGui_OPTIONAL_SRC
QtGui_DROPPED_ENTRIES)
-diff --git a/PySide/QtGui/typesystem_gui_common.xml
b/PySide/QtGui/typesystem_gui_common.xml
-index 711d7cc..954aa54 100644
---- a/PySide/QtGui/typesystem_gui_common.xml
-+++ b/PySide/QtGui/typesystem_gui_common.xml
-@@ -6996,16 +6996,6 @@
- <modify-function signature="exec()" rename="exec_" allow-thread="yes" />
- </object-type>
-
-- <object-type name="QGtkStyle">
-- <modify-function signature="standardPixmap(QStyle::StandardPixmap,const
QStyleOption*,const QWidget*)const">
-- <modify-argument index="2">
-- <replace-default-expression with="0"/>
-- </modify-argument>
-- <modify-argument index="3">
-- <replace-default-expression with="0"/>
-- </modify-argument>
-- </modify-function>
-- </object-type>
-
- <object-type name="QPageSetupDialog">
- <enum-type name="PageSetupDialogOption" flags="PageSetupDialogOptions"/>
diff --git a/dev-python/pyside/files/rpath.cmake
b/dev-python/pyside/files/rpath.cmake
deleted file mode 100644
index b896c878918..00000000000
--- a/dev-python/pyside/files/rpath.cmake
+++ /dev/null
@@ -1,10 +0,0 @@
-# use, i.e. don't skip the full RPATH for the build tree
-SET(CMAKE_SKIP_BUILD_RPATH FALSE)
-
-# when building, don't use the install RPATH already
-# (but later on when installing)
-SET(CMAKE_BUILD_WITH_INSTALL_RPATH FALSE)
-
-# add the automatically determined parts of the RPATH
-# which point to directories outside the build tree to the install RPATH
-SET(CMAKE_INSTALL_RPATH_USE_LINK_PATH TRUE)
diff --git a/dev-python/pyside/metadata.xml b/dev-python/pyside/metadata.xml
deleted file mode 100644
index fafc4012082..00000000000
--- a/dev-python/pyside/metadata.xml
+++ /dev/null
@@ -1,23 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd";>
-<pkgmetadata>
- <maintainer type="project">
- <email>q...@gentoo.org</email>
- <name>Gentoo Qt Project</name>
- </maintainer>
- <use>
- <flag name="X">Build QtGui and QtTest modules</flag>
- <flag name="declarative">Build QtDeclarative module</flag>
- <flag name="designer">Build QtDesigner and QtUiTools
modules</flag>
- <flag name="help">Build QtHelp module</flag>
- <flag name="multimedia">Build QtMultimedia module</flag>
- <flag name="opengl">Build QtOpenGL module</flag>
- <flag name="phonon">Build phonon module</flag>
- <flag name="script">Build QtScript module</flag>
- <flag name="scripttools">Build QtScriptTools module</flag>
- <flag name="sql">Build QtSql module</flag>
- <flag name="svg">Build QtSvg module</flag>
- <flag name="webkit">Build QtWebKit module</flag>
- <flag name="xmlpatterns">Build QtXmlPatterns module</flag>
- </use>
-</pkgmetadata>
diff --git a/dev-python/pyside/pyside-1.2.2-r2.ebuild
b/dev-python/pyside/pyside-1.2.2-r2.ebuild
deleted file mode 100644
index 317dd053bee..00000000000
--- a/dev-python/pyside/pyside-1.2.2-r2.ebuild
+++ /dev/null
@@ -1,138 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-PYTHON_COMPAT=( python2_7 python3_{4,5,6} )
-
-inherit cmake-utils multilib python-r1 virtualx
-
-MY_P="${PN}-qt4.8+${PV}"
-
-DESCRIPTION="Python bindings for the Qt framework"
-HOMEPAGE="http://wiki.qt.io/PySide";
-SRC_URI="http://download.qt-project.org/official_releases/${PN}/${MY_P}.tar.bz2";
-
-LICENSE="LGPL-2.1"
-SLOT="0"
-KEYWORDS="amd64 arm ~arm64 ppc ppc64 x86 ~amd64-linux ~x86-linux"
-
-IUSE="X declarative designer help multimedia opengl phonon script scripttools
sql svg test webkit xmlpatterns"
-REQUIRED_USE="
- ${PYTHON_REQUIRED_USE}
- declarative? ( X )
- designer? ( X )
- help? ( X )
- multimedia? ( X )
- opengl? ( X )
- phonon? ( X )
- scripttools? ( X script )
- sql? ( X )
- svg? ( X )
- test? ( X )
- webkit? ( X )
-"
-
-# Minimal supported version of Qt.
-QT_PV="4.8.5:4"
-
-RDEPEND="
- ${PYTHON_DEPS}
- >=dev-python/shiboken-${PV}:${SLOT}[${PYTHON_USEDEP}]
- >=dev-qt/qtcore-${QT_PV}[ssl]
- X? (
- >=dev-qt/qtgui-${QT_PV}[accessibility]
- >=dev-qt/qttest-${QT_PV}
- )
- declarative? ( >=dev-qt/qtdeclarative-${QT_PV} )
- designer? ( >=dev-qt/designer-${QT_PV} )
- help? ( >=dev-qt/qthelp-${QT_PV} )
- multimedia? ( >=dev-qt/qtmultimedia-${QT_PV} )
- opengl? ( >=dev-qt/qtopengl-${QT_PV} )
- phonon? ( media-libs/phonon[qt4] )
- script? ( >=dev-qt/qtscript-${QT_PV} )
- sql? ( >=dev-qt/qtsql-${QT_PV} )
- svg? ( >=dev-qt/qtsvg-${QT_PV}[accessibility] )
- webkit? ( >=dev-qt/qtwebkit-${QT_PV} )
- xmlpatterns? ( >=dev-qt/qtxmlpatterns-${QT_PV} )
-"
-DEPEND="${RDEPEND}
- >=dev-qt/qtgui-${QT_PV}
-"
-
-S=${WORKDIR}/${MY_P}
-
-DOCS=( ChangeLog )
-
-src_prepare() {
- # Fix generated pkgconfig file to require the shiboken
- # library suffixed with the correct python version.
- sed -i -e '/^Requires:/ s/shiboken$/&@SHIBOKEN_PYTHON_SUFFIX@/' \
- libpyside/pyside.pc.in || die
-
- if use prefix; then
- cp "${FILESDIR}"/rpath.cmake . || die
- sed -i -e '1iinclude(rpath.cmake)' CMakeLists.txt || die
- fi
-
- epatch "${FILESDIR}/qgtkstyle-${PV}.patch" # bug 530764
-
- cmake-utils_src_prepare
-}
-
-src_configure() {
- local mycmakeargs=(
- $(cmake-utils_use_build test TESTS)
- $(cmake-utils_use_disable X QtGui)
- $(cmake-utils_use_disable X QtTest)
- $(cmake-utils_use_disable declarative QtDeclarative)
- $(cmake-utils_use_disable designer QtDesigner)
- $(cmake-utils_use_disable designer QtUiTools)
- $(cmake-utils_use_disable help QtHelp)
- $(cmake-utils_use_disable multimedia QtMultimedia)
- $(cmake-utils_use_disable opengl QtOpenGL)
- $(cmake-utils_use_disable phonon)
- $(cmake-utils_use_disable script QtScript)
- $(cmake-utils_use_disable scripttools QtScriptTools)
- $(cmake-utils_use_disable sql QtSql)
- $(cmake-utils_use_disable svg QtSvg)
- $(cmake-utils_use_disable webkit QtWebKit)
- $(cmake-utils_use_disable xmlpatterns QtXmlPatterns)
- )
-
- if use phonon && has_version "media-libs/phonon[qt4]"; then
- # bug 475786
- mycmakeargs+=(
- -DQT_PHONON_INCLUDE_DIR="${EPREFIX}/usr/include/phonon"
-
-DQT_PHONON_LIBRARY_RELEASE="${EPREFIX}/usr/$(get_libdir)/libphonon.so"
- )
- fi
-
- configuration() {
- local mycmakeargs=(
- -DPYTHON_SUFFIX="-${EPYTHON}"
- "${mycmakeargs[@]}"
- )
- cmake-utils_src_configure
- }
- python_foreach_impl configuration
-}
-
-src_compile() {
- python_foreach_impl cmake-utils_src_compile
-}
-
-src_test() {
- local PYTHONDONTWRITEBYTECODE
- export PYTHONDONTWRITEBYTECODE
-
- VIRTUALX_COMMAND="cmake-utils_src_test" python_foreach_impl virtualmake
-}
-
-src_install() {
- installation() {
- cmake-utils_src_install
- mv "${ED}"usr/$(get_libdir)/pkgconfig/${PN}{,-${EPYTHON}}.pc ||
die
- }
- python_foreach_impl installation
-}
diff --git a/dev-python/shiboken/Manifest b/dev-python/shiboken/Manifest
deleted file mode 100644
index 4600bb3d978..00000000000
--- a/dev-python/shiboken/Manifest
+++ /dev/null
@@ -1 +0,0 @@
-DIST shiboken-1.2.2.tar.bz2 1073776 BLAKE2B
162e0e6d6bb53d09e4dbe9abf8ac310cd7913ba2e4440681cf98f16b8ee63a577759a1a3669bfb7e37b712a4c1dd638f54d571aadeae07578d377bdb1f161bb5
SHA512
9f5c1219ce699df6b5ee4bd68cf422cb69476bd062346fcc8b4d34d314001ba60dbd52a73d772aec16285a0aabb600034630beba754ca54f5e6a4b744a720073
diff --git a/dev-python/shiboken/files/1.2.2-Fix-tests-with-Python-3.patch
b/dev-python/shiboken/files/1.2.2-Fix-tests-with-Python-3.patch
deleted file mode 100644
index 48e401d1be1..00000000000
--- a/dev-python/shiboken/files/1.2.2-Fix-tests-with-Python-3.patch
+++ /dev/null
@@ -1,49 +0,0 @@
-From 7f793442316599ca25014a3d39c5de56c384990f Mon Sep 17 00:00:00 2001
-From: Michael Palimaka <kensing...@gentoo.org>
-Date: Fri, 23 May 2014 18:10:20 +1000
-Subject: [PATCH] Fix tests with Python 3.
-
-Change-Id: Ibbf54406ba33dd1f645a46d63c04269868288768
----
- tests/minimalbinding/typedef_test.py | 2 +-
- tests/samplebinding/overflow_test.py | 4 ++--
- 2 files changed, 3 insertions(+), 3 deletions(-)
-
-diff --git a/tests/minimalbinding/typedef_test.py
b/tests/minimalbinding/typedef_test.py
-index 089b279..b5535fb 100644
---- a/tests/minimalbinding/typedef_test.py
-+++ b/tests/minimalbinding/typedef_test.py
-@@ -30,7 +30,7 @@ from py3kcompat import IS_PY3K
-
- try:
- import numpy as np
--except ImportError, e:
-+except ImportError:
- np = None
-
-
-diff --git a/tests/samplebinding/overflow_test.py
b/tests/samplebinding/overflow_test.py
-index 5020872..c294c13 100644
---- a/tests/samplebinding/overflow_test.py
-+++ b/tests/samplebinding/overflow_test.py
-@@ -45,7 +45,7 @@ class OverflowTest(unittest.TestCase):
- '''C++ function receives an long long argument and raise
OverflowError if the value is negative.'''
- val = 100
- self.assertEqual(doubleLongLong(val), 2 * val)
-- val = long(100)
-+ val = int(100)
- self.assertEqual(doubleLongLong(val), 2 * val)
- val = (2 << 64) + 1
- self.assertRaises(OverflowError, doubleLongLong, val)
-@@ -54,7 +54,7 @@ class OverflowTest(unittest.TestCase):
- '''C++ function receives an unsigned long long argument and raise
OverflowError if the value is negative.'''
- val = 100
- self.assertEqual(doubleUnsignedLongLong(val), 2 * val)
-- val = long(100)
-+ val = int(100)
- self.assertEqual(doubleUnsignedLongLong(val), 2 * val)
- val *= -1
- self.assertRaises(OverflowError, doubleUnsignedLongLong, val)
---
-2.1.0
-
diff --git a/dev-python/shiboken/files/rpath.cmake
b/dev-python/shiboken/files/rpath.cmake
deleted file mode 100644
index b896c878918..00000000000
--- a/dev-python/shiboken/files/rpath.cmake
+++ /dev/null
@@ -1,10 +0,0 @@
-# use, i.e. don't skip the full RPATH for the build tree
-SET(CMAKE_SKIP_BUILD_RPATH FALSE)
-
-# when building, don't use the install RPATH already
-# (but later on when installing)
-SET(CMAKE_BUILD_WITH_INSTALL_RPATH FALSE)
-
-# add the automatically determined parts of the RPATH
-# which point to directories outside the build tree to the install RPATH
-SET(CMAKE_INSTALL_RPATH_USE_LINK_PATH TRUE)
diff --git a/dev-python/shiboken/files/shiboken-1.2.2-gcc6.patch
b/dev-python/shiboken/files/shiboken-1.2.2-gcc6.patch
deleted file mode 100644
index 65734232472..00000000000
--- a/dev-python/shiboken/files/shiboken-1.2.2-gcc6.patch
+++ /dev/null
@@ -1,20 +0,0 @@
-Bug: https://bugs.gentoo.org/619332
-PR: https://github.com/pyside/Shiboken/pull/84
-
---- a/tests/libsample/simplefile.cpp
-+++ b/tests/libsample/simplefile.cpp
-@@ -90,13 +90,13 @@ bool
- SimpleFile::exists() const
- {
- std::ifstream ifile(p->m_filename);
-- return ifile;
-+ return static_cast<bool>(ifile);
- }
-
- bool
- SimpleFile::exists(const char* filename)
- {
- std::ifstream ifile(filename);
-- return ifile;
-+ return static_cast<bool>(ifile);
- }
diff --git a/dev-python/shiboken/metadata.xml b/dev-python/shiboken/metadata.xml
deleted file mode 100644
index a7f1abb3029..00000000000
--- a/dev-python/shiboken/metadata.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd";>
-<pkgmetadata>
- <maintainer type="project">
- <email>q...@gentoo.org</email>
- <name>Gentoo Qt Project</name>
- </maintainer>
-</pkgmetadata>
diff --git a/dev-python/shiboken/shiboken-1.2.2.ebuild
b/dev-python/shiboken/shiboken-1.2.2.ebuild
deleted file mode 100644
index 038b7b41135..00000000000
--- a/dev-python/shiboken/shiboken-1.2.2.ebuild
+++ /dev/null
@@ -1,91 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-PYTHON_COMPAT=( python2_7 python3_{4,5,6} )
-
-inherit cmake-utils multilib python-r1
-
-DESCRIPTION="A tool for creating Python bindings for C++ libraries"
-HOMEPAGE="http://qt-project.org/wiki/PySide";
-SRC_URI="http://download.qt-project.org/official_releases/pyside/${P}.tar.bz2";
-
-LICENSE="LGPL-2.1"
-SLOT="0"
-KEYWORDS="amd64 arm ~arm64 ppc ppc64 x86 ~amd64-linux ~x86-linux"
-
-IUSE="test"
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-
-RDEPEND="
- ${PYTHON_DEPS}
- dev-libs/libxml2
- dev-libs/libxslt
- dev-qt/qtcore:4
- dev-qt/qtxmlpatterns:4
-"
-DEPEND="${RDEPEND}
- test? (
- dev-qt/qtgui:4
- dev-qt/qttest:4
- )"
-
-DOCS=( AUTHORS ChangeLog )
-PATCHES=(
- "${FILESDIR}/${PV}-Fix-tests-with-Python-3.patch"
- "${FILESDIR}/${P}-gcc6.patch"
-)
-
-src_prepare() {
- # Fix inconsistent naming of libshiboken.so and ShibokenConfig.cmake,
- # caused by the usage of a different version suffix with python >= 3.2
- sed -i -e "/get_config_var('SOABI')/d" \
- cmake/Modules/FindPython3InterpWithDebug.cmake || die
-
- if use prefix; then
- cp "${FILESDIR}"/rpath.cmake . || die
- sed -i -e '1iinclude(rpath.cmake)' CMakeLists.txt || die
- fi
-
- cmake-utils_src_prepare
-}
-
-src_configure() {
- configuration() {
- local mycmakeargs=(
- $(cmake-utils_use_build test TESTS)
- -DPYTHON_EXECUTABLE="${PYTHON}"
- -DPYTHON_SITE_PACKAGES="$(python_get_sitedir)"
- -DPYTHON_SUFFIX="-${EPYTHON}"
- )
-
- if [[ ${EPYTHON} == python3* ]]; then
- mycmakeargs+=(
- -DUSE_PYTHON3=ON
- -DPYTHON3_EXECUTABLE="${PYTHON}"
- -DPYTHON3_INCLUDE_DIR="$(python_get_includedir)"
- -DPYTHON3_LIBRARY="$(python_get_library_path)"
- )
- fi
-
- cmake-utils_src_configure
- }
- python_foreach_impl configuration
-}
-
-src_compile() {
- python_foreach_impl cmake-utils_src_compile
-}
-
-src_test() {
- python_foreach_impl cmake-utils_src_test
-}
-
-src_install() {
- installation() {
- cmake-utils_src_install
- mv "${ED}"usr/$(get_libdir)/pkgconfig/${PN}{,-${EPYTHON}}.pc ||
die
- }
- python_foreach_impl installation
-}
diff --git a/profiles/package.mask b/profiles/package.mask
index ded906affd7..a056982c73e 100644
--- a/profiles/package.mask
+++ b/profiles/package.mask
@@ -217,13 +217,6 @@ media-libs/emfengine
media-libs/quarter
media-libs/SoQt
-# Andreas Sturmlechner <ast...@gentoo.org> (26 Jun 2018)
-# Depends on dead Qt4. Masked for removal.
-dev-python/pyqwt
-dev-python/PyQt4
-dev-python/pyside:0
-dev-python/shiboken:0
-
# Thomas Deutschmann <whi...@gentoo.org> (23 Jun 2018)
# Doesn't pass QA full boot test
=sys-kernel/ck-sources-4.16.17
