upgrade opennebula and clean old versions

6 files changed, 33 insertions, 585 deletions

diff --git a/app-emulation/opennebula/Manifest b/app-emulation/opennebula/Manifest
index 2f9179d..43fea72 100644
--- a/app-emulation/opennebula/Manifest
+++ b/app-emulation/opennebula/Manifest
@@ -20,17 +20,12 @@ AUX tmpfilesd.opennebula.conf 85 BLAKE2B f9a99645c91bd1c700f2bcb8c2fb7b2d775d3e3
 AUX websocket.py.diff 274 BLAKE2B f2c961bb29bc745a0b6fee43fa77a2ccdd26454dfcb50a0f8e3b24505f2b0df3fc6efacf30216434e76bdca0789eeff6377172d96f6f97f0a2be54d7a5a854ca SHA512 37536922c0160ee36b115f8ccfce54f2eef589f1a10df8022316247e996ccf542e193f7af13c8c00f89ab4993008a5d6f31561ccafbc0e6e4dd14eeb9ac2ea29
 AUX websocketproxy.py.diff 291 BLAKE2B 5ceb2e09830119b11b4ad319eeef3167d28808457b2f1a3e869225e4ddf87f05e6fcce377f9f9742435b173dee1f82cdf4fcf7fedf2a23f5eee4448fc5e8e540 SHA512 3c176c8709d28a2b506cb915bc00947b031e621267650b7282e26ffaf810f3a5aa128576c9cebd7cec0f320f6a173a4f8aa723898d7d5fdcf7710d484da1416a
 DIST opennebula-4.14.2.tar.gz 9283555 BLAKE2B 4e9dfdfc3f4ea6270003540bb97ecbaee7d26ce3cfcf08e85244d91658bfe3bdb8181111d6661b982bd8445409d743359ef5deb5d47afac7fec7de5ee93b2836 SHA512 ed572bf1a6e0a4eecb85c1f2beb1f686e6729f74a354f41dbb5113fd089af06013f63d022ee8c068234e5be64df818771a0ba0c452ffbf4fd096dd16cf878926
-DIST opennebula-5.0.2.tar.gz 12041225 BLAKE2B a834421b6fd9a67cc8c0d0ffc2e3d4f6d7f7a74f46d0f22b93e1f6225bddd4c17c9427234ea44925dcee50499db94648cd69c1f20ef139e0ec74a1a7dd83d7e6 SHA512 95d61476538e32b75c3ac870c4ba19e4f352a90e1d6e76355efab4f4679291ba2fcd223ec39f9b3cbd29bc5c5c7a5388c1c402c5c84b22f81729ff240b6d34b6
-DIST opennebula-5.2.0.tar.gz 12220329 BLAKE2B d23ff242b0b0170fbbfa339118335ea0f44f65d2335f8cff2dad998f19f867884f6bcdf626e30ee091b359e8012546a15403240bf4f8138778bfc6209961a967 SHA512 e0095bb452198bbd72e946651a004005c0315137b9a7093226298138226f59630147e07ec66766ac8def74a580dc4f1f5d90739033d445b61d8f98fc2239ab58
-DIST opennebula-5.2.1.tar.gz 12224129 BLAKE2B 5dd4c4cbdbd91e1054a92d1a3c068e97921608b47e87a0d24831e3062021961716108b5f49b068bc4fff4be2aec4727a8850a8ad7ec78ec1a159ba1d3ff3c021 SHA512 f46d722b6fbea4406000dafeb0ed3d26c61e35645a8de028c39d160879af5ab93352a8f2407fc637b39d5a600d39015be3cc29af32d9fc69a678a8e8cf4f7400
 DIST opennebula-5.4.1.tar.gz 14652947 BLAKE2B 299cc960debea0032e597b027ae73ff96c1d1262825e5797fabb98cbec3e2b15413ac97c38ec16c71cc0a0a6ea64447dac20cab7fcc73c4f2e6aa09f3855d801 SHA512 e6660c44c7fcb1d32077b483814ccaad03bca0f6264671548b6ef9cc60f544b134ea3d9ade13a959340bb1f8c94cf08c8246ea929073cf89d6ee35f8b2e19904
+DIST opennebula-5.4.13.tar.gz 14579822 BLAKE2B 66c6267a6b4ef5754f1f782245ef0708ab2ac1efd2a28f212ea44c5c5e4d5745b6dca64e42e5a5d675fc55abca5fbf9e5dcf8fc4101a5d6e091ad315c2f44322 SHA512 4e92e1c94d621fec99fd65d63f0ec64dba972e615726a589be6487a0d6782dbf4fd0d368525555deccefcc4c9af28309efc175102e2ac9ea3306edc4e9ed5611
 DIST opennebula-5.4.6.tar.gz 14537181 BLAKE2B 7240dbd209e7aec7c7ccecb95420b1b07761dcf0f1fa5f348101193e42a7af03def090d9ec6a60d32632e4ea31a5dfd03f7ee534a0e96b9e17255d8215f06f49 SHA512 440db6e15499740622c4a25cb8e28f2b718b6d2dfcb7d181f0fab927c03bc8d0ceb241bf08e03f068d73fc795ebe831b4102bebffb37f6aa320713bea66ef3ba
 EBUILD opennebula-4.14.2.ebuild 5992 BLAKE2B d9858fe197615ac54b61ca1637acec8bd991f7b975f95d75bb45161db6953148faa300557109213ba7f0844d9cb0c7774b5900b2c9a5afb3021edbb7412b73eb SHA512 cc18db5d7480f2067d95deb6a61df6c0a40a11ab9e4f6e2491fccdac34f349d527b6ffeedb2d2d2f04c3dba210c2a1316c635b4f69064a69bfd378ea0c4f9ebe
-EBUILD opennebula-5.0.2.ebuild 5178 BLAKE2B 987bf171438c6409dc6f0f5f88ac50425e485e6c81c14f4c5af96b7431e5a0f255ce55f2d6d40cf9523a9370abbfeb2190ad42d54e3e2230d63a04896288b0d6 SHA512 d758667dd121fa812e420de93c7b18edd2d15582088c8f995f69028d8afd48d10a5d683d35a18f2b41d5ce4b568f93ae0e8df98b0f211b2168c77547365d212e
-EBUILD opennebula-5.2.0.ebuild 5178 BLAKE2B 987bf171438c6409dc6f0f5f88ac50425e485e6c81c14f4c5af96b7431e5a0f255ce55f2d6d40cf9523a9370abbfeb2190ad42d54e3e2230d63a04896288b0d6 SHA512 d758667dd121fa812e420de93c7b18edd2d15582088c8f995f69028d8afd48d10a5d683d35a18f2b41d5ce4b568f93ae0e8df98b0f211b2168c77547365d212e
-EBUILD opennebula-5.2.1.ebuild 5376 BLAKE2B 0f3f5565e1a445ed2144018195244fe3b1d3db27665fa94b624e7c53ea1115c2c553694e2abef9fa5e0eabfbfeb0badc3cae14fffc4ee14dd72a43e75bc30a04 SHA512 d175ce386029b824ccd3f2f59a9f3c4cb607fe2548b49d8b8bb436542f46852553e5fe2dcacfcfac71a63710344148637bada6659758f3248552d1b31099768c
 EBUILD opennebula-5.4.1.ebuild 5394 BLAKE2B be801a88a64fb6c2345845bdb389a41b7f29664a8421639977058ea6e6b419fda65db70328fbf74782859e52979e52807bd77c1e3ce71a64d456e2b8e831d12b SHA512 a4fd17509e5363838e699abbb609c9ff33de519949aa61121ffc7551405e3204dd7e6f2e0c764fc80c4a8d3f7b68693fe92ffd54c47f36095d949758b653e1dd
-EBUILD opennebula-5.4.11.ebuild 6415 BLAKE2B d011ee9a835c65314964ea62b6aa3d0bb23e74310857114af4f751e5c0114a3b674a73c50c6889fc222a8161abf4ff8fc85494b6c5d2140b0df09d019a3f4ac0 SHA512 da259c64b8aa2b569b70c7afa9c834e1c19939a01201c9954736064378decfa5020e8a5eec655b413d901e2578901197139cd545897068e41525dd255c1f4168
-EBUILD opennebula-5.4.12.ebuild 6415 BLAKE2B d011ee9a835c65314964ea62b6aa3d0bb23e74310857114af4f751e5c0114a3b674a73c50c6889fc222a8161abf4ff8fc85494b6c5d2140b0df09d019a3f4ac0 SHA512 da259c64b8aa2b569b70c7afa9c834e1c19939a01201c9954736064378decfa5020e8a5eec655b413d901e2578901197139cd545897068e41525dd255c1f4168
+EBUILD opennebula-5.4.13.ebuild 5394 BLAKE2B be801a88a64fb6c2345845bdb389a41b7f29664a8421639977058ea6e6b419fda65db70328fbf74782859e52979e52807bd77c1e3ce71a64d456e2b8e831d12b SHA512 a4fd17509e5363838e699abbb609c9ff33de519949aa61121ffc7551405e3204dd7e6f2e0c764fc80c4a8d3f7b68693fe92ffd54c47f36095d949758b653e1dd
+EBUILD opennebula-5.4.15.ebuild 7290 BLAKE2B 578696a7fe565adc8dbb907241def8accc1b0ff0cf62a6db3a1fca8e75c901b87b8332ba4c9e8f4ac5e2ecee3a05ae5121bd51e3c8b4432720abc5352a78c0d9 SHA512 9c76be63786056ebf0c68535ea95ecb42fbdfe66e5e0aa895a5e3c293ab492b380642feb0dfa7b46b26c0c6384b0eb6964a4c6e6a07b2553a66d5c7cce09ea31
 EBUILD opennebula-5.4.6.ebuild 5394 BLAKE2B be801a88a64fb6c2345845bdb389a41b7f29664a8421639977058ea6e6b419fda65db70328fbf74782859e52979e52807bd77c1e3ce71a64d456e2b8e831d12b SHA512 a4fd17509e5363838e699abbb609c9ff33de519949aa61121ffc7551405e3204dd7e6f2e0c764fc80c4a8d3f7b68693fe92ffd54c47f36095d949758b653e1dd
 MISC metadata.xml 471 BLAKE2B fecada7f873a86295bd66aa16126682170731bb4cd87dc2cfc7f46503d1d10880cc92f87c388dc6b2d3e8a4d4cba73c4b88a97ce8d23c2254b0d91cb3f820779 SHA512 0be6058785693cef097e2b3ffcffbc7b0011719afcaaf4d10116f490dc23291bdbb9e91f42977c82ef002967a4cbd56f1bebe1f1e61a053a659250a54d7d67d1
diff --git a/app-emulation/opennebula/opennebula-5.0.2.ebuild b/app-emulation/opennebula/opennebula-5.0.2.ebuild
deleted file mode 100644
index 0e16ad5..0000000
--- a/app-emulation/opennebula/opennebula-5.0.2.ebuild
+++ /dev/null
@@ -1,175 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: $
-
-EAPI=5
-USE_RUBY="ruby20 ruby21"
-
-inherit user eutils multilib ruby-ng systemd
-
-MY_P="opennebula-${PV/_/-}"
-
-DESCRIPTION="OpenNebula Virtual Infrastructure Engine"
-HOMEPAGE="http://www.opennebula.org/"
-SRC_URI="http://downloads.opennebula.org/packages/${PN}-${PV}/${PN}-${PV}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="~amd64"
-IUSE="qemu +mysql xen sqlite +extras systemd"
-
-RDEPEND=">=dev-libs/xmlrpc-c-1.18.02[abyss,cxx,threads]
-	dev-lang/ruby
-	extras? ( dev-libs/openssl
-		dev-ruby/libxml
-		net-misc/curl
-		dev-libs/libxslt
-		dev-libs/expat
-		dev-libs/log4cpp )
-	mysql? ( virtual/mysql )
-	dev-db/sqlite
-	net-misc/openssh
-	|| ( app-cdr/cdrkit app-cdr/cdrtools )
-	sqlite? ( dev-ruby/sqlite3 )
-	qemu? ( app-emulation/libvirt[libvirtd,qemu] )
-	xen? ( app-emulation/xen-tools )"
-DEPEND="${RDEPEND}
-	>=dev-util/scons-1.2.0-r1
-	dev-ruby/nokogiri"
-
-# make sure no eclass is running tests
-RESTRICT="test"
-
-S="${WORKDIR}/${PN}-${PV}"
-
-ONEUSER="oneadmin"
-ONEGROUP="oneadmin"
-
-pkg_setup () {
-	enewgroup ${ONEGROUP}
-	enewuser ${ONEUSER} -1 /bin/bash /var/lib/one ${ONEGROUP}
-}
-
-src_unpack() {
-	default
-}
-
-src_prepare() {
-	sed -i -e 's|chmod|true|' install.sh || die "sed failed"
-}
-
-src_configure() {
-	:
-}
-
-src_compile() {
-
-	local myconf
-	use extras && myconf+="new_xmlrpc=yes "
-	use mysql && myconf+="mysql=yes " || myconf+="mysql=no "
-	scons \
-		${myconf} \
-		$(sed -r 's/.*(-j\s*|--jobs=)([0-9]+).*/-j\2/' <<< ${MAKEOPTS}) \
-		|| die "building ${PN} failed"
-}
-
-src_install() {
-	DESTDIR=${T} ./install.sh -u ${ONEUSER} -g ${ONEGROUP} || die "install failed"
-
-	cd "${T}"
-
-	# installing things for real
-	dobin bin/*
-
-	keepdir /var/{lib,run}/${PN} || die "keepdir failed"
-
-	dodir /usr/$(get_libdir)/one
-	dodir /var/lock/one
-	dodir /var/log/one
-	dodir /var/lib/one
-	dodir /var/run/one
-	dodir /var/tmp/one
-	# we have to preserve the executable bits
-	cp -a lib/* "${D}/usr/$(get_libdir)/one/" || die "copying lib files failed"
-
-	insinto /usr/share/doc/${PF}
-	doins -r share/examples
-
-	dodir /var/lib/one
-	dodir /var/lib/one/vms
-	dodir /usr/share/one
-	dodir /etc/tmpfiles.d
-	# we have to preserve the executable bits
-	cp -a var/remotes "${D}/var/lib/one/" || die "copying remotes failed"
-	cp -a share/* "${D}/usr/share/one/" || die "copying share failed"
-
-	doenvd "${FILESDIR}/99one"
-
-	newinitd "${FILESDIR}/opennebula.initd" opennebula
-	newinitd "${FILESDIR}/sunstone-server.initd" sunstone-server
-	newinitd "${FILESDIR}/oneflow-server.initd" oneflow-server
-	newconfd "${FILESDIR}/opennebula.confd" opennebula
-	newconfd "${FILESDIR}/sunstone-server.confd" sunstone-server
-	newconfd "${FILESDIR}/oneflow-server.confd" oneflow-server
-
-	use systemd && systemd_dounit "${FILESDIR}"/opennebula{,-sunstone,-econe,-oneflow,-onegate}.service
-
-	insinto /etc/one
-	insopts -m 0640
-	doins -r etc/*
-	doins "${FILESDIR}/one_auth"
-
-	insinto /etc/tmpfiles.d
-	doins "${FILESDIR}/tmpfilesd.opennebula.conf"
-
-}
-
-pkg_postinst() {
-
-
-	chown -R oneadmin:oneadmin ${ROOT}var/{lock,lib,log,run,tmp}/one
-	chown -R oneadmin:oneadmin ${ROOT}usr/share/one
-	chown -R oneadmin:oneadmin ${ROOT}etc/one
-	chown -R oneadmin:oneadmin ${ROOT}usr/lib/one
-
-	local onedir="${EROOT}var/lib/one"
-	if [ ! -d "${onedir}/.ssh" ] ; then
-		einfo "Generating ssh-key..."
-		umask 0027 || die "setting umask failed"
-		mkdir "${onedir}/.ssh" || die "creating ssh directory failed"
-		ssh-keygen -q -t dsa -N "" -f "${onedir}/.ssh/id_dsa" || die "ssh-keygen failed"
-		cat > "${onedir}/.ssh/config" <<EOF
-UserKnownHostsFile /dev/null
-Host *
-    StrictHostKeyChecking no
-EOF
-		cat "${onedir}/.ssh/id_dsa.pub"  >> "${onedir}/.ssh/authorized_keys" || die "adding key failed"
-		chown -R ${ONEUSER}:${ONEGROUP} "${onedir}/.ssh" || die "changing owner failed"
-	fi
-
-	if use qemu ; then
-		elog "Make sure that the user ${ONEUSER} has access to the libvirt control socket"
-		elog "  /var/run/libvirt/libvirt-sock"
-		elog "You can easily check this by executing the following command as ${ONEUSER} user"
-		elog "  virsh -c qemu:///system nodeinfo"
-		elog "If not using using policykit in libvirt, the file you should take a look at is:"
-		elog "  /etc/libvirt/libvirtd.conf (look for the unix_sock_*_perms parameters)"
-		elog "Failure to do so may lead to nodes hanging in PENDING state forever without further notice."
-		echo ""
-		elog "Should a node hang in PENDING state even with correct permissions, try the following to get more information."
-		elog "In /tmp/one-im execute the following command for the biggest one_im-* file:"
-		elog "  ruby -wd one_im-???"
-		echo ""
-		elog "OpenNebula doesn't allow you to specify the disc format."
-		elog "Unfortunately the default in libvirt is not to guess and"
-		elog "it therefores assumes a 'raw' format when using qemu/kvm."
-		elog "Set 'allow_disk_format_probing = 0' in /etc/libvirt/qemu.conf"
-		elog "to work around this until OpenNebula fixes it."
-	fi
-
-	elog "If you wish to use the sunstone server, please issue the command"
-	#elog "/usr/share/one/install_gems as oneadmin user"
-	elog "gem install sequel thin json rack sinatra builder treetop zendesk_api mysql parse-cron"
-
-
-}
diff --git a/app-emulation/opennebula/opennebula-5.2.0.ebuild b/app-emulation/opennebula/opennebula-5.2.0.ebuild
deleted file mode 100644
index 0e16ad5..0000000
--- a/app-emulation/opennebula/opennebula-5.2.0.ebuild
+++ /dev/null
@@ -1,175 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: $
-
-EAPI=5
-USE_RUBY="ruby20 ruby21"
-
-inherit user eutils multilib ruby-ng systemd
-
-MY_P="opennebula-${PV/_/-}"
-
-DESCRIPTION="OpenNebula Virtual Infrastructure Engine"
-HOMEPAGE="http://www.opennebula.org/"
-SRC_URI="http://downloads.opennebula.org/packages/${PN}-${PV}/${PN}-${PV}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="~amd64"
-IUSE="qemu +mysql xen sqlite +extras systemd"
-
-RDEPEND=">=dev-libs/xmlrpc-c-1.18.02[abyss,cxx,threads]
-	dev-lang/ruby
-	extras? ( dev-libs/openssl
-		dev-ruby/libxml
-		net-misc/curl
-		dev-libs/libxslt
-		dev-libs/expat
-		dev-libs/log4cpp )
-	mysql? ( virtual/mysql )
-	dev-db/sqlite
-	net-misc/openssh
-	|| ( app-cdr/cdrkit app-cdr/cdrtools )
-	sqlite? ( dev-ruby/sqlite3 )
-	qemu? ( app-emulation/libvirt[libvirtd,qemu] )
-	xen? ( app-emulation/xen-tools )"
-DEPEND="${RDEPEND}
-	>=dev-util/scons-1.2.0-r1
-	dev-ruby/nokogiri"
-
-# make sure no eclass is running tests
-RESTRICT="test"
-
-S="${WORKDIR}/${PN}-${PV}"
-
-ONEUSER="oneadmin"
-ONEGROUP="oneadmin"
-
-pkg_setup () {
-	enewgroup ${ONEGROUP}
-	enewuser ${ONEUSER} -1 /bin/bash /var/lib/one ${ONEGROUP}
-}
-
-src_unpack() {
-	default
-}
-
-src_prepare() {
-	sed -i -e 's|chmod|true|' install.sh || die "sed failed"
-}
-
-src_configure() {
-	:
-}
-
-src_compile() {
-
-	local myconf
-	use extras && myconf+="new_xmlrpc=yes "
-	use mysql && myconf+="mysql=yes " || myconf+="mysql=no "
-	scons \
-		${myconf} \
-		$(sed -r 's/.*(-j\s*|--jobs=)([0-9]+).*/-j\2/' <<< ${MAKEOPTS}) \
-		|| die "building ${PN} failed"
-}
-
-src_install() {
-	DESTDIR=${T} ./install.sh -u ${ONEUSER} -g ${ONEGROUP} || die "install failed"
-
-	cd "${T}"
-
-	# installing things for real
-	dobin bin/*
-
-	keepdir /var/{lib,run}/${PN} || die "keepdir failed"
-
-	dodir /usr/$(get_libdir)/one
-	dodir /var/lock/one
-	dodir /var/log/one
-	dodir /var/lib/one
-	dodir /var/run/one
-	dodir /var/tmp/one
-	# we have to preserve the executable bits
-	cp -a lib/* "${D}/usr/$(get_libdir)/one/" || die "copying lib files failed"
-
-	insinto /usr/share/doc/${PF}
-	doins -r share/examples
-
-	dodir /var/lib/one
-	dodir /var/lib/one/vms
-	dodir /usr/share/one
-	dodir /etc/tmpfiles.d
-	# we have to preserve the executable bits
-	cp -a var/remotes "${D}/var/lib/one/" || die "copying remotes failed"
-	cp -a share/* "${D}/usr/share/one/" || die "copying share failed"
-
-	doenvd "${FILESDIR}/99one"
-
-	newinitd "${FILESDIR}/opennebula.initd" opennebula
-	newinitd "${FILESDIR}/sunstone-server.initd" sunstone-server
-	newinitd "${FILESDIR}/oneflow-server.initd" oneflow-server
-	newconfd "${FILESDIR}/opennebula.confd" opennebula
-	newconfd "${FILESDIR}/sunstone-server.confd" sunstone-server
-	newconfd "${FILESDIR}/oneflow-server.confd" oneflow-server
-
-	use systemd && systemd_dounit "${FILESDIR}"/opennebula{,-sunstone,-econe,-oneflow,-onegate}.service
-
-	insinto /etc/one
-	insopts -m 0640
-	doins -r etc/*
-	doins "${FILESDIR}/one_auth"
-
-	insinto /etc/tmpfiles.d
-	doins "${FILESDIR}/tmpfilesd.opennebula.conf"
-
-}
-
-pkg_postinst() {
-
-
-	chown -R oneadmin:oneadmin ${ROOT}var/{lock,lib,log,run,tmp}/one
-	chown -R oneadmin:oneadmin ${ROOT}usr/share/one
-	chown -R oneadmin:oneadmin ${ROOT}etc/one
-	chown -R oneadmin:oneadmin ${ROOT}usr/lib/one
-
-	local onedir="${EROOT}var/lib/one"
-	if [ ! -d "${onedir}/.ssh" ] ; then
-		einfo "Generating ssh-key..."
-		umask 0027 || die "setting umask failed"
-		mkdir "${onedir}/.ssh" || die "creating ssh directory failed"
-		ssh-keygen -q -t dsa -N "" -f "${onedir}/.ssh/id_dsa" || die "ssh-keygen failed"
-		cat > "${onedir}/.ssh/config" <<EOF
-UserKnownHostsFile /dev/null
-Host *
-    StrictHostKeyChecking no
-EOF
-		cat "${onedir}/.ssh/id_dsa.pub"  >> "${onedir}/.ssh/authorized_keys" || die "adding key failed"
-		chown -R ${ONEUSER}:${ONEGROUP} "${onedir}/.ssh" || die "changing owner failed"
-	fi
-
-	if use qemu ; then
-		elog "Make sure that the user ${ONEUSER} has access to the libvirt control socket"
-		elog "  /var/run/libvirt/libvirt-sock"
-		elog "You can easily check this by executing the following command as ${ONEUSER} user"
-		elog "  virsh -c qemu:///system nodeinfo"
-		elog "If not using using policykit in libvirt, the file you should take a look at is:"
-		elog "  /etc/libvirt/libvirtd.conf (look for the unix_sock_*_perms parameters)"
-		elog "Failure to do so may lead to nodes hanging in PENDING state forever without further notice."
-		echo ""
-		elog "Should a node hang in PENDING state even with correct permissions, try the following to get more information."
-		elog "In /tmp/one-im execute the following command for the biggest one_im-* file:"
-		elog "  ruby -wd one_im-???"
-		echo ""
-		elog "OpenNebula doesn't allow you to specify the disc format."
-		elog "Unfortunately the default in libvirt is not to guess and"
-		elog "it therefores assumes a 'raw' format when using qemu/kvm."
-		elog "Set 'allow_disk_format_probing = 0' in /etc/libvirt/qemu.conf"
-		elog "to work around this until OpenNebula fixes it."
-	fi
-
-	elog "If you wish to use the sunstone server, please issue the command"
-	#elog "/usr/share/one/install_gems as oneadmin user"
-	elog "gem install sequel thin json rack sinatra builder treetop zendesk_api mysql parse-cron"
-
-
-}
diff --git a/app-emulation/opennebula/opennebula-5.4.11.ebuild b/app-emulation/opennebula/opennebula-5.4.11.ebuild
deleted file mode 100644
index f4c0da3..0000000
--- a/app-emulation/opennebula/opennebula-5.4.11.ebuild
+++ /dev/null
@@ -1,219 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: $
-
-EAPI=6
-USE_RUBY="ruby22 ruby23 ruby24 ruby25"
-
-inherit user eutils multilib ruby-ng systemd git-r3 flag-o-matic
-
-MY_P="opennebula-${PV/_/-}"
-
-DESCRIPTION="OpenNebula Virtual Infrastructure Engine"
-HOMEPAGE="http://www.opennebula.org/"
-#SRC_URI="http://downloads.opennebula.org/packages/${PN}-${PV}/${PN}-${PV}.tar.gz"
-EGIT_REPO_URI="https://github.com/OpenNebula/one.git"
-EGIT_COMMIT="release-${PV}"
-EGIT_CHECKOUT_DIR=${WORKDIR}/${P}
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="~amd64"
-IUSE="qemu +mysql xen sqlite +extras systemd"
-
-RDEPEND=">=dev-libs/xmlrpc-c-1.18.02[abyss,cxx,threads]
-	dev-lang/ruby
-	extras? ( dev-libs/openssl
-		dev-ruby/libxml
-		net-misc/curl
-		dev-libs/libxslt
-		dev-libs/expat
-		dev-ruby/uuidtools
-		dev-ruby/amazon-ec2
-		dev-ruby/aws-sdk
-		dev-ruby/webmock
-		dev-ruby/mysql
-		dev-ruby/mysql2
-		dev-ruby/parse-cron
-		dev-ruby/sequel
-		dev-ruby/treetop
-		dev-ruby/xml-simple
-		dev-ruby/zendesk_api
-		dev-ruby/ruby-net-ldap
-		dev-ruby/rack
-		dev-ruby/sinatra
-		dev-ruby/thin
-		dev-ruby/memcache-client
-		dev-ruby/curb
-		dev-ruby/trollop
-		dev-ruby/azure
-		dev-ruby/safe_yaml
-		dev-libs/log4cpp )
-	mysql? ( virtual/mysql )
-	dev-db/sqlite
-	net-misc/openssh
-	|| ( app-cdr/cdrkit app-cdr/cdrtools )
-	sqlite? ( dev-ruby/sqlite3 )
-	qemu? ( app-emulation/libvirt[libvirtd,qemu] )
-	xen? ( app-emulation/xen-tools )"
-DEPEND="${RDEPEND}
-	>=dev-util/scons-1.2.0-r1
-	dev-python/configparser
-	dev-ruby/configparser
-	dev-ruby/rubygems
-	dev-ruby/rake
-	dev-ruby/xmlparser
-	dev-ruby/ox
-	dev-ruby/builder
-	sys-devel/make
-	dev-ruby/nokogiri"
-
-# make sure no eclass is running tests
-RESTRICT="test"
-
-#S="${WORKDIR}/${PN}-${PV}"
-S="${WORKDIR}/${P}"
-
-ONEUSER="oneadmin"
-ONEGROUP="oneadmin"
-
-pkg_setup () {
-	enewgroup ${ONEGROUP}
-	enewuser ${ONEUSER} -1 /bin/bash /var/lib/one ${ONEGROUP}
-}
-
-#src_unpack() {
-#	default
-#}
-
-src_prepare() {
-	epatch "${FILESDIR}/fix_kvm_emulator.patch"
-	default
-	sed -i -e 's|chmod|true|' install.sh || die "sed failed"
-}
-
-src_configure() {
-	:
-}
-
-src_compile() {
-
-	# http://lists.ceph.com/pipermail/users-opennebula.org/2011-June/033132.html
-	#filter-ldflags -lpthread
-
-	local myconf
-	# This builds the vanilla OpenNebula package. Tweak this line as desired.
-	myconf+="sunstone=no parsers=yes "
-	use extras && myconf+="new_xmlrpc=yes "
-	use mysql && myconf+="mysql=yes " || myconf+="mysql=no "
-	use sqlite && myconf+="sqlite=yes " || myconf+="sqlite=no "
-	use systemd && myconf+="systemd=yes " || myconf+="systemd=no "
-	scons \
-		${myconf} \
-		$(sed -r 's/.*(-j\s*|--jobs=)([0-9]+).*/-j\2/' <<< ${MAKEOPTS}) \
-		|| die "building ${PN} failed"
-}
-
-src_install() {
-	DESTDIR=${T} ./install.sh -u ${ONEUSER} -g ${ONEGROUP} || die "install failed"
-
-	cd "${T}"
-
-	# installing things for real
-	dobin bin/*
-
-	keepdir /var/{lib,run}/${PN} || die "keepdir failed"
-
-	dodir /usr/$(get_libdir)/one
-	dodir /var/lock/one
-	dodir /var/log/one
-	dodir /var/lib/one
-	dodir /var/run/one
-	dodir /var/tmp/one
-	# we have to preserve the executable bits
-	cp -a lib/* "${D}/usr/$(get_libdir)/one/" || die "copying lib files failed"
-
-	insinto /usr/share/doc/${PF}
-	doins -r share/examples
-
-	dodir /var/lib/one
-	dodir /var/lib/one/vms
-	dodir /usr/share/one
-	dodir /etc/tmpfiles.d
-	# we have to preserve the executable bits
-	cp -a var/remotes "${D}/var/lib/one/" || die "copying remotes failed"
-	cp -a share/* "${D}/usr/share/one/" || die "copying share failed"
-
-	doenvd "${FILESDIR}/99one"
-
-	newinitd "${FILESDIR}/opennebula.initd" opennebula
-	newinitd "${FILESDIR}/sunstone-server.initd" sunstone-server
-	newinitd "${FILESDIR}/oneflow-server.initd" oneflow-server
-	newconfd "${FILESDIR}/opennebula.confd" opennebula
-	newconfd "${FILESDIR}/sunstone-server.confd" sunstone-server
-	newconfd "${FILESDIR}/oneflow-server.confd" oneflow-server
-
-	use systemd && systemd_dounit "${FILESDIR}"/opennebula{,-sunstone,-econe,-oneflow,-onegate,-scheduler,-novnc}.service
-
-	insinto /etc/one
-	insopts -m 0640
-	doins -r etc/*
-	doins "${FILESDIR}/one_auth"
-
-	insinto /etc/tmpfiles.d
-	newins "${FILESDIR}/tmpfilesd.opennebula.conf" "opennebula.conf"
-
-	insinto /etc/logrotate.d
-	newins "${FILESDIR}/logrotated.opennebula" "opennebula"
-
-}
-
-pkg_postinst() {
-
-
-	chown -R oneadmin:oneadmin ${ROOT}var/{lock,lib,log,run,tmp}/one
-	chown -R oneadmin:oneadmin ${ROOT}usr/share/one
-	chown -R oneadmin:oneadmin ${ROOT}etc/one
-	chown -R oneadmin:oneadmin ${ROOT}usr/lib/one
-
-	local onedir="${EROOT}var/lib/one"
-	if [ ! -d "${onedir}/.ssh" ] ; then
-		einfo "Generating ssh-key..."
-		umask 0027 || die "setting umask failed"
-		mkdir "${onedir}/.ssh" || die "creating ssh directory failed"
-		ssh-keygen -q -t dsa -N "" -f "${onedir}/.ssh/id_dsa" || die "ssh-keygen failed"
-		cat > "${onedir}/.ssh/config" <<EOF
-UserKnownHostsFile /dev/null
-Host *
-    StrictHostKeyChecking no
-EOF
-		cat "${onedir}/.ssh/id_dsa.pub"  >> "${onedir}/.ssh/authorized_keys" || die "adding key failed"
-		chown -R ${ONEUSER}:${ONEGROUP} "${onedir}/.ssh" || die "changing owner failed"
-	fi
-
-	if use qemu ; then
-		elog "Make sure that the user ${ONEUSER} has access to the libvirt control socket"
-		elog "  /var/run/libvirt/libvirt-sock"
-		elog "You can easily check this by executing the following command as ${ONEUSER} user"
-		elog "  virsh -c qemu:///system nodeinfo"
-		elog "If not using using policykit in libvirt, the file you should take a look at is:"
-		elog "  /etc/libvirt/libvirtd.conf (look for the unix_sock_*_perms parameters)"
-		elog "Failure to do so may lead to nodes hanging in PENDING state forever without further notice."
-		echo ""
-		elog "Should a node hang in PENDING state even with correct permissions, try the following to get more information."
-		elog "In /tmp/one-im execute the following command for the biggest one_im-* file:"
-		elog "  ruby -wd one_im-???"
-		echo ""
-		elog "OpenNebula doesn't allow you to specify the disc format."
-		elog "Unfortunately the default in libvirt is not to guess and"
-		elog "it therefores assumes a 'raw' format when using qemu/kvm."
-		elog "Set 'allow_disk_format_probing = 0' in /etc/libvirt/qemu.conf"
-		elog "to work around this until OpenNebula fixes it."
-	fi
-
-	elog "If you wish to use the sunstone server, please issue the command"
-	#elog "/usr/share/one/install_gems as oneadmin user"
-	elog "gem install sequel thin json rack sinatra builder treetop zendesk_api mysql parse-cron"
-
-
-}
-
diff --git a/app-emulation/opennebula/opennebula-5.2.1.ebuild b/app-emulation/opennebula/opennebula-5.4.13.ebuild
index 7e8f826..9d48554 100644
--- a/app-emulation/opennebula/opennebula-5.2.1.ebuild
+++ b/app-emulation/opennebula/opennebula-5.4.13.ebuild
@@ -29,6 +29,7 @@ RDEPEND=">=dev-libs/xmlrpc-c-1.18.02[abyss,cxx,threads]
 		dev-ruby/amazon-ec2
 		dev-ruby/webmock
 		dev-ruby/mysql
+		dev-ruby/mysql2
 		dev-ruby/parse-cron
 		dev-ruby/sequel
 		dev-ruby/treetop
diff --git a/app-emulation/opennebula/opennebula-5.4.12.ebuild b/app-emulation/opennebula/opennebula-5.4.15.ebuild
index f4c0da3..a889fd5 100644
--- a/app-emulation/opennebula/opennebula-5.4.12.ebuild
+++ b/app-emulation/opennebula/opennebula-5.4.15.ebuild
@@ -17,8 +17,9 @@ EGIT_COMMIT="release-${PV}"
 EGIT_CHECKOUT_DIR=${WORKDIR}/${P}
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~amd64"
-IUSE="qemu +mysql xen sqlite +extras systemd"
+#KEYWORDS="~amd64"
+KEYWORDS=""
+IUSE="qemu +mysql xen sqlite +extras systemd +sunstone"
 
 RDEPEND=">=dev-libs/xmlrpc-c-1.18.02[abyss,cxx,threads]
 	dev-lang/ruby
@@ -56,6 +57,7 @@ RDEPEND=">=dev-libs/xmlrpc-c-1.18.02[abyss,cxx,threads]
 	qemu? ( app-emulation/libvirt[libvirtd,qemu] )
 	xen? ( app-emulation/xen-tools )"
 DEPEND="${RDEPEND}
+	sunstone? ( net-libs/nodejs[npm] dev-nodejs/bower dev-nodejs/grunt dev-nodejs/grunt-cli dev-nodejs/ini dev-nodejs/braces )
 	>=dev-util/scons-1.2.0-r1
 	dev-python/configparser
 	dev-ruby/configparser
@@ -96,18 +98,21 @@ src_configure() {
 }
 
 src_compile() {
+	# force definition of nodejs path for grunt to work
+	local node_path="/usr/$(get_libdir)/node_modules"
 
 	# http://lists.ceph.com/pipermail/users-opennebula.org/2011-June/033132.html
 	#filter-ldflags -lpthread
 
 	local myconf
 	# This builds the vanilla OpenNebula package. Tweak this line as desired.
-	myconf+="sunstone=no parsers=yes "
-	use extras && myconf+="new_xmlrpc=yes "
+	myconf+="parsers=yes "
+	use sunstone && myconf+="sunstone=yes " || myconf+="sunstone=no "
+	use extras && myconf+="new_xmlrpc=yes " || myconf+="new_xmlrpc=no "
 	use mysql && myconf+="mysql=yes " || myconf+="mysql=no "
 	use sqlite && myconf+="sqlite=yes " || myconf+="sqlite=no "
 	use systemd && myconf+="systemd=yes " || myconf+="systemd=no "
-	scons \
+	NODE_PATH=${node_path} scons \
 		${myconf} \
 		$(sed -r 's/.*(-j\s*|--jobs=)([0-9]+).*/-j\2/' <<< ${MAKEOPTS}) \
 		|| die "building ${PN} failed"
@@ -210,10 +215,26 @@ EOF
 		elog "to work around this until OpenNebula fixes it."
 	fi
 
-	elog "If you wish to use the sunstone server, please issue the command"
+	if use sunstone ; then
+		elog "Set nmp prefix [-g] to define working folder"
+		elog "https://docs.npmjs.com/cli/prefix"
+		elog "https://docs.npmjs.com/getting-started/fixing-npm-permissions"
+		elog "If you wish to use the sunstone server, please issue the command"
+		elog "npm install"
+		elog "bower install"
+		elog "grunt sass"
+		elog "grunt requirejs"
+		elog "as oneadmin user in /usr/lib/one/sunstone/public"
+		elog
+		elog "also you need to issue this beforehand:"
+		elog
+		elog "npm install -g bower"
+		elog "npm install -g grunt"
+		elog "npm install -g grunt-cli"
+		elog "as root"
+	fi
+	#elog "gem install sequel thin json rack sinatra builder treetop zendesk_api mysql parse-cron"
 	#elog "/usr/share/one/install_gems as oneadmin user"
-	elog "gem install sequel thin json rack sinatra builder treetop zendesk_api mysql parse-cron"
-
 
 }