commit: c4fb1a83d92d4187f147c7b2e3edbb71cf36d99c
Author: Michael Palimaka <kensington <AT> gentoo <DOT> org>
AuthorDate: Tue Jun 10 08:06:09 2014 +0000
Commit: Michael Palimaka <kensington <AT> gentoo <DOT> org>
CommitDate: Tue Jun 10 08:06:09 2014 +0000
URL:
http://git.overlays.gentoo.org/gitweb/?p=proj/qt.git;a=commit;h=c4fb1a83
[dev-python/PyQt4] Remove old snapshot.
---
dev-python/PyQt4/Manifest | 1 -
dev-python/PyQt4/PyQt4-4.10.2_pre20130505.ebuild | 211 ------------------
.../files/PyQt4-4.7.3-qreal_float_support.patch | 239 ---------------------
dev-python/PyQt4/metadata.xml | 29 ---
4 files changed, 480 deletions(-)
diff --git a/dev-python/PyQt4/Manifest b/dev-python/PyQt4/Manifest
deleted file mode 100644
index 3bbadd1..0000000
--- a/dev-python/PyQt4/Manifest
+++ /dev/null
@@ -1 +0,0 @@
-DIST PyQt-x11-gpl-snapshot-4.10.2-6f54723ef2ba.tar.gz 11462772 SHA256
bbcf488599dfde14d621204a6081aedbd988771a98eec2a1151864cc90ee9c3f SHA512
56a0fb1363a5df6a4d761f7056f86469e4135cb71db01180966b26601e1edd9c9f00d7608fdeabf1938f9b4b34c19c9f37315dc55f02b8eda60c8e9a441b08cd
WHIRLPOOL
790c28b669b27dfa56396049c2e6d91d049099a6b30bed3ae86e51ab71cbcf6c48f954dc2e909a34f9ec3ba08cb78c4f67ad20e5bcb40d676e39133bf5fe9557
diff --git a/dev-python/PyQt4/PyQt4-4.10.2_pre20130505.ebuild
b/dev-python/PyQt4/PyQt4-4.10.2_pre20130505.ebuild
deleted file mode 100644
index 5660ecf..0000000
--- a/dev-python/PyQt4/PyQt4-4.10.2_pre20130505.ebuild
+++ /dev/null
@@ -1,211 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/PyQt4/PyQt4-4.10.3-r3.ebuild,v
1.2 2014/05/21 21:29:32 pesa Exp $
-
-EAPI=5
-PYTHON_COMPAT=( python{2_6,2_7,3_2,3_3} )
-REVISION=6f54723ef2ba
-
-inherit eutils multibuild python-r1 qmake-utils toolchain-funcs
-
-DESCRIPTION="Python bindings for the Qt toolkit"
-HOMEPAGE="http://www.riverbankcomputing.co.uk/software/pyqt/intro/
https://pypi.python.org/pypi/PyQt4";
-
-if [[ ${PV} == *_pre* ]]; then
- MY_P="PyQt-x11-gpl-snapshot-${PV%_pre*}-${REVISION}"
- SRC_URI="http://dev.gentoo.org/~hwoarang/distfiles/${MY_P}.tar.gz";
-else
- MY_P="PyQt-x11-gpl-${PV}"
- SRC_URI="mirror://sourceforge/pyqt/${MY_P}.tar.gz"
-fi
-
-LICENSE="|| ( GPL-2 GPL-3 )"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux
~x86-linux"
-
-IUSE="X dbus debug declarative designer doc examples help kde multimedia
opengl phonon script scripttools sql svg 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 )
- webkit? ( X )
-"
-
-# Minimal supported version of Qt.
-QT_PV="4.8.0:4"
-
-RDEPEND="
- ${PYTHON_DEPS}
- >=dev-python/sip-4.15.0:=[${PYTHON_USEDEP}]
- >=dev-qt/qtcore-${QT_PV}
- X? (
- >=dev-qt/qtgui-${QT_PV}
- >=dev-qt/qttest-${QT_PV}
- )
- dbus? (
- >=dev-python/dbus-python-0.80[${PYTHON_USEDEP}]
- >=dev-qt/qtdbus-${QT_PV}
- )
- declarative? ( >=dev-qt/qtdeclarative-${QT_PV} )
- designer? ( || ( dev-qt/designer:4 <dev-qt/qtgui-4.8.5:4 ) )
- help? ( >=dev-qt/qthelp-${QT_PV} )
- multimedia? ( >=dev-qt/qtmultimedia-${QT_PV} )
- opengl? ( >=dev-qt/qtopengl-${QT_PV} )
- phonon? (
- kde? ( media-libs/phonon )
- !kde? ( || ( >=dev-qt/qtphonon-${QT_PV} media-libs/phonon ) )
- )
- script? ( >=dev-qt/qtscript-${QT_PV} )
- sql? ( >=dev-qt/qtsql-${QT_PV} )
- svg? ( >=dev-qt/qtsvg-${QT_PV} )
- webkit? ( >=dev-qt/qtwebkit-${QT_PV} )
- xmlpatterns? ( >=dev-qt/qtxmlpatterns-${QT_PV} )
-"
-DEPEND="${RDEPEND}
- dbus? ( virtual/pkgconfig )
-"
-
-S=${WORKDIR}/${MY_P}
-
-src_prepare() {
- # Support qreal on arm architecture (bug 322349).
- use arm && epatch "${FILESDIR}/${PN}-4.7.3-qreal_float_support.patch"
-
- # Allow building against KDE's phonon (bug 433944 and others).
- sed -i \
- -e "s:VideoWidget()\":&,
extra_include_dirs=[\"${EPREFIX}/usr/include/qt4/QtGui\"]:" \
- -e "s:^\s\+generate_code(\"phonon\":&,
extra_include_dirs=[\"${EPREFIX}/usr/include/phonon\"]:" \
- configure.py || die
-
- if ! use dbus; then
- sed -i -e 's/^\(\s\+\)check_dbus()/\1pass/' configure.py || die
- fi
-
- python_copy_sources
-
- preparation() {
- if [[ ${EPYTHON} == python3.* ]]; then
- rm -fr pyuic/uic/port_v2
- else
- rm -fr pyuic/uic/port_v3
- fi
- }
- python_foreach_impl run_in_build_dir preparation
-}
-
-pyqt4_use_enable() {
- use $1 && echo --enable=${2:-Qt$(tr 'a-z' 'A-Z' <<< ${1:0:1})${1:1}}
-}
-
-src_configure() {
- configuration() {
- local myconf=(
- "${PYTHON}" configure.py
- --confirm-license
- --bindir="${EPREFIX}/usr/bin"
- --destdir="$(python_get_sitedir)"
- --sipdir="${EPREFIX}/usr/share/sip"
- --assume-shared
- --no-timestamp
- --qsci-api
- $(use debug && echo --debug)
- --enable=QtCore
- --enable=QtNetwork
- --enable=QtXml
- $(pyqt4_use_enable X QtGui)
- $(pyqt4_use_enable X QtTest)
- $(pyqt4_use_enable dbus QtDBus)
- $(pyqt4_use_enable declarative)
- $(pyqt4_use_enable designer) $(use designer || echo
--no-designer-plugin)
- $(pyqt4_use_enable help)
- $(pyqt4_use_enable multimedia)
- $(pyqt4_use_enable opengl QtOpenGL)
- $(pyqt4_use_enable phonon phonon)
- $(pyqt4_use_enable script)
- $(pyqt4_use_enable scripttools QtScriptTools)
- $(pyqt4_use_enable sql)
- $(pyqt4_use_enable svg)
- $(pyqt4_use_enable webkit QtWebKit)
- $(pyqt4_use_enable xmlpatterns QtXmlPatterns)
- 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=
- )
- echo "${myconf[@]}"
- "${myconf[@]}" || die
-
- local mod
- for mod in QtCore \
- $(use X && echo QtGui) \
- $(use dbus && echo QtDBus) \
- $(use declarative && echo QtDeclarative) \
- $(use designer && echo QtDesigner) \
- $(use opengl && echo QtOpenGL); do
- # Run eqmake4 inside the qpy subdirectories to respect
- # CC, CXX, CFLAGS, CXXFLAGS, LDFLAGS and avoid
stripping.
- pushd qpy/${mod} > /dev/null || return
- eqmake4 $(ls w_qpy*.pro)
- popd > /dev/null || return
-
- # Fix insecure runpaths.
- sed -i -e "/^LFLAGS\s*=/
s:-Wl,-rpath,${BUILD_DIR}/qpy/${mod}::" \
- ${mod}/Makefile || die "failed to fix rpath for
${mod}"
- done
-
- # Avoid stripping of libpythonplugin.so.
- if use designer; then
- pushd designer > /dev/null || return
- eqmake4 python.pro
- popd > /dev/null || return
- fi
- }
- python_parallel_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
-
- # INSTALL_ROOT is used by designer/Makefile, other Makefiles
use DESTDIR.
- emake DESTDIR="${tmp_root}" INSTALL_ROOT="${tmp_root}" install
-
- python_doexe "${tmp_root}${EPREFIX}"/usr/bin/pyuic4
- rm "${tmp_root}${EPREFIX}"/usr/bin/pyuic4 || die
-
- multibuild_merge_root "${tmp_root}" "${D}"
- python_optimize
- }
- python_foreach_impl run_in_build_dir installation
-
- dodoc NEWS THANKS
-
- if use doc; then
- dohtml -r doc/html/*
- fi
-
- if use examples; then
- insinto /usr/share/doc/${PF}
- doins -r examples
- fi
-}
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 37e1e69..0000000
--- 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 <[email protected]>
-##
-## 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 02d3937..0000000
--- a/dev-python/PyQt4/metadata.xml
+++ /dev/null
@@ -1,29 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd";>
-<pkgmetadata>
- <herd>qt</herd>
- <use>
- <flag name="X">Build QtGui and QtTest modules</flag>
- <flag name="declarative">Build QtDeclarative module</flag>
- <flag name="designer">Build QtDesigner module</flag>
- <flag name="help">Build QtHelp module</flag>
- <flag name="kde">Select <pkg>media-libs/phonon</pkg> as Phonon
variant (needed for KDE)</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>
- <upstream>
- <maintainer status="active">
- <email>[email protected]</email>
- <name>Phil Thompson</name>
- </maintainer>
- <bugs-to>mailto:[email protected]</bugs-to>
- <remote-id type="pypi">PyQt4</remote-id>
- </upstream>
-</pkgmetadata>
