Alter version numbering to include full branch number, so we can introduce the last 7.0 release, and the final 7.1 release.

Package-Manager: portage-2.2.0_alpha99/cvs/Linux x86_64

5 files changed, 17 insertions, 351 deletions

diff --git a/dev-db/drizzle/ChangeLog b/dev-db/drizzle/ChangeLog
index b5b621f48c9c..a0efda65bd84 100644
--- a/dev-db/drizzle/ChangeLog
+++ b/dev-db/drizzle/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for dev-db/drizzle
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-db/drizzle/ChangeLog,v 1.24 2012/01/14 17:22:41 xarthisius Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-db/drizzle/ChangeLog,v 1.25 2012/04/10 00:30:50 robbat2 Exp $
+
+*drizzle-7.1.33 (10 Apr 2012)
+
+  10 Apr 2012; Robin H. Johnson <robbat2@gentoo.org> +drizzle-7.1.33.ebuild,
+  -drizzle-7.2010.12.06.ebuild, -drizzle-7.2011.02.09.ebuild,
+  -drizzle-7.2011.03.11.ebuild:
+  Alter version numbering to include full branch number, so we can introduce the
+  last 7.0 release, and the final 7.1 release.
 
   14 Jan 2012; Kacper Kowalik <xarthisius@gentoo.org> metadata.xml:
   tcmalloc is now global
diff --git a/dev-db/drizzle/Manifest b/dev-db/drizzle/Manifest
index 6a1f061bcacd..2d5acf9fca25 100644
--- a/dev-db/drizzle/Manifest
+++ b/dev-db/drizzle/Manifest
@@ -1,31 +1,7 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA256
-
 AUX drizzle-2009.12.1240-nolint.patch 366 RMD160 5edac5d0f35b6a7830ba4c5d4cc9fa78f30c29bc SHA1 29f2257773552dabc40424ac068ca4ef32425d01 SHA256 612ffed94aebcce0aeef56a4fabfe35a5bb01f6c85a4c00757bef59f0cd75312
 AUX drizzle.conf.d 17 RMD160 04ac72be16bab0e6a590a19d2d663baa6741e743 SHA1 0337f18c03bbfbf1203a6391f8d7076a4d36a155 SHA256 5739bf0120eb4ef9dfed0b5307332d10c728ab9d204411d37fec85393e6db630
 AUX drizzle.init.d 3936 RMD160 99ab5c4b20e5e9c498396737fde1dbfcb8dccd1e SHA1 8bb93e0f92ecedb192eb6f1d12e9c3b4700dc66b SHA256 b3a0645876ee8eabe8bd8b90dabd189a2365141fb28213b1d4148443410b119d
-DIST drizzle7-2010.12.06.tar.gz 10465124 RMD160 1451815540b50c0863a8df3271146ca4f8781733 SHA1 49ac1d227b69b051204d8b1531a823a9225fe350 SHA256 2049b5f60aa1b81150c3a4882335d849860c4af48ae515a0095c5aee59dae5e2
-DIST drizzle7-2011.02.09.tar.gz 10785858 RMD160 d07abcfc9ece47a3f15fd5465de053897af01cd8 SHA1 8176bf08c1d6c3db9d1c741844c7ec1b94ce60c8 SHA256 e0e99eabcf745e4d7c989d5230d34e2b52719734a300df08a8dbde34f51b633a
-DIST drizzle7-2011.03.11.tar.gz 10772294 RMD160 9174a4b5f99f192c4dc49d0e652ed12fa502d2a3 SHA1 1941f0037f2e93bc2cb766f9facfce11b1c4926f SHA256 c69b39f94d2476f79646e15f480ae46c1606452171d883dcc84ed06447e98ea9
-EBUILD drizzle-7.2010.12.06.ebuild 4400 RMD160 58c9e302ea263fc6bc11b40e72900d7c9ca0bb83 SHA1 c2aedc0a3fa49b5450b40c4b0a55db1ff105e4f7 SHA256 df41908ae638cc438d78135aa2e464d490b0a649e2f3e6e606a6a99d5d5d5ec0
-EBUILD drizzle-7.2011.02.09.ebuild 4379 RMD160 8d793d3e1a22dd18b222ff1fdd8f12eb27acbfdf SHA1 590abc251c7a05680b1b054e2c3ddaf3ada4ec9d SHA256 67f096a48bad2c4cc73e780ab6d31467ac638d4ff78824768cf59e7c2deadee9
-EBUILD drizzle-7.2011.03.11.ebuild 4356 RMD160 4cd4cccd565bc7686cc3fde93116a90364ac6267 SHA1 c8e129cf71f08ee9ae4e3f8659f345b467d72c09 SHA256 e7e3c5a3bf481fc7d0da5b789b47633dffc38e9d4a92c0c70f26d82e715e4f0b
-MISC ChangeLog 5853 RMD160 bdd04c7dc5aa0081fd6aa38a985ac154ec106494 SHA1 e3d8d1447525aa6c6fb9598406b8dfbc6cb4b5a1 SHA256 9eba8bca8615b53e6785ef3d2f19aae26a5c722eb19f9d0e0bfb1a3d59966f19
+DIST drizzle-7.1.33-stable.tar.gz 29203104 RMD160 f94bef67fd2c2f95e29a93e1b457a383ba2cdb2d SHA1 5ca3349e8bc14ac73a94ed7ddf1fd234c47f5110 SHA256 12215b143f4a77ba44a7312313f1d187d598c6dd5b7eb949a7404599e827fcc0
+EBUILD drizzle-7.1.33.ebuild 4334 RMD160 572457a55bcc4f4876c5d4c103370d5d4d5e12cd SHA1 4e669cc7fe61412b5dcc2da9a2baf6c00f02dc88 SHA256 a1856337fef198c73d0799be6af5360aa84c12aac17757550d2d384250e3cefe
+MISC ChangeLog 6181 RMD160 8fc53f8c3848ce0721b3f5cba3088b03c1115267 SHA1 555ddc903f768f2dbaf68429ffa46f26b7ae71ab SHA256 c078575c69da4745b26ef1aef48fdf910dd87164630ee3b23c09b30bea0976ca
 MISC metadata.xml 1658 RMD160 8b44e3c92246c7d8be61ca8815ebee530a1556fd SHA1 4efadd33a7b3c678b3d9ee1193c2ff7ca56a0358 SHA256 f38c60f32f13be51aab762c165d09737722bdda1a175ff8001dbaecc16f11540
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.18 (GNU/Linux)
-
-iQIcBAEBCAAGBQJPEbnqAAoJEF0huFKJUZL58wUP/1aF2YLCtBNeVr28Y0DljxeF
-Xuz1X/ycogETc00d7xHqMi8DNPkNqxyLS0ujoxa3lwAZ958rK1Sg6mzvPP5Emb3D
-8oef8nFCmuj1vlnW5Qk7IOboCn55ilZJuBuVvFNiR75qrb7nxjAnIiU7PGrns7x9
-NymvAAbwiXcJWafwz36lbxejxp7UZN6xwyPef9LPJuKPXxsnWUbklv3H4baSzVNe
-G109Btygz9eQAszyMiGVdFY0QUyf2OuqWM5ZI0BybFtJVm4SDijVwHEu5k5OKmn3
-pAAGw6YVMnoH+sUREPfZb1xjzLxmk89xWrK0bApNjW8xGELxn3TJrKBBQqbEtObw
-cEGeYMFMOdR3Z4PgDOQQMjS6rj36x7ZTX9y6NlxN9OUlM/usNENcYjSMcvzTbt/V
-IS7rds857jzRJcUWuPBkNQLGYZE7Nq1HruKj/H4nqbK6yBEA3HHU+RLd5YIfnLys
-FDhxofryBacFOBVT2HHscCU/L+I5ZJciyeG31rnke843Dcy0EK4LMYOlj7t8cebO
-BoIJc+oqDzp3ixYQriwG4t39r49oyslPfcxH7XZ2qFJs9v6MStd6Xb1EkOkgZbx0
-zoiVQmw7z9Q5vP55oepJGT5tCdlbXmmdt/lD52b+/b9Hk1rEGXRwOqj4JoApmaIP
-s/uWw4ZATYxvfEcwvyDe
-=yUfq
------END PGP SIGNATURE-----
diff --git a/dev-db/drizzle/drizzle-7.2011.03.11.ebuild b/dev-db/drizzle/drizzle-7.1.33.ebuild
index 62128f459e02..18373538286a 100644
--- a/dev-db/drizzle/drizzle-7.2011.03.11.ebuild
+++ b/dev-db/drizzle/drizzle-7.1.33.ebuild
@@ -1,17 +1,18 @@
-# Copyright 1999-2011 Gentoo Foundation
+# Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-db/drizzle/drizzle-7.2011.03.11.ebuild,v 1.2 2011/08/04 11:33:32 hwoarang Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-db/drizzle/drizzle-7.1.33.ebuild,v 1.1 2012/04/10 00:30:50 robbat2 Exp $
 
 EAPI=2
 
 inherit flag-o-matic libtool autotools eutils pam versionator
 
-MY_P="${PN}$(replace_version_separator 1 -)"
+MY_P="${P}-stable"
 S="${WORKDIR}/${MY_P}"
+DIR_PV="$(get_version_component_range 1-2)/${PV}"
 
 DESCRIPTION="Database optimized for Cloud and Net applications"
 HOMEPAGE="http://drizzle.org"
-SRC_URI="http://launchpad.net/drizzle/elliott/$(get_version_component_range 2-2)-02-28/+download/${MY_P}.tar.gz"
+SRC_URI="http://launchpad.net/drizzle/${DIR_PV}/+download/${MY_P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
diff --git a/dev-db/drizzle/drizzle-7.2010.12.06.ebuild b/dev-db/drizzle/drizzle-7.2010.12.06.ebuild
deleted file mode 100644
index 14c769f27c2a..000000000000
--- a/dev-db/drizzle/drizzle-7.2010.12.06.ebuild
+++ /dev/null
@@ -1,160 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-db/drizzle/drizzle-7.2010.12.06.ebuild,v 1.1 2011/01/10 01:22:32 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/$(get_version_component_range 2-2)-$(get_version_component_range 3-3)-20/+download/${MY_P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="debug tcmalloc doc memcache curl pam gearman +md5 ldap haildb"
-
-# upstream bug #499911
-#RESTRICT="memcache? ( test ) !curl? ( test )"
-
-RDEPEND="tcmalloc? ( dev-util/google-perftools )
-		sys-libs/readline
-		sys-apps/util-linux
-		dev-libs/libpcre
-		>=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}
-		sys-devel/gettext
-		dev-util/intltool
-		dev-util/gperf
-		sys-devel/flex
-		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"
-
-	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/drizzle-7.2011.02.09.ebuild b/dev-db/drizzle/drizzle-7.2011.02.09.ebuild
deleted file mode 100644
index 21bb81072898..000000000000
--- a/dev-db/drizzle/drizzle-7.2011.02.09.ebuild
+++ /dev/null
@@ -1,159 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-db/drizzle/drizzle-7.2011.02.09.ebuild,v 1.1 2011/02/03 12:31:37 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/$(get_version_component_range 2-2)-01-31/+download/${MY_P}.tar.gz"
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="debug tcmalloc doc memcache curl pam gearman +md5 ldap haildb"
-
-# tests are known to fail with haildb enabled, still.
-RESTRICT="haildb? ( test )"
-
-RDEPEND="tcmalloc? ( dev-util/google-perftools )
-		sys-libs/readline
-		sys-apps/util-linux
-		dev-libs/libpcre
-		>=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.2 )
-		>=dev-libs/boost-1.32
-		ldap? ( net-nds/openldap )
-		!dev-db/libdrizzle"
-
-DEPEND="${RDEPEND}
-		sys-devel/gettext
-		dev-util/intltool
-		dev-util/gperf
-		sys-devel/flex
-		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"
-
-	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
-}