gentoo resync : 17.02.2018

4 files changed, 6 insertions, 63 deletions

diff --git a/app-editors/Manifest.gz b/app-editors/Manifest.gz
index d1089de46bbe..45050fa6af92 100644
--- a/app-editors/Manifest.gz
+++ b/app-editors/Manifest.gz
diff --git a/app-editors/notepadqq/Manifest b/app-editors/notepadqq/Manifest
index cadf73a75628..094e3030d757 100644
--- a/app-editors/notepadqq/Manifest
+++ b/app-editors/notepadqq/Manifest
@@ -1,6 +1,3 @@
-DIST CodeMirror-5.18.2.tar.gz 923001 BLAKE2B ef3ce5802f1d019a569be03f55d59aa22ebae25b2d6b9e5cd920d7b66ad9e919eb87e212540a6b203f787a39bcdcf22005124ec6f1adbff5ab762b45bac9e901 SHA512 c979c1ef02bb222b08e64847e5caab9c8a525c96d0eef656a00730d6710b0144144ac656eddef05d50c30c7d33da7dffe1a7580b9d47a5d958af9d6484ea705f
-DIST notepadqq-1.0.1.tar.gz 1056249 BLAKE2B cae61f3481cb1f5cc7c2febfc441906786e411267dcc8a2fea382eb789d049ad9c5344482de08c4af5b262c6b8ae405fb96c7041b639ed1830ff8e1ed04d29a5 SHA512 781ddf9960227c4ad21fb7e763180cfed7f1c5c0237277335577932678a42a4c2f303f61922d93ec850dbc86df36c292ff10ae053a6e00d7127a48c7ac4e359c
 DIST notepadqq-1.2.0.tar.gz 2082931 BLAKE2B 41f81be45b5e36d58c2632fc9d03c6802b1a99f5ff9603682f3e1c6907143767f57034f053677d8edffae68a098ddf56d2b90e57fd9884442d80749a670f9d4a SHA512 4b6b3e646add4dc21b4d4ddecacefa59785e6525d52ecc17ca418ba14f38ef9024f48af6db3538d195327942971eb9ccf0b5567da58ba15facad332b47742717
-EBUILD notepadqq-1.0.1.ebuild 1147 BLAKE2B 62210e6bb6be1f701a409b32871f7a646a406c56355254b5b4014336ed1bb0132a6c8c6df230a6015f36af686cc376356516bb2c0c42a0d88e86ccc0964c8b56 SHA512 44c0b195927c434fccc2b5ba7170167321723a846fc513fde27866a0891736559e2343c88553ae0f1763342b40e32a0af0053fea0d8fe028587e4783cddfc063
-EBUILD notepadqq-1.2.0.ebuild 887 BLAKE2B 4f2df76ce775f8f0e12e04cbb8e58b96d663d66edd462f52989648158b48dd386b242666c3849b93ad35600a7f4499b79fb6ed5fe29bcd3b34938d3d51890b88 SHA512 b5cf204d51dea2771f10fc81e24252bc66db68ce92419fc6e0cab724c071c6cbaba87520cbc4d82fbb1606696aa41a00d2b6c0b267fa36d356a5a0fe3a83c115
+EBUILD notepadqq-1.2.0.ebuild 890 BLAKE2B 86363e195a2347add303903a1f9cf3930e0ad09549bc85d9b9dfe65a113c64cffac65a8b43b74458f6c9da6e80fee6252b0d3742f85384e0a5bb860cd92f3c95 SHA512 946d934e8d931a76bb5e958bfd7b46a2713229837a64059c9ea60e7ac790e777de41dc9f5e3cdb634d9ce424bf93942596ca7f16ec28ddc830cc868d85ab4078
 MISC metadata.xml 345 BLAKE2B ae751443c2fd3565e979b52de96cb3804aa010a346fe4d404c2bf69f602a14d70e59af441caa25b5c8a2ed17fdc564539ee196366dc9ff290f7b756ec8121ddc SHA512 90d1d18d81da9f0870d7e41a4c421fb58872861358fa4f095c5b040c6465752898867e47b866750f19f316fdb8fed42bc878e84ced27ddb2503ec142d035f033
diff --git a/app-editors/notepadqq/notepadqq-1.0.1.ebuild b/app-editors/notepadqq/notepadqq-1.0.1.ebuild
deleted file mode 100644
index 9a6ce8d4b4ec..000000000000
--- a/app-editors/notepadqq/notepadqq-1.0.1.ebuild
+++ /dev/null
@@ -1,55 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit qmake-utils
-
-CM_PV="5.18.2"
-
-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
-	https://github.com/${PN}/CodeMirror/archive/${CM_PV}.tar.gz -> CodeMirror-${CM_PV}.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}"
-
-src_unpack() {
-	unpack ${A}
-	rmdir "${S}"/src/editor/libs/codemirror || die
-	mv "${WORKDIR}"/CodeMirror-${CM_PV} "${S}"/src/editor/libs/codemirror \
-		|| die
-}
-
-src_prepare() {
-	default
-
-	# codemirror releases have no m4 directory
-	sed '/mode\/m4/d' -i src/editor/libs/Makefile-codemirror || die
-
-	# 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 -j1 INSTALL_ROOT="${D}" install
-}
diff --git a/app-editors/notepadqq/notepadqq-1.2.0.ebuild b/app-editors/notepadqq/notepadqq-1.2.0.ebuild
index 7710405ccb60..cbebd28ae63f 100644
--- a/app-editors/notepadqq/notepadqq-1.2.0.ebuild
+++ b/app-editors/notepadqq/notepadqq-1.2.0.ebuild
@@ -1,12 +1,10 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
 
 inherit qmake-utils xdg-utils
 
-CM_PV="5.18.2"
-
 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"
@@ -24,7 +22,10 @@ RDEPEND="
 	dev-qt/qtwebkit:5
 	dev-qt/qtwidgets:5
 "
-DEPEND="${RDEPEND}"
+DEPEND="
+	${RDEPEND}
+	dev-qt/qtsvg:5
+"
 
 src_prepare() {
 	default