gentoo resync : 28.04.2019

4 files changed, 15 insertions, 58 deletions

diff --git a/app-misc/ckb/Manifest b/app-misc/ckb/Manifest
index 27514c0c2370..cb1ab93c2fe8 100644
--- a/app-misc/ckb/Manifest
+++ b/app-misc/ckb/Manifest
@@ -1,6 +1,4 @@
 AUX ckb.initd 659 BLAKE2B 1de2e8b9b555f2d083698e8302c972619dc08ca652bb1ef06e3a72ec9fa026f74aadb5e86491b4a95fe1c44699a21802907c75c67e3d09bc12caa2114052eaf8 SHA512 45c98f5b3cf2868fd7a5b0a015222b1dc6608847d380a1a3ccc95fab306bfde642a74e5dafe1545b380516fb4d41e30d76b9c1f826882dae28a0332f6c3b40ad
-DIST ckb-0.2.6.tar.gz 526737 BLAKE2B c41d4e510fb9226b578d305fbcf1f899f0e4c4ce1334274fde365d50ed8365fff5fa60784a5bbc7b2a1f8c85b9812a78d9d4cf629bea88ea4c4104e2f75c3c65 SHA512 6d92b0e82865748d9731943462d2cb89c3ea0dea4170f8aebcf5e1ed491c5d635dcd69a4f1f385ab891846f2b3437e2cb154f5dae5f5446cf52e557ebf6343a6
 DIST ckb-0.2.9.tar.gz 664625 BLAKE2B 37dc9c75876ca46fb10241da7b223ca67e5b9c0a998386f0f82eba15a97045e269b1f8a75dea18297865826bff241c21b255a507fd26e73747ee2656a228c4ce SHA512 7910f089d7b01ceade5ae8282db931c9decb9296d4c9c5fc2419eb7fb4ba5a2c0f85721a3a6846ed24a72f61b18374baa7fd27e11329b5d2f65b21916e8b96e1
-EBUILD ckb-0.2.6-r1.ebuild 1014 BLAKE2B 5f57f007c70aa8ba83d22bf858af168e6161c28727bc5713ed3b1ba87ca73a3143edf1542a0501d9bd04445acb6d34b52f840a9d90bbbdd35310a4b640a73e94 SHA512 d959ce86b5e088d782438518b50cf787c811374623350ed8134ea468f0f9f19e8e327863ba5077245dcd288a18e68d624d8d78b8de71ded6e12b42793dd8aa35
-EBUILD ckb-0.2.9.ebuild 1115 BLAKE2B 0baa0ffa72e1f9324fa4fa71eef92cdbfbe438f1f7a03519a5f39715930bc7ef4103c7280feeee9a2b2329d6f4ec6a128b869bb5b0fd1e78a710ebb49f52c8f1 SHA512 8a37d8d0814a59d5667de0726e6fbf4890fac2718a046027083e20339f5df69de5175b0b3b7370b3590d7751979ed688f179faf46b3bcb7b05f331fe418e9ae4
-MISC metadata.xml 319 BLAKE2B 5f2728fea7674baeefc2946a7ee7f94c390d10f37c6f90ad7a0c87a31f2e5072d465ac335f056beb332defcd6b66ccc838ff6cc25894751140ad4a8a658a2229 SHA512 62f3e5ae4cdf822445aac43dfb6a42da92230a79f007b15c5af65a802741338ff5008fe4ac9afb14bca120e23a2b947c92f8e132d0b3f5c36a43efd7a22c3183
+EBUILD ckb-0.2.9-r1.ebuild 1188 BLAKE2B 31bd8b6247e0f3615b9f2a770e60651ebc3962390c1fb73c39138269acfd9daf30845c70a04c123a358fe52bef07933c618e748076a28bc3b7b79375374779bd SHA512 18531d54b89558b00ada031fd161f96f56105ace63b300db85aa699408184668aab56a9b21fec7c214df232525c5bbe28097aefe3bf7f1b63c650ffa0068f644
+MISC metadata.xml 241 BLAKE2B 53b81bd5f392373de9734e1bf97c56251d03f1e8fd925dc2a85ac14aef11ced9bcfaad9e469e7a1548edc92e5562b4ed631d699e1398d314320eed76446a8ead SHA512 dad8f3d5c83cf60831c21d441b8d9a1bf4941c2c5b56697ab55ade147394f83db181f3de21f5c35d8f70eb1ed80e55633489551bdb53ef27146447763b156d4c
diff --git a/app-misc/ckb/ckb-0.2.6-r1.ebuild b/app-misc/ckb/ckb-0.2.6-r1.ebuild
deleted file mode 100644
index e9ac7cbbdb3c..000000000000
--- a/app-misc/ckb/ckb-0.2.6-r1.ebuild
+++ /dev/null
@@ -1,45 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-inherit qmake-utils systemd
-
-DESCRIPTION="Corsair K65/K70/K95 Driver"
-HOMEPAGE="https://github.com/ccMSC/ckb"
-SRC_URI="https://github.com/ccMSC/ckb/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64"
-IUSE=""
-
-DEPEND=">=dev-libs/quazip-0.7.2[qt5(+)]
-	dev-qt/qtcore:5
-	dev-qt/qtgui:5
-	dev-qt/qtnetwork:5
-	dev-qt/qtwidgets:5"
-RDEPEND="${DEPEND}"
-
-DOCS=( README.md BUILD.md DAEMON.md )
-
-src_prepare() {
-	sed -i -e "s/-Werror=all//" src/ckb-daemon/ckb-daemon.pro || die
-	sed -i -e "/quazip/d" -e "s/^.*QUAZIP_STATIC/LIBS += -lquazip5/" src/ckb/ckb.pro || die
-}
-
-src_configure() {
-	eqmake5
-}
-
-src_install() {
-	dobin bin/ckb bin/ckb-daemon
-	dodir /usr/bin/ckb-animations
-	exeinto /usr/bin/ckb-animations
-	doexe bin/ckb-animations/*
-
-	newinitd "${FILESDIR}"/ckb.initd ckb-daemon
-	domenu usr/ckb.desktop
-	doicon usr/ckb.png
-	systemd_dounit service/systemd/ckb-daemon.service
-}
diff --git a/app-misc/ckb/ckb-0.2.9.ebuild b/app-misc/ckb/ckb-0.2.9-r1.ebuild
index 0516a27502af..a0d3d2a09f0a 100644
--- a/app-misc/ckb/ckb-0.2.9.ebuild
+++ b/app-misc/ckb/ckb-0.2.9-r1.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
+EAPI=7
 
-inherit vcs-snapshot qmake-utils systemd
+inherit desktop qmake-utils systemd
 
 DESCRIPTION="Corsair K65/K70/K95 Driver"
 HOMEPAGE="https://github.com/ckb-next/ckb-next"
@@ -14,16 +14,23 @@ SLOT="0"
 KEYWORDS="~amd64"
 IUSE=""
 
-DEPEND=">=dev-libs/quazip-0.7.2[qt5(+)]
+DEPEND="
+	>=dev-libs/quazip-0.7.2[qt5(+)]
 	dev-qt/qtcore:5
 	dev-qt/qtgui:5
 	dev-qt/qtnetwork:5
-	dev-qt/qtwidgets:5"
+	dev-qt/qtwidgets:5
+	virtual/libudev:=
+	x11-libs/libX11
+"
 RDEPEND="${DEPEND}"
 
 DOCS=( README.md BUILD.md DAEMON.md )
 
+S="${WORKDIR}/${PN}-next-${PV}"
+
 src_prepare() {
+	default
 	sed -i -e "s/-Werror=all//" src/ckb-daemon/ckb-daemon.pro || die
 	sed -i -e "/quazip/d" -e "s/^.*QUAZIP_STATIC/LIBS += -lquazip5/" src/ckb/ckb.pro || die
 	sed -i -e "s#/usr/lib#/usr/libexec#" src/ckb/animscript.cpp || die
diff --git a/app-misc/ckb/metadata.xml b/app-misc/ckb/metadata.xml
index cb945f500083..2a82acaed1c4 100644
--- a/app-misc/ckb/metadata.xml
+++ b/app-misc/ckb/metadata.xml
@@ -1,10 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="person">
-		<email>mrueg@gentoo.org</email>
-		<name>Manuel Rüger</name>
-	</maintainer>
+	<!-- maintainer-needed -->
 	<upstream>
 		<remote-id type="github">ccMSC/ckb</remote-id>
 	</upstream>