gentoo Easter resync : 12.04.2020

6 files changed, 21 insertions, 142 deletions

diff --git a/app-editors/notepadqq/Manifest b/app-editors/notepadqq/Manifest
index 78f1ac616023..fa67bdfaadfe 100644
--- a/app-editors/notepadqq/Manifest
+++ b/app-editors/notepadqq/Manifest
@@ -1,8 +1,4 @@
-AUX notepadqq-1.4.8-qt-5.11-QDateTime.patch 682 BLAKE2B 34bf2eed6c5499f79caacdcb51e3ec1d09951bafb38f3a66308a33d5cc3724c36787aa7fed21bd1eb23b34517572d0898274d03b2963dd420fd7210a669f2b39 SHA512 a80234dfe6308ac223ce8e9a8117e06b93d1f13034c978a2024c938699864d4609e20a9f077c2bc988ccbf7cb957744068b65e93e5d53c0e5f98abe635e8184f
-AUX notepadqq-1.4.8-qt-5.11.patch 664 BLAKE2B 442012f9ad0046abf7ed6206d69db42b49b0f9d407ae99a4e7a6df0d5340dfadd664a3e8f97a90beb41014bba668174ca6090c9ad46dd090013ca3ffa07d03f5 SHA512 584e7f4c4032719c42eafcc9ff23031c7e980084aeac3044669a136be33ebc4fe0b6e6e61dbf1a70195953949ac05fae9150f97fb369bc9399ddae099a744549
-DIST notepadqq-1.2.0.tar.gz 2082931 BLAKE2B 41f81be45b5e36d58c2632fc9d03c6802b1a99f5ff9603682f3e1c6907143767f57034f053677d8edffae68a098ddf56d2b90e57fd9884442d80749a670f9d4a SHA512 4b6b3e646add4dc21b4d4ddecacefa59785e6525d52ecc17ca418ba14f38ef9024f48af6db3538d195327942971eb9ccf0b5567da58ba15facad332b47742717
-DIST notepadqq-1.4.8.tar.gz 4418925 BLAKE2B 91d993fd952609a7255c6541e97580b5dd01e6902cb6a84b77da7fbf8bc52a9a07ba85845d33e5801d539d8c560804b69947df965550dfb981e228330ea46ffd SHA512 fa1937b75a378fb81486a871a5b736f6ba216cd4b71f99e342e457de65ea034c2ee4d2c9f42754c4737671ccb1083fb1e6c946240ab2094042125430578141fa
-EBUILD notepadqq-1.2.0.ebuild 929 BLAKE2B b21202f5e541df1bac7d48ed0e0bf59b9d99a70dba3b26fbadb0febcb8c8c90d7c5fc5bbe275c7c723275ce14557ff2a42a3ef01dd0343fd06e2ab420dbd3d31 SHA512 f7eea0a23d1027da845a86a07fefab372dd1cd3dbcca990b73a014127e23a6a72dbffa5d58f818224d56f6422f22d346fc14bbbad0a286fada7c2373967538bd
-EBUILD notepadqq-1.4.8.ebuild 1104 BLAKE2B fea940bb98eb1fdc902ccf6ce0ded0ff606705c4aa50bdace255f887dbc22bcbf60b843690a06e693799c5772c80f8ff61676bbde38332cf712f4108f75e55ab SHA512 00dabd3049c1b8a1e2401e4c22761cc3a56d2d37f53a72deb0013508418818247ace97e98cfe74a42d4b30772f2675f5b16e295733a3f23ac46317596f734cc2
-EBUILD notepadqq-9999.ebuild 1092 BLAKE2B 3b7a60dc54f044342a6c6c1ce5b85f66aa8577eb31df81e543be9a8eb81f53ae1204e0a6d1542910bd88b7ca9ae1680c2626525b20fe13835ded6d1a96224f0c SHA512 8904cab648cf44213d0436c13f45e261426cba1bfe40ab3caf33dbb9dd40f76432adc74811b7d70f4995dde84298c439947816ae6302557ffaffe14a1c361d20
+DIST notepadqq-2.0.0_beta.tar.gz 4516680 BLAKE2B 9a16ab64134ab0d33a68cc528db6a50b8860c391130667a9213e3aa941e115b1e3acae5833ce4b8b52fc81aa8997c5389f5920cde86171cf5d960a7f58dbea99 SHA512 b2ae3493da1512f5f2e42ffc90529f3acfe81d75b7dd6e476f41b94e9b39e02c6fe355ea5ad40460d644ed76bca695d451721e19738c251c8ecb8acc0c0fb061
+EBUILD notepadqq-2.0.0_beta.ebuild 1042 BLAKE2B 8d3ea345c3a4d3c9ca34bfff72a2549e0a1ecc0df102e64e2bb6e3bce77661e877ba2ba5e3e1168f1225433a8eb92b9e97107c072782c3810aa6dd0c3e14da8c SHA512 3faf879c48ca8375a344e8fa14edf980aba4bdc49e3c38130feb00ce8fc37947c107ebb38221cbae3ad8ab2e72bb4bc790e88019d93fb591283eeb9df15aa2dc
+EBUILD notepadqq-9999.ebuild 1042 BLAKE2B 8d3ea345c3a4d3c9ca34bfff72a2549e0a1ecc0df102e64e2bb6e3bce77661e877ba2ba5e3e1168f1225433a8eb92b9e97107c072782c3810aa6dd0c3e14da8c SHA512 3faf879c48ca8375a344e8fa14edf980aba4bdc49e3c38130feb00ce8fc37947c107ebb38221cbae3ad8ab2e72bb4bc790e88019d93fb591283eeb9df15aa2dc
 MISC metadata.xml 345 BLAKE2B ae751443c2fd3565e979b52de96cb3804aa010a346fe4d404c2bf69f602a14d70e59af441caa25b5c8a2ed17fdc564539ee196366dc9ff290f7b756ec8121ddc SHA512 90d1d18d81da9f0870d7e41a4c421fb58872861358fa4f095c5b040c6465752898867e47b866750f19f316fdb8fed42bc878e84ced27ddb2503ec142d035f033
diff --git a/app-editors/notepadqq/files/notepadqq-1.4.8-qt-5.11-QDateTime.patch b/app-editors/notepadqq/files/notepadqq-1.4.8-qt-5.11-QDateTime.patch
deleted file mode 100644
index d0158c33527c..000000000000
--- a/app-editors/notepadqq/files/notepadqq-1.4.8-qt-5.11-QDateTime.patch
+++ /dev/null
@@ -1,25 +0,0 @@
-From 8d5dc3dfb279f8420457fbc04a3ff6fb5f3f8a21 Mon Sep 17 00:00:00 2001
-From: Andreas Sturmlechner <andreas.sturmlechner@gmail.com>
-Date: Tue, 26 Feb 2019 00:47:26 +0100
-Subject: [PATCH] Fix build with Qt 5.11 (add missing QDateTime include)
-
-Downstream report: https://bugs.gentoo.org/668392
----
- src/ui/stats.cpp | 1 +
- 1 file changed, 1 insertion(+)
-
-diff --git a/src/ui/stats.cpp b/src/ui/stats.cpp
-index 59837c9..e0f3cbd 100644
---- a/src/ui/stats.cpp
-+++ b/src/ui/stats.cpp
-@@ -3,6 +3,7 @@
- #include <QNetworkAccessManager>
- #include <QJsonDocument>
- #include <QNetworkRequest>
-+#include <QDateTime>
- #include <QNetworkReply>
- #include <QSysInfo>
- #include <QTimer>
--- 
-2.21.0
-
diff --git a/app-editors/notepadqq/files/notepadqq-1.4.8-qt-5.11.patch b/app-editors/notepadqq/files/notepadqq-1.4.8-qt-5.11.patch
deleted file mode 100644
index d656bd920940..000000000000
--- a/app-editors/notepadqq/files/notepadqq-1.4.8-qt-5.11.patch
+++ /dev/null
@@ -1,26 +0,0 @@
-Bug: https://bugs.gentoo.org/665286
-
-From 8fabccfe2682583f5190b84dbc1922cce9c8d82b Mon Sep 17 00:00:00 2001
-From: Michael Palimaka <kensington@gentoo.org>
-Date: Thu, 11 Oct 2018 23:23:08 +1100
-Subject: [PATCH] Add missing include.
-
----
- src/ui/EditorNS/languageservice.cpp | 1 +
- 1 file changed, 1 insertion(+)
-
-diff --git a/src/ui/EditorNS/languageservice.cpp b/src/ui/EditorNS/languageservice.cpp
-index bbe03dc..9a0f212 100644
---- a/src/ui/EditorNS/languageservice.cpp
-+++ b/src/ui/EditorNS/languageservice.cpp
-@@ -6,6 +6,7 @@
- #include <QJsonDocument>
- #include <QJsonObject>
- #include <QJsonValue>
-+#include <QTextStream>
- 
- namespace EditorNS {
- 
--- 
-2.18.1
-
diff --git a/app-editors/notepadqq/notepadqq-1.2.0.ebuild b/app-editors/notepadqq/notepadqq-1.2.0.ebuild
deleted file mode 100644
index fbdfbecdd1d7..000000000000
--- a/app-editors/notepadqq/notepadqq-1.2.0.ebuild
+++ /dev/null
@@ -1,55 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit qmake-utils xdg-utils
-
-DESCRIPTION="Notepad++-like editor for Linux"
-HOMEPAGE="http://notepadqq.altervista.org"
-SRC_URI="https://github.com/${PN}/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="GPL-3+"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND="
-	dev-qt/qtcore:5
-	dev-qt/qtgui:5
-	dev-qt/qtnetwork:5
-	dev-qt/qtprintsupport:5
-	dev-qt/qtwebkit:5
-	dev-qt/qtwidgets:5
-"
-DEPEND="
-	${RDEPEND}
-	dev-qt/linguist-tools:5
-	dev-qt/qtsvg:5
-	dev-qt/qttest:5
-"
-
-src_prepare() {
-	default
-
-	# Silence a QA warning
-	sed '/^OnlyShowIn/d' \
-		-i support_files/shortcuts/notepadqq.desktop \
-		|| die
-}
-
-src_configure() {
-	eqmake5 PREFIX="${EPREFIX}/usr" ${PN}.pro
-}
-
-src_install() {
-	emake INSTALL_ROOT="${D}" install
-}
-
-pkg_postinst() {
-	xdg_desktop_database_update
-}
-
-pkg_postrm() {
-	xdg_desktop_database_update
-}
diff --git a/app-editors/notepadqq/notepadqq-1.4.8.ebuild b/app-editors/notepadqq/notepadqq-2.0.0_beta.ebuild
index 804533a3e34b..2da7d1d0936a 100644
--- a/app-editors/notepadqq/notepadqq-1.4.8.ebuild
+++ b/app-editors/notepadqq/notepadqq-2.0.0_beta.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=6
+EAPI=7
 
-inherit qmake-utils xdg-utils
+inherit qmake-utils xdg
 
 DESCRIPTION="Notepad++-like editor for Linux"
 HOMEPAGE="http://notepadqq.altervista.org"
@@ -11,8 +11,9 @@ if [[ "${PV}" == 9999 ]] ; then
 	inherit git-r3
 	EGIT_REPO_URI="https://github.com/notepadqq/notepadqq.git"
 else
-	SRC_URI="https://github.com/${PN}/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+	SRC_URI="https://github.com/${PN}/${PN}/archive/v${PV/_/-}.tar.gz -> ${P}.tar.gz"
 	KEYWORDS="~amd64 ~x86"
+	S="${WORKDIR}/${P/_/-}"
 fi
 
 LICENSE="GPL-3+"
@@ -20,21 +21,23 @@ SLOT="0"
 IUSE=""
 
 RDEPEND="
+	app-i18n/uchardet
 	dev-qt/qtcore:5
 	dev-qt/qtgui:5
 	dev-qt/qtnetwork:5
 	dev-qt/qtprintsupport:5
-	dev-qt/qtwebkit:5
+	dev-qt/qtsvg:5
+	dev-qt/qtwebchannel:5
+	dev-qt/qtwebengine:5
 	dev-qt/qtwidgets:5
 "
-DEPEND="${RDEPEND}
+DEPEND="
+	${RDEPEND}
 	dev-qt/linguist-tools:5
-	dev-qt/qtsvg:5
 	dev-qt/qttest:5
+	dev-qt/qtwebsockets:5
 "
 
-PATCHES=( "${FILESDIR}"/${P}-qt-5.11{,-QDateTime}.patch )
-
 src_prepare() {
 	default
 
@@ -51,11 +54,3 @@ src_configure() {
 src_install() {
 	emake INSTALL_ROOT="${D}" install
 }
-
-pkg_postinst() {
-	xdg_desktop_database_update
-}
-
-pkg_postrm() {
-	xdg_desktop_database_update
-}
diff --git a/app-editors/notepadqq/notepadqq-9999.ebuild b/app-editors/notepadqq/notepadqq-9999.ebuild
index f906b948b04b..2da7d1d0936a 100644
--- a/app-editors/notepadqq/notepadqq-9999.ebuild
+++ b/app-editors/notepadqq/notepadqq-9999.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 qmake-utils xdg-utils
+inherit qmake-utils xdg
 
 DESCRIPTION="Notepad++-like editor for Linux"
 HOMEPAGE="http://notepadqq.altervista.org"
@@ -11,8 +11,9 @@ if [[ "${PV}" == 9999 ]] ; then
 	inherit git-r3
 	EGIT_REPO_URI="https://github.com/notepadqq/notepadqq.git"
 else
-	SRC_URI="https://github.com/${PN}/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+	SRC_URI="https://github.com/${PN}/${PN}/archive/v${PV/_/-}.tar.gz -> ${P}.tar.gz"
 	KEYWORDS="~amd64 ~x86"
+	S="${WORKDIR}/${P/_/-}"
 fi
 
 LICENSE="GPL-3+"
@@ -25,6 +26,7 @@ RDEPEND="
 	dev-qt/qtgui:5
 	dev-qt/qtnetwork:5
 	dev-qt/qtprintsupport:5
+	dev-qt/qtsvg:5
 	dev-qt/qtwebchannel:5
 	dev-qt/qtwebengine:5
 	dev-qt/qtwidgets:5
@@ -32,8 +34,8 @@ RDEPEND="
 DEPEND="
 	${RDEPEND}
 	dev-qt/linguist-tools:5
-	dev-qt/qtsvg:5
 	dev-qt/qttest:5
+	dev-qt/qtwebsockets:5
 "
 
 src_prepare() {
@@ -52,11 +54,3 @@ src_configure() {
 src_install() {
 	emake INSTALL_ROOT="${D}" install
 }
-
-pkg_postinst() {
-	xdg_desktop_database_update
-}
-
-pkg_postrm() {
-	xdg_desktop_database_update
-}