gentoo resync : 25.11.2020

4 files changed, 27 insertions, 29 deletions

diff --git a/net-im/vacuum/Manifest b/net-im/vacuum/Manifest
index 7fbfc494dcfa..f6b9fba757f1 100644
--- a/net-im/vacuum/Manifest
+++ b/net-im/vacuum/Manifest
@@ -1,4 +1,4 @@
 DIST vacuum-im-1.3.0.20180105-Alpha.tar.gz 2658247 BLAKE2B 823984f49687805c8e859984d6dfc9afcbdff864eef2f81825562dca11281286d5e736a986ed40e10bb915b7ee4f972dba10b073ea738cd8153f887c74b89f1b SHA512 83d830494c272145c3ad923ebb2897a8ab6323a301bdd0fc2b972f84b246e2de4eff29a93d92da97ed4deb6018c52e38e6fc5941c54722e1c37de207bca0c687
-EBUILD vacuum-1.3.0_pre20180105.ebuild 3159 BLAKE2B dc47da266dd7e6b06c6408ea9382c725bbf809a2a67ece99856a9ae93e77be21b5a659d02bc5956ff5f6140afa5ee59249cc61eebd72240c32b70f67b927cf47 SHA512 c39b634701714be6a22d8bcb75e3b69abe838ec868aea2a57ed2b975b5622471704c5b75af7e00139adc0ccdf4931b3a203e99d914e3780b39c9eb190271c93c
-EBUILD vacuum-9999.ebuild 3029 BLAKE2B 947282547137128870cc90d84c49bdc2477be954895ea4f45d8bd50ebcfc4a689774bb0daa19ef9557734d70a7e35e081d8d6e4ea9341bef1d6770ba2fecaf35 SHA512 1137af18c50195ae99ade4a43240b67616aec48f1518b472f410a66c88eab4baccc86ad5f9c5ed70fe79ea27bafd2b4fd32336c9d60ec9e5547fd671c242d7b4
-MISC metadata.xml 4465 BLAKE2B 0436dde685c7e32a95f148e922680220dd37c3ca612778c86c09340d108bbeb538f86ae7914ff6c3a16355831019b75cad986666964cd2def302cbe2346b52ae SHA512 9650379639d1e21d58c1012291a1f2c2727e1a93f57ddc5d13e95eff1fc1a440e292c91d3500d5ad108768005ca5104e6847895473233429bf32f999234aac6f
+EBUILD vacuum-1.3.0_pre20180105.ebuild 3114 BLAKE2B 2985d8610dd5c6131be1ee32c04a7d35cfc9816dde0cf7bd94eb351c25470287a263e90dc65e2d7efa1183649f731291e09e0eb6c7ad3949e03fd6ffa65e73c7 SHA512 51eff110897062bf05cdfa2ac080bc97e29b6416514a278bf7c110a5a8abac076f8944a126677c37f3d6c8edb21122fe58d2d6b07fe426467b85abab30a651c4
+EBUILD vacuum-9999.ebuild 2951 BLAKE2B c47d8203f106e137113fbaa085a4fb5965a27c63f004973cc4be603047978b6dd7528dbd95ee8caf0b7a83987757a7799ec8763d3f7eef1875c36b75773abec2 SHA512 779aa707585a3d42d4779d835669e4d85214bd82554b51cddc6d3190736b20760e0be8b3a91505d9bbf801e7c657287b00f5d47a2e3bad290463341262d89dd8
+MISC metadata.xml 4393 BLAKE2B 1e7ca7fd2e9a6d9280380a3a4b1d3c4eb779a248f3d50c2f8e0760fdd76d7d87ce9f113d29f3e2bdd4f5f8b8468907bbf306bb8485f76bf1e76376b23f019ef0 SHA512 446e38db0ce8ce1c7a62f2b9ee03a701d75a6df16e62f6e70dd829d1a6973bc601c51859f1e9929e3da430494ea47afbbe6fddde794d86850205159cd88d468d
diff --git a/net-im/vacuum/metadata.xml b/net-im/vacuum/metadata.xml
index 69557bbd0f96..724d412c2613 100644
--- a/net-im/vacuum/metadata.xml
+++ b/net-im/vacuum/metadata.xml
@@ -14,7 +14,6 @@
 		<name>Proxy Maintainers</name>
 	</maintainer>
 	<use>
-		<flag name="adiummessagestyle">Use UI styles created for Adium</flag>
 		<flag name="annotations">Enable adding comments to the contacts in the roster</flag>
 		<flag name="autostatus">Change the status in accordance with the time of inactivity</flag>
 		<flag name="avatars">Enable assigning and displaying avatars</flag>
diff --git a/net-im/vacuum/vacuum-1.3.0_pre20180105.ebuild b/net-im/vacuum/vacuum-1.3.0_pre20180105.ebuild
index cdb7af2a260d..7da48efb53a4 100644
--- a/net-im/vacuum/vacuum-1.3.0_pre20180105.ebuild
+++ b/net-im/vacuum/vacuum-1.3.0_pre20180105.ebuild
@@ -1,11 +1,10 @@
 # Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=7
 
 PLOCALES="de es pl ru uk"
-
-inherit cmake-utils l10n
+inherit cmake l10n
 
 MY_PN="${PN}-im"
 MY_PV="${PV/_pre/.}-Alpha"
@@ -18,7 +17,7 @@ SRC_URI="https://github.com/Vacuum-IM/${MY_PN}/archive/${MY_PV}.tar.gz -> ${MY_P
 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 )
+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 )
 SPELLCHECKER_BACKENDS="aspell +enchant hunspell"
 IUSE="${PLUGINS[@]/#/+} ${SPELLCHECKER_BACKENDS} +spell"
 
@@ -43,6 +42,9 @@ REQUIRED_USE="
 	spell? ( ^^ ( ${SPELLCHECKER_BACKENDS//+/} ) )
 "
 
+BDEPEND="
+	dev-qt/linguist-tools:5
+"
 DEPEND="
 	dev-qt/qtcore:5
 	dev-qt/qtgui:5
@@ -53,7 +55,6 @@ DEPEND="
 	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? (
@@ -71,14 +72,13 @@ DOCS=( AUTHORS CHANGELOG README TRANSLATORS )
 S="${WORKDIR}/${MY_P}"
 
 src_prepare() {
+	cmake_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
+	# Suppress find thirdparty library in the system
+	sed -i -r -e "/find_library.+qxtglobalshortcut/d" CMakeLists.txt || die
 }
 
 src_configure() {
@@ -100,5 +100,5 @@ src_configure() {
 		use "${i}" && mycmakeargs+=( -DSPELLCHECKER_BACKEND="${i}" )
 	done
 
-	cmake-utils_src_configure
+	cmake_src_configure
 }
diff --git a/net-im/vacuum/vacuum-9999.ebuild b/net-im/vacuum/vacuum-9999.ebuild
index edcb05c884a1..a5e9347a9baf 100644
--- a/net-im/vacuum/vacuum-9999.ebuild
+++ b/net-im/vacuum/vacuum-9999.ebuild
@@ -1,11 +1,11 @@
 # Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=7
 
-EGIT_REPO_URI="https://github.com/Vacuum-IM/vacuum-im.git"
+EGIT_REPO_URI="https://github.com/Vacuum-IM/vacuum-im"
 PLOCALES="de es pl ru uk"
-inherit cmake-utils git-r3 l10n
+inherit cmake git-r3 l10n
 
 DESCRIPTION="Qt Crossplatform Jabber client"
 HOMEPAGE="http://www.vacuum-im.org/"
@@ -13,7 +13,7 @@ HOMEPAGE="http://www.vacuum-im.org/"
 LICENSE="GPL-3"
 SLOT="0/37" # subslot = libvacuumutils soname version
 KEYWORDS=""
-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 )
+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 )
 SPELLCHECKER_BACKENDS="aspell +enchant hunspell"
 IUSE="${PLUGINS[@]/#/+} ${SPELLCHECKER_BACKENDS} +spell"
 
@@ -38,6 +38,9 @@ REQUIRED_USE="
 	spell? ( ^^ ( ${SPELLCHECKER_BACKENDS//+/} ) )
 "
 
+BDEPEND="
+	dev-qt/linguist-tools:5
+"
 DEPEND="
 	dev-qt/qtcore:5
 	dev-qt/qtgui:5
@@ -48,7 +51,6 @@ DEPEND="
 	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? (
@@ -57,21 +59,18 @@ DEPEND="
 		hunspell? ( app-text/hunspell )
 	)
 "
-RDEPEND="${DEPEND}
-	!net-im/vacuum-spellchecker
-"
+RDEPEND="${DEPEND}"
 
 DOCS=( AUTHORS CHANGELOG README TRANSLATORS )
 
 src_prepare() {
+	cmake_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
+	# Suppress find thirdparty library in the system
+	sed -i -r -e "/find_library.+qxtglobalshortcut/d" CMakeLists.txt || die
 }
 
 src_configure() {
@@ -93,5 +92,5 @@ src_configure() {
 		use "${i}" && mycmakeargs+=( -DSPELLCHECKER_BACKEND="${i}" )
 	done
 
-	cmake-utils_src_configure
+	cmake_src_configure
 }