Version bump. Drop qatomic-x32 patch applied upstream. Drop qpa useflag.

(Portage version: 2.2.0_alpha128/cvs/Linux x86_64)

2 files changed, 82 insertions, 1 deletions

diff --git a/x11-libs/qt-declarative/ChangeLog b/x11-libs/qt-declarative/ChangeLog
index abe0d3fc6ff7..4a3091c42dc6 100644
--- a/x11-libs/qt-declarative/ChangeLog
+++ b/x11-libs/qt-declarative/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for x11-libs/qt-declarative
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-libs/qt-declarative/ChangeLog,v 1.53 2012/07/19 20:58:11 maekke Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/qt-declarative/ChangeLog,v 1.54 2012/09/14 07:44:15 yngwin Exp $
+
+*qt-declarative-4.8.3 (14 Sep 2012)
+
+  14 Sep 2012; Ben de Groot <yngwin@gentoo.org> +qt-declarative-4.8.3.ebuild:
+  Version bump. Drop qatomic-x32 patch applied upstream. Drop qpa useflag.
 
   19 Jul 2012; Markus Meier <maekke@gentoo.org> qt-declarative-4.8.2.ebuild:
   arm stable, bug #424625
diff --git a/x11-libs/qt-declarative/qt-declarative-4.8.3.ebuild b/x11-libs/qt-declarative/qt-declarative-4.8.3.ebuild
new file mode 100644
index 000000000000..1b930b80f598
--- /dev/null
+++ b/x11-libs/qt-declarative/qt-declarative-4.8.3.ebuild
@@ -0,0 +1,76 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/qt-declarative/qt-declarative-4.8.3.ebuild,v 1.1 2012/09/14 07:44:15 yngwin Exp $
+
+EAPI=4
+
+inherit qt4-build
+
+DESCRIPTION="The Declarative module for the Qt toolkit"
+SLOT="4"
+if [[ ${QT4_BUILD_TYPE} == live ]]; then
+	KEYWORDS=""
+else
+	KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-fbsd ~amd64-linux ~x86-linux ~ppc-macos"
+fi
+IUSE="+accessibility qt3support webkit"
+
+DEPEND="
+	~x11-libs/qt-core-${PV}[aqua=,c++0x=,debug=,qt3support=]
+	~x11-libs/qt-gui-${PV}[accessibility=,aqua=,c++0x=,debug=,qt3support=]
+	~x11-libs/qt-opengl-${PV}[aqua=,c++0x=,debug=,qt3support=]
+	~x11-libs/qt-script-${PV}[aqua=,c++0x=,debug=]
+	~x11-libs/qt-sql-${PV}[aqua=,c++0x=,debug=,qt3support=]
+	~x11-libs/qt-svg-${PV}[accessibility=,aqua=,c++0x=,debug=]
+	~x11-libs/qt-xmlpatterns-${PV}[aqua=,c++0x=,debug=]
+	qt3support? ( ~x11-libs/qt-qt3support-${PV}[accessibility=,aqua=,c++0x=,debug=] )
+	webkit? ( ~x11-libs/qt-webkit-${PV}[aqua=,debug=] )
+"
+RDEPEND="${DEPEND}"
+
+pkg_setup() {
+	QT4_TARGET_DIRECTORIES="
+		src/declarative
+		src/imports
+		tools/designer/src/plugins/qdeclarativeview
+		tools/qml
+		tools/qmlplugindump"
+
+	if use webkit; then
+		QT4_TARGET_DIRECTORIES+=" src/3rdparty/webkit/Source/WebKit/qt/declarative"
+	fi
+
+	QT4_EXTRACT_DIRECTORIES="
+		include
+		src
+		tools
+		translations"
+
+	QCONFIG_ADD="declarative"
+	QCONFIG_DEFINE="QT_DECLARATIVE"
+
+	qt4-build_pkg_setup
+}
+
+src_configure() {
+	myconf+="
+		-declarative -no-gtkstyle
+		$(qt_use accessibility)
+		$(qt_use qt3support)
+		$(qt_use webkit)"
+	qt4-build_src_configure
+}
+
+src_install() {
+	qt4-build_src_install
+
+	# install private headers
+	if use aqua && [[ ${CHOST##*-darwin} -ge 9 ]]; then
+		insinto "${QTLIBDIR#${EPREFIX}}"/QtDeclarative.framework/Headers/private
+		# ran for the 2nd time, need it for the updated headers
+		fix_includes
+	else
+		insinto "${QTHEADERDIR#${EPREFIX}}"/QtDeclarative/private
+	fi
+	find "${S}"/src/declarative/ -type f -name "*_p.h" -exec doins {} +
+}