Version bump.

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

3 files changed, 146 insertions, 6 deletions

diff --git a/dev-db/drizzle/ChangeLog b/dev-db/drizzle/ChangeLog
index 3d8345f22b89..9c9a9184c174 100644
--- a/dev-db/drizzle/ChangeLog
+++ b/dev-db/drizzle/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for dev-db/drizzle
-# Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-db/drizzle/ChangeLog,v 1.1 2009/12/23 20:39:33 flameeyes Exp $
+# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/dev-db/drizzle/ChangeLog,v 1.2 2010/01/13 10:21:32 flameeyes Exp $
+
+*drizzle-2010.01.1263 (13 Jan 2010)
+
+  13 Jan 2010; Diego E. Pettenò <flameeyes@gentoo.org>
+  +drizzle-2010.01.1263.ebuild:
+  Version bump.
 
 *drizzle-2009.12.1251 (23 Dec 2009)
 
diff --git a/dev-db/drizzle/Manifest b/dev-db/drizzle/Manifest
index d6ad58937fde..a6c9c7b5212b 100644
--- a/dev-db/drizzle/Manifest
+++ b/dev-db/drizzle/Manifest
@@ -4,13 +4,15 @@ Hash: SHA1
 AUX drizzle-2009.12.1240-asneeded.patch 707 RMD160 a3bc68cff9c9bdc74647461f956e2509fee2ac62 SHA1 6f8c29b67cf2c663c63cb92cb49f0f94b33a3c91 SHA256 04035b625ff830e21486fce9c96470713994694726dcebac10c7c1647257d981
 AUX drizzle-2009.12.1240-nolint.patch 366 RMD160 5edac5d0f35b6a7830ba4c5d4cc9fa78f30c29bc SHA1 29f2257773552dabc40424ac068ca4ef32425d01 SHA256 612ffed94aebcce0aeef56a4fabfe35a5bb01f6c85a4c00757bef59f0cd75312
 DIST drizzle-2009.12.1251.tar.gz 7524661 RMD160 6d12d6d282a43756e2f56a60a18e5382d78fae28 SHA1 639472cf93451b009729a713e86dce498726667e SHA256 50ee541dbadb10a6f62ef52419e6a789ca15caeb371627210037362b5dc18bd4
+DIST drizzle-2010.01.1263.tar.gz 7532727 RMD160 19f6e69c35500fbd135d818e94ba4b60fd188397 SHA1 5795ef266e2a74094a59dd4adbe789f9982ff33a SHA256 fe60480362725ce5154c8276c92c165f91043d7368e3f1efed9025742cdff1fa
 EBUILD drizzle-2009.12.1251.ebuild 3252 RMD160 41921afb3c4f33d013ff554ffc1e8c75f65d88cb SHA1 5b19dc2285753ec87dba4fd54b2d0051211510c0 SHA256 0382fbae640eca5a833e14d08ba6f2c903d62b8c47666403df03f1ca35f87103
-MISC ChangeLog 644 RMD160 6683cf4d1c4624bb5f8f7dc7c02772c581aecdac SHA1 606f5817d394ac718b8c896bdac63e6360d6b6fe SHA256 cf1bfc382c8e58461143b3dfa869000d2cda4ad429906836377e7e97adeb6025
+EBUILD drizzle-2010.01.1263.ebuild 3196 RMD160 9b85be12fb17d2e6b9875087d6462cfc65932bb5 SHA1 ec10e1b4d805f29b911f61ff4f8e702e20c44ee1 SHA256 0b06d3b36d1ad0d898ae79ce2a46e092db231cd17aa89155e84a485776a8b8bb
+MISC ChangeLog 786 RMD160 4458e8cab9b2615c1a3d6aba6d3599c3cd2e8dec SHA1 7e2c6108d6d72d7a62adf35dd14e7bd455ac2ef2 SHA256 ca1ea7890e48d675740ffa84b5b12681272b37bd83ecfdd5b79a38395328bb73
 MISC metadata.xml 2263 RMD160 160a507de863707c2d258cb29b787437b8787398 SHA1 62839e65f03b5261e2df6acbee1fce6240a3e1ed SHA256 ec06196287c8cf1b2369fb687435fdf3e5e392e9778b71366c4e44148289d4d6
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.14 (GNU/Linux)
 
-iEYEARECAAYFAksyf+4ACgkQAiZjviIA2XhypACgmTkXGiPLEpQ/jfucrDK0V6CE
-ZZsAoMOMNz8tL+6+2sDYVyM63IjNfeOA
-=ajN3
+iEYEARECAAYFAktNnrMACgkQAiZjviIA2Xiw3QCg2KNsg007HXu1a3peuadgTwl2
+kSAAniUGZQgyiBIC8oTZsr/pL7T6WQmh
+=YPZd
 -----END PGP SIGNATURE-----
diff --git a/dev-db/drizzle/drizzle-2010.01.1263.ebuild b/dev-db/drizzle/drizzle-2010.01.1263.ebuild
new file mode 100644
index 000000000000..29499b121587
--- /dev/null
+++ b/dev-db/drizzle/drizzle-2010.01.1263.ebuild
@@ -0,0 +1,132 @@
+# 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.1263.ebuild,v 1.1 2010/01/13 10:21:32 flameeyes Exp $
+
+EAPI=2
+
+inherit flag-o-matic libtool autotools eutils
+
+DESCRIPTION="Drizzle project"
+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"
+
+	# disable hello_world tests as we don't care about the
+	# demonstrative plugin.
+	# https://bugs.launchpad.net/drizzle/+bug/499944
+	rm "${S}"/tests/{t,r}/hello_world.* || die
+
+	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
+}