summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMarkos Chandras <hwoarang@gentoo.org>2010-09-01 09:04:59 +0000
committerMarkos Chandras <hwoarang@gentoo.org>2010-09-01 09:04:59 +0000
commit021322f3cec11bc733d570129493565f6616b846 (patch)
treee032da126642426ac8d664b450dd6ee4429397ec /dev-python/PyQt4
parentVersion bump (diff)
downloadhistorical-021322f3cec11bc733d570129493565f6616b846.tar.gz
historical-021322f3cec11bc733d570129493565f6616b846.tar.bz2
historical-021322f3cec11bc733d570129493565f6616b846.zip
Version bump
Package-Manager: portage-2.2_rc72/cvs/Linux x86_64
Diffstat (limited to 'dev-python/PyQt4')
-rw-r--r--dev-python/PyQt4/ChangeLog8
-rw-r--r--dev-python/PyQt4/Manifest16
-rw-r--r--dev-python/PyQt4/PyQt4-4.7.4.ebuild10
-rw-r--r--dev-python/PyQt4/PyQt4-4.7.5.ebuild172
4 files changed, 198 insertions, 8 deletions
diff --git a/dev-python/PyQt4/ChangeLog b/dev-python/PyQt4/ChangeLog
index 7ac98c2eb458..832134fb6578 100644
--- a/dev-python/PyQt4/ChangeLog
+++ b/dev-python/PyQt4/ChangeLog
@@ -1,6 +1,12 @@
# ChangeLog for dev-python/PyQt4
# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/PyQt4/ChangeLog,v 1.122 2010/08/18 03:50:35 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/PyQt4/ChangeLog,v 1.123 2010/09/01 09:04:59 hwoarang Exp $
+
+*PyQt4-4.7.5 (01 Sep 2010)
+
+ 01 Sep 2010; Markos Chandras <hwoarang@gentoo.org> PyQt4-4.7.4.ebuild,
+ +PyQt4-4.7.5.ebuild:
+ Version bump
18 Aug 2010; Jeroen Roovers <jer@gentoo.org> PyQt4-4.7.3.ebuild:
Stable for HPPA (bug #315775).
diff --git a/dev-python/PyQt4/Manifest b/dev-python/PyQt4/Manifest
index fb80b9b27254..f7475c8480f1 100644
--- a/dev-python/PyQt4/Manifest
+++ b/dev-python/PyQt4/Manifest
@@ -1,3 +1,6 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
AUX PyQt4-4.5.4-qgraphicslinearlayout-fix.patch 572 RMD160 81e80c650ef118a7fe9b1a0c581117774552daa7 SHA1 90980166dbe91f4b8e32b82736c92761547c2126 SHA256 b489794c26b1884971dc4bebaec3a625a1827df7b9532965b321ba2c00472562
AUX PyQt4-4.6.1-configure-multilib.patch 883 RMD160 4ce96cdf4d53773c245544737c894c2494e9de29 SHA1 d0c9b214172b47537873e3fc1bd5fb34e815220c SHA256 6b33666a0b773122330d33a1b88ddd3b18d2d3b2c265e3fd4edc253f1bdfab1a
AUX PyQt4-4.7.2-configure.py.patch 933 RMD160 1c9525855d47bcdbf0c88618294be44274ce653b SHA1 4b27ab9173692a9d74598dc7c7fc88c3531e09b5 SHA256 1a87c58ccb14441f77c7c764b6e6c40d1bdd64c5b35581f3deda54019a3461be
@@ -9,12 +12,21 @@ DIST PyQt-x11-gpl-4.6.2.tar.gz 6979753 RMD160 acd984f335c3b9661603388347e064098f
DIST PyQt-x11-gpl-4.7.2.tar.gz 7803259 RMD160 1ac032761dbdbb7b7d446ae81a15e263df557c6c SHA1 56d8f730e5fdad0324f186306c52bcaf9b88fe7e SHA256 db17c93f6090d75fb2964e589cd9403d88252af5b225f4515165637972ebef24
DIST PyQt-x11-gpl-4.7.3.tar.gz 7803557 RMD160 fb86bb4abc665e67620d6a77dcd37ad6c6f038c4 SHA1 7ad7ed37509f13b4975c50f5fbf557bd58815558 SHA256 574ad672b4171272028c49d5867087db04287c4dc7be8af17d71542db3a8225c
DIST PyQt-x11-gpl-4.7.4.tar.gz 7812552 RMD160 d93f83c40277829008d9a7e47f7f9c651b36e0d7 SHA1 dd1d9eb22f9780c54e3811c8958512847eacc302 SHA256 1900984b9fb830b8e394da338d304fa4555fa4aa0e7bc8774ea2c172eec7f128
+DIST PyQt-x11-gpl-4.7.5.tar.gz 7816707 RMD160 ae389c724d248ebbcc2445f044a4e1965b3d89f5 SHA1 0c7c96872b8dfc1822618fbaacae735e91d8405f SHA256 26d9de915932af0ffb4886977b055b079f2193d04a5d706f32a504062dcb6802
DIST PyQt-x11-gpl-4.7.tar.gz 7888435 RMD160 bddf2b4d668733a7a6bbb179dd986b5f82752198 SHA1 3cc46c8cc9c83ac111cd171ee594b2d34a4133dc SHA256 7fee05d926f33c290544965960262f1866256d95021332f8ab6918fe22419743
EBUILD PyQt4-4.5.4-r4.ebuild 4004 RMD160 12533cb11dbcc3ad71fc08e53ea00c0a90ba7ef8 SHA1 70359bf705d8a5c379562239ea9ea0a41452d3da SHA256 353ce0d264c35b684bdd2f9ca876ac76a2b0aadf010b56e0ad03697cb507bc8b
EBUILD PyQt4-4.6.2.ebuild 4025 RMD160 47ba49049478e52969db91376cdc22173d284cd7 SHA1 5705b8cf534fcbc0f066c709851c616e1a35fe43 SHA256 e3fadf2cfe5a87bdfc66038ddaf28e0b6f4970cd86445a36a608f4054a94461b
EBUILD PyQt4-4.7.2.ebuild 4522 RMD160 c5311daf946a59539a09e881bf0c6592ecdf2e03 SHA1 62b2696965c11ee2eb6b8bf6cf8340ae9a123b32 SHA256 2da5f3deb7fdd598ca0601664367d64635cb74a6a665cd4d030af42171feddd1
EBUILD PyQt4-4.7.3.ebuild 4643 RMD160 1458b0954a9e357d6bc4d517d009ca9d8a0663ba SHA1 8bc505777ed7416f510386e0cc0efe15a728da0d SHA256 8c5210a8f2e265df24ddf51271e4f351f096458c7cbda8013059e45044b3159d
-EBUILD PyQt4-4.7.4.ebuild 4661 RMD160 969fb18a632fe79884f212b55bf25439d3d1518f SHA1 3f38a05522ab74191256b32fe2aa1d23db0c0062 SHA256 b9eecc7c4b17ccf930329ffa0515a157c71deecfc7ac1b2a7920aeea56da0474
+EBUILD PyQt4-4.7.4.ebuild 4655 RMD160 f8468107ea23a0b245f339c6f1d0538fcaff5d56 SHA1 1da60d8c373885447aa360655fb9e39f05610767 SHA256 91878b276fdf2382cf54a3685be3300814c4e22b5702ec18e3d4a0f1919df590
+EBUILD PyQt4-4.7.5.ebuild 4665 RMD160 d13051c8f25d591eed6a49942f03f8ed4992b5b1 SHA1 d6b798e12c462df544a3b2d05775938d9a9ec2ae SHA256 dcd1bb19d26fdd13e4b333e80e55552918983bb0b8446d57951354d95b8dc81d
EBUILD PyQt4-4.7.ebuild 4521 RMD160 ad65e74cc548e948b30a8f351ec5cc6c093303f3 SHA1 c455c022244deda7ef8bbe3eaba1e6d31b7e93cb SHA256 a01e9535a585f0eb7bee8a97b1254c11686f59653454f84a3126cecf9bc7a160
-MISC ChangeLog 16562 RMD160 77d9ea7dc7b092da7ca53ff058f130b25025ea3c SHA1 dc64ec6c895c08adc3f7074e8bb3895d180bc887 SHA256 499b8aae0a01a86f396e7a56d0e8fd715966851e9d4010fc71119c0d56445aaa
+MISC ChangeLog 16707 RMD160 f8a343f2c4eca24b6c720d46167cc5ecd528ecaf SHA1 ee81876ed61bd166d00fc9e695d146641d5863f2 SHA256 79f3be142907a782c41b22f889ac904c4682fda82395075b6365224435d5a84e
MISC metadata.xml 846 RMD160 9ebdd502e44dac1e93f95e60936ad7871be6ed1c SHA1 2731e0ad5e11b9f0e4089cd9d9e2b342b6103c09 SHA256 6a481f4cc08dcb57f2b7bb0cc3d6944aa281fd3bc7a3aa586aa50372323b838c
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.16 (GNU/Linux)
+
+iEYEARECAAYFAkx+F0sACgkQ9/cejkQaxBBaNgCfXkV5qpRN+FMoZFCB5iupdMJ5
+rKcAnjNjUlcSTcoo3mmluLOMKnlC0YSp
+=IXpH
+-----END PGP SIGNATURE-----
diff --git a/dev-python/PyQt4/PyQt4-4.7.4.ebuild b/dev-python/PyQt4/PyQt4-4.7.4.ebuild
index 0ed0fc2e36db..2318175ae8b5 100644
--- a/dev-python/PyQt4/PyQt4-4.7.4.ebuild
+++ b/dev-python/PyQt4/PyQt4-4.7.4.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2010 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/PyQt4/PyQt4-4.7.4.ebuild,v 1.2 2010/07/15 11:19:50 hwoarang Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/PyQt4/PyQt4-4.7.4.ebuild,v 1.3 2010/09/01 09:04:59 hwoarang Exp $
EAPI="2"
PYTHON_EXPORT_PHASE_FUNCTIONS="1"
@@ -88,7 +88,7 @@ src_configure() {
use prefix || EPREFIX=
configuration() {
- local myconf="$(PYTHON) configure.py
+ set -- $(PYTHON) configure.py
--confirm-license
--bindir=${EPREFIX}/usr/bin
--destdir=${EPREFIX}$(python_get_sitedir)
@@ -114,9 +114,9 @@ src_configure() {
$(pyqt4_use_enable xmlpatterns QtXmlPatterns)
CC=$(tc-getCC) CXX=$(tc-getCXX)
LINK=$(tc-getCXX) LINK_SHLIB=$(tc-getCXX)
- CFLAGS='${CFLAGS}' CXXFLAGS='${CXXFLAGS}' LFLAGS='${LDFLAGS}'"
- echo ${myconf}
- eval ${myconf} || return 1
+ CFLAGS='${CFLAGS}' CXXFLAGS='${CXXFLAGS}' LFLAGS='${LDFLAGS}'
+ echo "$@"
+ "$@" || die "configure.py failed"
for mod in QtCore $(use X && echo 'QtDesigner QtGui'); do
# Run eqmake4 inside the qpy subdirs to prevent
diff --git a/dev-python/PyQt4/PyQt4-4.7.5.ebuild b/dev-python/PyQt4/PyQt4-4.7.5.ebuild
new file mode 100644
index 000000000000..8128a8d655f7
--- /dev/null
+++ b/dev-python/PyQt4/PyQt4-4.7.5.ebuild
@@ -0,0 +1,172 @@
+# Copyright 1999-2010 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-python/PyQt4/PyQt4-4.7.5.ebuild,v 1.1 2010/09/01 09:04:59 hwoarang Exp $
+
+EAPI="2"
+PYTHON_EXPORT_PHASE_FUNCTIONS="1"
+SUPPORT_PYTHON_ABIS="1"
+
+inherit qt4-r2 python toolchain-funcs
+
+MY_P="PyQt-x11-gpl-${PV/_pre/-snapshot-}"
+QTVER="4.6.2" # minimal Qt version this is supposed to work with
+
+DESCRIPTION="A set of Python bindings for the Qt toolkit"
+HOMEPAGE="http://www.riverbankcomputing.co.uk/software/pyqt/intro/ http://pypi.python.org/pypi/PyQt"
+SRC_URI="http://www.riverbankcomputing.com/static/Downloads/${PN}/${MY_P}.tar.gz"
+
+SLOT="0"
+LICENSE="|| ( GPL-2 GPL-3 )"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux"
+IUSE="X assistant +dbus debug doc examples kde multimedia opengl phonon sql svg webkit xmlpatterns"
+
+DEPEND=">=dev-python/sip-4.11
+ >=x11-libs/qt-core-${QTVER}:4
+ >=x11-libs/qt-script-${QTVER}:4
+ >=x11-libs/qt-test-${QTVER}:4
+ X? ( >=x11-libs/qt-gui-${QTVER}:4[dbus?] )
+ assistant? ( >=x11-libs/qt-assistant-${QTVER}:4 )
+ dbus? (
+ >=dev-python/dbus-python-0.80
+ >=x11-libs/qt-dbus-${QTVER}:4
+ )
+ multimedia? ( >=x11-libs/qt-multimedia-${QTVER}:4 )
+ opengl? ( >=x11-libs/qt-opengl-${QTVER}:4 )
+ phonon? (
+ !kde? ( || ( >=x11-libs/qt-phonon-${QTVER}:4 media-sound/phonon ) )
+ kde? ( media-sound/phonon )
+ )
+ sql? ( >=x11-libs/qt-sql-${QTVER}:4 )
+ svg? ( >=x11-libs/qt-svg-${QTVER}:4 )
+ webkit? ( >=x11-libs/qt-webkit-${QTVER}:4 )
+ xmlpatterns? ( >=x11-libs/qt-xmlpatterns-${QTVER}:4 )"
+RDEPEND="${DEPEND}"
+RESTRICT_PYTHON_ABIS="3.2" # doesn't build with python:3.2 (yet), bug 292419
+
+S=${WORKDIR}/${MY_P}
+
+PATCHES=(
+ "${FILESDIR}/${PN}-4.6.1-configure-multilib.patch"
+ "${FILESDIR}/${PN}-4.7.2-configure.py.patch"
+)
+
+src_prepare() {
+ use prefix || EPREFIX=
+
+ if ! use dbus; then
+ sed -i -e 's,^\([[:blank:]]\+\)check_dbus(),\1pass,' \
+ "${S}"/configure.py || die
+ fi
+
+ # Patch to support qreal for arm architecture
+ # wrt bug #322349
+ use arm && epatch "${FILESDIR}/${PN}-4.7.3-qreal_float_support.patch"
+
+ qt4-r2_src_prepare
+
+ # Use proper include dir
+ sed -e "s|/usr/include|${EPREFIX}/usr/include|g" \
+ -i configure.py
+
+ python_copy_sources
+
+ preparation() {
+ if [[ "${PYTHON_ABI:0:1}" == "3" ]]; then
+ rm -fr pyuic/uic/port_v2
+ else
+ rm -fr pyuic/uic/port_v3
+ fi
+ }
+ python_execute_function -s preparation
+}
+
+pyqt4_use_enable() {
+ use $1 && echo "--enable=${2:-$1}"
+}
+
+src_configure() {
+ use prefix || EPREFIX=
+
+ configuration() {
+ local myconf="$(PYTHON) configure.py
+ --confirm-license
+ --bindir="${EPREFIX}"/usr/bin
+ --destdir="${EPREFIX}"$(python_get_sitedir)
+ --sipdir="${EPREFIX}"/usr/share/sip
+ --qsci-api
+ $(use debug && echo '--debug')
+ --enable=QtCore
+ --enable=QtNetwork
+ --enable=QtScript
+ --enable=QtTest
+ --enable=QtXml
+ $(pyqt4_use_enable X QtGui)
+ $(pyqt4_use_enable X QtDesigner)
+ $(pyqt4_use_enable X QtScriptTools)
+ $(pyqt4_use_enable assistant QtAssistant)
+ $(pyqt4_use_enable assistant QtHelp)
+ $(pyqt4_use_enable multimedia QtMultimedia)
+ $(pyqt4_use_enable opengl QtOpenGL)
+ $(pyqt4_use_enable phonon)
+ $(pyqt4_use_enable sql QtSql)
+ $(pyqt4_use_enable svg QtSvg)
+ $(pyqt4_use_enable webkit QtWebKit)
+ $(pyqt4_use_enable xmlpatterns QtXmlPatterns)
+ CC=$(tc-getCC) CXX=$(tc-getCXX)
+ LINK=$(tc-getCXX) LINK_SHLIB=$(tc-getCXX)
+ CFLAGS='${CFLAGS}' CXXFLAGS='${CXXFLAGS}' LFLAGS='${LDFLAGS}'"
+ echo ${myconf}
+ eval ${myconf} || return 1
+
+ for mod in QtCore $(use X && echo 'QtDesigner QtGui'); do
+ # Run eqmake4 inside the qpy subdirs to prevent
+ # stripping and many other QA issues
+ pushd qpy/${mod} > /dev/null || die
+ eqmake4 $(ls w_qpy*.pro)
+ popd > /dev/null || die
+
+ # Fix insecure runpaths
+ sed -i -e "/^LFLAGS/s:-Wl,-rpath,${BUILDDIR}/qpy/${mod}::" \
+ ${mod}/Makefile || die "failed to fix rpath issues"
+ done
+
+ # Fix pre-stripping of libpythonplugin.so
+ if use X; then
+ cd "${BUILDDIR}"/designer
+ eqmake4 python.pro
+ fi
+ }
+ python_execute_function -s configuration
+}
+
+src_compile() {
+ python_src_compile
+}
+
+src_install() {
+ installation() {
+ # INSTALL_ROOT is needed for the QtDesigner module,
+ # the other Makefiles use DESTDIR.
+ emake DESTDIR="${D}" INSTALL_ROOT="${D}" install
+ }
+ python_execute_function -s installation
+
+ dodoc doc/pyqt4ref.txt NEWS THANKS || die
+
+ if use doc; then
+ dohtml -r doc/* || die
+ fi
+
+ if use examples; then
+ insinto /usr/share/doc/${PF}
+ doins -r examples || die
+ fi
+}
+
+pkg_postinst() {
+ python_mod_optimize PyQt4
+}
+
+pkg_postrm() {
+ python_mod_cleanup PyQt4
+}