Version bump

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

3 files changed, 198 insertions, 9 deletions

diff --git a/dev-python/PyQt4/ChangeLog b/dev-python/PyQt4/ChangeLog
index 797d62569e29..5ee2216f8b71 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.158 2011/07/25 20:38:19 xarthisius Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/PyQt4/ChangeLog,v 1.159 2011/08/19 10:12:33 hwoarang Exp $
+
+*PyQt4-4.8.5 (19 Aug 2011)
+
+  19 Aug 2011; Markos Chandras <hwoarang@gentoo.org> +PyQt4-4.8.5.ebuild:
+  Version bump
 
   25 Jul 2011; Kacper Kowalik <xarthisius@gentoo.org> PyQt4-4.8.4.ebuild:
   ppc/ppc64 stable wrt #374591
diff --git a/dev-python/PyQt4/Manifest b/dev-python/PyQt4/Manifest
index e7bad6beb21a..389705c1ad17 100644
--- a/dev-python/PyQt4/Manifest
+++ b/dev-python/PyQt4/Manifest
@@ -1,5 +1,5 @@
 -----BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
+Hash: SHA512
 
 AUX PyQt4-4.6.1-configure-multilib.patch 883 RMD160 4ce96cdf4d53773c245544737c894c2494e9de29 SHA1 d0c9b214172b47537873e3fc1bd5fb34e815220c SHA256 6b33666a0b773122330d33a1b88ddd3b18d2d3b2c265e3fd4edc253f1bdfab1a
 AUX PyQt4-4.7.2-configure.py.patch 933 RMD160 1c9525855d47bcdbf0c88618294be44274ce653b SHA1 4b27ab9173692a9d74598dc7c7fc88c3531e09b5 SHA256 1a87c58ccb14441f77c7c764b6e6c40d1bdd64c5b35581f3deda54019a3461be
@@ -12,6 +12,7 @@ DIST PyQt-x11-gpl-4.8.1.tar.gz 9409175 RMD160 e5ba0d98359ce315432f479a5f44b2c1ae
 DIST PyQt-x11-gpl-4.8.2.tar.gz 9605005 RMD160 ba9948dcd05964c6f27d24b0f2d224a3d6109258 SHA1 fd26aed89a6032c85a553bfd5228280ac982b85c SHA256 ea9f4643d090a4416daa745ecf527c04429b89614d4fde8143a2155f64300fe4
 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
 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
@@ -19,14 +20,23 @@ EBUILD PyQt4-4.8.1.ebuild 4797 RMD160 421e76d1ffd040195e9792e0b44feb6d1eaef08a S
 EBUILD PyQt4-4.8.2.ebuild 4918 RMD160 5a0feedede8c46f0c263b9af7ef9993c1afed338 SHA1 c97586783414cde972dcb1e31c60dcd285561929 SHA256 f7054dc6acdf5209545cae873b60b6b9990f178a78e2c7aeec25515f29006f48
 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
-MISC ChangeLog 21702 RMD160 3775e05f8b52ca1c1010f4cdbc6c8a368784e7dc SHA1 ffc090a1cb510e4e69d3a3c6c24c0ddaa43bd161 SHA256 a50078f49f4fec482d46a3331af903fa952d9d3f52a658c5c33d5b280f0f1f18
+EBUILD PyQt4-4.8.5.ebuild 4980 RMD160 e6f05e42dbab8233ecc7bf448f575e27eef1c332 SHA1 11fd8396f0ad91424d1e8a31681e89fbf18bf649 SHA256 abedd87f070b8a85db832e1fe3e640bade7c94172dbcf27a7f5764022a0843a2
+MISC ChangeLog 21818 RMD160 2315a8e8c66c239b450d115fdf82349c5c9a015b SHA1 33efc4f3ff8743a1d359f5d64a92bf25a2aa9674 SHA256 968586b1521717c1b5b29e16c481c5d20e0b0385a6291b4a345ca5c061e17e6f
 MISC metadata.xml 878 RMD160 cdc42fae8ad9f67bbe0dcc949f7822cc72d0acf9 SHA1 f1907739ab33d27cd8276c57b4d062a3b44ae402 SHA256 89c99beeac252dc158fb953793675d0133b2daa91b22f4c5a016262348323afe
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.17 (GNU/Linux)
+Version: GnuPG v2.0.18 (GNU/Linux)
 
-iJwEAQECAAYFAk4t1EEACgkQIiMqcbOVdxRChgP/YbwPSSJdtRCOVJOWGN7Eh7EX
-Cm2SBIYOpOxu/y5Vjg0TGGxb4kOwc58Y64g57NT2TuLXaTfx/L3kRa4mC+w5CeNt
-GvihnJPkedOgUpnNEbDog0Qv3XILJVRd3DJ2XrBVLDDxAHBu1+qFuE2YWDFw5Xv1
-pB81eJJG2lBXK2nMA9g=
-=+nle
+iQIcBAEBCgAGBQJOTjcRAAoJEPqDWhW0r/LCMbUQAKlCk97DAFU5NMvTMpG216cY
+rsfGp3wPCcTBYAIYyxc4q2FfqpiajU2WACxQef7PJvHrSvy5AnKs1UJf1KM5o3Sp
+J9cdVe2t6aeGsaz1fjPfNnxW2c7kpVJiGxNeaAI2iW/AqmXegNZfJBuBdLg7N/2d
+VArXu65P98DaKK2oK3kTTE9iEbiNTsSfZTDaykXL2OP8e7byFVj86e5n+OwmKdjX
+EM4und0GfkiZpbBX/AypFQj4EB7cOB52IeIbwwy1ElNTf1FgZLg6JwvgfiizUzym
+4/cERz5P7164r5DV9jnhBpTMJAYxDqsiF96iIHhP22BEdwamF0M0jTGY2wsPslmw
+N/lF+nIg3CE7m+v+w+ku6Vzgl/6vdVoTijdmSOTtbG+1yY7yaCHGbLQ1u875Ydch
+BvAcdITwugcQwt7yLIlEBQTuvHRwT3yClnYr4oeLQH/ag9g/lka19eDD5UT9pJI0
+2vFgjTUESZIGZNzQpT20Q2QOaLzIS6QX/scSomVAcxtr2KffZD594+B7kWC/3o9Q
+6ixPvzlwLg8BYIjwyKe8BJmBEj0jaHoCDNfnOcSuqrXeb95fkROQwbWjrGc2YRDZ
+kYh5KqYdf+TU7JeEjemAmEVNCD+MBmV+NIw92+D8jJ+6MQphrmpB6LqAtMwyx/uS
+qby5y7ujecYf5RRJKUYf
+=Ljkv
 -----END PGP SIGNATURE-----
diff --git a/dev-python/PyQt4/PyQt4-4.8.5.ebuild b/dev-python/PyQt4/PyQt4-4.8.5.ebuild
new file mode 100644
index 000000000000..f330f3d7dd5d
--- /dev/null
+++ b/dev-python/PyQt4/PyQt4-4.8.5.ebuild
@@ -0,0 +1,174 @@
+# 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.5.ebuild,v 1.1 2011/08/19 10:12:33 hwoarang Exp $
+
+EAPI="3"
+PYTHON_DEPEND="*"
+PYTHON_EXPORT_PHASE_FUNCTIONS="1"
+SUPPORT_PYTHON_ABIS="1"
+RESTRICT_PYTHON_ABIS="*-jython"
+
+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); 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
+}
+
+pkg_postrm() {
+	python_mod_cleanup PyQt4
+}