Version bump.

Package-Manager: portage-14854-svn/cvs/Linux x86_64

3 files changed, 166 insertions, 2 deletions

diff --git a/dev-python/PyQt4/ChangeLog b/dev-python/PyQt4/ChangeLog
index 26bba54ffd35..8479f6dfd84c 100644
--- a/dev-python/PyQt4/ChangeLog
+++ b/dev-python/PyQt4/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for dev-python/PyQt4
 # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/PyQt4/ChangeLog,v 1.95 2009/11/05 07:59:34 wired Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/PyQt4/ChangeLog,v 1.96 2009/11/20 16:27:04 arfrever Exp $
+
+*PyQt4-4.6.2 (20 Nov 2009)
+
+  20 Nov 2009; Arfrever Frehtes Taifersar Arahesis <arfrever@gentoo.org>
+  +PyQt4-4.6.2.ebuild:
+  Version bump.
 
 *PyQt4-4.6.1-r1 (05 Nov 2009)
 
diff --git a/dev-python/PyQt4/Manifest b/dev-python/PyQt4/Manifest
index 07307f77506c..490fa1215356 100644
--- a/dev-python/PyQt4/Manifest
+++ b/dev-python/PyQt4/Manifest
@@ -8,6 +8,7 @@ DIST PyQt-x11-gpl-4.4.4.tar.gz 6982063 RMD160 970bca082a93402b1986b4e8a147385757
 DIST PyQt-x11-gpl-4.5.2.tar.gz 6970308 RMD160 3c4f507d098153d5a7be96f0a523bcc4b750f53c SHA1 25d41d489fae521e26797b797137e069af13c2ae SHA256 2588c67d29c2d56e50cfedafb9449000bff03edfcca2b23be38ebf6fe194494d
 DIST PyQt-x11-gpl-4.5.4.tar.gz 6970552 RMD160 0f7a48edb65116c8fb23357f66d164ff1fe48684 SHA1 be8b01b8b2343a6a85f18d16f10bc549e88265d6 SHA256 b3d06c7bda701055769add93b48103ee35c6fc9a4b00c67599cb426f9efda5a8
 DIST PyQt-x11-gpl-4.6.1.tar.gz 6979314 RMD160 6f0b70dc2b23809a7bbd7c3ab53b48e4e52be2ea SHA1 a1ef956ff2f3fbdada98032c1332d77a2fc89f37 SHA256 1443a3f32a9ee66fe1804e21d5ff358709422a7aaf44aa6e43c5602757772058
+DIST PyQt-x11-gpl-4.6.2.tar.gz 6979753 RMD160 acd984f335c3b9661603388347e064098f50856c SHA1 41c04232618b78497145ba91ff25e5891c1624b5 SHA256 09312616c3e796b670222c575bbaab6f367f45242f2e82f83f8b3af9ce535bcf
 EBUILD PyQt4-4.4.4-r2.ebuild 2057 RMD160 c53d76a3cc8a0b39b167ee0f95b375d10ec64bcb SHA1 cd4c7d73f4be8fd082a8ebd95ab29ea2a4482f9c SHA256 62846add2eeae19473391d0c5fa172dd3f227b3f65d830854cb04667dd9d57c7
 EBUILD PyQt4-4.4.4-r5.ebuild 3020 RMD160 ba75cf1209d08d44e6d7de1f8b0731869ab46dfd SHA1 8fe4d0563f22bca03c6c6cffc56507d1da73c2aa SHA256 feb7ac90dc1a91fd551c419329b266a92dad2c954af00ff8eeb126ed2633a117
 EBUILD PyQt4-4.5.2.ebuild 3173 RMD160 8dc1fe362621b1f1eaa04769bea19f4643c2af95 SHA1 94f78aabbe3f9bf08753270ff4fb5af2c25f2bc5 SHA256 c92953611c34214330a63891d3d9a8cdfa9ae09978960e45d20cabc0650d680d
@@ -15,5 +16,6 @@ EBUILD PyQt4-4.5.4-r3.ebuild 4020 RMD160 c1147777ef4210a831ecf1423ed5e3fbf8963be
 EBUILD PyQt4-4.5.4-r4.ebuild 4057 RMD160 38818215953d84f1f29cbcca8aa62ba3e789d7e2 SHA1 af41523ee6918cd96380dab2edcb1682af744392 SHA256 a1370703fbf20baa0d9b3942150ea724c0f1252264f28c1dcb3a8a21bd4e899e
 EBUILD PyQt4-4.6.1-r1.ebuild 4022 RMD160 a7db0d8004c7e98a7912a8dca2935afb94e2883b SHA1 02cc98f0ba4dcaed839bfae61df158734eee4cc7 SHA256 697f5a9083b593cf1c6d22356fa5a57d34aef22c15c54a4e20f6086b9a23fbce
 EBUILD PyQt4-4.6.1.ebuild 3977 RMD160 f9be066f031a84e1f9335ff884316388e0b6d034 SHA1 f4483696a1ad12d08259632c1f555c68fcda24af SHA256 ef36641f10375e070652cfdac4aa5f3bba000c1dc5bbd5378509642d4ad919fb
-MISC ChangeLog 12889 RMD160 df963e0664463a706ea8e8db0715e6787d4cb15b SHA1 f6a68a9929723be204dca68a0395bc9278fed1e0 SHA256 5b0a3f22d7b82b3090df952cccdc3a829c92d2da5b6f64b8e1da9d1c5f4b0f8d
+EBUILD PyQt4-4.6.2.ebuild 4062 RMD160 5e883bfbc1bec1f832598cb3f881951e3a7e778c SHA1 32a01f4cc488c93eef564785c388578e9f107387 SHA256 c85a17780ad14da29976bd92be02d48f6478b9565fbdf1d16dab087679d27c38
+MISC ChangeLog 13033 RMD160 842e8453e45dca3ad2c2bfbcfba34918b121f0e2 SHA1 a4f35ffee961357ac4f86593f7263edf964561f6 SHA256 08da7bc950e1e0ebe15ba6e83435736420f984f52691c68fe8c704e9fc8dad8f
 MISC metadata.xml 859 RMD160 3da7dcc5dc212af8ed4f98e73c561f2365081c98 SHA1 f607feed53689fa15b62d474d6763bc674fbcb2a SHA256 00475be82d27e0e1dab95eafcea3751ae70ee39b53a268063772d76752556d8b
diff --git a/dev-python/PyQt4/PyQt4-4.6.2.ebuild b/dev-python/PyQt4/PyQt4-4.6.2.ebuild
new file mode 100644
index 000000000000..c8b243ceeace
--- /dev/null
+++ b/dev-python/PyQt4/PyQt4-4.6.2.ebuild
@@ -0,0 +1,156 @@
+# Copyright 1999-2009 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-python/PyQt4/PyQt4-4.6.2.ebuild,v 1.1 2009/11/20 16:27:04 arfrever Exp $
+
+EAPI="2"
+SUPPORT_PYTHON_ABIS="1"
+
+inherit python qt4 toolchain-funcs
+
+MY_P="PyQt-x11-gpl-${PV/_pre/-snapshot-}"
+QTVER="4.5.1"
+
+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 opengl phonon sql svg webkit xmlpatterns"
+
+DEPEND=">=dev-python/sip-4.9
+	>=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
+	)
+	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}"
+
+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_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
+				$(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 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() {
+	python_need_rebuild
+
+	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
+}