old

Package-Manager: portage-2.1.11.62/cvs/Linux x86_64
Manifest-Sign-Key: 0xC2BA7F3C!

5 files changed, 22 insertions, 350 deletions

diff --git a/dev-python/PyQt4/ChangeLog b/dev-python/PyQt4/ChangeLog
index ce108a8d8b10..07fec9283913 100644
--- a/dev-python/PyQt4/ChangeLog
+++ b/dev-python/PyQt4/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for dev-python/PyQt4
 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/PyQt4/ChangeLog,v 1.220 2013/03/12 09:12:18 pesa Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/PyQt4/ChangeLog,v 1.221 2013/05/04 11:12:04 hwoarang Exp $
+
+  04 May 2013; Markos Chandras <hwoarang@gentoo.org> -PyQt4-4.9.4-r1.ebuild,
+  -files/PyQt4-4.7.2-configure.py.patch,
+  -files/PyQt4-4.9.4-pyuic-custom-widgets.patch:
+  old
 
 *PyQt4-4.10 (12 Mar 2013)
 
diff --git a/dev-python/PyQt4/Manifest b/dev-python/PyQt4/Manifest
index cdc5a2d251a9..60ced1fabff4 100644
--- a/dev-python/PyQt4/Manifest
+++ b/dev-python/PyQt4/Manifest
@@ -1,31 +1,29 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA256
 
-AUX PyQt4-4.7.2-configure.py.patch 933 SHA256 1a87c58ccb14441f77c7c764b6e6c40d1bdd64c5b35581f3deda54019a3461be SHA512 e2484a7361fabe32861913fe2e81e8c4a2d4e0d697a82a643dfc45332e99221767b0224df3fb0b5da27e33f7c2e6585d5b09a022e3fe35e9c8e3af2ba5feb4a3 WHIRLPOOL 44435221972b24dff022c78ffaa0c5888e035a88e95ebf2220605e34ca736d272b46cf875bbe7bde16b3137f255026f8d07e51c35fc6a9fd52d1256feba32312
 AUX PyQt4-4.7.3-qreal_float_support.patch 6460 SHA256 8183d7a12c094d02eb4f1ac2b983690c39ee54182a0d28adba52348f705e9c16 SHA512 b333f4016b048af66bb13177981dc468f6e645d9280c18a4f419127c48aca8b4d5c034a167be7353884b715e67ec110ff7d4d4e850793883186ebfef7678e372 WHIRLPOOL 9c7a0409023e8c3af3626bfb3887aea687c07feb5235506ea0ed01171095d575b5681171dc5cde1c796448bb83e26449cab7df2432e172b47b43ec751bf99317
-AUX PyQt4-4.9.4-pyuic-custom-widgets.patch 3212 SHA256 8a59ee0fcd3f1d8a52745c68c35eed5e4b0e2b31e6e7bf2f5dca7bdb2396e44c SHA512 58e4e4bb43c32408f3ead09c619c414d717a2ad3b15025a54698d2287c085ac3ec2e14760b6f9e36d11a28202c65aed2a3e378e7c7ed65ee9f6d3b7edc5eaee0 WHIRLPOOL 16d32a6f885fc71205c9208ea8e1ca7fcb6f8fed8f31305e907395dfd3bcb1723c3ea4aeda1eb1f04824cc7424eb00b1318834a98350f5a1d789ca0a2b480b19
 DIST PyQt-x11-gpl-4.10.tar.gz 9353719 SHA256 03eaa01a59b13dc85cad0318dd5ae01d0bd6fb3339f502967bae85c6e8c499df SHA512 caf856d84659375cdaee9eead34d05f7bb0cbacbebf6e53bcfefa054335a774c09475d2e2b4be62967443700fc88e97389484e26e1a7d3ef4e3aa43a20afaade WHIRLPOOL e8ff59b78702c5cfaca81cfca1542339fe96c61c49b4e19adb62b95c617f46b3f0b9d568481bae26419bef6233cd66fcdc6de9fa185ef783fda5498d0df02bca
-DIST PyQt-x11-gpl-4.9.4.tar.gz 9801300 SHA256 29416e9b2dd394d39c3034e103717a40b9090ec05f457600a4d62b6f29b27e48 SHA512 719abd2dc5504c9fdab3151d9649915d80d4b9e59f4f122127c7d9c5938cb4116ba993d7ff1a8468d098bb76d49c7f36aa5f13b30f44fedc38192e89e751e1f3 WHIRLPOOL 294a6d77ecf6540561795219ea02d687d906fd635b1de0c8d78cc60ddf51bf870f819127f58c9bb406edb942a3c8caaf4d581045920b99ecd4b9bb831d16d214
 DIST PyQt-x11-gpl-4.9.6.tar.gz 9349834 SHA256 a350f9e5c6d8062671c0f29bf1a70824719b18175ce8372c29bf7c1eda44b18d SHA512 1d0ca00d529f67d33e51b947b9e2c49a64611a842f1a78220c9390afd1657e909451d9b758d0c008b6efbba7ed047f18ca41323e4db2269d685b9d2400a604aa WHIRLPOOL fd9e2339014e2cce9c4106f92593abca3d71881c57a90e6084a08fdc55213cd640723b988fa792bf4e20e448fb7f6fc43fb72bb45fb7c81bf5819684620ad4ae
 EBUILD PyQt4-4.10.ebuild 5379 SHA256 7feee0b8095f84cbe03cc014a0aae5d4d898769ec906b7d6e205f88acd64385d SHA512 ee8593cfb9df288ab01c897a6e75291e028087bfdd3578ed84d147a241a0bc4b8ebcc098c04629b969bb4a774eb0f84a6f8bc9a0a9916b10afdfab4279823113 WHIRLPOOL 30f14a5b1633c385d1ddd9ef751d935c2ed8b7ba2990a7ce83f5c13d77120e769167c0b2ccf5d45e62b9dc57999f79ada2a079e4fc1e1a5b26b65c3bac0f7336
-EBUILD PyQt4-4.9.4-r1.ebuild 5691 SHA256 b7c690f8e50a26079771bbd776e3c814411d7d345527789badad2a449804824e SHA512 d9fd47db0b7a3e2e5e0726ada90ba66ca6df561054839ca66279fe47058ae479c3fc1dbf3802b917a0b44f0a6dce66d7b9472eff85e05ea838087c9758da8190 WHIRLPOOL e53b90e88bbed69941436459d983d2d9debe95d3f7930121fcf961b9a227845451c88ca73d71a85cc85d8a243fe0a50a377b2b64fe1ff080c447ea65afa732c3
 EBUILD PyQt4-4.9.6-r2.ebuild 5253 SHA256 46262e209f803d6fa4bbb6b719ce48ad6c18e7757720b567dcd36719cee4cd84 SHA512 59bb1e075d62928088938d81e8b89ab5607061d3ddaf9865f203e66f135c7ae5485d6fd38f1545f7ed6252d156973cd9e504e5ab495d0e91374709fa3955c4dd WHIRLPOOL 99333609d64ea845f771541922d71ce379e5ed6669287def4c4806d93d385d68a632de3457e812e27017ffe25a631fdd7e6c8edfa66c78f84f963852a77536ab
-MISC ChangeLog 30548 SHA256 602407522e7b70608a64bab5ffefb5cdcbf9ab6cccd06dd6cd4a0348c0b57225 SHA512 197a9bf429a3ac6a81088bd390944a64301b7dee83507e57f102fbaf91115a96c29434ab74ee21fad9afc6724597ac77d1573bc7dcb65b0c31a6303633a107a9 WHIRLPOOL 1d1b62075b2e2f2e352a0d7a5a693438d3bee9803ea6b09ed9834f35f220c18e74415391b49a5d977e6610dee7bff6734ff74a844e5fa450d8c4800f95432c37
+MISC ChangeLog 30726 SHA256 b2db91908cfeea7a22094e7086e35b3a7d9c789b92c8efffcc85410ba3189016 SHA512 d6cea14d273fd4032a9cb59d003c11d5e9610f2aa8dea6a4041bd69caf4f7589afbc6e1c2025a7eccb4e9f7e7db245f285104b6a4aa9fab2ed169c4784350d9a WHIRLPOOL b726c336ffff1547980dd1293cd78b4d5414ec6e25fb8fe48a92570e95d816bda50058c1b36412656ff9db122fbc078991801e5fdef72e4530d3490fcc0727ac
 MISC metadata.xml 1259 SHA256 6e84edc762013d947ce99abe16bc677889a2df354930daa460cac89c7719b972 SHA512 afed2276d4b93648b7706013cf6877cb7cfb1df94d42aa7dd26b902cbd2ccdc3e420e267aeb26d5899a8c69b4cd17909ee30e0b13982fd0f9c8e6c7b13362857 WHIRLPOOL a65b3dabe625baf77ecdaac2a00c36b5bf42bb2f310b5238bc975cee192f87531175d88e02cbe22db85121ac01d5a23df292db474350b87db038a373cb79cda1
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.19 (GNU/Linux)
 
-iQIcBAEBCAAGBQJRPvF3AAoJENXLsxwXqFxyL0kP/1dCOaM90cOCDvAE0XvM9f2j
-pVXJeoh5A1DIrCbIRRKqzE8Ooo3rPNGRtSSbVpKnCLnoxX4Nr2P6n9mtwtxyWrZ2
-eu6gzntQkAQ9Rst3bGxam1Mv2R3H1mItX2/Q09Dyd19f2HwSvlRM1Pm9HF9TOqKU
-8LejvMRcUqinOpT9OEXV9wudI29L2Y0Xmc/n2Us5OWzUMZWipqDiY74jCgfH+OBO
-2Dw6MYgB5e4XKUAfKMPJD/R+RSSV0bs1T3aofnNkph93tQVRRScsiWZFyn8VMrNY
-YaJZ0Q2Alh93iBj0rpqkumUNsB+lyEFwOXDJkMcyL5ZEZfxueeYUVEHhS8VRS7cL
-W8RnHpeZUMNG0S84VpQcHp3BVb4WrtN4chwiAV7e1gQcJDL9aPsNfaOJnA/N6lNj
-LRpWRNPXsjYQ13JEZqTfQrxxN+hnxVPrschlIQ1iuVsFmPSunNyua1Bnt9adaX72
-fiYhtcrml3NjWfDbNGzAnZEW4lNfsvwW+MZWc4JXwMMFOYZDnQShjxkpOD9WlNwM
-UhglGXfr1DXVkvRKzjFeeD6QXMuxdIkz459MF1MskFfeXb1xzlU0loh4ZMOO2Fv5
-snFRHehvjOm+uQRiwKMLABe0UBjP7azKqMntuT8ynk1BfbmQirSMVM6rTJ0pcthf
-HmSCvAKCIZrt3juxz+T4
-=EmGu
+iQJ8BAEBCABmBQJRhO0BXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
+ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQzNTVDNDczOUYzRjJEMTRGNDRGMzU2RkMw
+OUJGNEY1NEMyQkE3RjNDAAoJEAm/T1TCun880aoP/RYi5aleuRhj1DUx6gBsHhdD
+tAW3KS4qOelUF/Z8AAamWxEL99JV4O29XnH54kbGFHeyZaHZZ+wAsSgRAxKPKIdF
+8E/PGqsKbwwJX7jIuFZuteQUw0OCefXW+6QGLGkH3PJfOottHkZ0HuEcjIu9s7D5
+o3AgIJkzU60aEY0toUg97xdiTqdfbtVZNuS1aMldsg2GovvOT462hETU+jhKC9iC
+b5BdycpbwG/IPXisET2A534Sz6S7N5QbJBIyltPYZecS9SIkrWgOuUQz/6WlBVm9
+bp4e0O8XBHmiQOyuGzDrlX4Af6dGdfXk/eepcZCTfbcrZECmQraXZ9hLVCw2SGQx
+11a5iPJKtJU6D3B28LO8U8McSO1NkPMsgxF8cJbZ7nGUYpM0hbZmgr4PZ4q59grB
+uzeO2upNn2kQFZS2Dl5ho5XsGZwEU5DP6pFGSke1AZPshycL3KQ58zKrXmEF+pcH
+3rd88CdIXuVyPyiTvYp72IAkTT+6mjmVjoW0BR8YodbeW+kB2EKFNFiFh0XQE2om
+Ro+ziIVQBRPPRwI+p2b18fiSl1BhsA5VFHHC0kS7unVyNA27Xi+an72iuIJDwEGt
+PYQPwz8gy6SIB+/5IinNgNbXS9L7fJ5wmCiiwk7Y9TUDbYShqTfMTRrIT1ddr0pn
+8oBgjIgqTW1cVkRZethC
+=d/FD
 -----END PGP SIGNATURE-----
diff --git a/dev-python/PyQt4/PyQt4-4.9.4-r1.ebuild b/dev-python/PyQt4/PyQt4-4.9.4-r1.ebuild
deleted file mode 100644
index 4c49af1b1511..000000000000
--- a/dev-python/PyQt4/PyQt4-4.9.4-r1.ebuild
+++ /dev/null
@@ -1,211 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/PyQt4/PyQt4-4.9.4-r1.ebuild,v 1.4 2013/03/03 00:36:24 hwoarang Exp $
-
-EAPI=4
-
-PYTHON_DEPEND="*"
-PYTHON_EXPORT_PHASE_FUNCTIONS="1"
-SUPPORT_PYTHON_ABIS="1"
-RESTRICT_PYTHON_ABIS="*-jython *-pypy-*"
-
-inherit eutils toolchain-funcs qt4-r2 python
-
-# Minimal supported version of Qt.
-QT_VER="4.7.2"
-
-DESCRIPTION="Python bindings for the Qt toolkit"
-HOMEPAGE="http://www.riverbankcomputing.co.uk/software/pyqt/intro/ http://pypi.python.org/pypi/PyQt"
-
-if [[ ${PV} == *_pre* ]]; then
-	MY_P="PyQt-x11-gpl-snapshot-${PV%_pre*}-${REVISION}"
-	SRC_URI="http://www.gentoo-el.org/~hwoarang/distfiles/${MY_P}.tar.gz"
-else
-	MY_P="PyQt-x11-gpl-${PV}"
-	SRC_URI="http://www.riverbankcomputing.com/static/Downloads/${PN}/${MY_P}.tar.gz"
-fi
-
-LICENSE="|| ( GPL-2 GPL-3 )"
-SLOT="0"
-KEYWORDS="alpha amd64 arm ia64 ppc ppc64 sparc x86 ~amd64-linux ~x86-linux"
-IUSE="X assistant dbus debug declarative doc examples kde multimedia opengl phonon sql svg webkit xmlpatterns"
-
-REQUIRED_USE="
-	assistant? ( X )
-	declarative? ( X )
-	multimedia? ( X )
-	opengl? ( X )
-	phonon? ( X )
-	sql? ( X )
-	svg? ( X )
-	webkit? ( X )
-"
-
-RDEPEND="
-	>=dev-python/sip-4.13.3
-	>=dev-qt/qtcore-${QT_VER}:4
-	>=dev-qt/qtscript-${QT_VER}:4
-	X? (
-		>=dev-qt/qtgui-${QT_VER}:4[dbus?]
-		>=dev-qt/qttest-${QT_VER}:4
-	)
-	assistant? ( >=dev-qt/qthelp-${QT_VER}:4 )
-	dbus? (
-		>=dev-python/dbus-python-0.80
-		>=dev-qt/qtdbus-${QT_VER}:4
-	)
-	declarative? ( >=dev-qt/qtdeclarative-${QT_VER}:4 )
-	multimedia? ( >=dev-qt/qtmultimedia-${QT_VER}:4 )
-	opengl? (
-		>=dev-qt/qtopengl-${QT_VER}:4
-		|| ( >=dev-qt/qtopengl-4.8.0:4 <dev-qt/qtopengl-4.8.0:4[-egl] )
-	)
-	phonon? (
-		!kde? ( || ( >=dev-qt/qtphonon-${QT_VER}:4 media-libs/phonon ) )
-		kde? ( media-libs/phonon )
-	)
-	sql? ( >=dev-qt/qtsql-${QT_VER}:4 )
-	svg? ( >=dev-qt/qtsvg-${QT_VER}:4 )
-	webkit? ( >=dev-qt/qtwebkit-${QT_VER}:4 )
-	xmlpatterns? ( >=dev-qt/qtxmlpatterns-${QT_VER}:4 )
-"
-DEPEND="${RDEPEND}
-	dbus? ( virtual/pkgconfig )
-"
-
-S=${WORKDIR}/${MY_P}
-
-PATCHES=(
-	"${FILESDIR}/${PN}-4.7.2-configure.py.patch"
-	"${FILESDIR}/${P}-pyuic-custom-widgets.patch"
-)
-
-PYTHON_VERSIONED_EXECUTABLES=("/usr/bin/pyuic4")
-
-src_prepare() {
-	if ! use dbus; then
-		sed -e 's/^\([[:blank:]]\+\)check_dbus()/\1pass/' -i configure.py || die
-	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
-
-	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"
-			--assume-shared
-			--no-timestamp
-			--qsci-api
-			$(use debug && echo --debug)
-			--enable=QtCore
-			--enable=QtNetwork
-			--enable=QtScript
-			--enable=QtXml
-			$(pyqt4_use_enable X QtGui)
-			$(pyqt4_use_enable X QtDesigner) $(use X || echo --no-designer-plugin)
-			$(pyqt4_use_enable X QtScriptTools)
-			$(pyqt4_use_enable X QtTest)
-			$(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[@]}" || die
-
-		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, 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 "Failed to fix rpath for ${mod}"
-		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_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
-
-	if use doc; then
-		dohtml -r doc/html/*
-	fi
-
-	if use examples; then
-		insinto /usr/share/doc/${PF}
-		doins -r examples
-	fi
-}
-
-pkg_postinst() {
-	python_mod_optimize PyQt4
-
-	ewarn "When updating dev-python/PyQt4, you usually need to rebuild packages that depend on it,"
-	ewarn "such as dev-python/qscintilla-python and kde-base/pykde4. 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
-}
diff --git a/dev-python/PyQt4/files/PyQt4-4.7.2-configure.py.patch b/dev-python/PyQt4/files/PyQt4-4.7.2-configure.py.patch
deleted file mode 100644
index 4f3b251de0a6..000000000000
--- a/dev-python/PyQt4/files/PyQt4-4.7.2-configure.py.patch
+++ /dev/null
@@ -1,27 +0,0 @@
---- PyQt-x11-gpl-4.7.2/configure.py.orig	2010-03-18 00:59:51.000000000 +0100
-+++ PyQt-x11-gpl-4.7.2/configure.py	2010-03-18 01:08:46.000000000 +0100
-@@ -478,7 +478,7 @@
-             generate_code("QtXmlPatterns")
- 
-         if "phonon" in pyqt_modules:
--            generate_code("phonon")
-+            generate_code("phonon", extra_include_dirs=["/usr/include/phonon"])
- 
-         if "QtAssistant" in pyqt_modules:
-             generate_code("QtAssistant")
-@@ -797,6 +797,7 @@
-                 install_dir=pydbusmoddir,
-                 qt=["QtCore"],
-                 debug=opts.debug,
-+                strip=0,
-                 universal=sipcfg.universal,
-                 arch=sipcfg.arch
-             )
-@@ -1611,6 +1612,7 @@
-         warnings=1,
-         static=opts.static,
-         debug=opts.debug,
-+        strip=0,
-         universal=sipcfg.universal,
-         arch=sipcfg.arch,
-         prot_is_public=opts.prot_is_public
diff --git a/dev-python/PyQt4/files/PyQt4-4.9.4-pyuic-custom-widgets.patch b/dev-python/PyQt4/files/PyQt4-4.9.4-pyuic-custom-widgets.patch
deleted file mode 100644
index 20ebeb93e842..000000000000
--- a/dev-python/PyQt4/files/PyQt4-4.9.4-pyuic-custom-widgets.patch
+++ /dev/null
@@ -1,93 +0,0 @@
-
-
-# HG changeset patch
-# User Phil Thompson <phil@riverbankcomputing.com>
-# Date 2012-07-13 13:39:28 +0100
-# Node ID 29b668ada14c1428a3bbfe8f0324c6626bd5ac9a
-# Parent  fd0f3da9d79ca9858d10a20c15fb85456cb832d7
-Fixed a regression in pyuic's handling of custom widgets.
-
-diff --git a/pyuic/uic/Compiler/qobjectcreator.py b/pyuic/uic/Compiler/qobjectcreator.py
---- a/pyuic/uic/Compiler/qobjectcreator.py
-+++ b/pyuic/uic/Compiler/qobjectcreator.py
-@@ -1,6 +1,6 @@
- #############################################################################
- ##
--## Copyright (C) 2011 Riverbank Computing Limited.
-+## Copyright (C) 2012 Riverbank Computing Limited.
- ## Copyright (C) 2006 Thorsten Marek.
- ## All right reserved.
- ##
-@@ -100,7 +100,6 @@
-         assert widgetClass not in self._widgets 
-         self._widgets[widgetClass] = (baseClass, module)
- 
--
-     def _resolveBaseclass(self, baseClass):
-         try:
-             for x in range(0, 10):
-@@ -114,19 +113,17 @@
-         except KeyError:
-             raise ValueError("unknown baseclass %s" % baseClass)
-         
--
-     def search(self, cls):
-         try:
--            self._usedWidgets.add(cls)
-             baseClass = self._resolveBaseclass(self._widgets[cls][0])
-             DEBUG("resolved baseclass of %s: %s" % (cls, baseClass))
--            
--            return type(cls, (baseClass,),
--                        {"module" : ""})
--        
-         except KeyError:
-             return None
- 
-+        self._usedWidgets.add(cls)
-+
-+        return type(cls, (baseClass, ), {"module" : ""})
-+
-     def _writeImportCode(self):
-         imports = {}
-         for widget in self._usedWidgets:
-diff --git a/pyuic/uic/objcreator.py b/pyuic/uic/objcreator.py
---- a/pyuic/uic/objcreator.py
-+++ b/pyuic/uic/objcreator.py
-@@ -102,19 +102,26 @@
-         self._modules.append(self._customWidgets)
- 
-     def createQObject(self, classname, *args, **kwargs):
--        # Handle scoped names, typically static factory methods.
--        parts = classname.split('.')
--        factory = self.findQObjectType(parts[0])
-+        # Handle regular and custom widgets.
-+        factory = self.findQObjectType(classname)
- 
--        if factory is not None:
--            for part in parts[1:]:
--                factory = getattr(factory, part, None)
--                if factory is None:
--                    break
--            else:
--                return self._cpolicy.instantiate(factory, *args, **kwargs)
-+        if factory is None:
-+            # Handle scoped names, typically static factory methods.
-+            parts = classname.split('.')
- 
--        raise NoSuchWidgetError(classname)
-+            if len(parts) > 1:
-+                factory = self.findQObjectType(parts[0])
-+
-+                if factory is not None:
-+                    for part in parts[1:]:
-+                        factory = getattr(factory, part, None)
-+                        if factory is None:
-+                            break
-+
-+            if factory is None:
-+                raise NoSuchWidgetError(classname)
-+
-+        return self._cpolicy.instantiate(factory, *args, **kwargs)
- 
-     def invoke(self, rname, method, args=()):
-         return self._cpolicy.invoke(rname, method, args)