gentoo resync : 28.12.2017

8 files changed, 263 insertions, 3 deletions

diff --git a/dev-db/Manifest.gz b/dev-db/Manifest.gz
index e4939cf6a096..6c0b481b8a70 100644
--- a/dev-db/Manifest.gz
+++ b/dev-db/Manifest.gz
diff --git a/dev-db/mariadb/Manifest b/dev-db/mariadb/Manifest
index 9053a8193c45..73a48a60fd71 100644
--- a/dev-db/mariadb/Manifest
+++ b/dev-db/mariadb/Manifest
@@ -10,6 +10,7 @@ DIST mariadb-10.0.33.tar.gz 69211872 BLAKE2B 02efa97a75ff13655e9a6d6ba562c4d14bd
 DIST mariadb-10.1.24.tar.gz 61780687 BLAKE2B 38df67a1b26aab559e41f44b129f2e57388634b80a8b10637744c3d11f9cad15329c9a1725cb836f7249352d5bdf9471bc9c3f254e1ef96229716543f235f7ed SHA512 0b8d81b53f6866a81f33559ce57ebf956fec3ba25da0bd58c8bee3b2ecc00a6c370340000209d18463f84501d3ba35994b51ef99224616c37cd38d2fc87b73e9
 DIST mariadb-10.1.26.tar.gz 61887132 BLAKE2B 2397e9d0b0f7dd126ff6b50a90996da734a30b6e49028dd2ad06c93b70faa0415184ce66840fc8d92a974acd0013f5cc1b2e7d1dc8214136a95d354ae2272bb7 SHA512 a7505c579728b58eb6a92bdee1f5dfea5c10c8389cb7a31eb99fe2c6bc416593925cf9708d3dec91ede12eb4e232098a0833af2185bdd60bc593c89d255f3c0b
 DIST mariadb-10.1.29.tar.gz 67885370 BLAKE2B 40b94ed519522f16ee4687a9c569a0e52632d2aeccf65b87070de31118bf5e719cce78cf36afd4f1386166b14e418e0262ffbc3a61098c95e6ee101faf871ec5 SHA512 c169dfa2878f9fa9e0e9d12ca79fcbfa644e9b51bb0b78b8dd51d6c5679f3184d139fa96a1ddb25f3ae5d1c0489708c2c624f96a24020f77bf7e5247fac45ecd
+DIST mariadb-10.1.30.tar.gz 67930015 BLAKE2B faa36733f617f1c867124335cbac0a38cbb626444b90068ee2b52ac63602d1526d9016868fa43c833f114b8c56ed6bf3c9a38c9b4601dec729f22650d21080d3 SHA512 3b123cc04e4bb09d86b7cee2caa21cc8f94b1b562d8762137565a7fa173385b87fc31f7ca4e15ce85c6a1cb45bdca2216d4c49347b75248e2b60b3438b7cc15c
 DIST mariadb-10.2.10.tar.gz 72388999 BLAKE2B 8d9188672b9250d47859fb0c050eb22b31b99046cf70aac334e26bc34759a73f1f4ab60c5d0437e113e21b213492202d5b5950337ba09590308bbb2bb9179581 SHA512 39c198009f8b19f4a08226ef9842b50e24636580b67c1c92d59c61cce3aa1edbd466e253c281dfcdfc58ab573ae9a59aaacb0ce3e8b82222043ddd849fc3e239
 DIST mariadb-10.2.11.tar.gz 72772830 BLAKE2B b3cd346ed1e032ed61e4499e1e6fb2adb0f0e959c296917fb55240922904872cb5d7836be8ee0ed744a753d1ae6310e537f4366209e0ce0627073b68076fe2d7 SHA512 4041ee1f1e266e8b30f85b19c5c95bcb626f965df9e0e20eb801598cc7fc5f5f37906e8a75cc86d373aa642adcccf3b75a0e67994e18908fb733cc6520d04a44
 DIST mariadb-5.5.58.tar.gz 45784323 BLAKE2B 57c51cf2e4574259acabb676c9aead1adfbaa0fe5cade08a41d6896089c27d401dab67598d58a00be44fe30f18d0c2252f3e4208c51508c7a20f0e5689cccf15 SHA512 c5c8b52c613a1a3f30de2cd1d8e390f8110b0891af78ee2a24ef2c4b7b8c5f2e140970ca89865e8277e7486dbfd0ad01c1fdbf8791c67a9793392247d68fec63
@@ -24,6 +25,7 @@ EBUILD mariadb-10.0.33.ebuild 6731 BLAKE2B 765a9b3bbb00a435753a6d6996682dd3d3c4e
 EBUILD mariadb-10.1.24-r1.ebuild 7187 BLAKE2B 0d018118c3f9bb6d6e3c4b2fd26e7a64340d278bbdd466fe0015cf48618db74ab21c21521b8abc7fd74c40ec46da6267e9a4cdb85f16ce7d6a959d8f948015f3 SHA512 f88e2f171b9785ab6c834511ca71d9939eb36020a32cfdba5fb91f81253df8a35b891db321c0f796dfec03c7fa39226d1696607518efbaa446531590de97a75a
 EBUILD mariadb-10.1.26-r1.ebuild 7255 BLAKE2B 69863e33f40194ed5b594f3af6b2cf290261f9e8b311efa373017e5e40b5b0384baa37f97e09960806aa3f4abcdc82e8e8d6049afd9445069c25fa5b399356c5 SHA512 171bd1cf59c77e98505f9f2217a5522611977fcd1c13d67dbe551892da3569b45298a032e33d5aed8cc2caa95f326c6f011291f678436a7fb3069133792693c7
 EBUILD mariadb-10.1.29.ebuild 7318 BLAKE2B 5048655ef3770c8dc9c2108f21ff1d84cf4548817391e4616788e108a5669b370e1c120bd2cd55f252486df215fab38c2a14674c9ba46af6eb2e805094db2553 SHA512 a4cb2c1c08542e10f56e970b33efabfdf873cbff028f6de37036385eec9a9bcdd7a943e928d8a083def3416ecf4035020db349bc8f47d013ec2e3b16da9ebdcc
+EBUILD mariadb-10.1.30.ebuild 7623 BLAKE2B 596196dfd19aa9c5432667e8130c3bc1f36ae19088fe7628c30c71e4d16457d65d4e1b745987cf697c37473befafcf127a9ffecc1d126b028a8c8d1c18b84d50 SHA512 f2c7d3d51efee75db2d8b6c852cad3172d4d7997a3e0697d2f211f4d4f792fcdd8f247889c22cdf0b0f391e536d1caa7223b00e8d08b92cacd43a8917fa27df2
 EBUILD mariadb-10.2.10.ebuild 32355 BLAKE2B e144135f516726c6abaf8239bc830a881df70d216b07372f3fe4d346e0050b9caa6cb762544e57fa5cc27c66cd814082d180fc2d841185932fd06b93ab44fe35 SHA512 56116f8a65f22c89b491cdd4e72c6fb118dbf7efae56c9827d1520055e555abef57e9b88957c3460e1e7ff76b44f2955a0092acda08e183a9ed867c08053ea44
 EBUILD mariadb-10.2.11.ebuild 32540 BLAKE2B d9834013d4a8efcad1240a80f7ba2f8f259290716cb3f05e3d9ffd41b8810937503b6fc75de83ac04a16d798879d6f1935767794c7942596e6a4bd1c1c739788 SHA512 162123fb2c338d84cdafc89cf362f622b25235d8430b505b3dafa8948122461485e08f28f1434ec9bf8f99e3a27ea9682ada57c6578c12d24234123fd2e6cd91
 EBUILD mariadb-5.5.58.ebuild 4241 BLAKE2B f296031afc5f43c890217a3f1d34d978fa83919164cfcde6a6d897d1a2e67894aeaaa88c8488c5d7f4143ac7c08170142e1c4ec0e7e024cbe79d3e37c33d9523 SHA512 3de822605e73ca9094f6635ee232b133371823e3f3330d6ecad973c0e9176d2280a5fd5ae6032a4f6e3f914c8a937f912e2aeb91a5802342ced02aee6db11944
diff --git a/dev-db/mariadb/mariadb-10.1.30.ebuild b/dev-db/mariadb/mariadb-10.1.30.ebuild
new file mode 100644
index 000000000000..31f4aec1b090
--- /dev/null
+++ b/dev-db/mariadb/mariadb-10.1.30.ebuild
@@ -0,0 +1,239 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="6"
+MY_EXTRAS_VER="20170926-1321Z"
+# The wsrep API version must match between upstream WSREP and sys-cluster/galera major number
+WSREP_REVISION="25"
+SUBSLOT="18"
+MYSQL_PV_MAJOR="5.6"
+
+JAVA_PKG_OPT_USE="jdbc"
+
+inherit toolchain-funcs java-pkg-opt-2 mysql-multilib-r1
+
+HOMEPAGE="http://mariadb.org/"
+DESCRIPTION="An enhanced, drop-in replacement for MySQL"
+
+IUSE="+backup bindist cracklib galera kerberos innodb-lz4 innodb-lzo innodb-snappy jdbc mroonga odbc oqgraph pam sphinx sst-rsync sst-mariabackup sst-xtrabackup tokudb systemd xml"
+RESTRICT="!bindist? ( bindist )"
+
+REQUIRED_USE="jdbc? ( extraengine server !static ) server? ( tokudb? ( jemalloc !tcmalloc ) ) static? ( !pam )"
+
+# REMEMBER: also update eclass/mysql*.eclass before committing!
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~sparc-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris"
+
+MY_PATCH_DIR="${WORKDIR}/mysql-extras-${MY_EXTRAS_VER}"
+
+PATCHES=(
+	"${MY_PATCH_DIR}"/20006_all_cmake_elib-mariadb-10.1.27.patch
+	"${MY_PATCH_DIR}"/20009_all_mariadb_myodbc_symbol_fix-5.5.38.patch
+	"${MY_PATCH_DIR}"/20015_all_mariadb-pkgconfig-location.patch
+	"${MY_PATCH_DIR}"/20018_all_mariadb-10.1.16-without-clientlibs-tools.patch
+	"${MY_PATCH_DIR}"/20025_all_mariadb-10.1.26-gssapi-detect.patch
+)
+
+COMMON_DEPEND="
+	mroonga? ( app-text/groonga-normalizer-mysql )
+	kerberos? ( virtual/krb5[${MULTILIB_USEDEP}] )
+	!bindist? (
+		sys-libs/binutils-libs:0=
+		>=sys-libs/readline-4.1:0=
+	)
+	server? (
+		backup? ( app-arch/libarchive:0= )
+		cracklib? ( sys-libs/cracklib:0= )
+		extraengine? (
+			odbc? ( dev-db/unixODBC:0= )
+			xml? ( dev-libs/libxml2:2= )
+			sys-libs/zlib[minizip]
+		)
+		innodb-lz4? ( app-arch/lz4 )
+		innodb-lzo? ( dev-libs/lzo )
+		innodb-snappy? ( app-arch/snappy )
+		oqgraph? ( >=dev-libs/boost-1.40.0:0= dev-libs/judy:0= )
+		pam? ( virtual/pam:0= )
+		systemd? ( sys-apps/systemd:= )
+		tokudb? ( app-arch/snappy )
+	)
+	>=dev-libs/libpcre-8.41-r1:3=
+"
+DEPEND="|| ( >=sys-devel/gcc-3.4.6 >=sys-devel/gcc-apple-4.0 )
+	server? ( extraengine? ( jdbc? ( >=virtual/jdk-1.6 ) ) )
+	${COMMON_DEPEND}"
+RDEPEND="${RDEPEND} ${COMMON_DEPEND}
+	galera? (
+		sys-apps/iproute2
+		=sys-cluster/galera-${WSREP_REVISION}*
+		sst-rsync? ( sys-process/lsof )
+		sst-mariabackup? ( net-misc/socat[ssl] )
+		sst-xtrabackup? ( net-misc/socat[ssl] )
+	)
+	perl? ( !dev-db/mytop
+		virtual/perl-Getopt-Long
+		dev-perl/TermReadKey
+		virtual/perl-Term-ANSIColor
+		virtual/perl-Time-HiRes )
+	server? ( extraengine? ( jdbc? ( >=virtual/jre-1.6 ) ) )
+"
+# xtrabackup-bin causes a circular dependency if DBD-mysql is not already installed
+PDEPEND="galera? ( sst-xtrabackup? ( || ( >=dev-db/xtrabackup-bin-2.2.4 dev-db/percona-xtrabackup ) ) )"
+
+MULTILIB_WRAPPED_HEADERS+=( /usr/include/mysql/mysql_version.h
+	/usr/include/mysql/private/probes_mysql_nodtrace.h
+	/usr/include/mysql/private/probes_mysql_dtrace.h )
+
+pkg_setup() {
+	java-pkg-opt-2_pkg_setup
+	mysql-multilib-r1_pkg_setup
+}
+
+pkg_preinst() {
+	java-pkg-opt-2_pkg_preinst
+	mysql-multilib-r1_pkg_preinst
+}
+
+src_prepare() {
+	java-pkg-opt-2_src_prepare
+	mysql-multilib-r1_src_prepare
+}
+
+src_configure(){
+	# bug 508724 mariadb cannot use ld.gold
+	tc-ld-disable-gold
+
+	local MYSQL_CMAKE_NATIVE_DEFINES=(
+			-DWITH_JEMALLOC=$(usex jemalloc system)
+			-DWITH_PCRE=system
+	)
+	local MYSQL_CMAKE_EXTRA_DEFINES=(
+			-DPLUGIN_AUTH_GSSAPI_CLIENT=$(usex kerberos YES NO)
+	)
+	if use server ; then
+		# Federated{,X} must be treated special otherwise they will not be built as plugins
+		if ! use extraengine ; then
+			MYSQL_CMAKE_NATIVE_DEFINES+=(
+				-DPLUGIN_FEDERATED=NO
+				-DPLUGIN_FEDERATEDX=NO )
+		fi
+
+		MYSQL_CMAKE_NATIVE_DEFINES+=(
+			-DPLUGIN_OQGRAPH=$(usex oqgraph YES NO)
+			-DPLUGIN_SPHINX=$(usex sphinx YES NO)
+			-DPLUGIN_TOKUDB=$(usex tokudb YES NO)
+			-DPLUGIN_AUTH_PAM=$(usex pam YES NO)
+			-DPLUGIN_CRACKLIB_PASSWORD_CHECK=$(usex cracklib YES NO)
+			-DPLUGIN_CASSANDRA=NO
+			-DPLUGIN_SEQUENCE=$(usex extraengine YES NO)
+			-DPLUGIN_SPIDER=$(usex extraengine YES NO)
+			-DPLUGIN_CONNECT=$(usex extraengine YES NO)
+			-DCONNECT_WITH_MYSQL=1
+			-DCONNECT_WITH_LIBXML2=$(usex xml)
+			-DCONNECT_WITH_ODBC=$(usex odbc)
+			-DCONNECT_WITH_JDBC=$(usex jdbc)
+			# Build failure and autodep wrt bug 639144
+			-DCONNECT_WITH_MONGO=OFF
+			-DWITH_WSREP=$(usex galera)
+			-DWITH_INNODB_LZ4=$(usex innodb-lz4 ON OFF)
+			-DWITH_INNODB_LZO=$(usex innodb-lzo ON OFF)
+			-DWITH_INNODB_SNAPPY=$(usex innodb-snappy ON OFF)
+			-DPLUGIN_MROONGA=$(usex mroonga YES NO)
+			-DPLUGIN_AUTH_GSSAPI=$(usex kerberos YES NO)
+			-DWITH_MARIABACKUP=$(usex backup ON OFF)
+			-DWITH_LIBARCHIVE=$(usex backup ON OFF)
+		)
+	fi
+	mysql-multilib-r1_src_configure
+}
+
+# Official test instructions:
+# USE='extraengine perl server openssl static-libs' \
+# FEATURES='test userpriv -usersandbox' \
+# ebuild mariadb-X.X.XX.ebuild \
+# digest clean package
+multilib_src_test() {
+
+	if ! multilib_is_native_abi ; then
+		einfo "Server tests not available on non-native abi".
+		return 0;
+	fi
+
+	_disable_test() {
+		local rawtestname reason
+		rawtestname="${1}" ; shift
+		reason="${@}"
+		ewarn "test '${rawtestname}' disabled: '${reason}'"
+		echo ${rawtestname} : ${reason} >> "${T}/disabled.def"
+	}
+	local TESTDIR="${BUILD_DIR}/mysql-test"
+	local retstatus_unit
+	local retstatus_tests
+
+	if ! use server ; then
+		einfo "Skipping server tests due to minimal build."
+		return 0
+	fi
+
+	# Bug #213475 - MySQL _will_ object strenously if your machine is named
+	# localhost. Also causes weird failures.
+	[[ "${HOSTNAME}" == "localhost" ]] && die "Your machine must NOT be named localhost"
+
+	if [[ $UID -eq 0 ]]; then
+		die "Testing with FEATURES=-userpriv is no longer supported by upstream. Tests MUST be run as non-root."
+	fi
+	has usersandbox $FEATURES && ewarn "Some tests may fail with FEATURES=usersandbox"
+
+	einfo ">>> Test phase [test]: ${CATEGORY}/${PF}"
+
+	# Run CTest (test-units)
+	cmake-utils_src_test
+	retstatus_unit=$?
+
+	# Ensure that parallel runs don't die
+	export MTR_BUILD_THREAD="$((${RANDOM} % 100))"
+	# Enable parallel testing, auto will try to detect number of cores
+	# You may set this by hand.
+	# The default maximum is 8 unless MTR_MAX_PARALLEL is increased
+	export MTR_PARALLEL="${MTR_PARALLEL:-auto}"
+
+	# create directories because mysqladmin might run out of order
+	mkdir -p "${T}"/var-tests{,/log}
+
+	# Run mysql tests
+	pushd "${TESTDIR}" || die
+
+	touch "${T}/disabled.def"
+	# These are failing in MariaDB 10.0 for now and are believed to be
+	# false positives:
+	#
+	# main.mysql_client_test, main.mysql_client_test_nonblock
+	# main.mysql_client_test_comp:
+	# segfaults at random under Portage only, suspect resource limits.
+
+	local t
+	for t in plugins.cracklib_password_check plugins.two_password_validations ; do
+		_disable_test  "$t" "False positive due to varying policies"
+	done
+
+	for t in main.mysql_client_test main.mysql_client_test_nonblock \
+		main.mysql_client_test_comp ; do
+			_disable_test  "$t" "False positives in Gentoo"
+	done
+
+	# run mysql-test tests
+	perl mysql-test-run.pl --force --vardir="${T}/var-tests" --reorder --skip-test-list="${T}/disabled.def"
+	retstatus_tests=$?
+
+	popd || die
+
+	# Cleanup is important for these testcases.
+	pkill -9 -f "${S}/ndb" 2>/dev/null
+	pkill -9 -f "${S}/sql" 2>/dev/null
+
+	local failures=""
+	[[ $retstatus_unit -eq 0 ]] || failures="${failures} test-unit"
+	[[ $retstatus_tests -eq 0 ]] || failures="${failures} tests"
+
+	[[ -z "$failures" ]] || eerror "Test failures: $failures"
+	einfo "Tests successfully completed"
+}
diff --git a/dev-db/mycli/Manifest b/dev-db/mycli/Manifest
index 6d64e8389c56..18a34c9fddb7 100644
--- a/dev-db/mycli/Manifest
+++ b/dev-db/mycli/Manifest
@@ -1,8 +1,9 @@
+AUX remove-tasks.patch 423 BLAKE2B d4259bb4d0ba1434fb88d25ae1f2bc4e81e89d81c9c2d45f1ac442b2de14d5b9e42ac7ad25a73c18a80570d20626db1c8070965f817f185d9de42bd9ff1605e7 SHA512 21e577769418867ce6a3ea71e8b8949c8974a2a0f1750a87df6f125e53dca04e5e93381324b1d6f9f99b7795bb2e13384619ea4664c3d2c77c5ec83ecd4e33c4
 DIST mycli-1.10.0.tar.gz 272722 BLAKE2B f2a4d7b76684718167fb6bb4f90a96a31b669cf1f35c266ed544d00b4fe4f9b0cb2c6d81e161d41f1df785e2dcf79056a675857f8400d8cd7811199ea00064b7 SHA512 d66866fd23ee2be3f1bb47d1414b8151c2b50e8844a2553e139f753ae55dd010d1c23aae7c5863891ea4f347b124145405dc7894efc27fc8fcb74127c14261f8
 DIST mycli-1.15.0.tar.gz 275065 BLAKE2B 47ae049a7a669d18fc2bb467dd4ee6d1bbe23a86115db6d1965c48c93a2a1be9bb8b4427b377f8ce935b957c854c1c4bf4a87fdea07f27329a13fd6a28b59559 SHA512 7a7d98220c4a679340dbf3c3c9fb3eaab7698f7abbe3e62835a03df10b59c79f0dfd916e9f7b39f12215063849ecadf9d08d086d14b00666b67bac1d092609f2
 DIST mycli-1.7.1.tar.gz 266597 BLAKE2B 8fc6006dbb85a7053d67040d492ba12619507160efd240fdb89125794a01fbb439756bdeb420c306a883db925f6ec7ae0c36657c4c4b2197cfb702fc77babcb1 SHA512 5c61fe67f3205dd1123ed8d38441cda0574db04dd46b7e075d216f7aa8cd856a2f06a1b4bf7dbe9fd0b07f3e91c151fe3f885d10d3db488b6c306e0ce9ac9e7c
 EBUILD mycli-1.10.0.ebuild 821 BLAKE2B 49aeb85ed7281c5aaa1fd973e81d3daa2e0a27b38452b55a9ac8b9b97c99ee9aeb6f47a3fba83c35e6e8391b7bebd3b6c48d4bbb6d1392eb43cf25613b2764ae SHA512 16df33c8943ccc83bb5e22f4207490d5850ce3d38d252c5f7035c066a906481a3ece64ec185c15fb5945d34a4ca1b88189c2233fb3f44eb0c1c89b3f2734bd1e
-EBUILD mycli-1.15.0.ebuild 901 BLAKE2B 4bf9e1310bff73b0b9583510d656b592028d6f4a81750b91b68275ebf82c696ab09679c43cf4f6811e7d04935bb8d7bcea861c3e152eb89ea921bda1b0dc1d10 SHA512 55d9537211a79d416cffab3212c1c00d6649760cf6f129807783a2e92f9b3a70a71e2fd4def6b915d1b111f53c51dee8fbcea27a844de8ecaad71e40aaf18378
+EBUILD mycli-1.15.0-r2.ebuild 997 BLAKE2B b0155b809c70bf2f38073eabd4700852bb9675ef2bd9a0af8f211280600f1b3ccaf493923207ccee4790a0f702382a10eaca4785c282669eb7220c92a0fab283 SHA512 f22b412a7d8e741aacb8e4050d497b0ab4642691a8167c959d384ad778ea53e749e5d3d94258bca45a2245fd7a0264621e60be5dbf8720fa45db76470d47e7bf
 EBUILD mycli-1.7.1.ebuild 939 BLAKE2B 1a3f30af359d528c8bd882c44857ba58e24db4618ead1d741de4ed2fa0ad1574b6489a4c2d97fec1279142cc2e2af7b7a3de55b3ab4cd050c1f05e2305c38633 SHA512 75c6921589218796a539089db1c06e107efd506809d1e7337bddfe98d1491fc13e80500b0d0fa6364aad7ee751ed69e0a040339a918239b3a5268c0886fa4a03
 EBUILD mycli-9999.ebuild 881 BLAKE2B 9f864204cbf3697a29477c5fdcf5e1b2742c226db8f635675d3894f3cede78cda874c1a8b17b348499549a3bcdcdc3cc4f42110bf82ba7da3d64e68a6a6fad02 SHA512 97f0726752da1cca2ea7ab970d0d8bfc49c40f78f849f8529f6a7d3b03cb7a5be809abf7847b531944fb9a448f12bb515a2ae68b05ab585a42b6bda087df40b9
 MISC metadata.xml 322 BLAKE2B 16f308194537f996ff6a54d92c996267e2ea37d78d9377d3d3b5a6246ebf511c9dae536f03627a32885753a2d3943554a9748513a036ef6e10b952e5281ecfbe SHA512 ae5215f13b457aa43dc95d67bacc371292f0c8f6540dcb49633f0120232dbde7fe12479c3ff16c203b20ac96700be12c187444a768f50e319320684553509dd1
diff --git a/dev-db/mycli/files/remove-tasks.patch b/dev-db/mycli/files/remove-tasks.patch
new file mode 100644
index 000000000000..94502e6b656a
--- /dev/null
+++ b/dev-db/mycli/files/remove-tasks.patch
@@ -0,0 +1,15 @@
+diff --git a/setup.py b/setup.py
+index 882fe92..f0d28ab 100755
+--- a/setup.py
++++ b/setup.py
+@@ -36,10 +36,6 @@ setup(
+     install_requires=install_requirements,
+     entry_points={
+         'console_scripts': ['mycli = mycli.main:cli'],
+-        'distutils.commands': [
+-            'lint = tasks:lint',
+-            'test = tasks:test',
+-        ],
+     },
+     classifiers=[
+         'Intended Audience :: Developers',
diff --git a/dev-db/mycli/mycli-1.15.0.ebuild b/dev-db/mycli/mycli-1.15.0-r2.ebuild
index 8db9aeb27412..1782a8aa2bb4 100644
--- a/dev-db/mycli/mycli-1.15.0.ebuild
+++ b/dev-db/mycli/mycli-1.15.0-r2.ebuild
@@ -16,6 +16,7 @@ KEYWORDS="~amd64 ~x86"
 IUSE=""
 DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
 RDEPEND="
+	>=dev-python/cli_helpers-1.0.1[${PYTHON_USEDEP}]
 	>=dev-python/click-4.1[${PYTHON_USEDEP}]
 	>=dev-python/configobj-5.0.6[${PYTHON_USEDEP}]
 	>=dev-python/cryptography-1.0.0[${PYTHON_USEDEP}]
@@ -26,3 +27,5 @@ RDEPEND="
 	>=dev-python/python-sqlparse-0.2.2[${PYTHON_USEDEP}]
 	!>=dev-python/python-sqlparse-0.3.0
 "
+
+PATCHES=( "${FILESDIR}/remove-tasks.patch" )
diff --git a/dev-db/postgresql/Manifest b/dev-db/postgresql/Manifest
index 5f3ddd82a337..f5f935558fdc 100644
--- a/dev-db/postgresql/Manifest
+++ b/dev-db/postgresql/Manifest
@@ -41,7 +41,7 @@ DIST postgresql-9.6.5.tar.bz2 19576132 BLAKE2B 6b924993df6cd8cc990b83c0707fd0428
 DIST postgresql-9.6.6.tar.bz2 19605724 BLAKE2B efdb13a4e32133b31a0ee368aed9bf76f0511596a2d77ade60129c2c76b0ba2c7dafad532cf09ae007d7110175a153968cfa151cf8aa7008b59d36ed00ed18ed SHA512 ac2f0fe6ef7c4e14f85cd7592d1306d9657b7f35efa6f43a089d7785ab970b8c25aa1e66d83df056c23513d6dbac0a9f54717b3d85758560d02e7f8141914ebc
 EBUILD postgresql-10.0-r1.ebuild 13755 BLAKE2B 8c9d81e1a4f278a814417e5dfc579259c67bbf022053beed565008b9b354e4bcc05080729e63f0c8a71b5a6b27f42f8cce35b79b19298aacbbc299648f56dd26 SHA512 60c6f0d5ecef9db6d0095b1a3010dd8e4a3af1a94e69bea90336ae9ff0dd2bc48607016f93e8e56cc3b755d6f20841cffe70415bf9bdbc84c73a4a55e6990a0c
 EBUILD postgresql-10.0.ebuild 13607 BLAKE2B f9f029c18e9025cfeeab7fed16a52d0873700a60a6a7937a2034cb89cea842799c7c31acc39d5140c3ebf21130f7f9ce381ac7d7e612ebddf9d008a787661238 SHA512 fe84e6f2e87505cfe5edb0d571f54465cd2e7d05ea9a62a1e6b9f2e96acf36dcfa6adc7995e80eb4b2d27c42c0c4a69e476f4d86068124755f2a6cfbcd623cb8
-EBUILD postgresql-10.1.ebuild 13752 BLAKE2B 87de2e4a59f6129eb7369a102888a487c9940e76dd52e39ef81fdc83ad1354a794caef28a8a1e979091cd141c8b195c90b5ba621d6ce98c69c22f263a0e6e5da SHA512 186337b2963269e7587603291ad538f6cf3e42f024f867ef5beb9efbcbd3a526211e419a741ec568c327017c79196a04ef398bda11260986f09d69344177fc5b
+EBUILD postgresql-10.1.ebuild 13750 BLAKE2B 1c38145dc27894d2af4e7a6bd8955863c0fe21b70699861be6c5933496c39d42f6a49de853643365ed7bf68911d5cf2ba8dcd3e1d6e692b56ac9b30e2c102cb9 SHA512 2f8a4685913a2aae4adfd3d61c85782c8b6d7a9b158ad5ee6788290d70fb50aff041c95641997c76e92ab437cf54799a8f187e067eaed80b992c175b524b0306
 EBUILD postgresql-9.2.19.ebuild 11735 BLAKE2B 35b4c9e9a28212e8b37c898dfd4b792bb28d91df746ce1134ddd59d1efeabfef7811f753b6e76563334d3c4e365683416504aa1ed16a5fbded5c6bf7af51b95d SHA512 a8adf4f3cfd3ccdb22f0f1fd8c2ca2498e6a06643b62bbd6349ec1728ef9af4832ec27904c18fc8d8d43b5f1444c020c5214f4373a556d9d94adf4b0b16a72ee
 EBUILD postgresql-9.2.22.ebuild 13345 BLAKE2B 78c2d15f879d5489ac3842deb1f0e7f00eabdbedbdf132d310ba040ffead6bce707119cbc08ca8ab5d05afc4b3d767d0fefae20c1449e2bda645e8724fc384a4 SHA512 c0286afe4a066ddbd32b2cc3d09e5f86250b7656f2148dbd2128ec3b650260a0af9f67cbee02fa3f3bbab880824b2a692c93add8cc705d22c1a6664ec7dd3b8f
 EBUILD postgresql-9.2.23-r1.ebuild 13541 BLAKE2B 1fe059126314b7ba4c257818ff9ee6cf47464511025ede24b7eed9a7d92fb68ff2c53726d3d4266bb68c1a24a6ae5267ffc4cabcdd1343544f7bb9fbc7029ec7 SHA512 380dfda81ac3e5c6bed023c899f102eb97c7ba9b43fca1bbee101b599a69c1cb51594dc5d5171202a415774c719b94f4fb6573575f166893d0c0ec71d9534dd9
diff --git a/dev-db/postgresql/postgresql-10.1.ebuild b/dev-db/postgresql/postgresql-10.1.ebuild
index 3381d06cc4dc..420ba4c6824e 100644
--- a/dev-db/postgresql/postgresql-10.1.ebuild
+++ b/dev-db/postgresql/postgresql-10.1.ebuild
@@ -8,7 +8,7 @@ PYTHON_COMPAT=( python2_7 python3_{4,5,6} )
 inherit eutils flag-o-matic linux-info multilib pam prefix python-single-r1 \
 		systemd user versionator
 
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ppc ppc64 ~s390 ~sh ~sparc x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~ppc-macos ~x86-solaris"
+KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~ppc-macos ~x86-solaris"
 
 SLOT=$(get_major_version)