fix #482576, drop v8 dep. ebuilds, update metadata

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

7 files changed, 16 insertions, 433 deletions

diff --git a/dev-db/mongodb/ChangeLog b/dev-db/mongodb/ChangeLog
index b621c17a45d5..49b088c6d0e4 100644
--- a/dev-db/mongodb/ChangeLog
+++ b/dev-db/mongodb/ChangeLog
@@ -1,6 +1,12 @@
 # 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.79 2013/10/22 10:02:42 ultrabug Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-db/mongodb/ChangeLog,v 1.80 2013/10/28 14:30:33 ultrabug Exp $
+
+  28 Oct 2013; Ultrabug <ultrabug@gentoo.org> -mongodb-2.2.6.ebuild,
+  -mongodb-2.4.6.ebuild, -mongodb-2.4.6-r1.ebuild, mongodb-2.4.6-r2.ebuild,
+  mongodb-2.4.7.ebuild, metadata.xml:
+  fix gcc-4.8 compilation #482576 thx to @xarthisius, drop v8 dependent
+  ebuilds, update metadata
 
 *mongodb-2.4.7 (22 Oct 2013)
 
diff --git a/dev-db/mongodb/metadata.xml b/dev-db/mongodb/metadata.xml
index d36240582fbe..87c16b599fe0 100644
--- a/dev-db/mongodb/metadata.xml
+++ b/dev-db/mongodb/metadata.xml
@@ -20,13 +20,8 @@
 	and powerful queries).
 	</longdescription>
 	<use>
-		<flag name="embedded-v8">Use embedded version of v8 instead of system v8</flag>
-		<flag name="v8">Use V8 JavaScript engine
-			(<pkg>dev-lang/v8</pkg>) instead of SpiderMonkey
-			(<pkg>dev-lang/spidermonkey</pkg>)</flag>
 		<flag name="spidermonkey">Use embedded SpiderMonkey engine
-			(<pkg>dev-lang/spidermonkey</pkg>) instead of v8
-			(<pkg>dev-lang/v8</pkg>)</flag>
+			(<pkg>dev-lang/spidermonkey</pkg>) instead of v8</flag>
 		<flag name="mms-agent">Install the MongoDB Monitoring Service agent</flag>
 		<flag name="sharedclient">build client shared library libmongoclient.so</flag>
 	</use>
diff --git a/dev-db/mongodb/mongodb-2.2.6.ebuild b/dev-db/mongodb/mongodb-2.2.6.ebuild
deleted file mode 100644
index 93c1ece3b6bd..000000000000
--- a/dev-db/mongodb/mongodb-2.2.6.ebuild
+++ /dev/null
@@ -1,117 +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.2.6.ebuild,v 1.1 2013/08/21 12:41:54 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/20130821-10gen-mms-agent.zip )"
-
-LICENSE="AGPL-3 Apache-2.0"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="mms-agent static-libs v8"
-
-PDEPEND="mms-agent? ( dev-python/pymongo app-arch/unzip )"
-RDEPEND="
-	v8? ( dev-lang/v8 )
-	>=dev-libs/boost-1.50[threads(+)]
-	dev-libs/libpcre[cxx]
-	dev-util/google-perftools
-	net-libs/libpcap
-	app-arch/snappy"
-DEPEND="${RDEPEND}
-	sys-libs/readline
-	sys-libs/ncurses"
-
-S=${WORKDIR}/${MY_P}
-
-pkg_setup() {
-	enewgroup mongodb
-	enewuser mongodb -1 -1 /var/lib/${PN} mongodb
-
-	scons_opts="  --cc=$(tc-getCC) --cxx=$(tc-getCXX) --sharedclient"
-	scons_opts+=" --use-system-tcmalloc"
-	scons_opts+=" --use-system-pcre"
-	scons_opts+=" --use-system-snappy"
-	scons_opts+=" --use-system-boost"
-
-	if use v8; then
-		scons_opts+=" --usev8"
-	else
-		scons_opts+=" --usesm"
-	fi
-}
-
-src_prepare() {
-	epatch "${FILESDIR}/${PN}-2.2-r1-fix-scons.patch"
-	epatch "${FILESDIR}/${PN}-2.2-r1-fix-boost.patch"
-	epatch "${FILESDIR}/${PN}-2.2-r2-boost-1.50.patch"
-	epatch "${FILESDIR}/${PN}-2.2-fix-sharedclient.patch"
-
-	# FIXME: apply only this fix [1] on x86 boxes as it breaks /usr/lib symlink
-	# on amd64 machines [2].
-	# [1] https://jira.mongodb.org/browse/SERVER-5575
-	# [2] https://bugs.gentoo.org/show_bug.cgi?id=434664
-	if use !prefix && [[ "$(get_libdir)" == "lib" ]]; then
-		epatch "${FILESDIR}/${PN}-2.2-fix-x86client.patch"
-	fi
-}
-
-src_compile() {
-	escons ${scons_opts} all
-}
-
-src_install() {
-	escons ${scons_opts} --full --nostrip install --prefix="${ED}"/usr
-
-	use static-libs || rm "${ED}/usr/$(get_libdir)/libmongoclient.a"
-
-	use v8 && pax-mark m "${ED}"/usr/bin/{mongo,mongod}
-
-	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-r1" ${PN}
-	newconfd "${FILESDIR}/${PN}.confd" ${PN}
-	newinitd "${FILESDIR}/${PN/db/s}.initd-r1" ${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
-}
-
-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.6-r1.ebuild b/dev-db/mongodb/mongodb-2.4.6-r1.ebuild
deleted file mode 100644
index bcf3cd5072c7..000000000000
--- a/dev-db/mongodb/mongodb-2.4.6-r1.ebuild
+++ /dev/null
@@ -1,155 +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.6-r1.ebuild,v 1.1 2013/09/28 11:40:54 pacho Exp $
-
-EAPI=4
-SCONS_MIN_VERSION="1.2.0"
-
-inherit eutils flag-o-matic multilib pax-utils scons-utils systemd 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/20130821-10gen-mms-agent.zip )"
-
-LICENSE="AGPL-3 Apache-2.0"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="-embedded-v8 kerberos mms-agent sharedclient spidermonkey ssl static-libs"
-
-PDEPEND="mms-agent? ( dev-python/pymongo app-arch/unzip )"
-RDEPEND="
-	!spidermonkey? (
-		!embedded-v8? ( <dev-lang/v8-3.19 )
-	)
-	>=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? ( dev-libs/cyrus-sasl[kerberos] )"
-
-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 prefix; then
-		scons_opts+=" --cpppath=${EPREFIX}/usr/include"
-		scons_opts+=" --libpath=${EPREFIX}/usr/$(get_libdir)"
-	fi
-
-	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
-		if use embedded-v8; then
-			scons_opts+=" --usev8"
-		else
-			scons_opts+=" --use-system-v8"
-		fi
-	fi
-
-	if use ssl; then
-		scons_opts+=" --ssl"
-	fi
-}
-
-src_prepare() {
-	epatch "${FILESDIR}/${PN}-2.4.5-fix-scons.patch"
-	epatch "${FILESDIR}/${PN}-2.2-r1-fix-boost.patch"
-
-	# bug #462606
-	sed -i -e "s@\$INSTALL_DIR/lib@\$INSTALL_DIR/$(get_libdir)@g" src/SConscript.client || die
-}
-
-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-r1" ${PN}
-	newconfd "${FILESDIR}/${PN}.confd" ${PN}
-	newinitd "${FILESDIR}/${PN/db/s}.initd-r1" ${PN/db/s}
-	newconfd "${FILESDIR}/${PN/db/s}.confd" ${PN/db/s}
-	systemd_dounit "${FILESDIR}"/${PN}.service
-	insinto /etc
-	doins "${FILESDIR}"/${PN}.conf
-
-	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/ &>/dev/null
-	fi
-}
-
-src_test() {
-	escons ${scons_opts} test
-	"${S}"/test --dbpath=unittest || die
-}
-
-pkg_postinst() {
-	if use embedded-v8; then
-		ewarn "You chose to build ${PN} using embedded v8."
-		ewarn "This is not recommended by Gentoo and should be used to resolve"
-		ewarn "blockers with packages requiring >=v8-3.19 only !"
-		ewarn "See the following bug [1] and jira issue [2] for more info."
-		ewarn "    [1] https://bugs.gentoo.org/show_bug.cgi?id=471582"
-		ewarn "    [2] https://jira.mongodb.org/browse/SERVER-10282"
-	fi
-	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
-	elog "Journaling is now enabled by default, see /etc/conf.d/${PN}"
-}
diff --git a/dev-db/mongodb/mongodb-2.4.6-r2.ebuild b/dev-db/mongodb/mongodb-2.4.6-r2.ebuild
index 4a1c94d07956..85c499b0d1fc 100644
--- a/dev-db/mongodb/mongodb-2.4.6-r2.ebuild
+++ b/dev-db/mongodb/mongodb-2.4.6-r2.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.6-r2.ebuild,v 1.1 2013/10/21 10:17:05 ultrabug Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-db/mongodb/mongodb-2.4.6-r2.ebuild,v 1.2 2013/10/28 14:30:33 ultrabug Exp $
 
 EAPI=4
 SCONS_MIN_VERSION="1.2.0"
@@ -74,6 +74,9 @@ src_prepare() {
 
 	# bug #462606
 	sed -i -e "s@\$INSTALL_DIR/lib@\$INSTALL_DIR/$(get_libdir)@g" src/SConscript.client || die
+
+	# bug #482576
+	sed -i -e "/-Werror/d" src/third_party/v8/SConscript || die
 }
 
 src_compile() {
diff --git a/dev-db/mongodb/mongodb-2.4.6.ebuild b/dev-db/mongodb/mongodb-2.4.6.ebuild
deleted file mode 100644
index c62a8c664ee1..000000000000
--- a/dev-db/mongodb/mongodb-2.4.6.ebuild
+++ /dev/null
@@ -1,152 +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.6.ebuild,v 1.2 2013/08/30 07:02:29 heroxbd 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/20130821-10gen-mms-agent.zip )"
-
-LICENSE="AGPL-3 Apache-2.0"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="-embedded-v8 kerberos mms-agent sharedclient spidermonkey ssl static-libs"
-
-PDEPEND="mms-agent? ( dev-python/pymongo app-arch/unzip )"
-RDEPEND="
-	!spidermonkey? (
-		!embedded-v8? ( <dev-lang/v8-3.19 )
-	)
-	>=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? ( dev-libs/cyrus-sasl[kerberos] )"
-
-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 prefix; then
-		scons_opts+=" --cpppath=${EPREFIX}/usr/include"
-		scons_opts+=" --libpath=${EPREFIX}/usr/$(get_libdir)"
-	fi
-
-	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
-		if use embedded-v8; then
-			scons_opts+=" --usev8"
-		else
-			scons_opts+=" --use-system-v8"
-		fi
-	fi
-
-	if use ssl; then
-		scons_opts+=" --ssl"
-	fi
-}
-
-src_prepare() {
-	epatch "${FILESDIR}/${PN}-2.4.5-fix-scons.patch"
-	epatch "${FILESDIR}/${PN}-2.2-r1-fix-boost.patch"
-
-	# bug #462606
-	sed -i -e "s@\$INSTALL_DIR/lib@\$INSTALL_DIR/$(get_libdir)@g" src/SConscript.client || die
-}
-
-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-r1" ${PN}
-	newconfd "${FILESDIR}/${PN}.confd" ${PN}
-	newinitd "${FILESDIR}/${PN/db/s}.initd-r1" ${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/ &>/dev/null
-	fi
-}
-
-src_test() {
-	escons ${scons_opts} test
-	"${S}"/test --dbpath=unittest || die
-}
-
-pkg_postinst() {
-	if use embedded-v8; then
-		ewarn "You chose to build ${PN} using embedded v8."
-		ewarn "This is not recommended by Gentoo and should be used to resolve"
-		ewarn "blockers with packages requiring >=v8-3.19 only !"
-		ewarn "See the following bug [1] and jira issue [2] for more info."
-		ewarn "    [1] https://bugs.gentoo.org/show_bug.cgi?id=471582"
-		ewarn "    [2] https://jira.mongodb.org/browse/SERVER-10282"
-	fi
-	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
-	elog "Journaling is now enabled by default, see /etc/conf.d/${PN}"
-}
diff --git a/dev-db/mongodb/mongodb-2.4.7.ebuild b/dev-db/mongodb/mongodb-2.4.7.ebuild
index 3e0904dec640..fe51c0b59edf 100644
--- a/dev-db/mongodb/mongodb-2.4.7.ebuild
+++ b/dev-db/mongodb/mongodb-2.4.7.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.7.ebuild,v 1.1 2013/10/22 10:02:42 ultrabug Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-db/mongodb/mongodb-2.4.7.ebuild,v 1.2 2013/10/28 14:30:33 ultrabug Exp $
 
 EAPI=4
 SCONS_MIN_VERSION="1.2.0"
@@ -74,6 +74,9 @@ src_prepare() {
 
 	# bug #462606
 	sed -i -e "s@\$INSTALL_DIR/lib@\$INSTALL_DIR/$(get_libdir)@g" src/SConscript.client || die
+
+	# bug #482576
+	sed -i -e "/-Werror/d" src/third_party/v8/SConscript || die
 }
 
 src_compile() {