version bump

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

3 files changed, 66 insertions, 2 deletions

diff --git a/x11-libs/qt-demo/ChangeLog b/x11-libs/qt-demo/ChangeLog
index 0f97e8f93a3e..fdda3793bc6a 100644
--- a/x11-libs/qt-demo/ChangeLog
+++ b/x11-libs/qt-demo/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for x11-libs/qt-demo
-# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-libs/qt-demo/ChangeLog,v 1.78 2011/12/27 21:42:55 maekke Exp $
+# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/qt-demo/ChangeLog,v 1.79 2012/01/29 17:02:04 wired Exp $
+
+*qt-demo-4.8.0 (29 Jan 2012)
+
+  29 Jan 2012; Alex Alexander <wired@gentoo.org> +qt-demo-4.8.0.ebuild,
+  metadata.xml:
+  version bump
 
   27 Dec 2011; Markus Meier <maekke@gentoo.org> qt-demo-4.7.4.ebuild:
   x86 stable, bug #390963
diff --git a/x11-libs/qt-demo/metadata.xml b/x11-libs/qt-demo/metadata.xml
index cd68118d37a5..80ed182284bb 100644
--- a/x11-libs/qt-demo/metadata.xml
+++ b/x11-libs/qt-demo/metadata.xml
@@ -7,5 +7,7 @@
 			inside the event loop (recommended by Nokia)</flag>
 		<flag name='qt3support'>Enable the Qt3Support libraries for Qt4. Note that
 			this does not mean you can compile pure Qt3 programs with Qt4.</flag>
+		<flag name='c++0x'>Build Qt using the C++11 standard</flag>
+		<flag name='qpa'>Build a window system agnostic implementation of Qt</flag>
 	</use>
 </pkgmetadata>
diff --git a/x11-libs/qt-demo/qt-demo-4.8.0.ebuild b/x11-libs/qt-demo/qt-demo-4.8.0.ebuild
new file mode 100644
index 000000000000..d54f5713728d
--- /dev/null
+++ b/x11-libs/qt-demo/qt-demo-4.8.0.ebuild
@@ -0,0 +1,56 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/qt-demo/qt-demo-4.8.0.ebuild,v 1.1 2012/01/29 17:02:04 wired Exp $
+
+EAPI="3"
+inherit qt4-build
+
+DESCRIPTION="Demonstration module of the Qt toolkit"
+SLOT="4"
+KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
+IUSE="kde qt3support"
+
+DEPEND="~x11-libs/qt-assistant-${PV}:${SLOT}[aqua=,c++0x=,qpa=,debug=]
+	~x11-libs/qt-core-${PV}:${SLOT}[aqua=,c++0x=,qpa=,debug=,qt3support=]
+	~x11-libs/qt-dbus-${PV}:${SLOT}[aqua=,c++0x=,qpa=,debug=]
+	~x11-libs/qt-declarative-${PV}:${SLOT}[aqua=,c++0x=,qpa=,debug=,webkit]
+	~x11-libs/qt-gui-${PV}:${SLOT}[aqua=,c++0x=,qpa=,debug=,qt3support=]
+	~x11-libs/qt-multimedia-${PV}:${SLOT}[aqua=,c++0x=,qpa=,debug=]
+	~x11-libs/qt-opengl-${PV}:${SLOT}[aqua=,c++0x=,qpa=,debug=,qt3support=]
+	!kde? ( || ( ~x11-libs/qt-phonon-${PV}:${SLOT}[aqua=,c++0x=,qpa=,debug=]
+		media-libs/phonon[aqua=,debug=] ) )
+	kde? ( media-libs/phonon[aqua=,debug=] )
+	~x11-libs/qt-script-${PV}:${SLOT}[aqua=,c++0x=,qpa=,debug=]
+	~x11-libs/qt-sql-${PV}:${SLOT}[aqua=,c++0x=,qpa=,debug=,qt3support=]
+	~x11-libs/qt-svg-${PV}:${SLOT}[aqua=,c++0x=,qpa=,debug=]
+	~x11-libs/qt-test-${PV}:${SLOT}[aqua=,c++0x=,qpa=,debug=]
+	~x11-libs/qt-webkit-${PV}:${SLOT}[aqua=,c++0x=,qpa=,debug=]
+	~x11-libs/qt-xmlpatterns-${PV}:${SLOT}[aqua=,c++0x=,qpa=,debug=]"
+
+RDEPEND="${DEPEND}"
+
+PATCHES=( "${FILESDIR}/${PN}-4.6-plugandpaint.patch" )
+
+pkg_setup() {
+	QT4_TARGET_DIRECTORIES="demos
+		examples"
+	QT4_EXTRACT_DIRECTORIES="${QT4_TARGET_DIRECTORIES}
+		doc/src/images
+		src/
+		include/
+		tools/"
+
+	qt4-build_pkg_setup
+}
+
+src_configure() {
+	myconf="${myconf} $(qt_use qt3support) -no-openvg"
+	qt4-build_src_configure
+}
+
+src_install() {
+	insinto "${QTDOCDIR#${EPREFIX}}"/src
+	doins -r "${S}"/doc/src/images || die "Installing images failed."
+
+	qt4-build_src_install
+}