From: Markos Chandras Date: Sat, 17 Apr 2010 09:47:41 +0000 (+0000) Subject: Version bump X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=55349f6695f45dae0cd774bdb2431c132a2a0f35;p=gentoo.git Version bump Package-Manager: portage-2.2_rc67/cvs/Linux x86_64 --- diff --git a/dev-python/PyQt4/ChangeLog b/dev-python/PyQt4/ChangeLog index 6310dcb12c9d..9591be76bd4b 100644 --- a/dev-python/PyQt4/ChangeLog +++ b/dev-python/PyQt4/ChangeLog @@ -1,6 +1,11 @@ # 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.113 2010/04/11 13:14:17 nixnut Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-python/PyQt4/ChangeLog,v 1.114 2010/04/17 09:47:41 hwoarang Exp $ + +*PyQt4-4.7.3 (17 Apr 2010) + + 17 Apr 2010; Markos Chandras +PyQt4-4.7.3.ebuild: + Version bump 11 Apr 2010; PyQt4-4.7.ebuild: ppc stable #301105 diff --git a/dev-python/PyQt4/Manifest b/dev-python/PyQt4/Manifest index bb2c6982e7d8..6254e290e400 100644 --- a/dev-python/PyQt4/Manifest +++ b/dev-python/PyQt4/Manifest @@ -6,10 +6,12 @@ AUX configure.py.patch 1727 RMD160 31802058d0b0488264cdbcfeebd7ce9aff250957 SHA1 DIST PyQt-x11-gpl-4.5.4.tar.gz 6970552 RMD160 0f7a48edb65116c8fb23357f66d164ff1fe48684 SHA1 be8b01b8b2343a6a85f18d16f10bc549e88265d6 SHA256 b3d06c7bda701055769add93b48103ee35c6fc9a4b00c67599cb426f9efda5a8 DIST PyQt-x11-gpl-4.6.2.tar.gz 6979753 RMD160 acd984f335c3b9661603388347e064098f50856c SHA1 41c04232618b78497145ba91ff25e5891c1624b5 SHA256 09312616c3e796b670222c575bbaab6f367f45242f2e82f83f8b3af9ce535bcf 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.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 4519 RMD160 eac52d55ae07cab5dead1fde5116f6903c75f548 SHA1 af58e1ef94ac3ca300d5f5b7cd5d9bce271a03a9 SHA256 e53378e729e812506508560ae971e731337115855f35ecfbaf350a372e96a0d4 +EBUILD PyQt4-4.7.3.ebuild 4521 RMD160 c2b52e5e9849af78d81a5c024aad71b9f872482f SHA1 2ff554ee8c3702e6a8a2c257158d40f5e9fddbc7 SHA256 abf2363ef040e5e6136bd1c1339e51a881ef152a00a2dbd0998ee1f32d4e13d4 EBUILD PyQt4-4.7.ebuild 4518 RMD160 4835ad318478bfa42c1db6548a8b01708470731e SHA1 7f67a35b3122548bf77d963950cba5868c941cd4 SHA256 103f1c2270495b8454481726b62ef48525848e011364d0a076fbbc1259db02a7 -MISC ChangeLog 15461 RMD160 19156177ca73f419c03b8470768c5222b5e760c0 SHA1 03479775534c28da1f90a1400c9bae4c998b2a07 SHA256 c55135593babadd1aa9d03feee07f9057a16eb3bdc47d6bc22948b0fcfb4598b +MISC ChangeLog 15581 RMD160 4d0d8e73088d4c5320edf7238da8dab9d53251b0 SHA1 a451c995ad2c009dc6c79afdf05f17329786d8e4 SHA256 9e6d57d8201072b1d865676fc239eb40c9a27a5fb9510ff760fae1feabf74c45 MISC metadata.xml 846 RMD160 9ebdd502e44dac1e93f95e60936ad7871be6ed1c SHA1 2731e0ad5e11b9f0e4089cd9d9e2b342b6103c09 SHA256 6a481f4cc08dcb57f2b7bb0cc3d6944aa281fd3bc7a3aa586aa50372323b838c diff --git a/dev-python/PyQt4/PyQt4-4.7.3.ebuild b/dev-python/PyQt4/PyQt4-4.7.3.ebuild new file mode 100644 index 000000000000..7579097f3840 --- /dev/null +++ b/dev-python/PyQt4/PyQt4-4.7.3.ebuild @@ -0,0 +1,168 @@ +# 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.3.ebuild,v 1.1 2010/04/17 09:47:41 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.10* + >=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 + + 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 +}