Cleanup old versions, fix init script (thanks to Pavel).

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

7 files changed, 23 insertions, 511 deletions

diff --git a/dev-db/drizzle/ChangeLog b/dev-db/drizzle/ChangeLog
index a5099bf609a0..68561cc988b4 100644
--- a/dev-db/drizzle/ChangeLog
+++ b/dev-db/drizzle/ChangeLog
@@ -1,6 +1,15 @@
 # ChangeLog for dev-db/drizzle
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-db/drizzle/ChangeLog,v 1.12 2010/05/21 20:59:14 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-db/drizzle/ChangeLog,v 1.13 2010/06/14 23:45:57 flameeyes Exp $
+
+*drizzle-2010.05.1525-r1 (14 Jun 2010)
+
+  14 Jun 2010; Diego E. Pettenò <flameeyes@gentoo.org>
+  -drizzle-2010.03.1347.ebuild, -drizzle-2010.03.1412.ebuild,
+  -files/drizzle-2010.03.1412-ggdb3-fix.patch, -drizzle-2010.04.1513.ebuild,
+  -drizzle-2010.05.1525.ebuild, +drizzle-2010.05.1525-r1.ebuild,
+  files/drizzle.init.d:
+  Cleanup old versions, fix init script (thanks to Pavel).
 
   21 May 2010; Diego E. Pettenò <flameeyes@gentoo.org>
   drizzle-2010.05.1525.ebuild:
diff --git a/dev-db/drizzle/drizzle-2010.03.1347.ebuild b/dev-db/drizzle/drizzle-2010.03.1347.ebuild
deleted file mode 100644
index 1ed8613962f6..000000000000
--- a/dev-db/drizzle/drizzle-2010.03.1347.ebuild
+++ /dev/null
@@ -1,164 +0,0 @@
-# Copyright 1999-2010 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-db/drizzle/drizzle-2010.03.1347.ebuild,v 1.1 2010/03/19 13:49:46 flameeyes Exp $
-
-EAPI=2
-
-inherit flag-o-matic libtool autotools eutils
-
-DESCRIPTION="Database optimized for Cloud and Net applications"
-HOMEPAGE="http://drizzle.org"
-SRC_URI="http://launchpad.net/drizzle/cherry/2010-03-15/+download/${P}.tar.gz"
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64"
-
-# don't add an ssl USE flag here, since it's not ssl support that
-# we're to use, but rather MD5 support
-IUSE="debug tcmalloc doc memcache curl pam gearman gnutls openssl"
-
-# upstream bug #499911
-RESTRICT="memcache? ( test ) !curl? ( test )"
-
-RDEPEND="tcmalloc? ( dev-util/google-perftools )
-		dev-db/libdrizzle
-		sys-libs/readline
-		sys-apps/util-linux
-		dev-libs/libpcre
-		dev-libs/libevent
-		dev-libs/protobuf
-		gearman? ( sys-cluster/gearmand )
-		pam? ( sys-libs/pam )
-		curl? ( net-misc/curl )
-		gnutls? ( net-libs/gnutls )
-		memcache? ( dev-libs/libmemcached )"
-DEPEND="${RDEPEND}
-		dev-util/gperf
-		doc? ( app-doc/doxygen )"
-RDEPEND="${RDEPEND}
-		curl? (
-			gnutls? ( || ( net-misc/curl[-ssl] net-misc/curl[gnutls] ) )
-			openssl? ( net-misc/curl[-gnutls,-nss] )
-		)"
-
-# The dependencies related to the curl, gnutls and openssl USE flag
-# are overly complicated, but are needed this way. The gnutls and
-# openssl USE flag here are to choose the implementation of the MD5
-# interface to use, rather than the provider of SSL-layer
-# functions. Unfortunately since curl is a dependency and that can use
-# either for its SSL support, we have to be wary of the possibility of
-# the two libraries to be loaded together (which would create a very
-# bad situation!), so we force the choice to be the same across the two.
-# See upstream bg for the whole shebang:
-# https://bugs.launchpad.net/drizzle/+bug/499958
-
-pkg_setup() {
-	elog "This is a work-in-progress ebuild, some features will require"
-	elog "manual configuration and others aren't fleshed out just yet."
-	elog "Use it at your risk."
-
-	if use gnutls && use openssl; then
-		eerror "You cannot use both GnuTLS and OpenSSL at the same time"
-		eerror "to provide the MD5 plugin. Please choose only one USE flag"
-		eerror "between gnutls and openssl."
-		die "Both gnutls and openssl USE flags enabled."
-	fi
-
-	enewuser drizzle -1 -1 /dev/null nogroup
-}
-
-src_prepare() {
-	epatch "${FILESDIR}/${PN}-2009.12.1240-nolint.patch"
-	AT_M4DIR="m4" eautoreconf
-	elibtoolize
-}
-
-src_configure() {
-	local myconf=
-
-	if use debug; then
-		append-flags -DDEBUG
-	fi
-
-	if use gnutls; then
-		myconf="${myconf} --with-md5-plugin"
-		export ac_cv_libcrypto=no
-	elif use openssl; then
-		myconf="${myconf} --with-md5-plugin"
-		export ac_cv_libgnutls_openssl=no
-	else
-		myconf="${myconf} --without-md5-plugin"
-	fi
-
-	econf \
-		--disable-static \
-		--disable-dependency-tracking \
-		--disable-mtmalloc \
-		$(use_enable tcmalloc) \
-		$(use_enable memcache libmemcached) \
-		$(use_enable gearman libgearman) \
-		$(use_with curl auth-http-plugin) \
-		$(use_with pam auth-pam-plugin) \
-		--without-hello-world-plugin \
-		${myconf}
-}
-
-src_compile() {
-	emake || die "build failed"
-
-	if use doc; then
-		emake doxygen || die "doxygen failed"
-	fi
-}
-
-src_test() {
-	# Explicitly allow parallel make check
-	emake check || die "tests failed"
-}
-
-src_install() {
-	emake DESTDIR="${D}" install || die "install failed"
-	dodoc AUTHORS NEWS README || die
-
-	find "${D}" -name '*.la' -delete || die
-
-	if use doc; then
-		docinto apidoc
-		pushd docs/html
-		dohtml -r .
-		popd
-	fi
-
-	newinitd "${FILESDIR}"/drizzle.init.d drizzled || die
-	newconfd "${FILESDIR}"/drizzle.conf.d drizzled || die
-
-	if ! use gearman; then
-		sed -i -e '/need gearmand/d' "${D}"/etc/init.d/drizzled \
-			|| die "unable to sed init script (gearman)"
-	fi
-
-	if ! use memcache; then
-		sed -i -e '/need memcached/d' "${D}"/etc/init.d/drizzled \
-			|| die "unable to sed init script (memcache)"
-	fi
-
-	keepdir /var/run/drizzle || die
-	keepdir /var/log/drizzle || die
-	keepdir /var/lib/drizzle/drizzled || die
-	keepdir /etc/drizzle || die
-
-	fperms 0755 /var/run/drizzle || die
-	fperms 0755 /var/log/drizzle || die
-	fperms -R 0700 /var/lib/drizzle || die
-
-	fowners drizzle:nogroup /var/run/drizzle || die
-	fowners drizzle:nogroup /var/log/drizzle || die
-	fowners -R drizzle:nogroup /var/lib/drizzle || die
-}
-
-pkg_postinst() {
-	if use pam; then
-		ewarn "Be warned that we're still lacking a pam configuration"
-		ewarn "file so the PAM authentication will not work by default"
-	fi
-}
diff --git a/dev-db/drizzle/drizzle-2010.03.1412.ebuild b/dev-db/drizzle/drizzle-2010.03.1412.ebuild
deleted file mode 100644
index 1e797a44c465..000000000000
--- a/dev-db/drizzle/drizzle-2010.03.1412.ebuild
+++ /dev/null
@@ -1,145 +0,0 @@
-# Copyright 1999-2010 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-db/drizzle/drizzle-2010.03.1412.ebuild,v 1.3 2010/04/18 16:39:22 mr_bones_ Exp $
-
-EAPI=2
-
-inherit flag-o-matic libtool autotools eutils pam
-
-DESCRIPTION="Database optimized for Cloud and Net applications"
-HOMEPAGE="http://drizzle.org"
-SRC_URI="http://launchpad.net/drizzle/cherry/2010-03-29/+download/${P}.tar.gz"
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-
-IUSE="debug tcmalloc doc memcache curl pam gearman +md5"
-
-# upstream bug #499911
-RESTRICT="memcache? ( test ) !curl? ( test )"
-
-# for libdrizzle version, check m4/pandora*, PANDORA_LIBDRIZZLE_RECENT
-RDEPEND="tcmalloc? ( dev-util/google-perftools )
-		>=dev-db/libdrizzle-0.8
-		sys-libs/readline
-		sys-apps/util-linux
-		dev-libs/libpcre
-		>=dev-libs/libevent-1.4
-		>=dev-libs/protobuf-2.1.0
-		gearman? ( >=sys-cluster/gearmand-0.12 )
-		pam? ( sys-libs/pam )
-		curl? ( net-misc/curl )
-		memcache? ( >=dev-libs/libmemcached-0.39 )
-		md5? ( >=dev-libs/libgcrypt-1.4.2 )
-		>=dev-libs/boost-1.32"
-DEPEND="${RDEPEND}
-		dev-util/gperf
-		doc? ( app-doc/doxygen )
-		>=dev-util/boost-build-1.32"
-
-pkg_setup() {
-	enewuser drizzle -1 -1 /dev/null nogroup
-}
-
-src_prepare() {
-	epatch "${FILESDIR}/${PN}-2010.03.1412-ggdb3-fix.patch"
-	# disable in release after 1412
-	epatch "${FILESDIR}/${PN}-2009.12.1240-nolint.patch"
-
-	AT_M4DIR="m4" eautoreconf
-	elibtoolize
-}
-
-src_configure() {
-	local myconf=
-
-	if use debug; then
-		append-flags -DDEBUG
-	fi
-
-	# while I applaud upstreams goal of 0 compiler warnings
-	# the 1412 release didn't achieve it.
-	append-flags -Wno-error
-
-	# disable-all gets rid of automagic dep
-	econf \
-		--disable-all \
-		--disable-static \
-		--disable-dependency-tracking \
-		--disable-mtmalloc \
-		--with-debug=$(use debug && echo yes || echo no) \
-		$(use_enable tcmalloc) \
-		$(use_enable memcache libmemcached) \
-		$(use_enable gearman libgearman) \
-		$(use_with curl auth-http-plugin) \
-		$(use_with pam auth-pam-plugin) \
-		$(use_with md5 md5-plugin) \
-		$(use_with gearman gearman_udf-plugin) \
-		$(use_with gearman logging_gearman-plugin) \
-		$(use_with memcache memcache_functions-plugins) \
-		--with-logging_stats \
-		--without-hello-world-plugin \
-		${myconf}
-
-	# upstream TODO:
-	# --without-all \
-	# broken atm
-	#$(use_with memcache memcache_stats-plugins) \
-}
-
-src_compile() {
-	emake || die "build failed"
-
-	if use doc; then
-		emake doxygen || die "doxygen failed"
-	fi
-}
-
-# 5-10 min eta
-src_test() {
-	# If you want to turn off a test, rename to suffix of .DISABLED
-	# Explicitly allow parallel make check
-	emake check || die "tests failed"
-}
-
-src_install() {
-	emake DESTDIR="${D}" install || die "install failed"
-	dodoc AUTHORS NEWS README || die
-
-	find "${D}" -name '*.la' -delete || die
-
-	if use doc; then
-		docinto apidoc
-		pushd docs/html
-		dohtml -r .
-		popd
-	fi
-
-	newinitd "${FILESDIR}"/drizzle.init.d drizzled || die
-	newconfd "${FILESDIR}"/drizzle.conf.d drizzled || die
-
-	if ! use gearman; then
-		sed -i -e '/need gearmand/d' "${D}"/etc/init.d/drizzled \
-			|| die "unable to sed init script (gearman)"
-	fi
-
-	if ! use memcache; then
-		sed -i -e '/need memcached/d' "${D}"/etc/init.d/drizzled \
-			|| die "unable to sed init script (memcache)"
-	fi
-
-	keepdir /var/run/drizzle || die
-	keepdir /var/log/drizzle || die
-	keepdir /var/lib/drizzle/drizzled || die
-	keepdir /etc/drizzle || die
-
-	fperms 0755 /var/run/drizzle || die
-	fperms 0755 /var/log/drizzle || die
-	fperms -R 0700 /var/lib/drizzle || die
-
-	fowners drizzle:nogroup /var/run/drizzle || die
-	fowners drizzle:nogroup /var/log/drizzle || die
-	fowners -R drizzle:nogroup /var/lib/drizzle || die
-
-	pamd_mimic system-auth drizzle auth account session
-}
diff --git a/dev-db/drizzle/drizzle-2010.04.1513.ebuild b/dev-db/drizzle/drizzle-2010.04.1513.ebuild
deleted file mode 100644
index 43656998afff..000000000000
--- a/dev-db/drizzle/drizzle-2010.04.1513.ebuild
+++ /dev/null
@@ -1,148 +0,0 @@
-# Copyright 1999-2010 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-db/drizzle/drizzle-2010.04.1513.ebuild,v 1.2 2010/05/21 20:57:54 flameeyes Exp $
-
-EAPI=2
-
-inherit flag-o-matic libtool autotools eutils pam
-
-DESCRIPTION="Database optimized for Cloud and Net applications"
-HOMEPAGE="http://drizzle.org"
-SRC_URI="http://launchpad.net/drizzle/cherry/2010-04-26/+download/${P}.tar.gz"
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-
-IUSE="debug tcmalloc doc memcache curl pam gearman +md5"
-
-# upstream bug #499911
-RESTRICT="memcache? ( test ) !curl? ( test )"
-
-# for libdrizzle version, check m4/pandora*, PANDORA_LIBDRIZZLE_RECENT
-RDEPEND="tcmalloc? ( dev-util/google-perftools )
-		>=dev-db/libdrizzle-0.8
-		sys-libs/readline
-		sys-apps/util-linux
-		dev-libs/libpcre
-		>=dev-libs/libevent-1.4
-		>=dev-libs/protobuf-2.1.0
-		gearman? ( >=sys-cluster/gearmand-0.12 )
-		pam? ( sys-libs/pam )
-		curl? ( net-misc/curl )
-		memcache? ( >=dev-libs/libmemcached-0.39 )
-		md5? ( >=dev-libs/libgcrypt-1.4.2 )
-		>=dev-libs/boost-1.32"
-DEPEND="${RDEPEND}
-		dev-util/gperf
-		doc? ( app-doc/doxygen )
-		>=dev-util/boost-build-1.32"
-
-pkg_setup() {
-	enewuser drizzle -1 -1 /dev/null nogroup
-}
-
-src_prepare() {
-	epatch "${FILESDIR}/${PN}-2010.03.1412-ggdb3-fix.patch"
-	# disable in release after 1412
-	epatch "${FILESDIR}/${PN}-2009.12.1240-nolint.patch"
-
-	AT_M4DIR="m4" eautoreconf
-	elibtoolize
-}
-
-src_configure() {
-	local myconf=
-
-	if use debug; then
-		append-flags -DDEBUG
-	fi
-
-	# while I applaud upstreams goal of 0 compiler warnings
-	# the 1412 release didn't achieve it.
-	append-flags -Wno-error
-
-	# disable-all gets rid of automagic dep
-	econf \
-		--disable-all \
-		--disable-static \
-		--disable-dependency-tracking \
-		--disable-mtmalloc \
-		--with-debug=$(use debug && echo yes || echo no) \
-		$(use_enable tcmalloc) \
-		$(use_enable memcache libmemcached) \
-		$(use_enable gearman libgearman) \
-		$(use_with curl auth-http-plugin) \
-		$(use_with pam auth-pam-plugin) \
-		$(use_with md5 md5-plugin) \
-		$(use_with gearman gearman_udf-plugin) \
-		$(use_with gearman logging_gearman-plugin) \
-		$(use_with memcache memcache_functions-plugins) \
-		--with-logging_stats \
-		--disable-pbxt-plugin --without-pbxt-plugin \
-		--disable-rabbitmq-plugin --without-rabbitmq-plugin \
-		--disable-embedded-innodb-plugin --without-embedded-innodb-plugin \
-		--without-hello-world-plugin \
-		${myconf}
-
-	# upstream TODO:
-	# --without-all \
-	# broken atm
-	#$(use_with memcache memcache_stats-plugins) \
-}
-
-src_compile() {
-	emake || die "build failed"
-
-	if use doc; then
-		emake doxygen || die "doxygen failed"
-	fi
-}
-
-# 5-10 min eta
-src_test() {
-	# If you want to turn off a test, rename to suffix of .DISABLED
-	# Explicitly allow parallel make check
-	emake check || die "tests failed"
-}
-
-src_install() {
-	emake DESTDIR="${D}" install || die "install failed"
-	dodoc AUTHORS NEWS README || die
-
-	find "${D}" -name '*.la' -delete || die
-
-	if use doc; then
-		docinto apidoc
-		pushd docs/html
-		dohtml -r .
-		popd
-	fi
-
-	newinitd "${FILESDIR}"/drizzle.init.d drizzled || die
-	newconfd "${FILESDIR}"/drizzle.conf.d drizzled || die
-
-	if ! use gearman; then
-		sed -i -e '/need gearmand/d' "${D}"/etc/init.d/drizzled \
-			|| die "unable to sed init script (gearman)"
-	fi
-
-	if ! use memcache; then
-		sed -i -e '/need memcached/d' "${D}"/etc/init.d/drizzled \
-			|| die "unable to sed init script (memcache)"
-	fi
-
-	keepdir /var/run/drizzle || die
-	keepdir /var/log/drizzle || die
-	keepdir /var/lib/drizzle/drizzled || die
-	keepdir /etc/drizzle || die
-
-	fperms 0755 /var/run/drizzle || die
-	fperms 0755 /var/log/drizzle || die
-	fperms -R 0700 /var/lib/drizzle || die
-
-	fowners drizzle:nogroup /var/run/drizzle || die
-	fowners drizzle:nogroup /var/log/drizzle || die
-	fowners -R drizzle:nogroup /var/lib/drizzle || die
-
-	pamd_mimic system-auth drizzle auth account session
-}
diff --git a/dev-db/drizzle/drizzle-2010.05.1525.ebuild b/dev-db/drizzle/drizzle-2010.05.1525-r1.ebuild
index 43dcbf8099fc..6267a5b82210 100644
--- a/dev-db/drizzle/drizzle-2010.05.1525.ebuild
+++ b/dev-db/drizzle/drizzle-2010.05.1525-r1.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/dev-db/drizzle/drizzle-2010.05.1525.ebuild,v 1.3 2010/05/21 20:59:14 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-db/drizzle/drizzle-2010.05.1525-r1.ebuild,v 1.1 2010/06/14 23:45:57 flameeyes Exp $
 
 EAPI=2
 
diff --git a/dev-db/drizzle/files/drizzle-2010.03.1412-ggdb3-fix.patch b/dev-db/drizzle/files/drizzle-2010.03.1412-ggdb3-fix.patch
deleted file mode 100644
index b023a9f3088c..000000000000
--- a/dev-db/drizzle/files/drizzle-2010.03.1412-ggdb3-fix.patch
+++ /dev/null
@@ -1,39 +0,0 @@
-diff -Nuar --exclude '*~' drizzle-2010.03.1412/m4.orig/pandora_optimize.m4 drizzle-2010.03.1412/m4//pandora_optimize.m4
---- drizzle-2010.03.1412/m4.orig/pandora_optimize.m4	2010-03-30 13:02:33.000000000 -0700
-+++ drizzle-2010.03.1412/m4//pandora_optimize.m4	2010-04-17 09:51:53.000000000 -0700
-@@ -22,10 +22,9 @@
-     dnl with using AC_CC_STD_C99 above
-     CC="${CC} -std=gnu99"
- 
--    AM_CPPFLAGS="-ggdb3 ${AM_CPPFLAGS}"
--
-     DEBUG_CFLAGS="-O0"
-     DEBUG_CXXFLAGS="-O0"
-+    DEBUG_CPPFLAGS="-ggdb3"
- 
-     OPTIMIZE_CFLAGS="-O3"
-     OPTIMIZE_CXXFLAGS="-O3"
-@@ -35,9 +34,8 @@
-     dnl with using AC_CC_STD_C99 above
-     CC="${CC} -std=c99"
- 
--    AM_CPPFLAGS="-g ${AM_CPPFLAGS}"
--
-     DEBUG_CFLAGS="-O0"
-+    DEBUG_CPPFLAGS="-g"
-     DEBUG_CXXFLAGS="-O0"
- 
-     OPTIMIZE_CFLAGS="-xHOST -O3 -no-prec-div -static"
-@@ -70,10 +68,12 @@
-   AS_IF([test "$with_debug" = "yes"],[
-     # Debugging. No optimization.
-     AM_CFLAGS="${AM_CFLAGS} ${DEBUG_CFLAGS} -DDEBUG"
-+    AM_CPPFLAGS="${AM_CPPFLAGS} ${DEBUG_CPPFLAGS} -DDEBUG"
-     AM_CXXFLAGS="${AM_CXXFLAGS} ${DEBUG_CXXFLAGS} -DDEBUG"
-   ],[
-     # Optimized version. No debug
-     AM_CFLAGS="${AM_CFLAGS} ${OPTIMIZE_CFLAGS}"
-+    AM_CPPFLAGS="${AM_CPPFLAGS} ${OPTIMIZE_CPPFLAGS}"
-     AM_CXXFLAGS="${AM_CXXFLAGS} ${OPTIMIZE_CXXFLAGS}"
-   ])
- ])
diff --git a/dev-db/drizzle/files/drizzle.init.d b/dev-db/drizzle/files/drizzle.init.d
index 7b004dcd76c5..69eb2ded1ea9 100644
--- a/dev-db/drizzle/files/drizzle.init.d
+++ b/dev-db/drizzle/files/drizzle.init.d
@@ -2,16 +2,15 @@
 # Copyright 2010 Pavel Stratil, senbonzakura.eu
 # Some functions were taken from debian init script. Licensed under GPL-2
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-db/drizzle/files/drizzle.init.d,v 1.1 2010/03/18 13:04:24 flameeyes Exp $
-
+# $Header: /var/cvsroot/gentoo-x86/dev-db/drizzle/files/drizzle.init.d,v 1.2 2010/06/14 23:45:58 flameeyes Exp $
 
 #########################
 ### Construct vars ######
 #########################
 
 
-SUFIX=".${SVCNAME#*.}"
-[ "${SUFIX}" == ".drizzle" ] && SUFIX=''
+SUFFIX=".${SVCNAME#*.}"
+[ "${SUFFIX}" == ".drizzled" ] && SUFFIX=''
 
 BASE_CONFD="/etc/conf.d/drizzle"
 BASE_CNF="/etc/drizzle/drizzled"
@@ -19,11 +18,11 @@ BASE_PID="/var/run/drizzle/drizzled"
 BASE_LOG="/var/log/drizzle/drizzled"
 BASE_DIR="/var/lib/drizzle/drizzled"
 
-PIDFILE="${BASE_PID}${SUFIX}.pid"
-CNFFILE="${BASE_CNF}${SUFIX}.cnf"
-LOGFILE="${BASE_LOG}${SUFIX}.log"
-DATADIR="${BASE_DIR}${SUFIX}"
-CONFSRC="${BASE_CONFD}${SUFIX}"
+PIDFILE="${BASE_PID}${SUFFIX}.pid"
+CNFFILE="${BASE_CNF}${SUFFIX}.cnf"
+LOGFILE="${BASE_LOG}${SUFFIX}.log"
+DATADIR="${BASE_DIR}${SUFFIX}"
+CONFSRC="${BASE_CONFD}${SUFFIX}"
 DRIZZLE="/usr/bin/drizzle"
 DRIZZLE_USER="drizzle"
 DRIZZLE_DAEMON="/usr/sbin/drizzled"
@@ -37,7 +36,7 @@ DRIZZLE_EXTRA=""
 #
 # drizzle_get_param() fetches a particular option from drizzle's invocation.
 # Usage: void drizzle_get_param option
-# Example: /etc/init.d/drizzle drizzle_get_param pid-file
+# Example: /etc/init.d/drizzled drizzle_get_param pid-file
 # 
 drizzle_get_param() {
 	${DRIZZLE_DAEMON} --print-defaults \
@@ -104,8 +103,8 @@ checkconfig() {
 
 depend() {
 	use localmount
-        need gearmand
-        need memcached
+        use gearmand
+        use memcached
         
         # TODO use drizzle_get_param() to decide if gearmand and memcached
         #      are needed. Then the useflag based sed-ing of this script
@@ -134,7 +133,7 @@ start() {
 	
         # TODO in order to have replication always working we should add the
         #      --server-id=# option. AFAIK only integers are allowed, though
-        #      ${HOSTNAME}${SVCNAME}${SUFIX} whould be much easier to handle.
+        #      ${HOSTNAME}${SVCNAME}${SUFFIX} whould be much easier to handle.
 
 	for i in 1 2 3 4 5 6 7 8 9 10 11 12 13 14; do
 	  sleep 1