[gentoo-commits] gentoo-x86 commit in dev-db/drizzle: metadata.xml ChangeLog drizzle-2010.03.1412.ebuild

[Diego Petteno (flameeyes)]

flameeyes    10/04/01 15:01:51

  Modified:             metadata.xml ChangeLog
  Added:                drizzle-2010.03.1412.ebuild
  Log:
  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.
  (Portage version: 2.2_rc67/cvs/Linux x86_64)

Revision  Changes    Path
1.2                  dev-db/drizzle/metadata.xml

file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/dev-db/drizzle/metadata.xml?rev=1.2&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/dev-db/drizzle/metadata.xml?rev=1.2&content-type=text/plain
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/dev-db/drizzle/metadata.xml?r1=1.1&r2=1.2

Index: metadata.xml
===================================================================
RCS file: /var/cvsroot/gentoo-x86/dev-db/drizzle/metadata.xml,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- metadata.xml	23 Dec 2009 20:39:33 -0000	1.1
+++ metadata.xml	1 Apr 2010 15:01:51 -0000	1.2
@@ -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>



1.8                  dev-db/drizzle/ChangeLog

file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/dev-db/drizzle/ChangeLog?rev=1.8&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/dev-db/drizzle/ChangeLog?rev=1.8&content-type=text/plain
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/dev-db/drizzle/ChangeLog?r1=1.7&r2=1.8

Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/dev-db/drizzle/ChangeLog,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- ChangeLog	19 Mar 2010 13:49:46 -0000	1.7
+++ ChangeLog	1 Apr 2010 15:01:51 -0000	1.8
@@ -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@g.o>
+  +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)
 



1.1                  dev-db/drizzle/drizzle-2010.03.1412.ebuild

file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/dev-db/drizzle/drizzle-2010.03.1412.ebuild?rev=1.1&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/dev-db/drizzle/drizzle-2010.03.1412.ebuild?rev=1.1&content-type=text/plain

Index: drizzle-2010.03.1412.ebuild
===================================================================
# 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
}