dev-db/rqlite: version bump to 3.0.1

Package-Manager: portage-2.2.28

3 files changed, 98 insertions, 4 deletions

diff --git a/dev-db/rqlite/Manifest b/dev-db/rqlite/Manifest
index 19eba91fe308..f146efa3c6f7 100644
--- a/dev-db/rqlite/Manifest
+++ b/dev-db/rqlite/Manifest
@@ -5,3 +5,4 @@ DIST go-sqlite3-1.1.0_p20160307.tar.gz 1847839 SHA256 f3551d37bb2a485ef2c62c205b
 DIST hashicorp-boltdb-d1e82c1ec3f15ee991f7cc7ffd5b67ff6f5bbaee.tar.gz 8881 SHA256 490ced07cc72baede9b997dcf92499fa0d4298926fbc51ee632bde3d3ea0979e SHA512 4f98cf8cf375561f255822cbd21b6926d3bd12ff2a1d9307b59ce5e12628034f197f6efc85d9cc9cf951eac7402b36954c2ea686bb033075ec840106614f2039 WHIRLPOOL 337d399c6b73893bb72d77a77e6b2c7b5ee914d191b719dec13f72975c0a4ece1ee6a902d32197bbf0f0300bdc3ce8efda082363a1e79a7d3f2d8aec6eb2d436
 DIST hashicorp-raft-057b893fd996696719e98b6c44649ea14968c811.tar.gz 60617 SHA256 0a97044468f5a7b0640296c0bf25c9b66c2f78a6df9fdd8bf8ea5d624549ea93 SHA512 cc98717d405e3ee2479d44d79a98228faba3ca3ff41064490dde7555ca35bc65d3a8765778298fd0372b6a8afd0b00e5a557b8ad736709a0534c3fc85f61f3d7 WHIRLPOOL 74fd868a541d356284482c4af37b8affd61bf9588ec8c8f631cdb65d5c019cb5e4c78472b2fe111b137bf3aaf414c49c994e03a08522342047cd140df20986c6
 DIST rqlite-2.1.tar.gz 22054 SHA256 0720cbf6972e83c7ca588440dee7f3c75d92baa5869244b3a36a8bb71b58af36 SHA512 fc34ef604a3b8c0d574d78e75baabdf9c1d859771a076a6cd1c11c0737d8bd412f23be44bbeb0ef6404700e22149c93f0d54e27046f9350b43e9c492b72ae457 WHIRLPOOL 2bc9f25ef533c0e55b317ad1cf2325643b772b6219e2af2e7a5510bdbae9d516f83a5547548336ba456dcb19c8ff440178a4547ff486602b99bab413bd3b839b
+DIST rqlite-3.0.1.tar.gz 38710 SHA256 c71308eb6703094d3b0c031d55c07e660e4820c92519bcdba3a6a1326fd80fa5 SHA512 7103676e35c35ca06a004bd8f49f335702f6ec4e7338c58e5c161ef1bf94b2647098b1ef00e1a8555f9e23ca11ef8d882880ee18d1fa9adfe4baac1d428d7339 WHIRLPOOL 9930dc4a89859686ef3b9d6a6bcb6f97a2685a108c8b0a6e75a6625d28ba061bbc107dbc7833f59149913e9308d8c6a34d2586ebfb7b568343eb5e8f98b91a8b
diff --git a/dev-db/rqlite/rqlite-3.0.1.ebuild b/dev-db/rqlite/rqlite-3.0.1.ebuild
new file mode 100644
index 000000000000..815ac44c094e
--- /dev/null
+++ b/dev-db/rqlite/rqlite-3.0.1.ebuild
@@ -0,0 +1,94 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+if [[ ${PV} == *9999* ]]; then
+	inherit git-r3
+fi
+
+inherit golang-build
+
+KEYWORDS="~amd64"
+DESCRIPTION="Replicated SQLite using the Raft consensus protocol"
+EGO_PN="github.com/rqlite/rqlite/..."
+HOMEPAGE="https://${EGO_PN%/*} http://www.philipotoole.com/tag/rqlite/"
+LICENSE="MIT"
+SLOT="0/${PVR}"
+IUSE=""
+EGIT_REPO_URI="https://github.com/rqlite/rqlite.git"
+EGIT_COMMIT="v${PV}"
+SRC_URI="https://${EGO_PN%/*}/archive/${EGIT_COMMIT}.tar.gz -> ${P}.tar.gz
+	https://github.com/armon/go-metrics/archive/345426c77237ece5dab0e1605c3e4b35c3f54757.tar.gz -> go-metrics-345426c77237ece5dab0e1605c3e4b35c3f54757.tar.gz
+	https://github.com/boltdb/bolt/archive/ee4a0888a9abe7eefe5a0992ca4cb06864839873.tar.gz -> bolt-ee4a0888a9abe7eefe5a0992ca4cb06864839873.tar.gz
+	https://github.com/hashicorp/go-msgpack/archive/fa3f63826f7c23912c15263591e65d54d080b458.tar.gz -> go-msgpack-fa3f63826f7c23912c15263591e65d54d080b458.tar.gz
+	https://github.com/hashicorp/raft/archive/057b893fd996696719e98b6c44649ea14968c811.tar.gz -> hashicorp-raft-057b893fd996696719e98b6c44649ea14968c811.tar.gz
+	https://github.com/hashicorp/raft-boltdb/archive/d1e82c1ec3f15ee991f7cc7ffd5b67ff6f5bbaee.tar.gz -> hashicorp-boltdb-d1e82c1ec3f15ee991f7cc7ffd5b67ff6f5bbaee.tar.gz
+	https://github.com/mattn/go-sqlite3/archive/10876d7dac65f02064c03d7372a2f1dfb90043fe.tar.gz -> go-sqlite3-1.1.0_p20160307.tar.gz"
+
+get_archive_go_package() {
+	local archive=${1} uri x
+	for x in ${SRC_URI}; do
+		if [[ ${x} == http* ]]; then
+			uri=${x}
+		elif [[ ${x} == ${archive} ]]; then
+			break
+		fi
+	done
+	uri=${uri#https://}
+	echo ${uri%/archive/*}
+}
+
+unpack_go_packages() {
+	local go_package x
+	# Unpack packages to appropriate locations for GOPATH
+	for x in ${A}; do
+		unpack ${x}
+		if [[ ${x} == *.tar.gz ]]; then
+			go_package=$(get_archive_go_package ${x})
+			if [[ ${x%.tar.gz} -ef ${S} ]]; then
+				mv "${S}"{,_} || die
+				mkdir -p "${S}/src/${go_package%/*}" || die
+				mv "${S}"_ "${S}/src/${go_package}" || die || die
+			else
+				mkdir -p "${S}/src/${go_package%/*}" || die
+				for x in "${go_package##*/}"-*; do
+					if [[ ! ${x} -ef ${S} ]]; then
+						mv "${x}" "${S}/src/${go_package}" || die
+					fi
+				done
+			fi
+		fi
+	done
+}
+
+src_unpack() {
+	if [[ ${PV} == *9999* ]]; then
+		git-r3_src_unpack
+		mv "${S}"{,_} || die
+		mkdir -p "$(dirname "${S}/src/${EGO_PN%/*}")" || die
+		mv "${S}_" "${S}/src/${EGO_PN%/*}" || die
+	fi
+	unpack_go_packages
+}
+
+src_compile() {
+	# Omit $(get_golibdir_gopath) from GOPATH, in order to avoid
+	# interference from installed rqlite sources.
+	GOPATH="${WORKDIR}/${P}" \
+		go install -v -work -x ${EGO_BUILD_FLAGS} "${EGO_PN}" || die
+}
+
+src_install() {
+	golang_install_pkgs
+}
+
+golang_install_pkgs() {
+	dobin bin/${PN}d
+	insinto $(dirname "${EPREFIX}$(get_golibdir)/src/${EGO_PN%/*}")
+	rm -rf "${S}"/src/${EGO_PN%/*}/.git*
+	doins -r "${S}"/src/${EGO_PN%/*}
+	insinto $(dirname "${EPREFIX}$(get_golibdir)/pkg/$(go env GOOS)_$(go env GOARCH)/${EGO_PN%/*}")
+	doins -r "${S}"/pkg/$(go env GOOS)_$(go env GOARCH)/${EGO_PN%/*}{,.a}
+	dodoc "${S}/src/${EGO_PN%/*}/"*.md
+}
diff --git a/dev-db/rqlite/rqlite-9999.ebuild b/dev-db/rqlite/rqlite-9999.ebuild
index 3ed035a17a5d..cc4ef9f4ed94 100644
--- a/dev-db/rqlite/rqlite-9999.ebuild
+++ b/dev-db/rqlite/rqlite-9999.ebuild
@@ -10,15 +10,14 @@ fi
 inherit golang-build
 
 KEYWORDS=""
-DESCRIPTION="Replicated SQLite using the Raft consensus protocol "
+DESCRIPTION="Replicated SQLite using the Raft consensus protocol"
 EGO_PN="github.com/rqlite/rqlite/..."
 HOMEPAGE="https://${EGO_PN%/*} http://www.philipotoole.com/tag/rqlite/"
 LICENSE="MIT"
 SLOT="0/${PVR}"
 IUSE=""
-RESTRICT="test"
 EGIT_REPO_URI="https://github.com/rqlite/rqlite.git"
-#EGIT_COMMIT="32514f4744917937d8ac9a85f4ad7ee7adcfe3d7"
+#EGIT_COMMIT="e3c20964fbdda2e865a5af20667a74fc2c3b5582"
 SRC_URI="
 	https://github.com/armon/go-metrics/archive/345426c77237ece5dab0e1605c3e4b35c3f54757.tar.gz -> go-metrics-345426c77237ece5dab0e1605c3e4b35c3f54757.tar.gz
 	https://github.com/boltdb/bolt/archive/ee4a0888a9abe7eefe5a0992ca4cb06864839873.tar.gz -> bolt-ee4a0888a9abe7eefe5a0992ca4cb06864839873.tar.gz
@@ -91,5 +90,5 @@ golang_install_pkgs() {
 	doins -r "${S}"/src/${EGO_PN%/*}
 	insinto $(dirname "${EPREFIX}$(get_golibdir)/pkg/$(go env GOOS)_$(go env GOARCH)/${EGO_PN%/*}")
 	doins -r "${S}"/pkg/$(go env GOOS)_$(go env GOARCH)/${EGO_PN%/*}{,.a}
-	dodoc "${S}/src/${EGO_PN%/*}/"{CHANGELOG,README}.md
+	dodoc "${S}/src/${EGO_PN%/*}/"*.md
 }