Remove USE=bearer, superseded by dev-qt/qtbearer. Switch to virtual/libudev. Drop obexd dependency wrt bug 509360.

Package-Manager: portage-2.2.10/cvs/Linux x86_64
Manifest-Sign-Key: 0xDADED6B2671CB57D!

3 files changed, 175 insertions, 16 deletions

diff --git a/dev-qt/qt-mobility/ChangeLog b/dev-qt/qt-mobility/ChangeLog
index 1c36a0fc6592..d1609d871d7b 100644
--- a/dev-qt/qt-mobility/ChangeLog
+++ b/dev-qt/qt-mobility/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for dev-qt/qt-mobility
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-qt/qt-mobility/ChangeLog,v 1.6 2014/05/23 13:03:55 pesa Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-qt/qt-mobility/ChangeLog,v 1.7 2014/05/23 13:57:23 pesa Exp $
+
+*qt-mobility-1.2.2_p20130703-r1 (23 May 2014)
+
+  23 May 2014; Davide Pesavento <pesa@gentoo.org>
+  +qt-mobility-1.2.2_p20130703-r1.ebuild:
+  Remove USE=bearer, superseded by dev-qt/qtbearer. Switch to virtual/libudev.
+  Drop obexd dependency wrt bug 509360.
 
   23 May 2014; Davide Pesavento <pesa@gentoo.org>
   qt-mobility-1.2.2_p20130703.ebuild:
diff --git a/dev-qt/qt-mobility/Manifest b/dev-qt/qt-mobility/Manifest
index 7c6285358f1b..ac4c9ab67cfc 100644
--- a/dev-qt/qt-mobility/Manifest
+++ b/dev-qt/qt-mobility/Manifest
@@ -2,25 +2,26 @@
 Hash: SHA256
 
 DIST qt-mobility-1.2.2_p20130703.tar.xz 16748672 SHA256 c4f1578a8384a520744ece9c19639600029d1fac2b55e0f110ec5700911aad44 SHA512 51e960dbcab3641906043c0e3dc6c44da2a66d11a15f5ec255776cef299d1403eeb0df55ee953567fdafd4c2a88a6514dcf1e2f8ba0af574c44e02e809f42287 WHIRLPOOL 4e7ee4039fbb4e8f8cfd7f720d232ddf79d61c3cd62ad5851e490c9284badf3431852eb56dfea18e3caf350e2e0ccd50f3244abc04bd68ffc6f6de67e644d3c4
+EBUILD qt-mobility-1.2.2_p20130703-r1.ebuild 3792 SHA256 c51cc4c9d716c60312ef7704938f2635cc1555d2cfd62d65ea5dfe0512cc4eda SHA512 899c50bf20a08af1d5191757f15b577e97623de9d8e2ace31ca4bfc802a8debcfb66c5d52e8d0c9bf194051894e8c172f03bacd7d025aba0c51a6701d456b4b7 WHIRLPOOL 91b03ec5414375fbe2cef6e755c377e388a16aaad1f792ee690b202e25da59217c81afd5957432e1ead54d4d03860f841e0e0ff2b79588f7950fe4554b7cd13c
 EBUILD qt-mobility-1.2.2_p20130703.ebuild 3952 SHA256 c330d09904e8276805080065fc7b21793f312b5fcb06e1508c0333d751d47de0 SHA512 13d731ce11fee3c572c9f400cb4d359ec17da631a6d6ac5f972af59a812b616350d0350b1348ac6938028989efafa7825084687e1d9adea5dd1ce8eed6316332 WHIRLPOOL e317ac202f132d912ad49af53142d04e4221b8bb39a507a3e0cfcfd838414148652cf1cbda5a2a32a1f231bbaee899ae40621ba2d10662bd2d935adcbd5b72ce
-MISC ChangeLog 2954 SHA256 34a18d71af581a0759dfff672a57d319f61d1f512a8d3129e530957cb8064a33 SHA512 390855bf4da5e5f9dcdb685810716da8586aaab0e8098ed6b433810f0da33ffbb9fa2e5728541d243921589d403adc3b3a04a9c0d593367d9c0bf079a22ea58e WHIRLPOOL 331a6932060c3eee01982b8307cdee086f84eff6951250cca577db310d7be57a3973712b0fb9db43e2815b389c7b39bce30e53a02f18f772241b8b1f7d769258
+MISC ChangeLog 3213 SHA256 223f25d03d22e9076398fe6d7f212ec7b7b01e9089baf02b73e825fc5d59edf9 SHA512 ff9590e147c7c7f14c92c343ab0bf070f111fedaf9f51a858dcd565aba574c6da33f8b23eeb9eb957fabf7169dcd101ebfcfd07caa340b432e4283d06118f2e6 WHIRLPOOL 0f0d7b0fa570b85875f15868258623648dd3b2a962040d33bab30792ac9c15cfe2d4dc6f72d9b829aaac5f3a1fa678f41548d7bcc292d7607c50fc19ddb57491
 MISC metadata.xml 1592 SHA256 8ec9afd91308148afcd0a18478b0e73db41f74b023fa44a19628b433a30709d0 SHA512 2df264ec0dfa38960e379f7dd096aaa9b934315c0867844d5aa1f39578adc06c188541b57c920a1cf1d7623edc0c5f1985719616381c50c67b51f4585494bf3f WHIRLPOOL e636439f495841539fdf339a312d0cf55bf35ed1527402649675721a5c2de523facddedd941382a486769cf8d362943c2aead7dbb5700d04d178e79d22dcd901
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.22 (GNU/Linux)
 
-iQJ8BAEBCABmBQJTf0dAXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
+iQJ8BAEBCABmBQJTf1PRXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
 ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQ4N0Y5QkIzRDgwM0JERkYzMTc5RTI1MjhE
-QURFRDZCMjY3MUNCNTdEAAoJENre1rJnHLV9pWoQALChAqvT1qYlVqiIBFQyc861
-fk3R4/70gHqwsnYBnP7KTWNPOKKvdGdNc0XkTP6qjLJWVDC6DV/bst70xhOaBr0M
-Y+9xc/3yhzB33OkLPgNWXti32BZOmHA7LcHtjK0Q/HS4SWpVTigfCxzAw9kHbJwP
-UqGdxobrQSNSn74HUlq78o2tTyM+hmStd0YQtyHSiXzDJRkI+/tYCGiXtlfE8DK7
-aKm9Mbaha7xGD4MI2TBV3BvOqB7G4AZcxD9XKaKoh+kAa3P3Xie42kIljwVz3Pmw
-TEv56Eeg1YJ4eRT5xMEcyRKYTUXzLUYrZ0GFNcZuSKhGzK0O64r3xvTeVFby0lYv
-yarCz2FTx+nVUYv8TNGwZb0OffAa4CHGgK6U90Qy6vrVw7YMrWTp0coD27q0b7wn
-4KJKvmPcj9hI3D3Lzm8JLqGOJmdl/S8kFGc3wGyguH4Da+VZKnChx4NcBzgOmUC6
-Hm8ZPBb0ch88Bx96grUZm8ad0JggyKMzBuyXikRXFEgkjgP7sIVhIcJ24McqlnD3
-yFoQvIsV42/9HHKp/zE6bbZXAxA9tF/yS2upz6yyFaJojtVSfFQbDiF8PLBBM14s
-r1HVzobt8BE6aMdKHnM8YE8kB5/8Vqb5Lu6D7NtTrmsESetDOxjt8DZEfHfVXav0
-dTK+EHB0jDYMoTlKCqMv
-=UySs
+QURFRDZCMjY3MUNCNTdEAAoJENre1rJnHLV9jhYP/17oOpGIpXK6Hv9wUT4qA67B
+DlOTLF7uR2TbiWE03CsW2UKl08d2WUpqJFF/IkKJqwq1bfihndtjZskb1u/VkeYC
+Ajw180TL2gBfMwYumE+MegyIrbKjGw7/Mn5l3Lzx5NeHAh6U3fOPQYiEMeUIVupm
+WhBbfGz1AOEvQt/0LOy+5aO5MIT9PPsOfNzIx1Uonvrl4nneDkd/xkhSB47eI3bK
+qv//PLnJn2RAbEpuCBhUTbJtRMKQ5fXFtQNjUkCOpqnLKtEnYx76Mt/waBV4la53
+QOA2GhahDJb8L4duoBuvCdlagC1RPv3rPZ6UUVZiLI+x2yLTZHmVCHh24c629g2F
+gfmIvunhDSNpy7m2nw4poIzvxLLwqL3V7vlTs6FUbn4LJ05Kveq1LlvBZ2RW6kdI
+kIpOerxQmJoGngxTjGw56y+MgCnRfcd1D0v4mjFcf9LgCJXGpfl9pv5BTuX8s6R0
+18QI+vMGNBs//k2jj8uz7vP0yfkL7FrVTSZZd8F0gzKRLhpmkJhBPav35SPj4bPg
+0Ftimzb4JFmWQi0LB9iDiP3z24IE7r+SYblX3oA+3JfWCaoUL3lv33gls4vLmAPZ
+T11lmZteACFuduCKl0DY7R2yLHvDwO1cDfx3mdovCC7D3xKAe/9yJ8S9fjojkjnv
+yDP5NIYD2EWnIi6DrL+l
+=Yhbg
 -----END PGP SIGNATURE-----
diff --git a/dev-qt/qt-mobility/qt-mobility-1.2.2_p20130703-r1.ebuild b/dev-qt/qt-mobility/qt-mobility-1.2.2_p20130703-r1.ebuild
new file mode 100644
index 000000000000..81156c25e38c
--- /dev/null
+++ b/dev-qt/qt-mobility/qt-mobility-1.2.2_p20130703-r1.ebuild
@@ -0,0 +1,151 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-qt/qt-mobility/qt-mobility-1.2.2_p20130703-r1.ebuild,v 1.1 2014/05/23 13:57:23 pesa Exp $
+
+EAPI=5
+
+inherit multilib qt4-r2
+
+DESCRIPTION="Additional Qt APIs for mobile devices and desktop platforms"
+HOMEPAGE="http://qt-project.org/wiki/Category:Developing_with_Qt::QtMobility"
+SRC_URI="http://dev.gentoo.org/~pesa/distfiles/${P}.tar.xz"
+LICENSE="LGPL-2.1"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~x86"
+
+QT_MOBILITY_MODULES=(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="
+	>=dev-qt/qtcore-4.8.0:4
+	connectivity? (
+		>=dev-qt/qtdbus-4.8.0:4
+		bluetooth? ( net-wireless/bluez )
+	)
+	contacts? ( >=dev-qt/qtgui-4.8.0:4 )
+	gallery? ( >=dev-qt/qtdbus-4.8.0:4 )
+	location? (
+		>=dev-qt/qtdeclarative-4.8.0:4
+		>=dev-qt/qtgui-4.8.0:4
+		>=dev-qt/qtsql-4.8.0:4[sqlite]
+	)
+	messaging? ( >=net-libs/qmf-4.0 )
+	multimedia? (
+		>=dev-qt/qtgui-4.8.0-r4:4[xv]
+		>=dev-qt/qtopengl-4.8.0:4
+		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
+		pulseaudio? ( media-sound/pulseaudio[alsa] )
+	)
+	publishsubscribe? (
+		tools? ( >=dev-qt/qtgui-4.8.0:4 )
+	)
+	qml? ( >=dev-qt/qtdeclarative-4.8.0:4 )
+	serviceframework? (
+		>=dev-qt/qtdbus-4.8.0:4
+		>=dev-qt/qtsql-4.8.0:4[sqlite]
+		tools? ( >=dev-qt/qtgui-4.8.0:4 )
+	)
+	systeminfo? (
+		>=dev-qt/qtdbus-4.8.0:4
+		>=dev-qt/qtgui-4.8.0:4
+		sys-apps/util-linux
+		virtual/libudev:=
+		x11-libs/libX11
+		x11-libs/libXrandr
+		bluetooth? ( net-wireless/bluez )
+		networkmanager? ( net-misc/networkmanager )
+	)
+	versit? ( >=dev-qt/qtgui-4.8.0:4 )
+"
+DEPEND="${RDEPEND}
+	virtual/pkgconfig
+	doc? ( >=dev-qt/qthelp-4.8.0:4 )
+	multimedia? (
+		sys-kernel/linux-headers
+		x11-proto/videoproto
+	)
+	systeminfo? ( sys-kernel/linux-headers )
+"
+
+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
+
+	# 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
+}