Merge updates from master

4 files changed, 93 insertions, 0 deletions

diff --git a/app-misc/faq/Manifest b/app-misc/faq/Manifest
index c9ab2df40579..6c9e64268282 100644
--- a/app-misc/faq/Manifest
+++ b/app-misc/faq/Manifest
@@ -1,16 +1,29 @@
 DIST faq-0.0.1.tar.gz 9916 BLAKE2B 1a585f56e72818978f5a79e0df3d59533a422127e8eacc79a05bb8704c0321b85c85e8cc9fd6eb633a1d5c39ea0b03d546d8da39462a94f369495ca0279a516d SHA512 38d5789dcf83042cc909424864e37d7adaf49bd3f2ab3da851005d528d3deb1e13ea37f68ba9245cf05e1fd1e45d1ab80c5d6d027ed785983d279cb8de05f718
+DIST faq-0.0.2.tar.gz 47842 BLAKE2B 7568da2ea59d6d2888116fa7cfb920d2c07fff56fcf8c0b7f568b6ed3545da8497ad72854d62041db8160b50004034524e928fe89bb4c9e02c426c722fcb887c SHA512 d9f33f1dfd2210a77ff9bfc4b08095a9d4689c81d1effda573a794272d5dc3461beca7294e3fe3652adb322e4b15ec11bd532f0a013a420ec82f7c6d782391c5
 DIST github.com-Azure-draft-53924464463d2474f410415f1310d2b95fb8965f.tar.gz 1417651 BLAKE2B 3d8743ac35e813116ca7c093878669b721a1af052e2a8e48daa48736132bbf85326a363638dc4f253f825a730e4325c6bd6f83fccb319c507cdfc82c2ba978a4 SHA512 464b6cb5250bf35b505c6c40c509c357a46b32b96cee4c06917b35fb66cb5f21841fd5c812079356565d5ca2045c5e51eec74106f0d4731e9096e8224286f68e
+DIST github.com-Azure-draft-fdc29c553a45600ac4f795f3485d4bb9a80c7862.tar.gz 1461279 BLAKE2B f15dd35c476dab9e8c8c8699a14ef1d26f208c29512917b3c16a75e36b9435f158f66505ba88d8820ad1c3b37cff06edf1b90f71b178b17f67705033f0f270d4 SHA512 5e4a526ff4f3a22d6e8e5a84592ba8b3c075ffb3867f9781a106f07f26b6ad7176e4bec2bb9829eb2dfbb45bf76569dc03ecb3eba1e71b119d3e70748eb1a4c5
 DIST github.com-BurntSushi-toml-b26d9c308763d68093482582cea63d69be07a0f0.tar.gz 41564 BLAKE2B 267579e3e2135626bfdce4524db2baf26a6dae14135421368c0f3cb21c41ec844cf42e127c4e0af7845b8caab4abd35c50ed5b0642fd713708e753ea54ee3100 SHA512 0a1ac02221645e06c60fdb5d162d1422fef791d101409c237a048a3d94708e3f1cf1e8e40bc390dc7cd6340f28514c2ae2d9c99a9ec2c3f969c7a8fbd5d0d232
+DIST github.com-alecthomas-chroma-d7b2ed20a4989ab604703f61f86523560f8a6a87.tar.gz 307488 BLAKE2B 1b4e373e2896fdf9126eb8f8f9b4c9137921d2067b13d14d91582fd83d44976f894f32fa1bd89750a04914fb6e14b37bea01ce7c893fc7b8b94093457855d809 SHA512 ba1e4eacd22006ee32bfd4ab4f56579d332d1fa8e3206e3670edf9270743cc87a8743f00deac30c2ac449b4eea0ab99dc14e829acde039d9cdb4593fd0dfc2c5
 DIST github.com-ashb-jqrepl-70de3caa122cf7c7a737f28b666ab0d541560598.tar.gz 14761 BLAKE2B fe636cf5425d2b717647404a012ff297d3c792e6ac11998004c3813e30768ba9dbee7b12aefbfd8793db398c7e24dad805e54207f689399bf9ce7f5632cfa7bc SHA512 f0f6529ad9561919fe5ffecb2acb2a432560a01b24292eb3b2746ba45491455f5e7bb023ceee0de1fdc147471e9733f3946a3bde599d2bf8122177626ea54424
+DIST github.com-cheekybits-is-68e9c0620927fb5427fda3708222d0edee89eae9.tar.gz 5848 BLAKE2B f3afe8bc17c2edf7cd334e8a54c34073772b26dd05268536eeccbcac2e210aac0159c6257aa02bb19b2cc76ddcec9b2b2b99db975535a900b44c8e42caee8227 SHA512 bbbfadfce1cdb7f8ea0fa7b319ed56df64630031aa85ca04e74b9da0d2eb8c6b5e02b5446ff4bbca11650592992cb4b2f63061686130e37089d2fa37a547de07
+DIST github.com-clbanning-mxj-32282164326064599d3a83e53adcb9b318d78d90.tar.gz 1089017 BLAKE2B 036c33acd4919dd228c90a5a7fc408244290ab38f66fa9875f60e4d8bfa8e5369ef9350b199b84b95ee74ea2803358313c3f8ac07110561f2892dd56435a7b65 SHA512 cc10b7f2eb440f7e553efd55adbfe024273ec85ed5447739919472123dba00638e1ce1683fe91927c2eabd53cfae9ead26e78a047002ffc56b638ab3f98c3e7f
 DIST github.com-clbanning-mxj-eb2e8a1ed220896d2b16890436447a0eae496fae.tar.gz 1071238 BLAKE2B 34a7cfe6e46fd80ee49c05c4efa6ba615ca516af34828dc291029d3f8efc83548204930a2487ed0fc86590f1443c8ca2b5574071189872ac9578739c1ecb6445 SHA512 742f9ff55eda7785cc733189018f487c2a7debcbc2d4446f8631b1e66457aa433319d9b5e81ed405ca54581a300d6e979367422eb7729d2cd9edde36717414b9
+DIST github.com-danwakefield-fnmatch-cbb64ac3d964b81592e64f957ad53df015803288.tar.gz 4952 BLAKE2B 92a7cfe2f3c07bdf2c61b445e35531150869dc181138d3438d7173ee38130d411a0de770ba40958471ea61d9aebe8881b51eb0ca9340deced89fd94df267e299 SHA512 5904008003ac80d34581dd1d33130fef27c6a523196aafef1231a2e63c5296cd30f8c3c517090b6b4c7ebb6a57d24bb0bff10cc40876e3fa1c9e74b65bc13154
+DIST github.com-dlclark-regexp2-7632a260cbaf5e7594fc1544a503456ecd0827f1.tar.gz 200360 BLAKE2B bbefca0280c0858669c45c8d63e66e77e07871507185ed777e96334eac22fc52ddd89a5dd0216ca12328d7a1b0b71dfca4e5ac75e75aebebdbda649818668e1d SHA512 b43d08612524b52a61179356ce3e67f170a7718349c89aaaf70ddc8e3e6de1bccd5df03f9caf596a48866b31fd8a9680400bbaf73408660e595e112de2b93736
 DIST github.com-ghodss-yaml-0ca9ea5df5451ffdf184b4428c902747c2c11cd7.tar.gz 11776 BLAKE2B bef19eeb755e2711ca293fa759ff98e39e17ef5679bef7b73592da7d44f1212dbe4812aafdfd63e585337623161074464a42f255873901e26091fd56f100b454 SHA512 a6848eeda7a6066b3df7582f681aa3382dc4e6d3c4579b4a13d8b31af317be56529a8ebf5c396b85490c0cddcfbe08872db8d747fedd212ff035678b9dfa9e0e
 DIST github.com-globalsign-mgo-baa28fcb8e7d5dfab92026c0920cb6c9ae72faa2.tar.gz 409146 BLAKE2B 4fe1d3812f0f695febbb42809cfffbce50a8602ed89b58d1dca53255520b4945f30aee0a97141e28ce554f97edbaea3121020aee66db1a29cecd59c463755bc2 SHA512 7caac9d229c9cdd9a32a2f3f3117790bf67391c2b25c1ff88cd4ad6f5b0157f68affc90f86733919f961b5551e6732eab307309ddcf25f517dc8023ce6c96e0f
+DIST github.com-globalsign-mgo-efe0945164a7e582241f37ae8983c075f8f2e870.tar.gz 416824 BLAKE2B 4b0f151d5ac226c31de9126ff911aab762df0e4915d12deaf243698dc13db45466f7071998921c275e66485ee69ac8b5db86ccfc3c471682e0de73ae6dfd9b13 SHA512 cc38bcbf6944176caadf886d2c4882f727fa9732972ccbc040355cf95ed0f452e047727a0690a57eb98cf10e290bb028218ee1af03ac13ceaea54ee58bbdee62
+DIST github.com-go-yaml-yaml-5420a8b6744d3b0345ab293f6fcba19c978f1183.tar.gz 70322 BLAKE2B e4284bbc1825c0e78cf2818091d2d25c581fd5da86d66eb8f91877b8a92f62400962391efb911ff33ffbe3db1de432a892dcc3670f96710fdb7c2cb191309697 SHA512 a5c4cbfc12e932f161c827537ad8366d8c003f40c3959c39bba9b6032e3d381516998a046429ef0980072b717dab0ab1df6b1ef24a43e66e1bf4bda176302b49
 DIST github.com-go-yaml-yaml-86f5ed62f8a0ee96bd888d2efdfd6d4fb100a4eb.tar.gz 70230 BLAKE2B 0d6d56ae3ab1a46a2b8cb7cd89141825358d33b76d8bdf7a18bd42bea42321c2d294cabc1fcaee3b3761a56654da261f83cfd54db0f734b1471ab29df985197a SHA512 ab1f058e9702238b968e21d03c2d5effb606f6446e2f0a3f6fbd71dcfd90bf1a390bde6d3097f5e9b087e79645138e21a792862cc83d119ce4e0da2510be775c
+DIST github.com-golang-crypto-1a580b3eff7814fc9b40602fd35256c63b50f491.tar.gz 1606221 BLAKE2B ffdb4c6152715f0157c1c4bdea1ff0abf549daa39373cdb30e78c4a9b9e73b238d287964a9a2335c18349821bfb187bf608169c08190d37eb363c8701eaab63c SHA512 ff8fee4616ce22a304b829e2991299214953b5cfdcdfd18e75ba60bf873e54395fa2c255f11e51837b27c576ac959eee766127d2a299e05842881a4103a10617
 DIST github.com-golang-crypto-88942b9c40a4c9d203b82b3731787b672d6e809b.tar.gz 1455583 BLAKE2B ceb0dbb22869d4e5a43a8674138f725de7514af12131da26152bfc723d8981356f056547c63b81193da2b0b9d4587a2941b05dcd921d27ed9cb5d9db3abdd971 SHA512 2c81f213f5d934af9b449d0bcb4b6ee2078b4db842933aa84b6dcaf893029f2bba3657fd3cab14749cff8d4cca6ee64dc7478d4c790f314bb12ebb8fed88d179
 DIST github.com-golang-sys-13d03a9a82fba647c21a0ef8fba44a795d0f0835.tar.gz 802725 BLAKE2B f826bcb2230bbeba10b138d3fae0191ee0dda49ade37dc3462adcf16ea890dd87d86aa9793ada59b86ee427da4f2b336fee1a2cda7f079bf50a6f7b70360cc48 SHA512 d4f82bd401b6a805c7d369fac26edb5153f0f9654a6d9fc9809a545c8a3de546329a36f4fe8aa5506bd2d3b4da27dcd56cc2bd5ea18f2c5a033d7fa5f3820251
+DIST github.com-golang-sys-7c87d13f8e835d2fb3a70a2912c811ed0c1d241b.tar.gz 857002 BLAKE2B 53fe56ca4674f48f18f8de03a1eef1f5e57f71a2fe8d2ae2f6e67fa106cf57c4042aafa783b7d3aa8044012a2cd527eea30881beca6c49738758dd961f7f3a3e SHA512 95451c906c1b797de586f4c3a313378a45fba0557fdc54d2373db2234093f7e7966a06757fb35e4ccd466e93260f867ff832b85b6b632f3c2d600c1ff06d21a4
 DIST github.com-inconshreveable-mousetrap-76626ae9c91c4f2a10f34cad8ce83ea42c93bb75.tar.gz 2292 BLAKE2B 5220adf6cf740368b1b3a238795791b422d600b0293e350bcb5cae4f3ea452865e14e6271ae5d475c717da2c96cea7e0b12a5d71228f7679f67868de50852f17 SHA512 287a52df6a3ac88a95aed19ea2c76524f9916d6c6713365f56d86e08bd4ac686d3e231aefd3361ccfbf8c9ff702c94b3cc9d200640f05149f1d885ff61164b55
 DIST github.com-jbrukh-bayesian-bf3f261f9a9c61145c60d47665b0518cc32c774f.tar.gz 9353 BLAKE2B df1e8457587b5d27f0cbfe5707da54a38c3ca4311586674d9e4bc85ad55dc222e570002a2388fbbbf239e559e4438aa063971665e436e234ffecb7888a7aff3a SHA512 e3ba5ce1e2a8e3b61e70b4c9f31c4215ec8ffb4a558e51f74efcace20b6bcf958f675ffc1125623e79da616aba2518a6e4623596e3a47abf3d841ca9d9833cf3
 DIST github.com-sirupsen-logrus-c155da19408a8799da419ed3eeb0cb5db0ad5dbc.tar.gz 28758 BLAKE2B e34b383cbbddcadd99692609c9c20f94182735fc9879c0391947d0bc540df05cae7570230103a75a1e031fe8e30d1a4796eb17c80b4fba4a6d79bb999932205f SHA512 8f4f0bc4f4cd02f26f1ab39857e0e8120feab8ae3bb44b570e5d269b0c716d4028b824b04ad3923dc3e5a82b64c757e462ff74c71875677fd4fd276bd5b40926
 DIST github.com-spf13-cobra-a1f051bc3eba734da4772d60e2d677f47cf93ef4.tar.gz 100895 BLAKE2B a4534b0ce3689db04d2f1fc4bdd982576f62e1f4622b81f305b9651bb455b14d4b4b145cc4da49a52289b2b7f32cd9e1406e950020fc7b3f87bb0fdba98db12f SHA512 b33bc0c32d25d099f44b3c7cf653ebbcdbec00d45aade37d38e9c5e0f15bcff36ea736b13583d5ba88e7728815ffa986c4dc01b082df5ac2bfbd8db2c7f7d333
+DIST github.com-spf13-cobra-ef82de70bb3f60c65fb8eebacbb2d122ef517385.tar.gz 101660 BLAKE2B c55d90b35107df52b9a5e8376f096267a0d96253dcdf01cfad27fa3e67d58e352472dc871ed0cae411f09600d7c2a1f244e03d8d62a1db609368a95f836aa933 SHA512 2897e8e2e837606e42daf0d3319669ed1c3ea03d3c9c07b784bfca38fe0b5fca6ac07e074608036af33f5127bb3f0a2a6606df79437c90363c11fc32185a068d
+DIST github.com-spf13-pflag-583c0c0531f06d5278b7d917446061adc344b5cd.tar.gz 43327 BLAKE2B cc00d2852d895265eb0b60454877da841fe123535009025c761761c61b4d937d6293f3bef765d2a8919d63d8324dcb6addf774837df26fb864cb72d88add2d03 SHA512 061b9895e3936e356f707385ed7d7e5172f94167a1fabc84e9a0a69df4f03e0eaf435a4ac0cb00f5077855987ab1d2c3b051846c0466485a7bc329a547dc3d3a
 DIST github.com-spf13-pflag-e57e3eeb33f795204c1ca35f56c44f83227c6e66.tar.gz 39045 BLAKE2B a933e0ae64f3bb344a7dffdf8f7ed73e4fba329a81794442ac3a8fa8904f29958bcc6b0f2af9848bc6c715b27abc5908d5ff16d23ea790899f71d2f5ff0ce6cb SHA512 c05ef1bc05cba471a55a11a2209fe4bdaaba491434a28b7f08d23528f4074b82a656b62972efdd49384dd49bde429d2d2c0e6ba311cae0d23f55b229b768dae8
 DIST github.com-zeebo-bencode-d522839ac797fc43269dae6a04a1f8be475a915d.tar.gz 13253 BLAKE2B 043d6824c2d0aeb69403610dc64b890d77a555483e92d54d0f70f630bc1b1326202118a8d2285335dea0605b582d640962a763eb4fe9cfee257a742a6da2141e SHA512 488aa86cbb20e0c1c0f22d053dd6e793f0d1e6faaa84c3e5da299e3714d493df2284ed74009002dfe8e33d06291d06791f74c257443ee6dc3ba84b871d59fec3
diff --git a/app-misc/faq/faq-0.0.2.ebuild b/app-misc/faq/faq-0.0.2.ebuild
new file mode 100644
index 000000000000..279745ad6702
--- /dev/null
+++ b/app-misc/faq/faq-0.0.2.ebuild
@@ -0,0 +1,56 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+EGO_PN="github.com/jzelinskie/faq"
+
+EGO_VENDOR=(
+	"github.com/alecthomas/chroma d7b2ed20a4989ab604703f61f86523560f8a6a87"
+	"github.com/Azure/draft fdc29c553a45600ac4f795f3485d4bb9a80c7862"
+	"github.com/BurntSushi/toml b26d9c308763d68093482582cea63d69be07a0f0"
+	"github.com/cheekybits/is 68e9c0620927fb5427fda3708222d0edee89eae9"
+	"github.com/clbanning/mxj 32282164326064599d3a83e53adcb9b318d78d90"
+	"github.com/danwakefield/fnmatch cbb64ac3d964b81592e64f957ad53df015803288"
+	"github.com/dlclark/regexp2 7632a260cbaf5e7594fc1544a503456ecd0827f1"
+	"github.com/ghodss/yaml 0ca9ea5df5451ffdf184b4428c902747c2c11cd7"
+	"github.com/globalsign/mgo efe0945164a7e582241f37ae8983c075f8f2e870"
+	"github.com/inconshreveable/mousetrap 76626ae9c91c4f2a10f34cad8ce83ea42c93bb75"
+	"github.com/jbrukh/bayesian bf3f261f9a9c61145c60d47665b0518cc32c774f"
+	"github.com/sirupsen/logrus c155da19408a8799da419ed3eeb0cb5db0ad5dbc"
+	"github.com/spf13/cobra ef82de70bb3f60c65fb8eebacbb2d122ef517385"
+	"github.com/spf13/pflag 583c0c0531f06d5278b7d917446061adc344b5cd"
+	"github.com/zeebo/bencode d522839ac797fc43269dae6a04a1f8be475a915d"
+	"golang.org/x/crypto 1a580b3eff7814fc9b40602fd35256c63b50f491 github.com/golang/crypto"
+	"golang.org/x/sys 7c87d13f8e835d2fb3a70a2912c811ed0c1d241b github.com/golang/sys"
+	"gopkg.in/yaml.v2 5420a8b6744d3b0345ab293f6fcba19c978f1183 github.com/go-yaml/yaml"
+)
+
+inherit golang-build golang-vcs-snapshot
+
+DESCRIPTION="Format agnostic jQ"
+HOMEPAGE="https://github.com/jzelinskie/faq"
+SRC_URI="https://github.com/jzelinskie/faq/archive/${PV}.tar.gz -> ${P}.tar.gz
+	${EGO_VENDOR_URI}"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64"
+IUSE=""
+
+DEPEND="dev-libs/oniguruma"
+
+RESTRICT="test"
+
+src_compile() {
+	pushd src/${EGO_PN} || die
+	GOPATH="${S}" go install -v "${EGO_PN}" || die
+	popd || die
+}
+
+src_install() {
+	dobin bin/${PN}
+	pushd src/${EGO_PN} || die
+	dodoc README.md docs/examples.md
+	popd || die
+}
diff --git a/dev-db/tokumx/files/tokumx-2.0.2-no-delete-null-pointer-checks.patch b/dev-db/tokumx/files/tokumx-2.0.2-no-delete-null-pointer-checks.patch
new file mode 100644
index 000000000000..551770553d77
--- /dev/null
+++ b/dev-db/tokumx/files/tokumx-2.0.2-no-delete-null-pointer-checks.patch
@@ -0,0 +1,23 @@
+diff -uNr tokumx-enterprise-2.0.2.ORIG/CMakeLists.txt tokumx-enterprise-2.0.2/CMakeLists.txt
+--- tokumx-enterprise-2.0.2.ORIG/CMakeLists.txt	2018-07-17 16:20:18.712013701 +0100
++++ tokumx-enterprise-2.0.2/CMakeLists.txt	2018-07-17 16:22:06.063018495 +0100
+@@ -83,7 +83,7 @@
+ endmacro(set_cxxflags_if_supported)
+ 
+ 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(CMAKE_CXX_FLAGS "-fPIC -fno-strict-aliasing -fno-delete-null-pointer-checks -ggdb")
+ set_cxxflags_if_supported(
+   -Wall
+   -Wsign-compare
+diff -uNr tokumx-enterprise-2.0.2.ORIG/SConstruct tokumx-enterprise-2.0.2/SConstruct
+--- tokumx-enterprise-2.0.2.ORIG/SConstruct	2018-07-17 16:20:18.712013701 +0100
++++ tokumx-enterprise-2.0.2/SConstruct	2018-07-17 16:22:40.459020031 +0100
+@@ -702,6 +702,7 @@
+     # -Winvalid-pch Warn if a precompiled header (see Precompiled Headers) is found in the search path but can't be used.
+     env.Append( CCFLAGS=["-fPIC",
+                          "-fno-strict-aliasing",
++                         "-fno-delete-null-pointer-checks",
+                          "-ggdb",
+                          "-pthread",
+                          "-Wall",
diff --git a/dev-db/tokumx/tokumx-2.0.2-r1.ebuild b/dev-db/tokumx/tokumx-2.0.2-r2.ebuild
index 866bdec8d243..b1fbf2a7fdf9 100644
--- a/dev-db/tokumx/tokumx-2.0.2-r1.ebuild
+++ b/dev-db/tokumx/tokumx-2.0.2-r2.ebuild
@@ -43,6 +43,7 @@ src_prepare() {
 	eapply "${FILESDIR}/${P}-boost-57.patch"
 	eapply "${FILESDIR}/${P}-gcc-7.patch"
 	eapply "${FILESDIR}/${P}-undefined-reference.patch"
+	eapply "${FILESDIR}/${P}-no-delete-null-pointer-checks.patch"
 	cmake-utils_src_prepare
 }