Version bump

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

3 files changed, 200 insertions, 15 deletions

diff --git a/dev-python/PyQt4/ChangeLog b/dev-python/PyQt4/ChangeLog
index 4759902e4832..c3d852a90c32 100644
--- a/dev-python/PyQt4/ChangeLog
+++ b/dev-python/PyQt4/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for dev-python/PyQt4
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/PyQt4/ChangeLog,v 1.160 2011/08/24 16:28:35 hwoarang Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/PyQt4/ChangeLog,v 1.161 2011/11/11 19:40:39 hwoarang Exp $
+
+*PyQt4-4.8.6 (11 Nov 2011)
+
+  11 Nov 2011; Markos Chandras <hwoarang@gentoo.org> +PyQt4-4.8.6.ebuild:
+  Version bump
 
   24 Aug 2011; Markos Chandras <hwoarang@gentoo.org> PyQt4-4.8.5.ebuild:
   Restrict PyPy ABIs. Avoid warnings about insecure runpaths (bug #376483).
diff --git a/dev-python/PyQt4/Manifest b/dev-python/PyQt4/Manifest
index 97b1432e883c..6e03c21cbe65 100644
--- a/dev-python/PyQt4/Manifest
+++ b/dev-python/PyQt4/Manifest
@@ -13,6 +13,7 @@ DIST PyQt-x11-gpl-4.8.2.tar.gz 9605005 RMD160 ba9948dcd05964c6f27d24b0f2d224a3d6
 DIST PyQt-x11-gpl-4.8.3.tar.gz 9770929 RMD160 b871a5937c5d1a1e4deded5e7c62c33e9c692fbf SHA1 b634467f803704fffa2ff94ad84311796c36d6b8 SHA256 8a59fe9dbb4d7f441dfa2e9405ebbf016aa3da838aa7ccfd429a429457c3d664
 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
 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
 EBUILD PyQt4-4.8.1-r1.ebuild 4923 RMD160 6c99c7da1dfd99a5dab21510d6fb0840c43341ba SHA1 8079e0d0c2403e586558450808b4091e6b34a686 SHA256 15bd628ed8049e05b8bf182a95d1d92e394944642eee025ecfe1609852e88215
@@ -21,22 +22,23 @@ EBUILD PyQt4-4.8.2.ebuild 4918 RMD160 5a0feedede8c46f0c263b9af7ef9993c1afed338 S
 EBUILD PyQt4-4.8.3.ebuild 5030 RMD160 03636343ee6364eba3601a0e554cc7314719322f SHA1 7e346093fd54025dc83e9fb04521a21ee8745b86 SHA256 eafaded9a0f4cccbfbf9d134053e414cb0414edd6309192e1f67c178d11070ae
 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
-MISC ChangeLog 22063 RMD160 fa0361b4bbdfef73cdf0840ddc23b7f7e932faad SHA1 174b526417ed03ba918b61c2b53566391f29ae5a SHA256 d638f6a39e2184c069d00fc5e7f45d00240b549c83d76d9625205e9775903f24
+EBUILD PyQt4-4.8.6.ebuild 5302 RMD160 946b9a419d0b08eb5201a235d4316a77750d7a85 SHA1 242f16dba6656a83bdd4d49b3e37fc566726d1aa SHA256 b7fd6c9456eca33ec1e6f4ed7b16bd6bef4bdfdfc2654de9f62564aadf3e7d7c
+MISC ChangeLog 22181 RMD160 e6dda9dfb8a05db72d82da8fa786ed206e0d9565 SHA1 0d62a6e2ca6162e1587cdd05d52c30411660a727 SHA256 f1082effa4da70bd6bc73a853feb2ee82bd8c55a4118db55b1efe3b08f3ebe83
 MISC metadata.xml 878 RMD160 cdc42fae8ad9f67bbe0dcc949f7822cc72d0acf9 SHA1 f1907739ab33d27cd8276c57b4d062a3b44ae402 SHA256 89c99beeac252dc158fb953793675d0133b2daa91b22f4c5a016262348323afe
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.18 (GNU/Linux)
 
-iQIcBAEBCgAGBQJOVSaiAAoJEPqDWhW0r/LCAf4QAL31Be+uz4L3eqeNidDXZepb
-sFc4WISYo90lH82RPROQiXmqhJQ09GIf+oBBJDLXR1fiGL0UaSNViL7Fu7uabeRt
-OBj1pg5uNed7pYgw5QtHlrtm77o7xgEjtEaLx6RpK5m9YI3UxfXk6paVlP0A+qxj
-xqVhDdrN1bw5QPj7vKFfHJ8wbNeZrL+KY/5WEOvBE8Y/1YfKG1pq7VipQl1Oogo1
-UGV2zauJY7sxVOgB7g2e1DIZXKnpqTzFnNgUkAszgAbr5X4Mm7WOSdy8VuOGEg8U
-OHMUrXYuGTMdkL7PSHUiAltE1UeQoNHM1pEsAy9ZHU680XmxNyKmhUBqBL2+h/Qx
-WJNX/h46MEe/Vx5RbtSP4mMkuAQgeReQTbLSkDW3D8/OppXUb+gXM1D1uFcaxUkO
-31yJB6vRZqBJ/09NgsTwyMHjXS4qObLVZFu7x0gv2ITq0GlDB5aP6j5/TmEDG2eX
-JTJTEQnT2aEvDMiH/FfjD3E3FNOI3e2ae1exf2qk7kTlrum0G0K91sJVv8WC7Lu7
-E7RmU4renCWf6h2xhMbQa8UIalQczUJjDBbvL7bJoRxbv71ahOg+3f4xe3ruGYjU
-3DdLzCMKOI1T72Z9u3Hlzvq4Axo+wnj4zjhVnPbGpikfp2v72Xy1kPOeybSnPXFO
-zG8UYm0uhrZSb/kQPxt3
-=Xrnv
+iQIcBAEBCgAGBQJOvYf6AAoJEPqDWhW0r/LCEW4QAIIajhMKU884gG0swpbry5GP
+Jz9FWxf8xDsyJ0QHuuPIkkEJQg58PGGFW8u1rzPc+VlYquHbgZEH7sKIGhlok6il
+Be1MXeLdQl/v2c3ocglcmnhta/+G6Gj4l8Q4GYDC8daDbfEcH8aRBYVJzq90d7qO
+Yf0WGgILZPdUQJjpBOnGtYfEuN/DGS3NVhu6+nlkjHZyju2J2qm2RGg3XOX1xq5D
+yVyD5ZoEPORKcY5/6jQAHG/9sPoouVweIRzsPgNj4sORNSXmuGNefGiyRJASloMx
+wy78OGvN2713kbd75Mm67pYlg9AIKJ7WslR0Q99bfRvHiw+EMgDqTwXBkTAfr8k/
+F970ONSLZRu6oggkYlqn7KmS+6LHH6wXA352K9qVNMKwP1rimGvf+ajVYx++zk4x
+QUxCbvBg6tCyXSh4gTUBVWL0B3g52I/b3cIxU2yQ01r3Yt1qAyU86sZ1Qxs/kaAa
+yYkQo1VOnoAKQ6lflmcnwhkNkwW3I/Mjm6Mux4kh2tFwpuuqkCTp7OHu2I8PrbPT
+Uhk14VAapkIszDtWega4X4UWIqHmhDvSAtUImi6P2um6mzA2LCi0QVb6AD2FzelA
+vORWTtTLMeV81com64My8ezeAfavAT6xtQE+qcdIyMPYtWCG1MB+HI5ey1uSb+bl
+nION3mvnZk8WfXJ/jVYi
+=N0gk
 -----END PGP SIGNATURE-----
diff --git a/dev-python/PyQt4/PyQt4-4.8.6.ebuild b/dev-python/PyQt4/PyQt4-4.8.6.ebuild
new file mode 100644
index 000000000000..f0322562326b
--- /dev/null
+++ b/dev-python/PyQt4/PyQt4-4.8.6.ebuild
@@ -0,0 +1,178 @@
+# Copyright 1999-2011 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-python/PyQt4/PyQt4-4.8.6.ebuild,v 1.1 2011/11/11 19:40:39 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.12.2
+	>=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.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"
+)
+
+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 --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 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 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 needed for the QtDesigner module, other Makefiles use DESTDIR.
+		emake DESTDIR="${D}" INSTALL_ROOT="${D}" install
+	}
+	python_execute_function -s installation
+
+	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
+}