From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id 17B46138350 for ; Mon, 4 May 2020 03:20:58 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id D94BFE0950; Mon, 4 May 2020 03:20:56 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id C7A10E092D for ; Mon, 4 May 2020 03:20:55 +0000 (UTC) Received: from oystercatcher.gentoo.org (unknown [IPv6:2a01:4f8:202:4333:225:90ff:fed9:fc84]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 5AB5134F4A4 for ; Mon, 4 May 2020 03:20:54 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id CFE482B for ; Mon, 4 May 2020 03:20:52 +0000 (UTC) From: "Samuel Bernardo" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Samuel Bernardo" Message-ID: <1588562399.0f1c2c310094ee73fbd163c4e6c2063c57a84307.samuelbernardo@gentoo> Subject: [gentoo-commits] repo/user/ssnb:master commit in: app-emulation/opennebula/ X-VCS-Repository: repo/user/ssnb X-VCS-Files: app-emulation/opennebula/opennebula-5.10.1.ebuild app-emulation/opennebula/opennebula-5.10.3.ebuild app-emulation/opennebula/opennebula-5.10.4.ebuild X-VCS-Directories: app-emulation/opennebula/ X-VCS-Committer: samuelbernardo X-VCS-Committer-Name: Samuel Bernardo X-VCS-Revision: 0f1c2c310094ee73fbd163c4e6c2063c57a84307 X-VCS-Branch: master Date: Mon, 4 May 2020 03:20:52 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply X-Archives-Salt: 6f711f4e-39a2-4fad-be3b-c3a000c248d3 X-Archives-Hash: aca357ec46660f90d1a458fbd26ebcd1 commit: 0f1c2c310094ee73fbd163c4e6c2063c57a84307 Author: Samuel Bernardo gmail com> AuthorDate: Mon May 4 03:19:59 2020 +0000 Commit: Samuel Bernardo gmail 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 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/*