Version bump, drop old, fix #471784

(Portage version: 2.1.12.2/cvs/Linux x86_64, signed Manifest commit with key B658FA13)

4 files changed, 15 insertions, 147 deletions

diff --git a/dev-db/mongodb/ChangeLog b/dev-db/mongodb/ChangeLog
index 99637fff331e..5c0f539ea741 100644
--- a/dev-db/mongodb/ChangeLog
+++ b/dev-db/mongodb/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for dev-db/mongodb
 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-db/mongodb/ChangeLog,v 1.67 2013/04/24 07:28:14 ultrabug Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-db/mongodb/ChangeLog,v 1.68 2013/06/05 09:59:46 ultrabug Exp $
+
+*mongodb-2.4.4 (05 Jun 2013)
+
+  05 Jun 2013; Ultrabug <ultrabug@gentoo.org> -mongodb-2.4.2.ebuild,
+  -mongodb-2.4.3.ebuild, +mongodb-2.4.4.ebuild,
+  +files/mongodb-2.4.4-fix-sharedclient.patch,
+  -files/mongodb-2.4-fix-sharedclient.patch:
+  Version bump, drop old, fix #471784
 
 *mongodb-2.4.3 (24 Apr 2013)
 
diff --git a/dev-db/mongodb/files/mongodb-2.4-fix-sharedclient.patch b/dev-db/mongodb/files/mongodb-2.4.4-fix-sharedclient.patch
index ac086b97f3c8..891b9b1531c8 100644
--- a/dev-db/mongodb/files/mongodb-2.4-fix-sharedclient.patch
+++ b/dev-db/mongodb/files/mongodb-2.4.4-fix-sharedclient.patch
@@ -67,7 +67,7 @@ index b88a54f..a15bbb3 100644
  
  if env['MONGO_BUILD_SASL_CLIENT']:
      clientSource = clientSourceAll
-+    env.Append(LIBS="gsasl")
++    env.Append(LIBS="sasl2")
  else:
      clientSource = clientSourceBasic
  
diff --git a/dev-db/mongodb/mongodb-2.4.3.ebuild b/dev-db/mongodb/mongodb-2.4.3.ebuild
deleted file mode 100644
index 6cdfada4e2c4..000000000000
--- a/dev-db/mongodb/mongodb-2.4.3.ebuild
+++ /dev/null
@@ -1,137 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-db/mongodb/mongodb-2.4.3.ebuild,v 1.1 2013/04/24 07:28:14 ultrabug Exp $
-
-EAPI=4
-SCONS_MIN_VERSION="1.2.0"
-
-inherit eutils flag-o-matic multilib pax-utils scons-utils user versionator
-
-MY_P=${PN}-src-r${PV/_rc/-rc}
-
-DESCRIPTION="A high-performance, open source, schema-free document-oriented database"
-HOMEPAGE="http://www.mongodb.org"
-SRC_URI="http://downloads.mongodb.org/src/${MY_P}.tar.gz
-	mms-agent? ( http://dev.gentoo.org/~ultrabug/20130319-10gen-mms-agent.zip )"
-
-LICENSE="AGPL-3 Apache-2.0"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="kerberos mms-agent sharedclient spidermonkey ssl static-libs"
-
-PDEPEND="mms-agent? ( dev-python/pymongo )"
-RDEPEND="
-	dev-lang/v8
-	>=dev-libs/boost-1.50[threads(+)]
-	dev-libs/libpcre[cxx]
-	dev-util/google-perftools
-	net-libs/libpcap
-	app-arch/snappy
-	ssl? ( >=dev-libs/openssl-1.0.1c )"
-DEPEND="${RDEPEND}
-	sys-libs/readline
-	sys-libs/ncurses
-	kerberos? ( net-libs/libgsasl )"
-
-S=${WORKDIR}/${MY_P}
-
-pkg_setup() {
-	enewgroup mongodb
-	enewuser mongodb -1 -1 /var/lib/${PN} mongodb
-
-	scons_opts="  --cc=$(tc-getCC) --cxx=$(tc-getCXX)"
-	scons_opts+=" --use-system-tcmalloc"
-	scons_opts+=" --use-system-pcre"
-	scons_opts+=" --use-system-snappy"
-	scons_opts+=" --use-system-boost"
-
-	if use kerberos; then
-		scons_opts+=" --use-sasl-client"
-	fi
-
-	if use sharedclient; then
-		scons_opts+=" --sharedclient"
-	fi
-
-	if use spidermonkey; then
-		scons_opts+=" --usesm"
-	else
-		scons_opts+=" --use-system-v8"
-	fi
-
-	if use ssl; then
-		scons_opts+=" --ssl"
-	fi
-}
-
-src_prepare() {
-	epatch "${FILESDIR}/${PN}-2.2-r1-fix-scons.patch"
-	epatch "${FILESDIR}/${PN}-2.2-r1-fix-boost.patch"
-	epatch "${FILESDIR}/mongodb-2.4-fix-sharedclient.patch"
-
-	# bug #462606
-	sed -i -e "s@\prefix + \"/lib\"@prefix + \"/$(get_libdir)\"@g" src/SConscript.client || die
-	if use !prefix && [[ "$(get_libdir)" == "lib" ]]; then
-		sed -i -e 's/^env.Install(prefix/env.InstallAs(prefix/g' src/SConscript.client || die
-	fi
-}
-
-src_compile() {
-	escons ${scons_opts} all
-}
-
-src_install() {
-	escons ${scons_opts} --full --nostrip install --prefix="${ED}"/usr
-
-	use static-libs || find "${ED}"/usr/ -type f -name "*.a" -delete
-
-	if ! use spidermonkey; then
-		pax-mark m "${ED}"/usr/bin/{mongo,mongod}
-	fi
-
-	for x in /var/{lib,log}/${PN}; do
-		keepdir "${x}"
-		fowners mongodb:mongodb "${x}"
-	done
-
-	doman debian/mongo*.1
-	dodoc README docs/building.md
-
-	newinitd "${FILESDIR}/${PN}.initd" ${PN}
-	newconfd "${FILESDIR}/${PN}.confd" ${PN}
-	newinitd "${FILESDIR}/${PN/db/s}.initd" ${PN/db/s}
-	newconfd "${FILESDIR}/${PN/db/s}.confd" ${PN/db/s}
-
-	insinto /etc/logrotate.d/
-	newins "${FILESDIR}/${PN}.logrotate" ${PN}
-
-	if use mms-agent; then
-		local MY_PN="mms-agent"
-		local MY_D="/opt/${MY_PN}"
-		insinto ${MY_D}
-		doins "${WORKDIR}/${MY_PN}/"*
-		fowners -R mongodb:mongodb ${MY_D}
-		newinitd "${FILESDIR}/${MY_PN}.initd" ${MY_PN}
-		newconfd "${FILESDIR}/${MY_PN}.confd" ${MY_PN}
-	fi
-}
-
-pkg_preinst() {
-	# wrt bug #461466
-	if [[ "$(get_libdir)" == "lib64" ]]; then
-		rmdir "${ED}"/usr/lib/
-	fi
-}
-
-src_test() {
-	escons ${scons_opts} test
-	"${S}"/test --dbpath=unittest || die
-}
-
-pkg_postinst() {
-	if [[ ${REPLACING_VERSIONS} < 1.8 ]]; then
-		ewarn "You just upgraded from a previous version of mongodb !"
-		ewarn "Make sure you run 'mongod --upgrade' before using this version."
-	fi
-	elog "Journaling is now enabled by default, see /etc/conf.d/${PN}"
-}
diff --git a/dev-db/mongodb/mongodb-2.4.2.ebuild b/dev-db/mongodb/mongodb-2.4.4.ebuild
index 330e7cbdedb3..3706a33c3ff1 100644
--- a/dev-db/mongodb/mongodb-2.4.2.ebuild
+++ b/dev-db/mongodb/mongodb-2.4.4.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-db/mongodb/mongodb-2.4.2.ebuild,v 1.2 2013/04/19 09:51:02 ultrabug Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-db/mongodb/mongodb-2.4.4.ebuild,v 1.1 2013/06/05 09:59:46 ultrabug Exp $
 
 EAPI=4
 SCONS_MIN_VERSION="1.2.0"
@@ -12,7 +12,7 @@ MY_P=${PN}-src-r${PV/_rc/-rc}
 DESCRIPTION="A high-performance, open source, schema-free document-oriented database"
 HOMEPAGE="http://www.mongodb.org"
 SRC_URI="http://downloads.mongodb.org/src/${MY_P}.tar.gz
-	mms-agent? ( http://dev.gentoo.org/~ultrabug/20130319-10gen-mms-agent.zip )"
+	mms-agent? ( http://dev.gentoo.org/~ultrabug/20130605-10gen-mms-agent.zip )"
 
 LICENSE="AGPL-3 Apache-2.0"
 SLOT="0"
@@ -31,7 +31,7 @@ RDEPEND="
 DEPEND="${RDEPEND}
 	sys-libs/readline
 	sys-libs/ncurses
-	kerberos? ( net-libs/libgsasl )"
+	kerberos? ( dev-libs/cyrus-sasl[kerberos] )"
 
 S=${WORKDIR}/${MY_P}
 
@@ -67,13 +67,10 @@ pkg_setup() {
 src_prepare() {
 	epatch "${FILESDIR}/${PN}-2.2-r1-fix-scons.patch"
 	epatch "${FILESDIR}/${PN}-2.2-r1-fix-boost.patch"
-	epatch "${FILESDIR}/mongodb-2.4-fix-sharedclient.patch"
+	epatch "${FILESDIR}/mongodb-2.4.4-fix-sharedclient.patch"
 
 	# bug #462606
 	sed -i -e "s@\prefix + \"/lib\"@prefix + \"/$(get_libdir)\"@g" src/SConscript.client || die
-	if use !prefix && [[ "$(get_libdir)" == "lib" ]]; then
-		sed -i -e 's/^env.Install(prefix/env.InstallAs(prefix/g' src/SConscript.client || die
-	fi
 }
 
 src_compile() {
@@ -129,7 +126,7 @@ src_test() {
 }
 
 pkg_postinst() {
-	if [[ ${REPLACING_VERSIONS} < 1.8 ]]; then
+	if [[ ${REPLACING_VERSIONS} < 2.4 ]]; then
 		ewarn "You just upgraded from a previous version of mongodb !"
 		ewarn "Make sure you run 'mongod --upgrade' before using this version."
 	fi