Bump to a more recent snapshot from git, since upstream has stopped doing tarball releases.

Fixes compilation against Qt 4.8 (bug 408305). Run 'emake docs' to fix bug 405953. Various code cleanups.

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

3 files changed, 189 insertions, 15 deletions

diff --git a/x11-libs/qt-mobility/ChangeLog b/x11-libs/qt-mobility/ChangeLog
index 873092be4c26..bf808eb14c10 100644
--- a/x11-libs/qt-mobility/ChangeLog
+++ b/x11-libs/qt-mobility/ChangeLog
@@ -1,6 +1,14 @@
 # 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.3 2012/04/04 15:43:36 pesa Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/qt-mobility/ChangeLog,v 1.4 2012/04/04 16:14:23 pesa Exp $
+
+*qt-mobility-1.2.2_p20120403 (04 Apr 2012)
+
+  04 Apr 2012; Davide Pesavento <pesa@gentoo.org>
+  +qt-mobility-1.2.2_p20120403.ebuild:
+  Bump to a more recent snapshot from git, since upstream has stopped doing
+  tarball releases. Fixes compilation against Qt 4.8 (bug 408305). Run 'emake
+  docs' to fix bug 405953. Various code cleanups.
 
   04 Apr 2012; Davide Pesavento <pesa@gentoo.org> qt-mobility-1.2.0.ebuild:
   Restrict qt deps to 4.7.x only, qt-mobility doesn't build against qt 4.8.
diff --git a/x11-libs/qt-mobility/Manifest b/x11-libs/qt-mobility/Manifest
index b310303b8cc5..c9b5789ede23 100644
--- a/x11-libs/qt-mobility/Manifest
+++ b/x11-libs/qt-mobility/Manifest
@@ -1,24 +1,26 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA512
 
+DIST qt-mobility-1.2.2_p20120403.tar.gz 22789546 RMD160 b8dd820586c8d4e7cdcbd192b1dcc74c44cbd022 SHA1 cb13a06e62c95b0ef3bf089b4f58ccdc014d75b0 SHA256 4b9aabfda8d1eab6b91c6c5732c536fe74204988fb3f3e8f9c197f2ecbbd680a
 DIST qt-mobility-opensource-src-1.2.0.tar.gz 37179556 RMD160 c8c3c6c301e90a2ba9a2a249569084b9c3923322 SHA1 090d1cc0d9c27f41d6fc9022b80ab5579af5e46d SHA256 ee3c88975e04139ac9589f76d4be646d44fcbc4c8c1cf2db621abc154cf0ba44
 EBUILD qt-mobility-1.2.0.ebuild 4253 RMD160 92aea3232581e82cb210d1234fb24d06aab6a9c9 SHA1 32e9c4c4c99465d5e49dced496b2cfdf695de335 SHA256 8b8d9ed4820a2f8a8d61dae0deb9e753ff2bcb2cd952226498cff914764d06f8
-MISC ChangeLog 761 RMD160 b46cc6447d375fcf54fc1ccf2e69cd833c436362 SHA1 cf939b9032c1deb241822a67fb6cfab4ecdcf121 SHA256 1693acb9f5dae120dc4b47828423106fc62d84e0ead18fce10410ab08dd0dcc8
+EBUILD qt-mobility-1.2.2_p20120403.ebuild 4174 RMD160 aa59dce786c78ef7f4b8fc8204842cb019f401b4 SHA1 4b9eeab10039409d15b2098f5692841b88a5db65 SHA256 8187a37fced9f59803dff1a24b5f5b99229d5f6aa4fe9c90156bbcd899cb9cf2
+MISC ChangeLog 1099 RMD160 c2a523e5696a1ea89d18bf9d288127145b925b4f SHA1 9bc95332c69e5d860f6bb29d9962da6429bdec8b SHA256 91caba8cb8a5d22cbbdfe833319a775e1601ad648e16667f1b7146242ded1f29
 MISC metadata.xml 1532 RMD160 eefbc0a8f75fb34dd2bd5be08078536f2e3b603d SHA1 45551a561d5befff090e365db537a9f63782b548 SHA256 6acf9a09e0be0786a810f962c0484e062765ccc65e70992d9b645da14d280836
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.19 (GNU/Linux)
 
-iQIcBAEBCgAGBQJPfGwvAAoJENXLsxwXqFxyIlMP/02fDsjSNc94RlIttwJnhWJg
-MXUpVW3keZB6v3QnO9vdXGet7F5Uxzfbn2Vh6G5e3ixS70cl6fKGtFhaHgNKHMYi
-dd6l3WIYWHWzdMRFF/Hr54wp7vBDOZaBZGTOkQhY2ku9rJh8bry2MYhiLdG7pkP4
-M9yv/w4M92Ijom0bQMAAfHcShuYxxt7IWy+oi1M+Ti/IWKZrCis9+x1QtsJcU4oU
-E2GX/AxnJWcRsWddkdRWYiAcAygEabFUzm/j/+l7dvajKvw0dn+psHsnlkNXVrlV
-gfVeDSdO2W0oHNz8rpFE9mG4ci0FtYw+JPmAdD/OvEmuxzOO0tVflQO7+nVktEK5
-wC0ks/XM8INW3FzeRwuiSExc9jL6GOX8ZuxA03AQKxxUcdcB6xWZ2iefAF3WRCU6
-/1Jzfc+JHVq0jmhD2BZ5mosMtfv3I92lpELPY+7GX7cIzcpNb22aL6xRclNcvRsC
-KnuSlS0ZzrwZ13xzte8TqzT3YoqK4B/1/8BXyaxu7nxnxDPLFNtsEp6aGzlGsYwv
-yaP+MvwHfZC3fiDj3W47N+QBPtmnZ5ZtSqTtUylr5a76ZqLCn+LhwLrVgrxCVTyh
-mvfia2hloP2Y7o21ynAUt2o79HV+DoVWuaYOome5jCq0PJAJ5CcKMPRUC7gaGP20
-OZI+EbvOm3bQZ8tIDus3
-=Ovgr
+iQIcBAEBCgAGBQJPfHNlAAoJENXLsxwXqFxyB2EQAJooLdoRgdypjqdQ88hHDXbI
+dzAI7fb8zcgNgoDMzDtbngToCy0L79tsxlXNoOzSJ49xAX4HibHYlQ16u5+R2crv
+yt5lFD917FBNyca9I8IlNv3NZZNe/TpXN7D/OWUGRTiJeXKnm3mgBHJ2dk5mf75n
+62P94xYcGBB1RlkEmM76xqWgZn2C7AEPywPXTDSXhUHTbIdDI9eURwry94kh2gl8
+goSqgsoWhJY+pQnHIuSLDBFL6nW9ZeeyHmDMWvJ4Es20g1MqPa+twAL9Jmu9fO8T
+j4IpydaaafyEqYYLjs80L/ubrB/6kZWKov4X5/2pjVetqPO8ipgh/87hT0GmD8Lo
+5QI2U4+eM8YQ9jjCgN6rgpNk/A+emzenx/xJBQOWYMyRMmcTRhmcTUhX1sTqC5a2
+8Q4bIc8Nn36tDstDgh9ICMjVZGCa8fxM9ESAUlceOQOGW5CRCdmlWSYryU5Ix6+D
+Z8YVSv67lsdAxlrjqBjZdsBC5EwKGDh1zyMXtm/KDKNoCLoWmeeKrfW9NuG8/BcW
+kgR0bfPCWbbxVMqkfjrTkVsIGPxVF6YarZ227DyhhGwmyi3dDfrOdt7WIJaTEzcD
+n+r7nOhfu+Yz0bLjBEdr7JNrwAfunUd73kJHewVCN2S4aEq4QSNynTD8b9r/zQPK
+dE7WFCk6epOFAR0a5tKD
+=yzK1
 -----END PGP SIGNATURE-----
diff --git a/x11-libs/qt-mobility/qt-mobility-1.2.2_p20120403.ebuild b/x11-libs/qt-mobility/qt-mobility-1.2.2_p20120403.ebuild
new file mode 100644
index 000000000000..97adfa73c88f
--- /dev/null
+++ b/x11-libs/qt-mobility/qt-mobility-1.2.2_p20120403.ebuild
@@ -0,0 +1,164 @@
+# 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_p20120403.ebuild,v 1.1 2012/04/04 16:14:23 pesa 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/~pesa/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 )
+	)
+	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.19:0.10
+		>=media-libs/gst-plugins-bad-0.10.19
+		>=media-libs/gst-plugins-base-0.10.19: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
+		sys-fs/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}
+	dev-util/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
+}