version bump

Package-Manager: portage-2.2.0_alpha85/cvs/Linux x86_64

3 files changed, 204 insertions, 15 deletions

diff --git a/dev-python/PyQt4/ChangeLog b/dev-python/PyQt4/ChangeLog
index bd8dfd14df04..2ab883c1d9d9 100644
--- a/dev-python/PyQt4/ChangeLog
+++ b/dev-python/PyQt4/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for dev-python/PyQt4
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/PyQt4/ChangeLog,v 1.164 2012/01/25 13:24:31 wired Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/PyQt4/ChangeLog,v 1.165 2012/02/12 11:02:13 hwoarang Exp $
+
+*PyQt4-4.9.1 (12 Feb 2012)
+
+  12 Feb 2012; Markos Chandras <hwoarang@gentoo.org> +PyQt4-4.9.1.ebuild:
+  version bump
 
   25 Jan 2012; Alex Alexander <wired@gentoo.org> PyQt4-4.9.ebuild:
   builds with qt-opengl-4.8.0[egl], updated dep
diff --git a/dev-python/PyQt4/Manifest b/dev-python/PyQt4/Manifest
index d6938fbfef9a..3ed94d8e5e00 100644
--- a/dev-python/PyQt4/Manifest
+++ b/dev-python/PyQt4/Manifest
@@ -14,6 +14,7 @@ DIST PyQt-x11-gpl-4.8.3.tar.gz 9770929 RMD160 b871a5937c5d1a1e4deded5e7c62c33e9c
 DIST PyQt-x11-gpl-4.8.4.tar.gz 9799081 RMD160 100d16e9005e3b83f0030e498a16d99636c9034c SHA1 747236d5dd103687cac54746af0a24a1adbc067c SHA256 fcfa3ecc0b4fad6d93227751b36a6f81ea104ee19dd26905f52de59f060b3e98
 DIST PyQt-x11-gpl-4.8.5.tar.gz 9798545 RMD160 53d5a3032670b704581d0187b0e6077d1a31f31f SHA1 df253c6267c7bf80ddb33cd5357aadbc0629492d SHA256 c9e2df3a2fc7cba2f0c93e957bfaa8ee454f823c3032f688154976a3a3b36820
 DIST PyQt-x11-gpl-4.8.6.tar.gz 9661693 RMD160 9dc52e247c4242b1838c0cc6ebada8f4f62a8f4e SHA1 7454a270026f4b1a6c0d56899ae8234f0b6204e2 SHA256 3352a46c3a070e2509d0227db5cb2ba41060bfc1dff7b1fb79ed2c23d568eb07
+DIST PyQt-x11-gpl-4.9.1.tar.gz 9742132 RMD160 056d6570ffc5ad873ef36d8181122cbb79d7b5ef SHA1 6aa0e64cdcca0f23946c5e6c244b19189c234306 SHA256 f283557f2190ffc00d72fe8451ac15536cab777c36a9b573031328f401629bb1
 DIST PyQt-x11-gpl-4.9.tar.gz 9741275 RMD160 b21bf092e46b6f7d1bfa87ca89f26be3547d8dad SHA1 0bd0b39abbc117e812863f37a63b7364904e754a SHA256 f9a806578f2b388d762438a39da3fc5a6ac109497b0b96fb49a7dd850cd08102
 EBUILD PyQt4-4.7.3.ebuild 4671 RMD160 486ca36240c077f2e85c7d162e2928600fe6d174 SHA1 ab425b75e06169e4f1b95108e991f8a0c37ed27b SHA256 ec822408faea454f405a4d62cce24b1b933c365435e02a17a5ed59bee9400acf
 EBUILD PyQt4-4.7.7-r1.ebuild 4645 RMD160 f5ec224cc9705a24bf2c131234d25360a6f20390 SHA1 b9cda1ecb400dd15ddc11996dfd00722b3457f86 SHA256 0bfb387b8e99aaaa5678fa002b34370517714732a325975722f26fd4bc4ca88c
@@ -24,23 +25,24 @@ EBUILD PyQt4-4.8.3.ebuild 5030 RMD160 03636343ee6364eba3601a0e554cc7314719322f S
 EBUILD PyQt4-4.8.4.ebuild 4978 RMD160 058c3089cc67edba707587b2b9f43e7ae64c9758 SHA1 4abe5d2d4d441b058e99bfcd0d27ea302e4fe2c2 SHA256 764b6cb8ed982e0d7616054e92654860acf8fb17a4e20b38cf6ea7c32f6324ea
 EBUILD PyQt4-4.8.5.ebuild 5302 RMD160 1f0b5e8d355e8100d6b7e297bbd7f2a445aad76c SHA1 4fda85e3ae863d503c6a3015507c0ee0d452e0a7 SHA256 6b009aee13de0cb89d8171c0521dea562d15bae3ad9b6b791899851b7a011998
 EBUILD PyQt4-4.8.6.ebuild 5302 RMD160 946b9a419d0b08eb5201a235d4316a77750d7a85 SHA1 242f16dba6656a83bdd4d49b3e37fc566726d1aa SHA256 b7fd6c9456eca33ec1e6f4ed7b16bd6bef4bdfdfc2654de9f62564aadf3e7d7c
+EBUILD PyQt4-4.9.1.ebuild 5542 RMD160 92772be1b93c881cca8a2be19e74997952dfd070 SHA1 26b23718e22b6b6544dc681356d4dcecff8be004 SHA256 fb1ff6c6e0e501a3a45d33b0af75200cf313b586dd13350efd99235b492c1059
 EBUILD PyQt4-4.9.ebuild 5537 RMD160 581ee730bad5131417815fde64517cce5cda49a7 SHA1 bcb666a7a847b860ac25f6107bcfafacb0859bcd SHA256 bad8f195e5f32a746bdcea11a2cbc9f609e932787f3824fcd9eb871e5aad5648
-MISC ChangeLog 22619 RMD160 ed43fbc510480cb8bf04684ffeceda6ef07ce456 SHA1 7f9aae34f6c26e2940240fd9874512cf928f4da5 SHA256 613ff550c9e7928e4aa0018ff02963de9e6b91f3db4c590f66875402f086683d
+MISC ChangeLog 22740 RMD160 dc9e2ad2e7c5857fe9502b3660f8267c61891b0b SHA1 faa4e84343db24f20497eecf947eb3476d632cbd SHA256 99249ec827fdddc7f42e914e6f906be4d80fc874dd4210ab3a23112f13b81c15
 MISC metadata.xml 878 RMD160 cdc42fae8ad9f67bbe0dcc949f7822cc72d0acf9 SHA1 f1907739ab33d27cd8276c57b4d062a3b44ae402 SHA256 89c99beeac252dc158fb953793675d0133b2daa91b22f4c5a016262348323afe
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.18 (GNU/Linux)
 
-iQIcBAEBCgAGBQJPIAMBAAoJEDZF8K7rm0r6aKMP/3P2BbSZpDRVPU1iyJShtD6g
-I/aJk83WYluEwI8VjJ17LJvQsxyeZ6E8NcTp/0hziuDEV8y7upqzIpVktT/4GWPe
-nomm+if/pGUn/8vSaDH0Cv88wqY61X5L/jsEwoTOu602e6tvlLmWHwnDrSCQjgez
-PQ7K4INb7VTK8yOB6exEjVfyCr4ix8JRTUciZYOeZSWL253l+/8qD7kAut8ZUw8a
-UuPKNn0H7UQYpkqh3Cih/v+Av8VKBOFUZjYJAGrq95gN7AAcCx1bEKd8SvIrMRMa
-mU9gQANrJa5WCGuBzEZC+M5D+R2pg/7JTeS5HWBxoJAyOuftZudnebtKnfgvtjmf
-lH+IyfMpwuSb/esnaqHYAy1Ry6AUJn7h9A5dIgdMOtLkFHuSCBSJJmZs8eVomQ92
-f/CdAnRB4uj6QgL6VKNX7fxpaG0TfWcMqVU9AmE6nYdSt+tnSAHr31+Gi89yEmCr
-iPiK/4EY87XN9VPqJNPSP0wghJKmVFFTU/QwkTo7I6XR9f6ecpiH0Ek/BIP808Z5
-7cKCXfERdPSnufqm3FkUpMGvyoCRzToUs3wtbNJHRJEf9c4iUy1C4w+Rv5l3Q+HX
-aEKC80gOCKzWbCOhQziOzGcDKBHkxBRYQVaSByLLeQVbHAV3qE2qEfmGTzMv9vsR
-JnoSNFqi/vG70ICn4kej
-=vJX/
+iQIcBAEBCgAGBQJPN5wZAAoJEPqDWhW0r/LCqP4P/0kalMa06b9FPmWuF3mqdhSz
+rfRl3ADK9hmja+IlDeUmnh1tLPjJjBpsX+yN0/H7C3vtQseDXnbLhd4ITOyx+x+f
+nunQ8cILYkUqlCkUEamoiWx95wDmAx/+3qY/7RK63utfzzWDJQtnfZX/Td+GmcCH
+qAT0v2EPfsCl8QMe/K/YZ9Y4ThdUSEhorU8hNbZISXtXM6K4gSxZ9GIfrWc5DrGR
+rOd3bSiEC0P+MhZK/W3oDwy9/nfDwhqIG/obAQAPQ6WkW7uSo240xN0wIBNaPKaT
+uORbR51qau9xls+WFqz+6uEskfbEM2DWH0C2OO05pGJtXF1DaQaSnVLJybzH0x9e
+nICJmynHjGQ4gY6Dq7SdjgQlat2UMUrT4KsHyuKtuJD37FpdGhMEb5aBApijNU19
+KWdV6YeVomWSUCFcflrw9Ry0yW8hlXZhrcZo8M6yobtEwzeY7t9Y1abzbhQC3rju
+0HZkVKkUnV/2hBKNxjeNy7E00j5OMVmn+wJhCfcr2jTCrAL19CIFz4ssPPci2EWm
+D1lWVl88Q3Ace2zqzBVzL5o/9u5SafHAPGmX5/7e6sqAsAZRhzHT4hg0bCl3qJSO
+j2qp79MNjzL7JYH8f4sjxy79XQyRtJMEOfc53lZoxuXuFn3jdH3TtXNaj4rCjP4e
+nzugN+igksW13RHlAg44
+=F38W
 -----END PGP SIGNATURE-----
diff --git a/dev-python/PyQt4/PyQt4-4.9.1.ebuild b/dev-python/PyQt4/PyQt4-4.9.1.ebuild
new file mode 100644
index 000000000000..64e9df42a547
--- /dev/null
+++ b/dev-python/PyQt4/PyQt4-4.9.1.ebuild
@@ -0,0 +1,182 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-python/PyQt4/PyQt4-4.9.1.ebuild,v 1.1 2012/02/12 11:02:13 hwoarang Exp $
+
+EAPI="3"
+PYTHON_DEPEND="*"
+PYTHON_EXPORT_PHASE_FUNCTIONS="1"
+SUPPORT_PYTHON_ABIS="1"
+RESTRICT_PYTHON_ABIS="*-jython *-pypy-*"
+
+inherit python qt4-r2 toolchain-funcs
+
+MY_P="PyQt-x11-gpl-${PV/_pre/-snapshot-}"
+
+# Minimal supported version of Qt.
+QT_VER="4.6.2"
+
+DESCRIPTION="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"
+
+LICENSE="|| ( GPL-2 GPL-3 )"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux"
+IUSE="X assistant +dbus debug declarative doc examples kde multimedia opengl phonon sql svg webkit xmlpatterns"
+
+DEPEND=">=dev-python/sip-4.13.1
+	>=x11-libs/qt-core-${QT_VER}:4
+	>=x11-libs/qt-script-${QT_VER}:4
+	>=x11-libs/qt-test-${QT_VER}:4
+	X? ( >=x11-libs/qt-gui-${QT_VER}:4[dbus?] )
+	assistant? ( >=x11-libs/qt-assistant-${QT_VER}:4 )
+	dbus? (
+		>=dev-python/dbus-python-0.80
+		>=x11-libs/qt-dbus-${QT_VER}:4
+	)
+	declarative? ( >=x11-libs/qt-declarative-${QT_VER}:4 )
+	multimedia? ( >=x11-libs/qt-multimedia-${QT_VER}:4 )
+	opengl? ( >=x11-libs/qt-opengl-${QT_VER}:4 || ( >=x11-libs/qt-opengl-4.8.0:4 >=x11-libs/qt-opengl-4.7.0:4[-egl] <x11-libs/qt-opengl-4.7.0:4 ) )
+	phonon? (
+		!kde? ( || ( >=x11-libs/qt-phonon-${QT_VER}:4 media-libs/phonon ) )
+		kde? ( media-libs/phonon )
+	)
+	sql? ( >=x11-libs/qt-sql-${QT_VER}:4 )
+	svg? ( >=x11-libs/qt-svg-${QT_VER}:4 )
+	webkit? ( >=x11-libs/qt-webkit-${QT_VER}:4 )
+	xmlpatterns? ( >=x11-libs/qt-xmlpatterns-${QT_VER}:4 )"
+RDEPEND="${DEPEND}"
+
+S="${WORKDIR}/${MY_P}"
+
+PATCHES=(
+	"${FILESDIR}/${PN}-4.7.2-configure.py.patch"
+)
+
+PYTHON_VERSIONED_EXECUTABLES=("/usr/bin/pyuic4")
+
+src_prepare() {
+	if ! use dbus; then
+		sed -e "s/^\([[:blank:]]\+\)check_dbus()/\1pass/" -i configure.py || die "sed configure.py failed"
+	fi
+
+	# Support qreal for arm architecture (bug #322349).
+	use arm && epatch "${FILESDIR}/${PN}-4.7.3-qreal_float_support.patch"
+
+	qt4-r2_src_prepare
+
+	# Use proper include directory.
+	sed -e "s:/usr/include:${EPREFIX}/usr/include:g" -i configure.py || die "sed configure.py failed"
+
+	python_copy_sources
+
+	preparation() {
+		if [[ "$(python_get_version -l --major)" == "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="${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 QtDesigner)
+			$(pyqt4_use_enable X QtGui)
+			$(pyqt4_use_enable X QtScriptTools)
+			# QtAssistant module is not available with Qt >=4.7.0.
+			$(pyqt4_use_enable assistant QtAssistant)
+			$(pyqt4_use_enable assistant QtHelp)
+			$(pyqt4_use_enable dbus QtDBus)
+			$(pyqt4_use_enable declarative QtDeclarative)
+			$(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[@]}"
+		"${myconf[@]}" || return 1
+
+		local mod
+		for mod in QtCore $(use X && echo QtDesigner QtGui) $(use dbus && echo QtDBus) $(use declarative && echo QtDeclarative) $(use opengl && echo QtOpenGL); do
+			# Run eqmake4 inside the qpy subdirectories to respect CC, CXX, CFLAGS, CXXFLAGS and LDFLAGS and avoid stripping.
+			pushd qpy/${mod} > /dev/null || return 1
+			eqmake4 $(ls w_qpy*.pro)
+			popd > /dev/null || return 1
+
+			# Fix insecure runpaths.
+			sed -e "/^LFLAGS[[:space:]]*=/s:-Wl,-rpath,${BUILDDIR}/qpy/${mod}::" -i ${mod}/Makefile || die "Fixing of runpaths failed"
+		done
+
+		# Avoid stripping of libpythonplugin.so.
+		if use X; then
+			pushd designer > /dev/null || return 1
+			eqmake4 python.pro
+			popd > /dev/null || return 1
+		fi
+	}
+	python_execute_function -s configuration
+}
+
+src_compile() {
+	python_src_compile
+}
+
+src_install() {
+	installation() {
+		# INSTALL_ROOT is used by designer/Makefile, other Makefiles use DESTDIR.
+		emake DESTDIR="${T}/images/${PYTHON_ABI}" INSTALL_ROOT="${T}/images/${PYTHON_ABI}" install
+	}
+	python_execute_function -s installation
+	python_merge_intermediate_installation_images "${T}/images"
+
+	dodoc NEWS THANKS || die "dodoc failed"
+
+	if use doc; then
+		dohtml -r doc/html/* || die "dohtml failed"
+	fi
+
+	if use examples; then
+		insinto /usr/share/doc/${PF}
+		doins -r examples || die "doins failed"
+	fi
+}
+
+pkg_postinst() {
+	python_mod_optimize PyQt4
+
+	ewarn "When updating dev-python/PyQt4, you usually need to rebuild packages, which depend on"
+	ewarn "dev-python/PyQt4, such as dev-python/qscintilla-python. If you have app-portage/gentoolkit"
+	ewarn "installed, you can find these packages with \`equery d dev-python/PyQt4\`."
+}
+
+pkg_postrm() {
+	python_mod_cleanup PyQt4
+}