Remove old version and use the new drizzle with libdrizzle.

(Portage version: 2.2_rc75/cvs/Linux x86_64)

3 files changed, 7 insertions, 103 deletions

diff --git a/sys-cluster/gearmand/ChangeLog b/sys-cluster/gearmand/ChangeLog
index c3186198c841..40cf499b7161 100644
--- a/sys-cluster/gearmand/ChangeLog
+++ b/sys-cluster/gearmand/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for sys-cluster/gearmand
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-cluster/gearmand/ChangeLog,v 1.7 2010/04/17 18:39:59 robbat2 Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-cluster/gearmand/ChangeLog,v 1.8 2010/09/06 20:23:04 flameeyes Exp $
+
+  06 Sep 2010; Diego E. Pettenò <flameeyes@gentoo.org>
+  -gearmand-0.11-r2.ebuild, gearmand-0.12.ebuild:
+  Remove old version and use the new drizzle with libdrizzle.
 
   17 Apr 2010; Robin H. Johnson <robbat2@gentoo.org> gearmand-0.12.ebuild:
   x86 support.
diff --git a/sys-cluster/gearmand/gearmand-0.11-r2.ebuild b/sys-cluster/gearmand/gearmand-0.11-r2.ebuild
deleted file mode 100644
index d3689e3b1e32..000000000000
--- a/sys-cluster/gearmand/gearmand-0.11-r2.ebuild
+++ /dev/null
@@ -1,100 +0,0 @@
-# Copyright 1999-2010 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-cluster/gearmand/gearmand-0.11-r2.ebuild,v 1.5 2010/02/09 19:18:39 flameeyes Exp $
-
-EAPI=2
-
-inherit flag-o-matic libtool
-
-DESCRIPTION="Generic framework to farm out work to other machines"
-HOMEPAGE="http://www.gearman.org/"
-SRC_URI="http://launchpad.net/gearmand/trunk/${PV}/+download/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64"
-IUSE="debug tcmalloc +memcache drizzle sqlite" # postgres
-# postgresql support is broken right now so keep it disabled
-
-RDEPEND="dev-libs/libevent
-	|| ( >=sys-apps/util-linux-2.16 <sys-libs/e2fsprogs-libs-1.41.8 )
-	tcmalloc? ( dev-util/google-perftools )
-	memcache? ( dev-libs/libmemcached )
-	drizzle? ( dev-db/libdrizzle )
-	sqlite? ( dev-db/sqlite:3 )"
-	#postgres? ( dev-db/postgresql-base )"
-DEPEND="${RDEPEND}"
-
-pkg_setup() {
-	enewuser gearmand -1 -1 /dev/null nogroup
-}
-
-src_prepare() {
-	elibtoolize
-}
-
-src_configure() {
-	# Don't ever use --enable-assert since configure.ac is broken, and
-	# only does --disable-assert correctly.
-	 if use debug; then
-		# Since --with-debug would turn off optimisations as well as
-		# enabling debug, we just enable debug through the
-		# preprocessor then.
-		append-flags -DDEBUG
-
-	# Right now disabling asserts break the code, so never disable
-	# them as it is.
-	#else
-	#	myconf="${myconf} --disable-assert"
-	fi
-
-		#$(use_enable postgres libpq)
-	econf \
-		--disable-static \
-		--disable-dependency-tracking \
-		--disable-mtmalloc \
-		--disable-libpq
-		$(use_enable tcmalloc) \
-		$(use_enable memcache libmemcached) \
-		$(use_enable drizzle libdrizzle) \
-		$(use_enable sqlite libsqlite3)
-}
-
-src_test() {
-	# Since libtool is stupid and doesn't discard /usr/lib64 from the
-	# load path, we'd end up testing against the installed copy of
-	# gearmand (bad).
-	#
-	# We thus cheat and "fix" the scripts by hand.
-	sed -i -e '/LD_LIBRARY_PATH=/s|/usr/lib64:||' "${S}"/tests/*_test \
-		|| die "test fixing failed"
-
-	emake check || die "tests failed"
-}
-
-src_install() {
-	emake DESTDIR="${D}" install || die "install failed"
-
-	dodoc README AUTHORS ChangeLog || die "dodoc failed"
-
-	newinitd "${FILESDIR}"/gearmand.init.d gearmand || die
-	newconfd "${FILESDIR}"/gearmand.conf.d gearmand || die
-
-	keepdir /var/run/gearmand || die
-	fperms 0755 /var/run/gearmand || die
-	fowners gearmand:nogroup /var/run/gearmand || die
-
-	keepdir /var/log/gearmand || die
-	fperms 0755 /var/log/gearmand || die
-	fowners gearmand /var/log/gearmand || die
-
-	find "${D}" -name '*.la' -delete || die
-}
-
-pkg_postinst() {
-	elog ""
-	elog "Unless you set the PERSISTENT_TABLE option in"
-	elog "/etc/conf.d/gearmand, Gearmand will use table 'queue'."
-	elog "If such table doesn't exist, Gearmand will create it for you"
-	elog ""
-}
diff --git a/sys-cluster/gearmand/gearmand-0.12.ebuild b/sys-cluster/gearmand/gearmand-0.12.ebuild
index c257a65df3bc..1260f73920cd 100644
--- a/sys-cluster/gearmand/gearmand-0.12.ebuild
+++ b/sys-cluster/gearmand/gearmand-0.12.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-cluster/gearmand/gearmand-0.12.ebuild,v 1.2 2010/04/17 18:39:59 robbat2 Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-cluster/gearmand/gearmand-0.12.ebuild,v 1.3 2010/09/06 20:23:04 flameeyes Exp $
 
 EAPI=2
 
@@ -20,7 +20,7 @@ RDEPEND="dev-libs/libevent
 	|| ( >=sys-apps/util-linux-2.16 <sys-libs/e2fsprogs-libs-1.41.8 )
 	tcmalloc? ( dev-util/google-perftools )
 	memcache? ( dev-libs/libmemcached )
-	drizzle? ( dev-db/libdrizzle )
+	drizzle? ( >=dev-db/drizzle-2010.08.1742 )
 	sqlite? ( dev-db/sqlite:3 )
 	tokyocabinet? ( dev-db/tokyocabinet )"
 	#postgres? ( dev-db/postgresql-base )"