| 1 |
commit: 165963056fbbd0e5422fb5e89603dfef75b807e8 |
| 2 |
Author: Michael Palimaka <kensington <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Sun Sep 10 04:09:14 2017 +0000 |
| 4 |
Commit: Michael Palimaka <kensington <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Sun Sep 10 04:14:51 2017 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=16596305 |
| 7 |
|
| 8 |
net-im/qutim: remove mobility and jingle USE flags |
| 9 |
|
| 10 |
The required dependency is being last rited. |
| 11 |
|
| 12 |
Closes: https://bugs.gentoo.org/626232 |
| 13 |
Package-Manager: Portage-2.3.6, Repoman-2.3.3 |
| 14 |
|
| 15 |
net-im/qutim/metadata.xml | 1 - |
| 16 |
net-im/qutim/qutim-0.3.3_p1.ebuild | 18 +++--------------- |
| 17 |
2 files changed, 3 insertions(+), 16 deletions(-) |
| 18 |
|
| 19 |
diff --git a/net-im/qutim/metadata.xml b/net-im/qutim/metadata.xml |
| 20 |
index 6d10686c9a1..f84be2388b5 100644 |
| 21 |
--- a/net-im/qutim/metadata.xml |
| 22 |
+++ b/net-im/qutim/metadata.xml |
| 23 |
@@ -37,7 +37,6 @@ |
| 24 |
<flag name="telepathy">Enable to connect various IMs through <pkg>net-libs/telepathy-qt</pkg></flag> |
| 25 |
<flag name="antiboss">Enable support for the antiboss plugin</flag> |
| 26 |
<flag name="espionage">!!Not recomended, contains privacy risk!! Enable control plugin that controls user by sending messages and roster to remote server</flag> |
| 27 |
- <flag name="mobility">Enable several mobility related plugins like vibro notification</flag> |
| 28 |
<flag name="plugman">Enable downloadable content management with <pkg>dev-libs/libattica</pkg></flag> |
| 29 |
</use> |
| 30 |
</pkgmetadata> |
| 31 |
|
| 32 |
diff --git a/net-im/qutim/qutim-0.3.3_p1.ebuild b/net-im/qutim/qutim-0.3.3_p1.ebuild |
| 33 |
index 0a867366a10..94d11a57265 100644 |
| 34 |
--- a/net-im/qutim/qutim-0.3.3_p1.ebuild |
| 35 |
+++ b/net-im/qutim/qutim-0.3.3_p1.ebuild |
| 36 |
@@ -19,14 +19,13 @@ KEYWORDS="amd64 x86" |
| 37 |
# general USE |
| 38 |
IUSE="doc +sound tools" |
| 39 |
# protocol uses |
| 40 |
-IUSE="$IUSE telepathy irc xmpp jingle mrim oscar purple vkontakte" |
| 41 |
+IUSE="$IUSE telepathy irc xmpp mrim oscar purple vkontakte" |
| 42 |
# plugins |
| 43 |
IUSE="$IUSE antiboss aspell ayatana awn crypt dbus debug -espionage histman hunspell |
| 44 |
- kde mobility otr plugman phonon purple qml sdl +ssl +xscreensaver webkit" |
| 45 |
+ kde otr plugman phonon purple qml sdl +ssl +xscreensaver webkit" |
| 46 |
|
| 47 |
REQUIRED_USE=" |
| 48 |
oscar? ( ssl ) |
| 49 |
- jingle? ( xmpp ) |
| 50 |
qml? ( webkit ) |
| 51 |
" |
| 52 |
|
| 53 |
@@ -45,7 +44,6 @@ CDEPEND=" |
| 54 |
app-crypt/qca:2[qt4(+)] |
| 55 |
>=net-libs/jreen-1.2.0[qt4] |
| 56 |
) |
| 57 |
- jingle? ( dev-qt/qt-mobility[multimedia] ) |
| 58 |
oscar? ( app-crypt/qca:2[qt4(+)] ) |
| 59 |
purple? ( net-im/pidgin ) |
| 60 |
vkontakte? ( >=dev-qt/qtwebkit-${QT_PV} ) |
| 61 |
@@ -59,10 +57,6 @@ CDEPEND=" |
| 62 |
ayatana? ( >=dev-libs/libindicate-qt-0.2.2 ) |
| 63 |
hunspell? ( app-text/hunspell ) |
| 64 |
kde? ( kde-frameworks/kdelibs:4 ) |
| 65 |
- mobility? ( |
| 66 |
- dev-qt/qt-mobility[multimedia,feedback] |
| 67 |
- >=dev-qt/qtbearer-${QT_PV} |
| 68 |
- ) |
| 69 |
otr? ( >=net-libs/libotr-4.0.0 ) |
| 70 |
phonon? ( media-libs/phonon[qt4] ) |
| 71 |
plugman? ( |
| 72 |
@@ -103,12 +97,6 @@ src_prepare() { |
| 73 |
core/src/corelayers/idledetector/CMakeLists.txt || die |
| 74 |
fi |
| 75 |
|
| 76 |
- # fix automagic dep on qt-mobility for jingle |
| 77 |
- if ! use jingle; then |
| 78 |
- sed -i -e '/find_package(QtMobility)/d' \ |
| 79 |
- protocols/jabber/CMakeLists.txt || die |
| 80 |
- fi |
| 81 |
- |
| 82 |
# remove unwanted translations |
| 83 |
local lang |
| 84 |
for lang in ${LANGS}; do |
| 85 |
@@ -152,7 +140,6 @@ src_configure() { |
| 86 |
$(cmake-utils_use phonon PHONONSOUND ) |
| 87 |
$(cmake-utils_use plugman PLUGMAN ) |
| 88 |
$(cmake-utils_use debug LOGGER ) |
| 89 |
- $(cmake-utils_use mobility MOBILITY ) |
| 90 |
$(cmake-utils_use dbus NOWPLAYING ) |
| 91 |
$(cmake-utils_use otr OFFTHERECORD ) |
| 92 |
$(cmake-utils_use qml QMLCHAT ) |
| 93 |
@@ -162,6 +149,7 @@ src_configure() { |
| 94 |
-DDOCKTILE=OFF # QtDockTile currenly supports only unity; |
| 95 |
# consider to make it optional if it also support kde or whatever |
| 96 |
-DUPDATER=OFF |
| 97 |
+ -DCMAKE_DISABLE_FIND_PACKAGE_QtMobility=ON # required dependency last-rited |
| 98 |
) |
| 99 |
# NOTE: Integration plugins are autodisabled: |
| 100 |
# symbianintegration macintegration maemo5integration haikunotifications meegointegration winintegration |
Archives