[gentoo-commits] dev/ultrabug:master commit in: dev-libs/libaerospike/

[Alexys Jacob]

commit:     a348c2a4d4cb71e0edbbb9a15dd8a413854b753b
Author:     Ultrabug <ultrabug <AT> gentoo <DOT> org>
AuthorDate: Thu Aug  6 12:23:43 2015 +0000
Commit:     Alexys Jacob <ultrabug <AT> gentoo <DOT> org>
CommitDate: Thu Aug  6 12:23:43 2015 +0000
URL:        https://gitweb.gentoo.org/dev/ultrabug.git/commit/?id=a348c2a4

libaerospike version bump

 dev-libs/libaerospike/Manifest                                 |  2 +-
 .../{libaerospike-3.1.11.ebuild => libaerospike-3.1.20.ebuild} | 10 +++++++++-
 2 files changed, 10 insertions(+), 2 deletions(-)

diff --git a/dev-libs/libaerospike/Manifest b/dev-libs/libaerospike/Manifest
index e704ad5..e198127 100644
--- a/dev-libs/libaerospike/Manifest
+++ b/dev-libs/libaerospike/Manifest
@@ -1 +1 @@
-EBUILD libaerospike-3.1.11.ebuild 1343 SHA256 
55913110b2b7f9c0ec32a9b2533165666390f0ffe4f6bdb0b7497fd1e0bd4f05 SHA512 
a7548eecfeed451dcfaf35095cd1c4620230785c328f3d45676673ccdcebf0a1caf7a10ea7ab78be063f2992af75f98b924fa8fc66779f72b643fefc8053c7e3
 WHIRLPOOL 
b88e6b6e083ce33e4998517d9a1c8a95f0372bce753860cba896cc6f4cb6c5615b580706be560b226c0bebc3b4a1ea1ddc76193799e8c995774d056d51cfdb68
+EBUILD libaerospike-3.1.20.ebuild 1676 SHA256 
7a26f91776969e27109818ea1564549b37240050752c5546db982c0c91861654 SHA512 
65e8a9bc904ea2eb00ff1699fa176e933837d95ee8e7a755e4250a631a4527cd8f9f38c0fe41468a3eec04a1c5db6f0eeabfbe800400f7d718adf1966bd084bd
 WHIRLPOOL 
b0ec2229445c5b4ed6f674caa07139e982aa6354dd88b22c79e45c0cb9c50a40d546ec303d9bd54a98768084e81799fecc715ab3f9f57c97683de592b472adf0

diff --git a/dev-libs/libaerospike/libaerospike-3.1.11.ebuild 
b/dev-libs/libaerospike/libaerospike-3.1.20.ebuild
similarity index 76%
rename from dev-libs/libaerospike/libaerospike-3.1.11.ebuild
rename to dev-libs/libaerospike/libaerospike-3.1.20.ebuild
index 09737c1..ebe1374 100644
--- a/dev-libs/libaerospike/libaerospike-3.1.11.ebuild
+++ b/dev-libs/libaerospike/libaerospike-3.1.20.ebuild
@@ -36,12 +36,20 @@ src_prepare() {
        use luajit && sed -e 's/^USE_LUAJIT = 0/USE_LUAJIT = 1/g' -i Makefile
 
        git submodule update --init
+
+       # main, applies to all modules
+       sed -e "s/CC = cc/CC = $(tc-getCC)/g" \
+               -e "s/LD = cc/CC = $(tc-getCC)/g" \
+               -i project/settings.mk || die
+
+       # include dir
+       sed -e 's@/usr/local@/usr@g' -i Makefile -i modules/mod-lua/Makefile -i 
modules/luajit/src/Makefile -i modules/ck/Makefile.in -i 
modules/luajit/Makefile || die
 }
 
 src_compile() {
        # forced MAKEOPTS, see:
        # https://github.com/aerospike/aerospike-client-c/issues/22
-       CC=$(tc-getCC) LD=$(tc-getCC) MAKEOPTS="-j1" emake all
+       CC=$(tc-getCC) LD=$(tc-getCC) MAKEOPTS="-j1" PREFIX=/usr emake all
 }
 
 src_install() {