gentoo resync : 19.05.2018

17 files changed, 194 insertions, 636 deletions

diff --git a/dev-db/Manifest.gz b/dev-db/Manifest.gz
index f71be8d5a8f8..dd8488a27cb6 100644
--- a/dev-db/Manifest.gz
+++ b/dev-db/Manifest.gz
diff --git a/dev-db/SchemaSync/Manifest b/dev-db/SchemaSync/Manifest
index dff9fd4cd661..d817b6637cc7 100644
--- a/dev-db/SchemaSync/Manifest
+++ b/dev-db/SchemaSync/Manifest
@@ -1,5 +1,7 @@
 DIST SchemaSync-0.9.2.tar.gz 12828 BLAKE2B 050a027376282816bef34d6a7e146e590c5ebc279649f03d65129d33b9941c08aeb7bb58a302b9a77a62c8b7820b8dcbd6bc783c2405a25a4baca863baa53d3e SHA512 4f2522c05e3cf0957fe0d51cc48f3a45fd8eaeb341801bfdeb32bb7e959e8a250a84a162b80853f2010a99a932ef7d1b556579f7c77971f0e9a3e0fa87531599
 DIST SchemaSync-0.9.4.tar.gz 13824 BLAKE2B d98cd5cc0d6275ac5e4bb0272f4ab2879f4639b0e2986c175297ab3cc60930f63c3288cc2c3194784078958749c8e95a9e9ecdf660e071a61caac37b9659f2e3 SHA512 0087f5f634d2374def5e1dd2dd8d6d57d3fca9322bba23aee461487053233dba30ce889a87747ce2c11bd9a7e08418d619e9fd8b910ea303987b57bac7609248
+DIST SchemaSync-0.9.5.tar.gz 13973 BLAKE2B e76dd4e2e69875dedafed44214b6e30db6e71f4ee62a4bcd1cf1592c6727ae9d6f70190aa288559594d278b3962f8cb91eeb3d4b4b9014737be8b6b37acc9e84 SHA512 8ee37c099de8e3627d3d708c5642e4e0b7304306002bfa82d24cd2a733539bd0d5144d6afd18dd06e229a87b05ee569fe2febc727785a085bb32169581805934
 EBUILD SchemaSync-0.9.2-r1.ebuild 568 BLAKE2B a88730eb8d9f71df54ab1f617f1166f638ed530dbe168d7439409e614c968054939e3f5dbf7b212977250baf384d05f23cdba82023d2f64cd24360bfee03a9ce SHA512 6c7501e38ab17d0bfe24f78338e525415aac6f81bce0423e6db1dc2787ef43f82f8788f61cdd6de6d9916348332ca9d9fc4743b1fa15f16903ef6cb63acd84c8
 EBUILD SchemaSync-0.9.4.ebuild 550 BLAKE2B 550326591dcea19d82af7373fc5a1bd13356054bf679b1d01ee57ca05fd9b04989f0b24d07aacb879c5f475f2b8eedd0e3520fd5d1b14345caca7a16d5f24bb4 SHA512 620a7eecfdb121ef9d9076e7978921d07766e2fe3b54b02d2947fa6803be81c1dffcbcf73d9a8a66270320d538ec4194aead79af1d02f1c74d61cf1eb06c490b
+EBUILD SchemaSync-0.9.5.ebuild 550 BLAKE2B aeb421fbd4f55f0c0afd1ad5bb3c600d455413fcb56d1a953874653689c9c3b9010360b7f13bf299013a141917b69521c91b836c9fc23b1efa04ec7001786796 SHA512 252e8d0e8b3cac03f0a3f180f3adc3633dd77c5e4562f7f7ec4f8a84236e2ed2492c573e0849f4cf10c0e0eaaf1df30c18bb999984fd3cb4280736a10f3df49a
 MISC metadata.xml 384 BLAKE2B 124298e3a428e69e9fd9b204453ddc37d5e283bc9c5fdb2565c7c876b2b1f95fb9bf0c3485089b971f0f486d74b4d2674647098ed0bc6803266067964bd9cc75 SHA512 8b370f82a807086da710e4af1e39a5e6e9b2cc06e89171c91d2516ad96fd5e5f8f96ff745943123368bf9773a0408f6563a5eee38ec36fab38e872ad08120960
diff --git a/dev-db/SchemaSync/SchemaSync-0.9.5.ebuild b/dev-db/SchemaSync/SchemaSync-0.9.5.ebuild
new file mode 100644
index 000000000000..77f6e927f299
--- /dev/null
+++ b/dev-db/SchemaSync/SchemaSync-0.9.5.ebuild
@@ -0,0 +1,23 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+PYTHON_COMPAT=( python2_7 )
+
+inherit distutils-r1
+
+DESCRIPTION="MySQL Schema Versioning and Migration Utility"
+HOMEPAGE="https://github.com/mmatuson/SchemaSync"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+RDEPEND="
+	dev-python/setuptools[${PYTHON_USEDEP}]
+	dev-python/mysql-python[${PYTHON_USEDEP}]
+	dev-python/SchemaObject[${PYTHON_USEDEP}]"
+DEPEND="${RDEPEND}"
diff --git a/dev-db/mariadb-galera/Manifest b/dev-db/mariadb-galera/Manifest
index 239bc7e382a7..9716fe40ea82 100644
--- a/dev-db/mariadb-galera/Manifest
+++ b/dev-db/mariadb-galera/Manifest
@@ -2,5 +2,5 @@ AUX my.cnf-5.5 5244 BLAKE2B f6e22850e34454d7b48566b3e3e1731940933e00611cf5c3c79a
 AUX my.cnf-5.6 5144 BLAKE2B 2f977b6a92524cfabbdd19058430c62dd4d03a0587036f49057eff69fda04c148a4dca8e58abe418a2bdc0fe1ef3c780cf53d7214fb51f13d5a4b2a4f7a3b8e9 SHA512 db4bdde6f82d9bd33026477d89d8191ddc4099586273ca4aa3f2dcd09572f887d03f79c2ce00bf74d01c21a18384b05516982bdcf31a6c458631315ea75c4cab
 DIST mariadb-galera-10.0.35.tar.gz 66950519 BLAKE2B a0b48de41234d1800c1734782bd604d30512e3d33d1937cd3e79f68ec804089166223ba53450ef630779d2b74bc4ace611dc748b4ceca7ed4e4151f97d693655 SHA512 e0160ef74d45c332edf49f21bb673b926008cba9ba650f97a47d7631260b2517db19e1730b76be77af4ee384aa5cc9b3453a24da57c48ab5f062f937494aee87
 DIST mysql-extras-20180515-1334Z.tar.bz2 321462 BLAKE2B 48fc1e0058fa824e6234b0f3319d261997e99f334c8583c0def4cdac4b59f2380d7153ab0fa2ca9a6ab15e35899c2a7586e3b61f4044c4c949110cc8ab9fb0e6 SHA512 de3000f0c65eed9595b52d53205cdcac60cb4a06a5aca27057c8beca6a7890f453aeeda0bb8487b8de75cfb4caa48682b7706273574876c5cefd0d03988c4f7e
-EBUILD mariadb-galera-10.0.35.ebuild 27110 BLAKE2B 1b50a7632b065793c85413bf077238ce1784b7395fd4c957fa7dd278a4f8a687010a0e91923f6b394963a3a6923ce1a2c09ad1e0effbd6d3e7b17d91a0452621 SHA512 ba7ebc9c9d79b8b13f46ea3e9e8971f730359436bd72508d7a1c11e092d0fe6d5195098c93af74e23147caf8aaea62349acceaefe174201517de8bf704eabdd0
+EBUILD mariadb-galera-10.0.35-r1.ebuild 27198 BLAKE2B 8dcb32748457944d44149901e17881c1f40ffb29358efdce8263a1c100c365711087522b903e31fa89c3383f0f29017330bb7eb91b859edf564ef523af57fa1a SHA512 c32ef62c4e88eda04022462e765b42831c4b13d1b858726b9e750c0b10bb46072d97040c971538c1ff23ca5440b16c7c83620c7b37b4465138429a8795674510
 MISC metadata.xml 1812 BLAKE2B d8dca52245956dd59e770feaa45354e8b6d718b950a072bd8db93f162ac59ad4029556c5f02b7753a4b541eaf9e0d97d93eb29c06649be4391268212d395896e SHA512 7e2cb0d0b2bb303f475ac84dd9ebb23b1df940eec5fbe562cd238be1f2e1d3564edeb66b5d237d529ec1ab4b6aad4935d2ab490411f8083a934fd1f4894647e0
diff --git a/dev-db/mariadb-galera/mariadb-galera-10.0.35.ebuild b/dev-db/mariadb-galera/mariadb-galera-10.0.35-r1.ebuild
index 837885821034..b0a8b98c8e94 100644
--- a/dev-db/mariadb-galera/mariadb-galera-10.0.35.ebuild
+++ b/dev-db/mariadb-galera/mariadb-galera-10.0.35-r1.ebuild
@@ -238,7 +238,10 @@ src_prepare() {
 		done
 	fi
 
-	# Don't build Mroonga
+	# Collides with mariadb-connector-c bug 655980
+	disable_plugin auth_dialog
+
+	# Don't build Mroonga or example
 	disable_engine mroonga
 	disable_engine example
 
diff --git a/dev-db/myodbc/Manifest b/dev-db/myodbc/Manifest
index 4c9f6d086cc7..c638da55a58f 100644
--- a/dev-db/myodbc/Manifest
+++ b/dev-db/myodbc/Manifest
@@ -2,9 +2,6 @@ AUX 5.2.7-mariadb-dynamic-array.patch 3053 BLAKE2B 1c72b7318dcfd035655285c433a88
 AUX 5.2.7-my_malloc.patch 594 BLAKE2B c9d9aad2e9b9e3e2b30ff41e6ec68343557123517b808df6888d91f48e68cbb1de852f31b057dffea40264a717077e4bbce6f78438535eb11cb660986f469892 SHA512 bcd26b2f8de21404c741fec51bb7e7bec32a5d3fbc90471c157ee275dc6136a44a6ef4d2ad8dd170e2852679d3fcb0cc74cf4acca0570702206b4cded1cb1fa5
 AUX 5.2.7-r1-cxxlinkage.patch 1707 BLAKE2B aaf7ef0f319f2e00034307f51406c82580f5d257b61d722d7d610e731b9c549ff54b88279689c226df72837c5af35911ee1f4dd756b989f4018a78d3e3d5e940 SHA512 3d0f1839e1b200d7746d2c7161ee2a85813bf40517a70777d361e482efd6d6b0be88415d339d6dccc49de865a0d714fbbce2b74abb1bbc12c4f4681a5bd5abf8
 AUX 5.3-cmake-doc-path.patch 1480 BLAKE2B 5f89253a86fa97fbf4103fbe797f60449245195e9c8d0f6d7f065e654a402de0461459dd11d9d878f0794089261ee5ee9fac3240bf90f7c8382edb54d84b27a6 SHA512 aa2303161af2b53608acc127464951cf77492a1a90e869a58893ba10a014077d7f8f319325b77713fffceeaa002943f4ce52b6cb9571b0b3d3d7ab562601968d
-AUX 5.3-cxxlinkage.patch 1687 BLAKE2B 6ed84c304bf4fd22cf894e6eaf98202056d78f32b5ef55ac83b19b2dbb2a6b3441adc1faae4eb01d5eae49d01585b08fa231f7f7b9d56530b49ee342e28b7928 SHA512 404242e009e3c22000d599be20856e7610f845abc086519082d9b45ad3a904cfcc569cdcab5eade904a8b27b59af954df0cba870520792290187259a9b0012bc
-AUX 5.3-mariadb-buffer_length.patch 3242 BLAKE2B 56931a6f9ce1a03b207a7b0fe282f392fc97e9a501666a209ad06391d3ff318b5516e397edf90f8a648eec07967cbd7dbce1fff19f33036448b442568e00d256 SHA512 b267c76da77594715edff83aa223d0e45f7b369a142707f91f44a7c862fdf319d6ffd8726927fd7f44b32a779a0fc96b87e04f882d6cf99f7df0385eaa8021c2
-AUX 5.3-mariadb-dynamic-array.patch 3654 BLAKE2B 699cac32b39ea1a6761aa5045c16be413fd499f11f5a1046a92f80c8c5ebffabccbdba174ef90c88ac7d2e6932ab5fc527b8d2a0914a147110f3bacf44fe1e7e SHA512 8599fb01062db680dbfd0f054eab0f91b5ca8f1799fd602ff4634241936ab4d8f5e26e6149f6d92e97241c953369259a142b1ab02e9b8bbe6fb16cd44d78ffff
 AUX 5.3.10-cxxlinkage.patch 1027 BLAKE2B b3df78658e4fb3243debb6f95cea6c5530db309ffc50f3a6afaff8bce143d147b4645a4bef4a54f6d04203ea132d4245812f5a2473ad7e9899f6e6b3c0799213 SHA512 f4d6df55313ccba995c8bd2e182397ce2652c2fbc0f0706474386654fb890fc47cad3a18f306206e840a47b729569e9a0ccb1cc2401c5280792afc4f544b41fd
 AUX 5.3.10-mariadb.patch 1744 BLAKE2B a9e33c86f999394d77757f69f1f314238123fa4158297961b4ce0f501e6fb743927e892c1f6640945842e843da56a826e5da1a968d84f7e5dcf3b2b4a590c0e8 SHA512 ebf62a2e0cc901fce81d0ad358f62d1c41494a5e35fb5a4df6913d1f4d5b8bbb638a23cabfe483818efa39688744b7be8b98d922b4bdff830de701c665da0fa0
 AUX cmake-doc-path.patch 1498 BLAKE2B b79110c92b7fc80c64fdf05b469c4bb333d68610ff4fadc78bd307689651e41bcd66f33fd782db1b69c863ef81faee3d5eb485d5c9bd284db8be3948d2bec7e7 SHA512 2e48af11efb55a1508402d5d1d717a3dfc9897bf0ccce5aa190792fb673ac78b27a9480e951a6347a2c8d0e2fe08a28c11fd08c55dbea835a93f525decaaf09e
diff --git a/dev-db/myodbc/files/5.3-cxxlinkage.patch b/dev-db/myodbc/files/5.3-cxxlinkage.patch
deleted file mode 100644
index 319262c81ca3..000000000000
--- a/dev-db/myodbc/files/5.3-cxxlinkage.patch
+++ /dev/null
@@ -1,43 +0,0 @@
-diff -aurN a/cmake/FindMySQL.cmake b/cmake/FindMySQL.cmake
---- a/cmake/FindMySQL.cmake	2016-11-29 07:40:13.000000000 -0500
-+++ b/cmake/FindMySQL.cmake	2017-02-17 13:59:18.115389096 -0500
-@@ -747,7 +747,7 @@
-     endif()
- 
-     if(NOT MYSQL_CXXFLAGS)
--      if(MYSQL_CXX_LINKAGE OR MYSQL_VERSION_ID GREATER 50603)
-+      if(MYSQL_CXX_LINKAGE)
-         _mysql_conf(MYSQL_CXXFLAGS "--cxxflags")
-         set(MYSQL_CXX_LINKAGE 1)
-       else()
-diff -aurN a/CMakeLists.txt b/CMakeLists.txt
---- a/CMakeLists.txt	2017-02-17 13:50:43.556006202 -0500
-+++ b/CMakeLists.txt	2017-02-17 13:57:15.745676184 -0500
-@@ -242,10 +242,9 @@
- SET(EXECUTABLE_OUTPUT_PATH "${CMAKE_BINARY_DIR}/bin")
- SET(LIBRARY_OUTPUT_PATH "${CMAKE_BINARY_DIR}/lib")
- 
--SET(LIB_SUBDIR "lib")
--IF(RPM_BUILD AND CMAKE_SYSTEM_PROCESSOR MATCHES "(x86_64|ppc64|ppc64p7|s390x|sparc64)") 
--  SET(LIB_SUBDIR "lib64")
--ENDIF()
-+IF(NOT LIB_SUBDIR)
-+	MESSAGE(ERROR "LIB_SUBDIR is not set")
-+ENDIF(NOT LIB_SUBDIR)
- 
- MESSAGE(STATUS "Installation library subdir: ${LIB_SUBDIR}")
- 
-diff -aurN a/cmake/FindMySQL.cmake b/cmake/FindMySQL.cmake
---- a/cmake/FindMySQL.cmake	2017-02-17 14:44:29.532733308 -0500
-+++ b/cmake/FindMySQL.cmake	2017-02-17 14:48:56.756740330 -0500
-@@ -270,8 +270,8 @@
-   set(_static_lib_ext ".lib")   # Careful, can be import library for DLL
- elseif(MYSQLCLIENT_NO_THREADS)
-   # In 5.1 and below there is a single threaded library
--  set(_dynamic_libs   "mysqlclient")
--  set(_static_libs    "libmysqlclient.a")
-+  set(_dynamic_libs   "${MYSQLCLIENT_LIB_NAME}")
-+  set(_static_libs    "lib${MYSQLCLIENT_LIB_NAME}.a")
-   set(_static_lib_ext ".a")
- else()
-   # We try the multithreaded "libmysqlclient_r" first and if not
diff --git a/dev-db/myodbc/files/5.3-mariadb-buffer_length.patch b/dev-db/myodbc/files/5.3-mariadb-buffer_length.patch
deleted file mode 100644
index 1be9cc466b65..000000000000
--- a/dev-db/myodbc/files/5.3-mariadb-buffer_length.patch
+++ /dev/null
@@ -1,93 +0,0 @@
-diff -aurN a/driver/connect.c b/driver/connect.c
---- a/driver/connect.c	2016-11-29 07:40:13.000000000 -0500
-+++ b/driver/connect.c	2017-02-17 16:14:48.116640371 -0500
-@@ -510,11 +510,11 @@
-     }
-   }
- 
--#if MYSQL_VERSION_ID >= 50709
--  mysql_get_option(mysql, MYSQL_OPT_NET_BUFFER_LENGTH, &dbc->net_buffer_length);
-+#if MYSQL_VERSION_ID >= 50709 && !defined(MARIADB_BASE_VERSION)
-+  mysql_get_option(mysql, MYSQL_OPT_NET_BUFFER_LENGTH, &dbc->net_buffer_length_value);
- #else
-   // for older versions just use net_buffer_length() macro
--  dbc->net_buffer_length = net_buffer_length;
-+  dbc->net_buffer_length_value = net_buffer_length;
- #endif
-   return rc;
- 
-diff -aurN a/driver/cursor.c b/driver/cursor.c
---- a/driver/cursor.c	2016-11-29 07:40:13.000000000 -0500
-+++ b/driver/cursor.c	2017-02-17 16:13:19.163299885 -0500
-@@ -1485,7 +1485,7 @@
-               We have a limited capacity to shove data across the wire, but
-               we handle this by sending in multiple calls to exec_stmt_query()
-             */
--            if (ext_query->length + length >= (SQLULEN) stmt->dbc->net_buffer_length)
-+            if (ext_query->length + length >= (SQLULEN) stmt->dbc->net_buffer_length_value)
-             {
-                 break_insert= TRUE;
-                 break;
-diff -aurN a/driver/driver.h b/driver/driver.h
---- a/driver/driver.h	2016-11-29 07:40:13.000000000 -0500
-+++ b/driver/driver.h	2017-02-17 16:10:57.072950723 -0500
-@@ -378,7 +378,7 @@
-   int           txn_isolation;
-   uint          port;
-   uint          cursor_count;
--  ulong         net_buffer_length;
-+  ulong         net_buffer_length_value;
-   uint          commit_flag;
- #ifdef THREAD
-   myodbc_mutex_t lock;
-diff -aurN a/driver/info.c b/driver/info.c
---- a/driver/info.c	2016-11-29 07:40:13.000000000 -0500
-+++ b/driver/info.c	2017-02-17 16:12:54.315763441 -0500
-@@ -587,7 +587,7 @@
-     MYINFO_SET_USHORT(0);
- 
-   case SQL_MAX_STATEMENT_LEN:
--    MYINFO_SET_ULONG(dbc->net_buffer_length);
-+    MYINFO_SET_ULONG(dbc->net_buffer_length_value);
- 
-   case SQL_MAX_TABLE_NAME_LEN:
-     MYINFO_SET_USHORT(NAME_LEN);
-diff -aurN a/driver/connect.c b/driver/connect.c
---- a/driver/connect.c	2017-02-17 16:16:14.609026769 -0500
-+++ b/driver/connect.c	2017-02-17 16:34:29.637592664 -0500
-@@ -179,7 +179,7 @@
-   /* Set other connection options */
- 
-   if (ds->allow_big_results || ds->safe)
--#if MYSQL_VERSION_ID >= 50709
-+#if MYSQL_VERSION_ID >= 50709 && !defined(MARIADB_BASE_VERSION)
-     mysql_options(mysql, MYSQL_OPT_MAX_ALLOWED_PACKET, &max_long);
- #else
-     /* max_allowed_packet is a magical mysql macro. */
-@@ -252,7 +252,7 @@
-                   ds_get_utf8attr(ds->rsakey, &ds->rsakey8));
-   }
- 
--#if MYSQL_VERSION_ID >= 50710
-+#if MYSQL_VERSION_ID >= 50710 && !defined(MARIADB_BASE_VERSION)
-   {
-     char tls_options[128] = { 0 };
-     if (!ds->no_tls_1)
-@@ -323,7 +323,7 @@
- #endif
- 
-   mysql->options.use_ssl = !ds->disable_ssl_default;
--#if MYSQL_VERSION_ID >= 50703
-+#if MYSQL_VERSION_ID >= 50703 && !defined(MARIADB_BASE_VERSION)
-   {
-     if (ds->ssl_enforce)
-     {
-@@ -332,7 +332,7 @@
-   }
- #endif
- 
--#if MYSQL_VERSION_ID >= 50711
-+#if MYSQL_VERSION_ID >= 50711 && !defined(MARIADB_BASE_VERSION)
-   if (ds->sslmode)
-   {
-     unsigned int mode = 0;
diff --git a/dev-db/myodbc/files/5.3-mariadb-dynamic-array.patch b/dev-db/myodbc/files/5.3-mariadb-dynamic-array.patch
deleted file mode 100644
index 96720618a586..000000000000
--- a/dev-db/myodbc/files/5.3-mariadb-dynamic-array.patch
+++ /dev/null
@@ -1,96 +0,0 @@
-diff -aurN a/driver/catalog_no_i_s.c b/driver/catalog_no_i_s.c
---- a/driver/catalog_no_i_s.c	2016-11-29 07:40:13.000000000 -0500
-+++ b/driver/catalog_no_i_s.c	2017-02-17 14:07:03.979683613 -0500
-@@ -1093,7 +1093,11 @@
-   unsigned long *lengths;
-   SQLRETURN rc= SQL_SUCCESS;
- 
-+#if defined(MARIADB_BASE_VERSION) && MYSQL_VERSION_ID > 100001
-+  myodbc_init_dynamic_array(&records, sizeof(MY_FOREIGN_KEY_FIELD), 0, 0, MYF(0));
-+#else
-   myodbc_init_dynamic_array(&records, sizeof(MY_FOREIGN_KEY_FIELD), 0, 0);
-+#endif
- 
-   /* Get the list of tables that match szCatalog and szTable */
-   myodbc_mutex_lock(&stmt->dbc->lock);
-diff -aurN a/driver/desc.c b/driver/desc.c
---- a/driver/desc.c	2016-11-29 07:40:13.000000000 -0500
-+++ b/driver/desc.c	2017-02-17 14:09:30.139954232 -0500
-@@ -63,13 +63,21 @@
-      but in desc_get_rec we manually get a pointer to it. This avoids
-      having to call set_dynamic after modifying the DESCREC.
-   */
-+#if defined(MARIADB_BASE_VERSION) && MYSQL_VERSION_ID > 100001
-+  if (myodbc_init_dynamic_array(&desc->records, sizeof(DESCREC), 0, 0, MYF(0)))
-+#else
-   if (myodbc_init_dynamic_array(&desc->records, sizeof(DESCREC), 0, 0))
-+#endif
-   {
-     x_free((char *)desc);
-     return NULL;
-   }
- 
-+#if defined(MARIADB_BASE_VERSION) && MYSQL_VERSION_ID > 100001
-+  if (myodbc_init_dynamic_array(&desc->bookmark, sizeof(DESCREC), 0, 0, MYF(0)))
-+#else
-   if (myodbc_init_dynamic_array(&desc->bookmark, sizeof(DESCREC), 0, 0))
-+#endif
-   {
-     delete_dynamic(&desc->records);
-     x_free((char *)desc);
-@@ -997,7 +1005,11 @@
-   delete_dynamic(&dest->records);
-   if (myodbc_init_dynamic_array(&dest->records, sizeof(DESCREC),
-                             src->records.max_element,
-+#if defined(MARIADB_BASE_VERSION) && MYSQL_VERSION_ID > 100001
-+                            src->records.alloc_increment, MYF(0)))
-+#else
-                             src->records.alloc_increment))
-+#endif
-   {
-     return set_desc_error(dest, "HY001",
-               "Memory allocation error",
-diff -aurN a/driver/handle.c b/driver/handle.c
---- a/driver/handle.c	2016-11-29 07:40:13.000000000 -0500
-+++ b/driver/handle.c	2017-02-17 14:10:32.078797593 -0500
-@@ -409,7 +409,11 @@
-     }
-   }
- 
-+#if defined(MARIADB_BASE_VERSION) && MYSQL_VERSION_ID > 100001
-+  myodbc_init_dynamic_array(*param_bind, sizeof(MYSQL_BIND), elements, 10, MYF(0));
-+#else
-   myodbc_init_dynamic_array(*param_bind, sizeof(MYSQL_BIND), elements, 10);
-+#endif
-   memset((*param_bind)->buffer, 0, sizeof(MYSQL_BIND) *
- 											(*param_bind)->max_element);
- 
-diff -aurN a/driver/parse.c b/driver/parse.c
---- a/driver/parse.c	2016-11-29 07:40:13.000000000 -0500
-+++ b/driver/parse.c	2017-02-17 14:12:00.638143846 -0500
-@@ -139,8 +139,13 @@
- 
-     /* TODO: Store offsets rather than ptrs. In this case we will be fine
-        if work with copy of the originally parsed string */
-+#if defined(MARIADB_BASE_VERSION) && MYSQL_VERSION_ID > 100001
-+    myodbc_init_dynamic_array(&pq->token,     sizeof(uint), 20, 10, MYF(0));
-+    myodbc_init_dynamic_array(&pq->param_pos, sizeof(uint), 10, 10, MYF(0));
-+#else
-     myodbc_init_dynamic_array(&pq->token,     sizeof(uint), 20, 10);
-     myodbc_init_dynamic_array(&pq->param_pos, sizeof(uint), 10, 10);
-+#endif
-   }
- 
-   return pq;
-diff -aurN a/MYODBC_MYSQL.h b/MYODBC_MYSQL.h
---- a/MYODBC_MYSQL.h	2016-11-29 07:40:13.000000000 -0500
-+++ b/MYODBC_MYSQL.h	2017-02-17 15:04:47.153994839 -0500
-@@ -44,7 +44,7 @@
- #endif
- 
- #ifdef THREAD
--#if MYSQL_VERSION_ID < 50703
-+#if MYSQL_VERSION_ID < 50703 || defined(MARIADB_BASE_VERSION)
- #include <my_pthread.h>
- #define myodbc_mutex_t pthread_mutex_t
- #define myodbc_key_t pthread_key_t
diff --git a/dev-db/mysql/Manifest b/dev-db/mysql/Manifest
index b4abde808798..16478909a1c7 100644
--- a/dev-db/mysql/Manifest
+++ b/dev-db/mysql/Manifest
@@ -16,5 +16,5 @@ EBUILD mysql-5.5.60.ebuild 4381 BLAKE2B c48db634322354aeb487df4df4eff2a27b2e69d9
 EBUILD mysql-5.6.38.ebuild 6466 BLAKE2B c85ee0bd78a7b75a328a72120444277c9425886e06dc9134662669c73af4d1da45c6d49943f44fbe518379d0babd0590a3ae127f7552862aeb6eacbc18e6cd1c SHA512 e4272584a5de91df2b5f4fee2060e3ca3b5151472bc5e9d472004fdc213f0fc9527874958995bb039847f7f5da97047fc3e9b12f61cecdf03b9d3f65d707be78
 EBUILD mysql-5.6.39.ebuild 6520 BLAKE2B d21e873fb57b7b311e7c06d680963794f1b7eb63c118a90aba8d4d036b0449c109e7c50c58a7616bf0b6545225f505fa5a6bcbcb3c0b095ba7c09dc3d296cc63 SHA512 e3c0b406a9c738d0474428c3007888d70832cd61c5a1d1bfad9ff9842f54c67f9494ca81e9647621b68a7e8ccb40af2ecc7fec4118538e569aeb58fe797c54e5
 EBUILD mysql-5.6.40.ebuild 6526 BLAKE2B 08c92c74325dfab7d6106c3397129a5da95f52598185cf379985097f99e373cd9c0fbc0afa5a12643eb7212a10b63f1263eecb92556315943b59139d938cb7cb SHA512 2298baeeda2edf1d75e9a697e86428b81ded08fb58513942698e24ec4c8d16a295ed5abbc899faeb30bd5f3359f85bcde218c01020802727cf4816b7b447cd42
-EBUILD mysql-5.7.22.ebuild 26986 BLAKE2B 8c071c62a8b72a1d8bec13da7c0ee2fb2fa5d0130f471c183474c52d6257b5f0fe773984fbc8fa4cd73271b5319a1a231b343133c1f5d5eeaa68bb3225914bef SHA512 c96834420f28583be5efe283a5539d217d6d26fc8e81a460e90089911fd9c9908f6eddbf831a7fb6ae24dc6ccba557e5d200cc091489e495d36f725499c68f51
+EBUILD mysql-5.7.22.ebuild 27123 BLAKE2B 82491262adbf310360065d1d7a628f9a6e68eb324461469a6b9978feb22c6c52025f7c318a5e0825fa2a74527199346c1af17ba90f51e26cef53d07b69c69461 SHA512 58ad4316696e0d94029622ce0be5e6821255384ff514b12b222a15f787bf720ea685a7514968968ee5691f6d88b15486cbcbf88c5f52d8ace01eaf737744a0e1
 MISC metadata.xml 1916 BLAKE2B da2c681ac07c234aa7ecc6f52a1ed63bf49241f7cb270733d0acf523ae5c420bb8f91628bf8510f9365b137ddd63224fd9da6a00df976832947ce043da49a602 SHA512 eac8cb1f76264b46137794c7c47907579af51ac9184aba324f3951135f60dc58c642efdd0a7a3e5c438322f8de4066425ec306d0924472853413be2fd19cbaf9
diff --git a/dev-db/mysql/mysql-5.7.22.ebuild b/dev-db/mysql/mysql-5.7.22.ebuild
index 8ff8a60d64c5..58394d6071fd 100644
--- a/dev-db/mysql/mysql-5.7.22.ebuild
+++ b/dev-db/mysql/mysql-5.7.22.ebuild
@@ -566,10 +566,10 @@ src_test() {
 }
 
 mysql_init_vars() {
-	MY_SHAREDSTATEDIR=${MY_SHAREDSTATEDIR="${EPREFIX}/usr/share/mysql"}
-	MY_SYSCONFDIR=${MY_SYSCONFDIR="${EPREFIX}/etc/mysql"}
-	MY_LOCALSTATEDIR=${MY_LOCALSTATEDIR="${EPREFIX}/var/lib/mysql"}
-	MY_LOGDIR=${MY_LOGDIR="${EPREFIX}/var/log/mysql"}
+	MY_SHAREDSTATEDIR=${MY_SHAREDSTATEDIR="${EPREFIX%/}/usr/share/mysql"}
+	MY_SYSCONFDIR=${MY_SYSCONFDIR="${EPREFIX%/}/etc/mysql"}
+	MY_LOCALSTATEDIR=${MY_LOCALSTATEDIR="${EPREFIX%/}/var/lib/mysql"}
+	MY_LOGDIR=${MY_LOGDIR="${EPREFIX%/}/var/log/mysql"}
 
 	if [[ -z "${MY_DATADIR}" ]] ; then
 		MY_DATADIR=""
@@ -623,7 +623,7 @@ mysql_init_vars() {
 
 pkg_config() {
 	_getoptval() {
-		local mypd="${EROOT}"/usr/bin/my_print_defaults
+		local mypd="${EROOT%/}"/usr/bin/my_print_defaults
 		local section="$1"
 		local flag="--${2}="
 		local extra_options="${3}"
@@ -632,20 +632,20 @@ pkg_config() {
 	local old_MY_DATADIR="${MY_DATADIR}"
 	local old_HOME="${HOME}"
 	# my_print_defaults needs to read stuff in $HOME/.my.cnf
-	export HOME=${EPREFIX}/root
+	export HOME=${EPREFIX%/}/root
 
 	# Make sure the vars are correctly initialized
 	mysql_init_vars
 
 	[[ -z "${MY_DATADIR}" ]] && die "Sorry, unable to find MY_DATADIR"
-	if [[ ! -x "${EROOT}/usr/sbin/mysqld" ]] ; then
+	if [[ ! -x "${EROOT%/}/usr/sbin/mysqld" ]] ; then
 		die "Minimal builds do NOT include the MySQL server"
 	fi
 
 	if [[ ( -n "${MY_DATADIR}" ) && ( "${MY_DATADIR}" != "${old_MY_DATADIR}" ) ]]; then
-		local MY_DATADIR_s="${ROOT}/${MY_DATADIR}"
+		local MY_DATADIR_s="${ROOT%/}/${MY_DATADIR}"
 		MY_DATADIR_s="${MY_DATADIR_s%%/}"
-		local old_MY_DATADIR_s="${ROOT}/${old_MY_DATADIR}"
+		local old_MY_DATADIR_s="${ROOT%/}/${old_MY_DATADIR}"
 		old_MY_DATADIR_s="${old_MY_DATADIR_s%%/}"
 
 		if [[ ( -d "${old_MY_DATADIR_s}" ) && ( "${old_MY_DATADIR_s}" != / ) ]]; then
@@ -704,22 +704,22 @@ pkg_config() {
 	MYSQL_LOG_BIN="$(_getoptval mysqld log-bin)"
 	MYSQL_LOG_BIN=${MYSQL_LOG_BIN%/*}
 
-	if [[ ! -d "${ROOT}/$MYSQL_TMPDIR" ]]; then
+	if [[ ! -d "${EROOT%/}/$MYSQL_TMPDIR" ]]; then
 		einfo "Creating MySQL tmpdir $MYSQL_TMPDIR"
-		install -d -m 770 -o mysql -g mysql "${EROOT}/$MYSQL_TMPDIR"
+		install -d -m 770 -o mysql -g mysql "${EROOT%/}/$MYSQL_TMPDIR"
 	fi
-	if [[ ! -d "${ROOT}/$MYSQL_LOG_BIN" ]]; then
+	if [[ ! -d "${EROOT%/}/$MYSQL_LOG_BIN" ]]; then
 		einfo "Creating MySQL log-bin directory $MYSQL_LOG_BIN"
-		install -d -m 770 -o mysql -g mysql "${EROOT}/$MYSQL_LOG_BIN"
+		install -d -m 770 -o mysql -g mysql "${EROOT%/}/$MYSQL_LOG_BIN"
 	fi
-	if [[ ! -d "${EROOT}/$MYSQL_RELAY_LOG" ]]; then
+	if [[ ! -d "${EROOT%/}/$MYSQL_RELAY_LOG" ]]; then
 		einfo "Creating MySQL relay-log directory $MYSQL_RELAY_LOG"
-		install -d -m 770 -o mysql -g mysql "${EROOT}/$MYSQL_RELAY_LOG"
+		install -d -m 770 -o mysql -g mysql "${EROOT%/}/$MYSQL_RELAY_LOG"
 	fi
 
-	if [[ -d "${ROOT}/${MY_DATADIR}/mysql" ]] ; then
+	if [[ -d "${ROOT%/}/${MY_DATADIR}/mysql" ]] ; then
 		ewarn "You have already a MySQL database in place."
-		ewarn "(${ROOT}/${MY_DATADIR}/*)"
+		ewarn "(${ROOT%/}/${MY_DATADIR}/*)"
 		ewarn "Please rename or delete it if you wish to replace it."
 		die "MySQL database already exists!"
 	fi
@@ -753,9 +753,9 @@ pkg_config() {
 	use prefix && options="${options} '--defaults-file=${MY_SYSCONFDIR}/my.cnf'"
 
 	# Figure out which options we need to disable to do the setup
-	local helpfile="${TMPDIR}/mysqld-help"
-	"${EROOT}/usr/sbin/mysqld" --verbose --help >"${helpfile}" 2>/dev/null
-	for opt in grant-tables host-cache name-resolve networking slave-start \
+	local helpfile="${TMPDIR%/}/mysqld-help"
+	"${EROOT%/}/usr/sbin/mysqld" --verbose --help >"${helpfile}" 2>/dev/null
+	for opt in host-cache name-resolve networking slave-start \
 		federated ssl log-bin relay-log slow-query-log external-locking \
 		log-slave-updates \
 		; do
@@ -766,7 +766,7 @@ pkg_config() {
 	einfo "Creating the mysql database and setting proper permissions on it ..."
 
 	# Now that /var/run is a tmpfs mount point, we need to ensure it exists before using it
-	PID_DIR="${EROOT}/var/run/mysqld"
+	PID_DIR="${EROOT%/}/var/run/mysqld"
 	if [[ ! -d "${PID_DIR}" ]]; then
 		install -d -m 755 -o mysql -g mysql "${PID_DIR}" || die "Could not create pid directory"
 	fi
@@ -779,33 +779,35 @@ pkg_config() {
 
 	# Filling timezones, see
 	# http://dev.mysql.com/doc/mysql/en/time-zone-support.html
-	"${EROOT}/usr/bin/mysql_tzinfo_to_sql" "${EROOT}/usr/share/zoneinfo" > "${sqltmp}" 2>/dev/null
+	echo "USE mysql;" >"${sqltmp}"
+	"${EROOT%/}/usr/bin/mysql_tzinfo_to_sql" "${EROOT%/}/usr/share/zoneinfo" >> "${sqltmp}" 2>/dev/null
+	chown mysql "${sqltmp}" || die
 
 	# --initialize-insecure will not set root password
 	# --initialize would set a random one in the log which we don't need as we set it ourselves
-	local cmd=( "${EROOT}usr/sbin/mysqld" "--initialize-insecure" "--init-file='${sqltmp}'" )
-	cmd+=( "--basedir=${EPREFIX}/usr" ${options} "--datadir=${ROOT}/${MY_DATADIR}" "--tmpdir=${ROOT}/${MYSQL_TMPDIR}" )
+	local cmd=( "${EROOT%/}/usr/sbin/mysqld" "--initialize-insecure" "--init-file='${sqltmp}'" )
+	cmd+=( "--basedir=${EPREFIX%/}/usr" ${options} "--datadir=${ROOT%/}${MY_DATADIR}" "--tmpdir=${ROOT%/}${MYSQL_TMPDIR}" )
 	einfo "Command: ${cmd[*]}"
 	su -s /bin/sh -c "${cmd[*]}" mysql \
-		>"${TMPDIR}"/mysql_install_db.log 2>&1
+		>"${TMPDIR%/}"/mysql_install_db.log 2>&1
 	if [ $? -ne 0 ]; then
-		grep -B5 -A999 -i "ERROR" "${TMPDIR}"/mysql_install_db.log 1>&2
-		die "Failed to initialize mysqld. Please review ${EPREFIX}/var/log/mysql/mysqld.err AND ${TMPDIR}/mysql_install_db.log"
+		grep -B5 -A999 -i "ERROR" "${TMPDIR%/}"/mysql_install_db.log 1>&2
+		die "Failed to initialize mysqld. Please review ${EPREFIX%/}/var/log/mysql/mysqld.err AND ${TMPDIR%/}/mysql_install_db.log"
 	fi
 	popd &>/dev/null || die
-	[[ -f "${ROOT}/${MY_DATADIR}/mysql/user.frm" ]] \
+	[[ -f "${ROOT%/}/${MY_DATADIR}/mysql/user.frm" ]] \
 	|| die "MySQL databases not installed"
 
 	use prefix || options="${options} --user=mysql"
 
-	local socket="${EROOT}/var/run/mysqld/mysqld${RANDOM}.sock"
-	local pidfile="${EROOT}/var/run/mysqld/mysqld${RANDOM}.pid"
-	local mysqld="${EROOT}/usr/sbin/mysqld \
+	local socket="${EROOT%/}/var/run/mysqld/mysqld${RANDOM}.sock"
+	local pidfile="${EROOT%/}/var/run/mysqld/mysqld${RANDOM}.pid"
+	local mysqld="${EROOT%/}/usr/sbin/mysqld \
 		${options} \
 		$(use prefix || echo --user=mysql) \
 		--log-warnings=0 \
-		--basedir=${EROOT}/usr \
-		--datadir=${ROOT}/${MY_DATADIR} \
+		--basedir=${EROOT%/}/usr \
+		--datadir=${ROOT%/}/${MY_DATADIR} \
 		--max_allowed_packet=8M \
 		--net_buffer_length=16K \
 		--socket=${socket} \
@@ -829,8 +831,9 @@ pkg_config() {
 
 	ebegin "Setting root password"
 	# Do this from memory, as we don't want clear text passwords in temp files
-	local sql="UPDATE mysql.user SET Password = PASSWORD('${MYSQL_ROOT_PASSWORD}') WHERE USER='root'; FLUSH PRIVILEGES"
-	"${EROOT}/usr/bin/mysql" \
+	local sql="ALTER USER 'root'@'localhost' IDENTIFIED WITH mysql_native_password BY '${MYSQL_ROOT_PASSWORD}'"
+	"${EROOT%/}/usr/bin/mysql" \
+		--no-defaults \
 		"--socket=${socket}" \
 		-hlocalhost \
 		-e "${sql}"
diff --git a/dev-db/pgadmin4/Manifest b/dev-db/pgadmin4/Manifest
index 8a3ea21756cb..b0cd89cd1dd7 100644
--- a/dev-db/pgadmin4/Manifest
+++ b/dev-db/pgadmin4/Manifest
@@ -1,5 +1,7 @@
 DIST pgadmin4-2.0.tar.gz 24988176 BLAKE2B 96e942d5001b1d590fb1b642933c665a13bca5429d3a3e74eefe4a8090c76515cc08b656ebfea3a170b4fa6077d7086fbffdd5fddfcb517be08fd4ecc20052ab SHA512 463e95a341dec74ac0a08a647af1cbe83b514b0595b8469ab9c7b5335e24604e082b906d530aa735fef7b08c58d8a8a6df3edf5dc65402f6521165f1cbb72f67
 DIST pgadmin4-2.1.tar.gz 27842212 BLAKE2B 26c12dff8e2e5e37dd2911f6eb582a0f706d73490c8d93e83b07b7537fc201547d095d4f34181d2502bbc29b2741614adabf876b7e6ea3ef5f555eab94caa240 SHA512 02bc122ae53db595a1fd395e634fc4d0891f024a2e5e341c81b306a8c1d07bc18e5673cda440c7ba56754be4902ae4441010db0140132352e12b8986c8c0f47c
+DIST pgadmin4-3.0.tar.gz 28915010 BLAKE2B 7e6dccd91f082f7b5514f5d3abdf4653a9961b4efc706e10ce58d817785d514508233e25068762fe0e4bca4c1a3cf10a2515afa38e6f9ba3c99b4af3fa32f3d2 SHA512 5921340176e6748ef13112d906061f195d4bb2f73917d762371bbaeb44ef66cf8e0edcd1cd241eb78dae46ed0b3af014c749468a930fb0c0983b38b2c54dfc3a
 EBUILD pgadmin4-2.0-r1.ebuild 3428 BLAKE2B f113a801d23cc94c8b3f56c52489e0d7725d3337f46dd24515ccb9a74e4c9320c1c508fc49410b27a53caf356c7d9b82bf98f1f0df8ac0618b89e9e9eaa05d02 SHA512 41c09ba0a15af4ce615deb72f9e944ddbf89515900c02a026f9ee4c42e21c2e409f2940842343441067864fad0d735db1e1993d5770a66501afa045879c14d64
 EBUILD pgadmin4-2.1.ebuild 3432 BLAKE2B 150010a6b6abbd2dae6a362883a24c1b2a13a62301489ef4a6073801de25e7c6b9792beb542306393c8fe1b598dcb2125bef88e03020de0a61688edb76a78578 SHA512 493c026a3bc156a92f5253ac96aa30891d8c644463196ab603daed5cfa9536fdb99e786dd07cfaafa31b1eb782040e6711d9e8a541211aa905e57227309843fa
+EBUILD pgadmin4-3.0.ebuild 3480 BLAKE2B 7f46411f73af5af0e32047943ff6fc384615614bdbf2d80c289b4ee4cc4ad9854a0d827c710fca89c5394f1857883b4af13914ffb2c316ff0b8b741d10f3e38e SHA512 9d82b57a2d3a24d317838d9806c38aa9c6c09b4d35b6bca16275f6fc971fa2c2f6ea2f73eff0fc9db68d5a670865a70a338fe9293ffa87326ef6408654e2143f
 MISC metadata.xml 266 BLAKE2B 9d5988ab45f9939f9be5ee7f4b7a9950a3d62252aa0d3e6c953265467428c59fb8c05b2bb72085431b7aa9fc18d31f2b3273e8fdb33443d786b2237db697b7e2 SHA512 9f85990c7ce6a1de5c1067e4781af18bede2d3bd02963a7b2927766b70dbe98d3fb63bb01e19b1cf6e2b77038d9788bf38155b3cc33f9e5ff8430b10a4006325
diff --git a/dev-db/pgadmin4/pgadmin4-3.0.ebuild b/dev-db/pgadmin4/pgadmin4-3.0.ebuild
new file mode 100644
index 000000000000..6b633695be96
--- /dev/null
+++ b/dev-db/pgadmin4/pgadmin4-3.0.ebuild
@@ -0,0 +1,123 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+PYTHON_COMPAT=( python3_{4,5} )
+PYTHON_REQ_USE="sqlite"
+
+inherit python-single-r1 qmake-utils
+
+DESCRIPTION="GUI administration and development platform for PostgreSQL"
+HOMEPAGE="http://www.pgadmin.org/"
+SRC_URI="mirror://postgresql/pgadmin/${PN}/v${PV}/source/${P}.tar.gz"
+
+LICENSE="POSTGRESQL"
+KEYWORDS="~amd64 ~x86"
+SLOT="0"
+IUSE="doc"
+
+RESTRICT="test"
+
+REQUIRED_USE="${PYTHON_REQUIRED_USE}"
+
+COMMON_DEPEND="${PYTHON_DEPS}
+	dev-qt/qtwidgets:5
+	dev-qt/qtwebkit:5
+	dev-qt/qtwebengine:5[widgets]
+"
+
+DEPEND="${COMMON_DEPEND}
+	doc? ( dev-python/sphinx[${PYTHON_USEDEP}] )
+"
+
+RDEPEND="${COMMON_DEPEND}
+	>=app-text/htmlmin-0.1.12[${PYTHON_USEDEP}]
+	>=dev-python/Babel-2.3.4[${PYTHON_USEDEP}]
+	>=dev-python/beautifulsoup-4.4.1[${PYTHON_USEDEP}]
+	>=dev-python/blinker-1.4[${PYTHON_USEDEP}]
+	>=dev-python/click-6.6[${PYTHON_USEDEP}]
+	>=dev-python/extras-1.0.0[${PYTHON_USEDEP}]
+	>=dev-python/fixtures-3.0.0[${PYTHON_USEDEP}]
+	>=dev-python/flask-0.12.2[${PYTHON_USEDEP}]
+	>=dev-python/flask-babel-0.11.1[${PYTHON_USEDEP}]
+	>=dev-python/flask-babelex-0.9.3[${PYTHON_USEDEP}]
+	>=dev-python/flask-gravatar-0.5.0[${PYTHON_USEDEP}]
+	>=dev-python/flask-htmlmin-1.3.2[${PYTHON_USEDEP}]
+	>=dev-python/flask-login-0.3.2[${PYTHON_USEDEP}]
+	>=dev-python/flask-mail-0.9.1[${PYTHON_USEDEP}]
+	>=dev-python/flask-migrate-2.1.1[${PYTHON_USEDEP}]
+	>=dev-python/flask-paranoid-0.2.0[${PYTHON_USEDEP}]
+	>=dev-python/flask-principal-0.4.0[${PYTHON_USEDEP}]
+	>=dev-python/flask-security-3.0.0[${PYTHON_USEDEP}]
+	>=dev-python/flask-sqlalchemy-2.3.2[${PYTHON_USEDEP}]
+	>=dev-python/flask-wtf-0.14.2[${PYTHON_USEDEP}]
+	>=dev-python/html5lib-1.0.1[${PYTHON_USEDEP}]
+	>=dev-python/itsdangerous-0.24[${PYTHON_USEDEP}]
+	>=dev-python/jinja-2.7.3[${PYTHON_USEDEP}]
+	>=dev-python/linecache2-1.0.0[${PYTHON_USEDEP}]
+	>=dev-python/markupsafe-0.23[${PYTHON_USEDEP}]
+	>=dev-python/mimeparse-1.6.0[${PYTHON_USEDEP}]
+	>=dev-python/passlib-1.7.1[${PYTHON_USEDEP}]
+	>=dev-python/pbr-3.1.1[${PYTHON_USEDEP}]
+	>=dev-python/psycopg-2.7.4[${PYTHON_USEDEP}]
+	>=dev-python/pycrypto-2.6.1[${PYTHON_USEDEP}]
+	>=dev-python/pyrsistent-0.14.2[${PYTHON_USEDEP}]
+	>=dev-python/python-dateutil-2.7.1[${PYTHON_USEDEP}]
+	>=dev-python/python-sqlparse-0.2.4[${PYTHON_USEDEP}]
+	>=dev-python/pytz-2018.3[${PYTHON_USEDEP}]
+	>=dev-python/simplejson-3.13.2[${PYTHON_USEDEP}]
+	>=dev-python/six-1.11.0[${PYTHON_USEDEP}]
+	>=dev-python/speaklater-1.3[${PYTHON_USEDEP}]
+	>=dev-python/sqlalchemy-1.2.5[${PYTHON_USEDEP}]
+	>=dev-python/werkzeug-0.9.6[${PYTHON_USEDEP}]
+	>=dev-python/wtforms-2.1[${PYTHON_USEDEP}]
+"
+
+S="${WORKDIR}"/${P}/runtime
+
+src_prepare() {
+	cd "${WORKDIR}"/${P} || die
+	default
+}
+
+src_configure() {
+	eqmake5
+}
+
+src_compile() {
+	default
+	if use doc; then
+		cd "${WORKDIR}"/${P} || die
+		emake docs
+	fi
+}
+
+src_install() {
+	dobin pgAdmin4
+
+	cd "${WORKDIR}"/${P} || die
+
+	local APP_DIR=/usr/share/${PN}/web
+	insinto "${APP_DIR}"
+	doins -r web/*
+	cat > "${D}${APP_DIR}"/config_local.py <<-EOF
+		SERVER_MODE = False
+		UPGRADE_CHECK_ENABLED = False
+	EOF
+	python_optimize "${D}${APP_DIR}"
+
+	local CONFIG_DIR="/etc/xdg/pgadmin"
+	dodir "${CONFIG_DIR}"
+	cat > "${D}${CONFIG_DIR}"/pgadmin4.conf <<-EOF
+		[General]
+		ApplicationPath=${APP_DIR}
+		PythonPath=$(python_get_sitedir)
+	EOF
+
+	if use doc; then
+		rm -r docs/en_US/_build/html/_sources || die
+		insinto /usr/share/${PN}/docs/en_US/_build
+		doins -r docs/en_US/_build/html
+	fi
+}
diff --git a/dev-db/postgresql/Manifest b/dev-db/postgresql/Manifest
index 7653a9a9577f..5155c5bbe2d5 100644
--- a/dev-db/postgresql/Manifest
+++ b/dev-db/postgresql/Manifest
@@ -1,14 +1,11 @@
 AUX postgresql-10.2-no-server.patch 3317 BLAKE2B 133a9e80c4ad82f8b121d8f2e9907fbc5a94f791f0972e604b1c54aa2bfb71b18e246ac8e65f7b917cbdb19222c78273d3e5ed96a7569bfd796045c4dac9f610 SHA512 6a9f6dbbece2364cbae200cca5c468ae99b78815ee3af6e90d8f637cb75b5755971b0582cedfb6569c0dc79cb6701a29712e3c99feb814fe7575a31e194e9b7a
 AUX postgresql-10beta2-no-server.patch 3586 BLAKE2B 6d4472d389fd7b36a59c978b37b64535b715ee8d2e9c24b762849e0e6fcb351b03ff6e5a8316bbc4e9ff77b25d9a4dcef74b10c25e520cd0b86392921debcaf8 SHA512 d4be4ed02c62586aa8d2c3452eb4b804783e73d8200d484052bf82bf1b15c503a3328b19792a270912ed7ccc5c63c1f055946e32421547c95f47f1264eb085ee
-AUX postgresql-9.2-no-server.patch 4219 BLAKE2B ed7b3794e09d59b78640602a29e9ca8fb3727c0b0b567bf23d900d2a7e2c0736d7a0fc491b8674d724eb01231caf5922d21a69d1c1e63125562ca0bcd576756a SHA512 e657389bd8d34ce3a5daa7f8432158758ee7a05e5a149e5257c88366dbc1b4f571a312f2934cf29ea8e5069ecf9726c9bf0fa5c908ba3e3e850d906d66d5b4a9
 AUX postgresql-9.3-no-server.patch 4293 BLAKE2B 3224f3a7a82529ba710ff31ed02418f91cd394cee50c8cad10dbe6aff3260c08bd5958f91812fe16ea4820238bdd1cc4898b36f1dde09a2e54b6e3e94f2c6bfb SHA512 20117afa5a6999c6ae7f2b9adbdcfd2394a56c61d9c5d8c7ab2554a8de869d3aeaa4230a7dc4322fe585591277eb6ae47a594a7e605b811ed2c089d91cad6d4c
 AUX postgresql-9.4.10-no-server.patch 4356 BLAKE2B 97ca2424a854ac0efd2b5947e0efe183dd2b0171db07be92e4389b639fac707c3cba2957469996481e5d4ad5cac4fa686a193efc774e14ec0ad8f897713a5a19 SHA512 1abfb624b01b925a834c1c4f292246fd676cb7f2241a4e26bf52ce9b8c4dc2e4beeb4eea326c44f758d45034d5f18370280a8b18114bffaba1841e9ddac45174
 AUX postgresql-9.5.5-no-server.patch 4498 BLAKE2B eb874ac58ddd3a9c0b6ed97cf6616c5a2480df4cf708fb77496ab5cc459da423eb77986cb99824cf24131918eb4844320cd9353a04d41f696471b4b3c2d59071 SHA512 c961c7f1935b064e402e6c73dc6b087cdbea23d8038ef5e5aa5e625f7f1e87bb8d5986b95bbf9ed7c1abc40eeb89cda3b7aa4571d4a75ad6dd6c6d847de77c7d
 AUX postgresql-9.6.3-no-server.patch 3555 BLAKE2B 905bdfe6b084d775755cc88f7f11262d6bd04df7b2eb9a8230aef0fbb079d0431c9335b5219f8867cf1ce3cf858c8c0e964208713876ebfe13ae6138f5d4f35a SHA512 c70a4df16d865ceff7474f1a1ccc72d4e82e73a09792edc787a7907aa419985495871d07830390982bc82c82723fe668fb42b0dd239973804532499f39696dfe
 AUX postgresql-check-db-dir 1013 BLAKE2B 2be45942d0442822113879708c11dfde267938b6e7118bd225f567ca9fdacb11082792eabcb40b8a39cd6017fdedb18100576fea0895dae2dcda83c2d51de34d SHA512 2f34ee0cb6a889500ccfca7621ada6ee1bb06dc146f3c556938152dd3d7c0312266bb4db5f4099838d93ade26e2b8866dfddb3576cb5a737431ea2befd0cec6f
-AUX postgresql.confd-9.2 2450 BLAKE2B 267c6c388533d597d90285497fece703a4a5db088811eedd1a9507d400e9a16041211baf4af1f16fefd74cb0b2b83db5f037939da17e73ef04ef313c5701fb90 SHA512 a4aae13cc0312707d77d3164da6f573c78360cf039bd81e8e0dccd19cedf701a227315aded0a412531217398426e357bffffcf9d374614bcb5bfa398c946bf0b
 AUX postgresql.confd-9.3 2477 BLAKE2B dbe2fea6befdcdfe4a8a65cb68d040996986553be78615115070f14cd966d517b36a09366a431c774df119501fb933caf056abe0c5131e3327484ef557db3d14 SHA512 c928364b2b8a555443db8c1ac2a7336cd5e32ac860f3238a0a791cfcdfdce941837d72dfa44f3f08704d528590f9f3bb479e25b7db9f32cdde76f216819baa9d
-AUX postgresql.init-9.2 4911 BLAKE2B 9e679849eb6422df72fabc0e0202e9353fdcbab5f1eb419f5ff49a3e3e05acac127d39a67c5ef66bd57679fc91e0790107dcf60b7da90f9173af11040525ae46 SHA512 bf51e7fbe02344f74a76c250c9804206ec7d3b988f99ad3476d00422ef2eea9c6ead7133a5adb9fb23aa7c0820f450ecab48f0c1a1a12a4e5ef5fe2bef48a0c0
 AUX postgresql.init-9.3-r1 4999 BLAKE2B 77e231e5ca62a8b845ee02b1f27f13e12ab2c7577d3385a533bf61f988e6209586b75d3ddbaef71f0141b3bdee458179dea77180008f751bd77d656adc2d44de SHA512 cd181bb6d3ed72f786cd21a5c0c012bac3847adcf9da2e0b78eb212c9515953b2f1a2006faf475bfaa9a8c91371bda34f558f83ae010daa7cd670923526e39a0
 AUX postgresql.service-9.2 1666 BLAKE2B d4b81415539db3d78e0f5908185f903b70966ce3a27feed9bdf80eb6a9065ca6bd4b49e4bb822c41548b7efa9de37656378c395a8bd00a7a3daaa52911a2f674 SHA512 8c64b59f1e80096382a7166e1e8f183a5b9cf14c75138c15a39de74b983bfbed2f41cf9b33b2c72c3b9c79130c10104836a3505c96cb18ac1be1297c0fce1af0
 AUX postgresql.service-9.6-r1 1477 BLAKE2B 2a652d5b2892f3a52f484fcc0b4f4dad09cf4b46c3739c3f805072040a26128cb2ad9a25d4a7c9f109a95696d739538d379af6bac53c656f5c41af45b6110de5 SHA512 9e2b04923f6ebec1424c0f276c58a6a0c4933f2de5e2a9776169227729afd06ce5284461be8b6ed70e5aaff2a68b9f96c6893d867d35761c9977f9847ccfe93d
diff --git a/dev-db/postgresql/files/postgresql-9.2-no-server.patch b/dev-db/postgresql/files/postgresql-9.2-no-server.patch
deleted file mode 100644
index a0c33efc63ae..000000000000
--- a/dev-db/postgresql/files/postgresql-9.2-no-server.patch
+++ /dev/null
@@ -1,143 +0,0 @@
-diff -Naur a/contrib/Makefile b/contrib/Makefile
---- a/contrib/Makefile	2012-05-10 18:35:09.000000000 -0400
-+++ b/contrib/Makefile	2012-05-20 09:33:47.892622992 -0400
-@@ -5,58 +5,10 @@
- include $(top_builddir)/src/Makefile.global
- 
- SUBDIRS = \
--		adminpack	\
--		auth_delay	\
--		auto_explain	\
--		btree_gin	\
--		btree_gist	\
--		chkpass		\
--		citext		\
--		cube		\
--		dblink		\
--		dict_int	\
--		dict_xsyn	\
--		dummy_seclabel	\
--		earthdistance	\
--		file_fdw	\
--		fuzzystrmatch	\
--		hstore		\
--		intagg		\
--		intarray	\
--		isn		\
--		lo		\
--		ltree		\
- 		oid2name	\
--		pageinspect	\
--		passwordcheck	\
--		pg_archivecleanup \
--		pg_buffercache	\
--		pg_freespacemap \
--		pg_standby	\
--		pg_stat_statements \
--		pg_test_fsync	\
--		pg_test_timing	\
--		pg_trgm		\
--		pg_upgrade	\
--		pg_upgrade_support \
- 		pgbench		\
--		pgcrypto	\
--		pgrowlocks	\
--		pgstattuple	\
--		seg		\
--		spi		\
--		tablefunc	\
--		tcn		\
--		test_parser	\
--		tsearch2	\
--		unaccent	\
- 		vacuumlo
- 
--ifeq ($(with_openssl),yes)
--SUBDIRS += sslinfo
--else
--ALWAYS_SUBDIRS += sslinfo
--endif
- 
- ifeq ($(with_ossp_uuid),yes)
- SUBDIRS += uuid-ossp
-diff -Naur a/src/backend/Makefile b/src/backend/Makefile
---- a/src/backend/Makefile	2012-05-10 18:35:09.000000000 -0400
-+++ b/src/backend/Makefile	2012-05-20 09:36:24.446654842 -0400
-@@ -45,7 +45,7 @@
- 
- ##########################################################################
- 
--all: submake-libpgport submake-schemapg postgres $(POSTGRES_IMP)
-+all: someheaders
- 
- ifneq ($(PORTNAME), cygwin)
- ifneq ($(PORTNAME), win32)
-@@ -114,7 +114,7 @@
- endif # aix
- 
- # Update the commonly used headers before building the subdirectories
--$(SUBDIRS:%=%-recursive): $(top_builddir)/src/include/parser/gram.h $(top_builddir)/src/include/catalog/schemapg.h $(top_builddir)/src/include/utils/fmgroids.h $(top_builddir)/src/include/utils/errcodes.h $(top_builddir)/src/include/utils/probes.h
-+someheaders $(SUBDIRS:%=%-recursive): $(top_builddir)/src/include/parser/gram.h $(top_builddir)/src/include/catalog/schemapg.h $(top_builddir)/src/include/utils/fmgroids.h $(top_builddir)/src/include/utils/errcodes.h $(top_builddir)/src/include/utils/probes.h
- 
- # run this unconditionally to avoid needing to know its dependencies here:
- submake-schemapg:
-@@ -207,23 +207,7 @@
- 
- ##########################################################################
- 
--install: all installdirs install-bin
--ifeq ($(PORTNAME), cygwin)
--ifeq ($(MAKE_DLL), true)
--	$(INSTALL_DATA) libpostgres.a '$(DESTDIR)$(libdir)/libpostgres.a'
--endif
--endif
--ifeq ($(PORTNAME), win32)
--ifeq ($(MAKE_DLL), true)
--	$(INSTALL_DATA) libpostgres.a '$(DESTDIR)$(libdir)/libpostgres.a'
--endif
--endif
--	$(MAKE) -C catalog install-data
--	$(MAKE) -C tsearch install-data
--	$(INSTALL_DATA) $(srcdir)/libpq/pg_hba.conf.sample '$(DESTDIR)$(datadir)/pg_hba.conf.sample'
--	$(INSTALL_DATA) $(srcdir)/libpq/pg_ident.conf.sample '$(DESTDIR)$(datadir)/pg_ident.conf.sample'
--	$(INSTALL_DATA) $(srcdir)/utils/misc/postgresql.conf.sample '$(DESTDIR)$(datadir)/postgresql.conf.sample'
--	$(INSTALL_DATA) $(srcdir)/access/transam/recovery.conf.sample '$(DESTDIR)$(datadir)/recovery.conf.sample'
-+install:
- 
- install-bin: postgres $(POSTGRES_IMP) installdirs
- 	$(INSTALL_PROGRAM) postgres$(X) '$(DESTDIR)$(bindir)/postgres$(X)'
-diff -Naur a/src/bin/Makefile b/src/bin/Makefile
---- a/src/bin/Makefile	2012-05-10 18:35:09.000000000 -0400
-+++ b/src/bin/Makefile	2012-05-20 09:41:18.489958216 -0400
-@@ -13,8 +13,7 @@
- top_builddir = ../..
- include $(top_builddir)/src/Makefile.global
- 
--SUBDIRS = initdb pg_ctl pg_dump \
--	psql scripts pg_config pg_controldata pg_resetxlog pg_basebackup
-+SUBDIRS = pg_dump psql scripts pg_config
- 
- ifeq ($(PORTNAME), win32)
- SUBDIRS += pgevent
-diff -Naur a/src/Makefile b/src/Makefile
---- a/src/Makefile	2012-05-10 18:35:09.000000000 -0400
-+++ b/src/Makefile	2012-05-20 09:40:13.532774840 -0400
-@@ -14,17 +14,11 @@
- 
- SUBDIRS = \
- 	port \
--	timezone \
- 	backend \
--	backend/utils/mb/conversion_procs \
--	backend/snowball \
- 	include \
- 	interfaces \
--	backend/replication/libpqwalreceiver \
- 	bin \
--	pl \
--	makefiles \
--	test/regress
-+	makefiles
- 
- # There are too many interdependencies between the subdirectories, so
- # don't attempt parallel make here.
diff --git a/dev-db/postgresql/files/postgresql.confd-9.2 b/dev-db/postgresql/files/postgresql.confd-9.2
deleted file mode 100644
index 7753eeae3a89..000000000000
--- a/dev-db/postgresql/files/postgresql.confd-9.2
+++ /dev/null
@@ -1,65 +0,0 @@
-# Directory that contains the unix socket. Created and controlled by
-# the related initscript. The directory created will be owned
-# root:postgres with mode 1775.
-#
-# /run/postgresql is the default directory.
-PG_SOCKET_DIRECTORY="/run/postgresql"
-
-# Which port and socket to bind PostgreSQL
-PGPORT="5432"
-
-# How long to wait for server to start in seconds
-START_TIMEOUT=10
-
-# NICE_QUIT ignores new connections and wait for clients to disconnect from
-# server before shutting down. NICE_TIMEOUT in seconds determines how long to
-# wait for this to succeed.
-NICE_TIMEOUT=60
-
-# Forecfully disconnect clients from server and shut down. This is performed
-# after NICE_QUIT. Terminated client connections have their open transactions
-# rolled back.
-# Set RUDE_QUIT to "NO" to disable. RUDE_TIMEOUT in seconds.
-RUDE_QUIT="YES"
-RUDE_TIMEOUT=30
-
-# If the server still fails to shutdown, you can force it to quit by setting
-# this to YES and a recover-run will execute on the next startup.
-# Set FORCE_QUIT to "YES" to enable. FORCE_TIMEOUT in seconds.
-FORCE_QUIT="NO"
-FORCE_TIMEOUT=2
-
-# Extra options to run postmaster with, e.g.:
-# -N is the maximal number of client connections
-# -B is the number of shared buffers and has to be at least 2x the value for -N
-# Please read the man-page to postmaster for more options. Many of these
-# options can be set directly in the configuration file.
-#PGOPTS="-N 512 -B 1024"
-
-# Pass extra environment variables. If you have to export environment variables
-# for the database process, this can be done here.
-# Don't forget to escape quotes.
-#PG_EXTRA_ENV="PGPASSFILE=\"/path/to/.pgpass\""
-
-##############################################################################
-#
-# The following values should not be arbitrarily changed.
-#
-# `emerge --config dev-db/postgresql:@SLOT@' uses these values to
-# determine where to create the data directory, where to place the
-# configuration files, and any additional options to pass to initdb.
-#
-# The initscript also uses these variables to inform PostgreSQL where to find
-# its data directory and configuration files.
-#
-##############################################################################
-
-# Location of configuration files
-PGDATA="/etc/postgresql-@SLOT@/"
-
-# Where the data directory is located/to be created
-DATA_DIR="/var/lib/postgresql/@SLOT@/data"
-
-# Additional options to pass to initdb.
-# See `man initdb' for available options.
-PG_INITDB_OPTS="--encoding=UTF8"
diff --git a/dev-db/postgresql/files/postgresql.init-9.2 b/dev-db/postgresql/files/postgresql.init-9.2
deleted file mode 100755
index b191ca29e97c..000000000000
--- a/dev-db/postgresql/files/postgresql.init-9.2
+++ /dev/null
@@ -1,152 +0,0 @@
-#!/sbin/openrc-run
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-extra_started_commands="reload promote"
-
-PG_CTL="/usr/@LIBDIR@/postgresql-@SLOT@/bin/pg_ctl"
-
-description="PostgreSQL @SLOT@ -- the world's most advanced open source database --
-${RC_SERVICE} is a wrapper around pg_ctl with additional administrative checks
-and convenience"
-
-get_config() {
-    [ -f "${PGDATA%/}/postgresql.conf" ] || return 1
-
-    eval echo $(sed -e 's:#.*::' "${PGDATA%/}/postgresql.conf" \
-        | awk '$1 == "'$1'" { print ($2 == "=" ? $3 : $2) }')
-}
-
-depend() {
-    use net
-    provide postgresql
-
-    if [ "$(get_config log_destination)" = "syslog" ]; then
-        use logger
-    fi
-}
-
-configured_port=$(get_config port)
-: ${configured_port:=${PGPORT}}
-
-checkconfig() {
-    # Check that DATA_DIR has been set
-    if [ -z "${DATA_DIR}" ] ; then
-        eerror "DATA_DIR not set"
-        eerror "HINT: Perhaps you need to update /etc/conf.d/postgresql-@SLOT@"
-        return 1
-    fi
-
-    # Check that DATA_DIR exists
-    if [ ! -d "${DATA_DIR}" ] ; then
-        eerror "Directory not found: ${DATA_DIR}"
-        eerror "HINT: Ensure that DATA_DIR points to the right path."
-        eerror "HINT: Or perhaps you need to create the database cluster:"
-        eerror "    emerge --config dev-db/postgresql:@SLOT@"
-        return 1
-    fi
-
-    # Check for the existence of PostgreSQL's config files, and set the
-    # proper mode and ownership.
-    # Only three files should be checked as potentially other files
-    # may be in PGDATA that should not be touched.
-    local file
-    for file in postgresql pg_hba pg_ident ; do
-        file="${PGDATA%/}/${file}.conf"
-        if [ -f "${file}" ] ; then
-            checkpath -f -m 0600 -o postgres:postgres "${file}"
-        else
-            eerror "${file} not found"
-            eerror "HINT: mv ${DATA_DIR%/}/*.conf ${PGDATA}"
-            return 1
-        fi
-    done
-
-    # Set the proper permission for the socket path and create it if
-    # it doesn't exist.
-    checkpath -d -m 1775 -o root:postgres "${PG_SOCKET_DIRECTORY}"
-    if [ -e "${PG_SOCKET_DIRECTORY%/}/.s.PGSQL.${configured_port}" ] ; then
-        eerror "Socket conflict."
-        eerror "A server is already listening on:"
-        eerror "    ${PG_SOCKET_DIRECTORY%/}/.s.PGSQL.${configured_port}"
-        eerror "HINT: Change PGPORT to listen on a different socket."
-        return 1
-    fi
-}
-
-start() {
-    checkconfig || return 1
-
-    ebegin "Starting PostgreSQL @SLOT@"
-
-    rm -f "${DATA_DIR%/}/postmaster.pid"
-
-    su - postgres -c \
-       "PGPORT=${configured_port} ${PG_EXTRA_ENV} ${PG_CTL} start \
-           -s -w -t ${START_TIMEOUT} -l ${DATA_DIR%/}/postmaster.log \
-           -D ${PGDATA} \
-           -o '--data-directory=${DATA_DIR} \
-               --unix-socket-directory=${PG_SOCKET_DIRECTORY} \
-               ${PGOPTS}'"
-
-    local retval=$?
-
-    if [ $retval -ne 0 ] ; then
-        eerror "Check the log for a possible explanation of the above error."
-        eerror "The log may be located at:"
-        eerror "    ${DATA_DIR%/}/postmaster.log"
-        eerror "Or wherever you configured PostgreSQL @SLOT@ to log."
-    fi
-
-    eend $retval
-}
-
-stop() {
-    local seconds=$(( ${NICE_TIMEOUT} + ${RUDE_TIMEOUT} + ${FORCE_TIMEOUT} ))
-    ebegin "Stopping PostgreSQL @SLOT@ (this can take up to ${seconds} seconds)"
-
-    su - postgres -c \
-       "${PG_CTL} stop -t ${NICE_TIMEOUT} -s -D ${DATA_DIR} -m smart"
-    local retval=$?
-
-    if [ "${RUDE_QUIT}" != "NO" -a ${retval} -ne 0 ] ; then
-        einfo "Previous attempt failed. Trying RUDE_QUIT."
-        su - postgres -c \
-           "${PG_CTL} stop -t ${RUDE_TIMEOUT} -s -D ${DATA_DIR} -m fast"
-        retval=$?
-    fi
-
-    if [ "${FORCE_QUIT}" = "YES" -a ${retval} -ne 0 ] ; then
-        einfo "Previous step failed. Trying FORCE_QUIT."
-        ewarn "A recover-run might be executed on next startup."
-        su - postgres -c \
-           "${PG_CTL} stop -t ${FORCE_TIMEOUT} -s -D ${DATA_DIR} -m immediate"
-        retval=$?
-    fi
-
-    eend ${retval}
-}
-
-status() {
-    ebegin "Checking PostgreSQL @SLOT@ status"
-    su - postgres -c "${PG_CTL} status -D ${DATA_DIR}"
-    eend $?
-}
-
-description_reload="Simply sends the postgres process a SIGHUP signal, causing
-           it to reread its configuration files (postgresql.conf, pg_hba.conf,
-           etc.). This allows changing of configuration-file options that do not
-           require a complete restart to take effect."
-reload() {
-    ebegin "Reloading PostgreSQL @SLOT@ configuration"
-    su - postgres -c "${PG_CTL} reload -s -D ${DATA_DIR}"
-    eend $?
-}
-
-description_promote="If the server is in standby, it is commanded to exit
-            recovery and begin read-write operations."
-promote() {
-    ebegin "Promoting PostgreSQL @SLOT@"
-    su - postgres -c "${PG_CTL} promote -s -D ${DATA_DIR}"
-    eend $?
-}