commit: 591e84b6611409f879db853adbe79806b797b9fe
Author: Davide Pesavento <pesa <AT> gentoo <DOT> org>
AuthorDate: Wed May 21 21:49:15 2014 +0000
Commit: Davide Pesavento <pesa <AT> gentoo <DOT> org>
CommitDate: Wed May 21 21:49:15 2014 +0000
URL:
http://git.overlays.gentoo.org/gitweb/?p=proj/qt.git;a=commit;h=591e84b6
[sip/PyQt4] Sync with portage (but the snapshots are still very old...)
---
dev-python/PyQt4/PyQt4-4.10.2_pre20130505.ebuild | 33 +++++++++++++-----------
dev-python/PyQt4/metadata.xml | 6 ++---
dev-python/sip/files/sip-4.15.5-darwin.patch | 30 +++++++++++++++++++++
dev-python/sip/metadata.xml | 1 -
dev-python/sip/sip-4.9999.ebuild | 6 ++---
5 files changed, 54 insertions(+), 22 deletions(-)
diff --git a/dev-python/PyQt4/PyQt4-4.10.2_pre20130505.ebuild
b/dev-python/PyQt4/PyQt4-4.10.2_pre20130505.ebuild
index 6c3eff7..5660ecf 100644
--- a/dev-python/PyQt4/PyQt4-4.10.2_pre20130505.ebuild
+++ b/dev-python/PyQt4/PyQt4-4.10.2_pre20130505.ebuild
@@ -1,15 +1,15 @@
# 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-r1.ebuild,v
1.1 2013/10/23 10:14:55 mgorny Exp $
+# $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 qt4-r2 python-r1 toolchain-funcs
+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/
http://pypi.python.org/pypi/PyQt";
+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}"
@@ -23,10 +23,11 @@ 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 doc examples help kde multimedia opengl phonon
script scripttools sql svg webkit xmlpatterns"
+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 )
@@ -42,12 +43,10 @@ QT_PV="4.8.0:4"
RDEPEND="
${PYTHON_DEPS}
- dev-python/python-exec:2[${PYTHON_USEDEP}]
>=dev-python/sip-4.15.0:=[${PYTHON_USEDEP}]
>=dev-qt/qtcore-${QT_PV}
X? (
>=dev-qt/qtgui-${QT_PV}
- || ( dev-qt/designer:4 <dev-qt/qtgui-4.8.5:4 )
>=dev-qt/qttest-${QT_PV}
)
dbus? (
@@ -55,6 +54,7 @@ RDEPEND="
>=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} )
@@ -75,8 +75,6 @@ DEPEND="${RDEPEND}
S=${WORKDIR}/${MY_P}
src_prepare() {
- qt4-r2_src_prepare
-
# Support qreal on arm architecture (bug 322349).
use arm && epatch "${FILESDIR}/${PN}-4.7.3-qreal_float_support.patch"
@@ -121,11 +119,11 @@ src_configure() {
--enable=QtCore
--enable=QtNetwork
--enable=QtXml
- $(pyqt4_use_enable X QtDesigner) $(use X || echo
--no-designer-plugin)
$(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)
@@ -155,9 +153,10 @@ src_configure() {
local mod
for mod in QtCore \
- $(use X && echo QtDesigner QtGui) \
+ $(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.
@@ -171,7 +170,7 @@ src_configure() {
done
# Avoid stripping of libpythonplugin.so.
- if use X; then
+ if use designer; then
pushd designer > /dev/null || return
eqmake4 python.pro
popd > /dev/null || return
@@ -186,15 +185,19 @@ src_compile() {
src_install() {
installation() {
+ local tmp_root=${D%/}/tmp
+
# INSTALL_ROOT is used by designer/Makefile, other Makefiles
use DESTDIR.
- emake DESTDIR="${D}" INSTALL_ROOT="${D}" install
- mkdir -p "${ED}"/usr/lib/python-exec/${EPYTHON} || die
- mv "${ED}"/usr/bin/pyuic4
"${ED}"/usr/lib/python-exec/${EPYTHON}/ || die
+ 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
- dosym ../lib/python-exec/python-exec2 /usr/bin/pyuic4
dodoc NEWS THANKS
if use doc; then
diff --git a/dev-python/PyQt4/metadata.xml b/dev-python/PyQt4/metadata.xml
index 8d6135d..02d3937 100644
--- a/dev-python/PyQt4/metadata.xml
+++ b/dev-python/PyQt4/metadata.xml
@@ -2,10 +2,10 @@
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd";>
<pkgmetadata>
<herd>qt</herd>
- <herd>python</herd>
<use>
- <flag name="X">Build QtGui, QtDesigner and QtScriptTools
modules</flag>
+ <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>
@@ -24,6 +24,6 @@
<name>Phil Thompson</name>
</maintainer>
<bugs-to>mailto:[email protected]</bugs-to>
- <remote-id type="pypi">PyQt</remote-id>
+ <remote-id type="pypi">PyQt4</remote-id>
</upstream>
</pkgmetadata>
diff --git a/dev-python/sip/files/sip-4.15.5-darwin.patch
b/dev-python/sip/files/sip-4.15.5-darwin.patch
new file mode 100644
index 0000000..b625d15
--- /dev/null
+++ b/dev-python/sip/files/sip-4.15.5-darwin.patch
@@ -0,0 +1,30 @@
+diff -ur sip-4.15.5.orig/siputils.py sip-4.15.5/siputils.py
+--- siputils.py 2014-02-21 18:31:35.000000000 +0800
++++ siputils.py 2014-04-01 23:21:41.895036589 +0800
+@@ -945,8 +945,6 @@
+ """
+ if self.generator in ("MSVC", "MSVC.NET", "MSBUILD", "BMAKE"):
+ plib = clib + ".lib"
+- elif sys.platform == "darwin" and framework:
+- plib = "-framework " + clib
+ else:
+ plib = "-l" + clib
+
+@@ -961,8 +959,6 @@
+ """
+ if self.generator in ("MSVC", "MSVC.NET", "MSBUILD", "BMAKE"):
+ prl_name = os.path.join(self.config.qt_lib_dir, clib + ".prl")
+- elif sys.platform == "darwin" and framework:
+- prl_name = os.path.join(self.config.qt_lib_dir, clib +
".framework", clib + ".prl")
+ else:
+ prl_name = os.path.join(self.config.qt_lib_dir, "lib" + clib +
".prl")
+
+@@ -1633,7 +1629,7 @@
+ if sys.platform == "win32":
+ ext = "pyd"
+ elif sys.platform == "darwin":
+- ext = "so"
++ ext = "bundle"
+ elif sys.platform == "cygwin":
+ ext = "dll"
+ else:
diff --git a/dev-python/sip/metadata.xml b/dev-python/sip/metadata.xml
index cbe6e6d..ff3d49f 100644
--- a/dev-python/sip/metadata.xml
+++ b/dev-python/sip/metadata.xml
@@ -2,7 +2,6 @@
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd";>
<pkgmetadata>
<herd>qt</herd>
- <herd>python</herd>
<upstream>
<maintainer status="active">
<email>[email protected]</email>
diff --git a/dev-python/sip/sip-4.9999.ebuild b/dev-python/sip/sip-4.9999.ebuild
index b9e8808..1e5d202 100644
--- a/dev-python/sip/sip-4.9999.ebuild
+++ b/dev-python/sip/sip-4.9999.ebuild
@@ -3,7 +3,7 @@
# $Header: $
EAPI=5
-PYTHON_COMPAT=( python{2_6,2_7,3_2,3_3} )
+PYTHON_COMPAT=( python{2_6,2_7,3_2,3_3,3_4} )
inherit eutils python-r1 toolchain-funcs
@@ -27,7 +27,7 @@ else
fi
# Sub-slot based on SIP_API_MAJOR_NR from siplib/sip.h.in
-SLOT="0/10"
+SLOT="0/11"
KEYWORDS=""
IUSE="debug doc"
@@ -44,7 +44,7 @@ RDEPEND="${DEPEND}"
REQUIRED_USE="${PYTHON_REQUIRED_USE}"
src_prepare() {
- epatch "${FILESDIR}"/${PN}-4.9.3-darwin.patch
+ epatch "${FILESDIR}"/${PN}-4.15.5-darwin.patch
if [[ ${PV} == *9999* ]]; then
python2 build.py prepare || die
