Bump

(Portage version: 2.2.14/cvs/Linux x86_64, unsigned Manifest commit)

5 files changed, 12 insertions, 141 deletions

diff --git a/dev-db/hyperdex/ChangeLog b/dev-db/hyperdex/ChangeLog
index e9fae9c4767d..751a20cfe174 100644
--- a/dev-db/hyperdex/ChangeLog
+++ b/dev-db/hyperdex/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for dev-db/hyperdex
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-db/hyperdex/ChangeLog,v 1.26 2014/09/17 03:25:08 patrick Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-db/hyperdex/ChangeLog,v 1.27 2014/11/23 13:23:26 patrick Exp $
+
+*hyperdex-1.5.0 (23 Nov 2014)
+
+  23 Nov 2014; Patrick Lauer <patrick@gentoo.org> +hyperdex-1.5.0.ebuild,
+  -hyperdex-1.1.0.ebuild, -hyperdex-1.2.0-r1.ebuild, -hyperdex-1.3.0.ebuild,
+  -hyperdex-1.3.1.ebuild:
+  Bump
 
 *hyperdex-1.4.5 (17 Sep 2014)
 
diff --git a/dev-db/hyperdex/hyperdex-1.1.0.ebuild b/dev-db/hyperdex/hyperdex-1.1.0.ebuild
deleted file mode 100644
index 4b61ab1e559c..000000000000
--- a/dev-db/hyperdex/hyperdex-1.1.0.ebuild
+++ /dev/null
@@ -1,45 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-db/hyperdex/hyperdex-1.1.0.ebuild,v 1.1 2014/02/21 03:34:49 patrick Exp $
-EAPI=5
-
-RESTRICT="test"
-PYTHON_DEPEND="2:2.6"
-inherit eutils python
-
-DESCRIPTION="A searchable distributed Key-Value Store"
-
-HOMEPAGE="http://hyperdex.org"
-SRC_URI="http://hyperdex.org/src/${P}.tar.gz"
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~amd64"
-
-IUSE="+python"
-# need to add ruby and java useflags too
-
-DEPEND="dev-cpp/glog
-	dev-cpp/sparsehash
-	dev-libs/cityhash
-	dev-libs/libpo6
-	dev-libs/libe
-	dev-libs/busybee
-	dev-libs/popt
-	dev-libs/replicant"
-RDEPEND="${DEPEND}"
-
-pkg_setup() {
-	python_set_active_version 2
-}
-
-src_configure() {
-	econf --disable-static \
-		$(use_enable python python-bindings)
-}
-
-src_install() {
-	emake DESTDIR="${D}" install || die "Failed to install"
-	newinitd "${FILESDIR}/hyperdex.initd" hyperdex || die "Failed to install init script"
-	newconfd "${FILESDIR}/hyperdex.confd" hyperdex || die "Failed to install config file"
-	find "${D}" -name '*.la' -exec rm {} \; # bad buildsystem! bad!
-}
diff --git a/dev-db/hyperdex/hyperdex-1.3.0.ebuild b/dev-db/hyperdex/hyperdex-1.3.0.ebuild
deleted file mode 100644
index 5fbae19c246f..000000000000
--- a/dev-db/hyperdex/hyperdex-1.3.0.ebuild
+++ /dev/null
@@ -1,47 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-db/hyperdex/hyperdex-1.3.0.ebuild,v 1.1 2014/05/22 08:35:49 patrick Exp $
-EAPI=5
-
-PYTHON_COMPAT=( python2_7)
-inherit eutils python-r1 autotools
-
-DESCRIPTION="A searchable distributed Key-Value Store"
-
-HOMEPAGE="http://hyperdex.org"
-SRC_URI="http://hyperdex.org/src/${P}.tar.gz
-	http://dev.gentooexperimental.org/~patrick/autotools-java.tar"
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~amd64"
-
-IUSE="+python"
-# need to add ruby and java useflags too
-
-DEPEND="dev-cpp/glog
-	dev-cpp/sparsehash
-	dev-libs/cityhash
-	dev-libs/libpo6
-	dev-libs/libe
-	dev-libs/busybee
-	dev-libs/popt
-	dev-libs/replicant
-	dev-libs/json-c"
-RDEPEND="${DEPEND}"
-
-src_prepare() {
-	cp "${WORKDIR}/"*.m4 m4/
-	sed -i -e 's~json/json.h~json-c/json.h~' configure.ac common/datatype_document.cc daemon/index_document.cc || die "Blergh!"
-	eautoreconf
-}
-src_configure() {
-	econf --disable-static \
-		$(use_enable python python-bindings)
-}
-
-src_install() {
-	emake DESTDIR="${D}" install || die "Failed to install"
-	newinitd "${FILESDIR}/hyperdex.initd" hyperdex || die "Failed to install init script"
-	newconfd "${FILESDIR}/hyperdex.confd" hyperdex || die "Failed to install config file"
-	find "${D}" -name '*.la' -exec rm {} \; # bad buildsystem! bad!
-}
diff --git a/dev-db/hyperdex/hyperdex-1.3.1.ebuild b/dev-db/hyperdex/hyperdex-1.3.1.ebuild
deleted file mode 100644
index b1dc2ee51ad4..000000000000
--- a/dev-db/hyperdex/hyperdex-1.3.1.ebuild
+++ /dev/null
@@ -1,47 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-db/hyperdex/hyperdex-1.3.1.ebuild,v 1.1 2014/07/11 02:56:11 patrick Exp $
-EAPI=5
-
-PYTHON_COMPAT=( python2_7)
-inherit eutils python-r1 autotools
-
-DESCRIPTION="A searchable distributed Key-Value Store"
-
-HOMEPAGE="http://hyperdex.org"
-SRC_URI="http://hyperdex.org/src/${P}.tar.gz
-	http://dev.gentooexperimental.org/~patrick/autotools-java.tar"
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~amd64"
-
-IUSE="+python"
-# need to add ruby and java useflags too
-
-DEPEND="dev-cpp/glog
-	dev-cpp/sparsehash
-	dev-libs/cityhash
-	dev-libs/libpo6
-	dev-libs/libe
-	dev-libs/busybee
-	dev-libs/popt
-	dev-libs/replicant
-	dev-libs/json-c"
-RDEPEND="${DEPEND}"
-
-src_prepare() {
-	cp "${WORKDIR}/"*.m4 m4/
-	sed -i -e 's~json/json.h~json-c/json.h~' configure.ac common/datatype_document.cc daemon/index_document.cc || die "Blergh!"
-	eautoreconf
-}
-src_configure() {
-	econf --disable-static \
-		$(use_enable python python-bindings)
-}
-
-src_install() {
-	emake DESTDIR="${D}" install || die "Failed to install"
-	newinitd "${FILESDIR}/hyperdex.initd" hyperdex || die "Failed to install init script"
-	newconfd "${FILESDIR}/hyperdex.confd" hyperdex || die "Failed to install config file"
-	find "${D}" -name '*.la' -exec rm {} \; # bad buildsystem! bad!
-}
diff --git a/dev-db/hyperdex/hyperdex-1.2.0-r1.ebuild b/dev-db/hyperdex/hyperdex-1.5.0.ebuild
index 75f20c070387..cb1ad850da36 100644
--- a/dev-db/hyperdex/hyperdex-1.2.0-r1.ebuild
+++ b/dev-db/hyperdex/hyperdex-1.5.0.ebuild
@@ -1,9 +1,11 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-db/hyperdex/hyperdex-1.2.0-r1.ebuild,v 1.1 2014/05/07 03:38:14 patrick Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-db/hyperdex/hyperdex-1.5.0.ebuild,v 1.1 2014/11/23 13:23:26 patrick Exp $
 EAPI=5
 
+# depends on libmacaroons python bindings
 RESTRICT="test"
+
 PYTHON_COMPAT=( python2_7)
 inherit eutils python-r1 autotools
 
@@ -27,6 +29,7 @@ DEPEND="dev-cpp/glog
 	dev-libs/busybee
 	dev-libs/popt
 	dev-libs/replicant
+	dev-libs/libmacaroons
 	dev-libs/json-c"
 RDEPEND="${DEPEND}"