From b7ebc951da8800f711142f69d9d958bde67a112d Mon Sep 17 00:00:00 2001
From: V3n3RiX <venerix@redcorelinux.org>
Date: Sun, 28 Apr 2019 09:54:45 +0100
Subject: gentoo resync : 28.04.2019

---
 x11-apps/copyq/Manifest           |  4 +--
 x11-apps/copyq/copyq-2.8.1.ebuild | 44 -----------------------------
 x11-apps/copyq/copyq-3.8.0.ebuild | 58 +++++++++++++++++++++++++++++++++++++++
 3 files changed, 60 insertions(+), 46 deletions(-)
 delete mode 100644 x11-apps/copyq/copyq-2.8.1.ebuild
 create mode 100644 x11-apps/copyq/copyq-3.8.0.ebuild

(limited to 'x11-apps/copyq')

diff --git a/x11-apps/copyq/Manifest b/x11-apps/copyq/Manifest
index d1520ecbe612..5f3a43aae79b 100644
--- a/x11-apps/copyq/Manifest
+++ b/x11-apps/copyq/Manifest
@@ -1,5 +1,5 @@
 DIST CopyQ-3.7.2.tar.gz 2882944 BLAKE2B 3fd90b719b931ad9d92cca97f3ad284dc454ea5644907fa61b51b70eef5c42f41d52323346c0d24611c99cd2004a0528111125726d5cefe64f2cc9ead22d1f94 SHA512 dff6530375ea674502b754866c0011f3436796fc0535dc9cd317640b8cab4620e821b440df62d229a3d1dba371a7ae0c4a03e5d3366dd845218ab1516196d730
-DIST copyq-2.8.1.tar.gz 1573991 BLAKE2B 464c7fb462638ae717ee70dffcf5fb6eaf628dd4640c9db9d757769ac07479424fc953d81c92ed0e11015802432a9e556171994e8e2da7d0ce11868dcdf57cb6 SHA512 77602d39b0cb5fd0c8bd8d6c1ba5079e95ad72dc846c3e273556ffe029732e65bfd0951954de856c894bd7b6ebae816dfe7048040d77f7f3cd07faa922260b57
-EBUILD copyq-2.8.1.ebuild 925 BLAKE2B 5b33ac4946aa52c34e252bd0dc601c4025c5a530f03fd200f579e24ecc886edb81b2f0c936f8da983a5eac60fd59d832c63213eceeea58c704e9bd194dd41611 SHA512 bb21cef2e96f855ed3009839aabf56479bcaffb1076d92aadc64f75f025d9de7aeb9b283672441011a48c89306166b7c557a19cacba5fa1ee2c9500e275dad02
+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 1204 BLAKE2B 32545300510f446a7bdfb2db490bdc527f9da36d47a7ff2060c6f7f0cb52e6bd1dc58c57a98ce5e2ffebe71793c1eef36a9d75ef3cb019b551fd1d82da1ba238 SHA512 7803fdd917aa0a448ad9b2b9bb544ca52a5d484bdf5042d601670edb7d2c39c3faff40a4b87e2057e8847da90c41df3805383213282190ca674d5f03c4eaab75
 MISC metadata.xml 583 BLAKE2B 9e4775c1555d5759d86b6fff357a02b15a8ec9f4fb177e4263c7a47ec5ea539f5d42c44371a79e0fcc96144b5b1fedd2844706d1c658d21f03a46854c8303821 SHA512 6b5df0cdd51515d5a2b03da10a8a7b794c92394858774dbd45bb0dd4e52f2722daf8ba4aa6954960eef592e061c53588b4c2c0bfa84225305f04553ba06b062e
diff --git a/x11-apps/copyq/copyq-2.8.1.ebuild b/x11-apps/copyq/copyq-2.8.1.ebuild
deleted file mode 100644
index 128db7ff3459..000000000000
--- a/x11-apps/copyq/copyq-2.8.1.ebuild
+++ /dev/null
@@ -1,44 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit cmake-utils multilib
-
-DESCRIPTION="Clipboard manager with advanced features"
-HOMEPAGE="https://github.com/hluk/CopyQ"
-SRC_URI="https://github.com/hluk/CopyQ/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
-IUSE="test webkit"
-
-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
-	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}/CopyQ-${PV}
-
-src_configure() {
-	local mycmakeargs=(
-		-DPLUGIN_INSTALL_PREFIX="/usr/$(get_libdir)/${PN}/plugins"
-		-DWITH_QT5=ON
-		-DWITH_TESTS=$(usex test)
-		-DWITH_WEBKIT=$(usex webkit)
-	)
-	cmake-utils_src_configure
-}
diff --git a/x11-apps/copyq/copyq-3.8.0.ebuild b/x11-apps/copyq/copyq-3.8.0.ebuild
new file mode 100644
index 000000000000..7139966cb746
--- /dev/null
+++ b/x11-apps/copyq/copyq-3.8.0.ebuild
@@ -0,0 +1,58 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+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
+}
-- 
cgit v1.2.3