Bump ebuild to support haildb (bug right now tests fail if haildb is used, waiting for upstream to express their recommendation); also improve parallel build of documentation, running it within the same make process as the code build. Cleanup metadata.

Package-Manager: portage-2.2_rc97/cvs/Linux x86_64

4 files changed, 191 insertions, 13 deletions

diff --git a/dev-db/drizzle/ChangeLog b/dev-db/drizzle/ChangeLog
index 5e53b691879d..5e664642bc7d 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.16 2010/10/14 20:23:18 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-db/drizzle/ChangeLog,v 1.17 2010/10/18 13:06:02 flameeyes Exp $
+
+*drizzle-7.2010.10.01-r1 (18 Oct 2010)
+
+  18 Oct 2010; Diego E. Pettenò <flameeyes@gentoo.org>
+  +drizzle-7.2010.10.01-r1.ebuild, metadata.xml:
+  Bump ebuild to support haildb (bug right now tests fail if haildb is used,
+  waiting for upstream to express their recommendation); also improve
+  parallel build of documentation, running it within the same make process
+  as the code build. Cleanup metadata.
 
 *drizzle-7.2010.10.01 (14 Oct 2010)
 *drizzle-6.2010.08.1742 (14 Oct 2010)
diff --git a/dev-db/drizzle/Manifest b/dev-db/drizzle/Manifest
index f802872e3274..58eddbc4ca5d 100644
--- a/dev-db/drizzle/Manifest
+++ b/dev-db/drizzle/Manifest
@@ -1,3 +1,6 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
 AUX drizzle-2009.12.1240-nolint.patch 366 RMD160 5edac5d0f35b6a7830ba4c5d4cc9fa78f30c29bc SHA1 29f2257773552dabc40424ac068ca4ef32425d01 SHA256 612ffed94aebcce0aeef56a4fabfe35a5bb01f6c85a4c00757bef59f0cd75312
 AUX drizzle-2010.08.1742-pcre.patch 413 RMD160 fb532b5d9b6113cf6672f472bd8445ac2ab1ca8e SHA1 c39637b3466f09e0c4bfc97876e6409bbcd4196a SHA256 f83893d65909217af8ee98c2ed36acbc8269ea13a7a39dd7b0aad060f10cda79
 AUX drizzle.conf.d 17 RMD160 04ac72be16bab0e6a590a19d2d663baa6741e743 SHA1 0337f18c03bbfbf1203a6391f8d7076a4d36a155 SHA256 5739bf0120eb4ef9dfed0b5307332d10c728ab9d204411d37fec85393e6db630
@@ -5,6 +8,14 @@ AUX drizzle.init.d 4602 RMD160 477d668649c413df96aa34d14a7446a3b7343656 SHA1 66f
 DIST drizzle-2010.08.1742.tar.gz 9721271 RMD160 56ca34582eb260aa3461a67758dce8688af912b1 SHA1 d2e7b0e7240db2be55b86bbaa13a4f75926f1e2b SHA256 f39f7a6e893ead7231a17683833b3831d0586d3f7b24e40571bf0aabd5dfec54
 DIST drizzle7-2010.10.01.tar.gz 9785453 RMD160 b3a04b9d3db2de4b8f7b49a6262e4641b4eda003 SHA1 acda9daff29611163108b58104bbed0394612dc9 SHA256 58d84e26aa0ab6509c1be4780a8c4faecea37b79914a5965f2c01142b95eb73b
 EBUILD drizzle-6.2010.08.1742.ebuild 4319 RMD160 269063a7e6b948f0186d68fea83e290674024022 SHA1 d8f7602fa0a124b42f6587ae3f870b32600c2ca7 SHA256 6ff0e6b7c59a59007a669bcd5118c8e45fd1c6553acd26e3ab28e85c0c68707f
+EBUILD drizzle-7.2010.10.01-r1.ebuild 4439 RMD160 627a83ee8c4ec31c9f5c195da52c9e08c5dc413e SHA1 50603f6a0048a1361314a4730cbee9aa3c38f019 SHA256 2cdbbf4d8642ccf5dabbf4ee390ca9333de5b6e9deef19fa1bd22937a9f447cd
 EBUILD drizzle-7.2010.10.01.ebuild 4371 RMD160 28a167f78d83780cfa4dfc56dd03562e38d081d9 SHA1 9e4409861efa269353dab42dc0ed137014ee91dd SHA256 ff8e71fdb395ef359621f8a21054a39bb7cd5a83a0fac2b404e1d8aa8d2b4791
-MISC ChangeLog 4182 RMD160 9f18c98aa5ee159ec15ca73f115db05c9da8e361 SHA1 0174016b628d77d7f213d3ade75c6b715bc9d85c SHA256 d71809742b05cd01e45424094b2f9195d702026ba4eea1dbd6baf75409712332
-MISC metadata.xml 2042 RMD160 18ed10793c4049bfbc2f751c6e86f30b67a80bb5 SHA1 8b2db68dfb18209a9f888f7cc0f7f0e8e92d5361 SHA256 b87f2442e63235b51915ee7fc97d5f677047bbcf5db4b23e66d9bb8cbc3fd718
+MISC ChangeLog 4589 RMD160 ab6d9563307d35e04edaed9fe5f6e8a901f72215 SHA1 8cf08e7200cbeb3d51d187031e7809222f8a45f1 SHA256 ef419c57a5fc6fe2a068f718b61b53c5d89ae529fd5bfc70288a4f08c6e02561
+MISC metadata.xml 1855 RMD160 ab45f0607b34db49bfe7972a9ece34f73e8eda3b SHA1 d3967d627e939ee30126f26f4f97f97164c51825 SHA256 61d9e5fadb778b559dac84110a46a0f1f7c8b85e0dac0ff09c36c2fc7e0d3e83
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.16 (GNU/Linux)
+
+iEYEARECAAYFAky8RjYACgkQAiZjviIA2XhaBQCfQdoliNTDe1WaBcLjgVlaGzkm
+dyYAn2qBjPbnCKCx/Cw8Pz63vpsJViZ4
+=WBhu
+-----END PGP SIGNATURE-----
diff --git a/dev-db/drizzle/drizzle-7.2010.10.01-r1.ebuild b/dev-db/drizzle/drizzle-7.2010.10.01-r1.ebuild
new file mode 100644
index 000000000000..93a4acc28f33
--- /dev/null
+++ b/dev-db/drizzle/drizzle-7.2010.10.01-r1.ebuild
@@ -0,0 +1,161 @@
+# 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-7.2010.10.01-r1.ebuild,v 1.1 2010/10/18 13:06:02 flameeyes Exp $
+
+EAPI=2
+
+inherit flag-o-matic libtool autotools eutils pam versionator
+
+MY_P="${PN}$(replace_version_separator 1 -)"
+S="${WORKDIR}/${MY_P}"
+
+DESCRIPTION="Database optimized for Cloud and Net applications"
+HOMEPAGE="http://drizzle.org"
+SRC_URI="http://launchpad.net/drizzle/elliott/2010-10-11/+download/${MY_P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64"
+IUSE="debug tcmalloc doc memcache curl pam gearman +md5 ldap haildb"
+
+# upstream bug #499911
+#RESTRICT="memcache? ( test ) !curl? ( test )"
+
+# for libdrizzle version, check m4/pandora*, PANDORA_LIBDRIZZLE_RECENT
+RDEPEND="tcmalloc? ( dev-util/google-perftools )
+		sys-libs/readline
+		sys-apps/util-linux
+		dev-libs/libpcre
+		sys-devel/flex
+		>=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 )
+		haildb? ( >=dev-db/haildb-2.3.1 )
+		>=dev-libs/boost-1.32
+		ldap? ( net-nds/openldap )
+		!dev-db/libdrizzle"
+
+DEPEND="${RDEPEND}
+		dev-util/intltool
+		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}-2009.12.1240-nolint.patch"
+	epatch "${FILESDIR}/${PN}-2010.08.1742-pcre.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
+
+	# 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-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 ldap auth-ldap-plugin) \
+		--without-hello-world-plugin \
+		--disable-pbxt-plugin --without-pbxt-plugin \
+		--disable-rabbitmq-plugin --without-rabbitmq-plugin \
+		$(use_enable haildb libhaildb) \
+		$(use_enable haildb haildb-plugin) \
+		$(use_with haildb haildb-plugin) \
+		--with-auth-test-plugin \
+		--with-auth-file-plugin \
+		--with-simple-user-policy-plugin \
+		--enable-logging-stats-plugin \
+		--with-logging-stats-plugin \
+		--enable-console-plugin \
+		--enable-archive-plugin \
+		${myconf}
+
+}
+
+src_compile() {
+	emake all $(use doc && echo doxygen) || die "build failed"
+}
+
+# 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/metadata.xml b/dev-db/drizzle/metadata.xml
index 8ac63e45b32a..7bccc64eec34 100644
--- a/dev-db/drizzle/metadata.xml
+++ b/dev-db/drizzle/metadata.xml
@@ -41,23 +41,20 @@
       properly.
     </flag>
 
-    <flag name="pam" restrict="&lt;dev-db/drizzle-2010.03.1412">
-      Enable the PAM authentication plugin (using
-      <pkg>sys-libs/pam</pkg>).
-
-      Warning: currently the pam configuration file is missing so it
-      will not work out of the box.
-    </flag>
-
-    <flag name="pam" restrict="&gt;=dev-db/drizzle-2010.03.1412">
+    <flag name="pam">
       Enable the PAM authentication plugin (using
       <pkg>sys-libs/pam</pkg>). The configuration file created will be
       /etc/pam.d/drizzle.
     </flag>
 
-    <flag name="md5" restrict="&gt;=dev-db/drizzle-2010.03.1412">
+    <flag name="md5">
       Enable the MD5 plugin, using <pkg>dev-libs/libgcrypt</pkg>; this
       replaces the older openssl and gnutls USE flags.
     </flag>
+
+    <flag name="haildb">
+      Use the <pkg>dev-db/haildb</pkg> libraries to replace the innodb
+      plugin storage engine with haildb (an innodb fork).
+    </flag>
   </use>
 </pkgmetadata>