summaryrefslogtreecommitdiff
path: root/dev-db
diff options
context:
space:
mode:
authorV3n3RiX <venerix@redcorelinux.org>2018-01-13 06:19:51 +0000
committerV3n3RiX <venerix@redcorelinux.org>2018-01-13 06:19:51 +0000
commit8be70107efbb417f839292165ee39d07a062046f (patch)
tree013918887ec4a00f0cefdb4b4d1313cbc3054305 /dev-db
parent343a7272d559a21a0e0ed13cb743fabb2bfcc479 (diff)
gentoo resync : 13.01.2018
Diffstat (limited to 'dev-db')
-rw-r--r--dev-db/Manifest.gzbin22133 -> 22119 bytes
-rw-r--r--dev-db/mongodb/Manifest5
-rw-r--r--dev-db/mongodb/files/mongodb-3.6.1-fix-scons.patch32
-rw-r--r--dev-db/mongodb/mongodb-3.6.2.ebuild (renamed from dev-db/mongodb/mongodb-3.6.1.ebuild)1
-rw-r--r--dev-db/pgadmin4/Manifest2
-rw-r--r--dev-db/pgadmin4/pgadmin4-2.1.ebuild122
-rw-r--r--dev-db/pgpool2/Manifest18
-rw-r--r--dev-db/pgpool2/files/pgpool2-3.5.0-path-fix.patch184
-rw-r--r--dev-db/pgpool2/files/pgpool_run_paths-3.6.4.patch255
-rw-r--r--dev-db/pgpool2/pgpool2-3.5.2.ebuild101
-rw-r--r--dev-db/pgpool2/pgpool2-3.5.5.ebuild101
-rw-r--r--dev-db/pgpool2/pgpool2-3.6.1.ebuild99
-rw-r--r--dev-db/pgpool2/pgpool2-3.6.4.ebuild99
-rw-r--r--dev-db/pgpool2/pgpool2-3.6.5.ebuild98
-rw-r--r--dev-db/pgpool2/pgpool2-3.6.7.ebuild98
-rw-r--r--dev-db/pgpool2/pgpool2-3.7.1.ebuild (renamed from dev-db/pgpool2/pgpool2-3.6.6.ebuild)4
-rw-r--r--dev-db/pgtap/Manifest5
-rw-r--r--dev-db/pgtap/files/pgtap-pg_config_override.patch25
-rw-r--r--dev-db/pgtap/pgtap-0.93.0.ebuild52
-rw-r--r--dev-db/pgtap/pgtap-0.97.0.ebuild26
-rw-r--r--dev-db/pspg/Manifest2
-rw-r--r--dev-db/pspg/pspg-0.9.1.ebuild16
-rw-r--r--dev-db/psqlodbc/Manifest8
-rw-r--r--dev-db/psqlodbc/psqlodbc-09.06.0200.ebuild33
-rw-r--r--dev-db/psqlodbc/psqlodbc-09.06.0300.ebuild32
-rw-r--r--dev-db/psqlodbc/psqlodbc-10.01.0000.ebuild (renamed from dev-db/psqlodbc/psqlodbc-09.06.0310.ebuild)2
-rw-r--r--dev-db/sqldeveloper/Manifest8
27 files changed, 189 insertions, 1239 deletions
diff --git a/dev-db/Manifest.gz b/dev-db/Manifest.gz
index b7f4e34943ec..b0cca40e2146 100644
--- a/dev-db/Manifest.gz
+++ b/dev-db/Manifest.gz
Binary files differ
diff --git a/dev-db/mongodb/Manifest b/dev-db/mongodb/Manifest
index 15c17ff48982..6ff6405b9f04 100644
--- a/dev-db/mongodb/Manifest
+++ b/dev-db/mongodb/Manifest
@@ -7,6 +7,7 @@ AUX mongodb-3.2.4-boost-1.60.patch 3352 BLAKE2B c008120ace4dc5507fd0de68caf12a79
AUX mongodb-3.4.0-fix-scons.patch 1411 BLAKE2B 6e5975b70ec7f281ea2cd101b16ee2849762fa1dd8427522eb3b01cd1738e60ece013bf23d07c180c58af024aebd141ca7fdf80bc240701f48556da46d3787ab SHA512 2e29c91a22663259d2f5413fbb2652702bceb122899e50a8969fb82d74a64a78649e79b005e20e6640740c089b1cee19080890eb8d9344c2ce355a977146b770
AUX mongodb-3.4.6-sysmacros-include.patch 1419 BLAKE2B f07ab093f13ea2b9675538dc99e2e58f85019edffad05bbbf3032f85f8ef881020cc9bf25bc62ca13344e7b8b7dd3b04954c76974c512a41ea5a7a2045de2b34 SHA512 ab269ec003b74848f981021f5eb09e38216d75dd9d1b8a155068b2a335d9ec9d1f5f575028ae9b4b0d8745d15e464cb05b70aabc6c28c984115574c6747afc05
AUX mongodb-3.4.7-no-boost-check.patch 641 BLAKE2B 0dc3a426b28cd80d7b3361ff9c6747aff64dd27c1bc01a9717c2dd1c160b66f53feb72fd2ead385c220ebe92a8c7b8fa6b04fb3fa8437dba17d5f8346665f6b8 SHA512 812eaaadb6f265cfc904e8f3a7ae8276e42e3968529914179efab5e44f1951ab46ac3bbcfb259f924b20a8ca61d2ebcf72b7103ea9d5f25594ff8e9e3e85836b
+AUX mongodb-3.6.1-fix-scons.patch 1207 BLAKE2B 3c47d72eb940d67f40e4a12becb6de469255446b74aa5e0b2f27e8e0021e77f1af9cce12ae26ed0b05871e995e29d3da1eaee718997bc6de6e62838285946094 SHA512 70efb9309ff5a2415cec6ddca694c33ebaba29d5fb959ecc79907218205a10d4e7329fe48c8c8515bda83751061245d41f4fb11a5d8cd0c80c1db61217acb90e
AUX mongodb-3.6.1-no-compass.patch 2046 BLAKE2B e6b6977b69eb297c6a6340661f906e0206c2b68a1cebfd3c7ca01b27cc05562e0909531a2488159a54db32a05ec0cc4f81b4fe675db51bf3c30d66bc9d484c0b SHA512 5a7257a3670f40453c424ae2e6d2bbe0e3d1c795b57351c24a1b48ea4134146b08310d88a47cbb0c94a0a451a2c4a3c30fb10c44a1b9203681ee9cb5240db412
AUX mongodb.conf-r3 722 BLAKE2B c053bf101f5e3e38cc68f2bcbe7fb66ed9e55da9382d2412a497d68b478573390eddc5f284f76d56ca4792fe6241f6d1273a6585a98f96a1cb20530499a15904 SHA512 ef193bfed673477aa0e868114bd52be6675492c164f218c71ccd02c4a620b5c4799ea1d18df0c3f2b364027b9f25e60ac4475bb216b25e1dc10bfd00a9f5d45d
AUX mongodb.confd-r2 549 BLAKE2B b43518e43d9c2fe030887cde657fdc08cdd15349cf12cfa1f0f4f0a0db568ba2ae3e3cdec1d04953e62d87feaea6bae969be03bb2270ca31bd9ebbe5e9c79416 SHA512 75f11e8350e98b90eccafd577d794e4b05f36ede8d95e7839e9fa1eb77ea7bd9cdd2fdd07719abb78a714cd7d72109c177d265d6417ef198a4217453c0a4db68
@@ -27,7 +28,7 @@ DIST mongodb-src-r3.2.13.tar.gz 29273616 BLAKE2B 9fb9851953ef1561340bcb33cac6a2c
DIST mongodb-src-r3.2.16.tar.gz 29293555 BLAKE2B e2863ed0210bc66fcf2c80e28668674c254e78ee750a0eb84c45569c2224157f1db65aca5296a0ed0c32ef83ab6269de25bd69dbf1f0ef54b021bb0aecd2e46a SHA512 ba57aae430959f7df036b7e19e1b7d81956184bededd35631616c6e3dc9423dc79a50ab3265bc48b06d198a7043bca902aee2ea75954e38151ebead5b5ab2db2
DIST mongodb-src-r3.2.17.tar.gz 29295394 BLAKE2B 3fa9d8fa0b50b72c3b2aa86980dd4d46bd053f23d044e321d6f98f5edb76c566bf00455cf745110a8c39355843664d9d1fbbdf554fc8696de73db2b270446adc SHA512 0d6a01278bc61805afd164e4a29abe150a5a96d551ed2c7c5d385b269924a7c5f065315e4f19c0ab070aa275ac03447959af45f33826457e5db0c5f98e623512
DIST mongodb-src-r3.4.10.tar.gz 39959937 BLAKE2B f14f081525f694b939bc21f8cb6364c2a37573c0e1867322dd2062dc167b112751579c3e2d76730b3ff07b0c6bbfd36666bbea99162b7c10eef62d92eb1b0850 SHA512 6293dde40a8433477ba3b1cf77abbdb32b28ce58279cc616b488647c8ab71b5ab3eab2146058c4a74b9e00f0938f1415020e2f26ea01f2b29dd78a1a38d58c3a
-DIST mongodb-src-r3.6.1.tar.gz 39996730 BLAKE2B 4d05b5bec959ff6d87913aae7a30af1cdec5d22eaf7785ec7f49e3deb5d4d92db35f278c7cddf91ed8bd3750797c0461bb7bc188214c82cecf9d3b2e43fbf6aa SHA512 ad02fac423186da725493bf82a417cf5f68b08afe91c67f007b46324dfde3d6b4c51ed8eb1a314da73563be498b844f79be66a4f5d1fb83095df6c5458bd6d1f
+DIST mongodb-src-r3.6.2.tar.gz 39999539 BLAKE2B 3e38917ebaf79b63bf054279fbb91a648fe52e69d8194998dc74453ad6766688929a80456f6cb4801f2806ac938a5dfc0407e5f46345b47a80ecce0ba03d7fde SHA512 7acfbcc68c1bd4e6e63eee09be1dfbb064be6f8b0144418105100a065f8162cafc9b776fe0429fd64c79b958561aa42d0bdef56588dda65acee27ccc98631f39
EBUILD mongodb-3.0.14.ebuild 4559 BLAKE2B e72ff73baaa3b6a5bb4bbb33f3153d2aeaa9458b6e7f48419f5fd0f9b7fe43dfbcd93bf0824555e688faa461839a8c3cb5e4d1a24219a395f1a245828d639777 SHA512 747424cae955229f6affd867961171d9ad3fe9c34553ddb94e034db76d4e389ba0c6dc47db23c291212b893b7377d1bfac52e79ae4ab1b9dfd8f4c89743e1a19
EBUILD mongodb-3.0.15.ebuild 4561 BLAKE2B 85e994c18b57a0278059eb0e2e141842b551a96e1a030b5d84e0bb4c1524bacff7ed1a1576093b0336ed042f8bcbf01d37ba725392c077a400fdefc2705ec2ab SHA512 d5b77ede0ab5d9fa814542e831ec93d5854f0aaa55930c5e445410d347787be96294a741f30089764ea23cdab52413d1d82c6796b3d7133796d28de95726e294
EBUILD mongodb-3.2.12.ebuild 5129 BLAKE2B 5587e9f109bc55d58d5157aed301fb61c8bc088d7bad7fc386d9e34b228f05a6fcdc79f4d2201ded1de0d178eb721600322992b6f0e4ec174cc85ac44decf81a SHA512 28de831886c3531c441658cdc7a29cea3b20f6aa9208c5658d4ad71269b6ff359954118810a9e845d567f54a54449ebc20a446f46da3d4694b5395fdf9f822dd
@@ -35,5 +36,5 @@ EBUILD mongodb-3.2.13.ebuild 5129 BLAKE2B 5587e9f109bc55d58d5157aed301fb61c8bc08
EBUILD mongodb-3.2.16.ebuild 5180 BLAKE2B 79f825055c4491535e1e4405af86b58650443885a6ac7e65e53f6739465be60bca9abba10ccc803cecfe93b1bf2645970f9a4e97b5dec72309ed12ddd4f1f350 SHA512 9d0a8bac5e2aed1803df8d23ccf126a56194d03f715e86adb4fda36a82fd176617c5c599c1ac7fbfdbdfb8d6c7c63496e34400a9dc5ed75cd6d84ca023d58ee1
EBUILD mongodb-3.2.17.ebuild 5339 BLAKE2B 44abb9bde7a946e9eb09002f0ea4c84e6cfb7161a8ad6624881268fe00d9e5d125a0d5a0dc0815d4f759e5d6fdc2160bbc88c9317848d15e551e2b165f5e1733 SHA512 bb163c16d8fceff96d1c199ee41e43ad91892a2442ea370c50c15484d80625057b5ac36e516deb0daa25325a74aeb37da7c19e0a97e3ce2a769c77933521622d
EBUILD mongodb-3.4.10.ebuild 5240 BLAKE2B 1e1897fe9f4d929a7ae9b720aad33819cee29776b5ed34c502e421b3454daedd11bb009437e5316cfb0bf5f3d2d3f563f5c34ce946ebab26030ef96e91b1602a SHA512 001ea14c326133a4d462ce4b25db9318376f86279cdcd9edf7ce6e9f8ee4ed642576e4a0a622cda55fd31360912fdc2aa3a77068503b7dc039ca05b7abd9aa89
-EBUILD mongodb-3.6.1.ebuild 4399 BLAKE2B 32de68bd08d8ecb31d3dcded887ba053d5a564f9e8bd639e53ce5cce6c67ba974c9fe1ade84fbe17c8c6cc332e6c3eec38e5b9258aea4d3cc59041810c6f4f1b SHA512 0177d55dda560363180d9b16b4d3d01745a1e6a7e44dd0e4e3c41300de51962825f6f22f3642a001011256b7bd1bf94992143de45d51f3aa5a395f8a23a5b2e8
+EBUILD mongodb-3.6.2.ebuild 4442 BLAKE2B b62187502656f26136a95ec54db456e87cb2149305c4c5f6c0e4fe4f988c847b3909855d7f536093e7d4d4eb304d5e0322a25fff54d51a378511bbb95040e749 SHA512 3da494650e9126d3287b8dc04876bc8f8b95e49cba2ea3dc7dcad7016e43bc6062f64552e223c88c274312304b98526161151d2bf0e93a8701e6706324da8b0b
MISC metadata.xml 1112 BLAKE2B 59da7a768ae87cb8ea3a539b40c27707b8aca5bdfd6f3acfcddca4d27a354aa5ffb13b68b7d69b57553d26d3b47860e186c5c43a38122df4712d0cc98ec1f690 SHA512 39b9bd8afc1c79382130c691154eac4338810fb4069406482648d32fd2aefd5d3697c272321d300154be2e4d37ac10f1372c62687d9c41ca0d3682b0152a53c4
diff --git a/dev-db/mongodb/files/mongodb-3.6.1-fix-scons.patch b/dev-db/mongodb/files/mongodb-3.6.1-fix-scons.patch
new file mode 100644
index 000000000000..d7bfb35b00d5
--- /dev/null
+++ b/dev-db/mongodb/files/mongodb-3.6.1-fix-scons.patch
@@ -0,0 +1,32 @@
+diff --git a/SConstruct b/SConstruct
+index fe7975b..92659a7 100644
+--- a/SConstruct
++++ b/SConstruct
+@@ -1619,7 +1619,6 @@ if env.TargetOSIs('posix'):
+ # -Winvalid-pch Warn if a precompiled header (see Precompiled Headers) is found in the search path but can't be used.
+ env.Append( CCFLAGS=["-fno-omit-frame-pointer",
+ "-fno-strict-aliasing",
+- "-ggdb",
+ "-pthread",
+ "-Wall",
+ "-Wsign-compare",
+@@ -1631,6 +1630,8 @@ if env.TargetOSIs('posix'):
+ env.Append( CCFLAGS=["-Werror"] )
+
+ env.Append( CXXFLAGS=["-Woverloaded-virtual"] )
++ env.Append( CXXFLAGS=os.environ['CXXFLAGS'] )
++ env.Append( LINKFLAGS=os.environ['LDFLAGS'] )
+ if env.ToolchainIs('clang'):
+ env.Append( CXXFLAGS=['-Werror=unused-result'] )
+
+@@ -1650,8 +1651,8 @@ if env.TargetOSIs('posix'):
+
+ env.Append( LIBS=[] )
+
+- #make scons colorgcc friendly
+- for key in ('HOME', 'TERM'):
++ #make scons colorgcc, distcc, ccache friendly
++ for key in ('HOME', 'PATH', 'TERM'):
+ try:
+ env['ENV'][key] = os.environ[key]
+ except KeyError:
diff --git a/dev-db/mongodb/mongodb-3.6.1.ebuild b/dev-db/mongodb/mongodb-3.6.2.ebuild
index 363620ef0504..8291fe7fc50d 100644
--- a/dev-db/mongodb/mongodb-3.6.1.ebuild
+++ b/dev-db/mongodb/mongodb-3.6.2.ebuild
@@ -52,6 +52,7 @@ PDEPEND="tools? ( >=app-admin/mongo-tools-${PV} )"
PATCHES=(
"${FILESDIR}/${PN}-3.4.7-no-boost-check.patch"
+ "${FILESDIR}/${PN}-3.6.1-fix-scons.patch"
"${FILESDIR}/${PN}-3.6.1-no-compass.patch"
)
diff --git a/dev-db/pgadmin4/Manifest b/dev-db/pgadmin4/Manifest
index 7f201cebdba7..60b1f09be8ba 100644
--- a/dev-db/pgadmin4/Manifest
+++ b/dev-db/pgadmin4/Manifest
@@ -1,3 +1,5 @@
DIST pgadmin4-2.0.tar.gz 24988176 BLAKE2B 96e942d5001b1d590fb1b642933c665a13bca5429d3a3e74eefe4a8090c76515cc08b656ebfea3a170b4fa6077d7086fbffdd5fddfcb517be08fd4ecc20052ab SHA512 463e95a341dec74ac0a08a647af1cbe83b514b0595b8469ab9c7b5335e24604e082b906d530aa735fef7b08c58d8a8a6df3edf5dc65402f6521165f1cbb72f67
+DIST pgadmin4-2.1.tar.gz 27842212 BLAKE2B 26c12dff8e2e5e37dd2911f6eb582a0f706d73490c8d93e83b07b7537fc201547d095d4f34181d2502bbc29b2741614adabf876b7e6ea3ef5f555eab94caa240 SHA512 02bc122ae53db595a1fd395e634fc4d0891f024a2e5e341c81b306a8c1d07bc18e5673cda440c7ba56754be4902ae4441010db0140132352e12b8986c8c0f47c
EBUILD pgadmin4-2.0-r1.ebuild 3430 BLAKE2B fb80fbc920e092ed3b39f58f0c080f41e6a358e573112f42da9db4c728a8bbec37f00a61be0eaadd19e607aa3c5b79841db80ff689404a102a51bc3ac28b118c SHA512 10d50efb96498eb3abb76943ab2a678c9b3a39935d628906a6a07b9b9d666ab6648eed4b2c4d6ecd0b4a61664dc4cf25cdeb4abc5fc55c2915a87d40e4f0975a
+EBUILD pgadmin4-2.1.ebuild 3432 BLAKE2B 150010a6b6abbd2dae6a362883a24c1b2a13a62301489ef4a6073801de25e7c6b9792beb542306393c8fe1b598dcb2125bef88e03020de0a61688edb76a78578 SHA512 493c026a3bc156a92f5253ac96aa30891d8c644463196ab603daed5cfa9536fdb99e786dd07cfaafa31b1eb782040e6711d9e8a541211aa905e57227309843fa
MISC metadata.xml 266 BLAKE2B 9d5988ab45f9939f9be5ee7f4b7a9950a3d62252aa0d3e6c953265467428c59fb8c05b2bb72085431b7aa9fc18d31f2b3273e8fdb33443d786b2237db697b7e2 SHA512 9f85990c7ce6a1de5c1067e4781af18bede2d3bd02963a7b2927766b70dbe98d3fb63bb01e19b1cf6e2b77038d9788bf38155b3cc33f9e5ff8430b10a4006325
diff --git a/dev-db/pgadmin4/pgadmin4-2.1.ebuild b/dev-db/pgadmin4/pgadmin4-2.1.ebuild
new file mode 100644
index 000000000000..6f3816804830
--- /dev/null
+++ b/dev-db/pgadmin4/pgadmin4-2.1.ebuild
@@ -0,0 +1,122 @@
+# 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.10[${PYTHON_USEDEP}]
+ >=dev-python/Babel-2.3.4[${PYTHON_USEDEP}]
+ >=dev-python/beautifulsoup-4.4.1[${PYTHON_USEDEP}]
+ >=dev-python/blinker-1.3[${PYTHON_USEDEP}]
+ >=dev-python/click-6.6[${PYTHON_USEDEP}]
+ >=dev-python/extras-0.0.3[${PYTHON_USEDEP}]
+ >=dev-python/fixtures-2.0.0[${PYTHON_USEDEP}]
+ >=dev-python/flask-0.11.1[${PYTHON_USEDEP}]
+ >=dev-python/flask-babel-0.11.1[${PYTHON_USEDEP}]
+ >=dev-python/flask-gravatar-0.4.2[${PYTHON_USEDEP}]
+ >=dev-python/flask-htmlmin-1.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.0.3[${PYTHON_USEDEP}]
+ >=dev-python/flask-paranoid-0.1.0[${PYTHON_USEDEP}]
+ >=dev-python/flask-principal-0.4.0[${PYTHON_USEDEP}]
+ >=dev-python/flask-security-1.7.5[${PYTHON_USEDEP}]
+ >=dev-python/flask-sqlalchemy-2.1[${PYTHON_USEDEP}]
+ >=dev-python/flask-wtf-0.12[${PYTHON_USEDEP}]
+ >=dev-python/html5lib-0.9999999[${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.5.1[${PYTHON_USEDEP}]
+ >=dev-python/passlib-1.6.2[${PYTHON_USEDEP}]
+ >=dev-python/pbr-1.9.1[${PYTHON_USEDEP}]
+ >=dev-python/psycopg-2.7.3.2[${PYTHON_USEDEP}]
+ >=dev-python/pycrypto-2.6.1[${PYTHON_USEDEP}]
+ >=dev-python/pyrsistent-0.11.13[${PYTHON_USEDEP}]
+ >=dev-python/python-dateutil-2.5.0[${PYTHON_USEDEP}]
+ >=dev-python/python-sqlparse-0.1.19[${PYTHON_USEDEP}]
+ >=dev-python/pytz-2014.10[${PYTHON_USEDEP}]
+ >=dev-python/simplejson-3.6.5[${PYTHON_USEDEP}]
+ >=dev-python/six-1.9.0[${PYTHON_USEDEP}]
+ >=dev-python/speaklater-1.3[${PYTHON_USEDEP}]
+ >=dev-python/sqlalchemy-1.0.14[${PYTHON_USEDEP}]
+ >=dev-python/werkzeug-0.9.6[${PYTHON_USEDEP}]
+ >=dev-python/wtforms-2.0.2[${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/pgpool2/Manifest b/dev-db/pgpool2/Manifest
index defc72762b26..ee65541078b8 100644
--- a/dev-db/pgpool2/Manifest
+++ b/dev-db/pgpool2/Manifest
@@ -1,24 +1,10 @@
-AUX pgpool2-3.5.0-path-fix.patch 8540 BLAKE2B 7f384a93c665eb790a2c2638104fc5fba6c818a31ea789c72505fadcd4431837698b799d1fc69d1aaf1b5bbcbf6233806289e152a2b185a57b0f643a1cb8a080 SHA512 b9e5b2c3532fd9a72f19915913b0a9d721a0e714de0215ae3f5f0d978b4effa9662b1eb3cb013fdb4f18160cc7c4ed5733f3085c98770aa6407a2af384065609
AUX pgpool2.confd 649 BLAKE2B 1c520c4fa954c7411c1b700c03bf4e39196c599eb239cf86412fcf491759ca6f46b1264e7647a8d278ac45da3e20702f6f077dfbcccf83cb3f45575dd3571308 SHA512 5f9a4fa1e68161049ad767d64c764fbf70e84a4239e58119455a45a7e45d86ea2d19b617147cf891053e0dad4420c84704d67015334c7d41bad05b260d70e910
AUX pgpool2.initd 2174 BLAKE2B 153fa1d756067fd381e599447fb71d780b90bc4c187d0146b1e2806fcc1c19a85d215b59b1931373a3a95fa7e719b9cebd93756276fbeeab087f2a5ba5a1f27b SHA512 3123d2c5e7178fc4b970592fe6908df2860ca3cd5ec54d4609c28145ffc934edf6ddb11f9d2208d89d43bc4252e326b3bc0eed36a28fd2fadbaeb2d635935e40
-AUX pgpool_run_paths-3.6.4.patch 10760 BLAKE2B a5aab30ba1d0a478f4efb119117770c5713ca2ae4276637805144754f0188a7dabe70cf24338887dd6712652048e9eb3a9872d3bc3fe828f2d767fbaf07d960c SHA512 ba3bdd19e6ea9178da3eb178f72981b337c9746ddf9f27d6de51d0d3c41d3a4b6f52ed88bbbbbcc6004693ee630172649ab316d69658b25521f438c44f72b3c5
AUX pgpool_run_paths-3.6.5.patch 11626 BLAKE2B 5d0b7a49b3c8bf2f2d69d369894e9976037025b289b0ec0f2cf11ed9862347dc4cb166af2cbd65637de40fdae09809a9232b0638cf69339901d6f3f67e9ddcd5 SHA512 ea718378d0ea14fa48975a899df26bc8aafa1e61b0d3f264ead81031a21d68284f4af5ce065c5534d113faf36724c880ce280665e148ec623e9fea9c8f91c77c
AUX pgpool_run_paths-9999.patch 11759 BLAKE2B 35df553f704846cc4ff8d67e5e6b54ca8ed0a5817a148c359b47cae7ff388fe2bb57600113d7f8ac9afe760ea75e3ddd410d111c2ef87aea3c3fb38671d59260 SHA512 109be0f3bcda49db14ebb86d6e9347aa0a47d582ac1a1438b07719f9fa503045cc5b65a27964c3c0b1690ef489f752a497e3b050b816569d0ce01193dc007259
-DIST pgpool-II-3.5.2.tar.gz 2227075 BLAKE2B 4f40044dc37353a811b2f4ddd4bb6d41604e1fc5c64064603fcee704a92a4e4d3b1baa83314f476dfe32ecbd851208996139a55ffaffb3f1bb9f8ac72685a02f SHA512 dd7268bce0019de30dfad01a8600af798127a4c2cc818e6f85ba30289e97c253d6faa392734d85ccbc97be3f04458c12af1bba541e5b8f3d2ee8268432e01d1a
-DIST pgpool-II-3.5.5.tar.gz 2243184 BLAKE2B 4267991fdf45ddd0e2bf3e253508b9b18ad669d0184bcb13143dddcfe6233e4aa223ba275f9471b2645262e43341fb4c8e5ac9e154ee2fd3de49aa5420de070e SHA512 f77888cbc5e2c15ae1035ee3a1965d4fd3d02cdfd5810c6c656456eaa0d73dae7471906bdf0848607723633da5b8d02145559b767735bcc9b7e4023b1d59efed
-DIST pgpool-II-3.6.1.tar.gz 2539510 BLAKE2B 844f54a2f74251af8af1348c374807e1dce2028eb64d2974c7fb1b904c6518012764c16fdd7fdeea8b9039fcfa13d8c139a9b2e020fffc87e6b90f3d6a489e5c SHA512 9d4f0ecec3cf7478c7c4cd5cb1aa75614edca204d11b145f145d752c24bed7f7f4ea2880f6a3f9833aee0b5f428e8cf36e2f91bdef2f6065fb98019df546469a
-DIST pgpool-II-3.6.4.tar.gz 2623625 BLAKE2B d8ba2a02c0b7e4d4b259dcf87a85d0b3b7dd11d5121907039cb3baad52f2c40bd0ff2457e844922d04c300068f1638d26b0efdc60d828e05a735d3866365ca8c SHA512 a44724b77faca12bc2b46a88e307c10f8099574b5a27720c98f2939fbfa61f41b4c3dc03565412972c351c10d57da4324a483c310b52f624f5ba87c2bd4d006f
-DIST pgpool-II-3.6.5.tar.gz 2651330 BLAKE2B d0ad069b17e1e0fb46590e7dd0dd29feb499a6703056d5ff5d4f218227158f4bca44f8d52209f378d08879a97c7930f85a61dfc22fce0bafa1313ad3c7649d5b SHA512 12247730f202859c76b0a11ccc485de786e53df7b8e08ffd76d7653c25633d79387f027e7c9d804bf19cd89b9db047b7ca0cf1cf5e914ee74c6efc0b6660eb1d
-DIST pgpool-II-3.6.6.tar.gz 3171264 BLAKE2B b519d097366f190c4b6136643ccd839d1854ced0287ec1dc9f058dad1f7ebc18448d97d48338d03a8a7eafee49391381a8aa802fc14b84b757b133d6c97ec94e SHA512 02cfceed761cf6338ce0a33e9afe05194acdf4d5577cf0d920176cb3bacffce6e9c2c1e8a8b89c5b062bc53d54cd012a4ad9582b42df7bc36ee666dcd0ee3e10
-DIST pgpool-II-3.6.7.tar.gz 3188186 BLAKE2B b58561418e4027716614d6a70f5d844b8043312cb2a2b18882e0fdcd466e1f0624e43db7c67685227d808368388c6ee9dd0d5f3ea956d0585444b1e30bc49643 SHA512 4bc80f4b47f4b37e4efe1af137c2af076dc98c438bf094236223bba0facfaea91546a86d7604e67453b67e82a24ac5ee6e4325d81f90358a3a0d7a6c34acd7fc
DIST pgpool-II-3.7.0.tar.gz 3269076 BLAKE2B f7a396e82022a35e5f46fb644ca4a9007db3abaf97f8249d88bca00abf5d33abe7d47f705e959f7fb910885bf49f68bd5f965aae3085d12076d3100cca2f25f8 SHA512 cf8eef3a2ec761b51f9e6a72b5211810de57ad9b40b1738067616478b6486a813782588bfc92f6f351334d9514b1394551230c486fa0ac2f6c18a0490f22bbe2
-EBUILD pgpool2-3.5.2.ebuild 2465 BLAKE2B 4e7d19f6ebdb02735cd58c00def5fa0b451e2878085235c5258952e18ee93e7ff21b4ba71441e100bb583530a424cd1094078cab5ac6a4c689c857b8e2c24fd9 SHA512 5f1d18669f16acdccda9eedb0a24d61705f9b9ea23130c95428ba1143ca337815e724047b9b41ee48ae7ae0599e329edd4a45ecc3ac428b95868d9990b4542bb
-EBUILD pgpool2-3.5.5.ebuild 2465 BLAKE2B d2c3ac6f7be204def3c7a7c9be6cf3aee43af6c340342197023f4001d078bdacbb0476195154989eeeb8cfa5d547d9e0a2a301bf553fbd08407a5a00bef07b49 SHA512 8cbe17265f1b698eca9386d1268dd3e07cc305efb0b4bd8cecd995656827bcb1db573094514d7f1e0b51a9a80effb70bffdc7c3c62f14fe974c468e2e3090926
-EBUILD pgpool2-3.6.1.ebuild 2396 BLAKE2B 5695231ccae6d373539da8fd54228ad1dcea17cae390a8b2b75d037fa26a5d02cfa0210a715deb2b2209daab1196f8ed574d832617adbe7c540113322021a574 SHA512 27b23a48947221074fee372c3c1708492796f1d0671d0f98272aa279c8021e491be182b7cf5f74e7ab7fa8a683a76539e60ad28ea89a79ed06984bc2e3920386
-EBUILD pgpool2-3.6.4.ebuild 2502 BLAKE2B 14ca82a4af57366f226004f2956c9a1e23798622aad40e76c76bd15cfb93e54864fda1f90f04a9bda3323eab0e1fc04a2b6e7afd272c0e375029daf421fff9d3 SHA512 2c2ebf35fd59e3d6103f7416a4f0cf2b16858773d9e12ac2d8d146af2103008792bb2c49927772e44e4558775299ab268b822f3ffa44a4e279cdd8214d47bc27
-EBUILD pgpool2-3.6.5.ebuild 2488 BLAKE2B 221e4f4353405ed3027303429d9c2934bb42259d080fcabf7d1c764dbaf4f0ac2e8479426ff76b7d49bd00f4ca7ef107f9b297df55190b9ea830c8926ddc2b38 SHA512 84f54eadcc0500659d4b38314183eacfa3fa0a7e518cd354368beb96a6b1a6d6e5c9bf47abb601f2df33ccbe7f924dc51c5a20e1550090f09f625d6f59181630
-EBUILD pgpool2-3.6.6.ebuild 2488 BLAKE2B 221e4f4353405ed3027303429d9c2934bb42259d080fcabf7d1c764dbaf4f0ac2e8479426ff76b7d49bd00f4ca7ef107f9b297df55190b9ea830c8926ddc2b38 SHA512 84f54eadcc0500659d4b38314183eacfa3fa0a7e518cd354368beb96a6b1a6d6e5c9bf47abb601f2df33ccbe7f924dc51c5a20e1550090f09f625d6f59181630
-EBUILD pgpool2-3.6.7.ebuild 2488 BLAKE2B 221e4f4353405ed3027303429d9c2934bb42259d080fcabf7d1c764dbaf4f0ac2e8479426ff76b7d49bd00f4ca7ef107f9b297df55190b9ea830c8926ddc2b38 SHA512 84f54eadcc0500659d4b38314183eacfa3fa0a7e518cd354368beb96a6b1a6d6e5c9bf47abb601f2df33ccbe7f924dc51c5a20e1550090f09f625d6f59181630
+DIST pgpool-II-3.7.1.tar.gz 3237755 BLAKE2B ec196e384c9c4c03a28081fbb74b820c7480e2a98427441572142bd80bff6d2adbbda9bc19df1c70f4699af28fcac5f09161a5938df633bb9eba52c0d9dc24ac SHA512 2a83f573ca2a720ee7beb75d8d1380747e29b2bb3c809f51bd0f8e4423d67f882ce2acb7d9ea118c55313e969aba3bf94a0d5b190eb905123d43c09df25e00ef
EBUILD pgpool2-3.7.0.ebuild 2489 BLAKE2B 1b2fd9bcb5c00ae160e80220e22aded619d7e769de630372c13ec1d8a3bb073b76a7aaac66861af6ea41242a35ccd8ac2ed2048cdb0ab0df884063e2a574f1f1 SHA512 8733a16433afcd1684c0ac5e38a3623ff1cea9a1fe4925f80d36e9cc0a4d45ddfe8ddd9edfd0695661a2cb0ed56c7ac917fb09dc4983a4f82351626f611bb4fb
+EBUILD pgpool2-3.7.1.ebuild 2491 BLAKE2B 0b2d0df464b71f63a9ab7a794a37eb0fb5a9617748ef149225552bdee4af01ae586a4a42276d93b5667f794c5f4c595b75c2f2fd9b26ce1f6ded370b02295adc SHA512 4a15fbb5fb53908a5a61c0649b8838ccaa4ca4f1f78ff411b9e30d8b2109b2069c3a430e58c849bfe4496c4894011e53350a3d5f8095f0bb138b7453b3f8c441
EBUILD pgpool2-9999.ebuild 2440 BLAKE2B fcc37575bc095fe15b6176f351e86b97f5c5ea8385a3cd6100f3ebb4031e429b026b850c5c8b78770900e1d7fdee95e2e99190755c1b2a0204d2f37009d20bda SHA512 b2fd29cf9643d0cf093c64db9283dadcaa39fec6cca1ca8f1cb1cdd85265cbcca2fc30a52a041d2683328235c8717cead2083813f8b6365ad3465c620f0ec0a1
MISC metadata.xml 390 BLAKE2B d6a0560051449e95bb43e81589eee966a477a75d7ec8211ae96b15f2d51ce9555181b8640d9d830f2b42f8159989e9126423c6ccbbc2bf2dd8121f4920a87a16 SHA512 ce26ee116c3c7ff77a771294ed07f38d8f940dc380915c339eb4c543d86fa5bde025ba83e70af2b7bf4a1bef1e51957f151131836855e0dae2e1daed73ffae8d
diff --git a/dev-db/pgpool2/files/pgpool2-3.5.0-path-fix.patch b/dev-db/pgpool2/files/pgpool2-3.5.0-path-fix.patch
deleted file mode 100644
index b2c5d554e561..000000000000
--- a/dev-db/pgpool2/files/pgpool2-3.5.0-path-fix.patch
+++ /dev/null
@@ -1,184 +0,0 @@
-diff -aruw pgpool-II-3.5.0.orig/src/include/pool.h pgpool-II-3.5.0/src/include/pool.h
---- pgpool-II-3.5.0.orig/src/include/pool.h 2016-02-10 03:53:31.000000000 -0500
-+++ pgpool-II-3.5.0/src/include/pool.h 2016-03-12 06:47:15.297966248 -0500
-@@ -72,16 +72,16 @@
- #define HBA_CONF_FILE_NAME "pool_hba.conf"
-
- /* pid file directory */
--#define DEFAULT_LOGDIR "/tmp"
-+#define DEFAULT_LOGDIR "@PGPOOL_SOCKETDIR@"
-
- /* Unix domain socket directory */
--#define DEFAULT_SOCKET_DIR "/tmp"
-+#define DEFAULT_SOCKET_DIR "@PGPOOL_SOCKETDIR@"
-
- /* Unix domain socket directory for watchdog IPC */
--#define DEFAULT_WD_IPC_SOCKET_DIR "/tmp"
-+#define DEFAULT_WD_IPC_SOCKET_DIR "@PGPOOL_SOCKETDIR@"
-
- /* pid file name */
--#define DEFAULT_PID_FILE_NAME "/var/run/pgpool/pgpool.pid"
-+#define DEFAULT_PID_FILE_NAME "@PGPOOL_SOCKETDIR@/pgpool.pid"
-
- /* status file name */
- #define STATUS_FILE_NAME "pgpool_status"
-diff -aruw pgpool-II-3.5.0.orig/src/sample/pgpool.conf.sample pgpool-II-3.5.0/src/sample/pgpool.conf.sample
---- pgpool-II-3.5.0.orig/src/sample/pgpool.conf.sample 2016-02-10 03:53:31.000000000 -0500
-+++ pgpool-II-3.5.0/src/sample/pgpool.conf.sample 2016-03-12 08:55:22.318087007 -0500
-@@ -31,10 +31,8 @@
- port = 9999
- # Port number
- # (change requires restart)
--socket_dir = '/tmp'
-+socket_dir = '@PGSQL_SOCKETDIR@'
- # Unix domain socket path
-- # The Debian package defaults to
-- # /var/run/postgresql
- # (change requires restart)
- listen_backlog_multiplier = 2
- # Set the backlog parameter of listen(2) to
-@@ -53,10 +51,8 @@
- pcp_port = 9898
- # Port number for pcp
- # (change requires restart)
--pcp_socket_dir = '/tmp'
-+pcp_socket_dir = '@PGSQL_SOCKETDIR@'
- # Unix domain socket path for pcp
-- # The Debian package defaults to
-- # /var/run/postgresql
- # (change requires restart)
-
- # - Backend Connection Settings -
-@@ -214,10 +210,10 @@
- # FILE LOCATIONS
- #------------------------------------------------------------------------------
-
--pid_file_name = '/var/run/pgpool/pgpool.pid'
-+pid_file_name = '@PGPOOL_SOCKETDIR@/pgpool.pid'
- # PID file name
- # (change requires restart)
--logdir = '/var/log/pgpool'
-+logdir = '/var/lib/pgpool'
- # Directory of pgPool status file
- # (change requires restart)
-
-diff -aruw pgpool-II-3.5.0.orig/src/sample/pgpool.conf.sample-master-slave pgpool-II-3.5.0/src/sample/pgpool.conf.sample-master-slave
---- pgpool-II-3.5.0.orig/src/sample/pgpool.conf.sample-master-slave 2016-02-10 03:53:31.000000000 -0500
-+++ pgpool-II-3.5.0/src/sample/pgpool.conf.sample-master-slave 2016-03-12 08:55:45.284665542 -0500
-@@ -31,10 +31,8 @@
- port = 9999
- # Port number
- # (change requires restart)
--socket_dir = '/tmp'
-+socket_dir = '@PGSQL_SOCKETDIR@'
- # Unix domain socket path
-- # The Debian package defaults to
-- # /var/run/postgresql
- # (change requires restart)
- listen_backlog_multiplier = 2
- # Set the backlog parameter of listen(2) to
-@@ -53,10 +51,8 @@
- pcp_port = 9898
- # Port number for pcp
- # (change requires restart)
--pcp_socket_dir = '/tmp'
-+pcp_socket_dir = '@PGSQL_SOCKETDIR@'
- # Unix domain socket path for pcp
-- # The Debian package defaults to
-- # /var/run/postgresql
- # (change requires restart)
-
- # - Backend Connection Settings -
-@@ -214,10 +210,10 @@
- # FILE LOCATIONS
- #------------------------------------------------------------------------------
-
--pid_file_name = '/var/run/pgpool/pgpool.pid'
-+pid_file_name = '@PGPOOL_SOCKETDIR@/pgpool.pid'
- # PID file name
- # (change requires restart)
--logdir = '/tmp'
-+logdir = '/var/lib/pgpool'
- # Directory of pgPool status file
- # (change requires restart)
-
-diff -aruw pgpool-II-3.5.0.orig/src/sample/pgpool.conf.sample-replication pgpool-II-3.5.0/src/sample/pgpool.conf.sample-replication
---- pgpool-II-3.5.0.orig/src/sample/pgpool.conf.sample-replication 2016-02-10 03:53:31.000000000 -0500
-+++ pgpool-II-3.5.0/src/sample/pgpool.conf.sample-replication 2016-03-12 08:56:55.004397999 -0500
-@@ -31,10 +31,8 @@
- port = 9999
- # Port number
- # (change requires restart)
--socket_dir = '/tmp'
-+socket_dir = '@PGSQL_SOCKETDIR@'
- # Unix domain socket path
-- # The Debian package defaults to
-- # /var/run/postgresql
- # (change requires restart)
- listen_backlog_multiplier = 2
- # Set the backlog parameter of listen(2) to
-@@ -53,10 +51,8 @@
- pcp_port = 9898
- # Port number for pcp
- # (change requires restart)
--pcp_socket_dir = '/tmp'
-+pcp_socket_dir = '@PGSQL_SOCKETDIR@'
- # Unix domain socket path for pcp
-- # The Debian package defaults to
-- # /var/run/postgresql
- # (change requires restart)
-
- # - Backend Connection Settings -
-@@ -214,10 +210,10 @@
- # FILE LOCATIONS
- #------------------------------------------------------------------------------
-
--pid_file_name = '/var/run/pgpool/pgpool.pid'
-+pid_file_name = '@PGPOOL_SOCKETDIR@/pgpool.pid'
- # PID file name
- # (change requires restart)
--logdir = '/tmp'
-+logdir = '/var/lib/pgpool'
- # Directory of pgPool status file
- # (change requires restart)
-
-diff -aruw pgpool-II-3.5.0.orig/src/sample/pgpool.conf.sample-stream pgpool-II-3.5.0/src/sample/pgpool.conf.sample-stream
---- pgpool-II-3.5.0.orig/src/sample/pgpool.conf.sample-stream 2016-02-10 03:53:31.000000000 -0500
-+++ pgpool-II-3.5.0/src/sample/pgpool.conf.sample-stream 2016-03-12 08:58:23.820723842 -0500
-@@ -31,10 +31,8 @@
- port = 9999
- # Port number
- # (change requires restart)
--socket_dir = '/tmp'
-+socket_dir = '@PGSQL_SOCKETDIR@'
- # Unix domain socket path
-- # The Debian package defaults to
-- # /var/run/postgresql
- # (change requires restart)
-
-
-@@ -47,10 +45,8 @@
- pcp_port = 9898
- # Port number for pcp
- # (change requires restart)
--pcp_socket_dir = '/tmp'
-+pcp_socket_dir = '@PGSQL_SOCKETDIR@'
- # Unix domain socket path for pcp
-- # The Debian package defaults to
-- # /var/run/postgresql
- # (change requires restart)
- listen_backlog_multiplier = 2
- # Set the backlog parameter of listen(2) to
-@@ -215,10 +211,10 @@
- # FILE LOCATIONS
- #------------------------------------------------------------------------------
-
--pid_file_name = '/var/run/pgpool/pgpool.pid'
-+pid_file_name = '@PGPOOL_SOCKETDIR@/pgpool.pid'
- # PID file name
- # (change requires restart)
--logdir = '/tmp'
-+logdir = '/var/lib/pgpool'
- # Directory of pgPool status file
- # (change requires restart)
-
diff --git a/dev-db/pgpool2/files/pgpool_run_paths-3.6.4.patch b/dev-db/pgpool2/files/pgpool_run_paths-3.6.4.patch
deleted file mode 100644
index d6943d7502e2..000000000000
--- a/dev-db/pgpool2/files/pgpool_run_paths-3.6.4.patch
+++ /dev/null
@@ -1,255 +0,0 @@
-diff -ru a/src/include/parser/pg_config_manual.h b/src/include/parser/pg_config_manual.h
---- a/src/include/parser/pg_config_manual.h 2017-05-11 05:53:04.000000000 -0400
-+++ b/src/include/parser/pg_config_manual.h 2017-07-08 20:28:47.733745889 -0400
-@@ -184,7 +184,7 @@
- * here's where to twiddle it. You can also override this at runtime
- * with the postmaster's -k switch.
- */
--#define DEFAULT_PGSOCKET_DIR "/tmp"
-+#define DEFAULT_PGSOCKET_DIR "/run/postgresql"
-
- /*
- * This is the default event source for Windows event log.
-diff -ru a/src/include/pcp/pcp_stream.h b/src/include/pcp/pcp_stream.h
---- a/src/include/pcp/pcp_stream.h 2017-05-11 05:36:01.000000000 -0400
-+++ b/src/include/pcp/pcp_stream.h 2017-07-08 20:29:28.613506800 -0400
-@@ -48,6 +48,6 @@
- extern int pcp_write(PCP_CONNECTION *pc, void *buf, int len);
- extern int pcp_flush(PCP_CONNECTION *pc);
-
--#define UNIX_DOMAIN_PATH "/tmp"
-+#define UNIX_DOMAIN_PATH "/run/pgpool"
-
- #endif /* PCP_STREAM_H */
-diff -ru a/src/include/pool.h b/src/include/pool.h
---- a/src/include/pool.h 2017-05-11 05:53:04.000000000 -0400
-+++ b/src/include/pool.h 2017-07-08 20:27:09.330984074 -0400
-@@ -73,16 +73,16 @@
- #define HBA_CONF_FILE_NAME "pool_hba.conf"
-
- /* pid file directory */
--#define DEFAULT_LOGDIR "/tmp"
-+#define DEFAULT_LOGDIR "/run/pgpool"
-
- /* Unix domain socket directory */
--#define DEFAULT_SOCKET_DIR "/tmp"
-+#define DEFAULT_SOCKET_DIR "/run/postgresql"
-
- /* Unix domain socket directory for watchdog IPC */
--#define DEFAULT_WD_IPC_SOCKET_DIR "/tmp"
-+#define DEFAULT_WD_IPC_SOCKET_DIR "/run/pgpool"
-
- /* pid file name */
--#define DEFAULT_PID_FILE_NAME "/var/run/pgpool/pgpool.pid"
-+#define DEFAULT_PID_FILE_NAME "/run/pgpool/pgpool.pid"
-
- /* status file name */
- #define STATUS_FILE_NAME "pgpool_status"
-diff -ru a/src/sample/pgpool.conf.sample b/src/sample/pgpool.conf.sample
---- a/src/sample/pgpool.conf.sample 2017-05-11 05:53:04.000000000 -0400
-+++ b/src/sample/pgpool.conf.sample 2017-07-08 20:36:28.477717849 -0400
-@@ -31,10 +31,8 @@
- port = 9999
- # Port number
- # (change requires restart)
--socket_dir = '/tmp'
-+socket_dir = '/run/postgresql'
- # Unix domain socket path
-- # The Debian package defaults to
-- # /var/run/postgresql
- # (change requires restart)
- listen_backlog_multiplier = 2
- # Set the backlog parameter of listen(2) to
-@@ -53,10 +51,8 @@
- pcp_port = 9898
- # Port number for pcp
- # (change requires restart)
--pcp_socket_dir = '/tmp'
-+pcp_socket_dir = '/run/pgpool'
- # Unix domain socket path for pcp
-- # The Debian package defaults to
-- # /var/run/postgresql
- # (change requires restart)
-
- # - Backend Connection Settings -
-@@ -210,10 +206,10 @@
- # FILE LOCATIONS
- #------------------------------------------------------------------------------
-
--pid_file_name = '/var/run/pgpool/pgpool.pid'
-+pid_file_name = '/run/pgpool/pgpool.pid'
- # PID file name
- # (change requires restart)
--logdir = '/var/log/pgpool'
-+logdir = '/run/pgpool'
- # Directory of pgPool status file
- # (change requires restart)
-
-@@ -490,10 +486,8 @@
- # Authentication key for watchdog communication
- # (change requires restart)
-
--wd_ipc_socket_dir = '/tmp'
-+wd_ipc_socket_dir = '/run/pgpool'
- # Unix domain socket path for watchdog IPC socket
-- # The Debian package defaults to
-- # /var/run/postgresql
- # (change requires restart)
-
-
-diff -ru a/src/sample/pgpool.conf.sample-master-slave b/src/sample/pgpool.conf.sample-master-slave
---- a/src/sample/pgpool.conf.sample-master-slave 2017-05-11 05:53:04.000000000 -0400
-+++ b/src/sample/pgpool.conf.sample-master-slave 2017-07-08 20:37:17.914095382 -0400
-@@ -31,10 +31,8 @@
- port = 9999
- # Port number
- # (change requires restart)
--socket_dir = '/tmp'
-+socket_dir = '/run/postgresql'
- # Unix domain socket path
-- # The Debian package defaults to
-- # /var/run/postgresql
- # (change requires restart)
- listen_backlog_multiplier = 2
- # Set the backlog parameter of listen(2) to
-@@ -53,10 +51,8 @@
- pcp_port = 9898
- # Port number for pcp
- # (change requires restart)
--pcp_socket_dir = '/tmp'
-+pcp_socket_dir = '/run/pgpool'
- # Unix domain socket path for pcp
-- # The Debian package defaults to
-- # /var/run/postgresql
- # (change requires restart)
-
- # - Backend Connection Settings -
-@@ -210,10 +206,10 @@
- # FILE LOCATIONS
- #------------------------------------------------------------------------------
-
--pid_file_name = '/var/run/pgpool/pgpool.pid'
-+pid_file_name = '/run/pgpool/pgpool.pid'
- # PID file name
- # (change requires restart)
--logdir = '/tmp'
-+logdir = '/run/pgpool'
- # Directory of pgPool status file
- # (change requires restart)
-
-@@ -489,10 +485,8 @@
- # Authentication key for watchdog communication
- # (change requires restart)
-
--wd_ipc_socket_dir = '/tmp'
-+wd_ipc_socket_dir = '/run/pgpool'
- # Unix domain socket path for watchdog IPC socket
-- # The Debian package defaults to
-- # /var/run/postgresql
- # (change requires restart)
-
- # - Virtual IP control Setting -
-diff -ru a/src/sample/pgpool.conf.sample-replication b/src/sample/pgpool.conf.sample-replication
---- a/src/sample/pgpool.conf.sample-replication 2017-05-11 05:53:04.000000000 -0400
-+++ b/src/sample/pgpool.conf.sample-replication 2017-07-08 20:37:30.384022450 -0400
-@@ -31,10 +31,8 @@
- port = 9999
- # Port number
- # (change requires restart)
--socket_dir = '/tmp'
-+socket_dir = '/run/postgresql'
- # Unix domain socket path
-- # The Debian package defaults to
-- # /var/run/postgresql
- # (change requires restart)
- listen_backlog_multiplier = 2
- # Set the backlog parameter of listen(2) to
-@@ -53,10 +51,8 @@
- pcp_port = 9898
- # Port number for pcp
- # (change requires restart)
--pcp_socket_dir = '/tmp'
-+pcp_socket_dir = '/run/pgpool'
- # Unix domain socket path for pcp
-- # The Debian package defaults to
-- # /var/run/postgresql
- # (change requires restart)
-
- # - Backend Connection Settings -
-@@ -210,10 +206,10 @@
- # FILE LOCATIONS
- #------------------------------------------------------------------------------
-
--pid_file_name = '/var/run/pgpool/pgpool.pid'
-+pid_file_name = '/run/pgpool/pgpool.pid'
- # PID file name
- # (change requires restart)
--logdir = '/tmp'
-+logdir = '/run/pgpool'
- # Directory of pgPool status file
- # (change requires restart)
-
-@@ -489,10 +485,8 @@
- # Authentication key for watchdog communication
- # (change requires restart)
-
--wd_ipc_socket_dir = '/tmp'
-+wd_ipc_socket_dir = '/run/pgpool'
- # Unix domain socket path for watchdog IPC socket
-- # The Debian package defaults to
-- # /var/run/postgresql
- # (change requires restart)
-
-
-diff -ru a/src/sample/pgpool.conf.sample-stream b/src/sample/pgpool.conf.sample-stream
---- a/src/sample/pgpool.conf.sample-stream 2017-05-11 05:53:04.000000000 -0400
-+++ b/src/sample/pgpool.conf.sample-stream 2017-07-08 20:37:44.060609128 -0400
-@@ -31,10 +31,8 @@
- port = 9999
- # Port number
- # (change requires restart)
--socket_dir = '/tmp'
-+socket_dir = '/run/postgresql'
- # Unix domain socket path
-- # The Debian package defaults to
-- # /var/run/postgresql
- # (change requires restart)
-
-
-@@ -47,10 +45,8 @@
- pcp_port = 9898
- # Port number for pcp
- # (change requires restart)
--pcp_socket_dir = '/tmp'
-+pcp_socket_dir = '/run/pgpool'
- # Unix domain socket path for pcp
-- # The Debian package defaults to
-- # /var/run/postgresql
- # (change requires restart)
- listen_backlog_multiplier = 2
- # Set the backlog parameter of listen(2) to
-@@ -211,10 +207,10 @@
- # FILE LOCATIONS
- #------------------------------------------------------------------------------
-
--pid_file_name = '/var/run/pgpool/pgpool.pid'
-+pid_file_name = '/run/pgpool/pgpool.pid'
- # PID file name
- # (change requires restart)
--logdir = '/tmp'
-+logdir = '/run/pgpool'
- # Directory of pgPool status file
- # (change requires restart)
-
-@@ -489,10 +485,8 @@
- # Authentication key for watchdog communication
- # (change requires restart)
-
--wd_ipc_socket_dir = '/tmp'
-+wd_ipc_socket_dir = '/run/pgpool'
- # Unix domain socket path for watchdog IPC socket
-- # The Debian package defaults to
-- # /var/run/postgresql
- # (change requires restart)
-
-
diff --git a/dev-db/pgpool2/pgpool2-3.5.2.ebuild b/dev-db/pgpool2/pgpool2-3.5.2.ebuild
deleted file mode 100644
index f5c656a3a1aa..000000000000
--- a/dev-db/pgpool2/pgpool2-3.5.2.ebuild
+++ /dev/null
@@ -1,101 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-MY_P="${PN/2/-II}-${PV}"
-
-inherit eutils user
-
-DESCRIPTION="Connection pool server for PostgreSQL"
-HOMEPAGE="http://www.pgpool.net/"
-SRC_URI="http://www.pgpool.net/download.php?f=${MY_P}.tar.gz -> ${MY_P}.tar.gz"
-LICENSE="BSD"
-SLOT="0"
-
-KEYWORDS="~amd64 ~x86"
-
-IUSE="doc memcached pam ssl static-libs"
-
-RDEPEND="
- dev-db/postgresql:=
- memcached? ( dev-libs/libmemcached )
- pam? ( sys-auth/pambase )
- ssl? ( dev-libs/openssl:= )
-"
-DEPEND="${RDEPEND}
- sys-devel/bison
- !!dev-db/pgpool
-"
-
-S=${WORKDIR}/${MY_P}
-
-pkg_setup() {
- enewgroup postgres 70
- enewuser pgpool -1 -1 -1 postgres
-
- # We need the postgres user as well so we can set the proper
- # permissions on the sockets without getting into fights with
- # PostgreSQL's initialization scripts.
- enewuser postgres 70 /bin/bash /var/lib/postgresql postgres
-}
-
-src_prepare() {
- epatch "${FILESDIR}/pgpool2-3.5.0-path-fix.patch"
-
- local pg_config_manual="$(pg_config --includedir)/pg_config_manual.h"
- local pgsql_socket_dir=$(grep DEFAULT_PGSOCKET_DIR "${pg_config_manual}" | \
- sed 's|.*\"\(.*\)\"|\1|g')
- local pgpool_socket_dir="$(dirname $pgsql_socket_dir)/pgpool"
-
- sed "s|@PGSQL_SOCKETDIR@|${pgsql_socket_dir}|g" \
- -i src/sample/pgpool.conf.sample* src/include/pool.h || die
-
- sed "s|@PGPOOL_SOCKETDIR@|${pgpool_socket_dir}|g" \
- -i src/sample/pgpool.conf.sample* src/include/pool.h || die
-}
-
-src_configure() {
- local myconf
- use memcached && \
- myconf="--with-memcached=\"${EROOT%/}/usr/include/libmemcached\""
- use pam && myconf+=' --with-pam'
-
- econf \
- --disable-rpath \
- --sysconfdir="${EROOT%/}/etc/${PN}" \
- $(use_with ssl openssl) \
- $(use_enable static-libs static) \
- ${myconf}
-}
-
-src_compile() {
- emake
-
- emake -C src/sql
-}
-
-src_install() {
- emake DESTDIR="${D}" install
-
- emake DESTDIR="${D}" -C src/sql install
-
- newinitd "${FILESDIR}/${PN}.initd" ${PN}
- newconfd "${FILESDIR}/${PN}.confd" ${PN}
-
- # Documentation
- dodoc NEWS TODO
- use doc && dohtml -r doc/*
-
- # Examples and extras
- # mv some files that get installed to /usr/share/pgpool-II so that
- # they all wind up in the same place
- mv "${ED%/}/usr/share/${PN/2/-II}" "${ED%/}/usr/share/${PN}" || die
- into "/usr/share/${PN}"
- dobin doc/{pgpool_remote_start,basebackup.sh}
- insinto "/usr/share/${PN}"
- doins doc/recovery.conf.sample
-
- # One more thing: Evil la files!
- find "${ED}" -name '*.la' -exec rm -f {} +
-}
diff --git a/dev-db/pgpool2/pgpool2-3.5.5.ebuild b/dev-db/pgpool2/pgpool2-3.5.5.ebuild
deleted file mode 100644
index 206325ee553c..000000000000
--- a/dev-db/pgpool2/pgpool2-3.5.5.ebuild
+++ /dev/null
@@ -1,101 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-MY_P="${PN/2/-II}-${PV}"
-
-inherit eutils user
-
-DESCRIPTION="Connection pool server for PostgreSQL"
-HOMEPAGE="http://www.pgpool.net/"
-SRC_URI="http://www.pgpool.net/download.php?f=${MY_P}.tar.gz -> ${MY_P}.tar.gz"
-LICENSE="BSD"
-SLOT="0"
-
-KEYWORDS="~amd64 ~x86"
-
-IUSE="doc memcached pam ssl static-libs"
-
-RDEPEND="
- dev-db/postgresql:=
- memcached? ( dev-libs/libmemcached )
- pam? ( sys-auth/pambase )
- ssl? ( dev-libs/openssl:= )
-"
-DEPEND="${RDEPEND}
- sys-devel/bison
- !!dev-db/pgpool
-"
-
-S=${WORKDIR}/${MY_P}
-
-pkg_setup() {
- enewgroup postgres 70
- enewuser pgpool -1 -1 -1 postgres
-
- # We need the postgres user as well so we can set the proper
- # permissions on the sockets without getting into fights with
- # PostgreSQL's initialization scripts.
- enewuser postgres 70 /bin/bash /var/lib/postgresql postgres
-}
-
-src_prepare() {
- epatch "${FILESDIR}/pgpool2-3.5.0-path-fix.patch"
-
- local pg_config_manual="$(pg_config --includedir)/pg_config_manual.h"
- local pgsql_socket_dir=$(grep DEFAULT_PGSOCKET_DIR "${pg_config_manual}" | \
- sed 's|.*\"\(.*\)\"|\1|g')
- local pgpool_socket_dir="$(dirname $pgsql_socket_dir)/pgpool"
-
- sed "s|@PGSQL_SOCKETDIR@|${pgsql_socket_dir}|g" \
- -i src/sample/pgpool.conf.sample* src/include/pool.h || die
-
- sed "s|@PGPOOL_SOCKETDIR@|${pgpool_socket_dir}|g" \
- -i src/sample/pgpool.conf.sample* src/include/pool.h || die
-}
-
-src_configure() {
- local myconf
- use memcached && \
- myconf="--with-memcached=\"${EROOT%/}/usr/include/libmemcached\""
- use pam && myconf+=' --with-pam'
-
- econf \
- --disable-rpath \
- --sysconfdir="${EROOT%/}/etc/${PN}" \
- $(use_with ssl openssl) \
- $(use_enable static-libs static) \
- ${myconf}
-}
-
-src_compile() {
- emake
-
- emake -C src/sql
-}
-
-src_install() {
- emake DESTDIR="${D}" install
-
- emake DESTDIR="${D}" -C src/sql install
-
- newinitd "${FILESDIR}/${PN}.initd" ${PN}
- newconfd "${FILESDIR}/${PN}.confd" ${PN}
-
- # Documentation
- dodoc NEWS TODO
- use doc && dohtml -r doc/*
-
- # Examples and extras
- # mv some files that get installed to /usr/share/pgpool-II so that
- # they all wind up in the same place
- mv "${ED%/}/usr/share/${PN/2/-II}" "${ED%/}/usr/share/${PN}" || die
- into "/usr/share/${PN}"
- dobin doc/{pgpool_remote_start,basebackup.sh}
- insinto "/usr/share/${PN}"
- doins doc/recovery.conf.sample
-
- # One more thing: Evil la files!
- find "${ED}" -name '*.la' -exec rm -f {} +
-}
diff --git a/dev-db/pgpool2/pgpool2-3.6.1.ebuild b/dev-db/pgpool2/pgpool2-3.6.1.ebuild
deleted file mode 100644
index 644dc65245e6..000000000000
--- a/dev-db/pgpool2/pgpool2-3.6.1.ebuild
+++ /dev/null
@@ -1,99 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-MY_P="${PN/2/-II}-${PV}"
-
-inherit eutils user
-
-DESCRIPTION="Connection pool server for PostgreSQL"
-HOMEPAGE="http://www.pgpool.net/"
-SRC_URI="http://www.pgpool.net/download.php?f=${MY_P}.tar.gz -> ${MY_P}.tar.gz"
-LICENSE="BSD"
-SLOT="0"
-
-KEYWORDS="~amd64 ~x86"
-
-IUSE="doc memcached pam ssl static-libs"
-
-RDEPEND="
- dev-db/postgresql:=
- memcached? ( dev-libs/libmemcached )
- pam? ( sys-auth/pambase )
- ssl? ( dev-libs/openssl:= )
-"
-DEPEND="${RDEPEND}
- sys-devel/bison
- !!dev-db/pgpool
-"
-
-S=${WORKDIR}/${MY_P}
-
-pkg_setup() {
- enewgroup postgres 70
- enewuser pgpool -1 -1 -1 postgres
-
- # We need the postgres user as well so we can set the proper
- # permissions on the sockets without getting into fights with
- # PostgreSQL's initialization scripts.
- enewuser postgres 70 /bin/bash /var/lib/postgresql postgres
-}
-
-src_prepare() {
- epatch "${FILESDIR}/pgpool2-3.5.0-path-fix.patch"
-
- local pg_config_manual="$(pg_config --includedir)/pg_config_manual.h"
- local pgsql_socket_dir=$(grep DEFAULT_PGSOCKET_DIR "${pg_config_manual}" | \
- sed 's|.*\"\(.*\)\"|\1|g')
- local pgpool_socket_dir="$(dirname $pgsql_socket_dir)/pgpool"
-
- sed "s|@PGSQL_SOCKETDIR@|${pgsql_socket_dir}|g" \
- -i src/sample/pgpool.conf.sample* src/include/pool.h || die
-
- sed "s|@PGPOOL_SOCKETDIR@|${pgpool_socket_dir}|g" \
- -i src/sample/pgpool.conf.sample* src/include/pool.h || die
-}
-
-src_configure() {
- local myconf
- use memcached && \
- myconf="--with-memcached=\"${EROOT%/}/usr/include/libmemcached\""
- use pam && myconf+=' --with-pam'
-
- econf \
- --disable-rpath \
- --sysconfdir="${EROOT%/}/etc/${PN}" \
- $(use_with ssl openssl) \
- $(use_enable static-libs static) \
- ${myconf}
-}
-
-src_compile() {
- emake
-
- emake -C src/sql
-}
-
-src_install() {
- emake DESTDIR="${D}" install
-
- emake DESTDIR="${D}" -C src/sql install
-
- newinitd "${FILESDIR}/${PN}.initd" ${PN}
- newconfd "${FILESDIR}/${PN}.confd" ${PN}
-
- # Documentation
- dodoc NEWS TODO
- use doc && dohtml -r doc/*
-
- # Examples and extras
- # mv some files that get installed to /usr/share/pgpool-II so that
- # they all wind up in the same place
- mv "${ED%/}/usr/share/${PN/2/-II}" "${ED%/}/usr/share/${PN}" || die
- into "/usr/share/${PN}"
- dobin src/sample/pgpool_remote_start
-
- # One more thing: Evil la files!
- find "${ED}" -name '*.la' -exec rm -f {} +
-}
diff --git a/dev-db/pgpool2/pgpool2-3.6.4.ebuild b/dev-db/pgpool2/pgpool2-3.6.4.ebuild
deleted file mode 100644
index e3a92f81d557..000000000000
--- a/dev-db/pgpool2/pgpool2-3.6.4.ebuild
+++ /dev/null
@@ -1,99 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-POSTGRES_COMPAT=( 9.{2..6} )
-
-inherit postgres-multi
-
-MY_P="${PN/2/-II}-${PV}"
-
-DESCRIPTION="Connection pool server for PostgreSQL"
-HOMEPAGE="http://www.pgpool.net/"
-SRC_URI="http://www.pgpool.net/download.php?f=${MY_P}.tar.gz -> ${MY_P}.tar.gz"
-LICENSE="BSD"
-SLOT="0"
-
-KEYWORDS="~amd64 ~x86"
-
-IUSE="doc memcached pam ssl static-libs"
-
-RDEPEND="
- ${POSTGRES_DEP}
- net-libs/libnsl:0=
- memcached? ( dev-libs/libmemcached )
- pam? ( sys-auth/pambase )
- ssl? ( dev-libs/openssl:* )
-"
-DEPEND="${RDEPEND}
- sys-devel/bison
- !!dev-db/pgpool
-"
-
-S=${WORKDIR}/${MY_P}
-
-pkg_setup() {
- postgres_new_user pgpool
-
- postgres-multi_pkg_setup
-}
-
-src_prepare() {
- eapply "${FILESDIR}/pgpool_run_paths-3.6.4.patch"
-
- postgres-multi_src_prepare
-}
-
-src_configure() {
- local myconf
- use memcached && \
- myconf="--with-memcached=\"${EROOT%/}/usr/include/libmemcached\""
- use pam && myconf+=' --with-pam'
-
- postgres-multi_foreach econf \
- --disable-rpath \
- --sysconfdir="${EROOT%/}/etc/${PN}" \
- --with-pgsql-includedir='/usr/include/postgresql-@PG_SLOT@' \
- --with-pgsql-libdir="/usr/$(get_libdir)/postgresql-@PG_SLOT@/$(get_libdir)" \
- $(use_with ssl openssl) \
- $(use_enable static-libs static) \
- ${myconf}
-}
-
-src_compile() {
- # Even though we're only going to do an install for the best slot
- # available, the extension bits in src/sql need some things outside
- # of that directory built, too.
- postgres-multi_foreach emake
- postgres-multi_foreach emake -C src/sql
-}
-
-src_install() {
- # We only need the best stuff installed
- postgres-multi_forbest emake DESTDIR="${D}" install
-
- # Except for the extension and .so files that each PostgreSQL slot needs
- postgres-multi_foreach emake DESTDIR="${D}" -C src/sql install
-
- newinitd "${FILESDIR}/${PN}.initd" ${PN}
- newconfd "${FILESDIR}/${PN}.confd" ${PN}
-
- # Documentation!
- dodoc NEWS TODO
- if use doc ; then
- postgres-multi_forbest emake DESTDIR="${D}" -C doc install
- fi
-
- # Examples and extras
- # mv some files that get installed to /usr/share/pgpool-II so that
- # they all wind up in the same place
- mv "${ED%/}/usr/share/${PN/2/-II}" "${ED%/}/usr/share/${PN}" || die
- into "/usr/share/${PN}"
- dobin src/sample/{pgpool_recovery,pgpool_recovery_pitr,pgpool_remote_start}
- insinto "/usr/share/${PN}"
- doins src/sample/{{pcp,pgpool,pool_hba}.conf.sample*,pgpool.pam}
-
- # One more thing: Evil la files!
- find "${ED}" -name '*.la' -exec rm -f {} +
-}
diff --git a/dev-db/pgpool2/pgpool2-3.6.5.ebuild b/dev-db/pgpool2/pgpool2-3.6.5.ebuild
deleted file mode 100644
index 830743a0c780..000000000000
--- a/dev-db/pgpool2/pgpool2-3.6.5.ebuild
+++ /dev/null
@@ -1,98 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-POSTGRES_COMPAT=( 9.{2..6} )
-
-inherit postgres-multi
-
-MY_P="${PN/2/-II}-${PV}"
-
-DESCRIPTION="Connection pool server for PostgreSQL"
-HOMEPAGE="http://www.pgpool.net/"
-SRC_URI="http://www.pgpool.net/download.php?f=${MY_P}.tar.gz -> ${MY_P}.tar.gz"
-LICENSE="BSD"
-SLOT="0"
-
-KEYWORDS="~amd64 ~x86"
-
-IUSE="doc memcached pam ssl static-libs"
-
-RDEPEND="
- ${POSTGRES_DEP}
- net-libs/libnsl:0=
- memcached? ( dev-libs/libmemcached )
- pam? ( sys-auth/pambase )
- ssl? ( dev-libs/openssl:* )
-"
-DEPEND="${RDEPEND}
- sys-devel/bison
- !!dev-db/pgpool
-"
-
-S=${WORKDIR}/${MY_P}
-
-pkg_setup() {
- postgres_new_user pgpool
-
- postgres-multi_pkg_setup
-}
-
-src_prepare() {
- eapply "${FILESDIR}/pgpool_run_paths-3.6.5.patch"
-
- postgres-multi_src_prepare
-}
-
-src_configure() {
- local myconf
- use memcached && \
- myconf="--with-memcached=\"${EROOT%/}/usr/include/libmemcached\""
- use pam && myconf+=' --with-pam'
-
- postgres-multi_foreach econf \
- --disable-rpath \
- --sysconfdir="${EROOT%/}/etc/${PN}" \
- --with-pgsql-includedir='/usr/include/postgresql-@PG_SLOT@' \
- --with-pgsql-libdir="/usr/$(get_libdir)/postgresql-@PG_SLOT@/$(get_libdir)" \
- $(use_with ssl openssl) \
- $(use_enable static-libs static) \
- ${myconf}
-}
-
-src_compile() {
- # Even though we're only going to do an install for the best slot
- # available, the extension bits in src/sql need some things outside
- # of that directory built, too.
- postgres-multi_foreach emake
- postgres-multi_foreach emake -C src/sql
-}
-
-src_install() {
- # We only need the best stuff installed
- postgres-multi_forbest emake DESTDIR="${D}" install
-
- # Except for the extension and .so files that each PostgreSQL slot needs
- postgres-multi_foreach emake DESTDIR="${D}" -C src/sql install
-
- newinitd "${FILESDIR}/${PN}.initd" ${PN}
- newconfd "${FILESDIR}/${PN}.confd" ${PN}
-
- # Documentation!
- dodoc NEWS TODO
- doman doc/src/sgml/man{1,8}/*
- use doc && dodoc -r doc/src/sgml/html
-
- # Examples and extras
- # mv some files that get installed to /usr/share/pgpool-II so that
- # they all wind up in the same place
- mv "${ED%/}/usr/share/${PN/2/-II}" "${ED%/}/usr/share/${PN}" || die
- into "/usr/share/${PN}"
- dobin src/sample/{pgpool_recovery,pgpool_recovery_pitr,pgpool_remote_start}
- insinto "/usr/share/${PN}"
- doins src/sample/{{pcp,pgpool,pool_hba}.conf.sample*,pgpool.pam}
-
- # One more thing: Evil la files!
- find "${ED}" -name '*.la' -exec rm -f {} +
-}
diff --git a/dev-db/pgpool2/pgpool2-3.6.7.ebuild b/dev-db/pgpool2/pgpool2-3.6.7.ebuild
deleted file mode 100644
index 830743a0c780..000000000000
--- a/dev-db/pgpool2/pgpool2-3.6.7.ebuild
+++ /dev/null
@@ -1,98 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-POSTGRES_COMPAT=( 9.{2..6} )
-
-inherit postgres-multi
-
-MY_P="${PN/2/-II}-${PV}"
-
-DESCRIPTION="Connection pool server for PostgreSQL"
-HOMEPAGE="http://www.pgpool.net/"
-SRC_URI="http://www.pgpool.net/download.php?f=${MY_P}.tar.gz -> ${MY_P}.tar.gz"
-LICENSE="BSD"
-SLOT="0"
-
-KEYWORDS="~amd64 ~x86"
-
-IUSE="doc memcached pam ssl static-libs"
-
-RDEPEND="
- ${POSTGRES_DEP}
- net-libs/libnsl:0=
- memcached? ( dev-libs/libmemcached )
- pam? ( sys-auth/pambase )
- ssl? ( dev-libs/openssl:* )
-"
-DEPEND="${RDEPEND}
- sys-devel/bison
- !!dev-db/pgpool
-"
-
-S=${WORKDIR}/${MY_P}
-
-pkg_setup() {
- postgres_new_user pgpool
-
- postgres-multi_pkg_setup
-}
-
-src_prepare() {
- eapply "${FILESDIR}/pgpool_run_paths-3.6.5.patch"
-
- postgres-multi_src_prepare
-}
-
-src_configure() {
- local myconf
- use memcached && \
- myconf="--with-memcached=\"${EROOT%/}/usr/include/libmemcached\""
- use pam && myconf+=' --with-pam'
-
- postgres-multi_foreach econf \
- --disable-rpath \
- --sysconfdir="${EROOT%/}/etc/${PN}" \
- --with-pgsql-includedir='/usr/include/postgresql-@PG_SLOT@' \
- --with-pgsql-libdir="/usr/$(get_libdir)/postgresql-@PG_SLOT@/$(get_libdir)" \
- $(use_with ssl openssl) \
- $(use_enable static-libs static) \
- ${myconf}
-}
-
-src_compile() {
- # Even though we're only going to do an install for the best slot
- # available, the extension bits in src/sql need some things outside
- # of that directory built, too.
- postgres-multi_foreach emake
- postgres-multi_foreach emake -C src/sql
-}
-
-src_install() {
- # We only need the best stuff installed
- postgres-multi_forbest emake DESTDIR="${D}" install
-
- # Except for the extension and .so files that each PostgreSQL slot needs
- postgres-multi_foreach emake DESTDIR="${D}" -C src/sql install
-
- newinitd "${FILESDIR}/${PN}.initd" ${PN}
- newconfd "${FILESDIR}/${PN}.confd" ${PN}
-
- # Documentation!
- dodoc NEWS TODO
- doman doc/src/sgml/man{1,8}/*
- use doc && dodoc -r doc/src/sgml/html
-
- # Examples and extras
- # mv some files that get installed to /usr/share/pgpool-II so that
- # they all wind up in the same place
- mv "${ED%/}/usr/share/${PN/2/-II}" "${ED%/}/usr/share/${PN}" || die
- into "/usr/share/${PN}"
- dobin src/sample/{pgpool_recovery,pgpool_recovery_pitr,pgpool_remote_start}
- insinto "/usr/share/${PN}"
- doins src/sample/{{pcp,pgpool,pool_hba}.conf.sample*,pgpool.pam}
-
- # One more thing: Evil la files!
- find "${ED}" -name '*.la' -exec rm -f {} +
-}
diff --git a/dev-db/pgpool2/pgpool2-3.6.6.ebuild b/dev-db/pgpool2/pgpool2-3.7.1.ebuild
index 830743a0c780..4a6fed48f203 100644
--- a/dev-db/pgpool2/pgpool2-3.6.6.ebuild
+++ b/dev-db/pgpool2/pgpool2-3.7.1.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
EAPI=6
-POSTGRES_COMPAT=( 9.{2..6} )
+POSTGRES_COMPAT=( 9.{2..6} 10 )
inherit postgres-multi
diff --git a/dev-db/pgtap/Manifest b/dev-db/pgtap/Manifest
index eeab596dc81a..7a54484d7c84 100644
--- a/dev-db/pgtap/Manifest
+++ b/dev-db/pgtap/Manifest
@@ -1,8 +1,3 @@
-AUX pgtap-pg_config_override.patch 1045 BLAKE2B e72b709ca1f565523ef96f034c80e543341f3912613ba3a7813ad02702d3378725cd94ce185ed79053cc49a948e84cfc7085eafed42c7c3891461e35b26671df SHA512 ac84f139d910a9f6394d9ceb8430b8f7c5768f9792ffad1b9b265ef4de45fc9d08b0961d04026a9a44c0c161f14e77acca52807191b3e07821a970a511a935fc
-DIST pgtap-0.93.0.zip 219355 BLAKE2B 0fc2a06bc623aa74a77905f6ee3d9c448c7863fe76098e355c478a0b663614a9e995044bad41a0671e12d2f5725ed5da5b01007b30f690ead035447a82d73e73 SHA512 6165f8bd107168a3955c3ec4c63277ce9fce31d7c375fdfe13cb31b7df71cb9aae4b20a1c2d961fba97e3ae207b45b8daf9174f0701a220e52f4ffb53dddea94
-DIST pgtap-0.97.0.zip 260089 BLAKE2B ac04be5e9e317b10ab8e944bdfc33d0444db989def18843adfa6c0238d56d041f40cbba8af62eb9152b19a397f140ff789d81c4723d2aadb39b1836f0de8e52a SHA512 8d1a87b6060e28150c580383b0151553dc9c588145a3888d1b2313770283c327bb50820eee3db8cfa5d21e4664272c1538cd3784908fd042c7e788b4558a0df5
DIST pgtap-0.98.0.zip 270583 BLAKE2B 25d409f5fc63bc7059e8a4ffd3cb460885648f8569cd10ca05d4c5fbe09af323ecc719d663f81389d45f4a4910ca77beef968e264a0d3f4fabf63fa30b8b98ac SHA512 478841aa9cf378120713b90f33dc16d40fdd030ee1856edd4bfa288a7803cabad09661cf5219925335d9220e12b6202a1fcd8cc0fc55d1974d1e98dc0f6ddac0
-EBUILD pgtap-0.93.0.ebuild 1094 BLAKE2B d5e6450fba45c0e9a7c4d540c4de309b3898a1390916097975e3eb501c522ad65bda350202903469a7af6140c58c681f3a69f8e36253f49f8d22d2be1472d933 SHA512 3669d55eb1bd4a9fa30e38b2699f77ebe0c4bdd77daec4af8906188031bab8b07274dccb6a0d90ce627ab23d648bfc80a5806391c2366cfae20e2eb3facdeeb7
-EBUILD pgtap-0.97.0.ebuild 467 BLAKE2B fa84a8a231756d8e18f13c60c107185df4ee692ea921e69d8e4ae65d05f1ea20e54e781d18b8646c8daef6025883e06bd0cfed9176fbe3ec9401de17a98bb0b9 SHA512 803a340ea66b873dd932151def432ea435b28774dff15b9470165035f72def9d78a233caefd5b6f672ea5e953e11289368c5f33473bced4e1fd1d2b8540d2299
EBUILD pgtap-0.98.0.ebuild 469 BLAKE2B f7b107484fa96f18584f832c9bb55ad6c9519dec8a1e15122b8d46eb33cce3d4b713a4362910e91fcecabf2c62c53c5530644cf0aad6207a35999a99ae8a953d SHA512 43b4e81afa83d0a34df82210a1db1dd635275c4589a47ba374b49ded125ac25d910f7837c493230689a6c519f1fa1041310631cf375687c4d600a5f2d803e735
MISC metadata.xml 628 BLAKE2B 8a671273bb0de6f11d5ea56a3bf38e9eee05c0a70ff8cefe183f0eb798afbead29e96d5a45f764e2afc437cc97d91590e648c6716a8dd8fa7a6cc9f072332e0c SHA512 1c06c14ea5af9248950e6c10ab877b0725c4885082211db94b8a195fdf0dd115dc584a325655b7155895ec4382008e03511aa238d43179310fbe3dc835f5270a
diff --git a/dev-db/pgtap/files/pgtap-pg_config_override.patch b/dev-db/pgtap/files/pgtap-pg_config_override.patch
deleted file mode 100644
index 2034b233f00c..000000000000
--- a/dev-db/pgtap/files/pgtap-pg_config_override.patch
+++ /dev/null
@@ -1,25 +0,0 @@
-diff -Naurw pgtap-0.93.0.orig/Makefile pgtap-0.93.0/Makefile
---- pgtap-0.93.0.orig/Makefile 2013-01-28 20:14:20.000000000 +0000
-+++ pgtap-0.93.0/Makefile 2013-03-30 16:02:45.077880109 +0000
-@@ -9,14 +9,15 @@
- DOCS = doc/pgtap.mmd
- REGRESS = $(patsubst test/sql/%.sql,%,$(TESTS))
- REGRESS_OPTS = --inputdir=test --load-language=plpgsql
-+ifndef PG_CONFIG
- PG_CONFIG = pg_config
-+endif
-
- ifdef NO_PGXS
- top_builddir = ../..
- PG_CONFIG := $(top_builddir)/src/bin/pg_config/pg_config
- else
- # Run pg_config to get the PGXS Makefiles
--PG_CONFIG = pg_config
- PGXS := $(shell $(PG_CONFIG) --pgxs)
- endif
-
-@@ -145,4 +146,3 @@
- MultiMarkdown.pl doc/pgtap.mmd > doc/pgtap.html
- ./tocgen doc/pgtap.html 2> doc/toc.html
- perl -MPod::Simple::XHTML -E "my \$$p = Pod::Simple::XHTML->new; \$$p->html_header_tags('<meta http-equiv=\"Content-Type\" content=\"text/html; charset=UTF-8\">'); \$$p->strip_verbatim_indent(sub { (my \$$i = \$$_[0]->[0]) =~ s/\\S.*//; \$$i }); \$$p->parse_from_file('`perldoc -l pg_prove`')" > doc/pg_prove.html
--
diff --git a/dev-db/pgtap/pgtap-0.93.0.ebuild b/dev-db/pgtap/pgtap-0.93.0.ebuild
deleted file mode 100644
index 1e2fc503e373..000000000000
--- a/dev-db/pgtap/pgtap-0.93.0.ebuild
+++ /dev/null
@@ -1,52 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-inherit eutils
-
-DESCRIPTION="Unit testing for PostgreSQL"
-HOMEPAGE="http://pgtap.org/"
-SRC_URI="http://api.pgxn.org/dist/${PN}/${PV}/${P}.zip"
-
-LICENSE="POSTGRESQL"
-SLOT="0"
-KEYWORDS="amd64"
-IUSE=""
-
-DEPEND=">=dev-db/postgresql-8.4
- dev-perl/TAP-Parser-SourceHandler-pgTAP
-"
-RDEPEND="${DEPEND}"
-
-src_prepare() {
- epatch "${FILESDIR}/pgtap-pg_config_override.patch"
-
- local pgslots=$(eselect --brief postgresql list)
- local pgslot
- for pgslot in ${pgslots} ; do
- mkdir -p "${WORKDIR}/${pgslot}"
- cp -R "${S}" "${WORKDIR}/${pgslot}"
- done
-}
-
-src_configure() {
- :
-}
-
-src_compile() {
- local pgslots=$(eselect --brief postgresql list)
- local pgslot
- for pgslot in ${pgslots} ; do
- cd "${WORKDIR}/${pgslot}/${P}"
- PG_CONFIG="pg_config${pgslot//.}" emake
- done
-}
-
-src_install() {
- local pgslots=$(eselect --brief postgresql list)
- local pgslot
- for pgslot in ${pgslots} ; do
- cd "${WORKDIR}/${pgslot}/${P}"
- PG_CONFIG="pg_config${pgslot//.}" emake DESTDIR="${D}" install
- done
-}
diff --git a/dev-db/pgtap/pgtap-0.97.0.ebuild b/dev-db/pgtap/pgtap-0.97.0.ebuild
deleted file mode 100644
index ac184400535a..000000000000
--- a/dev-db/pgtap/pgtap-0.97.0.ebuild
+++ /dev/null
@@ -1,26 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-POSTGRES_COMPAT=( 9.{2..6} )
-
-inherit postgres-multi
-
-DESCRIPTION="Unit testing for PostgreSQL"
-HOMEPAGE="http://pgtap.org/"
-SRC_URI="http://api.pgxn.org/dist/${PN}/${PV}/${P}.zip"
-
-LICENSE="POSTGRESQL"
-SLOT="0"
-KEYWORDS="~amd64"
-IUSE=""
-
-DEPEND="${POSTGRES_DEP}
- dev-perl/TAP-Parser-SourceHandler-pgTAP
-"
-RDEPEND="${DEPEND}"
-
-src_configure() {
- :
-}
diff --git a/dev-db/pspg/Manifest b/dev-db/pspg/Manifest
index e1f4d7dae182..f9d8c6cdb5a6 100644
--- a/dev-db/pspg/Manifest
+++ b/dev-db/pspg/Manifest
@@ -1,5 +1,7 @@
DIST pspg-0.8.0.tar.gz 850508 BLAKE2B 2f2fb7f094f72f0b5d1c959ab73a355ea2ced155fdb64adef21eb70c4991b057e31688128f50db2d6a84ab850b57ab59d50c0dd5ba06998af11ff3a5479cc9bd SHA512 758d47e041f4c7c91ad2033fb95e6d33a27b6f896077dbcb287331496e47740c31c6ba6bf7ea01ad6c1a3c3d4c5e525b268795a16f9c819f4d489d3e98fa3092
DIST pspg-0.9.0.tar.gz 853226 BLAKE2B 7fc73a02557991c24892f47f09a4402fea691047a41ed91e0b4d3fac8fe2fbfc02530615d1123288b641dba7b1db8ba524156351e494a37ca7072853e1f028ee SHA512 a752570ab1a7bca5d69c602a2e8bc0ec92a6ce405b7170bc1a25ed2ae29b0e69fa7833979ccbb5bd1adbaad968067928f26044eef902069edfe662812e9d3edd
+DIST pspg-0.9.1.tar.gz 853229 BLAKE2B 791a8d05ac549b869a3d31578277709f17a50b9aebf3ea84ffb30199ebdda8faae6828e4f5068880fc1e74d57d88086bf363b1825789d4968ed77087561a5435 SHA512 40fb07153c36e2e170ddd1fda18a9c2e663e7995367c2ac30e136f65e07d36f812bf69f886767fa71588d548d90c47c442c0503fdc775b5f61826e60672d9d54
EBUILD pspg-0.8.0.ebuild 389 BLAKE2B 965a10bfaeb36e9e5436d3870a109a71a763310e8ba2b1f2e2027c33def5af549b7c3d4a1ea3204bd174fdedd84ce9b57739a7f0a33f0e79a1928a3552c3532a SHA512 036103ff39c94b193a5d0dc24ba9d646d658003e843383d825dbbc2eebb71a775bc5c0c20bdeefc8d193fd874a2b9277c110e2387d6de0590561e9b2186e1f47
EBUILD pspg-0.9.0.ebuild 389 BLAKE2B 30ebc1a109cc694a1bcb8f612d36a51570d7df89cd5c55e6142581783e6afb958512c5de4c1bc446828c36acc3c6788da001c98ee0d60a1153ff454b693bf381 SHA512 3c62b0fbaacd4be5248cd7101cc91511f9bb321a0437b65e17848d1ab30338d1de64d674d43feb4c8c33513c8b4215545b3548994167eba20e9860955a2d3e6d
+EBUILD pspg-0.9.1.ebuild 389 BLAKE2B 30ebc1a109cc694a1bcb8f612d36a51570d7df89cd5c55e6142581783e6afb958512c5de4c1bc446828c36acc3c6788da001c98ee0d60a1153ff454b693bf381 SHA512 3c62b0fbaacd4be5248cd7101cc91511f9bb321a0437b65e17848d1ab30338d1de64d674d43feb4c8c33513c8b4215545b3548994167eba20e9860955a2d3e6d
MISC metadata.xml 298 BLAKE2B 40abb765b052aa2cbbf749c54c686f1c98968cb1af2e93c149bfbfe6244d3c17e827189d7a1da90a566016758bfbed63b16ad0a0328725349748d1b18b2437b1 SHA512 167896d1d92ccb4b171cce16d63405369a9e28b0d01c12b2ed94fcec1f982892e179c007287fc3386e1c00393d6570a2ae9e8efe9420e53a82308426075d5c89
diff --git a/dev-db/pspg/pspg-0.9.1.ebuild b/dev-db/pspg/pspg-0.9.1.ebuild
new file mode 100644
index 000000000000..9b1b64baa6d0
--- /dev/null
+++ b/dev-db/pspg/pspg-0.9.1.ebuild
@@ -0,0 +1,16 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+DESCRIPTION="A better pager for psql and mysql"
+HOMEPAGE="https://github.com/okbob/${PN}"
+SRC_URI="https://github.com/okbob/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="BSD-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+DEPEND="sys-libs/ncurses:*"
+RDEPEND="${DEPEND}"
diff --git a/dev-db/psqlodbc/Manifest b/dev-db/psqlodbc/Manifest
index 29b9f8d4c7f3..1fbbf10b1e5c 100644
--- a/dev-db/psqlodbc/Manifest
+++ b/dev-db/psqlodbc/Manifest
@@ -1,9 +1,5 @@
-DIST psqlodbc-09.06.0200.tar.gz 887807 BLAKE2B e9f022189f3bf8484dbdb6ced330f288b5f2776be696531c97a121f78123032b1f16687ef9b0f76dacbd6d80da87529a0184abb7e43b18a9c39101256c0dee2c SHA512 d8e3b6c13e657b4a3435ace94e6e1265a5a1a7bcd3a1f81348ca4edcb532b66036e3595ecd7224d3104f6a3f2e02704f73c1b62d94e9879528933edef7764552
-DIST psqlodbc-09.06.0300.tar.gz 898065 BLAKE2B 736a718ddc207a136dc443141ddca0b8bb341b495bd6e9d395b6ebac84edd8f0d131b9addf57413390f378eb785ee7706e321bc9f84b586612d1192e4f74300e SHA512 c7e31138888307bd25ff80c0796deb653a1e8f57af85ff91f9f307c2b3b683d9d8bc4b18a837dc604a9f896f85ee489a6678a2a69782258b17bdb9d2911e968c
-DIST psqlodbc-09.06.0310.tar.gz 898154 BLAKE2B 305c6aedd445f5e1aedadc08e875479eaebc90d60b2210a5afe9f4d224b495f98896e7131c543683200b04ace5d8ffbede15b9dee19c557995116378ff3d5aac SHA512 ccd6536a4065428d906be74c4381471c01b386668be3746daabaa9a9b8ef6fb09c42e400fe1207b6e3336b8625716b6bd9a61e9b88080f4f7cd233e96cb55f8a
DIST psqlodbc-10.00.0000.tar.gz 914115 BLAKE2B 3f1753a43b4707c0cb723df756b3d9a0177452231fd950a7bec4e5fc35bcd03012f64d2e0b64c1f7cdae375d2ff9211272537c6a76e044fcb3ac277752dff9a5 SHA512 95898b0030778f2f002b0820180de7261387cd7161231a000523ab84f3aa106436a4e6598b40936ab313a5cf578657548f833f58791eba50160c40be4ef3d275
-EBUILD psqlodbc-09.06.0200.ebuild 718 BLAKE2B 019fb51705771bcb54c0e39f338e60f20d19f0becccfc08eeb74a0319d8be1c149c2abc7a2de6e0d48f1bd73ed6bf342b4d27186edb63033e7ae6bbeb1dcd1e0 SHA512 523f1939b1136ae7baa1b23ad99d5643b19edc7ad8815681e7cb1ad19e7499a2cdc33c7c8f3255531a7d1115db909196b1d85261b419d2e0a3d623fb56179c83
-EBUILD psqlodbc-09.06.0300.ebuild 684 BLAKE2B 041e34ef73f41f34b75bdc4dc8227b9e21b39388ccd5d3506129a7d880d90b7b595afab17756e4783749ac99863fee7416f597e3871a4600c497e5fd50de2fa5 SHA512 62e2bde253fe3718b48a8e62eabc7d634568c2047e750f98addfd6c297cde3395a460d69b97e64551aa89e8c0008bb39b10bec8f224ec38e587bb1aea4c743b8
-EBUILD psqlodbc-09.06.0310.ebuild 684 BLAKE2B 041e34ef73f41f34b75bdc4dc8227b9e21b39388ccd5d3506129a7d880d90b7b595afab17756e4783749ac99863fee7416f597e3871a4600c497e5fd50de2fa5 SHA512 62e2bde253fe3718b48a8e62eabc7d634568c2047e750f98addfd6c297cde3395a460d69b97e64551aa89e8c0008bb39b10bec8f224ec38e587bb1aea4c743b8
+DIST psqlodbc-10.01.0000.tar.gz 915109 BLAKE2B a09de8218dbfbacf7972fc02c02863891ed65d19b86217a646aa0176ad7a8b962da83bb5036ad11b819a583409e4d1f3ce257a0457838000bc9cc060753c67b3 SHA512 1c5b9732a9c7e7bff0fd0a04cc7f0b45db9150486a2c3a8a96d85fb55e9296a80f12ee652cfb7ff54700e7dfc10accf9e5420b7ca798df31be51f997bbda88aa
EBUILD psqlodbc-10.00.0000.ebuild 684 BLAKE2B 041e34ef73f41f34b75bdc4dc8227b9e21b39388ccd5d3506129a7d880d90b7b595afab17756e4783749ac99863fee7416f597e3871a4600c497e5fd50de2fa5 SHA512 62e2bde253fe3718b48a8e62eabc7d634568c2047e750f98addfd6c297cde3395a460d69b97e64551aa89e8c0008bb39b10bec8f224ec38e587bb1aea4c743b8
+EBUILD psqlodbc-10.01.0000.ebuild 684 BLAKE2B 07f0532b350973ec74283caea9f698980e90bb3448d7611805b2847c2c44b1ac13fba5beb7fc833bf04d7f042956fbfd8ac69a147c7c3e64146ab9ffce46a282 SHA512 2ea7c9c760d05f9e4f981d7ee410bc1e668994ed4971a421a8c3059b2f8ab741c3ecbc905d08861d5f66e09d4fb0f39c6851030e72eaec36c3d631fa09d9fb95
MISC metadata.xml 366 BLAKE2B 9ec9629e72aec8407fc260e061f7bfe22f4ed13c6a4a99ddfffbd16eeac41cc09bcbe10045f6e4cba92d7ced6a874b09b7a7614aedd7cd45afa6e03e096f869e SHA512 a6aa6cbb188fa2ed889ecb69c60b77d33c52ee69a5e9b3c20d8faf9bd9616d33f592c85bded3351fb099b6424e2f7728ee11fb1114121604ceacd9e7e0a13f7b
diff --git a/dev-db/psqlodbc/psqlodbc-09.06.0200.ebuild b/dev-db/psqlodbc/psqlodbc-09.06.0200.ebuild
deleted file mode 100644
index 1b84488b8768..000000000000
--- a/dev-db/psqlodbc/psqlodbc-09.06.0200.ebuild
+++ /dev/null
@@ -1,33 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-DESCRIPTION="Official ODBC driver for PostgreSQL"
-HOMEPAGE="http://www.postgresql.org/"
-SRC_URI="mirror://postgresql/odbc/versions/src/${P}.tar.gz"
-SLOT="0"
-LICENSE="LGPL-2"
-KEYWORDS="~amd64 ~x86"
-IUSE="doc iodbc ssl threads unicode"
-
-DEPEND="dev-db/postgresql:*[ssl?]
- !iodbc? ( dev-db/unixODBC )
- iodbc? ( dev-db/libiodbc )
-"
-RDEPEND="${DEPEND}"
-
-src_configure() {
- econf \
- $(use_with iodbc) \
- $(use_with !iodbc unixodbc) \
- $(use_enable threads pthreads) \
- $(use_enable unicode)
-}
-
-src_install() {
- emake DESTDIR="${D}" install
-
- dodoc readme.txt
- use doc && dodoc docs/*{html,jpg,txt}
-}
diff --git a/dev-db/psqlodbc/psqlodbc-09.06.0300.ebuild b/dev-db/psqlodbc/psqlodbc-09.06.0300.ebuild
deleted file mode 100644
index 0db49481b159..000000000000
--- a/dev-db/psqlodbc/psqlodbc-09.06.0300.ebuild
+++ /dev/null
@@ -1,32 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-DESCRIPTION="Official ODBC driver for PostgreSQL"
-HOMEPAGE="http://www.postgresql.org/"
-SRC_URI="mirror://postgresql/odbc/versions/src/${P}.tar.gz"
-SLOT="0"
-LICENSE="LGPL-2"
-KEYWORDS="~amd64 ~x86"
-IUSE="doc iodbc ssl threads"
-
-DEPEND="dev-db/postgresql:*[ssl?]
- !iodbc? ( dev-db/unixODBC )
- iodbc? ( dev-db/libiodbc )
-"
-RDEPEND="${DEPEND}"
-
-src_configure() {
- econf \
- $(use_with iodbc) \
- $(use_with !iodbc unixodbc) \
- $(use_enable threads pthreads)
-}
-
-src_install() {
- emake DESTDIR="${D}" install
-
- dodoc readme.txt
- use doc && dodoc docs/*{html,jpg,txt}
-}
diff --git a/dev-db/psqlodbc/psqlodbc-09.06.0310.ebuild b/dev-db/psqlodbc/psqlodbc-10.01.0000.ebuild
index 0db49481b159..a7d8360210f1 100644
--- a/dev-db/psqlodbc/psqlodbc-09.06.0310.ebuild
+++ b/dev-db/psqlodbc/psqlodbc-10.01.0000.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
EAPI="6"
diff --git a/dev-db/sqldeveloper/Manifest b/dev-db/sqldeveloper/Manifest
index cc1ae0284818..a8c6047cea52 100644
--- a/dev-db/sqldeveloper/Manifest
+++ b/dev-db/sqldeveloper/Manifest
@@ -1,9 +1,9 @@
AUX sqldeveloper 325 BLAKE2B e89acd5441362bc693296e2fef189e637944413094169c09be73bb1f514393f0239c7f4c5b186dd0e34bd1bda9730f4bb2e029b166f1db740ac34eff25097c84 SHA512 ab1d70c5b693efe5e6270d7fcd0ba7ef30852ed98fe88a1853c5b415178c51bbb754a4da6964b5e57e87c38015cc90ac2fc04b7aa121b660300434523457bad2
AUX sqldeveloper-r1 407 BLAKE2B 26bf826e6ccf1cd45b52e7cdf6e694d88570118c0e98cab83f66f078ed79fea36fb3fa6df67dc271a74faad4307996c4968f6d316d9fc71d1a5360804f39782e SHA512 cf089f58c9de3677dbaa7b0c4bdd81e234bffac4c25f5a433c7854068ca33b5a4165d8a5d24188890d5d8c60c209adee5267a255505b978a5a7f73646fd1dfbe
-DIST sqldeveloper-4.0.2.15.21-no-jre.zip 235443867 SHA256 b23aca1d256002cdc19a0b3136ae13ebf9064feacc45a131be229a88fe9faed7 SHA512 e67b0f3d127adbc6cb77b3eb822834a6c41be7039c54eceb85e8c882704684a02dd036f078408192ad2cbcb963dfb0ba583e99a9f7b7db36b1e9a1f96e555880 WHIRLPOOL 31b32713f116193036dc5dd9b63c9b6c321763e2273227c51d70bd3db93575e4f12150a045f8615fb6086ee1d464af4d112be5824f9bf22b4f5917ae5a15b724
-DIST sqldeveloper-4.1.3.20.78-no-jre.zip 331401110 SHA256 10caec7183f4075033598faf272d2be82207261442abf3bc3bd899246968b8de SHA512 828a751bc9df7bdc59f9b89b317189826e328671d081df24d39a102aeefaf5a0a56e01e066802da1ee92617bf1fdb77ad598b448043dd7f4239f2103efb4427b WHIRLPOOL 8eee4fbc34617f721893ab880be9c7c27ac8d5378491ba97bcd0084660ad500e2c0e4812ea5b25f8cd907e2c689168af08bbccfdc0b51f04cc0d74bf0760e009
-DIST sqldeveloper-4.1.5.21.78-no-jre.zip 349775471 SHA256 1b6a5ea4f12306eaa41e4ad961d2cae4e4ccbdcb4b89d85f3d8f88a883f06967 SHA512 06535a2d60ce140fa08cf937e9bb38d0a8ecefcb1b68675b547d4682c2e514ba62121e4363cf655c10de149e39a5e7d1d4a61c8cf79d7388b2998bf9b0098601 WHIRLPOOL ceb60934100a9184c734d2d07bdde752a384f807934186f54618479de6af19a114a879edee52214bce71509e4b2a22dca8fa988f4f91202d29bceaaf8cbe67e9
-DIST sqldeveloper-4.2.0.17.089.1709-no-jre.zip 348604841 SHA256 866042c85f66ef022c256d726b4e2e0e8014be7b41346cfd84a56fe677d78b6a SHA512 4d1e270376ae125a60146228e35fcb2cb615d593c0e9f2ca98e4deef4d8fd1ddff59cf15064d63e33e77125f49e8da9fe317ed1fd96a9b00a699bf6c5e739874 WHIRLPOOL 695130acfed58678d92521cc86a6b6aaa51d400c6bec61b6e95eecb156cc4925483a2f687b2b942fb88dfbc7440a02d0444a9a4d242258ebad605a5fa589afbf
+DIST sqldeveloper-4.0.2.15.21-no-jre.zip 235443867 BLAKE2B 41982f06998653c6dc67ea368fc244646b93ba83f7b02e58a4f172b5b2fd613873f1eb4a5f9f01f0a6b2c412f558fc9cb1e4efb2de75bfc3b7a43816a247d1f8 SHA512 e67b0f3d127adbc6cb77b3eb822834a6c41be7039c54eceb85e8c882704684a02dd036f078408192ad2cbcb963dfb0ba583e99a9f7b7db36b1e9a1f96e555880
+DIST sqldeveloper-4.1.3.20.78-no-jre.zip 331401110 BLAKE2B e4bd3e660bcc0a131d9c2cc0bc4b49c8b4e6051b7162e38e86105d30931d2207767ec1ea38eaa61dad31804802c2a010f70f752700f9eb52a5e9bbf936b957f6 SHA512 828a751bc9df7bdc59f9b89b317189826e328671d081df24d39a102aeefaf5a0a56e01e066802da1ee92617bf1fdb77ad598b448043dd7f4239f2103efb4427b
+DIST sqldeveloper-4.1.5.21.78-no-jre.zip 349775471 BLAKE2B 87a4288b493306971f9aee490223843d76ed2c19c5353a3021295ddf13de6b552e3a8c03f4fd48d8150583982942f205ae261c0f4b41ba146de3c785560d039a SHA512 06535a2d60ce140fa08cf937e9bb38d0a8ecefcb1b68675b547d4682c2e514ba62121e4363cf655c10de149e39a5e7d1d4a61c8cf79d7388b2998bf9b0098601
+DIST sqldeveloper-4.2.0.17.089.1709-no-jre.zip 348604841 BLAKE2B 0c3adff04f148102e6460c7550f787329c7e5a69aca0b81c2de4725b9c9ea27c03bb2f588671a95371aa3612839805f2042855b443bb5635c70d0e0b2140295b SHA512 4d1e270376ae125a60146228e35fcb2cb615d593c0e9f2ca98e4deef4d8fd1ddff59cf15064d63e33e77125f49e8da9fe317ed1fd96a9b00a699bf6c5e739874
EBUILD sqldeveloper-4.0.2.15.21.ebuild 2996 BLAKE2B 83bbeb25044d805ae355e08440be4ee4580d0046e0ed23df186649d3e614ac309e714d292d39ba488b54855a7822a6129d7bcc1f81aa72c13d9c866a29d2a02f SHA512 3bc5b623272f8da7b2d3af934bd3a767aab54145a76693b1f3cf57d30da80e0ce986ce4068a7bbae57c01c59ec0e992e35dc14303d5b07dc8101c078afbb859f
EBUILD sqldeveloper-4.1.3.20.78-r1.ebuild 3192 BLAKE2B 8796cf35f38a845f3032d65976929a344ebca2939d30d5b5e69455e3d6e8441fe6aa5385b6db46805c28328b08c8ba17457249df7402d42ff16ddef75737c0c2 SHA512 6eb54e872d31ede49c537c625590d4be515a2d33b63027b71756709731eb2d9ceff6665dc5b31bf51f62a72bb13e174a3ef0306981790f69438cb1c8fec075e0
EBUILD sqldeveloper-4.1.5.21.78.ebuild 3192 BLAKE2B 8796cf35f38a845f3032d65976929a344ebca2939d30d5b5e69455e3d6e8441fe6aa5385b6db46805c28328b08c8ba17457249df7402d42ff16ddef75737c0c2 SHA512 6eb54e872d31ede49c537c625590d4be515a2d33b63027b71756709731eb2d9ceff6665dc5b31bf51f62a72bb13e174a3ef0306981790f69438cb1c8fec075e0