From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) by finch.gentoo.org (Postfix) with ESMTP id E033C58973 for ; Sun, 31 Jan 2016 01:51:01 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 3879621C03B; Sun, 31 Jan 2016 01:50:59 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id BC53F21C03B for ; Sun, 31 Jan 2016 01:50:58 +0000 (UTC) Received: from oystercatcher.gentoo.org (unknown [IPv6:2a01:4f8:202:4333:225:90ff:fed9:fc84]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id A45D2340AC8 for ; Sun, 31 Jan 2016 01:50:57 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 138FA8E9 for ; Sun, 31 Jan 2016 01:50:55 +0000 (UTC) From: "Matt Thode" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Matt Thode" Message-ID: <1454205027.55dc701ad0c8ff6493abaa13e0b5fae7845f8ff3.prometheanfire@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: www-apps/novnc/files/, www-apps/novnc/ X-VCS-Repository: repo/gentoo X-VCS-Files: www-apps/novnc/files/noVNC.initd www-apps/novnc/novnc-9999.ebuild X-VCS-Directories: www-apps/novnc/files/ www-apps/novnc/ X-VCS-Committer: prometheanfire X-VCS-Committer-Name: Matt Thode X-VCS-Revision: 55dc701ad0c8ff6493abaa13e0b5fae7845f8ff3 X-VCS-Branch: master Date: Sun, 31 Jan 2016 01:50:55 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Archives-Salt: dbaa9a09-5448-4ca7-a790-b10c6033c704 X-Archives-Hash: 611562b33c0c28fbd4c8d8afda66b5c4 commit: 55dc701ad0c8ff6493abaa13e0b5fae7845f8ff3 Author: Matthew Thode gentoo org> AuthorDate: Sun Jan 31 01:50:06 2016 +0000 Commit: Matt Thode gentoo org> CommitDate: Sun Jan 31 01:50:27 2016 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=55dc701a www-apps/novnc: fixing 9999 ebuild Package-Manager: portage-2.2.26 www-apps/novnc/files/noVNC.initd | 1 + www-apps/novnc/novnc-9999.ebuild | 34 +++++++++++++--------------------- 2 files changed, 14 insertions(+), 21 deletions(-) diff --git a/www-apps/novnc/files/noVNC.initd b/www-apps/novnc/files/noVNC.initd index 37367c9..7789b13 100644 --- a/www-apps/novnc/files/noVNC.initd +++ b/www-apps/novnc/files/noVNC.initd @@ -17,6 +17,7 @@ depend() { } checkconfig() { + checkpath -d -m 0750 /var/log/noVNC if [ ! -r /etc/conf.d/${SVCNAME} ]; then eerror "No config file found: /etc/conf.d/${SVCNAME}" return 1 diff --git a/www-apps/novnc/novnc-9999.ebuild b/www-apps/novnc/novnc-9999.ebuild index 95f6992..26e0aa8 100644 --- a/www-apps/novnc/novnc-9999.ebuild +++ b/www-apps/novnc/novnc-9999.ebuild @@ -1,10 +1,12 @@ -# Copyright 1999-2014 Gentoo Foundation +# Copyright 1999-2016 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 # $Id$ EAPI=5 -inherit git-2 +PYTHON_COMPAT=( python2_7 python3_4 ) + +inherit distutils-r1 git-2 DESCRIPTION="noVNC is a VNC client implemented using HTML5 technologies" HOMEPAGE="https://kanaka.github.com/noVNC/" @@ -18,42 +20,32 @@ IUSE="" DEPEND="" RDEPEND="${DEPEND} - dev-python/numpy" - -src_compile() { - cd "${S}/utils" - emake -} + dev-python/websockify[${PYTHON_USEDEP}] + dev-python/numpy[${PYTHON_USEDEP}]" src_install() { - dodir /usr/share/novnc 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/nova-novncproxy - doexe utils/rebind - doexe utils/rebind.so + doexe utils/parse.js doexe utils/u2x11 - doexe utils/web.py - doexe utils/wsproxy.py - doexe utils/websocket.py 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 /usr/share/novnc/images/favicon.ico /usr/share/novnc/ - cp -pPR "*.html" "${D}/usr/share/novnc/" - cp -pPR "include/*" "${D}/usr/share/novnc/include" - cp -pPR "images/*" "${D}/usr/share/novnc/images" newconfd "${FILESDIR}/noVNC.confd" noVNC newinitd "${FILESDIR}/noVNC.initd" noVNC - - diropts -m 0750 - dodir /var/log/noVNC }