[gentoo-commits] repo/gentoo:master commit in: www-apps/novnc/

[Matthew Thode]

commit:     02545210596189e16d3ea626fa06dc3f9757a646
Author:     Matthew Thode <prometheanfire <AT> gentoo <DOT> org>
AuthorDate: Thu Apr 23 19:29:50 2020 +0000
Commit:     Matthew Thode <prometheanfire <AT> gentoo <DOT> org>
CommitDate: Thu Apr 23 19:36:34 2020 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=02545210

www-apps/novnc: 1.1.0 stable amd64/x86 with cleanup

Package-Manager: Portage-2.3.89, Repoman-2.3.20
Signed-off-by: Matthew Thode <prometheanfire <AT> gentoo.org>

 www-apps/novnc/Manifest              |  1 -
 www-apps/novnc/novnc-0.6.2-r1.ebuild | 47 -------------------------------
 www-apps/novnc/novnc-0.6.2.ebuild    | 54 ------------------------------------
 www-apps/novnc/novnc-1.1.0.ebuild    |  2 +-
 4 files changed, 1 insertion(+), 103 deletions(-)

diff --git a/www-apps/novnc/Manifest b/www-apps/novnc/Manifest
index 5f0a899a2ff..a8f2de94299 100644
--- a/www-apps/novnc/Manifest
+++ b/www-apps/novnc/Manifest
@@ -1,3 +1,2 @@
-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

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 f06cf37a8b6..00000000000
--- 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 cf46ba67c5d..00000000000
--- 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 734f516e33b..a09ba239293 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