| 1 |
commit: 0f1c2c310094ee73fbd163c4e6c2063c57a84307 |
| 2 |
Author: Samuel Bernardo <samuelbernardo.mail <AT> gmail <DOT> com> |
| 3 |
AuthorDate: Mon May 4 03:19:59 2020 +0000 |
| 4 |
Commit: Samuel Bernardo <samuelbernardo.mail <AT> gmail <DOT> com> |
| 5 |
CommitDate: Mon May 4 03:19:59 2020 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/user/ssnb.git/commit/?id=0f1c2c31 |
| 7 |
|
| 8 |
Correct lib path into new Gentoo definition |
| 9 |
|
| 10 |
Signed-off-by: Samuel Bernardo <samuelbernardo.mail <AT> gmail.com> |
| 11 |
|
| 12 |
app-emulation/opennebula/opennebula-5.10.1.ebuild | 9 ++++++--- |
| 13 |
app-emulation/opennebula/opennebula-5.10.3.ebuild | 9 ++++++--- |
| 14 |
app-emulation/opennebula/opennebula-5.10.4.ebuild | 9 ++++++--- |
| 15 |
3 files changed, 18 insertions(+), 9 deletions(-) |
| 16 |
|
| 17 |
diff --git a/app-emulation/opennebula/opennebula-5.10.1.ebuild b/app-emulation/opennebula/opennebula-5.10.1.ebuild |
| 18 |
index 4f7f8df..08d23bd 100644 |
| 19 |
--- a/app-emulation/opennebula/opennebula-5.10.1.ebuild |
| 20 |
+++ b/app-emulation/opennebula/opennebula-5.10.1.ebuild |
| 21 |
@@ -102,7 +102,10 @@ src_unpack() { |
| 22 |
|
| 23 |
src_prepare() { |
| 24 |
# install missing source file |
| 25 |
- cp "${FILESDIR}"/${P}/parsers/* "${S}"/src/parsers/ |
| 26 |
+ cp "${FILESDIR}"/${P}/parsers/* "${S}"/src/parsers/ || die "copy parsers files failed" |
| 27 |
+ |
| 28 |
+ # set correct lib path |
| 29 |
+ 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" |
| 30 |
|
| 31 |
# grunt-sass and node-sass versions |
| 32 |
#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" |
| 33 |
@@ -187,10 +190,10 @@ src_install() { |
| 34 |
into /usr |
| 35 |
dobin usr/bin/* |
| 36 |
|
| 37 |
- cp -a usr/lib/one/* "${ED}"/usr/$(get_libdir)/one/ |
| 38 |
+ cp -a usr/$(get_libdir)/one/* "${ED}"/usr/$(get_libdir)/one/ |
| 39 |
cp -a usr/share/one/* "${ED}"/usr/share/one/ |
| 40 |
cp -a var/lib/one/* "${ED}"/var/lib/one/ |
| 41 |
- rm -rf usr/bin usr/lib/one usr/share/one var/lib/one |
| 42 |
+ rm -rf usr/bin usr/$(get_libdir)/one usr/share/one var/lib/one |
| 43 |
|
| 44 |
# add documentation |
| 45 |
dodoc usr/share/docs/one/* |
| 46 |
|
| 47 |
diff --git a/app-emulation/opennebula/opennebula-5.10.3.ebuild b/app-emulation/opennebula/opennebula-5.10.3.ebuild |
| 48 |
index 9adf118..93c0037 100644 |
| 49 |
--- a/app-emulation/opennebula/opennebula-5.10.3.ebuild |
| 50 |
+++ b/app-emulation/opennebula/opennebula-5.10.3.ebuild |
| 51 |
@@ -104,7 +104,10 @@ src_unpack() { |
| 52 |
|
| 53 |
src_prepare() { |
| 54 |
# install missing source file |
| 55 |
- #cp "${FILESDIR}"/${P}/parsers/* "${S}"/src/parsers/ |
| 56 |
+ #cp "${FILESDIR}"/${P}/parsers/* "${S}"/src/parsers/ || die "copy parsers files failed" |
| 57 |
+ |
| 58 |
+ # set correct lib path |
| 59 |
+ 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" |
| 60 |
|
| 61 |
# grunt-sass and node-sass versions |
| 62 |
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" |
| 63 |
@@ -193,10 +196,10 @@ src_install() { |
| 64 |
into /usr |
| 65 |
dobin usr/bin/* |
| 66 |
|
| 67 |
- cp -a usr/lib/one/* "${ED}"/usr/$(get_libdir)/one/ |
| 68 |
+ cp -a usr/$(get_libdir)/one/* "${ED}"/usr/$(get_libdir)/one/ |
| 69 |
cp -a usr/share/one/* "${ED}"/usr/share/one/ |
| 70 |
cp -a var/lib/one/* "${ED}"/var/lib/one/ |
| 71 |
- rm -rf usr/bin usr/lib/one usr/share/one var/lib/one |
| 72 |
+ rm -rf usr/bin usr/$(get_libdir)/one usr/share/one var/lib/one |
| 73 |
|
| 74 |
# add documentation |
| 75 |
dodoc usr/share/docs/one/* |
| 76 |
|
| 77 |
diff --git a/app-emulation/opennebula/opennebula-5.10.4.ebuild b/app-emulation/opennebula/opennebula-5.10.4.ebuild |
| 78 |
index 9adf118..93c0037 100644 |
| 79 |
--- a/app-emulation/opennebula/opennebula-5.10.4.ebuild |
| 80 |
+++ b/app-emulation/opennebula/opennebula-5.10.4.ebuild |
| 81 |
@@ -104,7 +104,10 @@ src_unpack() { |
| 82 |
|
| 83 |
src_prepare() { |
| 84 |
# install missing source file |
| 85 |
- #cp "${FILESDIR}"/${P}/parsers/* "${S}"/src/parsers/ |
| 86 |
+ #cp "${FILESDIR}"/${P}/parsers/* "${S}"/src/parsers/ || die "copy parsers files failed" |
| 87 |
+ |
| 88 |
+ # set correct lib path |
| 89 |
+ 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" |
| 90 |
|
| 91 |
# grunt-sass and node-sass versions |
| 92 |
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" |
| 93 |
@@ -193,10 +196,10 @@ src_install() { |
| 94 |
into /usr |
| 95 |
dobin usr/bin/* |
| 96 |
|
| 97 |
- cp -a usr/lib/one/* "${ED}"/usr/$(get_libdir)/one/ |
| 98 |
+ cp -a usr/$(get_libdir)/one/* "${ED}"/usr/$(get_libdir)/one/ |
| 99 |
cp -a usr/share/one/* "${ED}"/usr/share/one/ |
| 100 |
cp -a var/lib/one/* "${ED}"/var/lib/one/ |
| 101 |
- rm -rf usr/bin usr/lib/one usr/share/one var/lib/one |
| 102 |
+ rm -rf usr/bin usr/$(get_libdir)/one usr/share/one var/lib/one |
| 103 |
|
| 104 |
# add documentation |
| 105 |
dodoc usr/share/docs/one/* |
Archives