[gentoo-commits] dev/ultrabug:master commit in: dev-db/riak/

[Alexys Jacob]

commit:     7777d09237006a70ebced41281d442f3927873c9
Author:     Ultrabug <ultrabug <AT> gentoo <DOT> org>
AuthorDate: Fri Dec 23 14:43:03 2011 +0000
Commit:     Alexys Jacob <ultrabug <AT> gentoo <DOT> org>
CommitDate: Fri Dec 23 14:43:03 2011 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=dev/ultrabug.git;a=commit;h=7777d092

bump on riak work

---
 dev-db/riak/Manifest           |    6 +++-
 dev-db/riak/riak-0.14.1.ebuild |   26 ------------------------
 dev-db/riak/riak-1.0.2.ebuild  |   42 ++++++++++++++++++++++++++++++++++++++++
 3 files changed, 46 insertions(+), 28 deletions(-)

diff --git a/dev-db/riak/Manifest b/dev-db/riak/Manifest
index 3932cdd..3d62448 100644
--- a/dev-db/riak/Manifest
+++ b/dev-db/riak/Manifest
@@ -1,2 +1,4 @@
-DIST riak-0.14.1.tar.gz 6664636 RMD160 8d5a21a5d94a633551ab49c26c754f8227d2a74f SHA1 e689d3e8ced14fa7d8bb26f02873ff8e5766961e SHA256 531bab4700f6f7c8b7547145d73ec88d200220d3c45dffe19666a4049d9a305c
-EBUILD riak-0.14.1.ebuild 592 RMD160 0a2fe0ba10d4f5ad98241ccd1d45a6c998355e22 SHA1 1053f0750fbcd7a745d7807943628deda98c9c63 SHA256 99bbcf9fb8c345dbd0812c07c29e575bddac547cce33702a560806f8a61adc82
+AUX riak-1.0.2-erlang_js.patch 581 RMD160 cc31d209ba1a14e87ec5d945183cf224920af276 SHA1 5f821bda9da962d1c3ec85cb097ed5c1632909e5 SHA256 59018feac43be01b6c2bf66c11572891e4a991cf34265909dff2f96970e36d50
+DIST riak-1.0.2.tar.gz 9151355 RMD160 a5f96575cf5665a99e10fb36c9a2587ae408bfb2 SHA1 252ab9a198816c892ba98a66d91e629778624e23 SHA256 0b386ae7a4477ccc29ef9ba195bd84be88049202544572b0c1b42bd589177d58
+EBUILD riak-1.0.2.ebuild 1141 RMD160 bc48fcdde0d540feb352ff230e8b0faa3d39ae69 SHA1 f77018d260775605c2d8cf12df64412c4f03d467 SHA256 f5637031eb6189ac4013db9988999c280397faf9c87e2a22733b5e6a1383e971
+MISC riak-1.0.2.tar.gz 9151355 RMD160 a5f96575cf5665a99e10fb36c9a2587ae408bfb2 SHA1 252ab9a198816c892ba98a66d91e629778624e23 SHA256 0b386ae7a4477ccc29ef9ba195bd84be88049202544572b0c1b42bd589177d58

diff --git a/dev-db/riak/riak-0.14.1.ebuild b/dev-db/riak/riak-0.14.1.ebuild
deleted file mode 100644
index 5592434..0000000
--- a/dev-db/riak/riak-0.14.1.ebuild
+++ /dev/null
@@ -1,26 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: $
-
-EAPI=3
-
-inherit base versionator
-
-MAJ_PV="$(get_major_version)"
-MED_PV="$(get_version_component_range 2)"
-MIN_PV="$(get_version_component_range 3)"
-
-DESCRIPTION="An open source, highly scalable, schema-free document-oriented database"
-HOMEPAGE="http://www.basho.com/"
-SRC_URI="http://downloads.basho.com/${PN}/${PN}-${MAJ_PV}.${MED_PV}/${P}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND="dev-lang/erlang"
-DEPEND="${RDEPEND}"
-
-PATCHES=()
-

diff --git a/dev-db/riak/riak-1.0.2.ebuild b/dev-db/riak/riak-1.0.2.ebuild
new file mode 100644
index 0000000..60effb4
--- /dev/null
+++ b/dev-db/riak/riak-1.0.2.ebuild
@@ -0,0 +1,42 @@
+# Copyright 1999-2011 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: $
+
+EAPI=4
+
+inherit eutils versionator
+
+MAJ_PV="$(get_major_version)"
+MED_PV="$(get_version_component_range 2)"
+MIN_PV="$(get_version_component_range 3)"
+
+DESCRIPTION="An open source, highly scalable, schema-free document-oriented database"
+HOMEPAGE="http://www.basho.com/"
+SRC_URI="http://downloads.basho.com/${PN}/${PN}-${MAJ_PV}.${MED_PV}.${MIN_PV}/${P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+RDEPEND="dev-lang/erlang"
+DEPEND="${RDEPEND}"
+
+PATCHES=()
+
+src_prepare() {
+# 	epatch "${FILESDIR}/riak-1.0.2-erlang_js.patch"
+	sed -i -e 's/R14B0\[23\]/R14B0\[234\]/g' -e "s@compile generate@compile generate --target_dir=${D}@g" rebar.config || die
+	sed -i -e 's/XLDFLAGS="$(LDFLAGS)"//g' -e 's/ $(CFLAGS)//g' deps/erlang_js/c_src/Makefile || die
+}
+
+src_install() {
+	emake DESTDIR="${D}" rel
+
+	mkdir -p ${D}/{usr/sbin,etc,var/lib/${PN}}
+
+	cp -a rel/riak/bin/ "${D}"/usr/sbin
+	cp -a rel/riak/etc/ "${D}"/etc
+	cp -a rel/riak/lib/* "${D}"/var/lib/${PN}
+	cp -a rel/riak/data/* "${D}"/var/lib/${PN}
+}