net-im/qutim: remove mobility and jingle USE flags

The required dependency is being last rited.

Closes: https://bugs.gentoo.org/626232
Package-Manager: Portage-2.3.6, Repoman-2.3.3

2 files changed, 3 insertions, 16 deletions

diff --git a/net-im/qutim/metadata.xml b/net-im/qutim/metadata.xml
index 6d10686c9a19..f84be2388b5b 100644
--- a/net-im/qutim/metadata.xml
+++ b/net-im/qutim/metadata.xml
@@ -37,7 +37,6 @@
 	<flag name="telepathy">Enable to connect various IMs through <pkg>net-libs/telepathy-qt</pkg></flag>
 	<flag name="antiboss">Enable support for the antiboss plugin</flag>
 	<flag name="espionage">!!Not recomended, contains privacy risk!! Enable control plugin that controls user by sending messages and roster to remote server</flag>
-	<flag name="mobility">Enable several mobility related plugins like vibro notification</flag>
 	<flag name="plugman">Enable downloadable content management with <pkg>dev-libs/libattica</pkg></flag>
 </use>
 </pkgmetadata>
diff --git a/net-im/qutim/qutim-0.3.3_p1.ebuild b/net-im/qutim/qutim-0.3.3_p1.ebuild
index 0a867366a10a..94d11a57265a 100644
--- a/net-im/qutim/qutim-0.3.3_p1.ebuild
+++ b/net-im/qutim/qutim-0.3.3_p1.ebuild
@@ -19,14 +19,13 @@ KEYWORDS="amd64 x86"
 # general USE
 IUSE="doc +sound tools"
 # protocol uses
-IUSE="$IUSE telepathy irc xmpp jingle mrim oscar purple vkontakte"
+IUSE="$IUSE telepathy irc xmpp mrim oscar purple vkontakte"
 # plugins
 IUSE="$IUSE antiboss aspell ayatana awn crypt dbus debug -espionage histman hunspell
-	kde mobility otr plugman phonon purple qml sdl +ssl +xscreensaver webkit"
+	kde otr plugman phonon purple qml sdl +ssl +xscreensaver webkit"
 
 REQUIRED_USE="
 	oscar? ( ssl )
-	jingle? ( xmpp )
 	qml? ( webkit )
 "
 
@@ -45,7 +44,6 @@ CDEPEND="
 		app-crypt/qca:2[qt4(+)]
 		>=net-libs/jreen-1.2.0[qt4]
 	)
-	jingle? ( dev-qt/qt-mobility[multimedia] )
 	oscar? ( app-crypt/qca:2[qt4(+)] )
 	purple? ( net-im/pidgin )
 	vkontakte? ( >=dev-qt/qtwebkit-${QT_PV} )
@@ -59,10 +57,6 @@ CDEPEND="
 	ayatana? ( >=dev-libs/libindicate-qt-0.2.2 )
 	hunspell? ( app-text/hunspell )
 	kde? ( kde-frameworks/kdelibs:4 )
-	mobility? (
-		dev-qt/qt-mobility[multimedia,feedback]
-		>=dev-qt/qtbearer-${QT_PV}
-	)
 	otr? ( >=net-libs/libotr-4.0.0 )
 	phonon? ( media-libs/phonon[qt4] )
 	plugman? (
@@ -103,12 +97,6 @@ src_prepare() {
 			core/src/corelayers/idledetector/CMakeLists.txt || die
 	fi
 
-	# fix automagic dep on qt-mobility for jingle
-	if ! use jingle; then
-		sed -i -e '/find_package(QtMobility)/d' \
-			protocols/jabber/CMakeLists.txt || die
-	fi
-
 	# remove unwanted translations
 	local lang
 	for lang in ${LANGS}; do
@@ -152,7 +140,6 @@ src_configure() {
 		$(cmake-utils_use  phonon      PHONONSOUND       )
 		$(cmake-utils_use  plugman     PLUGMAN           )
 		$(cmake-utils_use  debug       LOGGER            )
-		$(cmake-utils_use  mobility    MOBILITY          )
 		$(cmake-utils_use  dbus        NOWPLAYING        )
 		$(cmake-utils_use  otr         OFFTHERECORD      )
 		$(cmake-utils_use  qml         QMLCHAT           )
@@ -162,6 +149,7 @@ src_configure() {
 		-DDOCKTILE=OFF	# QtDockTile currenly supports only unity;
 						# consider to make it optional if it also support kde or whatever
 		-DUPDATER=OFF
+		-DCMAKE_DISABLE_FIND_PACKAGE_QtMobility=ON # required dependency last-rited
 	)
 	# NOTE: Integration plugins are autodisabled:
 	# symbianintegration macintegration maemo5integration haikunotifications meegointegration winintegration