gentoo resync : 14.05.2020

3 files changed, 11 insertions, 70 deletions

diff --git a/x11-apps/copyq/Manifest b/x11-apps/copyq/Manifest
index 42df4ed0f1bc..080808cf0500 100644
--- a/x11-apps/copyq/Manifest
+++ b/x11-apps/copyq/Manifest
@@ -1,5 +1,3 @@
-DIST CopyQ-3.7.2.tar.gz 2882944 BLAKE2B 3fd90b719b931ad9d92cca97f3ad284dc454ea5644907fa61b51b70eef5c42f41d52323346c0d24611c99cd2004a0528111125726d5cefe64f2cc9ead22d1f94 SHA512 dff6530375ea674502b754866c0011f3436796fc0535dc9cd317640b8cab4620e821b440df62d229a3d1dba371a7ae0c4a03e5d3366dd845218ab1516196d730
-DIST CopyQ-3.8.0.tar.gz 2909764 BLAKE2B 73b5f1b088bdea6db7a1141d8b029329210c18f980caf8ff52746894d672885c0940b7eeea2e66ed4d7957ea83649780860fd97e93f8eb02aad4cb8d3e687472 SHA512 ae22e5e00a2624b5fb551790ccda82f4a10a026cfd16d6526b370a0a210a939f2a11d0729f2b735e201085083514ff9eff8cda69ee2d360766fbfb7ea49b6c5e
-EBUILD copyq-3.7.2.ebuild 1204 BLAKE2B 1a21218b0b1c79a82c867c3e41464dfa2991be477c614a41688259597f7a41639e8717eda27fb5dd696a2514f8b53f89ce7adf2a25d1a3017ee4cd378cea16dc SHA512 3b127d20561489756ac26c3128ac50bb1d00ef5395d375e481058e2cee4a92eea368cb68313f5bc0b034f97139e7cce48cc3adcc8b42524a3821b7c8872ddc36
-EBUILD copyq-3.8.0.ebuild 1192 BLAKE2B 4236a8df6c392e4ce62d7e4ffb5f14a299f61c4fe456dd97d3098971289f03e16db1fd424056294c6deef4a30abc213f231aba1a051af74aa7b87d3852043643 SHA512 f7abe5f272d984d6a33465a3d12fcff01a3ae40cc79ec971fcc87158c865d25516dc50e9500d969d1616f851f82aa59e41b13140b22543182b6c9d5fd6e05839
+DIST CopyQ-3.10.0.tar.gz 2832904 BLAKE2B 78866a3ecbd1ed4d1ab06db552ef517234c1354609ef2bc18f8c4d8fa22342c7479a5bde79b9333f896dee4fe18543e47657c780b821f45121e0413c597b45aa SHA512 6cae338a144d7f92850ce88c991ed99222613c57540ced49dab719e43af884bbd9d15e6e8f074c6af94b0ac2ecd1b355eff8b83ec99f688c0f93fa19f253d653
+EBUILD copyq-3.10.0.ebuild 1251 BLAKE2B 7625f9f5019c664118d61c08e61c44c9a0d7e0e3b9f7f5502cba93aa712798b7d01532f6caa4aa540a5b528c88d701157ebb024df01c6f010a130d2f0b4dd2cd SHA512 3795857f32dde0059f08fdc20bbc743c84bb9a5335c9236547439fffc2cdd6b185f25a55f934d11e21c94c08d0aad5e03878ec034029cf4d40ae0ff0ca6fa98c
 MISC metadata.xml 583 BLAKE2B 9e4775c1555d5759d86b6fff357a02b15a8ec9f4fb177e4263c7a47ec5ea539f5d42c44371a79e0fcc96144b5b1fedd2844706d1c658d21f03a46854c8303821 SHA512 6b5df0cdd51515d5a2b03da10a8a7b794c92394858774dbd45bb0dd4e52f2722daf8ba4aa6954960eef592e061c53588b4c2c0bfa84225305f04553ba06b062e
diff --git a/x11-apps/copyq/copyq-3.8.0.ebuild b/x11-apps/copyq/copyq-3.10.0.ebuild
index 9f5c1deeaa86..857bb8af4b57 100644
--- a/x11-apps/copyq/copyq-3.8.0.ebuild
+++ b/x11-apps/copyq/copyq-3.10.0.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
-inherit cmake gnome2-utils
+inherit cmake xdg-utils
 
 MY_P=CopyQ-${PV}
 
@@ -32,10 +32,9 @@ RDEPEND="
 	webkit? ( dev-qt/qtwebkit:5 )
 "
 DEPEND="${RDEPEND}
-	dev-qt/linguist-tools:5
-	test? ( dev-qt/qttest:5 )
-"
-S=${WORKDIR}/$MY_P
+	test? ( dev-qt/qttest:5 )"
+BDEPEND="dev-qt/linguist-tools:5"
+S="${WORKDIR}/$MY_P"
 
 src_configure() {
 	# CMakeLists.txt concatenates INSTALL_PREFIX with INSTALL_MANDIR leading to /usr/usr
@@ -50,9 +49,11 @@ src_configure() {
 }
 
 pkg_postinst() {
-	gnome2_icon_cache_update
+	xdg_desktop_database_update
+	xdg_icon_cache_update
 }
 
 pkg_postrm() {
-	gnome2_icon_cache_update
+	xdg_desktop_database_update
+	xdg_icon_cache_update
 }
diff --git a/x11-apps/copyq/copyq-3.7.2.ebuild b/x11-apps/copyq/copyq-3.7.2.ebuild
deleted file mode 100644
index 0c5b8ccd84f5..000000000000
--- a/x11-apps/copyq/copyq-3.7.2.ebuild
+++ /dev/null
@@ -1,58 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit cmake-utils gnome2-utils
-
-MY_P=CopyQ-${PV}
-
-DESCRIPTION="Clipboard manager with advanced features"
-HOMEPAGE="https://github.com/hluk/CopyQ"
-SRC_URI="https://github.com/hluk/CopyQ/archive/v${PV}.tar.gz -> ${MY_P}.tar.gz"
-
-LICENSE="GPL-3+"
-SLOT="0"
-KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
-IUSE="test webkit"
-
-RESTRICT="!test? ( test )"
-
-RDEPEND="
-	dev-qt/qtcore:5
-	dev-qt/qtgui:5
-	dev-qt/qtnetwork:5
-	dev-qt/qtscript:5
-	dev-qt/qtsvg:5
-	dev-qt/qtwidgets:5
-	dev-qt/qtx11extras:5
-	x11-libs/libX11
-	x11-libs/libXfixes
-	x11-libs/libXtst
-	webkit? ( dev-qt/qtwebkit:5 )
-"
-DEPEND="${RDEPEND}
-	dev-qt/linguist-tools:5
-	test? ( dev-qt/qttest:5 )
-"
-S=${WORKDIR}/$MY_P
-
-src_configure() {
-	# CMakeLists.txt concatenates INSTALL_PREFIX with INSTALL_MANDIR leading to /usr/usr
-	local mycmakeargs=(
-		-DPLUGIN_INSTALL_PREFIX="/usr/$(get_libdir)/${PN}/plugins"
-		-DWITH_QT5=ON
-		-DWITH_TESTS=$(usex test)
-		-DWITH_WEBKIT=$(usex webkit)
-		-DCMAKE_INSTALL_MANDIR="share/man"
-	)
-	cmake-utils_src_configure
-}
-
-pkg_postinst() {
-	gnome2_icon_cache_update
-}
-
-pkg_postrm() {
-	gnome2_icon_cache_update
-}