gentoo resync : 06.01.2018

3 files changed, 114 insertions, 7 deletions

diff --git a/net-im/vacuum/Manifest b/net-im/vacuum/Manifest
index 8ad1f30d1ce4..6be37ff5dd45 100644
--- a/net-im/vacuum/Manifest
+++ b/net-im/vacuum/Manifest
@@ -1,5 +1,7 @@
 AUX vacuum-1.2.4-gcc6-not-string-literals.patch 3213 BLAKE2B 7f617c04e85a8bd47881c6762fbf09ed558a615ee27f3dd390211aaddaa974fe0dd432dfc70a9e7f3f3ed08b759c2cf2c7d0231c2ba0f4207b8ea9875343b146 SHA512 1ee8a0be4c0f6495c9446a506293ba529b3ca59ae4362ae456db7b15c52afb358691776a6c8c49e48af1a2f9847d25c78ca66a9a1180a5c388e743f3b37ae424
 DIST vacuum-1.2.5.tar.gz 2242073 BLAKE2B 3c326fa38422e99ecc1edaca51932dbb18a8cefdbc757f6b39099ec5af07a07094f3d961ec98c65eb9c4b5e4937d6c5a4d814095b8257b5a95e94c68077f9259 SHA512 85e36ed312beb59b667f376d45511f3c9414ba8165746cc1da15992eac4716995aa01da505a2f2dd58c8d64822f25c9106691be26a534e01a21f0201049300fc
+DIST vacuum-im-1.3.0.20180105-Alpha.tar.gz 2658247 BLAKE2B 823984f49687805c8e859984d6dfc9afcbdff864eef2f81825562dca11281286d5e736a986ed40e10bb915b7ee4f972dba10b073ea738cd8153f887c74b89f1b SHA512 83d830494c272145c3ad923ebb2897a8ab6323a301bdd0fc2b972f84b246e2de4eff29a93d92da97ed4deb6018c52e38e6fc5941c54722e1c37de207bca0c687
 EBUILD vacuum-1.2.5.ebuild 2394 BLAKE2B 6448d47aebb976e21e2c0bccfa88a20d90aff44139761c41c8e7ba0607331087c5f53dc5fc3027fea1e08072d7dc043273523ccde587a8c47f58b3470a0168c4 SHA512 2b2fa3ec5ce9eca347d88b6f6e026c269906e8b6bada05767a9c2fa645ff8ae987ccacee816ee4d7a220d5cbc537ee9d9ab026fd39fa0e80dc81f50ebbe0e143
-EBUILD vacuum-9999.ebuild 2998 BLAKE2B 09fff1bad6a81803e87c729cf49d383e98cfcfcc7412d1f38961e4316d3f6ea70267bff43e11d773f8824016ce6c67ca8d7f722b897c957a20e54807c1261c07 SHA512 14602e99ed8fa7cb51a4c0397bb106f03182d848cbaac81552690aab9eeb8ccc1d7e75786c82a3cc6073eaba395840799919f3ad263b073fa2e93f8e73b0ad1b
+EBUILD vacuum-1.3.0_pre20180105.ebuild 3160 BLAKE2B d30f7345e1158e7b592d08e10c76cf7e7b736aaca6c9425c74778d239af92ae8f5627467f7b12d89040344e49ff35ffa86da7be3c6189419b9894e681b0e3545 SHA512 3527ffefee62a7412006f3b2b82e49d1590a6cd8fbd3ec1c7141b73c6c2fb0b5f3f3f1f8e447ae0ef976eeec60f66d090f7e40508d9d7da25b170c44c1d6363f
+EBUILD vacuum-9999.ebuild 3030 BLAKE2B 93e9c24456650acadf8ff17f222529ad3566776c9e5a501c8ef004c04ce40e6cbcab476b5a23575919568ee4ce12be5a410e0f68ebbdcda437cb1a70f4960c72 SHA512 92eee10958021300eadcc00645347b13ff37c3925d40fafd542cef25b5893313a5f086a1c64f278f627229cb5ad5880ec329255e1a42cce591634a16766dc77f
 MISC metadata.xml 4465 BLAKE2B b52eb1c3b2c2c351722c38bf441794b0bb8b2a210c819daa350981740d6c387aadf5984ca407c8b246869ab8a22aca571901d57c471c44279c49ea75cbe8d168 SHA512 6e2d48162715a8008d7ae3cdc83a2cfd6e66fd8b90f6c189f3e7fe7ca1983b66439cabbfc5e02a0eb75e5ba40b40bb35f829fa7400bd7a212178ac93018366f1
diff --git a/net-im/vacuum/vacuum-1.3.0_pre20180105.ebuild b/net-im/vacuum/vacuum-1.3.0_pre20180105.ebuild
new file mode 100644
index 000000000000..0b60a4d2b10a
--- /dev/null
+++ b/net-im/vacuum/vacuum-1.3.0_pre20180105.ebuild
@@ -0,0 +1,104 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+PLOCALES="de es pl ru uk"
+
+inherit cmake-utils l10n
+
+MY_PN="${PN}-im"
+MY_PV="${PV/_pre/.}-Alpha"
+MY_P="${MY_PN}-${MY_PV}"
+
+DESCRIPTION="Qt Crossplatform Jabber client"
+HOMEPAGE="http://www.vacuum-im.org/"
+SRC_URI="https://github.com/Vacuum-IM/${MY_PN}/archive/${MY_PV}.tar.gz -> ${MY_P}.tar.gz"
+
+LICENSE="GPL-3"
+SLOT="0/37" # subslot = libvacuumutils soname version
+KEYWORDS="~amd64 ~x86"
+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="${PLUGINS[@]/#/+} ${SPELLCHECKER_BACKENDS} +spell"
+
+REQUIRED_USE="
+	annotations? ( privatestorage )
+	avatars? ( vcard )
+	birthdayreminder? ( vcard )
+	bookmarks? ( privatestorage )
+	captchaforms? ( dataforms )
+	commands? ( dataforms )
+	datastreamsmanager? ( dataforms )
+	filemessagearchive? ( messagearchiver )
+	filestreamsmanager? ( datastreamsmanager )
+	filetransfer? ( filestreamsmanager datastreamsmanager )
+	messagecarbons? ( servicediscovery )
+	pepmanager? ( servicediscovery )
+	recentcontacts? ( privatestorage )
+	registration? ( dataforms )
+	remotecontrol? ( commands dataforms )
+	servermessagearchive? ( messagearchiver )
+	sessionnegotiation? ( dataforms )
+	spell? ( ^^ ( ${SPELLCHECKER_BACKENDS//+/} ) )
+"
+
+DEPEND="
+	dev-qt/qtcore:5
+	dev-qt/qtgui:5
+	dev-qt/qtlockedfile[qt5(+)]
+	dev-qt/qtmultimedia:5
+	dev-qt/qtnetwork:5[ssl]
+	dev-qt/qtxml:5
+	net-dns/libidn
+	sys-libs/zlib[minizip]
+	x11-libs/libXScrnSaver
+	adiummessagestyle? ( dev-qt/qtwebkit:5 )
+	filemessagearchive? ( dev-qt/qtsql:5[sqlite] )
+	messagearchiver? ( dev-qt/qtsql:5[sqlite] )
+	spell? (
+		aspell? ( app-text/aspell )
+		enchant? ( app-text/enchant )
+		hunspell? ( app-text/hunspell )
+	)
+"
+RDEPEND="${DEPEND}
+	!net-im/vacuum-spellchecker
+"
+
+DOCS=( AUTHORS CHANGELOG README TRANSLATORS )
+
+S="${WORKDIR}/${MY_P}"
+
+src_prepare() {
+	# Force usage of system libraries
+	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
+}
+
+src_configure() {
+	local mycmakeargs=(
+		-DINSTALL_LIB_DIR="$(get_libdir)"
+		-DINSTALL_SDK=ON
+		-DLANGS="$(l10n_get_locales)"
+		-DINSTALL_DOCS=OFF
+		-DFORCE_BUNDLED_MINIZIP=OFF
+		-DPLUGIN_statistics=OFF
+		-DPLUGIN_spellchecker=$(usex spell)
+	)
+
+	for x in ${PLUGINS[@]}; do
+		mycmakeargs+=( -DPLUGIN_${x}=$(usex $x) )
+	done
+
+	for i in ${SPELLCHECKER_BACKENDS//+/}; do
+		use "${i}" && mycmakeargs+=( -DSPELLCHECKER_BACKEND="${i}" )
+	done
+
+	cmake-utils_src_configure
+}
diff --git a/net-im/vacuum/vacuum-9999.ebuild b/net-im/vacuum/vacuum-9999.ebuild
index 56de1a0b3375..b2f5d478a4d4 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