New snapshot to fix bug #444986.

Package-Manager: portage-2.1.11.33/cvs/Linux x86_64
Manifest-Sign-Key: 0x675D0D2C

3 files changed, 182 insertions, 9 deletions

diff --git a/x11-libs/qt-mobility/ChangeLog b/x11-libs/qt-mobility/ChangeLog
index fac1330aea35..4b66398d4a32 100644
--- a/x11-libs/qt-mobility/ChangeLog
+++ b/x11-libs/qt-mobility/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for x11-libs/qt-mobility
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-libs/qt-mobility/ChangeLog,v 1.11 2012/12/02 22:16:43 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/qt-mobility/ChangeLog,v 1.12 2012/12/05 13:38:04 kensington Exp $
+
+*qt-mobility-1.2.2_p20121205 (05 Dec 2012)
+
+  05 Dec 2012; Michael Palimaka <kensington@gentoo.org>
+  +qt-mobility-1.2.2_p20121205.ebuild:
+  New snapshot to fix bug #444986.
 
   02 Dec 2012; Samuli Suominen <ssuominen@gentoo.org>
   qt-mobility-1.2.2_p20120403.ebuild:
diff --git a/x11-libs/qt-mobility/Manifest b/x11-libs/qt-mobility/Manifest
index b39937f349f5..2ee495246152 100644
--- a/x11-libs/qt-mobility/Manifest
+++ b/x11-libs/qt-mobility/Manifest
@@ -2,17 +2,19 @@
 Hash: SHA256
 
 DIST qt-mobility-1.2.2_p20120403.tar.gz 22789546 SHA256 4b9aabfda8d1eab6b91c6c5732c536fe74204988fb3f3e8f9c197f2ecbbd680a SHA512 d3f1df3f41d3074a8bd4281aca2158647068a81aa40124ba8b1d48f3c323f5a2b64dc2e21a691e68af96cbdeba3cd86115b66e934b83dbe61b2199ba63f6814b WHIRLPOOL cb1b10af080f1c468bec0c06bf5e0f70d2ae58ec9d76f1bcd68b991d6de42fa5964a89fea3a1adb90a2291cce0f5f96b8c51007ae888e13c4d5024f0d10f4767
+DIST qt-mobility-1.2.2_p20121205.tar.gz 23398818 SHA256 04704777136cbeeb3366cdb29087cc1435e149b3def245caafda4ab17da886e6 SHA512 7894b5ef4e1f6d5ab04ae895274cdf639679c5a7349df8b9bdd08c7d2e616872f955a2bf9d98fd4b3b54abbca53001b969ad49251723edf7bdbfb86e7b0f9486 WHIRLPOOL 7070eebdaf8c12cd6c7f6eb52f03d1f247cb70f8f25257c94ef98f709a8e73cf374f705a1a000d957d65bf053c575de483ccde93a8117b86143159559dc7961e
 EBUILD qt-mobility-1.2.2_p20120403.ebuild 4196 SHA256 237aab63f059fc213ca499ef884347ec62a977d8ffb8a7717a83d7a7c2b1027f SHA512 30537d55e79cd96458779c32602bd5bb19f6729a25cd1bab29ee0cd312cf7aa9e4f3757c3bf2777249a272a0e9c4be42cd83bd7d1733cfbe3db9efa914833185 WHIRLPOOL aa6762c41eadf68db1053f364054ad963555cba5fb1831fe0e54510705c834d64031be3cb1f4ee77a54b5b0e260fa6b6a92d15d02c38dc44918d1b9889087a03
-MISC ChangeLog 2051 SHA256 ed489a3fe6b6b6bcad8d5afd8b90f42ef18d5198c567dab2bd37973c0c3fe7d0 SHA512 c5b8ef64bd01bfffde0099643904e9d9c2e07df76b4b0ffc3cc754fbde6bb2e94facccf2c51b4c1e19f356404546400c86a653c2972abfb8e7f673d8d7344f1a WHIRLPOOL 6f2b8e694eb8b522d4c3f195bc5b140aaddc18adb35f1dd6b15133c244d8edb4d5026957e86e817d888b0910ae351dc0ec147f1ea999bd6765b8e2850f8d476b
+EBUILD qt-mobility-1.2.2_p20121205.ebuild 4203 SHA256 f2ca424a2c89bbeeac5d93c1390a5947f0ca90fd613e3b94ecbc68752be9b444 SHA512 b0c4bf51de0969fb634a4cf0cda6d8b2975c88c69afba18944589fcc0171abe7b1909bf61e6f620d573273acae395b5d99e63fa7d1eec8d4f909c303454381fb WHIRLPOOL a55b3cbddde3b1b2764da00b31611dcc38c375b6e076445af1b4a947ad958bb0a71cdbf1487ce0d8b502ad73a51bdf5abfa6e260b69cf16b7c56c61ffe4178e1
+MISC ChangeLog 2227 SHA256 b203d2438ce0f1bd6042df4946990a71c453a55aef7d2f934b0eb65076ffc074 SHA512 a0dcabcf895a042111062951e74f81afb653ac88c835fffaf3a7ffd7d688011005808065cecfb64d2ed1056a86f58040a8b9561ec45deb8d6a9f27df120d1988 WHIRLPOOL 8e54317eae6f22d4b49af01eeed499a3079f347c999567df7067ec8a2c0e6fdcaa0411ff1f47c15e6cfd40b2dc5137520a1cf6df17b3b2ce3d496af91d7f7352
 MISC metadata.xml 1592 SHA256 8ec9afd91308148afcd0a18478b0e73db41f74b023fa44a19628b433a30709d0 SHA512 2df264ec0dfa38960e379f7dd096aaa9b934315c0867844d5aa1f39578adc06c188541b57c920a1cf1d7623edc0c5f1985719616381c50c67b51f4585494bf3f WHIRLPOOL e636439f495841539fdf339a312d0cf55bf35ed1527402649675721a5c2de523facddedd941382a486769cf8d362943c2aead7dbb5700d04d178e79d22dcd901
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.19 (GNU/Linux)
 
-iQEcBAEBCAAGBQJQu9NMAAoJEEdUh39IaPFNd3UIAIwd36lVAehqODJRMiLilDp/
-uF7FaBcVO6fwJEz5A+ToQurf5hgqoFdFGXm4yoOptQi43+m293nQhpmznt806dq3
-CJMpGmM7tieXUQAKKuJQ7DKZ/l/VKsydmvrFxuLy7ne3aPR65QSK9j5XL1sM4T6x
-js6/A8DrjiQ622zM0XtiuFMFer/sr6oFkbpmNGb4EPmVQCpOgmeckAqqFiz6pL6p
-vBlRSkBEbeKWm75LXmIYC6N6SPkRK+FCkko2jcj0SHTkLkpM2cV8prInDpMZwFg8
-Lm++1xNHPwuDN5stN4Oe+FwTtq7y6A1p4mVQjl0g37pS5AsrVQEGW+c00jgBiDU=
-=5dvl
+iQEcBAEBCAAGBQJQv03NAAoJEMbwO6tnXQ0sWOIIAJiX0lHLatHvMyQZ68Hzcq+N
+n+JAlkHM2/C8dGqNmR55nJgAeVlrtZxuS92lm7AJjS/7SohvbHJPdE82yZYMH5m1
+bLJSfmmBV6roFheBVFEX0QIuW9KDMYC3akHHqA5hpzoxRfd+Idw0kHS1actrZGeH
+voOU743S61iWL6jJgOg+XtxCXDAThgKiguxqCSJv/IrmUG11fhHMAdQhdL2sLxJV
+/Y7kCDiJD5OkspyU1WNGAhzXe7PMb8Zwm+ugGmz6IMmfkT50e50pkL7S1FCHzLJ1
+sYPJSUFj2r/xFtn72E5NKVNAAZjTA2kzCkwAajp+p+Z+uS6obTOAj9f9Ud9xxzs=
+=xgNK
 -----END PGP SIGNATURE-----
diff --git a/x11-libs/qt-mobility/qt-mobility-1.2.2_p20121205.ebuild b/x11-libs/qt-mobility/qt-mobility-1.2.2_p20121205.ebuild
new file mode 100644
index 000000000000..ef11663cee65
--- /dev/null
+++ b/x11-libs/qt-mobility/qt-mobility-1.2.2_p20121205.ebuild
@@ -0,0 +1,165 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/qt-mobility/qt-mobility-1.2.2_p20121205.ebuild,v 1.1 2012/12/05 13:38:04 kensington Exp $
+
+EAPI=4
+
+inherit multilib qt4-r2 toolchain-funcs
+
+DESCRIPTION="Additional Qt APIs for mobile devices and desktop platforms"
+HOMEPAGE="http://qt.nokia.com/products/qt-addons/mobility"
+SRC_URI="http://dev.gentoo.org/~kensington/distfiles/${P}.tar.gz"
+LICENSE="LGPL-2.1"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+QT_MOBILITY_MODULES=(bearer connectivity +contacts feedback gallery
+		location messaging multimedia organizer publishsubscribe
+		sensors serviceframework systeminfo versit)
+IUSE="bluetooth debug doc networkmanager pulseaudio qml +tools
+	${QT_MOBILITY_MODULES[@]}"
+
+REQUIRED_USE="
+	|| ( ${QT_MOBILITY_MODULES[@]#[+-]} )
+	versit? ( contacts )
+"
+
+RDEPEND="
+	>=x11-libs/qt-core-4.7.0:4
+	bearer? (
+		networkmanager? (
+			net-misc/networkmanager
+			>=x11-libs/qt-dbus-4.7.0:4
+		)
+	)
+	connectivity? (
+		>=x11-libs/qt-dbus-4.7.0:4
+		bluetooth? ( net-wireless/bluez )
+	)
+	contacts? ( >=x11-libs/qt-gui-4.7.0:4 )
+	gallery? ( >=x11-libs/qt-dbus-4.7.0:4 )
+	location? (
+		>=x11-libs/qt-declarative-4.7.0:4
+		>=x11-libs/qt-gui-4.7.0:4
+		>=x11-libs/qt-sql-4.7.0:4[sqlite]
+	)
+	messaging? ( >=net-libs/qmf-2.0_p201209 )
+	multimedia? (
+		media-libs/alsa-lib
+		media-libs/gstreamer:0.10
+		media-libs/gst-plugins-bad:0.10
+		media-libs/gst-plugins-base:0.10
+		x11-libs/libX11
+		x11-libs/libXext
+		x11-libs/libXv
+		>=x11-libs/qt-gui-4.8.0-r4:4[xv]
+		>=x11-libs/qt-opengl-4.8.0:4
+		pulseaudio? ( media-sound/pulseaudio[alsa] )
+	)
+	publishsubscribe? (
+		tools? ( >=x11-libs/qt-gui-4.7.0:4 )
+	)
+	qml? ( >=x11-libs/qt-declarative-4.7.0:4 )
+	serviceframework? (
+		>=x11-libs/qt-dbus-4.7.0:4
+		>=x11-libs/qt-sql-4.7.0:4[sqlite]
+		tools? ( >=x11-libs/qt-gui-4.7.0:4 )
+	)
+	systeminfo? (
+		sys-apps/util-linux
+		virtual/udev
+		x11-libs/libX11
+		x11-libs/libXrandr
+		>=x11-libs/qt-dbus-4.7.0:4
+		>=x11-libs/qt-gui-4.7.0:4
+		bluetooth? ( net-wireless/bluez )
+		networkmanager? ( net-misc/networkmanager )
+	)
+	versit? ( >=x11-libs/qt-gui-4.7.0:4 )
+"
+DEPEND="${RDEPEND}
+	virtual/pkgconfig
+	multimedia? (
+		sys-kernel/linux-headers
+		x11-proto/videoproto
+	)
+	systeminfo? ( sys-kernel/linux-headers )
+"
+PDEPEND="
+	connectivity? (
+		bluetooth? ( app-mobilephone/obexd )
+	)
+"
+
+src_prepare() {
+	qt4-r2_src_prepare
+
+	# disable building of code snippets in doc/
+	# and translations (they aren't actually translated)
+	sed -i -re '/SUBDIRS \+= (doc|translations)/d' qtmobility.pro || die
+
+	# fix automagic dependency on qt-declarative
+	if ! use qml; then
+		sed -i -e '/SUBDIRS += declarative/d' plugins/plugins.pro || die
+	fi
+}
+
+src_configure() {
+	# figure out which modules to build
+	local modules=
+	for mod in "${QT_MOBILITY_MODULES[@]#[+-]}"; do
+		use ${mod} && modules+="${mod} "
+	done
+
+	if use messaging; then
+		# tell qmake where QMF is installed
+		export QMF_INCLUDEDIR=$($(tc-getPKG_CONFIG) --variable includedir qmfclient)
+		export QMF_LIBDIR=$($(tc-getPKG_CONFIG) --variable libdir qmfclient)
+	fi
+
+	# custom configure script
+	local myconf=(
+		./configure
+		-prefix "${EPREFIX}/usr"
+		-headerdir "${EPREFIX}/usr/include/qt4"
+		-libdir "${EPREFIX}/usr/$(get_libdir)/qt4"
+		-plugindir "${EPREFIX}/usr/$(get_libdir)/qt4/plugins"
+		$(use debug && echo -debug || echo -release)
+		$(use doc || echo -no-docs)
+		$(use tools || echo -no-tools)
+		-modules "${modules}"
+	)
+	echo "${myconf[@]}"
+	"${myconf[@]}" || die "configure failed"
+
+	# fix automagic dependency on bluez
+	if ! use bluetooth; then
+		sed -i -e '/^bluez_enabled =/s:yes:no:' config.pri || die
+	fi
+	# fix automagic dependency on networkmanager
+	if ! use networkmanager; then
+		sed -i -e '/^networkmanager_enabled =/s:yes:no:' config.pri || die
+	fi
+	# fix automagic dependency on pulseaudio
+	if ! use pulseaudio; then
+		sed -i -e '/^pulseaudio_enabled =/s:yes:no:' config.pri || die
+	fi
+
+	eqmake4 -recursive
+}
+
+src_compile() {
+	qt4-r2_src_compile
+
+	use doc && emake docs
+}
+
+src_install() {
+	qt4-r2_src_install
+
+	if use doc; then
+		dohtml -r doc/html/*
+		dodoc doc/qch/qtmobility.qch
+		docompress -x /usr/share/doc/${PF}/qtmobility.qch
+	fi
+}