Version bump, remove old versions, fix the curl dependencies (bug #310141).

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

3 files changed, 23 insertions, 131 deletions

diff --git a/dev-db/drizzle/ChangeLog b/dev-db/drizzle/ChangeLog
index 3bd3bf7f2e64..11f36150be90 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.6 2010/03/18 13:04:53 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-db/drizzle/ChangeLog,v 1.7 2010/03/19 13:49:46 flameeyes Exp $
+
+*drizzle-2010.03.1347 (19 Mar 2010)
+
+  19 Mar 2010; Diego E. Pettenò <flameeyes@gentoo.org>
+  -drizzle-2010.01.1273.ebuild, -drizzle-2010.03.1317.ebuild,
+  +drizzle-2010.03.1347.ebuild:
+  Version bump, remove old versions, fix the curl dependencies (bug
+  #310141).
 
   18 Mar 2010; Diego E. Pettenò <flameeyes@gentoo.org>
   drizzle-2010.03.1317.ebuild:
diff --git a/dev-db/drizzle/drizzle-2010.01.1273.ebuild b/dev-db/drizzle/drizzle-2010.01.1273.ebuild
deleted file mode 100644
index 61bcc8a0f832..000000000000
--- a/dev-db/drizzle/drizzle-2010.01.1273.ebuild
+++ /dev/null
@@ -1,127 +0,0 @@
-# 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.01.1273.ebuild,v 1.2 2010/02/19 14:25:48 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/trunk/bell/+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[-openssl,-nss] )
-			openssl? ( net-misc/curl[-gnutls,-nss] )
-		)"
-
-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
-}
-
-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
-}
-
-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
-}
diff --git a/dev-db/drizzle/drizzle-2010.03.1317.ebuild b/dev-db/drizzle/drizzle-2010.03.1347.ebuild
index f1b899bbddfc..1ed8613962f6 100644
--- a/dev-db/drizzle/drizzle-2010.03.1317.ebuild
+++ b/dev-db/drizzle/drizzle-2010.03.1347.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.03.1317.ebuild,v 1.2 2010/03/18 13:04:53 flameeyes Exp $
+# $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
 
@@ -8,7 +8,7 @@ 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-01/+download/${P}.tar.gz"
+SRC_URI="http://launchpad.net/drizzle/cherry/2010-03-15/+download/${P}.tar.gz"
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="~amd64"
@@ -37,10 +37,21 @@ DEPEND="${RDEPEND}
 		doc? ( app-doc/doxygen )"
 RDEPEND="${RDEPEND}
 		curl? (
-			gnutls? ( net-misc/curl[-openssl,-nss] )
+			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."