Version bump; the new version requires a patch, and merges libdrizzle back into a single package.

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

4 files changed, 55 insertions, 21 deletions

diff --git a/dev-db/drizzle/ChangeLog b/dev-db/drizzle/ChangeLog
index 68561cc988b4..c469521a9300 100644
--- a/dev-db/drizzle/ChangeLog
+++ b/dev-db/drizzle/ChangeLog
@@ -1,6 +1,14 @@
 # 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.13 2010/06/14 23:45:57 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-db/drizzle/ChangeLog,v 1.14 2010/09/06 20:19:24 flameeyes Exp $
+
+*drizzle-2010.08.1742 (06 Sep 2010)
+
+  06 Sep 2010; Diego E. Pettenò <flameeyes@gentoo.org>
+  -drizzle-2010.05.1525-r1.ebuild, +drizzle-2010.08.1742.ebuild,
+  +files/drizzle-2010.08.1742-pcre.patch, files/drizzle.init.d:
+  Version bump; the new version requires a patch, and merges libdrizzle back
+  into a single package.
 
 *drizzle-2010.05.1525-r1 (14 Jun 2010)
 
diff --git a/dev-db/drizzle/drizzle-2010.05.1525-r1.ebuild b/dev-db/drizzle/drizzle-2010.08.1742.ebuild
index 6267a5b82210..cd1619f74d13 100644
--- a/dev-db/drizzle/drizzle-2010.05.1525-r1.ebuild
+++ b/dev-db/drizzle/drizzle-2010.08.1742.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-r1.ebuild,v 1.1 2010/06/14 23:45:57 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-db/drizzle/drizzle-2010.08.1742.ebuild,v 1.1 2010/09/06 20:19:24 flameeyes Exp $
 
 EAPI=2
 
@@ -8,22 +8,21 @@ 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/dexter/2010-05-10/+download/${P}.tar.gz"
+SRC_URI="http://launchpad.net/drizzle/dexter/2010-08-30/+download/${P}.tar.gz"
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
-
-IUSE="debug tcmalloc doc memcache curl pam gearman +md5"
+IUSE="debug tcmalloc doc memcache curl pam gearman +md5 ldap"
 
 # upstream bug #499911
-RESTRICT="memcache? ( test ) !curl? ( test )"
+#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-util/intltool
 		>=dev-libs/libevent-1.4
 		>=dev-libs/protobuf-2.1.0
 		gearman? ( >=sys-cluster/gearmand-0.12 )
@@ -31,7 +30,10 @@ RDEPEND="tcmalloc? ( dev-util/google-perftools )
 		curl? ( net-misc/curl )
 		memcache? ( >=dev-libs/libmemcached-0.39 )
 		md5? ( >=dev-libs/libgcrypt-1.4.2 )
-		>=dev-libs/boost-1.32"
+		>=dev-libs/boost-1.32
+		ldap? ( net-nds/openldap )
+		!dev-db/libdrizzle"
+
 DEPEND="${RDEPEND}
 		dev-util/gperf
 		doc? ( app-doc/doxygen )
@@ -43,6 +45,7 @@ pkg_setup() {
 
 src_prepare() {
 	epatch "${FILESDIR}/${PN}-2009.12.1240-nolint.patch"
+	epatch "${FILESDIR}/${P}-pcre.patch"
 
 	AT_M4DIR="m4" eautoreconf
 	elibtoolize
@@ -59,33 +62,39 @@ src_configure() {
 	# the 1412 release didn't achieve it.
 	append-flags -Wno-error
 
-	# disable-all gets rid of automagic dep
+	# NOTE disable-all and without-all no longer recognized options
+	# NOTE using --enable on some plugins can cause test failures.
+	# --with should be used instead. A discussion about this here:
+	# https://bugs.launchpad.net/drizzle/+bug/598659
+	# TODO (upstream)
+	# $(use_with memcache memcached-stats-plugin) \
+	# $(use_with memcache memcached-functions-plugin) \
+
 	econf \
-		--disable-all \
 		--disable-static \
 		--disable-dependency-tracking \
 		--disable-mtmalloc \
 		$(use_enable tcmalloc) \
 		$(use_enable memcache libmemcached) \
 		$(use_enable gearman libgearman) \
+		$(use_enable ldap libldap) \
 		$(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 \
+		$(use_with gearman gearman-udf-plugin) \
+		$(use_with gearman logging-gearman-plugin) \
+		$(use_with ldap auth-ldap-plugin) \
 		--without-hello-world-plugin \
 		--disable-pbxt-plugin --without-pbxt-plugin \
 		--disable-rabbitmq-plugin --without-rabbitmq-plugin \
 		--disable-embedded-innodb-plugin --without-embedded-innodb-plugin \
-		--disable-auth-ldap-plugin --disable-libldap --without-auth-ldap-plugin \
+		--with-auth-test-plugin \
+		--with-auth-file-plugin \
+		--with-simple-user-policy-plugin \
+		--enable-logging-stats-plugin \
+		--with-logging-stats-plugin \
 		${myconf}
 
-	# upstream TODO:
-	# --without-all \
-	# broken atm
-	#$(use_with memcache memcache_stats-plugins) \
 }
 
 src_compile() {
diff --git a/dev-db/drizzle/files/drizzle-2010.08.1742-pcre.patch b/dev-db/drizzle/files/drizzle-2010.08.1742-pcre.patch
new file mode 100644
index 000000000000..2ceff6c86a57
--- /dev/null
+++ b/dev-db/drizzle/files/drizzle-2010.08.1742-pcre.patch
@@ -0,0 +1,13 @@
+Index: drizzle-2010.08.1742/drizzled/include.am
+===================================================================
+--- drizzle-2010.08.1742.orig/drizzled/include.am
++++ drizzle-2010.08.1742/drizzled/include.am
+@@ -458,7 +458,7 @@ drizzled_drizzled_LDADD= \
+ 				$(LDADD) \
+ 				$(LIBUUID) \
+ 				$(LIBDL_LIBS) \
+-				$(LIBPCRE) \
++				$(LTLIBPCRE) \
+ 				$(LTLIBPROTOBUF) \
+ 				$(LIBTBB) \
+ 				$(BOOST_LIBS) \
diff --git a/dev-db/drizzle/files/drizzle.init.d b/dev-db/drizzle/files/drizzle.init.d
index 69eb2ded1ea9..c8a5a33dbae2 100644
--- a/dev-db/drizzle/files/drizzle.init.d
+++ b/dev-db/drizzle/files/drizzle.init.d
@@ -1,8 +1,8 @@
 #!/sbin/runscript
-# Copyright 2010 Pavel Stratil, senbonzakura.eu
+# Copyright 2010-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.2 2010/06/14 23:45:58 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-db/drizzle/files/drizzle.init.d,v 1.3 2010/09/06 20:19:25 flameeyes Exp $
 
 #########################
 ### Construct vars ######
@@ -125,6 +125,10 @@ stop() {
 start() {
 	checkconfig
 	ebegin "Starting ${SVCNAME}"
+	# Test if ${BASE_PID}, ${BASE_LOG} and ${LOG_FILE} exist, create if not.
+	[ ! -e ${BASE_PID} ] && mkdir -p ${BASE_PID} && chown ${DRIZZLE_USER}:nogroup ${BASE_PID}
+	[ ! -e ${BASE_LOG} ] && mkdir -p ${BASE_LOG} && chown ${DRIZZLE_USER}:nogroup ${BASE_LOG}
+	[ ! -e ${LOGFILE} ]  && touch ${LOGFILE} && chown ${DRIZZLE_USER}:nogroup ${LOGFILE}
         start-stop-daemon --background --pidfile ${PIDFILE} --stderr ${LOGFILE} \
         --user ${DRIZZLE_USER} --start --exec ${DRIZZLE_DAEMON} -- \
         --datadir=${DATADIR} --pid-file=${PIDFILE} --user=${DRIZZLE_USER} \