old

Package-Manager: portage-2.2.0_alpha149/cvs/Linux x86_64
Manifest-Sign-Key: 0x17A85C72

3 files changed, 18 insertions, 227 deletions

diff --git a/dev-python/PyQt4/ChangeLog b/dev-python/PyQt4/ChangeLog
index 541f9e9abc6f..ba75d9614c11 100644
--- a/dev-python/PyQt4/ChangeLog
+++ b/dev-python/PyQt4/ChangeLog
@@ -1,6 +1,9 @@
 # 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.204 2012/12/26 03:11:43 pesa Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/PyQt4/ChangeLog,v 1.205 2012/12/26 03:14:58 pesa Exp $
+
+  26 Dec 2012; Davide Pesavento <pesa@gentoo.org> -PyQt4-4.9.5.ebuild:
+  old
 
 *PyQt4-4.9.6-r1 (26 Dec 2012)
 
diff --git a/dev-python/PyQt4/Manifest b/dev-python/PyQt4/Manifest
index 017c5476c520..01e84817c364 100644
--- a/dev-python/PyQt4/Manifest
+++ b/dev-python/PyQt4/Manifest
@@ -5,28 +5,26 @@ AUX PyQt4-4.7.2-configure.py.patch 933 SHA256 1a87c58ccb14441f77c7c764b6e6c40d1b
 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.9.4.tar.gz 9801300 SHA256 29416e9b2dd394d39c3034e103717a40b9090ec05f457600a4d62b6f29b27e48 SHA512 719abd2dc5504c9fdab3151d9649915d80d4b9e59f4f122127c7d9c5938cb4116ba993d7ff1a8468d098bb76d49c7f36aa5f13b30f44fedc38192e89e751e1f3 WHIRLPOOL 294a6d77ecf6540561795219ea02d687d906fd635b1de0c8d78cc60ddf51bf870f819127f58c9bb406edb942a3c8caaf4d581045920b99ecd4b9bb831d16d214
-DIST PyQt-x11-gpl-4.9.5.tar.gz 9824076 SHA256 75ff0a3a088ae22c4d6e8adb242f7e593104af93933cbdd9900bc7b06f46191e SHA512 27891944f35c66476b045cc5398e32d8566bc25d95e893a17f518f85f3a8b0ccbf1b56e148d086f5563259c76cf89e63057f9c77e16876343643235a930b0856 WHIRLPOOL 32ae4b2d9ff6146614f9ceeb263ab8b0a877a98e6528d026b20280253702a3a5218131e8bda1b6968a20f994f3b08bfcbeda9bd9b11ce8a742bb749cbad3483e
 DIST PyQt-x11-gpl-4.9.6.tar.gz 9349834 SHA256 a350f9e5c6d8062671c0f29bf1a70824719b18175ce8372c29bf7c1eda44b18d SHA512 1d0ca00d529f67d33e51b947b9e2c49a64611a842f1a78220c9390afd1657e909451d9b758d0c008b6efbba7ed047f18ca41323e4db2269d685b9d2400a604aa WHIRLPOOL fd9e2339014e2cce9c4106f92593abca3d71881c57a90e6084a08fdc55213cd640723b988fa792bf4e20e448fb7f6fc43fb72bb45fb7c81bf5819684620ad4ae
 EBUILD PyQt4-4.9.4-r1.ebuild 5742 SHA256 601ced757792b9e858a0c4ad69a5aa5ccb6fd961c791f681de8ad2469db0b83b SHA512 294287e228c70a3ca41b52cfeebc7e35b121aeea46ce6c84ead7e9239f1cd2a15d195535376306f917a9b51a9936a8b48c1c985410cd1b402f1be80f5a001820 WHIRLPOOL 6ff0cb2300333730e50222b00bc2f1b3ff66f03e379e33872214df44be9773b324645964aee7a1ff87d1140187e7737dd3f1892163fdc70c88d00b94bed52de2
-EBUILD PyQt4-4.9.5.ebuild 5683 SHA256 30fd5e957168b9f61743b97218beb144e4bae6f9bb9f3d3fa4df6c480df63953 SHA512 e185dbc8b8aadc8c73fa95c91f42c77f65a8e28975e95f0fa0f7d8c41f93da46240f536e2fc5f3f00dc8c33519f1b21c0a380279f77d5376dc6670320f40e266 WHIRLPOOL 4ec781091281f5f1b16afc0a5dd1b7d729c2859a1bbf802b2addac63c5811360c8d79f7fb6cae4f21be5c501431fa148ddeb5a64e2593462f1f8d60bf9e02fec
 EBUILD PyQt4-4.9.6-r1.ebuild 5425 SHA256 791d48fd8f7704df806565daa36ab485e5abad20b584081ccaafb8fdb599a6d5 SHA512 f628542bf2d0ddc89ef73e201f520d2750327cb809a57f35baee80e61bcff8b4d6197f8f19724ce086d16c4326cc3c411c5663668ad344f89eac291e9ef2e6c3 WHIRLPOOL 47bfb0021a5a8f7826f1f5fa6960cacffeadb3d491fb230c78e3d699b0ab029963e923fb55af9002cddfbeebe1502037d34a7e97181c233859907e02582355dc
 EBUILD PyQt4-4.9.6.ebuild 5777 SHA256 83d708e29360ace76838a47a7c6c65e2bf52d580a485974d04f64c5dd4368ac8 SHA512 fc32778b2fdd722c49a95c61f8c0e4450f8953b9beba8d7fe5862d4b4ae56624dde4ce486e0e3790c002c5e9b4b99345c65658f26a088940d159886b65c5316f WHIRLPOOL 5bb620c8d34a813a0a5cc525715e0837e5bbb7fbd489c48bcf8d16948116c5fbd22d6bc1424ec6b269126f0b7f8ac8f34720c08b955c4f4301bf3bde13d737e2
-MISC ChangeLog 28608 SHA256 dd591b01ba25ac3b78b04d4712cd6053a60a00117ad8b6178c269613cb0a93b3 SHA512 bdc32683db442a9d4ba97a0b23afe6fca0a3f881ed93f2e64d161fdd8cff51b3453ff54c2d64f3021e2605bbf3e8931a0521e53a81816461e32467b1f7f93b40 WHIRLPOOL 50891167228a5a74fb26e50366e66b108327d0011613939e34012444f8955f9dc2f43d0c3dc2ad22e373e75ec0200f55bcaaeca86e07b2799753d9b18b2fc41a
+MISC ChangeLog 28686 SHA256 df76f760e2c0df36dbb622e85ca7a8a25293d6edd82f2d86a4f86d2ebf131ab6 SHA512 b4f899cd562810b037df0ad34ffc40ac4abbbe1683b93302b0b7e1fdb58da10bef56acf973099ac91a3e53aa5eae1ea235fb7ca370192b6ba093f48c638c252d WHIRLPOOL ffc8a0b350e70173e0d53cc973a816c3e71f72864282c036f1f1685b4fb63b688cc1dc31b02ccd945f6aecc14dd6bb96f308e1ce7a63750931f2cae393669942
 MISC metadata.xml 1259 SHA256 6e84edc762013d947ce99abe16bc677889a2df354930daa460cac89c7719b972 SHA512 afed2276d4b93648b7706013cf6877cb7cfb1df94d42aa7dd26b902cbd2ccdc3e420e267aeb26d5899a8c69b4cd17909ee30e0b13982fd0f9c8e6c7b13362857 WHIRLPOOL a65b3dabe625baf77ecdaac2a00c36b5bf42bb2f310b5238bc975cee192f87531175d88e02cbe22db85121ac01d5a23df292db474350b87db038a373cb79cda1
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.19 (GNU/Linux)
 
-iQIcBAEBCAAGBQJQ2mr+AAoJENXLsxwXqFxyBR4P/1sqo8pkihQMVx2XmgrOZJIA
-WfQ0obiqxOfKMnNYnePlq3wsASkhbc8zkBWzoIlUbIJRC45qPQiMKly9+iFQvLL/
-yo7tvbS/To3nwvU4z+6Cxi+/hnUgsfWYGXPquwHnVAlyu4tSeDuHSn140CMRsL9Z
-Y1YTMImpoIAaIltdZ64HXVGSimVZA9sSNaHmayambXjeyYxhpXR8yT+3r4J8J/yE
-bhrQLpgwtBNdBFNr0UFRiYr9X93msbHBtMwaL4s7qFVV9fsrqG1aY+puYfr95mTg
-3GzCn1G0RR1eW54dl6amClQ3q2MkqPP4psto6j3Ic20l0vmbHOwg5Se3WTMRCCZB
-XrXEy/LfYPTDchfgSIOMu3dl55yPZmM12ZaqtiXY0sPxi/njytVZCheJPbFV48fz
-EhMGd5q8B5U7UkiWbeAUbpzV0mNEeJlM5TnBtRO9vje/izjIQTITk0vFquqxXNmG
-qYwKWTI7ZGvTsfPchwJPwgkcVdFvTSeSJwkhVnEMYP7l9QK66u+aLIKhmOx3+Nnh
-BfZKusp1mQHzGuFmB6W5KGKq5muaK4Vr02S3R6MFFpX7iUBKMQXyaCtRcfYEYTE+
-suTXGU6KpHPf5vRjqas/kE52BT7y2Xo550MWsq3md4mSsHbD1vnfeCf7onfX2fsW
-uROe9JG1fcdBQW6LWNBi
-=7JVg
+iQIcBAEBCAAGBQJQ2muyAAoJENXLsxwXqFxyqDAQAJNQi4jIqjfyVUMF6agAqHiF
+PZVCCKHiF4R2iCopOtu2YD5gFFKq1IbQS+Yf/iNECm7pqELIuXDBPELNOM7Il/ar
+gpcRi6/s4sXoe/J873zjlpTMDeNdIyAXo1aokTxxCms8OYQ1YDLb5z2ij8z4FUp+
+3jdcNzWBe5M1dX4krw9bWNR78cluk2sDpdW2F8GZUfiDRntdUs+LHqBiZPJyYMVH
+qeD/uCyxfS7caQ2/pNfFW3ldvFR5DCKtS0fOCViAaJKeNDQk7olNrifN+K9LUjHR
+P676yBtkxS7Og3msRrqKLk6WON5Y7L+JE8C+LSLX4Xa1bFSTqpJVurHf74VhAykQ
+bS+CFQ0sY7Hv+N8yp758wXhG/xzm8lPm5Wkwlhqmnrk+qt3NiGQhv+E3pqElohW+
+aItWmUVlfTJceVddAEFukvRueqw3NnFxXdq4izjAr7HI8g4oJD9bz2v9XoJGb3jO
+eyKrOdWrdLBittqvT1by608oYW9jTJAh3EfdKu6U02HNbUp2dCWdmLd/KxZ7QaET
+51NolQdrajY9mUmSyWZu1SkCGPZud4GItBtcAfdZhnEOWcDWcnm32nIodK+2peEm
+WIhUP2TY4fqr7UV9WGtDwhnmMBZqoOEz6HdxN17IbqecuE3MZ5WnYovDP/FdOF/j
+FIx6/VDNR6tXHA3xysT4
+=POaE
 -----END PGP SIGNATURE-----
diff --git a/dev-python/PyQt4/PyQt4-4.9.5.ebuild b/dev-python/PyQt4/PyQt4-4.9.5.ebuild
deleted file mode 100644
index 7e207317c835..000000000000
--- a/dev-python/PyQt4/PyQt4-4.9.5.ebuild
+++ /dev/null
@@ -1,210 +0,0 @@
-# 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.5.ebuild,v 1.1 2012/10/05 20:25:54 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://dev.gentoo.org/~hwoarang/distfiles/${MY_P}.tar.gz"
-else
-	MY_P="PyQt-x11-gpl-${PV}"
-	SRC_URI="mirror://sourceforge/pyqt/${PN}/PyQt-${PV}/${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.14
-	>=x11-libs/qt-core-${QT_VER}:4
-	>=x11-libs/qt-script-${QT_VER}:4
-	X? (
-		>=x11-libs/qt-gui-${QT_VER}:4[dbus?]
-		>=x11-libs/qt-test-${QT_VER}:4
-	)
-	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.8.0:4[-egl] )
-	)
-	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 )
-"
-DEPEND="${RDEPEND}
-	dbus? ( virtual/pkgconfig )
-"
-
-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
-	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
-}