| 1 |
commit: b3c088124e0104412ea99defe4aa04f39788b154 |
| 2 |
Author: reagentoo <reagentoo <AT> gmail <DOT> com> |
| 3 |
AuthorDate: Wed Jan 3 20:40:53 2018 +0000 |
| 4 |
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Thu Jan 4 10:40:11 2018 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b3c08812 |
| 7 |
|
| 8 |
net-im/vacuum: Switch live to Qt5-based master, fix cmake warning |
| 9 |
|
| 10 |
- fix PLUGIN_adiummessagestyle, available only if NO_WEBKIT=OFF |
| 11 |
- append proxy in metadata.xml |
| 12 |
|
| 13 |
Closes: https://github.com/gentoo/gentoo/pull/6738 |
| 14 |
|
| 15 |
net-im/vacuum/metadata.xml | 8 ++++++++ |
| 16 |
net-im/vacuum/vacuum-9999.ebuild | 9 +++++---- |
| 17 |
2 files changed, 13 insertions(+), 4 deletions(-) |
| 18 |
|
| 19 |
diff --git a/net-im/vacuum/metadata.xml b/net-im/vacuum/metadata.xml |
| 20 |
index 3cc79d8c788..7cef94a3a3a 100644 |
| 21 |
--- a/net-im/vacuum/metadata.xml |
| 22 |
+++ b/net-im/vacuum/metadata.xml |
| 23 |
@@ -5,6 +5,14 @@ |
| 24 |
<email>maksbotan@g.o</email> |
| 25 |
<name>Maxim Koltsov</name> |
| 26 |
</maintainer> |
| 27 |
+ <maintainer type="person"> |
| 28 |
+ <email>reagentoo@×××××.com</email> |
| 29 |
+ <name>Dmitry Baranov</name> |
| 30 |
+ </maintainer> |
| 31 |
+ <maintainer type="project"> |
| 32 |
+ <email>proxy-maint@g.o</email> |
| 33 |
+ <name>Proxy Maintainers</name> |
| 34 |
+ </maintainer> |
| 35 |
<use> |
| 36 |
<flag name="adiummessagestyle">Use UI styles created for Adium</flag> |
| 37 |
<flag name="annotations">Enable adding comments to the contacts in the roster</flag> |
| 38 |
|
| 39 |
diff --git a/net-im/vacuum/vacuum-9999.ebuild b/net-im/vacuum/vacuum-9999.ebuild |
| 40 |
index 76ab422c67c..56de1a0b337 100644 |
| 41 |
--- a/net-im/vacuum/vacuum-9999.ebuild |
| 42 |
+++ b/net-im/vacuum/vacuum-9999.ebuild |
| 43 |
@@ -1,9 +1,8 @@ |
| 44 |
-# Copyright 1999-2017 Gentoo Foundation |
| 45 |
+# Copyright 1999-2018 Gentoo Foundation |
| 46 |
# Distributed under the terms of the GNU General Public License v2 |
| 47 |
|
| 48 |
EAPI=6 |
| 49 |
|
| 50 |
-EGIT_BRANCH="dev_qt5" |
| 51 |
EGIT_REPO_URI="https://github.com/Vacuum-IM/vacuum-im.git" |
| 52 |
PLOCALES="de es pl ru uk" |
| 53 |
inherit cmake-utils git-r3 l10n |
| 54 |
@@ -14,9 +13,9 @@ HOMEPAGE="http://www.vacuum-im.org/" |
| 55 |
LICENSE="GPL-3" |
| 56 |
SLOT="0/37" # subslot = libvacuumutils soname version |
| 57 |
KEYWORDS="" |
| 58 |
-PLUGINS=( adiummessagestyle annotations autostatus avatars birthdayreminder bitsofbinary bookmarks captchaforms chatstates clientinfo commands compress console dataforms datastreamsmanager emoticons filemessagearchive filestreamsmanager filetransfer gateways inbandstreams iqauth jabbersearch messagearchiver messagecarbons multiuserchat pepmanager privacylists privatestorage recentcontacts registration remotecontrol rosteritemexchange rostersearch servermessagearchive servicediscovery sessionnegotiation shortcutmanager socksstreams urlprocessor vcard xmppuriqueries ) |
| 59 |
+PLUGINS=( annotations autostatus avatars birthdayreminder bitsofbinary bookmarks captchaforms chatstates clientinfo commands compress console dataforms datastreamsmanager emoticons filemessagearchive filestreamsmanager filetransfer gateways inbandstreams iqauth jabbersearch messagearchiver messagecarbons multiuserchat pepmanager privacylists privatestorage recentcontacts registration remotecontrol rosteritemexchange rostersearch servermessagearchive servicediscovery sessionnegotiation shortcutmanager socksstreams urlprocessor vcard xmppuriqueries ) |
| 60 |
SPELLCHECKER_BACKENDS="aspell +enchant hunspell" |
| 61 |
-IUSE="${PLUGINS[@]/#/+} ${SPELLCHECKER_BACKENDS} +spell" |
| 62 |
+IUSE="adiummessagestyle ${PLUGINS[@]/#/+} ${SPELLCHECKER_BACKENDS} +spell" |
| 63 |
|
| 64 |
REQUIRED_USE=" |
| 65 |
annotations? ( privatestorage ) |
| 66 |
@@ -83,6 +82,8 @@ src_configure() { |
| 67 |
-DPLUGIN_spellchecker=$(usex spell) |
| 68 |
) |
| 69 |
|
| 70 |
+ use adiummessagestyle && mycmakeargs+=( -DPLUGIN_adiummessagestyle=ON ) |
| 71 |
+ |
| 72 |
for x in ${PLUGINS[@]}; do |
| 73 |
mycmakeargs+=( -DPLUGIN_${x}=$(usex $x) ) |
| 74 |
done |
Archives