From: Markos Chandras Date: Tue, 13 Jul 2010 08:12:59 +0000 (+0000) Subject: Version bump X-Git-Url: http://git.tremily.us/gitweb.cgi?a=commitdiff_plain;h=dcf471cb55699ae82364566cc176908899e60456;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 7e21d3262433..ce17fd377dc4 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.119 2010/07/05 14:00:27 ssuominen Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-python/PyQt4/ChangeLog,v 1.120 2010/07/13 08:10:18 hwoarang Exp $ + +*PyQt4-4.7.4 (13 Jul 2010) + + 13 Jul 2010; Markos Chandras +PyQt4-4.7.4.ebuild: + Version bump 05 Jul 2010; Samuli Suominen PyQt4-4.7.3.ebuild: ppc64 stable wrt #315775 diff --git a/dev-python/PyQt4/PyQt4-4.7.4.ebuild b/dev-python/PyQt4/PyQt4-4.7.4.ebuild new file mode 100644 index 000000000000..016b5c24728a --- /dev/null +++ b/dev-python/PyQt4/PyQt4-4.7.4.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.4.ebuild,v 1.1 2010/07/13 08:10:18 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 + + # Patch to support qreal for arm architecture + # wrt bug #322349 + use arm && epatch "${FILESDIR}/${P}-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 +} diff --git a/dev-python/qscintilla-python/ChangeLog b/dev-python/qscintilla-python/ChangeLog index dac6a18c0d91..3eb914ebc092 100644 --- a/dev-python/qscintilla-python/ChangeLog +++ b/dev-python/qscintilla-python/ChangeLog @@ -1,6 +1,12 @@ # ChangeLog for dev-python/qscintilla-python # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/dev-python/qscintilla-python/ChangeLog,v 1.58 2010/07/05 14:01:24 ssuominen Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-python/qscintilla-python/ChangeLog,v 1.59 2010/07/13 08:12:59 hwoarang Exp $ + +*qscintilla-python-2.4.4 (13 Jul 2010) + + 13 Jul 2010; Markos Chandras + +qscintilla-python-2.4.4.ebuild: + Version bump 05 Jul 2010; Samuli Suominen qscintilla-python-2.4.3.ebuild: diff --git a/dev-python/qscintilla-python/qscintilla-python-2.4.4.ebuild b/dev-python/qscintilla-python/qscintilla-python-2.4.4.ebuild new file mode 100644 index 000000000000..cafa9a72c9ff --- /dev/null +++ b/dev-python/qscintilla-python/qscintilla-python-2.4.4.ebuild @@ -0,0 +1,51 @@ +# Copyright 1999-2010 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: /var/cvsroot/gentoo-x86/dev-python/qscintilla-python/qscintilla-python-2.4.4.ebuild,v 1.1 2010/07/13 08:12:59 hwoarang Exp $ + +EAPI="2" +PYTHON_EXPORT_PHASE_FUNCTIONS="1" +SUPPORT_PYTHON_ABIS="1" + +inherit eutils python toolchain-funcs + +MY_P="QScintilla-gpl-${PV/_pre/-snapshot-}" + +DESCRIPTION="Python bindings for Qscintilla" +HOMEPAGE="http://www.riverbankcomputing.co.uk/software/qscintilla/intro" +SRC_URI="http://www.riverbankcomputing.co.uk/static/Downloads/QScintilla2/${MY_P}.tar.gz" + +LICENSE="|| ( GPL-2 GPL-3 )" +SLOT="0" +KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd" +IUSE="debug" + +DEPEND=">=dev-python/sip-4.10 + >=dev-python/PyQt4-4.7[X] + ~x11-libs/qscintilla-${PV}" +RDEPEND="${DEPEND}" + +S="${WORKDIR}/${MY_P}/Python" + +src_prepare() { + epatch "${FILESDIR}"/${PN}-2.4-nostrip.patch + + python_copy_sources +} + +src_configure() { + configuration() { + local myconf="$(PYTHON) configure.py -p 4 + --destdir=$(python_get_sitedir)/PyQt4 + $(use debug && echo '--debug')" + echo ${myconf} + ${myconf} + } + python_execute_function -s configuration +} + +src_compile() { + building() { + emake CC="$(tc-getCC)" CXX="$(tc-getCXX)" LINK="$(tc-getCXX)" + } + python_execute_function -s building +} diff --git a/dev-python/sip/ChangeLog b/dev-python/sip/ChangeLog index cbcd44380751..5ca011423676 100644 --- a/dev-python/sip/ChangeLog +++ b/dev-python/sip/ChangeLog @@ -1,6 +1,11 @@ # ChangeLog for dev-python/sip # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/dev-python/sip/ChangeLog,v 1.167 2010/07/06 18:41:15 arfrever Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-python/sip/ChangeLog,v 1.168 2010/07/13 08:09:38 hwoarang Exp $ + +*sip-4.10.3 (13 Jul 2010) + + 13 Jul 2010; Markos Chandras +sip-4.10.3.ebuild: + Version bump 06 Jul 2010; Arfrever Frehtes Taifersar Arahesis sip-4.8.2.ebuild, sip-4.8.2-r1.ebuild, sip-4.9.3-r1.ebuild, diff --git a/dev-python/sip/sip-4.10.3.ebuild b/dev-python/sip/sip-4.10.3.ebuild new file mode 100644 index 000000000000..171d2ca6361b --- /dev/null +++ b/dev-python/sip/sip-4.10.3.ebuild @@ -0,0 +1,73 @@ +# Copyright 1999-2010 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: /var/cvsroot/gentoo-x86/dev-python/sip/sip-4.10.3.ebuild,v 1.1 2010/07/13 08:09:38 hwoarang Exp $ + +EAPI="2" +PYTHON_DEPEND="*" +PYTHON_EXPORT_PHASE_FUNCTIONS="1" +SUPPORT_PYTHON_ABIS="1" + +inherit eutils python toolchain-funcs + +MY_P=${P/_pre/-snapshot-} + +DESCRIPTION="A tool for generating bindings for C++ classes so that they can be used by Python" +HOMEPAGE="http://www.riverbankcomputing.co.uk/software/sip/intro http://pypi.python.org/pypi/SIP" +SRC_URI="http://www.riverbankcomputing.com/static/Downloads/${PN}${PV%%.*}/${MY_P}.tar.gz" + +LICENSE="|| ( GPL-2 GPL-3 sip )" +SLOT="0" +KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos" +IUSE="debug doc" + +S="${WORKDIR}/${MY_P}" + +DEPEND="" +RDEPEND="" + +src_prepare() { + epatch "${FILESDIR}"/${PN}-4.9.3-darwin.patch + python_copy_sources +} + +src_configure() { + configuration() { + local myconf="$(PYTHON) configure.py + --bindir=${EPREFIX}/usr/bin + --destdir=${EPREFIX}$(python_get_sitedir) + --incdir=${EPREFIX}$(python_get_includedir) + --sipdir=${EPREFIX}/usr/share/sip + $(use debug && echo '--debug') + CC=$(tc-getCC) CXX=$(tc-getCXX) + LINK=$(tc-getCXX) LINK_SHLIB=$(tc-getCXX) + CFLAGS='${CFLAGS}' CXXFLAGS='${CXXFLAGS}' + LFLAGS='${LDFLAGS}' + STRIP=true" + echo ${myconf} + eval ${myconf} + } + python_execute_function -s configuration +} + +src_install() { + python_src_install + + dodoc NEWS || die + + if use doc; then + dohtml -r doc/html/* || die + fi +} + +pkg_postinst() { + python_mod_optimize sipconfig.py sipdistutils.py + + ewarn 'When updating sip, you usually need to recompile packages that' + ewarn 'depend on sip, such as PyQt4 and qscintilla-python. If you have' + ewarn 'app-portage/gentoolkit installed you can find these packages with' + ewarn '`equery d sip` and `equery d PyQt4`.' +} + +pkg_postrm() { + python_mod_cleanup sipconfig.py sipdistutils.py +}