summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMatthew Thode <prometheanfire@gentoo.org>2013-09-30 14:41:39 +0000
committerMatthew Thode <prometheanfire@gentoo.org>2013-09-30 14:41:39 +0000
commit3f47891d674c4fe2a0c66e7e0d760e6a95492fbc (patch)
tree62ff1aee3443ac3f7f9beec7c1b2362fabfc1b57 /www-apps
parentVersion bump, thanks to 0xd34df00d. Drop old (diff)
downloadgentoo-2-3f47891d674c4fe2a0c66e7e0d760e6a95492fbc.tar.gz
gentoo-2-3f47891d674c4fe2a0c66e7e0d760e6a95492fbc.tar.bz2
gentoo-2-3f47891d674c4fe2a0c66e7e0d760e6a95492fbc.zip
better ebuilds for us all bug 486568
(Portage version: 2.1.12.2/cvs/Linux x86_64, signed Manifest commit with key 0x2471eb3e40ac5ac3)
Diffstat (limited to 'www-apps')
-rw-r--r--www-apps/novnc/ChangeLog6
-rw-r--r--www-apps/novnc/metadata.xml15
-rw-r--r--www-apps/novnc/novnc-0.4.ebuild40
3 files changed, 23 insertions, 38 deletions
diff --git a/www-apps/novnc/ChangeLog b/www-apps/novnc/ChangeLog
index a4598721a70d..b259af94c22c 100644
--- a/www-apps/novnc/ChangeLog
+++ b/www-apps/novnc/ChangeLog
@@ -1,6 +1,10 @@
# ChangeLog for www-apps/novnc
# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/www-apps/novnc/ChangeLog,v 1.1 2013/09/27 01:39:57 prometheanfire Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-apps/novnc/ChangeLog,v 1.2 2013/09/30 14:41:39 prometheanfire Exp $
+
+ 30 Sep 2013; Matthew Thode <prometheanfire@gentoo.org> metadata.xml,
+ novnc-0.4.ebuild:
+ better ebuilds for us all bug 486568
*novnc-0.4 (27 Sep 2013)
*novnc-9999 (27 Sep 2013)
diff --git a/www-apps/novnc/metadata.xml b/www-apps/novnc/metadata.xml
index 214c4eafc144..9cf505ad0218 100644
--- a/www-apps/novnc/metadata.xml
+++ b/www-apps/novnc/metadata.xml
@@ -1,10 +1,13 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
-<maintainer>
-<email>prometheanfire@gentoo.org</email>
-<name>Matthew Thode</name>
-</maintainer>
-<longdescription lang="en">
-</longdescription>
+ <maintainer>
+ <email>prometheanfire@gentoo.org</email>
+ <name>Matthew Thode</name>
+ </maintainer>
+ <longdescription lang="en">
+ </longdescription>
+ <use>
+ <flag name="nova">Installs Openstack Nova for it's libraries</flag>
+ </use>
</pkgmetadata>
diff --git a/www-apps/novnc/novnc-0.4.ebuild b/www-apps/novnc/novnc-0.4.ebuild
index 5225a39bb0b6..b9fcd2dac555 100644
--- a/www-apps/novnc/novnc-0.4.ebuild
+++ b/www-apps/novnc/novnc-0.4.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2013 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/www-apps/novnc/novnc-0.4.ebuild,v 1.1 2013/09/27 01:39:57 prometheanfire Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-apps/novnc/novnc-0.4.ebuild,v 1.2 2013/09/30 14:41:39 prometheanfire Exp $
EAPI=5
@@ -9,45 +9,23 @@ HOMEPAGE="http://kanaka.github.com/noVNC/"
SRC_URI="https://github.com/kanaka/noVNC/archive/v${PV}.tar.gz"
S="${WORKDIR}/noVNC-${PV}"
-LICENSE="LGPL-3"
+LICENSE="MPL-2.0"
SLOT="0"
KEYWORDS="~amd64 ~x86"
-IUSE=""
+IUSE="nova"
DEPEND=""
RDEPEND="${DEPEND}
- dev-python/numpy"
-
-src_compile() {
- cd "${S}/utils"
- emake
-}
+ dev-python/websockify
+ dev-python/matplotlib
+ dev-python/numpy
+ nova? ( sys-cluster/nova )"
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/json2graph.py
- doexe utils/launch.sh
- doexe utils/nova-novncproxy
- doexe utils/rebind
- doexe utils/rebind.so
- doexe utils/u2x11
- doexe utils/web.py
- doexe utils/wsproxy.py
- doexe utils/websocket.py
-
- docinto /usr/share/novnc/docs
+ insinto /usr/share/novnc
+ doins -r *.html images include
dodoc README.md
- dodoc LICENSE.txt
-
- 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