gentoo resync : 25.08.2020

3 files changed, 11 insertions, 51 deletions

diff --git a/net-dialup/cutecom/Manifest b/net-dialup/cutecom/Manifest
index 7e5d32df1aa9..cd5ef1f378da 100644
--- a/net-dialup/cutecom/Manifest
+++ b/net-dialup/cutecom/Manifest
@@ -1,5 +1,4 @@
 AUX cutecom-0.51.0-fix-for-qt-5.15.0.patch 615 BLAKE2B a39889b204d87c0812673098985b2d3bad919b10a7d923d589c0b88fa818bce77f5b08d8cf7c221a23f5f61ade8dac36f436c5be99c9b96322a1e4c2ebc4873f SHA512 5cbbb75beb4082be6e1d515b4d37a874d8a507a854e6844b6f0479af02db7575d54020c21e72fc5c2b6670de32b7edad18f7abe4ee69793782acca0ef09e4e05
 DIST cutecom-v0.51.0.tar.bz2 1296457 BLAKE2B 407bbe12fb4303e98589720c3fe9bf96a4112c816e64a3a32227d07a64c1efbb5b33c364d1f3f06ff67c9bc935c0bf62de14849b554508eaffacda1f65e7fad9 SHA512 67857977ab6444509662be4d27059e3c4cb766a69b78d806f4cd3d6cb7306d53094337fb384133a616ae397ac4d4d7c86347285a2d68f88fbf105d73ebd97731
-EBUILD cutecom-0.51.0-r1.ebuild 903 BLAKE2B ee8a14370cf3da79160cb2fa23c5cf6f3f39b33500a62a9a4eca09a0255aff333b337cacef459e8c9b12e47efd130d96d27a065324c18f46583e057231ef6d3c SHA512 3029e2627e2fae6c11ef8e3cf575896780208a5ef6c87a06aa2c12b8baeac08852e7d589222a8add3eeace93ff980aa17d10e37ffd5da81a1f0d12ed5c307ee9
-EBUILD cutecom-0.51.0.ebuild 831 BLAKE2B 5e1beb098a947089ebbb3db370b4d4cc3d5be66902e16f5162209c0a754829206e8283f8a32d409b80e25d92c0ba9fb4cbda1306c8fd8e16b4037a1c2c7b8cfa SHA512 2fe8dfb805a5247375f8127f753f28f6daf33bc0b4ed910696a4f9eaa4025b34f9089bf0f03aa4bce43001e8cd89f05540dbc52076252c28a40769bb6b7bc80c
+EBUILD cutecom-0.51.0-r1.ebuild 872 BLAKE2B 159a3406cab8fc0d9a64aa0212a17ffddda142867810c33cc21f186eeedc4363fef62ba0555551d0952c1833404c1bfdfde1df996c0deb97705b1d0db01e7ec5 SHA512 3d423abf0842d5f92689bca836a64972ddf00f20cb4cec5176f1dcda1c587f1b60a5ec89551bd0ff761affdae00b6c226d770fd8162955fd7da4851c69d93775
 MISC metadata.xml 518 BLAKE2B e409cc5cd2b57e810e408991786f22b93464167b4efe51374e6f4a5be8d5bf80f351ea37b3cd26080f731c53428d3046053ddb1e7192c8129d291a77c718fe76 SHA512 3641e21c8f46af695d3e11a27d3f67a6ef8670fc1d1621d253f2f0555ffc8a30762bf91513e5539177e640253c8f7ec2b574b8c2332a933150664bf2d3ad8880
diff --git a/net-dialup/cutecom/cutecom-0.51.0-r1.ebuild b/net-dialup/cutecom/cutecom-0.51.0-r1.ebuild
index 96ceaa41d2cb..683af0a6bb22 100644
--- a/net-dialup/cutecom/cutecom-0.51.0-r1.ebuild
+++ b/net-dialup/cutecom/cutecom-0.51.0-r1.ebuild
@@ -1,20 +1,21 @@
 # Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=7
 
-inherit cmake-utils eutils xdg
+inherit cmake desktop xdg
 
-DESCRIPTION="CuteCom is a serial terminal, like minicom, written in qt"
+DESCRIPTION="A serial terminal, like minicom, written in Qt"
 HOMEPAGE="https://gitlab.com/cutecom/cutecom"
 SRC_URI="https://gitlab.com/cutecom/cutecom/-/archive/v${PV}/cutecom-v${PV}.tar.bz2"
 
 LICENSE="GPL-3+"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 ~arm64 x86"
 IUSE=""
 
-DEPEND="dev-qt/qtcore:5
+DEPEND="
+	dev-qt/qtcore:5
 	dev-qt/qtgui:5
 	dev-qt/qtnetwork:5
 	dev-qt/qtserialport:5
@@ -24,19 +25,19 @@ RDEPEND="${DEPEND}
 
 S="${WORKDIR}/cutecom-v${PV}"
 
-PATCHES=( "${FILESDIR}"/cutecom-0.51.0-fix-for-qt-5.15.0.patch )
+PATCHES=( "${FILESDIR}"/${P}-fix-for-qt-5.15.0.patch )
 
 src_prepare() {
+	cmake_src_prepare
+
 	sed -i \
 		-e '/Path/d' \
 		-e '/Terminal/s/0/false/' \
 		"${PN}.desktop" || die 'sed on desktop file failed'
-
-	cmake-utils_src_prepare
 }
 
 src_install() {
-	cmake-utils_src_install
+	cmake_src_install
 	domenu "${PN}.desktop"
 	doicon "distribution/${PN}.png"
 }
diff --git a/net-dialup/cutecom/cutecom-0.51.0.ebuild b/net-dialup/cutecom/cutecom-0.51.0.ebuild
deleted file mode 100644
index 9b50680e54e3..000000000000
--- a/net-dialup/cutecom/cutecom-0.51.0.ebuild
+++ /dev/null
@@ -1,40 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit cmake-utils eutils
-
-DESCRIPTION="CuteCom is a serial terminal, like minicom, written in qt"
-HOMEPAGE="https://gitlab.com/cutecom/cutecom"
-SRC_URI="https://gitlab.com/cutecom/cutecom/-/archive/v${PV}/cutecom-v${PV}.tar.bz2"
-
-LICENSE="GPL-3+"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE=""
-
-DEPEND="dev-qt/qtcore:5
-	dev-qt/qtgui:5
-	dev-qt/qtnetwork:5
-	dev-qt/qtserialport:5
-	dev-qt/qtwidgets:5"
-RDEPEND="${DEPEND}
-	net-dialup/lrzsz"
-
-S="${WORKDIR}/cutecom-v${PV}"
-
-src_prepare() {
-	sed -i \
-		-e '/Path/d' \
-		-e '/Terminal/s/0/false/' \
-		"${PN}.desktop" || die 'sed on desktop file failed'
-
-	cmake-utils_src_prepare
-}
-
-src_install() {
-	cmake-utils_src_install
-	domenu "${PN}.desktop"
-	doicon "distribution/${PN}.png"
-}