[gentoo-commits] gentoo-x86 commit in x11-libs/qt-demo: metadata.xml qt-demo-4.8.1-r1.ebuild ChangeLog qt-demo-4.8.1.ebuild

[Davide Pesavento (pesa)]

pesa        12/04/01 15:42:58

  Modified:             metadata.xml ChangeLog
  Added:                qt-demo-4.8.1-r1.ebuild
  Removed:              qt-demo-4.8.1.ebuild
  Log:
  Introduce some USE flags to control building of various examples and demos, fixing also bug 410309.
  
  (Portage version: 2.2.0_alpha97/cvs/Linux x86_64)

Revision  Changes    Path
1.5                  x11-libs/qt-demo/metadata.xml

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/x11-libs/qt-demo/metadata.xml?rev=1.5&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/x11-libs/qt-demo/metadata.xml?rev=1.5&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/x11-libs/qt-demo/metadata.xml?r1=1.4&r2=1.5

Index: metadata.xml
===================================================================
RCS file: /var/cvsroot/gentoo-x86/x11-libs/qt-demo/metadata.xml,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- metadata.xml	29 Jan 2012 17:02:04 -0000	1.4
+++ metadata.xml	1 Apr 2012 15:42:58 -0000	1.5
@@ -3,11 +3,17 @@
 <pkgmetadata>
 	<herd>qt</herd> 
 	<use>
+		<flag name='c++0x'>Build Qt using the C++11 standard</flag>
+		<flag name='dbus'>Build QtDBus examples and demos</flag>
+		<flag name='declarative'>Build QtDeclarative examples and demos</flag>
 		<flag name='exceptions'>Add support for exceptions - like catching them
 			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='multimedia'>Build QtMultimedia examples and demos</flag>
+		<flag name='opengl'>Build QtOpenGL examples and demos</flag>
+		<flag name='openvg'>Build QtOpenVG examples and demos</flag>
 		<flag name='qpa'>Build a window system agnostic implementation of Qt</flag>
+		<flag name='qt3support'>Build Qt3Support examples and demos</flag>
+		<flag name='webkit'>Build QtWebKit examples and demos</flag>
+		<flag name='xmlpatterns'>Build QtXmlPatterns examples and demos</flag>
 	</use>
 </pkgmetadata>



1.83                 x11-libs/qt-demo/ChangeLog

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/x11-libs/qt-demo/ChangeLog?rev=1.83&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/x11-libs/qt-demo/ChangeLog?rev=1.83&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/x11-libs/qt-demo/ChangeLog?r1=1.82&r2=1.83

Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/x11-libs/qt-demo/ChangeLog,v
retrieving revision 1.82
retrieving revision 1.83
diff -u -r1.82 -r1.83
--- ChangeLog	29 Mar 2012 22:11:13 -0000	1.82
+++ ChangeLog	1 Apr 2012 15:42:58 -0000	1.83
@@ -1,6 +1,13 @@
 # ChangeLog for x11-libs/qt-demo
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-libs/qt-demo/ChangeLog,v 1.82 2012/03/29 22:11:13 pesa Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/qt-demo/ChangeLog,v 1.83 2012/04/01 15:42:58 pesa Exp $
+
+*qt-demo-4.8.1-r1 (01 Apr 2012)
+
+  01 Apr 2012; Davide Pesavento <pesa@g.o> +qt-demo-4.8.1-r1.ebuild,
+  -qt-demo-4.8.1.ebuild, metadata.xml:
+  Introduce some USE flags to control building of various examples and demos,
+  fixing also bug 410309.
 
 *qt-demo-4.8.1 (29 Mar 2012)
 



1.1                  x11-libs/qt-demo/qt-demo-4.8.1-r1.ebuild

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/x11-libs/qt-demo/qt-demo-4.8.1-r1.ebuild?rev=1.1&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/x11-libs/qt-demo/qt-demo-4.8.1-r1.ebuild?rev=1.1&content-type=text/plain

Index: qt-demo-4.8.1-r1.ebuild
===================================================================
# 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.1-r1.ebuild,v 1.1 2012/04/01 15:42:58 pesa Exp $

EAPI=4

inherit qt4-build

DESCRIPTION="Demonstration module of the Qt toolkit"
SLOT="4"
KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
IUSE="dbus declarative kde multimedia opengl openvg qt3support webkit xmlpatterns"

DEPEND="
	~x11-libs/qt-core-${PV}:4[aqua=,c++0x=,debug=,qpa=,qt3support?]
	dbus? ( ~x11-libs/qt-dbus-${PV}:4[aqua=,c++0x=,debug=,qpa=] )
	declarative? ( ~x11-libs/qt-declarative-${PV}:4[aqua=,c++0x=,debug=,qpa=,webkit?] )
	~x11-libs/qt-gui-${PV}:4[aqua=,c++0x=,debug=,qpa=,qt3support?]
	multimedia? ( ~x11-libs/qt-multimedia-${PV}:4[aqua=,c++0x=,debug=,qpa=] )
	opengl? ( ~x11-libs/qt-opengl-${PV}:4[aqua=,c++0x=,debug=,qpa=,qt3support?] )
	openvg? ( ~x11-libs/qt-openvg-${PV}:4[aqua=,c++0x=,debug=,qpa=,qt3support?] )
	kde? ( media-libs/phonon[aqua=] )
	!kde? ( || (
		~x11-libs/qt-phonon-${PV}:4[aqua=,c++0x=,debug=,qpa=]
		media-libs/phonon[aqua=]
	) )
	qt3support? ( ~x11-libs/qt-qt3support-${PV}:4[aqua=,c++0x=,debug=,qpa=] )
	~x11-libs/qt-script-${PV}:4[aqua=,c++0x=,debug=,qpa=]
	~x11-libs/qt-sql-${PV}:4[aqua=,c++0x=,debug=,qpa=,qt3support?]
	~x11-libs/qt-svg-${PV}:4[aqua=,c++0x=,debug=,qpa=]
	~x11-libs/qt-test-${PV}:4[aqua=,c++0x=,debug=,qpa=]
	webkit? ( ~x11-libs/qt-webkit-${PV}:4[aqua=,c++0x=,debug=,qpa=] )
	xmlpatterns? ( ~x11-libs/qt-xmlpatterns-${PV}:4[aqua=,c++0x=,debug=,qpa=] )
"
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_prepare() {
	qt4-build_src_prepare

	# Array mapping USE flags to subdirs
	local flags_subdirs_map=(
		'dbus'
		'declarative:declarative'
		'multimedia:spectrum'
		'opengl:boxes|glhypnotizer'
		'openvg'
		'webkit:browser'
		'xmlpatterns'
	)
	# Disable unwanted examples/demos
	for flag in "${flags_subdirs_map[@]}"; do
		if ! use ${flag%:*}; then
			einfo "Disabling ${flag%:*} examples"
			sed -i -e "/SUBDIRS += ${flag%:*}/d" \
				examples/examples.pro || die

			if [[ ${flag} == *:* ]]; then
				einfo "Disabling ${flag%:*} demos"
				sed -i -re "/SUBDIRS \+= demos_(${flag#*:})/d" \
					demos/demos.pro || die
			fi
		fi
	done

	if ! use qt3support; then
		einfo "Disabling qt3support examples"
		sed -i -e '/QT_CONFIG, qt3support/d' \
			examples/graphicsview/graphicsview.pro || die
	fi
}

src_configure() {
	myconf+="
		$(qt_use dbus)
		$(qt_use declarative)
		$(qt_use multimedia)
		$(qt_use opengl)
		$(qt_use openvg)
		$(qt_use qt3support)
		$(qt_use webkit)
		$(qt_use xmlpatterns)"

	qt4-build_src_configure
}

src_install() {
	insinto "${QTDOCDIR#${EPREFIX}}"/src
	doins -r doc/src/images

	qt4-build_src_install
}