# 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:
Hash: SHA1
AUX drizzle-2009.12.1240-nolint.patch 366 RMD160 5edac5d0f35b6a7830ba4c5d4cc9fa78f30c29bc SHA1 29f2257773552dabc40424ac068ca4ef32425d01 SHA256 612ffed94aebcce0aeef56a4fabfe35a5bb01f6c85a4c00757bef59f0cd75312
-AUX drizzle-2010.03.1412-ggdb3-fix.patch 1298 RMD160 29e17c18ae3476ea532b78c0e6a957fca1c8e547 SHA1 495dc9d1008e9cd57aa02351c46ffd223796eb9a SHA256 97b63b130277a824e820a7e423086e9f265287edfc19ecdd4a39c06acc7a21ab
AUX drizzle.conf.d 17 RMD160 04ac72be16bab0e6a590a19d2d663baa6741e743 SHA1 0337f18c03bbfbf1203a6391f8d7076a4d36a155 SHA256 5739bf0120eb4ef9dfed0b5307332d10c728ab9d204411d37fec85393e6db630
-AUX drizzle.init.d 4247 RMD160 6208fe8ad2a1fc3480f835d101799412b73ef208 SHA1 b0a288670de9a37f54f75b773aadbd56d737af64 SHA256 9b33960f1a203265f13bdd4c1a444cfa9c96e06529b45432d3e8e820a6e4d266
-DIST drizzle-2010.03.1347.tar.gz 7365259 RMD160 beaac701311da2c47a0fb78f0388b4fd00e41513 SHA1 9c81b4b9418979f6d29343e149cf048d0e93bec7 SHA256 30c274be33d05dca50c3211155b4e1dd267ac52828d3d9a2a0f2820dbac37586
-DIST drizzle-2010.03.1412.tar.gz 7299720 RMD160 2275465ee5cdd3d35463f7f516a744b1612092dd SHA1 85cbda12aa034409c08ffee11ed6870029a0676b SHA256 cd19f4c318a8dcb527e6c1c86b97dae8e07cc2fee85f66dade7b6bead9920dc7
-DIST drizzle-2010.04.1513.tar.gz 7771003 RMD160 da0b3f511a497c58911895f17bbf1489bc3a517c SHA1 39d749527ac626785fcce74af9fa6b869d4b47a8 SHA256 b661e3472667796f1be1e8bc8a27d0bfb50a3174806479f00c9f9e55ad8f33e6
+AUX drizzle.init.d 4255 RMD160 b10c3f6c47b5318cdb88b3acc36c61a173fda755 SHA1 bce6f1af9cc0c82469e466dff362f7dbd243e2af SHA256 b040fb3c8bc758b36472afe304be4703625678f660dac81a52b934480207bc89
DIST drizzle-2010.05.1525.tar.gz 7773814 RMD160 8dc2bd87075391f64b8828c143d4b16dde3d3779 SHA1 1c6cffaa1bdff23c05586ca4b0849b7475d3effa SHA256 9a37b3ba4e79d57508ee6df7465e51f7096e62a55a4dbcbfbd0bf9f298efe009
-EBUILD drizzle-2010.03.1347.ebuild 4549 RMD160 da52788744b9be7c8ecc7e800aa38888450eba20 SHA1 e58b13de9d87f3cc3f5b6afe24f1d171456f0317 SHA256 ea5984c18ef4e23413dea24e30f0617e8342a61a8b08f3f011e2c6b0f4f10d4f
-EBUILD drizzle-2010.03.1412.ebuild 3739 RMD160 ebfcca997d75372422bcb823c35bf1d996853cae SHA1 917b632567362a86d74f728b9b30cdd59c29d3c1 SHA256 618366427791a0186c0a101c754fbda34c167255faca0f08c537188322ab0085
-EBUILD drizzle-2010.04.1513.ebuild 3913 RMD160 23636497f63f3348977845bbe4694ac1755e1ec7 SHA1 8875fdfe2df5e41587a64be572d7bcad233433be SHA256 5a8123437ae79f677e55ed14594af7676ca717e3456b24c8e128602755d00481
-EBUILD drizzle-2010.05.1525.ebuild 3846 RMD160 e24f3c8a676d6298db0f40209528bcad9a2536fb SHA1 73c437694da09a17c48ca826da71482188c302b5 SHA256 58c1c2cda86fcfeed51d826b2d8d88231d85526d77975aceca4ed46329520dc2
-MISC ChangeLog 3041 RMD160 72868930bc5ebe188f3f44456508b6e9fad36eaa SHA1 45e6d0fb59620ae08c13550d2f7b235e18ce6b5c SHA256 12d1ddaa7fc9df29a4753312e3533353526be374aa825fb6545893ab5599d9f6
+EBUILD drizzle-2010.05.1525-r1.ebuild 3849 RMD160 6f41591b8cfd62339a8ab787e91bb220b8461591 SHA1 3b7ff42f383fe73e97c90eeb120b150eb6bc58be SHA256 2762d93ca3eb5720a7edadd684df63ff3769cc1098a6404272a5775fe6abe289
+MISC ChangeLog 3425 RMD160 7622a9cd2f97f4c0f4a6bd4bcdf2597b1681e562 SHA1 eb0f6fd92a858b688af353bd326374f93231eddd SHA256 79a098d22de446f8ec5623b9315784c8c3ed3420af398e0ac2146901c92d2c95
MISC metadata.xml 2823 RMD160 4d8ec16d5d512d4325305133578c2f0396200485 SHA1 2612ed473de2c4c0d6e912bdb1cc4303429a8b12 SHA256 37f8608359cbaea4b9a3f4ba0f5e71fa83f8236303584d5ca6458f5ed7fc8857
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v2.0.15 (GNU/Linux)
-iEYEARECAAYFAkv28/sACgkQAiZjviIA2XgrUgCfcCLgBBX+AnIxWMd/sG+32s2s
-ff0AniOaF7c/jdhwu89UM6JGOb+/6Nw9
-=U4EH
+iEYEARECAAYFAkwWvvUACgkQAiZjviIA2XiOZwCgn0/0b3AoK/qOvympwrUwTvl/
+v2kAoJ5ddxU7BoBXnXONi9Lj4pEk9ibZ
+=aejN
-----END PGP SIGNATURE-----
+++ /dev/null
-# 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
-}
+++ /dev/null
-# 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
-}
+++ /dev/null
-# 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
-}
# 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
+++ /dev/null
-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}"
- ])
- ])
# 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"
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"
#
# 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 \
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
# 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
projects / gentoo.git / commitdiff