Version bump, new version solves the PAM problem (the pam.d file is set up properly) and simplifies the curl/gnutls/openssl dependency web as the MD5 plugin is now using libgcrypt.

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

4 files changed, 155 insertions, 9 deletions

diff --git a/dev-db/drizzle/ChangeLog b/dev-db/drizzle/ChangeLog
index 11f36150be90..97cb1d881bdf 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.7 2010/03/19 13:49:46 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-db/drizzle/ChangeLog,v 1.8 2010/04/01 15:01:51 flameeyes Exp $
+
+*drizzle-2010.03.1412 (01 Apr 2010)
+
+  01 Apr 2010; Diego E. Pettenò <flameeyes@gentoo.org>
+  +drizzle-2010.03.1412.ebuild, metadata.xml:
+  Version bump, new version solves the PAM problem (the pam.d file is set up
+  properly) and simplifies the curl/gnutls/openssl dependency web as the MD5
+  plugin is now using libgcrypt.
 
 *drizzle-2010.03.1347 (19 Mar 2010)
 
diff --git a/dev-db/drizzle/Manifest b/dev-db/drizzle/Manifest
index 6ba13f2fc6b0..574cf7d494b2 100644
--- a/dev-db/drizzle/Manifest
+++ b/dev-db/drizzle/Manifest
@@ -5,13 +5,15 @@ AUX drizzle-2009.12.1240-nolint.patch 366 RMD160 5edac5d0f35b6a7830ba4c5d4cc9fa7
 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
 EBUILD drizzle-2010.03.1347.ebuild 4549 RMD160 da52788744b9be7c8ecc7e800aa38888450eba20 SHA1 e58b13de9d87f3cc3f5b6afe24f1d171456f0317 SHA256 ea5984c18ef4e23413dea24e30f0617e8342a61a8b08f3f011e2c6b0f4f10d4f
-MISC ChangeLog 1837 RMD160 7507ca6f397a979eb743d9bb8f83df96c806a360 SHA1 ff614d62d1a8745954b6a689f0945ff1ad16462a SHA256 60482a0fd35639e6cff66851f927989079b8566ed9888cc80f2a08b32549851e
-MISC metadata.xml 2263 RMD160 160a507de863707c2d258cb29b787437b8787398 SHA1 62839e65f03b5261e2df6acbee1fce6240a3e1ed SHA256 ec06196287c8cf1b2369fb687435fdf3e5e392e9778b71366c4e44148289d4d6
+EBUILD drizzle-2010.03.1412.ebuild 3064 RMD160 7fb0b360fa8d582ac4c77bf686bfd956f2cec237 SHA1 fcc78a21db584144955736cb5b56c461a833c83c SHA256 f973eadedaf4fdec6fe4584bc88ba3398803b2bd6aa5de0cdef447f8daaed2a0
+MISC ChangeLog 2164 RMD160 5178d658af6b68d4287138c7a35b9158db0e5ba0 SHA1 dc8f47e4ef4b3c5aa2a9e841cfeb3cad7f3d4254 SHA256 a88edd061021a0f69271abbecc51f7820bb47de1c113644bbc1c4e76e2db0f47
+MISC metadata.xml 2823 RMD160 4d8ec16d5d512d4325305133578c2f0396200485 SHA1 2612ed473de2c4c0d6e912bdb1cc4303429a8b12 SHA256 37f8608359cbaea4b9a3f4ba0f5e71fa83f8236303584d5ca6458f5ed7fc8857
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.14 (GNU/Linux)
 
-iEYEARECAAYFAkujgOIACgkQAiZjviIA2XhcDwCfdbL531k1/5Wj1ZxfYYJAl72m
-tPcAoMg4Tu6QNB5IEvtmY29Lv4wMT0rf
-=F9Wo
+iEYEARECAAYFAku0tWgACgkQAiZjviIA2XiFSwCdGDhrnvVFo/sPokKvJW3xtrap
+fyUAn22C4QEGScVHB1ZBWv6B3zOByqGZ
+=7mLU
 -----END PGP SIGNATURE-----
diff --git a/dev-db/drizzle/drizzle-2010.03.1412.ebuild b/dev-db/drizzle/drizzle-2010.03.1412.ebuild
new file mode 100644
index 000000000000..570cf588f050
--- /dev/null
+++ b/dev-db/drizzle/drizzle-2010.03.1412.ebuild
@@ -0,0 +1,125 @@
+# 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.1 2010/04/01 15:01:51 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-03-29/+download/${P}.tar.gz"
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64"
+
+IUSE="debug tcmalloc doc memcache curl pam gearman +md5"
+
+# 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 )
+		memcache? ( dev-libs/libmemcached )
+		md5? ( dev-libs/libgcrypt )"
+DEPEND="${RDEPEND}
+		dev-util/gperf
+		doc? ( app-doc/doxygen )"
+
+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."
+
+	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
+
+	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) \
+		$(use_with md5 md5-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
+
+	pamd_mimic system-auth drizzle auth account session
+}
diff --git a/dev-db/drizzle/metadata.xml b/dev-db/drizzle/metadata.xml
index 039c69606fd6..23732b3da57e 100644
--- a/dev-db/drizzle/metadata.xml
+++ b/dev-db/drizzle/metadata.xml
@@ -35,7 +35,7 @@
       logging (using <pkg>sys-cluster/gearman</pkg>).
     </flag>
 
-    <flag name="gnutls">
+    <flag name="gnutls" restrict="&lt;dev-db/drizzle-2010.03.1412">
       Enable the MD5 plugin for user-defined functions (using
       <pkg>net-libs/gnutls</pkg>).
 
@@ -45,7 +45,7 @@
       conflicts.
     </flag>
 
-    <flag name="openssl">
+    <flag name="openssl" restrict="&lt;dev-db/drizzle-2010.03.1412">
       Enable the MD5 plugin for user-defined functions (using
       <pkg>dev-libs/openssl</pkg>).
 
@@ -61,12 +61,23 @@
       properly.
     </flag>
 
-    <flag name="pam">
+    <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">
+      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">
+      Enable the MD5 plugin, using <pkg>dev-libs/libgcrypt</pkg>; this
+      replaces the older openssl and gnutls USE flags.
+    </flag>
   </use>
 </pkgmetadata>