Version bump, as requested by Tomas Mozes in bug #530778. Automatically PaX-mark the mongo binary, as requested by Colin Silcock in the LINX Technology team.

Package-Manager: portage-2.2.18/cvs/Linux x86_64
Manifest-Sign-Key: 0xB5058F9A

5 files changed, 147 insertions, 12 deletions

diff --git a/dev-db/tokumx/ChangeLog b/dev-db/tokumx/ChangeLog
index d1621babe911..269c90050f8e 100644
--- a/dev-db/tokumx/ChangeLog
+++ b/dev-db/tokumx/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for dev-db/tokumx
-# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-db/tokumx/ChangeLog,v 1.3 2014/10/09 20:24:59 grknight Exp $
+# Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/dev-db/tokumx/ChangeLog,v 1.4 2015/04/14 11:25:12 chainsaw Exp $
+
+*tokumx-2.0.1 (14 Apr 2015)
+
+  14 Apr 2015; Tony Vroon <chainsaw@gentoo.org> +tokumx-2.0.1.ebuild,
+  +files/tokumx-2.0.1-no-werror.patch:
+  Version bump, as requested by Tomas Mozes in bug #530778. Automatically
+  PaX-mark the mongo binary, as requested by Colin Silcock in the LINX
+  Technology team.
 
 *tokumx-1.5.0-r1 (01 Aug 2014)
 
diff --git a/dev-db/tokumx/Manifest b/dev-db/tokumx/Manifest
index b2835b46ce8d..ee08d8b07e95 100644
--- a/dev-db/tokumx/Manifest
+++ b/dev-db/tokumx/Manifest
@@ -2,20 +2,19 @@
 Hash: SHA256
 
 AUX 1.5.0-Werror.diff 2195 SHA256 4c0c9b0b3c08838ee0139f459559889459d340774c9c7a1c0c3ab33e0e841a25 SHA512 ac6c2f40e65bc4476a5a9def8c56865675da0099d910ff99e14c3a53df3d5055433ca5d5d4f92e23a1cd4b468555936412ead1a35ae5fd017f232e0afa6c60e6 WHIRLPOOL 4798ad52f6e920ff3b2c292329d07ec6e0f008042516a5530207a0bdd8b2178892f4a309b72569ea1a90c49f88dcb7fa4583bfb8c75cbbc04489e9bd088377b4
+AUX tokumx-2.0.1-no-werror.patch 2339 SHA256 558a1d07694c59b2bd9a2d65e30284697d7032b7ab319c30333fd5d257ee32c2 SHA512 f3f57bf2df3930ab8c46f24ef625d2b7038903f07ba5be473de42bf404d15c1e9f03f2524d78d5a4d34108df13c22ba9b4899c3045a726ec4781902f618a4ef1 WHIRLPOOL 635a55aa144224aa60b28cf934da49919f1690c8a47235eab55ae2fcc97d83a04b66e9e3d3eb9fe262c39be85b6813a2e34a55c50717f21107c8203d0d2eeb88
 AUX tokumx-disable-bundled-libs.patch 477 SHA256 cdcfbe6a6be63dd9e44c8aceed935d65eb1cba7f72d4e177d64492a48b2c7df2 SHA512 acb735167d9753aca5597a81f13696e0c158f837cff8eed703ac777824ef7fef71a339415c0b948f48dc992d0919ef3a0d747f37bb6ff9670e95475f0cf5057f WHIRLPOOL dacb3b8f4ee7d5c9f09ca3d870c61b9d818843c2c841bbb8ab0a12bbfac2aee59b38c720d98575e1817efff954805cc737aad41656aea647c3c51435b8d8578c
 DIST tokumx-git-tag-1.5.0.tar.bz2 13059584 SHA256 381747c47073c8a6f8717a27756bb793ec6d80f4f7d119385f8d7b805a3d827d SHA512 ba19237db7d3dcbd3ac07b8cc4860549830fa065fa4d26cbae685274524cd5b89f671d5f126ec25bee605c99929ce0436bb2ac32d67efdbb8dd6d7526d3f1c24 WHIRLPOOL e5e33e28ce55b1abcff603a40453ab0a9d68f61cd15c68950dd6f87371565bd05057e8e48475f772524684fdb744093867423b249614d4c02908a467f9380c75
+DIST tokumx-git-tag-2.0.1.tar.bz2 13444046 SHA256 f60be4bdabf1249b138b2da02cfc278f6296a8082ada1665be6c8b49c61c0e57 SHA512 91b342c8b0896f5f5e32348118f6a2bc30a4c0e6cd6808e4f510a5982c9d0008e80484a754111553b3249b41a6a5adcbff056ffe62745bc8e958ceab64a6553f WHIRLPOOL 9cc58cfee6ce64fa9d8ed0551ea48f1bc36ca564d5b05c3dfdf29fdc13abcfc6a7ac8be08fa219f7cd188fcc29e884744591ddc006381c6e413cd0bcd892491c
 EBUILD tokumx-1.5.0-r1.ebuild 1860 SHA256 a9dd57d2237e70edacb3f766e166f9f16ca3331c8964660c6e751f47703e1f30 SHA512 2a9538c032208e6a3c32fbc8425f0f97f6057be3ace930a9fe2f6a5609b5772dcb59fbb535c4eef155680d08267b98cc589b7fc34e39977d0a2d674eb2981a53 WHIRLPOOL 45e43ea8b81893819e56f8a1166187411cc84a8465c2a857f15e411976dd4f8c995e5c61a22bc382f123d8349a82594ad30dfaa643b59f4fc390d02737764223
 EBUILD tokumx-1.5.0.ebuild 1085 SHA256 93814526c7155d7712716a8af7b40e6c0faa8200ffd67460a26a360cc0d4e4fb SHA512 22f34eda716f19b46b2f7a371b17ec453135c8ac8067d6e056691f7ed48664f4954c6d49c01504b438de2f7fd0a476ff49c492113d43b491fc9954cb34f09b3e WHIRLPOOL 94462795bd38a9dd928e14e7a149cd74af50e7b1d36498053c4a26456ddecca437f74d969593da332241b8dde84b2f2d8b30926a01cc263344b2f6902d0e1a70
-MISC ChangeLog 716 SHA256 c7a0d6b4f4fa6bc6fd6762fe3228883751862f8b6438a24211fc075ffb402084 SHA512 855ff65effea49d5c3383bad84ffae862776cc330752de77aa9a5783a695d3e87fa466d870b80598b82b086c29b2dcf662e46735a10d89109c21aba1a90548b1 WHIRLPOOL 264d7d1eaff35dc32fc1bef7e0858c3670452ba26d0ebd489143ee6629feafea9ab8e1be701cb0d94b2f58c0ed8bf45b0e6508fefcb52b09cb1d90b1b581f7e3
-MISC metadata.xml 388 SHA256 85c7a327143fae530c5cc73caf18c7a7273030a7fc31af5878c4bc91bfe037b7 SHA512 3e4309fca9b7b5fc32a73ba294be619915aa21e300be7bc80385b25ec27c5eab4368d73669d87c3ab7cc8a7125fb92244cf96301c7abdbc965d535ee78385866 WHIRLPOOL 7b938fe4fdef98876852dec98fe1eef9e09fb15d92b6cbc6a6b81e11b80199babcf189e5ba3d9629443208c369f56abfc7bdf33e0d30227e1c588479dc1342df
+EBUILD tokumx-2.0.1.ebuild 1931 SHA256 f62b21143f961fb4a753986fd1ca74808c5601b48da392ac31ae07940af858ab SHA512 a6597df84f42618412051b7a8badf3aec72a31b22305ea13b7632f4bb65b726a217fd00d83a71ed3ec3e5fe2367f092d2e35ef789727e172c5f4478b3de77320 WHIRLPOOL aaebea11680cd850ec93f4998a07ec3431fa7d00aafa738c3e18fe07994f6c9160f2e01b1d28a36446383e9101064d410e51896e35e5fc88bea376ef458ea691
+MISC ChangeLog 1019 SHA256 bf5fc22b2a613f10e98f092861e07e0f3896bfcc1f9c980be0e19e96c749d18f SHA512 7534e38c7ed4b6ecaa740a89857317cba1d1658dd7a9f8ee1dc1deb4e7b1389a66a72bb7b83c7db282c469aff0c61aae814059e485b90ccab93fa67e4477a1b8 WHIRLPOOL 197062b95967a2ebac7167990a5e8e81f2a40c028718e1f4defa609a8a4b79e1612d45cce2457861a379eb4d953d1254c29898d1190ef8f3aa2532425fe06290
+MISC metadata.xml 475 SHA256 68ef21c0ee4c847b130565b36bdf2d3ea1f6396c19cee07e15665279846b63ec SHA512 9b3e0252bc47c41a7cacb43d4895d01f7d690dba91ec02b4585dc621446690f48be9ac6b7721ed7e9badd794bc969f1b014a749dd66ad449121ca1dabf2d8d54 WHIRLPOOL fe6ed2ce2f5de468fe409d10b36bd053849cafc168028f8c305648ee5747823fa59272d9fbf2ffb51783cae0734c67dd69cf102330c20d3f5a6ef0465ea04a3f
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2
 
-iQEcBAEBCAAGBQJUNu8cAAoJEE4V4vFnx44dBLwH/i4gWW4gACjakgyYf+3bqGJ9
-2kjWrQxgHCzBX2ib8HRtYkPtqKjOUl4JKsva1g5jHXCwARkKXedlszEvGi6esLGj
-zuGC7NXtZMX1+7ebMHeEFyTrB+63ksMtsyPEaEStHQiCWUMEl53zwbbEOXVsG7Pu
-PJMh8hbw6b/pCLLITWkiL39kGZ0TPwhRF1qohF34hpFYQoA9saDQWgOz6ErnxsnK
-U5tQWx1EXVpGfGZnVu+8U9KQSyIvv11RW9FcRXPZb2J9sWaod64QBV4Uzi73hIoo
-Px9U5AImEJVqJ46dLYs/jLkIBcrVLAwATB/320tEh6v5r+VR/SMapG1tH0dCUtc=
-=1M5q
+iEYEAREIAAYFAlUs+H4ACgkQp5vW4rUFj5pEIACgkQLvQMLHy3YN2LMFzBOU9HQy
+ujMAoJBAqoLsqfuAs2gEW68Fe/ASHC78
+=tbsI
 -----END PGP SIGNATURE-----
diff --git a/dev-db/tokumx/files/tokumx-2.0.1-no-werror.patch b/dev-db/tokumx/files/tokumx-2.0.1-no-werror.patch
new file mode 100644
index 000000000000..a67cde50b7f4
--- /dev/null
+++ b/dev-db/tokumx/files/tokumx-2.0.1-no-werror.patch
@@ -0,0 +1,53 @@
+diff -uNr mongo-tokumx-2.0.1.ORIG/CMakeLists.txt mongo-tokumx-2.0.1/CMakeLists.txt
+--- mongo-tokumx-2.0.1.ORIG/CMakeLists.txt	2015-04-14 11:28:47.723631388 +0100
++++ mongo-tokumx-2.0.1/CMakeLists.txt	2015-04-14 11:29:04.734632235 +0100
+@@ -82,14 +82,13 @@
+   endforeach(flag)
+ endmacro(set_cxxflags_if_supported)
+ 
+-set(CMAKE_C_FLAGS "-fPIC -fno-strict-aliasing -ggdb -Wall -Wsign-compare -Wno-unknown-pragmas -Winvalid-pch -Werror -pipe")
++set(CMAKE_C_FLAGS "-fPIC -fno-strict-aliasing -ggdb -Wall -Wsign-compare -Wno-unknown-pragmas -Winvalid-pch -pipe")
+ set(CMAKE_CXX_FLAGS "-fPIC -fno-strict-aliasing -ggdb")
+ set_cxxflags_if_supported(
+   -Wall
+   -Wsign-compare
+   -Wno-unknown-pragmas
+   -Winvalid-pch
+-  -Werror
+   -pipe
+   -Wnon-virtual-dtor
+   -Woverloaded-virtual
+diff -uNr mongo-tokumx-2.0.1.ORIG/SConstruct mongo-tokumx-2.0.1/SConstruct
+--- mongo-tokumx-2.0.1.ORIG/SConstruct	2015-04-14 11:28:47.724631388 +0100
++++ mongo-tokumx-2.0.1/SConstruct	2015-04-14 11:29:20.550633023 +0100
+@@ -710,7 +710,7 @@
+                          "-Winvalid-pch"] )
+     # env.Append( " -Wconversion" ) TODO: this doesn't really work yet
+     if linux:
+-        env.Append( CCFLAGS=["-Werror", "-pipe"] )
++        env.Append( CCFLAGS=["-pipe"] )
+         if not has_option('clang'):
+             env.Append( CCFLAGS=["-fno-builtin-memcmp"] ) # glibc's memcmp is faster than gcc's
+ 
+diff -uNr mongo-tokumx-2.0.1.ORIG/src/third_party/v8/CMakeLists.txt mongo-tokumx-2.0.1/src/third_party/v8/CMakeLists.txt
+--- mongo-tokumx-2.0.1.ORIG/src/third_party/v8/CMakeLists.txt	2015-04-14 11:28:47.853631395 +0100
++++ mongo-tokumx-2.0.1/src/third_party/v8/CMakeLists.txt	2015-04-14 11:30:00.934635034 +0100
+@@ -126,7 +126,6 @@
+ 
+ set(V8_CXX_FLAGS
+   -Wall
+-  -Werror
+   -W
+   -Wno-unused-parameter
+   -Woverloaded-virtual
+diff -uNr mongo-tokumx-2.0.1.ORIG/src/third_party/v8/SConscript mongo-tokumx-2.0.1/src/third_party/v8/SConscript
+--- mongo-tokumx-2.0.1.ORIG/src/third_party/v8/SConscript	2015-04-14 11:28:47.836631394 +0100
++++ mongo-tokumx-2.0.1/src/third_party/v8/SConscript	2015-04-14 11:29:49.341634457 +0100
+@@ -47,7 +47,6 @@
+   'gcc': {
+     'all': {
+       'CCFLAGS':      ['-Wall',
+-                       '-Werror',
+                        '-W',
+                        '-Wno-unused-parameter',
+                        '-Woverloaded-virtual',
diff --git a/dev-db/tokumx/metadata.xml b/dev-db/tokumx/metadata.xml
index e1ad531d3674..8b594299bb96 100644
--- a/dev-db/tokumx/metadata.xml
+++ b/dev-db/tokumx/metadata.xml
@@ -10,5 +10,7 @@
 		<name>Alexys Jacob</name>
 		<description>Secondary Maintainer. CC on bugs</description>
 	</maintainer>
+	<use>
+		<flag name="pax_kernel">Apply patch needed for hardened kernels</flag>
+	</use>
 </pkgmetadata>
-
diff --git a/dev-db/tokumx/tokumx-2.0.1.ebuild b/dev-db/tokumx/tokumx-2.0.1.ebuild
new file mode 100644
index 000000000000..6fa271f0391b
--- /dev/null
+++ b/dev-db/tokumx/tokumx-2.0.1.ebuild
@@ -0,0 +1,73 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-db/tokumx/tokumx-2.0.1.ebuild,v 1.1 2015/04/14 11:25:12 chainsaw Exp $
+
+EAPI=5
+CMAKE_BUILD_TYPE=Release
+PYTHON_COMPAT=( python2_7 )
+
+inherit python-r1 cmake-utils pax-utils
+
+MY_P=${PN}-git-tag-${PV}
+
+DESCRIPTION="An open source, high-performance distribution of MongoDB"
+HOMEPAGE="http://www.tokutek.com/products/tokumx-for-mongodb/"
+SRC_URI="mirror://gentoo/${MY_P}.tar.bz2"
+
+LICENSE="AGPL-3 Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64"
+IUSE="pax_kernel"
+
+RDEPEND="
+	dev-libs/jemalloc
+	>=dev-libs/boost-1.50[threads(+)]
+	>=dev-libs/libpcre-8.30[cxx]
+	net-libs/libpcap"
+DEPEND="${RDEPEND}
+	sys-libs/ncurses
+	sys-libs/readline
+	pax_kernel? ( sys-apps/paxctl sys-apps/elfix )
+"
+
+S="${WORKDIR}/mongo"
+BUILD_DIR="${WORKDIR}/mongo/build"
+QA_PRESTRIPPED="/usr/lib64/libHotBackup.so"
+
+src_prepare() {
+	epatch "${FILESDIR}/${P}-no-werror.patch"
+	cmake-utils_src_prepare
+}
+
+src_configure() {
+	local mycmakeargs=(
+		-D TOKU_DEBUG_PARANOID=OFF
+		-D USE_VALGRIND=OFF
+		-D USE_BDB=OFF
+		-D BUILD_TESTING=OFF
+		-D TOKUMX_DISTNAME=${PV}
+		-D LIBJEMALLOC="jemalloc"
+		-D TOKUMX_STRIP_BINARIES=0
+		-D USE_SYSTEM_PCRE=1
+		-D USE_SYSTEM_BOOST=1
+	)
+	cmake-utils_src_configure
+}
+
+src_install() {
+	cmake-utils_src_install
+	pax-mark -m "${D}"/usr/bin/mongo
+
+	# Remove unnecessary files
+	rm -r "${D}usr/buildscripts" "${D}usr/scripts" "${D}usr/src" "${D}usr/include/db.h" || die
+
+	# Correctly install this python script
+	python_foreach_impl python_doscript scripts/tokumxstat.py
+
+	# Clean up documentation installed to /usr
+	pushd "${D}usr/" || die
+	rm GNU-AGPL-3.0 LICENSE.txt NEWS README README.md README-TOKUDB README-TOKUKV SConstruct THIRD-PARTY-NOTICES || die
+	popd || die
+	dodoc README.md distsrc/NEWS distsrc/README distsrc/THIRD-PARTY-NOTICES
+	newdoc src/third_party/ft-index/README-TOKUDB README-TOKUKV
+}