revision bump fix #526114

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

3 files changed, 23 insertions, 6 deletions

diff --git a/dev-db/mongodb/ChangeLog b/dev-db/mongodb/ChangeLog
index 47e2721f4ae1..5f23900519d9 100644
--- a/dev-db/mongodb/ChangeLog
+++ b/dev-db/mongodb/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for dev-db/mongodb
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-db/mongodb/ChangeLog,v 1.100 2014/10/17 11:57:29 ultrabug Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-db/mongodb/ChangeLog,v 1.101 2014/11/12 10:22:35 ultrabug Exp $
+
+*mongodb-2.6.5-r1 (12 Nov 2014)
+*mongodb-2.6.4-r1 (12 Nov 2014)
+
+  12 Nov 2014; Ultrabug <ultrabug@gentoo.org> -mongodb-2.6.4.ebuild,
+  +mongodb-2.6.4-r1.ebuild, -mongodb-2.6.5.ebuild, +mongodb-2.6.5-r1.ebuild:
+  add PaX marking on 2.6 ebuilds wrt #526114
 
 *mongodb-2.4.12 (17 Oct 2014)
 
diff --git a/dev-db/mongodb/mongodb-2.6.4.ebuild b/dev-db/mongodb/mongodb-2.6.4-r1.ebuild
index 920f5b04d5ff..3fc046acabb0 100644
--- a/dev-db/mongodb/mongodb-2.6.4.ebuild
+++ b/dev-db/mongodb/mongodb-2.6.4-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-db/mongodb/mongodb-2.6.4.ebuild,v 1.1 2014/08/12 05:54:08 ultrabug Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-db/mongodb/mongodb-2.6.4-r1.ebuild,v 1.1 2014/11/12 10:22:35 ultrabug Exp $
 
 EAPI=5
 SCONS_MIN_VERSION="1.2.0"
@@ -8,7 +8,7 @@ CHECKREQS_DISK_BUILD="2400M"
 CHECKREQS_DISK_USR="512M"
 CHECKREQS_MEMORY="1024M"
 
-inherit eutils flag-o-matic multilib scons-utils systemd user versionator check-reqs
+inherit eutils flag-o-matic multilib pax-utils scons-utils systemd user versionator check-reqs
 
 MY_P=${PN}-src-r${PV/_rc/-rc}
 
@@ -112,6 +112,9 @@ src_install() {
 	insinto /etc/logrotate.d/
 	newins "${FILESDIR}/${PN}.logrotate" ${PN}
 
+	# see bug #526114
+	pax-mark emr "${ED}"/usr/bin/{mongo,mongod,mongos}
+
 	if use mms-agent; then
 		local MY_PN="mms-agent"
 		local MY_D="/opt/${MY_PN}"
diff --git a/dev-db/mongodb/mongodb-2.6.5.ebuild b/dev-db/mongodb/mongodb-2.6.5-r1.ebuild
index 48fae75ac3f4..332b9ac4f302 100644
--- a/dev-db/mongodb/mongodb-2.6.5.ebuild
+++ b/dev-db/mongodb/mongodb-2.6.5-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-db/mongodb/mongodb-2.6.5.ebuild,v 1.1 2014/10/13 14:32:31 ultrabug Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-db/mongodb/mongodb-2.6.5-r1.ebuild,v 1.1 2014/11/12 10:22:35 ultrabug Exp $
 
 EAPI=5
 SCONS_MIN_VERSION="1.2.0"
@@ -8,7 +8,7 @@ CHECKREQS_DISK_BUILD="2400M"
 CHECKREQS_DISK_USR="512M"
 CHECKREQS_MEMORY="1024M"
 
-inherit eutils flag-o-matic multilib scons-utils systemd user versionator check-reqs
+inherit eutils flag-o-matic multilib pax-utils scons-utils systemd user versionator check-reqs
 
 MY_P=${PN}-src-r${PV/_rc/-rc}
 
@@ -20,7 +20,7 @@ SRC_URI="http://downloads.mongodb.org/src/${MY_P}.tar.gz
 LICENSE="AGPL-3 Apache-2.0"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
-IUSE="kerberos mms-agent ssl static-libs"
+IUSE="debug kerberos mms-agent ssl static-libs"
 
 PDEPEND="mms-agent? ( dev-python/pymongo app-arch/unzip )"
 RDEPEND="
@@ -53,6 +53,10 @@ pkg_setup() {
 	scons_opts+=" --use-system-yaml"
 	scons_opts+=" --usev8"
 
+	if use debug; then
+		scons_opts+=" --dbg=on"
+	fi
+
 	if use prefix; then
 		scons_opts+=" --cpppath=${EPREFIX}/usr/include"
 		scons_opts+=" --libpath=${EPREFIX}/usr/$(get_libdir)"
@@ -112,6 +116,9 @@ src_install() {
 	insinto /etc/logrotate.d/
 	newins "${FILESDIR}/${PN}.logrotate" ${PN}
 
+	# see bug #526114
+	pax-mark emr "${ED}"/usr/bin/{mongo,mongod,mongos}
+
 	if use mms-agent; then
 		local MY_PN="mms-agent"
 		local MY_D="/opt/${MY_PN}"