Copy 4.8.1 to 4.8.1-r1. Delete "declarative" USE flag in 4.8.1.

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

4 files changed, 186 insertions, 7 deletions

diff --git a/dev-python/PyQt4/ChangeLog b/dev-python/PyQt4/ChangeLog
index 54eb128743f8..be51c94199e8 100644
--- a/dev-python/PyQt4/ChangeLog
+++ b/dev-python/PyQt4/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for dev-python/PyQt4
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/PyQt4/ChangeLog,v 1.139 2010/12/25 15:01:17 arfrever Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/PyQt4/ChangeLog,v 1.140 2010/12/30 01:11:19 arfrever Exp $
+
+*PyQt4-4.8.1-r1 (30 Dec 2010)
+
+  30 Dec 2010; Arfrever Frehtes Taifersar Arahesis <arfrever@gentoo.org>
+  PyQt4-4.8.1.ebuild, +PyQt4-4.8.1-r1.ebuild:
+  Copy 4.8.1 to 4.8.1-r1. Delete "declarative" USE flag in 4.8.1.
 
   25 Dec 2010; Arfrever Frehtes Taifersar Arahesis <arfrever@gentoo.org>
   PyQt4-4.8.2.ebuild:
diff --git a/dev-python/PyQt4/Manifest b/dev-python/PyQt4/Manifest
index 5a8a8bde3f21..67587bd870a4 100644
--- a/dev-python/PyQt4/Manifest
+++ b/dev-python/PyQt4/Manifest
@@ -8,7 +8,8 @@ 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
 EBUILD PyQt4-4.7.3.ebuild 4672 RMD160 157969a93dfb7f4dbc8bb9baa60a112f9fe61d0e SHA1 522a3ba34963cd0a539babb333112580721998d5 SHA256 021e4f0b244ea19e60c030d6d38ffb67294c9856a3f127dcfc1dbf78b1df0583
 EBUILD PyQt4-4.7.7-r1.ebuild 4646 RMD160 4d638a8e96fdc64335a8cdc27caa4f7e5d35c1a3 SHA1 22f8061422deab563300cc765ed43c9d3aa8c50a SHA256 c27219498de969cfd4a039f413c76cbf5d3f4d8f2aff2cf463db5d3e3b0cc286
-EBUILD PyQt4-4.8.1.ebuild 4851 RMD160 f095bb906f977de030bed3ee9557c78dc0a77896 SHA1 e33fe8384236c2f561dd35e8e0b10d31e0e97acc SHA256 dfe7763a871b0519cf1588acd0746b946fc1acc18ceff6ead6ca0a753c382418
+EBUILD PyQt4-4.8.1-r1.ebuild 4854 RMD160 7d73c74a0ca56497e71e83b0d4f93dd6e37e0086 SHA1 037921e86b452877eed10b9e471cf873468f02f8 SHA256 dcf3ebed5a55c8af140debaad4280db6bb9ab615ed33937c24a5ff372839aab9
+EBUILD PyQt4-4.8.1.ebuild 4734 RMD160 3e8990b2bbee9a57b7d71b62e5d0510279987077 SHA1 fdc10bf01b55f10b1e1449e32e9f9aefa99fb003 SHA256 fe1679bc592bc03d44d7478492bedcb8261956b559ac2b8befee3707d7c6534d
 EBUILD PyQt4-4.8.2.ebuild 4849 RMD160 20b42fdf8fcf96740d759e4c1699b237aa3cde7a SHA1 73c3657d2690849c132d22edf5cc88f514866812 SHA256 a76d5d6b812bf00e1b703e0ddf6ab99a667bff5993e09b538628013ae3490265
-MISC ChangeLog 19220 RMD160 8a04a2f2313f8d19701e216c39e979ffc4e4b3d9 SHA1 884550cd3144474c330950a0fb13d5e5ac3e6352 SHA256 4b97cefdcb10094909c1085c0199e6a4629a522ff8430845b1616273e52ee119
+MISC ChangeLog 19437 RMD160 c5996e8cda8d967521a00b9a035753334886e2de SHA1 2b4ec95c9b08a203f9e1a7609bb5292e35002880 SHA256 dc75392e0280e908e963f6d586cbabf5f9fa43700499f21c1f33a631d0c27193
 MISC metadata.xml 878 RMD160 cdc42fae8ad9f67bbe0dcc949f7822cc72d0acf9 SHA1 f1907739ab33d27cd8276c57b4d062a3b44ae402 SHA256 89c99beeac252dc158fb953793675d0133b2daa91b22f4c5a016262348323afe
diff --git a/dev-python/PyQt4/PyQt4-4.8.1-r1.ebuild b/dev-python/PyQt4/PyQt4-4.8.1-r1.ebuild
new file mode 100644
index 000000000000..5d74331f20bd
--- /dev/null
+++ b/dev-python/PyQt4/PyQt4-4.8.1-r1.ebuild
@@ -0,0 +1,174 @@
+# Copyright 1999-2010 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-python/PyQt4/PyQt4-4.8.1-r1.ebuild,v 1.1 2010/12/30 01:11:19 arfrever 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.11.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 )
+	phonon? (
+		!kde? ( || ( >=x11-libs/qt-phonon-${QT_VER}:4 media-sound/phonon ) )
+		kde? ( media-sound/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.6.1-configure-multilib.patch"
+	"${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 QtGui)
+			$(pyqt4_use_enable X QtDesigner)
+			$(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); do
+			# Run eqmake4 inside the qpy subdirectories to avoid stripping and many other QA issues.
+			pushd qpy/${mod} > /dev/null || return 1
+			eqmake4 $(ls w_qpy*.pro)
+			popd > /dev/null || return 1
+
+			# Fix insecure runpaths.
+			sed -e "/^LFLAGS/s:-Wl,-rpath,${BUILDDIR}/qpy/${mod}::" -i ${mod}/Makefile || die "Fixing of rpaths failed"
+		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_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 doc/pyqt4ref.txt NEWS THANKS || die "dodoc failed"
+
+	if use doc; then
+		dohtml -r doc/* || 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
+}
diff --git a/dev-python/PyQt4/PyQt4-4.8.1.ebuild b/dev-python/PyQt4/PyQt4-4.8.1.ebuild
index dfa0dab4a28e..8d2bb8a11f32 100644
--- a/dev-python/PyQt4/PyQt4-4.8.1.ebuild
+++ b/dev-python/PyQt4/PyQt4-4.8.1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/PyQt4/PyQt4-4.8.1.ebuild,v 1.4 2010/12/19 18:54:31 arfrever Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/PyQt4/PyQt4-4.8.1.ebuild,v 1.5 2010/12/30 01:11:19 arfrever Exp $
 
 EAPI="3"
 PYTHON_DEPEND="*"
@@ -22,7 +22,7 @@ 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"
+IUSE="X assistant +dbus debug doc examples kde multimedia opengl phonon sql svg webkit xmlpatterns"
 
 DEPEND=">=dev-python/sip-4.11.2
 	>=x11-libs/qt-core-${QT_VER}:4
@@ -34,7 +34,6 @@ DEPEND=">=dev-python/sip-4.11.2
 		>=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 )
 	phonon? (
@@ -104,7 +103,6 @@ src_configure() {
 			# 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)