gentoo resync : 25.04.2020

4 files changed, 2 insertions, 106 deletions

diff --git a/www-apps/novnc/Manifest b/www-apps/novnc/Manifest
index 619700e2aa9d..d6bf0f60337e 100644
--- a/www-apps/novnc/Manifest
+++ b/www-apps/novnc/Manifest
@@ -1,11 +1,8 @@
 AUX noVNC.confd 104 BLAKE2B da90c8f2ae649e65bbbcd8c894581d0dd187bfbb8bbb20393eb67ee1bef12c98890bce9ff3cf0731bed21bb844cc4f02ae363b75173d16d13e891d5512d45ac3 SHA512 9e784f668965b55b562b020fb32d4674267583647b950dd19aa297856b5a4509f2a7b9891e9575bc823a379aa237d4499dfeb1a2b2f537052e5ae471828e888f
 AUX noVNC.initd 697 BLAKE2B 18032906a808e14944dfae2eddc6bbdb22dbbf620ec307a892e077e818a2e4e4c056c05c7cf8bae6d8ce0818dc8c48a6ccc4c42972a5b47862b96933d8536c7a SHA512 8b131686c5add6e7ea859ba433a325ff7f0b9a5c9a11199f0d4025229e56e2c5e725ebfa2cde146f5df4b8bd4b71cdde1f08e87d0217d61bb18b683221b4595a
-DIST novnc-0.6.2.tar.gz 600675 BLAKE2B f9779a9f03ba653f77090639112cd0c967ff5925d2f9897da6508fd077fb79a2f543467e32210572935a642e06fbbcac4a44c34b4342474f54ef7ec7a9bdbf4f SHA512 245d205f8935c82722a55d6cfcd2cea1825176c0cd695fd0eec34aa19cdc3b766fed62e741ff41b0a8c4a3b3cbabc5a39dfa6ad8ffa6169f5b88420a4a845a7c
 DIST novnc-1.0.0.tar.gz 1551574 BLAKE2B 58bd63eb0480b3f20ed16907725e0abcf8c699671614dc195f46a363d6ab9cdb5b0b033ba0ba16bbe39b16437fb94f64a741acd69d1c3c3957a0e60353d78a89 SHA512 97a86be5f10f382e2ed641360f5f6c3b22998f68f980c78138aca900ef6a011c1f6aa9cbdd8cd07afd4884e8c65af30d65487e87bb34e524c10f16cf4cd116a3
 DIST novnc-1.1.0.tar.gz 1034997 BLAKE2B 0cb920cac99c3567cbf1c6a58e12649d4bca211d552a472a73ac1089d7c8a18d9478dcfeb558b6302c0c74d321b62575c35a492b02717dc4721b6a9b42f54415 SHA512 9c736912f5a3051027efe779fc64b182f523b9378ff412d78202e52665772678846d97fe3cc5ac18f5c29dd83d5ff2a2dd915e5eadf9af3573fe871db2e7821e
-EBUILD novnc-0.6.2-r1.ebuild 991 BLAKE2B 8a4b47a198513cb0856ac4b99053afd019e422dbddba555d2a4c664a920207e81ff3d309bb99cb7f65a96f372a36bcf0065675c358771bb92c6448f34ec42180 SHA512 1e9fc9f941265ec4d9ea64aa7f3c6bf577ecd6a1e839358632bb30e15dd191d179d3f9d8cb5796142caa521145d0bcd6ff942a88ed337b72dec986e6a6dfefa2
-EBUILD novnc-0.6.2.ebuild 1281 BLAKE2B 16b0c9ef78683cbfefa5218b77a191cfb20fa7abcc21bba7a38366ce2fc3679b138aeab19b6a85b87e217b34f959cf117256b0d2fbc14a1f53d0517fe118d3c5 SHA512 180fe3d50d42842654eea4b6d4b759b6a325383a5b7ccbcebfe87ed244b1ffd339863b5f2846ab155067f427d46fd28285acbb629af77872f80984b9cd44a019
 EBUILD novnc-1.0.0.ebuild 1034 BLAKE2B 50a1ff242ad4631de546c4467d8966ddb7101c596dcd3c73226fc20bb9f659d28d7e86e14e24533649567f90bf87c1f30a9a162598681037aa27c0666f2adbf3 SHA512 f685a561f3b4775528f1f3627457f2a4a58bf6ab8d61ae0a4312a0168982c2040e26cc76c47d2af8c1679fc4fea61eadfdb26846a0641b539fd91b78933a1c39
-EBUILD novnc-1.1.0.ebuild 1079 BLAKE2B 7fd735a9152a25fabcbe6c66f11fe7604d33d92b4ca8eb35a7a27e599390801716548ab8425ae05978e44f02e4bffadd55a4a720a773416dc025e846c5a802d7 SHA512 675a07c11d7283cb5952b9c1c2aa40f4994b755539e7cdb20f362384e143d121f014116aa9b094570f7b5b492c2ebc98d54ffde7696902b9ba722bb23c7dd5c0
+EBUILD novnc-1.1.0.ebuild 1077 BLAKE2B 076cf8ab1d2c3456fbc3b446bcbc070f88d90d8d61f098ebb1a844c0c66b4ffd76bc9c055c9d4102b0af39b04a15e00d9f8546050a029eb3a156d2e39524cb03 SHA512 8429491e1fe0d985e4f95639e35f7014c4c9c576478b84a08979ed72efebec44288c5602c6fb8a98ba30400633250e571362e947dc337a89e5ce76370577308a
 EBUILD novnc-9999.ebuild 1079 BLAKE2B 7fd735a9152a25fabcbe6c66f11fe7604d33d92b4ca8eb35a7a27e599390801716548ab8425ae05978e44f02e4bffadd55a4a720a773416dc025e846c5a802d7 SHA512 675a07c11d7283cb5952b9c1c2aa40f4994b755539e7cdb20f362384e143d121f014116aa9b094570f7b5b492c2ebc98d54ffde7696902b9ba722bb23c7dd5c0
 MISC metadata.xml 341 BLAKE2B 11a60501b1f7725f315055b98ecda3928e1755ad88983b8c7c4900ba053325ecb030b68e70e453c2860e67ec13337918da68422cb5c5cd432fda06b2a8027c70 SHA512 a41f01affc9fcb0cf61dba100f01ffe730a1278218c120f6a7d2c699a13d24868b6f7936c8ed5a28625e7c68a646e99556e745cead53c676037a5acbc92ffba8
diff --git a/www-apps/novnc/novnc-0.6.2-r1.ebuild b/www-apps/novnc/novnc-0.6.2-r1.ebuild
deleted file mode 100644
index f06cf37a8b68..000000000000
--- a/www-apps/novnc/novnc-0.6.2-r1.ebuild
+++ /dev/null
@@ -1,47 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python3_6 )
-
-inherit distutils-r1
-
-DESCRIPTION="noVNC is a VNC client implemented using HTML5 technologies"
-HOMEPAGE="https://kanaka.github.com/noVNC/"
-
-if [[ ${PV} == 9999 ]] ; then
-	inherit git-r3
-	EGIT_REPO_URI="https://github.com/kanaka/noVNC.git"
-else
-	SRC_URI="https://github.com/kanaka/noVNC/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="~amd64 ~arm64 ~x86 ~amd64-linux ~x86-linux"
-fi
-
-S="${WORKDIR}/noVNC-${PV}"
-
-LICENSE="LGPL-3"
-SLOT="0"
-IUSE=""
-
-DEPEND=""
-RDEPEND="${DEPEND}
-	dev-python/websockify[${PYTHON_USEDEP}]
-	dev-python/numpy[${PYTHON_USEDEP}]"
-
-python_compile() {
-	echo
-}
-
-src_install() {
-	exeinto /usr/share/novnc/utils
-	for f in utils/*; do
-		[[ ! $f = utils/README.md ]] && doexe $f
-	done
-
-	dodoc README.md LICENSE.txt
-
-	insinto /usr/share/novnc
-	doins -r *.html include/ images/
-	dosym images/favicon.ico /usr/share/novnc/favicon.ico
-}
diff --git a/www-apps/novnc/novnc-0.6.2.ebuild b/www-apps/novnc/novnc-0.6.2.ebuild
deleted file mode 100644
index cf46ba67c5d5..000000000000
--- a/www-apps/novnc/novnc-0.6.2.ebuild
+++ /dev/null
@@ -1,54 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python3_6 )
-
-inherit distutils-r1
-
-DESCRIPTION="noVNC is a VNC client implemented using HTML5 technologies"
-HOMEPAGE="https://kanaka.github.com/noVNC/"
-SRC_URI="https://github.com/kanaka/noVNC/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-S="${WORKDIR}/noVNC-${PV}"
-
-LICENSE="LGPL-3"
-SLOT="0"
-KEYWORDS="amd64 ~arm64 x86 ~amd64-linux ~x86-linux"
-IUSE=""
-
-DEPEND=""
-RDEPEND="${DEPEND}
-	dev-python/websockify[${PYTHON_USEDEP}]
-	dev-python/numpy[${PYTHON_USEDEP}]"
-
-python_compile() {
-	echo
-}
-
-src_install() {
-	dodir /usr/share/novnc/utils
-	dodir /usr/share/novnc/include
-	dodir /usr/share/novnc/images
-
-	exeinto /usr/share/novnc/utils
-	doexe utils/b64-to-binary.pl
-	doexe utils/img2js.py
-	doexe utils/inflator.partial.js
-	doexe utils/json2graph.py
-	doexe utils/launch.sh
-	doexe utils/parse.js
-	doexe utils/u2x11
-
-	docinto /usr/share/novnc/docs
-	dodoc README.md
-	dodoc LICENSE.txt
-
-	cp -pPR *.html "${D}/usr/share/novnc/"
-	cp -pPR include/* "${D}/usr/share/novnc/include/"
-	cp -pPR images/* "${D}/usr/share/novnc/images/"
-	dosym images/favicon.ico /usr/share/novnc/favicon.ico
-
-	newconfd "${FILESDIR}/noVNC.confd" noVNC
-	newinitd "${FILESDIR}/noVNC.initd" noVNC
-}
diff --git a/www-apps/novnc/novnc-1.1.0.ebuild b/www-apps/novnc/novnc-1.1.0.ebuild
index 734f516e33b9..a09ba2392930 100644
--- a/www-apps/novnc/novnc-1.1.0.ebuild
+++ b/www-apps/novnc/novnc-1.1.0.ebuild
@@ -15,7 +15,7 @@ if [[ ${PV} == 9999 ]] ; then
 	EGIT_REPO_URI="https://github.com/kanaka/noVNC.git"
 else
 	SRC_URI="https://github.com/kanaka/noVNC/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="~amd64 ~arm64 ~x86 ~amd64-linux ~x86-linux"
+	KEYWORDS="amd64 ~arm64 x86 ~amd64-linux ~x86-linux"
 	S="${WORKDIR}/noVNC-${PV}"
 fi