commit: 2e14962dabb01503d6aea3292d4c0e66f1ec78c7
Author: Samuel Bernardo <samuelbernardo.mail <AT> gmail <DOT> com>
AuthorDate: Sun May 10 22:09:59 2020 +0000
Commit: Samuel Bernardo <samuelbernardo.mail <AT> gmail <DOT> com>
CommitDate: Sun May 10 22:09:59 2020 +0000
URL: https://gitweb.gentoo.org/repo/user/ssnb.git/commit/?id=2e14962d
Correct opennebula ebuild to build sunstone minified files
Signed-off-by: Samuel Bernardo <samuelbernardo.mail <AT> gmail.com>
app-emulation/opennebula/Manifest | 4 ++--
app-emulation/opennebula/opennebula-5.10.3.ebuild | 7 +++++--
app-emulation/opennebula/opennebula-5.10.4.ebuild | 7 +++++--
dev-nodejs/bower/Manifest | 4 +---
dev-nodejs/bower/bower-1.8.4.ebuild | 18 ------------------
dev-nodejs/bower/bower-1.8.8.ebuild | 5 +++++
dev-nodejs/grunt/Manifest | 2 +-
dev-nodejs/grunt/grunt-1.0.2.ebuild | 5 +++++
eclass/npm.eclass | 10 +---------
9 files changed, 25 insertions(+), 37 deletions(-)
diff --git a/app-emulation/opennebula/Manifest
b/app-emulation/opennebula/Manifest
index 8013697..65bc162 100644
--- a/app-emulation/opennebula/Manifest
+++ b/app-emulation/opennebula/Manifest
@@ -63,6 +63,6 @@ DIST opennebula-5.10.1.tar.gz 43207580 BLAKE2B
de87e839cd772bec769af4a689fed02e8
DIST opennebula-5.10.3.tar.gz 5694695 BLAKE2B
09e20f0bcea43a454692c7bc5ac7e167024bc838755a2fed31ef5e4a0dea85f97a4334ec950a0a6c3f16a6d49837262dd7791b02298f58da600f65521de59764
SHA512
a0b581a6522054241d61255aba3a1754dd16052b058f0de244a3ec35fd99972aed36fef25d087a2a76566fa0d8c875c9e95766294d80adb4c5491231447ec839
DIST opennebula-5.10.4.tar.gz 5697792 BLAKE2B
fde611cbe5b44ee403b57e915253c9ffba267230bf3a54cd466260615918e871aebeae6f17c246a84ef1686df176134acff272c49e6a9b69c8841bc8fab1f1b5
SHA512
c509ec4a56b7865d118ab79e08227f0a78d1d899361ea2ae2ea3c6ac6ad3ab4a2a38211a4f5b7abf35ef512674d13ffb19f97286fed63515289e4f9a602f3145
EBUILD opennebula-5.10.1.ebuild 9405 BLAKE2B
fd6dfefc76da0aaadc993b7ed1593b8826fb642a92797220c9ce6226b846539900f6e7914730decfe57f79514654506e9a1aed76ebd28c1fc797d71ee5a6b2ba
SHA512
360d3323e46a1253f6489c696e020ea38e260923d6b0fcb50154b0cb412b4bd3db994365a072915f5a8411032cea12dd8b87fe2f730e418d6742dd7218722a66
-EBUILD opennebula-5.10.3.ebuild 9466 BLAKE2B
9a95ed8ad71e2c38ce1487ca675510b141cd2c068a19dc7417526d879b8f40413b93c13a6c7fce710b2b8be206d756ff1980a78ebb1518b45b63eec88376b69e
SHA512
22019fee74dea1612a3dbc0bfa7c70e97e8dc5e9db32d798f338dd5adb928b559a63a4306e8661f1950c833df75cedae51aa57a557d1f7203913563a9048135d
-EBUILD opennebula-5.10.4.ebuild 9466 BLAKE2B
9a95ed8ad71e2c38ce1487ca675510b141cd2c068a19dc7417526d879b8f40413b93c13a6c7fce710b2b8be206d756ff1980a78ebb1518b45b63eec88376b69e
SHA512
22019fee74dea1612a3dbc0bfa7c70e97e8dc5e9db32d798f338dd5adb928b559a63a4306e8661f1950c833df75cedae51aa57a557d1f7203913563a9048135d
+EBUILD opennebula-5.10.3.ebuild 9653 BLAKE2B
ad5ca71e2d22173d6a8815b1e38a82dc745e0d99d92ff0bdd9d24d86628fd5609213b1a984a984239fa68220877cf5781046164c3314f7bd358283052963e412
SHA512
43f66b8361cea0cad56efacf2a0187fd15ee4d49cf6f4c0b0bc563b9dcaa1ee4f23554475a7d23da412c9f58f1f6e26e95db26f5009c1c4270c3fe6e193a6e0c
+EBUILD opennebula-5.10.4.ebuild 9653 BLAKE2B
ad5ca71e2d22173d6a8815b1e38a82dc745e0d99d92ff0bdd9d24d86628fd5609213b1a984a984239fa68220877cf5781046164c3314f7bd358283052963e412
SHA512
43f66b8361cea0cad56efacf2a0187fd15ee4d49cf6f4c0b0bc563b9dcaa1ee4f23554475a7d23da412c9f58f1f6e26e95db26f5009c1c4270c3fe6e193a6e0c
MISC metadata.xml 931 BLAKE2B
abb0ecf04eb6fc45f64c5d2d6636591c9d706fbf1902943a80f7e058443787824581219fb8457a83192e4e2b672521609449d4eef78ab677f8c093fe939034b6
SHA512
c3770f399572b16601e7eeaf4a1eb4b5eea950ad18239be8719124f60f3edd02da4c7b28b177329d70b0810ee7d8597e522dd62a1bd4c8ea1194acf0d92dfeb2
diff --git a/app-emulation/opennebula/opennebula-5.10.3.ebuild
b/app-emulation/opennebula/opennebula-5.10.3.ebuild
index aadbf39..6db137d 100644
--- a/app-emulation/opennebula/opennebula-5.10.3.ebuild
+++ b/app-emulation/opennebula/opennebula-5.10.3.ebuild
@@ -18,7 +18,7 @@ IUSE="qemu +mysql xen sqlite +extras systemd docker +sunstone
vnc +python +doc"
REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
LICENSE="Apache-2.0"
SLOT="0"
-KEYWORDS=""
+#KEYWORDS="~amd64"
SRC_URI="https://github.com/OpenNebula/one/archive/release-${PV}.tar.gz ->
${P}.tar.gz"
RDEPEND=">=dev-libs/xmlrpc-c-1.18.02[abyss,cxx,threads]
@@ -58,6 +58,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}
+ dev-lang/ruby:2.5
>=dev-util/scons-3.0.0
dev-ruby/nokogiri
dev-ruby/bundler
@@ -119,7 +120,9 @@ src_prepare() {
# To do that we need the npm environment set up
#
https://docs.opennebula.org/5.4/integration/references/sunstone_dev.html#sunstone-dev
pushd src/sunstone/public/ >/dev/null
- ./build.sh -d
+ ./build.sh -d || die "Install required dependencies for npm and bower
failed."
+ #export PATH=$PATH:$PWD/node_modules/.bin
+ #./build.sh || die "Prepare minified files failed."
popd >/dev/null
eapply_user
diff --git a/app-emulation/opennebula/opennebula-5.10.4.ebuild
b/app-emulation/opennebula/opennebula-5.10.4.ebuild
index aadbf39..6db137d 100644
--- a/app-emulation/opennebula/opennebula-5.10.4.ebuild
+++ b/app-emulation/opennebula/opennebula-5.10.4.ebuild
@@ -18,7 +18,7 @@ IUSE="qemu +mysql xen sqlite +extras systemd docker +sunstone
vnc +python +doc"
REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
LICENSE="Apache-2.0"
SLOT="0"
-KEYWORDS=""
+#KEYWORDS="~amd64"
SRC_URI="https://github.com/OpenNebula/one/archive/release-${PV}.tar.gz ->
${P}.tar.gz"
RDEPEND=">=dev-libs/xmlrpc-c-1.18.02[abyss,cxx,threads]
@@ -58,6 +58,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}
+ dev-lang/ruby:2.5
>=dev-util/scons-3.0.0
dev-ruby/nokogiri
dev-ruby/bundler
@@ -119,7 +120,9 @@ src_prepare() {
# To do that we need the npm environment set up
#
https://docs.opennebula.org/5.4/integration/references/sunstone_dev.html#sunstone-dev
pushd src/sunstone/public/ >/dev/null
- ./build.sh -d
+ ./build.sh -d || die "Install required dependencies for npm and bower
failed."
+ #export PATH=$PATH:$PWD/node_modules/.bin
+ #./build.sh || die "Prepare minified files failed."
popd >/dev/null
eapply_user
diff --git a/dev-nodejs/bower/Manifest b/dev-nodejs/bower/Manifest
index 37d8010..5f95618 100644
--- a/dev-nodejs/bower/Manifest
+++ b/dev-nodejs/bower/Manifest
@@ -1,5 +1,3 @@
-DIST bower-1.8.4.tgz 4870523 BLAKE2B
4eb08374318e9be63d3a69b6a4e174d928eee30f3a282ad06bce5bf656b35fd7df38df8f355c4488a0ceb49d81aaca447fb078a21ae0d9dd720579d88f8716c2
SHA512
da40d171f149e82ae4f50fb20ad9899160785ff478b9d650c88c5eb685d21aba499e9e8010059b70a11eb0a49848932b67d256413c3ca2c35c064c82d14a79d8
DIST bower-1.8.8.tgz 4853602 BLAKE2B
a3dc0b50e4985dd01fac9a0373d5ff67e6d32fcc000ad1b293641c8157f89386f38f0b72011125d4b9ff8502d74df78cb669c2f6e21a33ed72415c84f37f641a
SHA512
d52ac99d79e43fdb282131e9b523be6a1c7740aa77715ce7f29a08eae8ea73949e3a48398aa335a4af47f8349cd8e43c4a73b48c2fcd1b852bfd4230cbbe7be0
-EBUILD bower-1.8.4.ebuild 331 BLAKE2B
3b2fe0bc4cb599013752c3a87b8677f0dfdaef771370c159f24ef1079105ae5c35bbf92867610d97ba24306ca6b13b2e41aece9ab5b832e80f4056342d6bebdb
SHA512
6a3fc743d27acb6a8addbbf99b7878c1fcfecdd0fdd9734fea88f45d231ff27785fc6ff3857784afd0f0c48c3ca5089d6c6bb3442c5ec0db1c2bb201d9b50196
-EBUILD bower-1.8.8.ebuild 331 BLAKE2B
6629d5ff4b1bbb16016a07d3412ec03b2805c9eca534a994dd3ace8b24f4eea9ca3050074d14519a363bc0646b7555d1b6308afdada2cb38bf9221f311e49362
SHA512
7db94cdb858e4f279655400a80daac8f3680ab91b4292c0763d3e61da3ffa8ed646956d1e5f26c18686d4fbbf72c7358c36bd0cfd9acdec0137e2cea6155f7ce
+EBUILD bower-1.8.8.ebuild 501 BLAKE2B
5d4fd1ef2644c62ce73808bc154fcce1c54cf92c3ae2f4a28a28dc000b2496f08423d10b922ad5d0c61956672595c5967874ab7234f447bc3d1adeb96d3d2d3a
SHA512
b7b7c04d894e718cec1a73861a3e1822339fa0ee19a4eed08edea23d2153d7659e703c4366bb3c5cd261a3b0aa56e9e0b2f2a2ece75bfdf8515efcd56f9ea4b4
MISC metadata.xml 159 BLAKE2B
1874e3af4a6c7f7ae7f3e6d4c497285da514376330d15173d0b667317398c37989e85c7fa71cff0b53c1fdd3e6358955b1ad12238b324b9cc174afe0fca5ce2d
SHA512
0d6d278aef7bd376d99b4f23af5d26573e625e50864403c2dd0f5c253a4f7ddd5e8dcccc3363ddddf154cbf020a7ecd9d3ecb64e0e4c144860602ae2aee9cd50
diff --git a/dev-nodejs/bower/bower-1.8.4.ebuild
b/dev-nodejs/bower/bower-1.8.4.ebuild
deleted file mode 100644
index d23e292..0000000
--- a/dev-nodejs/bower/bower-1.8.4.ebuild
+++ /dev/null
@@ -1,18 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=6
-
-inherit npm
-
-DESCRIPTION="A package manager for the web"
-HOMEPAGE="https://www.npmjs.com/package/bower";
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="test"
-
-NPM_EXTRA_FILES="bin packages"
-NPM_BIN="${PN}"
diff --git a/dev-nodejs/bower/bower-1.8.8.ebuild
b/dev-nodejs/bower/bower-1.8.8.ebuild
index 54f1631..435eb97 100644
--- a/dev-nodejs/bower/bower-1.8.8.ebuild
+++ b/dev-nodejs/bower/bower-1.8.8.ebuild
@@ -16,3 +16,8 @@ IUSE="test"
NPM_EXTRA_FILES="bin packages"
NPM_BIN="${PN}"
+
+src_prepare() {
+ default
+ sed -i -e "s|../lib/bin/|../$(get_libdir)/node_modules/bower/lib/bin/|"
"bin/${NPM_BIN}" || die "Failed to correct path for bower lib"
+}
diff --git a/dev-nodejs/grunt/Manifest b/dev-nodejs/grunt/Manifest
index 48a64c4..33f9acd 100644
--- a/dev-nodejs/grunt/Manifest
+++ b/dev-nodejs/grunt/Manifest
@@ -1,3 +1,3 @@
DIST grunt-1.0.2.tgz 22946 BLAKE2B
0f77cc3b71d41b818327da61c640b6cce59d67a40e18a34577dbf7abcfddc3c36e14b602681513bbeb923cfd1c5b775b4240c9235fef1dc3037ffe9846142898
SHA512
68f19d461978d3152c38d32644bfef77e51f6e338d7719b2bbfb81eb37731e12e936a80cf648db06481c903071666d04e44285ff13577fd41e388f9def2abc12
-EBUILD grunt-1.0.2.ebuild 651 BLAKE2B
9c1460c04abf7baa6d5dcb3a546bbf05594c8cad8c169bcea0e61fdceb1f8db21aaeba0816c4c61a3723d8415beec6967026ef1fa4a8fb62c97c771e28b1c179
SHA512
00e2773923263cdbf2eb50fa12bc29cbdf7a92bc659f2465560f076cf8f01bc231d8a4d646436e16d42989a6019fb5461c975f981990692ea84890718e03b107
+EBUILD grunt-1.0.2.ebuild 838 BLAKE2B
ae53021342267ec2180eb8765dd098bf22624f2bc408fe275cd9c68a5542967491d876ac831de0f993dee6489dee1f0cadd26ea2200578b69b451ec375a85bdd
SHA512
0b2a9ea2bfb35b82e8b6eb9dc364ec287e49578d1cee63a1543f915ed70ed5c42a2916cb338e7efb53b225a688602a9a23ac6785a863880d379e18b116455b68
MISC metadata.xml 159 BLAKE2B
1874e3af4a6c7f7ae7f3e6d4c497285da514376330d15173d0b667317398c37989e85c7fa71cff0b53c1fdd3e6358955b1ad12238b324b9cc174afe0fca5ce2d
SHA512
0d6d278aef7bd376d99b4f23af5d26573e625e50864403c2dd0f5c253a4f7ddd5e8dcccc3363ddddf154cbf020a7ecd9d3ecb64e0e4c144860602ae2aee9cd50
diff --git a/dev-nodejs/grunt/grunt-1.0.2.ebuild
b/dev-nodejs/grunt/grunt-1.0.2.ebuild
index 6ce501d..8b5c929 100644
--- a/dev-nodejs/grunt/grunt-1.0.2.ebuild
+++ b/dev-nodejs/grunt/grunt-1.0.2.ebuild
@@ -29,3 +29,8 @@ RDEPEND="dev-nodejs/grunt-cli
dev-nodejs/eventemitter2
dev-nodejs/dateformat
dev-nodejs/coffeescript"
+
+src_prepare() {
+ default
+ sed -i -e
"s|grunt-cli/bin/grunt|../$(get_libdir)/node_modules/grunt-cli/bin/grunt|"
"bin/${NPM_BIN}" || die "Failed to correct path for grunt-cli lib"
+}
diff --git a/eclass/npm.eclass b/eclass/npm.eclass
index c4e35b1..3ec0bf5 100644
--- a/eclass/npm.eclass
+++ b/eclass/npm.eclass
@@ -78,14 +78,6 @@ npm_src_unpack() {
mv "${WORKDIR}/package" ${S}
}
-# @FUNCTION: npm-src_prepare
-# @DESCRIPTION:
-# This function prepare the source for NodeJS/npm packages.
-npm_src_prepare() {
- default
- for f in $(grep -rlI "/lib/" "${S}"); do sed -i -e
"s|/lib/|/$(get_libdir)/|" "${f}"; done || die "Failed to correct usr/lib path
in lib"
-}
-
# @FUNCTION: npm-src_compile
# @DESCRIPTION:
# This function does nothing.
@@ -143,4 +135,4 @@ npm_src_install() {
fi
}
-EXPORT_FUNCTIONS src_unpack src_prepare src_compile src_install
+EXPORT_FUNCTIONS src_unpack src_compile src_install
