Version bump

Package-Manager: portage-2.2_rc61/cvs/Linux x86_64

4 files changed, 170 insertions, 3 deletions

diff --git a/dev-python/PyQt4/ChangeLog b/dev-python/PyQt4/ChangeLog
index 1c71add8985f..f680e640fa1d 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.102 2010/01/11 17:03:39 arfrever Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/PyQt4/ChangeLog,v 1.103 2010/01/15 15:15:44 yngwin Exp $
+
+*PyQt4-4.7 (15 Jan 2010)
+
+  15 Jan 2010; Ben de Groot <yngwin@gentoo.org> +PyQt4-4.7.ebuild:
+  Version bump
 
   11 Jan 2010; Arfrever Frehtes Taifersar Arahesis <arfrever@gentoo.org>
   PyQt4-4.5.4-r4.ebuild, PyQt4-4.6.2.ebuild:
diff --git a/dev-python/PyQt4/Manifest b/dev-python/PyQt4/Manifest
index 4eec4952f0c3..4b252679084f 100644
--- a/dev-python/PyQt4/Manifest
+++ b/dev-python/PyQt4/Manifest
@@ -6,7 +6,9 @@ AUX configure.py.patch 1727 RMD160 31802058d0b0488264cdbcfeebd7ce9aff250957 SHA1
 AUX fix_license_check.patch 643 RMD160 f8934e527bb8bf4f9edf98e068c07fc7b3380d97 SHA1 41fa9b3962add04c8196695c9d9b82b69d7d3ea8 SHA256 117025432a5db37375554577c66edbe7a6fdef6e120fb865b2f4304961dc2c42
 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.tar.gz 7888435 RMD160 bddf2b4d668733a7a6bbb179dd986b5f82752198 SHA1 3cc46c8cc9c83ac111cd171ee594b2d34a4133dc SHA256 7fee05d926f33c290544965960262f1866256d95021332f8ab6918fe22419743
 EBUILD PyQt4-4.5.4-r4.ebuild 4048 RMD160 869fa29220ea48541751a2134691ed44e853475a SHA1 0564214aa0aeeb6f5ed71f0255767bd508c5c572 SHA256 8e5f1c6cc5f7ef5696e6155d63486e95d3eedc4184af61081d8b42111aa33600
 EBUILD PyQt4-4.6.2.ebuild 4073 RMD160 5d544152d33ad6ec0f4b5b17af87b4810ae35609 SHA1 0ceb62d980bec95cff3f8ae87a9dfeef8cbe1d7b SHA256 81214fa38dc38e6018bc6823084447618f57df581d14514039ae963d8785cf93
-MISC ChangeLog 14122 RMD160 989d79a0709049f818c39efb4197ab429d67fe30 SHA1 6a79fc84a85be23cab3d6d8ab921712de6bf2db9 SHA256 d725287c56a505edd35d5f2225955ca02d96fde56249f70bdca70ba22b34544d
-MISC metadata.xml 784 RMD160 f98352d1efdc46ce85fa86a251e0334953953171 SHA1 8dcecbf0e4091ab3b8387523ec06a602a01821a3 SHA256 dd8004eeba543eba4dbc1f4ab6a3693c12d1185e9b33d028efd495f80ba18476
+EBUILD PyQt4-4.7.ebuild 4332 RMD160 e4cf2e9a78c92898e79bf3357a5de9f76e1f4d9b SHA1 29f608279e2f307222de73fc249682daffaab763 SHA256 dec92fb9d30c32dbf0c1ded48fd060fbf04650ddeefa01b4b2a3e8e55957658e
+MISC ChangeLog 14229 RMD160 9419e4da21fb24219001d32f26bdf14bdfa4b158 SHA1 c7297c59dfea71816723f1058c37e7a6fe4f0423 SHA256 8220c69c3a274d76203de0cb649325b409c706cbb8c7e6ae6cc3ae4b51a4a895
+MISC metadata.xml 846 RMD160 9ebdd502e44dac1e93f95e60936ad7871be6ed1c SHA1 2731e0ad5e11b9f0e4089cd9d9e2b342b6103c09 SHA256 6a481f4cc08dcb57f2b7bb0cc3d6944aa281fd3bc7a3aa586aa50372323b838c
diff --git a/dev-python/PyQt4/PyQt4-4.7.ebuild b/dev-python/PyQt4/PyQt4-4.7.ebuild
new file mode 100644
index 000000000000..0838d082cdd8
--- /dev/null
+++ b/dev-python/PyQt4/PyQt4-4.7.ebuild
@@ -0,0 +1,159 @@
+# 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.ebuild,v 1.1 2010/01/15 15:15:44 yngwin Exp $
+
+EAPI="2"
+PYTHON_DEFINE_DEFAULT_FUNCTIONS="1"
+SUPPORT_PYTHON_ABIS="1"
+
+inherit qt4-r2 python toolchain-funcs
+
+MY_P="PyQt-x11-gpl-${PV/_pre/-snapshot-}"
+QTVER="4.5.3" # 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"
+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}/configure-4.6.1.py.patch"
+	"${FILESDIR}/${PN}-4.6.1-configure-multilib.patch"
+)
+
+src_prepare() {
+	if ! use dbus; then
+		sed -i -e 's,^\([[:blank:]]\+\)check_dbus(),\1pass,' \
+			"${S}"/configure.py || die
+	fi
+
+	qt4-r2_src_prepare
+	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() {
+	configuration() {
+		local myconf="$(PYTHON) configure.py
+				--confirm-license
+				--bindir=/usr/bin
+				--destdir=$(python_get_sitedir)
+				--sipdir=/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_execute_function -d -s
+}
+
+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 ChangeLog 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/PyQt4/metadata.xml b/dev-python/PyQt4/metadata.xml
index 31cbfe12c86c..f70b8e22bf12 100644
--- a/dev-python/PyQt4/metadata.xml
+++ b/dev-python/PyQt4/metadata.xml
@@ -9,6 +9,7 @@
     <flag name='kde'>
       Select <pkg>media-sound/phonon</pkg> as phonon variant needed for kde
     </flag>
+	<flag name='multimedia'>Build the QtMultimedia module</flag>
     <flag name='opengl'>Build the QtOpenGL module</flag>
     <flag name='phonon'>Build the phonon module</flag>
     <flag name='sql'>Build the QtSql module</flag>