[gentoo-commits] repo/gentoo:master commit in: net-im/vacuum/

[Andreas Sturmlechner]

commit:     df03269f345a6f67a82de46d9515f47368c3e5bf
Author:     reagentoo <reagentoo <AT> gmail <DOT> com>
AuthorDate: Thu Jan  4 14:06:31 2018 +0000
Commit:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Sat Jan  6 02:58:42 2018 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=df03269f

net-im/vacuum: Drop unused NO_WEBKIT option, fix src_prepare

Closes: https://github.com/gentoo/gentoo/pull/6746

 net-im/vacuum/vacuum-9999.ebuild | 13 +++++++------
 1 file changed, 7 insertions(+), 6 deletions(-)

diff --git a/net-im/vacuum/vacuum-9999.ebuild b/net-im/vacuum/vacuum-9999.ebuild
index 56de1a0b337..b2f5d478a4d 100644
--- a/net-im/vacuum/vacuum-9999.ebuild
+++ b/net-im/vacuum/vacuum-9999.ebuild
@@ -13,9 +13,9 @@ HOMEPAGE="http://www.vacuum-im.org/"
 LICENSE="GPL-3"
 SLOT="0/37" # subslot = libvacuumutils soname version
 KEYWORDS=""
-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 )
+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 )
 SPELLCHECKER_BACKENDS="aspell +enchant hunspell"
-IUSE="adiummessagestyle ${PLUGINS[@]/#/+} ${SPELLCHECKER_BACKENDS} +spell"
+IUSE="${PLUGINS[@]/#/+} ${SPELLCHECKER_BACKENDS} +spell"
 
 REQUIRED_USE="
 	annotations? ( privatestorage )
@@ -65,7 +65,11 @@ DOCS=( AUTHORS CHANGELOG README TRANSLATORS )
 
 src_prepare() {
 	# Force usage of system libraries
-	rm -rf src/thirdparty/{idn,hunspell,minizip,zlib}
+	rm -rf src/thirdparty/{hunspell,idn,minizip,qtlockedfile,zlib} || die
+
+	# Supress find thirdparty library in the system
+	sed -i -r -e "/find_library.+qxtglobalshortcut/d" \
+		CMakeLists.txt || die
 
 	cmake-utils_src_prepare
 }
@@ -78,12 +82,9 @@ src_configure() {
 		-DINSTALL_DOCS=OFF
 		-DFORCE_BUNDLED_MINIZIP=OFF
 		-DPLUGIN_statistics=OFF
-		-DNO_WEBKIT=$(usex !adiummessagestyle)
 		-DPLUGIN_spellchecker=$(usex spell)
 	)
 
-	use adiummessagestyle && mycmakeargs+=( -DPLUGIN_adiummessagestyle=ON )
-
 	for x in ${PLUGINS[@]}; do
 		mycmakeargs+=( -DPLUGIN_${x}=$(usex $x) )
 	done