Gentoo Archives: gentoo-commits

From: Matt Thode <prometheanfire@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: www-apps/novnc/files/, www-apps/novnc/
Date: Sun, 31 Jan 2016 01:51:01
Message-Id: 1454205027.55dc701ad0c8ff6493abaa13e0b5fae7845f8ff3.prometheanfire@gentoo
1 commit: 55dc701ad0c8ff6493abaa13e0b5fae7845f8ff3
2 Author: Matthew Thode <prometheanfire <AT> gentoo <DOT> org>
3 AuthorDate: Sun Jan 31 01:50:06 2016 +0000
4 Commit: Matt Thode <prometheanfire <AT> gentoo <DOT> org>
5 CommitDate: Sun Jan 31 01:50:27 2016 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=55dc701a
7
8 www-apps/novnc: fixing 9999 ebuild
9
10 Package-Manager: portage-2.2.26
11
12 www-apps/novnc/files/noVNC.initd | 1 +
13 www-apps/novnc/novnc-9999.ebuild | 34 +++++++++++++---------------------
14 2 files changed, 14 insertions(+), 21 deletions(-)
15
16 diff --git a/www-apps/novnc/files/noVNC.initd b/www-apps/novnc/files/noVNC.initd
17 index 37367c9..7789b13 100644
18 --- a/www-apps/novnc/files/noVNC.initd
19 +++ b/www-apps/novnc/files/noVNC.initd
20 @@ -17,6 +17,7 @@ depend() {
21 }
22
23 checkconfig() {
24 + checkpath -d -m 0750 /var/log/noVNC
25 if [ ! -r /etc/conf.d/${SVCNAME} ]; then
26 eerror "No config file found: /etc/conf.d/${SVCNAME}"
27 return 1
28
29 diff --git a/www-apps/novnc/novnc-9999.ebuild b/www-apps/novnc/novnc-9999.ebuild
30 index 95f6992..26e0aa8 100644
31 --- a/www-apps/novnc/novnc-9999.ebuild
32 +++ b/www-apps/novnc/novnc-9999.ebuild
33 @@ -1,10 +1,12 @@
34 -# Copyright 1999-2014 Gentoo Foundation
35 +# Copyright 1999-2016 Gentoo Foundation
36 # Distributed under the terms of the GNU General Public License v2
37 # $Id$
38
39 EAPI=5
40
41 -inherit git-2
42 +PYTHON_COMPAT=( python2_7 python3_4 )
43 +
44 +inherit distutils-r1 git-2
45
46 DESCRIPTION="noVNC is a VNC client implemented using HTML5 technologies"
47 HOMEPAGE="https://kanaka.github.com/noVNC/"
48 @@ -18,42 +20,32 @@ IUSE=""
49
50 DEPEND=""
51 RDEPEND="${DEPEND}
52 - dev-python/numpy"
53 -
54 -src_compile() {
55 - cd "${S}/utils"
56 - emake
57 -}
58 + dev-python/websockify[${PYTHON_USEDEP}]
59 + dev-python/numpy[${PYTHON_USEDEP}]"
60
61 src_install() {
62 - dodir /usr/share/novnc
63 dodir /usr/share/novnc/utils
64 dodir /usr/share/novnc/include
65 dodir /usr/share/novnc/images
66
67 exeinto /usr/share/novnc/utils
68 + doexe utils/b64-to-binary.pl
69 + doexe utils/img2js.py
70 + doexe utils/inflator.partial.js
71 doexe utils/json2graph.py
72 doexe utils/launch.sh
73 - doexe utils/nova-novncproxy
74 - doexe utils/rebind
75 - doexe utils/rebind.so
76 + doexe utils/parse.js
77 doexe utils/u2x11
78 - doexe utils/web.py
79 - doexe utils/wsproxy.py
80 - doexe utils/websocket.py
81
82 docinto /usr/share/novnc/docs
83 dodoc README.md
84 dodoc LICENSE.txt
85
86 + cp -pPR *.html "${D}/usr/share/novnc/"
87 + cp -pPR include/* "${D}/usr/share/novnc/include/"
88 + cp -pPR images/* "${D}/usr/share/novnc/images/"
89 dosym /usr/share/novnc/images/favicon.ico /usr/share/novnc/
90 - cp -pPR "*.html" "${D}/usr/share/novnc/"
91 - cp -pPR "include/*" "${D}/usr/share/novnc/include"
92 - cp -pPR "images/*" "${D}/usr/share/novnc/images"
93
94 newconfd "${FILESDIR}/noVNC.confd" noVNC
95 newinitd "${FILESDIR}/noVNC.initd" noVNC
96 -
97 - diropts -m 0750
98 - dodir /var/log/noVNC
99 }