[gentoo-commits] repo/user/ssnb:master commit in: app-emulation/opennebula/

["Samuel Bernardo" <samuelbernardo.mail@gmail.com>]

commit:     0f1c2c310094ee73fbd163c4e6c2063c57a84307
Author:     Samuel Bernardo <samuelbernardo.mail <AT> gmail <DOT> com>
AuthorDate: Mon May  4 03:19:59 2020 +0000
Commit:     Samuel Bernardo <samuelbernardo.mail <AT> gmail <DOT> com>
CommitDate: Mon May  4 03:19:59 2020 +0000
URL:        https://gitweb.gentoo.org/repo/user/ssnb.git/commit/?id=0f1c2c31

Correct lib path into new Gentoo definition

Signed-off-by: Samuel Bernardo <samuelbernardo.mail <AT> gmail.com>

 app-emulation/opennebula/opennebula-5.10.1.ebuild | 9 ++++++---
 app-emulation/opennebula/opennebula-5.10.3.ebuild | 9 ++++++---
 app-emulation/opennebula/opennebula-5.10.4.ebuild | 9 ++++++---
 3 files changed, 18 insertions(+), 9 deletions(-)

diff --git a/app-emulation/opennebula/opennebula-5.10.1.ebuild b/app-emulation/opennebula/opennebula-5.10.1.ebuild
index 4f7f8df..08d23bd 100644
--- a/app-emulation/opennebula/opennebula-5.10.1.ebuild
+++ b/app-emulation/opennebula/opennebula-5.10.1.ebuild
@@ -102,7 +102,10 @@ src_unpack() {
 
 src_prepare() {
 	# install missing source file
-	cp "${FILESDIR}"/${P}/parsers/* "${S}"/src/parsers/
+	cp "${FILESDIR}"/${P}/parsers/* "${S}"/src/parsers/ || die "copy parsers files failed"
+
+	# set correct lib path
+	for f in $(grep -rlI "/usr/lib/one" .); do sed -i -e "s/\/usr\/lib\/one/\/usr\/$(get_libdir)\/one/g" $f; done || die "correct lib dir failed"
 
 	# grunt-sass and node-sass versions
 	#sed -i -e 's|1.2.1|2.1.0|' -e 's|3.10.1|4.13.0|' src/sunstone/public/package.json || die "sed failed"
@@ -187,10 +190,10 @@ src_install() {
 	into /usr
 	dobin usr/bin/*
 
-	cp -a usr/lib/one/* "${ED}"/usr/$(get_libdir)/one/
+	cp -a usr/$(get_libdir)/one/* "${ED}"/usr/$(get_libdir)/one/
 	cp -a usr/share/one/* "${ED}"/usr/share/one/
 	cp -a var/lib/one/* "${ED}"/var/lib/one/
-	rm -rf usr/bin usr/lib/one usr/share/one var/lib/one
+	rm -rf usr/bin usr/$(get_libdir)/one usr/share/one var/lib/one
 
 	# add documentation
 	dodoc usr/share/docs/one/*

diff --git a/app-emulation/opennebula/opennebula-5.10.3.ebuild b/app-emulation/opennebula/opennebula-5.10.3.ebuild
index 9adf118..93c0037 100644
--- a/app-emulation/opennebula/opennebula-5.10.3.ebuild
+++ b/app-emulation/opennebula/opennebula-5.10.3.ebuild
@@ -104,7 +104,10 @@ src_unpack() {
 
 src_prepare() {
 	# install missing source file
-	#cp "${FILESDIR}"/${P}/parsers/* "${S}"/src/parsers/
+	#cp "${FILESDIR}"/${P}/parsers/* "${S}"/src/parsers/ || die "copy parsers files failed"
+
+	# set correct lib path
+	for f in $(grep -rlI "/usr/lib/one" .); do sed -i -e "s/\/usr\/lib\/one/\/usr\/$(get_libdir)\/one/g" $f; done || die "correct lib dir failed"
 
 	# grunt-sass and node-sass versions
 	sed -i -e 's|1.2.1|2.1.0|' -e 's|3.10.1|4.13.0|' src/sunstone/public/package.json || die "sed failed"
@@ -193,10 +196,10 @@ src_install() {
 	into /usr
 	dobin usr/bin/*
 
-	cp -a usr/lib/one/* "${ED}"/usr/$(get_libdir)/one/
+	cp -a usr/$(get_libdir)/one/* "${ED}"/usr/$(get_libdir)/one/
 	cp -a usr/share/one/* "${ED}"/usr/share/one/
 	cp -a var/lib/one/* "${ED}"/var/lib/one/
-	rm -rf usr/bin usr/lib/one usr/share/one var/lib/one
+	rm -rf usr/bin usr/$(get_libdir)/one usr/share/one var/lib/one
 
 	# add documentation
 	dodoc usr/share/docs/one/*

diff --git a/app-emulation/opennebula/opennebula-5.10.4.ebuild b/app-emulation/opennebula/opennebula-5.10.4.ebuild
index 9adf118..93c0037 100644
--- a/app-emulation/opennebula/opennebula-5.10.4.ebuild
+++ b/app-emulation/opennebula/opennebula-5.10.4.ebuild
@@ -104,7 +104,10 @@ src_unpack() {
 
 src_prepare() {
 	# install missing source file
-	#cp "${FILESDIR}"/${P}/parsers/* "${S}"/src/parsers/
+	#cp "${FILESDIR}"/${P}/parsers/* "${S}"/src/parsers/ || die "copy parsers files failed"
+
+	# set correct lib path
+	for f in $(grep -rlI "/usr/lib/one" .); do sed -i -e "s/\/usr\/lib\/one/\/usr\/$(get_libdir)\/one/g" $f; done || die "correct lib dir failed"
 
 	# grunt-sass and node-sass versions
 	sed -i -e 's|1.2.1|2.1.0|' -e 's|3.10.1|4.13.0|' src/sunstone/public/package.json || die "sed failed"
@@ -193,10 +196,10 @@ src_install() {
 	into /usr
 	dobin usr/bin/*
 
-	cp -a usr/lib/one/* "${ED}"/usr/$(get_libdir)/one/
+	cp -a usr/$(get_libdir)/one/* "${ED}"/usr/$(get_libdir)/one/
 	cp -a usr/share/one/* "${ED}"/usr/share/one/
 	cp -a var/lib/one/* "${ED}"/var/lib/one/
-	rm -rf usr/bin usr/lib/one usr/share/one var/lib/one
+	rm -rf usr/bin usr/$(get_libdir)/one usr/share/one var/lib/one
 
 	# add documentation
 	dodoc usr/share/docs/one/*