[gentoo-commits] repo/gentoo:master commit in: dev-cpp/waylandpp/

[Craig Andrews]

commit:     9b06e9c5daf648c0e02964a967e59cb4e3a93df4
Author:     Craig Andrews <candrews <AT> gentoo <DOT> org>
AuthorDate: Thu Sep  7 13:10:25 2017 +0000
Commit:     Craig Andrews <candrews <AT> gentoo <DOT> org>
CommitDate: Thu Sep  7 13:11:06 2017 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=9b06e9c5

dev-cpp/waylandpp: 0.1.2 version bump

Package-Manager: Portage-2.3.8, Repoman-2.3.3

 dev-cpp/waylandpp/Manifest                                          | 1 +
 dev-cpp/waylandpp/{waylandpp-9999.ebuild => waylandpp-0.1.2.ebuild} | 6 +++---
 dev-cpp/waylandpp/waylandpp-9999.ebuild                             | 6 +++---
 3 files changed, 7 insertions(+), 6 deletions(-)

diff --git a/dev-cpp/waylandpp/Manifest b/dev-cpp/waylandpp/Manifest
index 49e18e0bbbb..721254e78e7 100644
--- a/dev-cpp/waylandpp/Manifest
+++ b/dev-cpp/waylandpp/Manifest
@@ -1 +1,2 @@
 DIST waylandpp-0.1.0.tar.gz 166427 SHA256 
117df357cbd1f272737b6379e05925b38bad41bafda02761017530053fa950e7 SHA512 
e0521ea99eeb7ae196ed9c8759e10d28406c5b99534b52ac51845cdd9c384ff820e4cc1fec65c537a0d071046746884793da122c72f6e75e7df4bca089d19eca
 WHIRLPOOL 
1d589fbe1884dbd38547a0957b07533e3029cca7453618375227d87afa90fa36eded62283bf302139920860c90b250aeaca9b48e0f8098b0f9f8bbaffa889067
+DIST waylandpp-0.1.2.tar.gz 166624 SHA256 
fabf0b512285abea77678d9e079009569e9eb3fd98c6b851d50bc5b6c781c7d8 SHA512 
2304390be26134561fb69e208a6bafd0e9789e6b212ff2f46384c6ed50ae1c9eca3f06a3b4958c8e710cc1a0be61ed84c7ff292ec7011dbb0396cd2d83363f7f
 WHIRLPOOL 
2633f41c0038c5f353ce7d9771c09d7a60ade11e9e7d0209180fb9f450437b37c3feebc955568335ce3371aae9b5083ab3425a8256157c5e7f94e0bd009ea3df

diff --git a/dev-cpp/waylandpp/waylandpp-9999.ebuild 
b/dev-cpp/waylandpp/waylandpp-0.1.2.ebuild
similarity index 77%
copy from dev-cpp/waylandpp/waylandpp-9999.ebuild
copy to dev-cpp/waylandpp/waylandpp-0.1.2.ebuild
index 112c1a2776d..4b36e9aea8e 100644
--- a/dev-cpp/waylandpp/waylandpp-9999.ebuild
+++ b/dev-cpp/waylandpp/waylandpp-0.1.2.ebuild
@@ -33,18 +33,18 @@ DEPEND="${RDEPEND}
 
 src_prepare() {
        default
-       sed -i -e "s:\$\${prefix}/lib:$\${prefix}/$(get_libdir):" -e 
"s:os.path.join(prefix, \"lib\":os.path.join(prefix, \"$(get_libdir)\":g" 
SConstruct || die
+       sed -i -e "s:\$\${prefix}/lib:$\${prefix}/$(get_libdir):" -e 
"s:os.path.join(root, prefix, \"lib\":os.path.join(root, prefix, 
\"$(get_libdir)\":g" SConstruct || die
 }
 
 src_compile() {
-       CC="$(tc-getCXX)" PKG_CONFIG="$(tc-getPKG_CONFIG)" PREFIX="${D%/}/usr" 
escons
+       CC="$(tc-getCXX)" PKG_CONFIG="$(tc-getPKG_CONFIG)" ROOT="${D%/}/" 
PREFIX="/usr" escons
        if use doc; then
                doxygen || die "error making docs"
        fi
 }
 
 src_install() {
-       CC="$(tc-getCXX)" PKG_CONFIG="$(tc-getPKG_CONFIG)" PREFIX="${D%/}/usr" 
escons install
+       CC="$(tc-getCXX)" PKG_CONFIG="$(tc-getPKG_CONFIG)" ROOT="${D%/}/" 
PREFIX="/usr" escons install
        # fix multilib-strict QA failures
        if use doc; then
                doman doc/man/man3/*.3

diff --git a/dev-cpp/waylandpp/waylandpp-9999.ebuild 
b/dev-cpp/waylandpp/waylandpp-9999.ebuild
index 112c1a2776d..4b36e9aea8e 100644
--- a/dev-cpp/waylandpp/waylandpp-9999.ebuild
+++ b/dev-cpp/waylandpp/waylandpp-9999.ebuild
@@ -33,18 +33,18 @@ DEPEND="${RDEPEND}
 
 src_prepare() {
        default
-       sed -i -e "s:\$\${prefix}/lib:$\${prefix}/$(get_libdir):" -e 
"s:os.path.join(prefix, \"lib\":os.path.join(prefix, \"$(get_libdir)\":g" 
SConstruct || die
+       sed -i -e "s:\$\${prefix}/lib:$\${prefix}/$(get_libdir):" -e 
"s:os.path.join(root, prefix, \"lib\":os.path.join(root, prefix, 
\"$(get_libdir)\":g" SConstruct || die
 }
 
 src_compile() {
-       CC="$(tc-getCXX)" PKG_CONFIG="$(tc-getPKG_CONFIG)" PREFIX="${D%/}/usr" 
escons
+       CC="$(tc-getCXX)" PKG_CONFIG="$(tc-getPKG_CONFIG)" ROOT="${D%/}/" 
PREFIX="/usr" escons
        if use doc; then
                doxygen || die "error making docs"
        fi
 }
 
 src_install() {
-       CC="$(tc-getCXX)" PKG_CONFIG="$(tc-getPKG_CONFIG)" PREFIX="${D%/}/usr" 
escons install
+       CC="$(tc-getCXX)" PKG_CONFIG="$(tc-getPKG_CONFIG)" ROOT="${D%/}/" 
PREFIX="/usr" escons install
        # fix multilib-strict QA failures
        if use doc; then
                doman doc/man/man3/*.3