[gentoo-commits] repo/gentoo:master commit in: x11-apps/copyq/, x11-misc/copyq/, profiles/updates/

[gentoo-commits] repo/gentoo:master commit in: x11-apps/copyq/, x11-misc/copyq/, profiles/updates/

[Andreas Sturmlechner]

commit:     e50d4491f3048a5b8bb1859433c9430d9d8f6a83
Author:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Fri Oct 23 09:15:48 2020 +0000
Commit:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Fri Oct 23 09:52:45 2020 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e50d4491

x11-apps/copyq: [QA] pkgmove to x11-misc/copyq

Non-maintainer commit, PR unusable and no response.
Choosing x11-misc for hard-requirement of X11.

- Minor style fixes
- metadata.xml indentation

Closes: https://bugs.gentoo.org/571828
Closes: https://github.com/gentoo/gentoo/pull/16939
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>

 profiles/updates/4Q-2020                         | 1 +
 {x11-apps => x11-misc}/copyq/Manifest            | 0
 {x11-apps => x11-misc}/copyq/copyq-3.10.0.ebuild | 6 +++---
 {x11-apps => x11-misc}/copyq/metadata.xml        | 9 +++------
 4 files changed, 7 insertions(+), 9 deletions(-)

diff --git a/profiles/updates/4Q-2020 b/profiles/updates/4Q-2020
index a45d50eecb1..fcb19f19f1b 100644
--- a/profiles/updates/4Q-2020
+++ b/profiles/updates/4Q-2020
@@ -1,2 +1,3 @@
 move acct-group/openldap acct-group/ldap
 move acct-user/openldap acct-user/ldap
+move x11-apps/copyq x11-misc/copyq

diff --git a/x11-apps/copyq/Manifest b/x11-misc/copyq/Manifest
similarity index 100%
rename from x11-apps/copyq/Manifest
rename to x11-misc/copyq/Manifest

diff --git a/x11-apps/copyq/copyq-3.10.0.ebuild b/x11-misc/copyq/copyq-3.10.0.ebuild
similarity index 98%
rename from x11-apps/copyq/copyq-3.10.0.ebuild
rename to x11-misc/copyq/copyq-3.10.0.ebuild
index 857bb8af4b5..5f4c4eff390 100644
--- a/x11-apps/copyq/copyq-3.10.0.ebuild
+++ b/x11-misc/copyq/copyq-3.10.0.ebuild
@@ -3,9 +3,8 @@
 
 EAPI=7
 
-inherit cmake xdg-utils
-
 MY_P=CopyQ-${PV}
+inherit cmake xdg-utils
 
 DESCRIPTION="Clipboard manager with advanced features"
 HOMEPAGE="https://github.com/hluk/CopyQ"
@@ -34,7 +33,8 @@ RDEPEND="
 DEPEND="${RDEPEND}
 	test? ( dev-qt/qttest:5 )"
 BDEPEND="dev-qt/linguist-tools:5"
-S="${WORKDIR}/$MY_P"
+
+S="${WORKDIR}/${MY_P}"
 
 src_configure() {
 	# CMakeLists.txt concatenates INSTALL_PREFIX with INSTALL_MANDIR leading to /usr/usr

diff --git a/x11-apps/copyq/metadata.xml b/x11-misc/copyq/metadata.xml
similarity index 64%
rename from x11-apps/copyq/metadata.xml
rename to x11-misc/copyq/metadata.xml
index d333752428c..967643d4680 100644
--- a/x11-apps/copyq/metadata.xml
+++ b/x11-misc/copyq/metadata.xml
@@ -6,14 +6,11 @@
 		<name>Gino</name>
 	</maintainer>
 	<maintainer type="project">
-			<email>proxy-maint@gentoo.org</email>
-			<name>Proxy Maintainers</name>
+		<email>proxy-maint@gentoo.org</email>
+		<name>Proxy Maintainers</name>
 	</maintainer>
 	<use>
-		<flag name="webkit">
-	enables the application to use advanced HTML rendering and fetching 
-	remote images and other data
-	</flag>
+		<flag name="webkit">Use advanced HTML rendering and fetching remote images and other data</flag>
 	</use>
 	<upstream>
 		<remote-id type="github">hluk/CopyQ</remote-id>