diff --git a/Manifest.files.gz b/Manifest.files.gz
index c253b3693c77..185c8cfb7f0c 100644
Binary files a/Manifest.files.gz and b/Manifest.files.gz differ
diff --git a/app-admin/Manifest.gz b/app-admin/Manifest.gz
index 4ba08c916185..e786eb174b5f 100644
Binary files a/app-admin/Manifest.gz and b/app-admin/Manifest.gz differ
diff --git a/app-admin/keepass/Manifest b/app-admin/keepass/Manifest
index 2f194778bf5b..a8db08e87e86 100644
--- a/app-admin/keepass/Manifest
+++ b/app-admin/keepass/Manifest
@@ -1 +1,2 @@
DIST KeePass-2.37-Source.zip 5080663 BLAKE2B bf74c93eb732d607fe87dc29d3e429b37f1052b258e980127ce1f687423a790bfe298f06c1c459888c60b066a45053447fbaed730e3d38cd6b6dd48d53fbdc34 SHA512 d094793a3216181ae375fb1343a809a20c358786bdf369c0171e5b7ca17a74bada314875cf410d84efaa4fa2b13e199de9be3c60f5f4e2c189241e4fffec8ad8
+DIST KeePass-2.38-Source.zip 5091900 BLAKE2B 22e3f7046984204a3e0c4a1c6d8303661048bc0fee4bcdb7999b521d0ed6e5463d89044d2897cfec0c932349cc80a7b43d4c8dfbceb4f2e88041c642e0c0d231 SHA512 42fa7274874d4858da360a6772eb25adbf3a6dafe375093459d9a25903d8c159360ea722e969fe8b330bccf62ee5d381e131bd0ba075445932d8019eee19bf20
diff --git a/app-admin/keepass/keepass-2.38.ebuild b/app-admin/keepass/keepass-2.38.ebuild
new file mode 100644
index 000000000000..03c01b537dff
--- /dev/null
+++ b/app-admin/keepass/keepass-2.38.ebuild
@@ -0,0 +1,111 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit eutils gnome2-utils xdg-utils
+
+MY_PN="KeePass"
+DESCRIPTION="A free, open source, light-weight and easy-to-use password manager"
+HOMEPAGE="http://keepass.info/"
+SRC_URI="mirror://sourceforge/${PN}/${MY_PN}-${PV}-Source.zip"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="aot"
+
+COMMON_DEPEND="dev-lang/mono"
+DEPEND="${COMMON_DEPEND}
+ app-arch/unzip
+"
+RDEPEND="${COMMON_DEPEND}
+ dev-dotnet/libgdiplus[cairo]
+"
+
+S="${WORKDIR}"
+PATCHES=( "${FILESDIR}/${PN}-2.36-xsl-path-detection.patch" )
+
+src_prepare() {
+ # KeePass looks for some XSL files in the same folder as the executable,
+ # we prefer to have it in /usr/share/KeePass. Apply patch using base function.
+ # This XSL file will not be upstreamed since the KeePass creator said that
+ # including this patch would break the Portable USB version of KeePass
+ # (which keeps/looks for xsl files in its own folder)
+ default
+
+ # Switch into build dir so the mono prepration script works correctly
+ cd Build || die
+ source PrepMonoDev.sh || die
+ cd ../ || die
+}
+
+src_compile() {
+ # Build with Release target
+ xbuild /target:KeePass /property:Configuration=Release || die
+
+ # Run Ahead Of Time compiler on the binary
+ if use aot; then
+ cp Ext/KeePass.exe.config Build/KeePass/Release/ || die
+ mono --aot -O=all Build/KeePass/Release/KeePass.exe || die
+ fi
+}
+
+src_install() {
+ # Wrapper script to launch mono
+ make_wrapper "${PN}" "mono /usr/$(get_libdir)/${PN}/KeePass.exe"
+
+ # Some XSL files
+ insinto "/usr/share/${PN}/XSL"
+ doins Ext/XSL/*
+
+ insinto "/usr/$(get_libdir)/${PN}/"
+ exeinto "/usr/$(get_libdir)/${PN}/"
+
+ doins Ext/KeePass.exe.config
+
+ # Default configuration, simply says to use user-specific configuration
+ doins Ext/KeePass.config.xml
+
+ # The actual executable
+ doexe Build/KeePass/Release/KeePass.exe
+
+ # Copy the AOT compilation result
+ if use aot; then
+ doexe Build/KeePass/Release/KeePass.exe.so
+ fi
+
+ # Prepare the icons
+ newicon -s 256 Ext/Icons_04_CB/Finals/plockb.png "${PN}.png"
+ newicon -s 256 -t gnome -c mimetypes Ext/Icons_04_CB/Finals/plockb.png "application-x-${PN}2.png"
+
+ # Create a desktop entry and associate it with the KeePass mime type
+ make_desktop_entry "${PN}" "${MY_PN}" "${PN}" "System;Security" "MimeType=application/x-keepass2;"
+
+ # MIME descriptor for .kdbx files
+ insinto /usr/share/mime/packages/
+ doins "${FILESDIR}/${PN}.xml"
+
+ # sed, because patching this really sucks
+ sed -i 's/mono/mono --verify-all/g' "${D}/usr/bin/keepass"
+}
+
+pkg_postinst() {
+ gnome2_icon_cache_update
+ xdg_desktop_database_update
+ xdg_mimeinfo_database_update
+
+ if ! has_version x11-misc/xdotool ; then
+ elog "Optional dependencies:"
+ elog " x11-misc/xdotool (enables autotype/autofill)"
+ fi
+
+ elog "Some systems may experience issues with copy and paste operations."
+ elog "If you encounter this, please install x11-misc/xsel."
+}
+
+pkg_postrm() {
+ gnome2_icon_cache_update
+ xdg_desktop_database_update
+ xdg_mimeinfo_database_update
+}
diff --git a/app-admin/mongo-tools/Manifest b/app-admin/mongo-tools/Manifest
index aef3a609055b..498276f23fda 100644
--- a/app-admin/mongo-tools/Manifest
+++ b/app-admin/mongo-tools/Manifest
@@ -5,4 +5,4 @@ DIST mongo-tools-3.2.13.tar.gz 2712076 BLAKE2B 66e76e049b6a322e05dea21c241d983eb
DIST mongo-tools-3.2.16.tar.gz 2720003 BLAKE2B e5cb694549b5c70cd07fc8e891b1a78cffec0f99aab62978c70d38c01d9b1ae9c401f9618d24d9afc036ae66657eac40f710076d177497b51c97b963cff31d86 SHA512 61c8cfd04a36e329c3573b73945d20a5623e1aa0a3430b309530e85e4289a27a46a850ec48ede7f04e66e67e23745ef26f5f4ddcf68ffeb647128e3d2526a724
DIST mongo-tools-3.2.17.tar.gz 2719970 BLAKE2B 666b67d8abdd10f7fa7c557e3c3906fb3cc6bcfa0b97a05e39e5f1ea923d2beb5ec249b3b0a521c4cce4bd595bf18672d8bce38152f84825bb3fffb058fd3b29 SHA512 62c2540027e07b8276621e08d13657864d16021030e3c8f9bc0d351454319d448f889cf6a48b8467ea3270365376ed0c3beb42ceae3f28357910148c6b4054b2
DIST mongo-tools-3.4.10.tar.gz 4719399 BLAKE2B 8165248bf58f2ea2b02e365a3609c72b72e98dd5902f176e251fa2add1ad26e90900e06c35dc6db4dbe161e541bedfc1776f5e15bbb41dcc9a7be17800424362 SHA512 b861bb3fb1a32c3aa2efefcf6a13bb6d4783ac1a9b006c477fd04deb338cbf6b7adc3944bc6919513b92bd96b8500813ff4af49c9dec0719ebd2fdaa99bc39a5
-DIST mongo-tools-3.6.1.tar.gz 4693844 BLAKE2B 1c6a600abf41a32cbac37cbcef540957e39b6e4574413ecedacdafc761e62b7bb45c285db985bbae01936fddbde0e8d10aa16cd512bd28ae3b60d072ac18b09e SHA512 15a073e92281b515d16c778ef3f540939dfaeaeb92afb303899ea3a7bbecd2782efa0ba05b9ed271660e9000c6108c05a28e2dec826880867c625d06ac65a0be
+DIST mongo-tools-3.6.2.tar.gz 4693924 BLAKE2B 61c44d579f6eb4013ee6c0118ebe89a2d454ef8cf6ad933479885cb71d169185272b03d9c63fa738d67bbd1b9efd4bc964eb17adcc5002508589d198cdb17752 SHA512 5ac2b1d2b33271f63c406c69bd8a576a21f4dcaa6f75839e0f907ebc9968f0e121eb3800e88da050c120856e7ddda4f12d551bb731d4acac0f5cf09f66fc948a
diff --git a/app-admin/mongo-tools/mongo-tools-3.6.1.ebuild b/app-admin/mongo-tools/mongo-tools-3.6.2.ebuild
similarity index 100%
rename from app-admin/mongo-tools/mongo-tools-3.6.1.ebuild
rename to app-admin/mongo-tools/mongo-tools-3.6.2.ebuild
diff --git a/app-emulation/Manifest.gz b/app-emulation/Manifest.gz
index 8fb2f9cccdd4..641ac630eb7e 100644
Binary files a/app-emulation/Manifest.gz and b/app-emulation/Manifest.gz differ
diff --git a/app-emulation/diskimage-builder/Manifest b/app-emulation/diskimage-builder/Manifest
index 4b615fb47219..0682a9a03e6f 100644
--- a/app-emulation/diskimage-builder/Manifest
+++ b/app-emulation/diskimage-builder/Manifest
@@ -1,3 +1,3 @@
DIST diskimage-builder-1.28.0.tar.gz 267409 BLAKE2B eec9e9bfba8ddbd31ec1af8fac401c64019c72c19982e7d74eb20f1056571873f5ed8198809b7ebd2ef87deb757a9a81b5a1ec23c83876abed659c1196df2cb0 SHA512 ae13e29563f90a4aaa4f2bee889bca4fd662da41fcffb957ca8a4380907e5d89fbc25ecb93aeda2cb5597776b51417388e8a5e39741250d68a8f7f67239ebc7f
-DIST diskimage-builder-2.10.0.tar.gz 338388 BLAKE2B c30f81f4cf2b0668d96dce49cab3aa79c484b7ee8a7c214bbc6f6f8e405d86e7240309bc266b4ac1cba14f19c82b2d67bd123d3e3e8af073ad8d4831301ae879 SHA512 37c3a6894ed30c69a6abe87524c08aa814158a01b1a5f17bf39ca9e905dd93eaab5a3f821ddddef73eafa5cf33b6cf0b8e30c6067b005c92c6029cdd7af5e8eb
+DIST diskimage-builder-2.10.1.tar.gz 338370 BLAKE2B d2417af55924971ac6c8ee803c7c9bf788ecd9a16affe90077eff51a58924c81e82728eef344749b5687cc26ff9e355a7611f4e2a0a5501217344eb9bca2bb00 SHA512 4c9ff1b7182b3c207d769bdcd142f23a6d9e2a8f040694ab75d41284bb96ad07305ae78e486343f22d13d8c8cbef5c66eaaf4638f0fd8f7158cf3520da587e88
DIST diskimage-builder-2.9.0.tar.gz 319035 BLAKE2B 846b2f35533efb66c22adb461b849352f17a8555998cf689756c513093d244c714a8e7b8ad7da4fada2b5da9ef3c2ac42f3247568b207e342a71d2ba677abda3 SHA512 ebaeb1d5396977d8391f7c718ff13e7b0d37aca58ff14719e2b5f17adc376e85f15f516f63c245c2374e363d4037bc358192aa87ce0515d0a69cb00ac5b616af
diff --git a/app-emulation/diskimage-builder/diskimage-builder-2.10.0.ebuild b/app-emulation/diskimage-builder/diskimage-builder-2.10.1.ebuild
similarity index 100%
rename from app-emulation/diskimage-builder/diskimage-builder-2.10.0.ebuild
rename to app-emulation/diskimage-builder/diskimage-builder-2.10.1.ebuild
diff --git a/dev-db/Manifest.gz b/dev-db/Manifest.gz
index b7f4e34943ec..b51a8dc7ae38 100644
Binary files a/dev-db/Manifest.gz and b/dev-db/Manifest.gz differ
diff --git a/dev-db/mongodb/Manifest b/dev-db/mongodb/Manifest
index 1d9f22ce9517..663d7836fff7 100644
--- a/dev-db/mongodb/Manifest
+++ b/dev-db/mongodb/Manifest
@@ -5,4 +5,4 @@ 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
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
similarity index 99%
rename from dev-db/mongodb/mongodb-3.6.1.ebuild
rename to 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/pgpool2/Manifest b/dev-db/pgpool2/Manifest
index 7be846d3630e..664bfb2820b5 100644
--- a/dev-db/pgpool2/Manifest
+++ b/dev-db/pgpool2/Manifest
@@ -1,8 +1 @@
-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
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.6.ebuild b/dev-db/pgpool2/pgpool2-3.6.6.ebuild
deleted file mode 100644
index 830743a0c780..000000000000
--- a/dev-db/pgpool2/pgpool2-3.6.6.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/pgtap/Manifest b/dev-db/pgtap/Manifest
index 60bbe7864d84..d36b43d654d5 100644
--- a/dev-db/pgtap/Manifest
+++ b/dev-db/pgtap/Manifest
@@ -1,3 +1 @@
-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
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(''); \$$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 20da12e18939..db487d0b0cd5 100644
--- a/dev-db/pspg/Manifest
+++ b/dev-db/pspg/Manifest
@@ -1,2 +1,3 @@
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
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 8629bda05a9a..8bcd49f79e9f 100644
--- a/dev-db/psqlodbc/Manifest
+++ b/dev-db/psqlodbc/Manifest
@@ -1,4 +1,2 @@
-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
+DIST psqlodbc-10.01.0000.tar.gz 915109 BLAKE2B a09de8218dbfbacf7972fc02c02863891ed65d19b86217a646aa0176ad7a8b962da83bb5036ad11b819a583409e4d1f3ce257a0457838000bc9cc060753c67b3 SHA512 1c5b9732a9c7e7bff0fd0a04cc7f0b45db9150486a2c3a8a96d85fb55e9296a80f12ee652cfb7ff54700e7dfc10accf9e5420b7ca798df31be51f997bbda88aa
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
similarity index 94%
rename from dev-db/psqlodbc/psqlodbc-09.06.0310.ebuild
rename to 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-games/Manifest.gz b/dev-games/Manifest.gz
index 3d43fde40fc0..b9de3a11174d 100644
Binary files a/dev-games/Manifest.gz and b/dev-games/Manifest.gz differ
diff --git a/dev-games/tiled/Manifest b/dev-games/tiled/Manifest
index c432218c15e5..8c2418dfacf5 100644
--- a/dev-games/tiled/Manifest
+++ b/dev-games/tiled/Manifest
@@ -1,2 +1,3 @@
DIST tiled-1.0.3.tar.gz 6601791 BLAKE2B 86bca36994b8596931b68dace6db61443bfa488444d06d7bae616a1c095da2d8fd476fd7a466d6b7e95b2291a977e4893125fd09091e96733973bfbc5f66a651 SHA512 4f3c97a91794f86f04965a2332e04f51bc588f7bcfef402edb1092c4e58bb6ace9c90ea522a5fa15a46ca39c8249f62818b80be6d65c11a8d41092ead31cd4f7
DIST tiled-1.1.0.tar.gz 15963801 BLAKE2B 69cba29e2bc501829636afae21cc02a48157d735620b8a04d52f0d73bb787cf8bcea1eba0c2da6a55d55dad70214ce42ac5fbd67529add07416d0702044345ce SHA512 8948a897636005bb837a922dca7cdeb8049983e11101d59e0f93255a88595bc64f1eca66a4737d3ec031ee222233e2edbd43d124d2f406698898bae4ee5f1bc1
+DIST tiled-1.1.1.tar.gz 15965530 BLAKE2B 75eb78637546478f85e2c0221b58ba8adaad7ba115e17e0e6f945ae474d7f213fe00124a877b144dad78b933f6fbad6764ee9d7b3b00a019358b2613d6e88778 SHA512 bc831d9d4b45887ca98a421580abf48f5af3e0fb5efd05bb7fdb209313a8a3a5958ce6814369c99396ca0ef029cd93fe9b133dddc5ebeea9c166eb42be2a0ea1
diff --git a/dev-games/tiled/tiled-1.1.1.ebuild b/dev-games/tiled/tiled-1.1.1.ebuild
new file mode 100644
index 000000000000..518492b3f37a
--- /dev/null
+++ b/dev-games/tiled/tiled-1.1.1.ebuild
@@ -0,0 +1,63 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+PYTHON_COMPAT=( python2_7 )
+inherit gnome2-utils multilib python-single-r1 qmake-utils xdg
+
+DESCRIPTION="A general purpose tile map editor"
+HOMEPAGE="http://www.mapeditor.org/"
+SRC_URI="https://github.com/bjorn/tiled/archive/v${PV}/${P}.tar.gz"
+
+LICENSE="BSD BSD-2 GPL-2+"
+SLOT="0"
+KEYWORDS="~amd64"
+IUSE="examples python"
+
+REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
+
+RDEPEND="
+ >=dev-qt/qtcore-5.7:5
+ >=dev-qt/qtgui-5.7:5
+ >=dev-qt/qtnetwork-5.7:5
+ >=dev-qt/qtwidgets-5.7:5
+ sys-libs/zlib
+ python? ( ${PYTHON_DEPS} )
+"
+DEPEND="${RDEPEND}
+ dev-qt/linguist-tools:5
+"
+
+DOCS=( AUTHORS COPYING NEWS.md README.md )
+
+pkg_setup() {
+ use python && python-single-r1_pkg_setup
+}
+
+src_configure() {
+ eqmake5 LIBDIR="/usr/$(get_libdir)" PREFIX="/usr" DISABLE_PYTHON_PLUGIN="$(usex !python)"
+}
+
+src_install() {
+ emake INSTALL_ROOT="${D}" install
+
+ einstalldocs
+
+ if use examples ; then
+ docompress -x /usr/share/doc/${PF}/examples
+ dodoc -r examples
+ fi
+}
+
+pkg_postinst() {
+ gnome2_icon_cache_update
+ xdg_desktop_database_update
+ xdg_mimeinfo_database_update
+}
+
+pkg_postrm() {
+ gnome2_icon_cache_update
+ xdg_desktop_database_update
+ xdg_mimeinfo_database_update
+}
diff --git a/dev-qt/Manifest.gz b/dev-qt/Manifest.gz
index 0d29e8a6c3ee..4902132512b0 100644
Binary files a/dev-qt/Manifest.gz and b/dev-qt/Manifest.gz differ
diff --git a/dev-qt/qtsql/qtsql-4.8.7-r1.ebuild b/dev-qt/qtsql/qtsql-4.8.7-r1.ebuild
index e5b47beeca3a..089d7a76c79c 100644
--- a/dev-qt/qtsql/qtsql-4.8.7-r1.ebuild
+++ b/dev-qt/qtsql/qtsql-4.8.7-r1.ebuild
@@ -37,7 +37,7 @@ QT4_TARGET_DIRECTORIES="
multilib_src_configure() {
local myconf=(
$(qt_native_use freetds sql-tds plugin)
- $(qt_use mysql sql-mysql plugin) $(use mysql && echo "-I${EPREFIX}/usr/include/mysql -L${EPREFIX}/usr/$(get_libdir)/mysql")
+ $(qt_use mysql sql-mysql plugin) $(use mysql && echo -mysql_config "${EPREFIX}/usr/bin/${CHOST}-mysql_config")
$(qt_use oci8 sql-oci plugin) $(use oci8 && echo "-I${ORACLE_HOME}/include -L${ORACLE_HOME}/$(get_libdir)")
$(qt_use odbc sql-odbc plugin) $(use odbc && echo "-I${EPREFIX}/usr/include/iodbc")
$(qt_native_use postgres sql-psql plugin) $(use postgres && multilib_is_native_abi && echo "-I${EPREFIX}/usr/include/postgresql/pgsql")
@@ -50,7 +50,7 @@ multilib_src_configure() {
-no-accessibility -no-xmlpatterns -no-multimedia -no-audio-backend -no-phonon
-no-phonon-backend -no-svg -no-webkit -no-script -no-scripttools -no-declarative
-system-zlib -no-gif -no-libtiff -no-libpng -no-libmng -no-libjpeg -no-openssl
- -no-cups -no-dbus -no-gtkstyle -no-nas-sound -no-opengl
+ -no-cups -no-dbus -no-gtkstyle -no-nas-sound -no-nis -no-opengl
-no-sm -no-xshape -no-xvideo -no-xsync -no-xinerama -no-xcursor -no-xfixes
-no-xrandr -no-xrender -no-mitshm -no-fontconfig -no-freetype -no-xinput -no-xkb
-no-glib
diff --git a/dev-ruby/Manifest.gz b/dev-ruby/Manifest.gz
index 7db39a5366ca..9d9c007bf5c0 100644
Binary files a/dev-ruby/Manifest.gz and b/dev-ruby/Manifest.gz differ
diff --git a/dev-ruby/ascii85/ascii85-1.0.2-r2.ebuild b/dev-ruby/ascii85/ascii85-1.0.2-r2.ebuild
index fef2e005dabd..a1adb044cc31 100644
--- a/dev-ruby/ascii85/ascii85-1.0.2-r2.ebuild
+++ b/dev-ruby/ascii85/ascii85-1.0.2-r2.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=5
-USE_RUBY="ruby21 ruby22 ruby23 ruby24"
+USE_RUBY="ruby22 ruby23 ruby24 ruby25"
RUBY_FAKEGEM_TASK_DOC=""
RUBY_FAKEGEM_EXTRADOC="README.rdoc History.txt"
diff --git a/dev-ruby/atomic/atomic-1.1.99.ebuild b/dev-ruby/atomic/atomic-1.1.99.ebuild
index 800f70a4261a..a11c8ef258bf 100644
--- a/dev-ruby/atomic/atomic-1.1.99.ebuild
+++ b/dev-ruby/atomic/atomic-1.1.99.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=5
-USE_RUBY="ruby21 ruby22 ruby23 ruby24"
+USE_RUBY="ruby22 ruby23 ruby24 ruby25"
RUBY_FAKEGEM_TASK_DOC=""
diff --git a/dev-ruby/bacon/bacon-1.2.0-r2.ebuild b/dev-ruby/bacon/bacon-1.2.0-r2.ebuild
index 056350ff34a8..71d9b7579983 100644
--- a/dev-ruby/bacon/bacon-1.2.0-r2.ebuild
+++ b/dev-ruby/bacon/bacon-1.2.0-r2.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
EAPI=5
-USE_RUBY="ruby21 ruby22 ruby23 ruby24"
+USE_RUBY="ruby22 ruby23 ruby24 ruby25"
RUBY_FAKEGEM_DOCDIR="doc"
RUBY_FAKEGEM_EXTRADOC="ChangeLog README.rdoc"
diff --git a/dev-ruby/binding_of_caller/Manifest b/dev-ruby/binding_of_caller/Manifest
index b28edc414e48..142794adf778 100644
--- a/dev-ruby/binding_of_caller/Manifest
+++ b/dev-ruby/binding_of_caller/Manifest
@@ -1,2 +1,3 @@
DIST binding_of_caller-0.7.2.gem 85504 BLAKE2B 5bee625852c4c32bb41b2eec57925479bf6315b73fd7486c2f0a2df88e42e2134bcca3d5b2c5accc4410fd6f0ec7b4be2aa26f1059325a96b136b5d7898c1a67 SHA512 6eb114070c3f15801c4f2454433630c207c2fb93afcf5906fa1288985303ff87c54ca07273b623bc2d3f76dc5bf363feb1561e109f599776a785aab65dfd7132
DIST binding_of_caller-0.7.3.gem 87552 BLAKE2B 5cceef6f8be2d8360d55ffd6b82148411bd65aa56f811719840465e4e5fb77f88ebb1917eac1a5b65e24abf9ed0ad860afc2aff1e8309e4b6832bc3a0ee915df SHA512 e16bfc1fffe7e7d87013506a28f2894c3737a9dfd149ab4c7deee7332e6a3b8eecde5d837a58defcb0ad45a6a8d01ffd7b1e32a9395fa895d2dc84d8e534e547
+DIST binding_of_caller-0.8.0.gem 87552 BLAKE2B 9097fe2dbf1e5ea2361bee94cb83ce8152f7e1357caecf1217b1643be225e21e5aa793e7fccbef5c983d5c204b95e633ded490158dfdd1d4e99fca81c51cb910 SHA512 d6ea4e893415eaf3614b109f8f36c3fa2378da9997d013fccbd0fc1e598886d11f7843023ceed2468184d5b8df01e2329ef16c7af57bc60bbd47304a53b43974
diff --git a/dev-ruby/binding_of_caller/binding_of_caller-0.8.0.ebuild b/dev-ruby/binding_of_caller/binding_of_caller-0.8.0.ebuild
new file mode 100644
index 000000000000..1235b94b1690
--- /dev/null
+++ b/dev-ruby/binding_of_caller/binding_of_caller-0.8.0.ebuild
@@ -0,0 +1,26 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+USE_RUBY="ruby22 ruby23 ruby24"
+
+RUBY_FAKEGEM_RECIPE_DOC="rdoc"
+RUBY_FAKEGEM_EXTRADOC="HISTORY README.md"
+
+inherit ruby-fakegem
+
+DESCRIPTION="Retrieve the binding of a method's caller"
+HOMEPAGE="https://github.com/banister/binding_of_caller"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64"
+IUSE="test"
+
+ruby_add_rdepend ">=dev-ruby/debug_inspector-0.0.1"
+
+ruby_add_bdepend "test? ( dev-ruby/bacon )"
+
+each_ruby_test() {
+ ${RUBY} -S bacon -Itest -rubygems -a -q || die
+}
diff --git a/dev-ruby/debug_inspector/debug_inspector-0.0.3.ebuild b/dev-ruby/debug_inspector/debug_inspector-0.0.3.ebuild
index f0281c17e624..1201483ea951 100644
--- a/dev-ruby/debug_inspector/debug_inspector-0.0.3.ebuild
+++ b/dev-ruby/debug_inspector/debug_inspector-0.0.3.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
EAPI=6
-USE_RUBY="ruby21 ruby22 ruby23 ruby24"
+USE_RUBY="ruby22 ruby23 ruby24 ruby25"
RUBY_FAKEGEM_TASK_TEST=""
diff --git a/dev-scheme/Manifest.gz b/dev-scheme/Manifest.gz
index 43ec7ad3523f..7d2e21e297f3 100644
Binary files a/dev-scheme/Manifest.gz and b/dev-scheme/Manifest.gz differ
diff --git a/dev-scheme/greg/files/2.0.0-notest.patch b/dev-scheme/greg/files/2.0.0-notest.patch
deleted file mode 100644
index 26a6cdf1c0ad..000000000000
--- a/dev-scheme/greg/files/2.0.0-notest.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff --git a/test/Makefile.am b/test/Makefile.am
-index 3cda45d..c61b34e 100644
---- a/test/Makefile.am
-+++ b/test/Makefile.am
-@@ -23,7 +23,6 @@
-
-
- all:
-- ./test.sh
-
- check:
- ./test.sh
diff --git a/dev-util/Manifest.gz b/dev-util/Manifest.gz
index cdd1566b7a5d..a53a12a31712 100644
Binary files a/dev-util/Manifest.gz and b/dev-util/Manifest.gz differ
diff --git a/dev-util/clazy/Manifest b/dev-util/clazy/Manifest
index 0e5a804675d4..b873c05fc1c0 100644
--- a/dev-util/clazy/Manifest
+++ b/dev-util/clazy/Manifest
@@ -1 +1,2 @@
+DIST clazy-1.3.tar.xz 159860 BLAKE2B 3860a7f0e2e518fda210e7a4c0de7ea21d52ed5f0e280e1f12dedea2b639dde994621e55b55766e65b9575c275e8ca55c8f6556d1223aee0d642fff2814810bc SHA512 71b69fd28e507f44c5ddc5be8e79fa1511398691cbd8aae920c77171720c6e3e2f308db478e604285a2686aaca0026ff0472547eff98d77c0d4f83c72727563e
DIST clazy_v1.2-src.zip 462520 BLAKE2B dbcd5b3be85f23b2bb1a8b130307223f2ccca4b04cd6b291a5ffb07fcbc9cd29c105016a5421c14af2ad41ff4a6e12c207628c34ee183749558e6bec96500b52 SHA512 53f6b0fb8d8f289e19cac591f7a612d1cefcc518cc192c9f7674cf836338d8822c5c266a260ecb34456011cb98603e69c5cffd73a08d0a6aa5d0b10ca96d768d
diff --git a/dev-util/clazy/clazy-1.3.ebuild b/dev-util/clazy/clazy-1.3.ebuild
new file mode 100644
index 000000000000..fc60842b73c9
--- /dev/null
+++ b/dev-util/clazy/clazy-1.3.ebuild
@@ -0,0 +1,35 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit cmake-utils
+
+DESCRIPTION="Compiler plugin which allows clang to understand Qt semantics"
+HOMEPAGE="https://github.com/KDE/clazy/blob/master/README.md"
+SRC_URI="mirror://kde/stable/${PN}/${PV}/src/${P}.tar.xz"
+
+LICENSE="LGPL-2+"
+SLOT="0"
+KEYWORDS="~amd64"
+IUSE=""
+
+RDEPEND="
+ sys-devel/clang:=
+ >=sys-devel/llvm-3.8:=
+"
+DEPEND="${RDEPEND}
+ app-arch/unzip
+"
+
+DOCS=( README.md )
+
+src_prepare() {
+ cmake-utils_src_prepare
+
+ sed -e '/install(FILES README.md COPYING-LGPL2.txt DESTINATION/d' \
+ -i CMakeLists.txt || die
+
+ sed -e 's|${MAN_INSTALL_DIR}|share/man/man1|' \
+ -i docs/man/CMakeLists.txt || die
+}
diff --git a/dev-util/drone-cli/Manifest b/dev-util/drone-cli/Manifest
index ebad0796debf..8f2ac2ab90ad 100644
--- a/dev-util/drone-cli/Manifest
+++ b/dev-util/drone-cli/Manifest
@@ -1,2 +1,3 @@
DIST drone-cli-0.7.0_p20170717.tar.gz 1148862 BLAKE2B a631b546917c542dc9395a2390a8f22c6f041314ece6cd185fbfd312a636040098c7f50f1ae07bedaba5ca1d718ad2a6741a24322ad0d9c291addf11b9b74035 SHA512 f901b9409354c9dc3bf21024f82a188e789c8ab05e8bca179cc77069baf024f40ce13995230f48d5c40e7485ab31bb3f22fae0ca68a8669295cdfb11dbb1b168
DIST drone-cli-0.8.0.tar.gz 1149494 BLAKE2B 6be4edf8a122919570319867d2981fd56fe644093f83216fc17ff4d17e6caa13f163748b6eec68eb6ebab86259bf10fc8636670248fb382120a72738b918ac9b SHA512 5dc9a9910a76e31f0f9f845e1d59a0dc8371463de295f35090efdc16230b1458cc2d2f8632e91c46d18efb0c154874c65388cf6a37cca72b72f08d56b61cae72
+DIST drone-cli-0.8.1.tar.gz 1150026 BLAKE2B 25197e3e8d15f07026251d68689fea1fab03329121b748bfd3c06d6310fb76de743934467e7c453492a7843c7ee0a925161e7f4dd912949490c4adad1d896dac SHA512 c3f157ae4f7deebc1641e73bbbf218da85d0f732143941c2c37a52fd6c7db0951d6ed6dc6d55920641a3b9a7a10537813442353890699075bdfd072601b82cd3
diff --git a/dev-util/drone-cli/drone-cli-0.8.1.ebuild b/dev-util/drone-cli/drone-cli-0.8.1.ebuild
new file mode 100644
index 000000000000..950e201a21ba
--- /dev/null
+++ b/dev-util/drone-cli/drone-cli-0.8.1.ebuild
@@ -0,0 +1,35 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+EGO_PN="github.com/drone/drone-cli"
+EGIT_COMMIT="1cb942f726e6c616bb78c85b70baa61ba01152a2"
+
+inherit golang-build golang-vcs-snapshot
+
+ARCHIVE_URI="https://${EGO_PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+KEYWORDS="~amd64"
+
+DESCRIPTION="Command-line interface for Drone"
+HOMEPAGE="https://github.com/drone/drone-cli"
+SRC_URI="${ARCHIVE_URI}"
+LICENSE="Apache-2.0"
+SLOT="0"
+IUSE=""
+
+RESTRICT="test"
+
+RDEPEND="!!=media-libs/libsfml-2.1
>net-libs/enet-1.3.7
>=net-libs/mbedtls-2.1.1
dev-libs/lzo
- media-libs/libpng:=
- sys-libs/glibc
- sys-libs/readline:=
+ media-libs/libpng:0=
+ sys-libs/readline:0=
sys-libs/zlib
x11-libs/libXext
x11-libs/libXi
@@ -37,14 +37,17 @@ RDEPEND=">=media-libs/libsfml-2.1
bluetooth? ( net-wireless/bluez )
egl? ( media-libs/mesa[egl] )
evdev? (
- dev-libs/libevdev
- virtual/udev
+ dev-libs/libevdev
+ virtual/udev
+ )
+ ffmpeg? (
+ libav? ( media-video/libav:= )
+ !libav? ( media-video/ffmpeg:= )
)
- ffmpeg? ( virtual/ffmpeg )
llvm? ( sys-devel/llvm )
openal? (
- media-libs/openal
- media-libs/libsoundtouch
+ media-libs/openal
+ media-libs/libsoundtouch
)
portaudio? ( media-libs/portaudio )
profile? ( dev-util/oprofile )
@@ -57,35 +60,20 @@ RDEPEND=">=media-libs/libsfml-2.1
sdl? ( media-libs/libsdl2[haptic,joystick] )
upnp? ( >=net-libs/miniupnpc-1.7 )
wxwidgets? (
- dev-libs/glib:2
- x11-libs/gtk+:2
- x11-libs/wxGTK:${WX_GTK_VER}[opengl,X]
- )
- "
+ dev-libs/glib:2
+ x11-libs/gtk+:2
+ x11-libs/wxGTK:${WX_GTK_VER}[opengl,X]
+ )"
DEPEND="${RDEPEND}
- >=dev-util/cmake-2.8.8
- >=sys-devel/gcc-4.9.0
app-arch/zip
media-libs/freetype
sys-devel/gettext
- virtual/pkgconfig
- "
-
-pkg_pretend() {
-
- local ver=4.9.0
- local msg="${PN} needs at least GCC ${ver} set to compile."
-
- if [[ ${MERGE_TYPE} != binary ]]; then
- if ! version_is_at_least ${ver} $(gcc-fullversion); then
- eerror ${msg}
- die ${msg}
- fi
- fi
+ virtual/pkgconfig"
-}
+PATCHES=( "${FILESDIR}"/${P}-CHAR_WIDTH-collision.patch )
src_prepare() {
+ cmake-utils_src_prepare
# Remove automatic dependencies to prevent building without flags enabled.
if use !alsa; then
@@ -139,13 +127,12 @@ src_prepare() {
}
src_configure() {
-
if use wxwidgets; then
need-wxwidgets unicode
fi
local mycmakeargs=(
- "-DUSE_SHARED_ENET=ON"
+ -DUSE_SHARED_ENET=ON
$( cmake-utils_use ffmpeg ENCODE_FRAMEDUMPS )
$( cmake-utils_use log FASTLOG )
$( cmake-utils_use profile OPROFILING )
@@ -162,12 +149,7 @@ src_configure() {
cmake-utils_src_configure
}
-src_compile() {
-
- cmake-utils_src_compile
-}
src_install() {
-
cmake-utils_src_install
dodoc Readme.md
diff --git a/games-emulation/dolphin/files/dolphin-5.0-CHAR_WIDTH-collision.patch b/games-emulation/dolphin/files/dolphin-5.0-CHAR_WIDTH-collision.patch
new file mode 100644
index 000000000000..d6e4c7a2dc0e
--- /dev/null
+++ b/games-emulation/dolphin/files/dolphin-5.0-CHAR_WIDTH-collision.patch
@@ -0,0 +1,49 @@
+Avoid clash with TS 18661-1:2014 macros
+https://bugs.gentoo.org/637986
+
+--- a/Source/Core/VideoBackends/OGL/RasterFont.cpp
++++ b/Source/Core/VideoBackends/OGL/RasterFont.cpp
+@@ -15,7 +15,7 @@
+ namespace OGL
+ {
+
+-static const int CHAR_WIDTH = 8;
++static const int DOLPHIN_CHAR_WIDTH = 8;
+ static const int CHAR_HEIGHT = 13;
+ static const int CHAR_OFFSET = 32;
+ static const int CHAR_COUNT = 95;
+@@ -146,20 +146,20 @@
+ glGenTextures(1, &texture);
+ glActiveTexture(GL_TEXTURE8);
+ glBindTexture(GL_TEXTURE_2D, texture);
+- std::vector texture_data(CHAR_WIDTH * CHAR_COUNT * CHAR_HEIGHT);
++ std::vector texture_data(DOLPHIN_CHAR_WIDTH * CHAR_COUNT * CHAR_HEIGHT);
+ for (int y = 0; y < CHAR_HEIGHT; y++)
+ {
+ for (int c = 0; c < CHAR_COUNT; c++)
+ {
+- for (int x = 0; x < CHAR_WIDTH; x++)
++ for (int x = 0; x < DOLPHIN_CHAR_WIDTH; x++)
+ {
+- bool pixel = (0 != (rasters[c][y] & (1 << (CHAR_WIDTH - x - 1))));
+- texture_data[CHAR_WIDTH * CHAR_COUNT * y + CHAR_WIDTH * c + x] = pixel ? -1 : 0;
++ bool pixel = (0 != (rasters[c][y] & (1 << (DOLPHIN_CHAR_WIDTH - x - 1))));
++ texture_data[DOLPHIN_CHAR_WIDTH * CHAR_COUNT * y + DOLPHIN_CHAR_WIDTH * c + x] = pixel ? -1 : 0;
+ }
+ }
+ }
+ glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MAX_LEVEL, 0);
+- glTexImage2D(GL_TEXTURE_2D, 0, GL_RGBA, CHAR_WIDTH * CHAR_COUNT, CHAR_HEIGHT, 0, GL_RGBA, GL_UNSIGNED_BYTE, texture_data.data());
++ glTexImage2D(GL_TEXTURE_2D, 0, GL_RGBA, DOLPHIN_CHAR_WIDTH * CHAR_COUNT, CHAR_HEIGHT, 0, GL_RGBA, GL_UNSIGNED_BYTE, texture_data.data());
+
+ // generate shader
+ ProgramShaderCache::CompileShader(s_shader, s_vertexShaderSrc, s_fragmentShaderSrc);
+@@ -196,7 +196,7 @@
+ std::vector vertices(text.length() * 6 * 4);
+
+ int usage = 0;
+- GLfloat delta_x = GLfloat(2 * CHAR_WIDTH) / GLfloat(bbWidth);
++ GLfloat delta_x = GLfloat(2 * DOLPHIN_CHAR_WIDTH) / GLfloat(bbWidth);
+ GLfloat delta_y = GLfloat(2 * CHAR_HEIGHT) / GLfloat(bbHeight);
+ GLfloat border_x = 2.0f / GLfloat(bbWidth);
+ GLfloat border_y = 4.0f / GLfloat(bbHeight);
diff --git a/metadata/Manifest.gz b/metadata/Manifest.gz
index 0edca9c13d5e..c537f9acbd57 100644
Binary files a/metadata/Manifest.gz and b/metadata/Manifest.gz differ
diff --git a/metadata/dtd/timestamp.chk b/metadata/dtd/timestamp.chk
index 2b967556862a..5e14f7acd01b 100644
--- a/metadata/dtd/timestamp.chk
+++ b/metadata/dtd/timestamp.chk
@@ -1 +1 @@
-Thu, 11 Jan 2018 03:39:28 +0000
+Thu, 11 Jan 2018 13:09:31 +0000
diff --git a/metadata/glsa/timestamp.chk b/metadata/glsa/timestamp.chk
index 2b967556862a..5e14f7acd01b 100644
--- a/metadata/glsa/timestamp.chk
+++ b/metadata/glsa/timestamp.chk
@@ -1 +1 @@
-Thu, 11 Jan 2018 03:39:28 +0000
+Thu, 11 Jan 2018 13:09:31 +0000
diff --git a/metadata/md5-cache/Manifest.gz b/metadata/md5-cache/Manifest.gz
index 6bf3a7c8d4f4..d14018c1fbc9 100644
Binary files a/metadata/md5-cache/Manifest.gz and b/metadata/md5-cache/Manifest.gz differ
diff --git a/metadata/md5-cache/app-admin/Manifest.gz b/metadata/md5-cache/app-admin/Manifest.gz
index a450fccbdfa8..a5722dd2feb4 100644
Binary files a/metadata/md5-cache/app-admin/Manifest.gz and b/metadata/md5-cache/app-admin/Manifest.gz differ
diff --git a/metadata/md5-cache/app-admin/keepass-2.38 b/metadata/md5-cache/app-admin/keepass-2.38
new file mode 100644
index 000000000000..92cb19853382
--- /dev/null
+++ b/metadata/md5-cache/app-admin/keepass-2.38
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile install postinst postrm prepare
+DEPEND=dev-lang/mono app-arch/unzip >=sys-apps/sed-4
+DESCRIPTION=A free, open source, light-weight and easy-to-use password manager
+EAPI=6
+HOMEPAGE=http://keepass.info/
+IUSE=aot
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2
+RDEPEND=dev-lang/mono dev-dotnet/libgdiplus[cairo]
+SLOT=0
+SRC_URI=mirror://sourceforge/keepass/KeePass-2.38-Source.zip
+_eclasses_=desktop 2ccd1dd1dd7bfb8795eea024a4f91bb6 epatch 8233751dc5105a6ae8fcd86ce2bb0247 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 6e7258392d5eda499c1cfa94db650b61 gnome2-utils 4d211d7614f303710fca59db6ec12c88 ltprune 2770eed66a9b8ef944714cd0e968182e multilib 97f470f374f2e94ccab04a2fb21d811e preserve-libs ef207dc62baddfddfd39a164d9797648 toolchain-funcs 885c7d8dd70a58825f3d17e35a3cd1e9 xdg-utils f2c8335407f0b935b0a96d4adf23ef25
+_md5_=70919da5dd8e721a8cd833b1c18def93
diff --git a/metadata/md5-cache/app-admin/mongo-tools-3.6.1 b/metadata/md5-cache/app-admin/mongo-tools-3.6.2
similarity index 81%
rename from metadata/md5-cache/app-admin/mongo-tools-3.6.1
rename to metadata/md5-cache/app-admin/mongo-tools-3.6.2
index fdb91571cb9f..4b2947ba2e6a 100644
--- a/metadata/md5-cache/app-admin/mongo-tools-3.6.1
+++ b/metadata/md5-cache/app-admin/mongo-tools-3.6.2
@@ -8,5 +8,5 @@ KEYWORDS=~amd64 ~x86
LICENSE=Apache-2.0
RDEPEND=! mongo-tools-3.6.1.tar.gz
+SRC_URI=https://github.com/mongodb/mongo-tools/archive/r3.6.2.tar.gz -> mongo-tools-3.6.2.tar.gz
_md5_=01b15c131a54266a7cbe53b179944048
diff --git a/metadata/md5-cache/app-emulation/Manifest.gz b/metadata/md5-cache/app-emulation/Manifest.gz
index 075465bb6a32..26cd0686bd27 100644
Binary files a/metadata/md5-cache/app-emulation/Manifest.gz and b/metadata/md5-cache/app-emulation/Manifest.gz differ
diff --git a/metadata/md5-cache/app-emulation/diskimage-builder-2.10.0 b/metadata/md5-cache/app-emulation/diskimage-builder-2.10.1
similarity index 99%
rename from metadata/md5-cache/app-emulation/diskimage-builder-2.10.0
rename to metadata/md5-cache/app-emulation/diskimage-builder-2.10.1
index 49719e1081ab..5df17b197df4 100644
--- a/metadata/md5-cache/app-emulation/diskimage-builder-2.10.0
+++ b/metadata/md5-cache/app-emulation/diskimage-builder-2.10.1
@@ -9,6 +9,6 @@ LICENSE=Apache-2.0
RDEPEND=>=dev-python/pbr-2.0.0[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] !~dev-python/pbr-2.1.0[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/Babel-2.3.4[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] !~dev-python/Babel-2.4.0[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/networkx-1.10[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] =dev-python/pyyaml-3.10.0[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/flake8-2.5.4[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] =dev-python/six-1.10.0[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/stevedore-1.20.0[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] app-emulation/qemu sys-block/parted sys-fs/multipath-tools !dev-python/dib-utils[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
REQUIRED_USE=|| ( python_targets_python2_7 )
SLOT=0
-SRC_URI=mirror://pypi/d/diskimage-builder/diskimage-builder-2.10.0.tar.gz
+SRC_URI=mirror://pypi/d/diskimage-builder/diskimage-builder-2.10.1.tar.gz
_eclasses_=distutils-r1 372bbe39047c0a2550319a3a82f3e063 multibuild 72647e255187a1fadc81097b3657e5c3 multilib 97f470f374f2e94ccab04a2fb21d811e multiprocessing cac3169468f893670dac3e7cb940e045 python-r1 e9350ec46bb5c9f3504b4fbe8b8d8987 python-utils-r1 c9de01becf9df3f8c10aeec3dc693f5d toolchain-funcs 885c7d8dd70a58825f3d17e35a3cd1e9 xdg-utils f2c8335407f0b935b0a96d4adf23ef25
_md5_=2be02f8b04d88056dbd6d23ad4c80a6d
diff --git a/metadata/md5-cache/dev-db/Manifest.gz b/metadata/md5-cache/dev-db/Manifest.gz
index a16291136b64..233769a6604e 100644
Binary files a/metadata/md5-cache/dev-db/Manifest.gz and b/metadata/md5-cache/dev-db/Manifest.gz differ
diff --git a/metadata/md5-cache/dev-db/mongodb-3.6.1 b/metadata/md5-cache/dev-db/mongodb-3.6.2
similarity index 95%
rename from metadata/md5-cache/dev-db/mongodb-3.6.1
rename to metadata/md5-cache/dev-db/mongodb-3.6.2
index fcb25fd40c39..30c40e335409 100644
--- a/metadata/md5-cache/dev-db/mongodb-3.6.1
+++ b/metadata/md5-cache/dev-db/mongodb-3.6.2
@@ -6,9 +6,9 @@ HOMEPAGE=https://www.mongodb.com
IUSE=debug kerberos libressl mms-agent ssl test +tools python_targets_python2_7
KEYWORDS=~amd64 ~x86
LICENSE=AGPL-3 Apache-2.0
-PDEPEND=tools? ( >=app-admin/mongo-tools-3.6.1 )
+PDEPEND=tools? ( >=app-admin/mongo-tools-3.6.2 )
RDEPEND=>=app-arch/snappy-1.1.3 >=dev-cpp/yaml-cpp-0.5.3 >=dev-libs/boost-1.60:=[threads(+)] >=dev-libs/libpcre-8.41[cxx] dev-libs/snowball-stemmer net-libs/libpcap >=sys-libs/zlib-1.2.8:= mms-agent? ( app-admin/mms-agent ) ssl? ( !libressl? ( >=dev-libs/openssl-1.0.1g:0= ) libressl? ( dev-libs/libressl:0= ) )
SLOT=0
-SRC_URI=https://fastdl.mongodb.org/src/mongodb-src-r3.6.1.tar.gz
+SRC_URI=https://fastdl.mongodb.org/src/mongodb-src-r3.6.2.tar.gz
_eclasses_=check-reqs bd050ce908e4637604ee604ed4b78e8f desktop 2ccd1dd1dd7bfb8795eea024a4f91bb6 epatch 8233751dc5105a6ae8fcd86ce2bb0247 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 6e7258392d5eda499c1cfa94db650b61 flag-o-matic 02908f00f002f0f07c5b74783d778325 ltprune 2770eed66a9b8ef944714cd0e968182e multilib 97f470f374f2e94ccab04a2fb21d811e multiprocessing cac3169468f893670dac3e7cb940e045 pax-utils 4f95120230a315c8caaabeb2307b7eee preserve-libs ef207dc62baddfddfd39a164d9797648 python-single-r1 317a2557b4d7319a7418225f65accf77 python-utils-r1 c9de01becf9df3f8c10aeec3dc693f5d scons-utils fcace052aef60e6b0eb3023c26aa585a systemd 8f5286f89e265842f5b5189666eae88b toolchain-funcs 885c7d8dd70a58825f3d17e35a3cd1e9 user 8bc2845510e2109af75e3eeac607ec81 versionator ce21313503c41896ebcd7d58b0607e37
-_md5_=b56f5116bad896e2b90f17fbaaa81fc5
+_md5_=9d10a60e9a10ca2c60daf8011d17285a
diff --git a/metadata/md5-cache/dev-db/pgpool2-3.5.2 b/metadata/md5-cache/dev-db/pgpool2-3.5.2
deleted file mode 100644
index 2458b61a60d4..000000000000
--- a/metadata/md5-cache/dev-db/pgpool2-3.5.2
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install prepare setup
-DEPEND=dev-db/postgresql:= memcached? ( dev-libs/libmemcached ) pam? ( sys-auth/pambase ) ssl? ( dev-libs/openssl:= ) sys-devel/bison !!dev-db/pgpool
-DESCRIPTION=Connection pool server for PostgreSQL
-EAPI=5
-HOMEPAGE=http://www.pgpool.net/
-IUSE=doc memcached pam ssl static-libs
-KEYWORDS=~amd64 ~x86
-LICENSE=BSD
-RDEPEND=dev-db/postgresql:= memcached? ( dev-libs/libmemcached ) pam? ( sys-auth/pambase ) ssl? ( dev-libs/openssl:= )
-SLOT=0
-SRC_URI=http://www.pgpool.net/download.php?f=pgpool-II-3.5.2.tar.gz -> pgpool-II-3.5.2.tar.gz
-_eclasses_=desktop 2ccd1dd1dd7bfb8795eea024a4f91bb6 epatch 8233751dc5105a6ae8fcd86ce2bb0247 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 6e7258392d5eda499c1cfa94db650b61 ltprune 2770eed66a9b8ef944714cd0e968182e multilib 97f470f374f2e94ccab04a2fb21d811e preserve-libs ef207dc62baddfddfd39a164d9797648 toolchain-funcs 885c7d8dd70a58825f3d17e35a3cd1e9 user 8bc2845510e2109af75e3eeac607ec81
-_md5_=abcfe3a9e31a7080a14297ad6e70bad0
diff --git a/metadata/md5-cache/dev-db/pgpool2-3.5.5 b/metadata/md5-cache/dev-db/pgpool2-3.5.5
deleted file mode 100644
index 1af0a8bb9e98..000000000000
--- a/metadata/md5-cache/dev-db/pgpool2-3.5.5
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install prepare setup
-DEPEND=dev-db/postgresql:= memcached? ( dev-libs/libmemcached ) pam? ( sys-auth/pambase ) ssl? ( dev-libs/openssl:= ) sys-devel/bison !!dev-db/pgpool
-DESCRIPTION=Connection pool server for PostgreSQL
-EAPI=5
-HOMEPAGE=http://www.pgpool.net/
-IUSE=doc memcached pam ssl static-libs
-KEYWORDS=~amd64 ~x86
-LICENSE=BSD
-RDEPEND=dev-db/postgresql:= memcached? ( dev-libs/libmemcached ) pam? ( sys-auth/pambase ) ssl? ( dev-libs/openssl:= )
-SLOT=0
-SRC_URI=http://www.pgpool.net/download.php?f=pgpool-II-3.5.5.tar.gz -> pgpool-II-3.5.5.tar.gz
-_eclasses_=desktop 2ccd1dd1dd7bfb8795eea024a4f91bb6 epatch 8233751dc5105a6ae8fcd86ce2bb0247 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 6e7258392d5eda499c1cfa94db650b61 ltprune 2770eed66a9b8ef944714cd0e968182e multilib 97f470f374f2e94ccab04a2fb21d811e preserve-libs ef207dc62baddfddfd39a164d9797648 toolchain-funcs 885c7d8dd70a58825f3d17e35a3cd1e9 user 8bc2845510e2109af75e3eeac607ec81
-_md5_=e4425bbd92c1b5153cbf0f78291eeca4
diff --git a/metadata/md5-cache/dev-db/pgpool2-3.6.1 b/metadata/md5-cache/dev-db/pgpool2-3.6.1
deleted file mode 100644
index 2d0abfde6ee1..000000000000
--- a/metadata/md5-cache/dev-db/pgpool2-3.6.1
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install prepare setup
-DEPEND=dev-db/postgresql:= memcached? ( dev-libs/libmemcached ) pam? ( sys-auth/pambase ) ssl? ( dev-libs/openssl:= ) sys-devel/bison !!dev-db/pgpool
-DESCRIPTION=Connection pool server for PostgreSQL
-EAPI=5
-HOMEPAGE=http://www.pgpool.net/
-IUSE=doc memcached pam ssl static-libs
-KEYWORDS=~amd64 ~x86
-LICENSE=BSD
-RDEPEND=dev-db/postgresql:= memcached? ( dev-libs/libmemcached ) pam? ( sys-auth/pambase ) ssl? ( dev-libs/openssl:= )
-SLOT=0
-SRC_URI=http://www.pgpool.net/download.php?f=pgpool-II-3.6.1.tar.gz -> pgpool-II-3.6.1.tar.gz
-_eclasses_=desktop 2ccd1dd1dd7bfb8795eea024a4f91bb6 epatch 8233751dc5105a6ae8fcd86ce2bb0247 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 6e7258392d5eda499c1cfa94db650b61 ltprune 2770eed66a9b8ef944714cd0e968182e multilib 97f470f374f2e94ccab04a2fb21d811e preserve-libs ef207dc62baddfddfd39a164d9797648 toolchain-funcs 885c7d8dd70a58825f3d17e35a3cd1e9 user 8bc2845510e2109af75e3eeac607ec81
-_md5_=587d7431b9a81312b1d931988b3fae4c
diff --git a/metadata/md5-cache/dev-db/pgpool2-3.6.4 b/metadata/md5-cache/dev-db/pgpool2-3.6.4
deleted file mode 100644
index 36b22a7daf83..000000000000
--- a/metadata/md5-cache/dev-db/pgpool2-3.6.4
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install prepare setup test
-DEPEND=postgres_targets_postgres9_6? ( dev-db/postgresql:9.6= ) postgres_targets_postgres9_5? ( dev-db/postgresql:9.5= ) postgres_targets_postgres9_4? ( dev-db/postgresql:9.4= ) postgres_targets_postgres9_3? ( dev-db/postgresql:9.3= ) postgres_targets_postgres9_2? ( dev-db/postgresql:9.2= ) net-libs/libnsl:0= memcached? ( dev-libs/libmemcached ) pam? ( sys-auth/pambase ) ssl? ( dev-libs/openssl:* ) sys-devel/bison !!dev-db/pgpool
-DESCRIPTION=Connection pool server for PostgreSQL
-EAPI=6
-HOMEPAGE=http://www.pgpool.net/
-IUSE=doc memcached pam ssl static-libs postgres_targets_postgres9_6 postgres_targets_postgres9_5 postgres_targets_postgres9_4 postgres_targets_postgres9_3 postgres_targets_postgres9_2
-KEYWORDS=~amd64 ~x86
-LICENSE=BSD
-RDEPEND=postgres_targets_postgres9_6? ( dev-db/postgresql:9.6= ) postgres_targets_postgres9_5? ( dev-db/postgresql:9.5= ) postgres_targets_postgres9_4? ( dev-db/postgresql:9.4= ) postgres_targets_postgres9_3? ( dev-db/postgresql:9.3= ) postgres_targets_postgres9_2? ( dev-db/postgresql:9.2= ) net-libs/libnsl:0= memcached? ( dev-libs/libmemcached ) pam? ( sys-auth/pambase ) ssl? ( dev-libs/openssl:* )
-SLOT=0
-SRC_URI=http://www.pgpool.net/download.php?f=pgpool-II-3.6.4.tar.gz -> pgpool-II-3.6.4.tar.gz
-_eclasses_=multibuild 72647e255187a1fadc81097b3657e5c3 postgres c59d58664169a60e232dd018eae69172 postgres-multi 4ad3669c874bed68b375f87035e46db8 user 8bc2845510e2109af75e3eeac607ec81
-_md5_=20f290462919b6f4106ae6c42f73cc78
diff --git a/metadata/md5-cache/dev-db/pgpool2-3.6.5 b/metadata/md5-cache/dev-db/pgpool2-3.6.5
deleted file mode 100644
index a6d722693108..000000000000
--- a/metadata/md5-cache/dev-db/pgpool2-3.6.5
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install prepare setup test
-DEPEND=postgres_targets_postgres9_6? ( dev-db/postgresql:9.6= ) postgres_targets_postgres9_5? ( dev-db/postgresql:9.5= ) postgres_targets_postgres9_4? ( dev-db/postgresql:9.4= ) postgres_targets_postgres9_3? ( dev-db/postgresql:9.3= ) postgres_targets_postgres9_2? ( dev-db/postgresql:9.2= ) net-libs/libnsl:0= memcached? ( dev-libs/libmemcached ) pam? ( sys-auth/pambase ) ssl? ( dev-libs/openssl:* ) sys-devel/bison !!dev-db/pgpool
-DESCRIPTION=Connection pool server for PostgreSQL
-EAPI=6
-HOMEPAGE=http://www.pgpool.net/
-IUSE=doc memcached pam ssl static-libs postgres_targets_postgres9_6 postgres_targets_postgres9_5 postgres_targets_postgres9_4 postgres_targets_postgres9_3 postgres_targets_postgres9_2
-KEYWORDS=~amd64 ~x86
-LICENSE=BSD
-RDEPEND=postgres_targets_postgres9_6? ( dev-db/postgresql:9.6= ) postgres_targets_postgres9_5? ( dev-db/postgresql:9.5= ) postgres_targets_postgres9_4? ( dev-db/postgresql:9.4= ) postgres_targets_postgres9_3? ( dev-db/postgresql:9.3= ) postgres_targets_postgres9_2? ( dev-db/postgresql:9.2= ) net-libs/libnsl:0= memcached? ( dev-libs/libmemcached ) pam? ( sys-auth/pambase ) ssl? ( dev-libs/openssl:* )
-SLOT=0
-SRC_URI=http://www.pgpool.net/download.php?f=pgpool-II-3.6.5.tar.gz -> pgpool-II-3.6.5.tar.gz
-_eclasses_=multibuild 72647e255187a1fadc81097b3657e5c3 postgres c59d58664169a60e232dd018eae69172 postgres-multi 4ad3669c874bed68b375f87035e46db8 user 8bc2845510e2109af75e3eeac607ec81
-_md5_=bd587108ed38da311b65462ac3f94e23
diff --git a/metadata/md5-cache/dev-db/pgpool2-3.6.6 b/metadata/md5-cache/dev-db/pgpool2-3.6.6
deleted file mode 100644
index 4d3804a1fb58..000000000000
--- a/metadata/md5-cache/dev-db/pgpool2-3.6.6
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install prepare setup test
-DEPEND=postgres_targets_postgres9_6? ( dev-db/postgresql:9.6= ) postgres_targets_postgres9_5? ( dev-db/postgresql:9.5= ) postgres_targets_postgres9_4? ( dev-db/postgresql:9.4= ) postgres_targets_postgres9_3? ( dev-db/postgresql:9.3= ) postgres_targets_postgres9_2? ( dev-db/postgresql:9.2= ) net-libs/libnsl:0= memcached? ( dev-libs/libmemcached ) pam? ( sys-auth/pambase ) ssl? ( dev-libs/openssl:* ) sys-devel/bison !!dev-db/pgpool
-DESCRIPTION=Connection pool server for PostgreSQL
-EAPI=6
-HOMEPAGE=http://www.pgpool.net/
-IUSE=doc memcached pam ssl static-libs postgres_targets_postgres9_6 postgres_targets_postgres9_5 postgres_targets_postgres9_4 postgres_targets_postgres9_3 postgres_targets_postgres9_2
-KEYWORDS=~amd64 ~x86
-LICENSE=BSD
-RDEPEND=postgres_targets_postgres9_6? ( dev-db/postgresql:9.6= ) postgres_targets_postgres9_5? ( dev-db/postgresql:9.5= ) postgres_targets_postgres9_4? ( dev-db/postgresql:9.4= ) postgres_targets_postgres9_3? ( dev-db/postgresql:9.3= ) postgres_targets_postgres9_2? ( dev-db/postgresql:9.2= ) net-libs/libnsl:0= memcached? ( dev-libs/libmemcached ) pam? ( sys-auth/pambase ) ssl? ( dev-libs/openssl:* )
-SLOT=0
-SRC_URI=http://www.pgpool.net/download.php?f=pgpool-II-3.6.6.tar.gz -> pgpool-II-3.6.6.tar.gz
-_eclasses_=multibuild 72647e255187a1fadc81097b3657e5c3 postgres c59d58664169a60e232dd018eae69172 postgres-multi 4ad3669c874bed68b375f87035e46db8 user 8bc2845510e2109af75e3eeac607ec81
-_md5_=bd587108ed38da311b65462ac3f94e23
diff --git a/metadata/md5-cache/dev-db/pgpool2-3.6.7 b/metadata/md5-cache/dev-db/pgpool2-3.6.7
deleted file mode 100644
index f3fc5da0f812..000000000000
--- a/metadata/md5-cache/dev-db/pgpool2-3.6.7
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install prepare setup test
-DEPEND=postgres_targets_postgres9_6? ( dev-db/postgresql:9.6= ) postgres_targets_postgres9_5? ( dev-db/postgresql:9.5= ) postgres_targets_postgres9_4? ( dev-db/postgresql:9.4= ) postgres_targets_postgres9_3? ( dev-db/postgresql:9.3= ) postgres_targets_postgres9_2? ( dev-db/postgresql:9.2= ) net-libs/libnsl:0= memcached? ( dev-libs/libmemcached ) pam? ( sys-auth/pambase ) ssl? ( dev-libs/openssl:* ) sys-devel/bison !!dev-db/pgpool
-DESCRIPTION=Connection pool server for PostgreSQL
-EAPI=6
-HOMEPAGE=http://www.pgpool.net/
-IUSE=doc memcached pam ssl static-libs postgres_targets_postgres9_6 postgres_targets_postgres9_5 postgres_targets_postgres9_4 postgres_targets_postgres9_3 postgres_targets_postgres9_2
-KEYWORDS=~amd64 ~x86
-LICENSE=BSD
-RDEPEND=postgres_targets_postgres9_6? ( dev-db/postgresql:9.6= ) postgres_targets_postgres9_5? ( dev-db/postgresql:9.5= ) postgres_targets_postgres9_4? ( dev-db/postgresql:9.4= ) postgres_targets_postgres9_3? ( dev-db/postgresql:9.3= ) postgres_targets_postgres9_2? ( dev-db/postgresql:9.2= ) net-libs/libnsl:0= memcached? ( dev-libs/libmemcached ) pam? ( sys-auth/pambase ) ssl? ( dev-libs/openssl:* )
-SLOT=0
-SRC_URI=http://www.pgpool.net/download.php?f=pgpool-II-3.6.7.tar.gz -> pgpool-II-3.6.7.tar.gz
-_eclasses_=multibuild 72647e255187a1fadc81097b3657e5c3 postgres c59d58664169a60e232dd018eae69172 postgres-multi 4ad3669c874bed68b375f87035e46db8 user 8bc2845510e2109af75e3eeac607ec81
-_md5_=bd587108ed38da311b65462ac3f94e23
diff --git a/metadata/md5-cache/dev-db/pgtap-0.93.0 b/metadata/md5-cache/dev-db/pgtap-0.93.0
deleted file mode 100644
index ee181fdc6218..000000000000
--- a/metadata/md5-cache/dev-db/pgtap-0.93.0
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile configure install prepare
-DEPEND=>=dev-db/postgresql-8.4 dev-perl/TAP-Parser-SourceHandler-pgTAP
-DESCRIPTION=Unit testing for PostgreSQL
-EAPI=5
-HOMEPAGE=http://pgtap.org/
-KEYWORDS=amd64
-LICENSE=POSTGRESQL
-RDEPEND=>=dev-db/postgresql-8.4 dev-perl/TAP-Parser-SourceHandler-pgTAP
-SLOT=0
-SRC_URI=http://api.pgxn.org/dist/pgtap/0.93.0/pgtap-0.93.0.zip
-_eclasses_=desktop 2ccd1dd1dd7bfb8795eea024a4f91bb6 epatch 8233751dc5105a6ae8fcd86ce2bb0247 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 6e7258392d5eda499c1cfa94db650b61 ltprune 2770eed66a9b8ef944714cd0e968182e multilib 97f470f374f2e94ccab04a2fb21d811e preserve-libs ef207dc62baddfddfd39a164d9797648 toolchain-funcs 885c7d8dd70a58825f3d17e35a3cd1e9
-_md5_=57ef9cdcd9587edf2be240f0a3b3789b
diff --git a/metadata/md5-cache/dev-db/pgtap-0.97.0 b/metadata/md5-cache/dev-db/pgtap-0.97.0
deleted file mode 100644
index a562e4e68a99..000000000000
--- a/metadata/md5-cache/dev-db/pgtap-0.97.0
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install prepare setup test
-DEPEND=postgres_targets_postgres9_6? ( dev-db/postgresql:9.6= ) postgres_targets_postgres9_5? ( dev-db/postgresql:9.5= ) postgres_targets_postgres9_4? ( dev-db/postgresql:9.4= ) postgres_targets_postgres9_3? ( dev-db/postgresql:9.3= ) postgres_targets_postgres9_2? ( dev-db/postgresql:9.2= ) dev-perl/TAP-Parser-SourceHandler-pgTAP
-DESCRIPTION=Unit testing for PostgreSQL
-EAPI=6
-HOMEPAGE=http://pgtap.org/
-IUSE=postgres_targets_postgres9_6 postgres_targets_postgres9_5 postgres_targets_postgres9_4 postgres_targets_postgres9_3 postgres_targets_postgres9_2
-KEYWORDS=~amd64
-LICENSE=POSTGRESQL
-RDEPEND=postgres_targets_postgres9_6? ( dev-db/postgresql:9.6= ) postgres_targets_postgres9_5? ( dev-db/postgresql:9.5= ) postgres_targets_postgres9_4? ( dev-db/postgresql:9.4= ) postgres_targets_postgres9_3? ( dev-db/postgresql:9.3= ) postgres_targets_postgres9_2? ( dev-db/postgresql:9.2= ) dev-perl/TAP-Parser-SourceHandler-pgTAP
-SLOT=0
-SRC_URI=http://api.pgxn.org/dist/pgtap/0.97.0/pgtap-0.97.0.zip
-_eclasses_=multibuild 72647e255187a1fadc81097b3657e5c3 postgres c59d58664169a60e232dd018eae69172 postgres-multi 4ad3669c874bed68b375f87035e46db8 user 8bc2845510e2109af75e3eeac607ec81
-_md5_=fc11b804eee2a9ca7000b8812cf0407c
diff --git a/metadata/md5-cache/dev-db/pspg-0.9.1 b/metadata/md5-cache/dev-db/pspg-0.9.1
new file mode 100644
index 000000000000..c251ab7be42a
--- /dev/null
+++ b/metadata/md5-cache/dev-db/pspg-0.9.1
@@ -0,0 +1,11 @@
+DEFINED_PHASES=-
+DEPEND=sys-libs/ncurses:*
+DESCRIPTION=A better pager for psql and mysql
+EAPI=6
+HOMEPAGE=https://github.com/okbob/pspg
+KEYWORDS=~amd64 ~x86
+LICENSE=BSD-2
+RDEPEND=sys-libs/ncurses:*
+SLOT=0
+SRC_URI=https://github.com/okbob/pspg/archive/0.9.1.tar.gz -> pspg-0.9.1.tar.gz
+_md5_=584f8a3d3cb871e00337361288a09afa
diff --git a/metadata/md5-cache/dev-db/psqlodbc-09.06.0200 b/metadata/md5-cache/dev-db/psqlodbc-09.06.0200
deleted file mode 100644
index 5faf5b18d899..000000000000
--- a/metadata/md5-cache/dev-db/psqlodbc-09.06.0200
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=configure install
-DEPEND=dev-db/postgresql:*[ssl?] !iodbc? ( dev-db/unixODBC ) iodbc? ( dev-db/libiodbc )
-DESCRIPTION=Official ODBC driver for PostgreSQL
-EAPI=6
-HOMEPAGE=http://www.postgresql.org/
-IUSE=doc iodbc ssl threads unicode
-KEYWORDS=~amd64 ~x86
-LICENSE=LGPL-2
-RDEPEND=dev-db/postgresql:*[ssl?] !iodbc? ( dev-db/unixODBC ) iodbc? ( dev-db/libiodbc )
-SLOT=0
-SRC_URI=mirror://postgresql/odbc/versions/src/psqlodbc-09.06.0200.tar.gz
-_md5_=a279d5bab4f70440f5eaf97cf3b20d98
diff --git a/metadata/md5-cache/dev-db/psqlodbc-09.06.0300 b/metadata/md5-cache/dev-db/psqlodbc-09.06.0300
deleted file mode 100644
index 5c1e43c94387..000000000000
--- a/metadata/md5-cache/dev-db/psqlodbc-09.06.0300
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=configure install
-DEPEND=dev-db/postgresql:*[ssl?] !iodbc? ( dev-db/unixODBC ) iodbc? ( dev-db/libiodbc )
-DESCRIPTION=Official ODBC driver for PostgreSQL
-EAPI=6
-HOMEPAGE=http://www.postgresql.org/
-IUSE=doc iodbc ssl threads
-KEYWORDS=~amd64 ~x86
-LICENSE=LGPL-2
-RDEPEND=dev-db/postgresql:*[ssl?] !iodbc? ( dev-db/unixODBC ) iodbc? ( dev-db/libiodbc )
-SLOT=0
-SRC_URI=mirror://postgresql/odbc/versions/src/psqlodbc-09.06.0300.tar.gz
-_md5_=a9c0ca240b3b46be6bb03882c407ada1
diff --git a/metadata/md5-cache/dev-db/psqlodbc-09.06.0310 b/metadata/md5-cache/dev-db/psqlodbc-10.01.0000
similarity index 78%
rename from metadata/md5-cache/dev-db/psqlodbc-09.06.0310
rename to metadata/md5-cache/dev-db/psqlodbc-10.01.0000
index 701d9753d0f6..009223b93a2b 100644
--- a/metadata/md5-cache/dev-db/psqlodbc-09.06.0310
+++ b/metadata/md5-cache/dev-db/psqlodbc-10.01.0000
@@ -8,5 +8,5 @@ KEYWORDS=~amd64 ~x86
LICENSE=LGPL-2
RDEPEND=dev-db/postgresql:*[ssl?] !iodbc? ( dev-db/unixODBC ) iodbc? ( dev-db/libiodbc )
SLOT=0
-SRC_URI=mirror://postgresql/odbc/versions/src/psqlodbc-09.06.0310.tar.gz
-_md5_=a9c0ca240b3b46be6bb03882c407ada1
+SRC_URI=mirror://postgresql/odbc/versions/src/psqlodbc-10.01.0000.tar.gz
+_md5_=2ed6b192584961914bedc43b81e90a70
diff --git a/metadata/md5-cache/dev-games/Manifest.gz b/metadata/md5-cache/dev-games/Manifest.gz
index 9736e68baa63..e585d7e2f056 100644
Binary files a/metadata/md5-cache/dev-games/Manifest.gz and b/metadata/md5-cache/dev-games/Manifest.gz differ
diff --git a/metadata/md5-cache/dev-games/tiled-1.1.1 b/metadata/md5-cache/dev-games/tiled-1.1.1
new file mode 100644
index 000000000000..856fe2dd3670
--- /dev/null
+++ b/metadata/md5-cache/dev-games/tiled-1.1.1
@@ -0,0 +1,14 @@
+DEFINED_PHASES=configure install postinst postrm preinst prepare setup
+DEPEND=>=dev-qt/qtcore-5.7:5 >=dev-qt/qtgui-5.7:5 >=dev-qt/qtnetwork-5.7:5 >=dev-qt/qtwidgets-5.7:5 sys-libs/zlib python? ( python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),python_single_target_python2_7(+)] ) dev-qt/linguist-tools:5 >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info
+DESCRIPTION=A general purpose tile map editor
+EAPI=6
+HOMEPAGE=http://www.mapeditor.org/
+IUSE=examples python python_targets_python2_7
+KEYWORDS=~amd64
+LICENSE=BSD BSD-2 GPL-2+
+RDEPEND=>=dev-qt/qtcore-5.7:5 >=dev-qt/qtgui-5.7:5 >=dev-qt/qtnetwork-5.7:5 >=dev-qt/qtwidgets-5.7:5 sys-libs/zlib python? ( python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),python_single_target_python2_7(+)] )
+REQUIRED_USE=python? ( python_targets_python2_7 )
+SLOT=0
+SRC_URI=https://github.com/bjorn/tiled/archive/v1.1.1/tiled-1.1.1.tar.gz
+_eclasses_=desktop 2ccd1dd1dd7bfb8795eea024a4f91bb6 epatch 8233751dc5105a6ae8fcd86ce2bb0247 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 6e7258392d5eda499c1cfa94db650b61 gnome2-utils 4d211d7614f303710fca59db6ec12c88 ltprune 2770eed66a9b8ef944714cd0e968182e multilib 97f470f374f2e94ccab04a2fb21d811e preserve-libs ef207dc62baddfddfd39a164d9797648 python-single-r1 317a2557b4d7319a7418225f65accf77 python-utils-r1 c9de01becf9df3f8c10aeec3dc693f5d qmake-utils 990448b067cb3cfe1443bc25fb57239c toolchain-funcs 885c7d8dd70a58825f3d17e35a3cd1e9 xdg 6cd76cc914c1a759dee032778487b57f xdg-utils f2c8335407f0b935b0a96d4adf23ef25
+_md5_=d043fe47cf366ce1ae0686f23e36ddbe
diff --git a/metadata/md5-cache/dev-qt/Manifest.gz b/metadata/md5-cache/dev-qt/Manifest.gz
index ca8272a6c145..7c669092a2c3 100644
Binary files a/metadata/md5-cache/dev-qt/Manifest.gz and b/metadata/md5-cache/dev-qt/Manifest.gz differ
diff --git a/metadata/md5-cache/dev-qt/qtsql-4.8.7-r1 b/metadata/md5-cache/dev-qt/qtsql-4.8.7-r1
index a8afec3de815..0aeea0acd71b 100644
--- a/metadata/md5-cache/dev-qt/qtsql-4.8.7-r1
+++ b/metadata/md5-cache/dev-qt/qtsql-4.8.7-r1
@@ -11,4 +11,4 @@ REQUIRED_USE=|| ( freetds mysql oci8 odbc postgres sqlite )
SLOT=4
SRC_URI=http://download.qt.io/official_releases/qt/4.8/4.8.7/qt-everywhere-opensource-src-4.8.7.tar.gz
_eclasses_=desktop 2ccd1dd1dd7bfb8795eea024a4f91bb6 epatch 8233751dc5105a6ae8fcd86ce2bb0247 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 6e7258392d5eda499c1cfa94db650b61 flag-o-matic 02908f00f002f0f07c5b74783d778325 ltprune 2770eed66a9b8ef944714cd0e968182e multibuild 72647e255187a1fadc81097b3657e5c3 multilib 97f470f374f2e94ccab04a2fb21d811e multilib-build 8ffb5e2112a70fef5f37fcacad308726 multilib-minimal 9139c3a57e077cb8e0d0f73ceb080b89 preserve-libs ef207dc62baddfddfd39a164d9797648 qt4-build-multilib 277a1997239523435425a3e17d116e23 toolchain-funcs 885c7d8dd70a58825f3d17e35a3cd1e9
-_md5_=97b003711b865cc5873ec9efaeaf5a87
+_md5_=06755ff8361593fefe1e7a21463c3119
diff --git a/metadata/md5-cache/dev-ruby/Manifest.gz b/metadata/md5-cache/dev-ruby/Manifest.gz
index 966326260962..1c9b4ff495ea 100644
Binary files a/metadata/md5-cache/dev-ruby/Manifest.gz and b/metadata/md5-cache/dev-ruby/Manifest.gz differ
diff --git a/metadata/md5-cache/dev-ruby/ascii85-1.0.2-r2 b/metadata/md5-cache/dev-ruby/ascii85-1.0.2-r2
index f456974598e4..cc2f9972a725 100644
--- a/metadata/md5-cache/dev-ruby/ascii85-1.0.2-r2
+++ b/metadata/md5-cache/dev-ruby/ascii85-1.0.2-r2
@@ -1,14 +1,14 @@
DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=ruby_targets_ruby22? ( test? ( dev-ruby/minitest[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( test? ( dev-ruby/minitest[ruby_targets_ruby23] ) ) ruby_targets_ruby24? ( test? ( dev-ruby/minitest[ruby_targets_ruby24] ) ) ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby22? ( test? ( dev-ruby/rake[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( test? ( dev-ruby/rake[ruby_targets_ruby23] ) ) ruby_targets_ruby24? ( test? ( dev-ruby/rake[ruby_targets_ruby24] ) ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) test? ( ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) )
+DEPEND=ruby_targets_ruby22? ( test? ( dev-ruby/minitest[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( test? ( dev-ruby/minitest[ruby_targets_ruby23] ) ) ruby_targets_ruby24? ( test? ( dev-ruby/minitest[ruby_targets_ruby24] ) ) ruby_targets_ruby25? ( test? ( dev-ruby/minitest[ruby_targets_ruby25] ) ) ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby25? ( dev-lang/ruby:2.5 ) ruby_targets_ruby22? ( test? ( dev-ruby/rake[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( test? ( dev-ruby/rake[ruby_targets_ruby23] ) ) ruby_targets_ruby24? ( test? ( dev-ruby/rake[ruby_targets_ruby24] ) ) ruby_targets_ruby25? ( test? ( dev-ruby/rake[ruby_targets_ruby25] ) ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25] ) test? ( ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25] ) )
DESCRIPTION=Methods for encoding/decoding Adobe's binary-to-text encoding of the same name
EAPI=5
HOMEPAGE=https://github.com/datawraith/ascii85gem
-IUSE=test elibc_FreeBSD ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 test test
+IUSE=test elibc_FreeBSD ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 ruby_targets_ruby25 test test
KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd
LICENSE=MIT
-RDEPEND=ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] )
-REQUIRED_USE=|| ( ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 )
+RDEPEND=ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby25? ( dev-lang/ruby:2.5 ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25] )
+REQUIRED_USE=|| ( ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 ruby_targets_ruby25 )
SLOT=0
SRC_URI=mirror://rubygems/Ascii85-1.0.2.gem
_eclasses_=desktop 2ccd1dd1dd7bfb8795eea024a4f91bb6 epatch 8233751dc5105a6ae8fcd86ce2bb0247 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 6e7258392d5eda499c1cfa94db650b61 java-utils-2 0ee72667014428e01a01df2345244cf3 ltprune 2770eed66a9b8ef944714cd0e968182e multilib 97f470f374f2e94ccab04a2fb21d811e preserve-libs ef207dc62baddfddfd39a164d9797648 ruby-fakegem cf1343b57e8029745950b4b147ff4d3a ruby-ng 2da44d50080e3d54e1a4ac7d91d149f8 ruby-utils 4ef362ae9cebac7c62680b608e2a675b toolchain-funcs 885c7d8dd70a58825f3d17e35a3cd1e9 versionator ce21313503c41896ebcd7d58b0607e37
-_md5_=d4b93ac61ebc8a14784de0e5fea85aec
+_md5_=5c8e0f21e30dcdc82d943dc739245af8
diff --git a/metadata/md5-cache/dev-ruby/atomic-1.1.99 b/metadata/md5-cache/dev-ruby/atomic-1.1.99
index 64f5938d3ff0..27049d3a35fa 100644
--- a/metadata/md5-cache/dev-ruby/atomic-1.1.99
+++ b/metadata/md5-cache/dev-ruby/atomic-1.1.99
@@ -1,14 +1,14 @@
DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby22? ( test? ( dev-ruby/rake[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( test? ( dev-ruby/rake[ruby_targets_ruby23] ) ) ruby_targets_ruby24? ( test? ( dev-ruby/rake[ruby_targets_ruby24] ) ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) test? ( ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) )
+DEPEND=ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby25? ( dev-lang/ruby:2.5 ) ruby_targets_ruby22? ( test? ( dev-ruby/rake[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( test? ( dev-ruby/rake[ruby_targets_ruby23] ) ) ruby_targets_ruby24? ( test? ( dev-ruby/rake[ruby_targets_ruby24] ) ) ruby_targets_ruby25? ( test? ( dev-ruby/rake[ruby_targets_ruby25] ) ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25] ) test? ( ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25] ) )
DESCRIPTION=An atomic reference implementation for JRuby, Rubinius, and MRI
EAPI=5
HOMEPAGE=https://github.com/headius/ruby-atomic
-IUSE=elibc_FreeBSD ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 test test
+IUSE=elibc_FreeBSD ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 ruby_targets_ruby25 test test
KEYWORDS=~alpha amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~x86
LICENSE=Apache-2.0
-RDEPEND=ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] )
-REQUIRED_USE=|| ( ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 )
+RDEPEND=ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby25? ( dev-lang/ruby:2.5 ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25] )
+REQUIRED_USE=|| ( ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 ruby_targets_ruby25 )
SLOT=0
SRC_URI=mirror://rubygems/atomic-1.1.99.gem
_eclasses_=desktop 2ccd1dd1dd7bfb8795eea024a4f91bb6 epatch 8233751dc5105a6ae8fcd86ce2bb0247 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 6e7258392d5eda499c1cfa94db650b61 java-utils-2 0ee72667014428e01a01df2345244cf3 ltprune 2770eed66a9b8ef944714cd0e968182e multilib 97f470f374f2e94ccab04a2fb21d811e preserve-libs ef207dc62baddfddfd39a164d9797648 ruby-fakegem cf1343b57e8029745950b4b147ff4d3a ruby-ng 2da44d50080e3d54e1a4ac7d91d149f8 ruby-utils 4ef362ae9cebac7c62680b608e2a675b toolchain-funcs 885c7d8dd70a58825f3d17e35a3cd1e9 versionator ce21313503c41896ebcd7d58b0607e37
-_md5_=bb68f5ea0c6b6545a77c84e44b75269f
+_md5_=91d45ddc7e9c1537cab5ea059af6a1fc
diff --git a/metadata/md5-cache/dev-ruby/bacon-1.2.0-r2 b/metadata/md5-cache/dev-ruby/bacon-1.2.0-r2
index 4aaa7d8df19e..228fe56612f0 100644
--- a/metadata/md5-cache/dev-ruby/bacon-1.2.0-r2
+++ b/metadata/md5-cache/dev-ruby/bacon-1.2.0-r2
@@ -1,14 +1,14 @@
DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby22? ( doc? ( dev-ruby/rake[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( doc? ( dev-ruby/rake[ruby_targets_ruby23] ) ) ruby_targets_ruby24? ( doc? ( dev-ruby/rake[ruby_targets_ruby24] ) ) ruby_targets_ruby22? ( test? ( dev-ruby/rake[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( test? ( dev-ruby/rake[ruby_targets_ruby23] ) ) ruby_targets_ruby24? ( test? ( dev-ruby/rake[ruby_targets_ruby24] ) ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) test? ( ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) )
+DEPEND=ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby25? ( dev-lang/ruby:2.5 ) ruby_targets_ruby22? ( doc? ( dev-ruby/rake[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( doc? ( dev-ruby/rake[ruby_targets_ruby23] ) ) ruby_targets_ruby24? ( doc? ( dev-ruby/rake[ruby_targets_ruby24] ) ) ruby_targets_ruby25? ( doc? ( dev-ruby/rake[ruby_targets_ruby25] ) ) ruby_targets_ruby22? ( test? ( dev-ruby/rake[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( test? ( dev-ruby/rake[ruby_targets_ruby23] ) ) ruby_targets_ruby24? ( test? ( dev-ruby/rake[ruby_targets_ruby24] ) ) ruby_targets_ruby25? ( test? ( dev-ruby/rake[ruby_targets_ruby25] ) ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25] ) test? ( ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25] ) )
DESCRIPTION=Small RSpec clone weighing less than 350 LoC
EAPI=5
HOMEPAGE=http://chneukirchen.org/repos/bacon
-IUSE=elibc_FreeBSD ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 doc test test
+IUSE=elibc_FreeBSD ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 ruby_targets_ruby25 doc test test
KEYWORDS=alpha amd64 arm ~arm64 hppa ia64 ppc ppc64 sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
LICENSE=MIT
-RDEPEND=ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] )
-REQUIRED_USE=|| ( ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 )
+RDEPEND=ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby25? ( dev-lang/ruby:2.5 ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25] )
+REQUIRED_USE=|| ( ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 ruby_targets_ruby25 )
SLOT=0
SRC_URI=mirror://rubygems/bacon-1.2.0.gem
_eclasses_=desktop 2ccd1dd1dd7bfb8795eea024a4f91bb6 epatch 8233751dc5105a6ae8fcd86ce2bb0247 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 6e7258392d5eda499c1cfa94db650b61 java-utils-2 0ee72667014428e01a01df2345244cf3 ltprune 2770eed66a9b8ef944714cd0e968182e multilib 97f470f374f2e94ccab04a2fb21d811e preserve-libs ef207dc62baddfddfd39a164d9797648 ruby-fakegem cf1343b57e8029745950b4b147ff4d3a ruby-ng 2da44d50080e3d54e1a4ac7d91d149f8 ruby-utils 4ef362ae9cebac7c62680b608e2a675b toolchain-funcs 885c7d8dd70a58825f3d17e35a3cd1e9 versionator ce21313503c41896ebcd7d58b0607e37
-_md5_=3841c0d1473541f90abd1a210aa56f80
+_md5_=f3b818a37856385e9277797f019c234c
diff --git a/metadata/md5-cache/dev-ruby/binding_of_caller-0.8.0 b/metadata/md5-cache/dev-ruby/binding_of_caller-0.8.0
new file mode 100644
index 000000000000..853d6befcd8c
--- /dev/null
+++ b/metadata/md5-cache/dev-ruby/binding_of_caller-0.8.0
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install prepare setup test unpack
+DEPEND=test? ( ruby_targets_ruby22? ( >=dev-ruby/debug_inspector-0.0.1[ruby_targets_ruby22] ) ruby_targets_ruby23? ( >=dev-ruby/debug_inspector-0.0.1[ruby_targets_ruby23] ) ruby_targets_ruby24? ( >=dev-ruby/debug_inspector-0.0.1[ruby_targets_ruby24] ) ) ruby_targets_ruby22? ( test? ( dev-ruby/bacon[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( test? ( dev-ruby/bacon[ruby_targets_ruby23] ) ) ruby_targets_ruby24? ( test? ( dev-ruby/bacon[ruby_targets_ruby24] ) ) ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby22? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby23] ) ) ruby_targets_ruby24? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby24] ) ) ruby_targets_ruby22? ( test? ( dev-ruby/rake[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( test? ( dev-ruby/rake[ruby_targets_ruby23] ) ) ruby_targets_ruby24? ( test? ( dev-ruby/rake[ruby_targets_ruby24] ) ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) test? ( ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) )
+DESCRIPTION=Retrieve the binding of a method's caller
+EAPI=6
+HOMEPAGE=https://github.com/banister/binding_of_caller
+IUSE=test elibc_FreeBSD ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 doc test test
+KEYWORDS=~amd64
+LICENSE=MIT
+RDEPEND=ruby_targets_ruby22? ( >=dev-ruby/debug_inspector-0.0.1[ruby_targets_ruby22] ) ruby_targets_ruby23? ( >=dev-ruby/debug_inspector-0.0.1[ruby_targets_ruby23] ) ruby_targets_ruby24? ( >=dev-ruby/debug_inspector-0.0.1[ruby_targets_ruby24] ) ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] )
+REQUIRED_USE=|| ( ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 )
+SLOT=0
+SRC_URI=mirror://rubygems/binding_of_caller-0.8.0.gem
+_eclasses_=desktop 2ccd1dd1dd7bfb8795eea024a4f91bb6 epatch 8233751dc5105a6ae8fcd86ce2bb0247 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 6e7258392d5eda499c1cfa94db650b61 java-utils-2 0ee72667014428e01a01df2345244cf3 ltprune 2770eed66a9b8ef944714cd0e968182e multilib 97f470f374f2e94ccab04a2fb21d811e preserve-libs ef207dc62baddfddfd39a164d9797648 ruby-fakegem cf1343b57e8029745950b4b147ff4d3a ruby-ng 2da44d50080e3d54e1a4ac7d91d149f8 ruby-utils 4ef362ae9cebac7c62680b608e2a675b toolchain-funcs 885c7d8dd70a58825f3d17e35a3cd1e9 versionator ce21313503c41896ebcd7d58b0607e37
+_md5_=69c8489824d926cc7853166a922e6aca
diff --git a/metadata/md5-cache/dev-ruby/debug_inspector-0.0.3 b/metadata/md5-cache/dev-ruby/debug_inspector-0.0.3
index 896d709defc5..6b04f2708313 100644
--- a/metadata/md5-cache/dev-ruby/debug_inspector-0.0.3
+++ b/metadata/md5-cache/dev-ruby/debug_inspector-0.0.3
@@ -1,14 +1,14 @@
DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby22? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby23] ) ) ruby_targets_ruby24? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby24] ) ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) test? ( ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) )
+DEPEND=ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby25? ( dev-lang/ruby:2.5 ) ruby_targets_ruby22? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby23] ) ) ruby_targets_ruby24? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby24] ) ) ruby_targets_ruby25? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby25] ) ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25] ) test? ( ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25] ) )
DESCRIPTION=A Ruby wrapper for the MRI 2.0 debug_inspector API
EAPI=6
HOMEPAGE=https://github.com/banister/debug_inspector
-IUSE=elibc_FreeBSD ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 doc test
+IUSE=elibc_FreeBSD ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 ruby_targets_ruby25 doc test
KEYWORDS=~amd64
LICENSE=MIT
-RDEPEND=ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] )
-REQUIRED_USE=|| ( ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 )
+RDEPEND=ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby25? ( dev-lang/ruby:2.5 ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25] )
+REQUIRED_USE=|| ( ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 ruby_targets_ruby25 )
SLOT=0
SRC_URI=mirror://rubygems/debug_inspector-0.0.3.gem
_eclasses_=desktop 2ccd1dd1dd7bfb8795eea024a4f91bb6 epatch 8233751dc5105a6ae8fcd86ce2bb0247 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 6e7258392d5eda499c1cfa94db650b61 java-utils-2 0ee72667014428e01a01df2345244cf3 ltprune 2770eed66a9b8ef944714cd0e968182e multilib 97f470f374f2e94ccab04a2fb21d811e preserve-libs ef207dc62baddfddfd39a164d9797648 ruby-fakegem cf1343b57e8029745950b4b147ff4d3a ruby-ng 2da44d50080e3d54e1a4ac7d91d149f8 ruby-utils 4ef362ae9cebac7c62680b608e2a675b toolchain-funcs 885c7d8dd70a58825f3d17e35a3cd1e9 versionator ce21313503c41896ebcd7d58b0607e37
-_md5_=c218063d526fc3af0935f636db08374c
+_md5_=e81af6fc7061796e8dd1b19095f98496
diff --git a/metadata/md5-cache/dev-util/Manifest.gz b/metadata/md5-cache/dev-util/Manifest.gz
index 61749c8276ad..0364faff7e01 100644
Binary files a/metadata/md5-cache/dev-util/Manifest.gz and b/metadata/md5-cache/dev-util/Manifest.gz differ
diff --git a/metadata/md5-cache/dev-util/clazy-1.3 b/metadata/md5-cache/dev-util/clazy-1.3
new file mode 100644
index 000000000000..dfaa22b7b68a
--- /dev/null
+++ b/metadata/md5-cache/dev-util/clazy-1.3
@@ -0,0 +1,12 @@
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=sys-devel/clang:= >=sys-devel/llvm-3.8:= app-arch/unzip sys-devel/make >=dev-util/cmake-3.7.2
+DESCRIPTION=Compiler plugin which allows clang to understand Qt semantics
+EAPI=6
+HOMEPAGE=https://github.com/KDE/clazy/blob/master/README.md
+KEYWORDS=~amd64
+LICENSE=LGPL-2+
+RDEPEND=sys-devel/clang:= >=sys-devel/llvm-3.8:=
+SLOT=0
+SRC_URI=mirror://kde/stable/clazy/1.3/src/clazy-1.3.tar.xz
+_eclasses_=cmake-utils 202a2becc86cb78ba14baad148d06759 desktop 2ccd1dd1dd7bfb8795eea024a4f91bb6 epatch 8233751dc5105a6ae8fcd86ce2bb0247 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 6e7258392d5eda499c1cfa94db650b61 flag-o-matic 02908f00f002f0f07c5b74783d778325 ltprune 2770eed66a9b8ef944714cd0e968182e multilib 97f470f374f2e94ccab04a2fb21d811e multiprocessing cac3169468f893670dac3e7cb940e045 ninja-utils ebb2eaddc6331c4fa000b8eb8f6fe074 preserve-libs ef207dc62baddfddfd39a164d9797648 toolchain-funcs 885c7d8dd70a58825f3d17e35a3cd1e9 versionator ce21313503c41896ebcd7d58b0607e37 xdg-utils f2c8335407f0b935b0a96d4adf23ef25
+_md5_=9f5f4e52ebb6a1aae4ce938ad08198da
diff --git a/metadata/md5-cache/dev-util/drone-cli-0.8.1 b/metadata/md5-cache/dev-util/drone-cli-0.8.1
new file mode 100644
index 000000000000..56289fc706ff
--- /dev/null
+++ b/metadata/md5-cache/dev-util/drone-cli-0.8.1
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile install test unpack
+DEPEND=>=dev-lang/go-1.8
+DESCRIPTION=Command-line interface for Drone
+EAPI=6
+HOMEPAGE=https://github.com/drone/drone-cli
+KEYWORDS=~amd64
+LICENSE=Apache-2.0
+RDEPEND=!! drone-cli-0.8.1.tar.gz
+_eclasses_=golang-base 51a1f13e065f1cff4507685d9cc268c7 golang-build b66349c110e4ddd6203bbe8bf4ae05c1 golang-vcs-snapshot 913580335becddd3ebecefe852e47536
+_md5_=8d7bf968c1c1644397fddee1ae332453
diff --git a/metadata/md5-cache/games-emulation/Manifest.gz b/metadata/md5-cache/games-emulation/Manifest.gz
index 6ae58d4c05d2..20fd72739a3b 100644
Binary files a/metadata/md5-cache/games-emulation/Manifest.gz and b/metadata/md5-cache/games-emulation/Manifest.gz differ
diff --git a/metadata/md5-cache/games-emulation/dolphin-5.0 b/metadata/md5-cache/games-emulation/dolphin-5.0
index c41a0ace3bcb..36d364b50ca0 100644
--- a/metadata/md5-cache/games-emulation/dolphin-5.0
+++ b/metadata/md5-cache/games-emulation/dolphin-5.0
@@ -1,13 +1,13 @@
-DEFINED_PHASES=compile configure install postinst prepare pretend test
-DEPEND=>=media-libs/libsfml-2.1 >net-libs/enet-1.3.7 >=net-libs/mbedtls-2.1.1 dev-libs/lzo media-libs/libpng:= sys-libs/glibc sys-libs/readline:= sys-libs/zlib x11-libs/libXext x11-libs/libXi x11-libs/libXrandr virtual/libusb:1 virtual/opengl alsa? ( media-libs/alsa-lib ) ao? ( media-libs/libao ) bluetooth? ( net-wireless/bluez ) egl? ( media-libs/mesa[egl] ) evdev? ( dev-libs/libevdev virtual/udev ) ffmpeg? ( virtual/ffmpeg ) llvm? ( sys-devel/llvm ) openal? ( media-libs/openal media-libs/libsoundtouch ) portaudio? ( media-libs/portaudio ) profile? ( dev-util/oprofile ) pulseaudio? ( media-sound/pulseaudio ) qt5? ( dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtwidgets:5 ) sdl? ( media-libs/libsdl2[haptic,joystick] ) upnp? ( >=net-libs/miniupnpc-1.7 ) wxwidgets? ( dev-libs/glib:2 x11-libs/gtk+:2 x11-libs/wxGTK:3.0[opengl,X] ) >=dev-util/cmake-2.8.8 >=sys-devel/gcc-4.9.0 app-arch/zip media-libs/freetype sys-devel/gettext virtual/pkgconfig sys-devel/make >=dev-util/cmake-3.7.2
+DEFINED_PHASES=compile configure install postinst prepare test
+DEPEND=>=media-libs/libsfml-2.1 >net-libs/enet-1.3.7 >=net-libs/mbedtls-2.1.1 dev-libs/lzo media-libs/libpng:0= sys-libs/readline:0= sys-libs/zlib x11-libs/libXext x11-libs/libXi x11-libs/libXrandr virtual/libusb:1 virtual/opengl alsa? ( media-libs/alsa-lib ) ao? ( media-libs/libao ) bluetooth? ( net-wireless/bluez ) egl? ( media-libs/mesa[egl] ) evdev? ( dev-libs/libevdev virtual/udev ) ffmpeg? ( libav? ( media-video/libav:= ) !libav? ( media-video/ffmpeg:= ) ) llvm? ( sys-devel/llvm ) openal? ( media-libs/openal media-libs/libsoundtouch ) portaudio? ( media-libs/portaudio ) profile? ( dev-util/oprofile ) pulseaudio? ( media-sound/pulseaudio ) qt5? ( dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtwidgets:5 ) sdl? ( media-libs/libsdl2[haptic,joystick] ) upnp? ( >=net-libs/miniupnpc-1.7 ) wxwidgets? ( dev-libs/glib:2 x11-libs/gtk+:2 x11-libs/wxGTK:3.0[opengl,X] ) app-arch/zip media-libs/freetype sys-devel/gettext virtual/pkgconfig sys-devel/make >=dev-util/cmake-3.7.2
DESCRIPTION=Gamecube and Wii game emulator
EAPI=5
HOMEPAGE=https://www.dolphin-emu.org/
-IUSE=alsa ao bluetooth doc egl +evdev ffmpeg llvm log lto openal +pch portaudio profile pulseaudio qt5 sdl upnp +wxwidgets
+IUSE=alsa ao bluetooth doc egl +evdev ffmpeg libav llvm log lto openal +pch portaudio profile pulseaudio qt5 sdl upnp +wxwidgets
KEYWORDS=amd64
LICENSE=GPL-2
-RDEPEND=>=media-libs/libsfml-2.1 >net-libs/enet-1.3.7 >=net-libs/mbedtls-2.1.1 dev-libs/lzo media-libs/libpng:= sys-libs/glibc sys-libs/readline:= sys-libs/zlib x11-libs/libXext x11-libs/libXi x11-libs/libXrandr virtual/libusb:1 virtual/opengl alsa? ( media-libs/alsa-lib ) ao? ( media-libs/libao ) bluetooth? ( net-wireless/bluez ) egl? ( media-libs/mesa[egl] ) evdev? ( dev-libs/libevdev virtual/udev ) ffmpeg? ( virtual/ffmpeg ) llvm? ( sys-devel/llvm ) openal? ( media-libs/openal media-libs/libsoundtouch ) portaudio? ( media-libs/portaudio ) profile? ( dev-util/oprofile ) pulseaudio? ( media-sound/pulseaudio ) qt5? ( dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtwidgets:5 ) sdl? ( media-libs/libsdl2[haptic,joystick] ) upnp? ( >=net-libs/miniupnpc-1.7 ) wxwidgets? ( dev-libs/glib:2 x11-libs/gtk+:2 x11-libs/wxGTK:3.0[opengl,X] )
+RDEPEND=>=media-libs/libsfml-2.1 >net-libs/enet-1.3.7 >=net-libs/mbedtls-2.1.1 dev-libs/lzo media-libs/libpng:0= sys-libs/readline:0= sys-libs/zlib x11-libs/libXext x11-libs/libXi x11-libs/libXrandr virtual/libusb:1 virtual/opengl alsa? ( media-libs/alsa-lib ) ao? ( media-libs/libao ) bluetooth? ( net-wireless/bluez ) egl? ( media-libs/mesa[egl] ) evdev? ( dev-libs/libevdev virtual/udev ) ffmpeg? ( libav? ( media-video/libav:= ) !libav? ( media-video/ffmpeg:= ) ) llvm? ( sys-devel/llvm ) openal? ( media-libs/openal media-libs/libsoundtouch ) portaudio? ( media-libs/portaudio ) profile? ( dev-util/oprofile ) pulseaudio? ( media-sound/pulseaudio ) qt5? ( dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtwidgets:5 ) sdl? ( media-libs/libsdl2[haptic,joystick] ) upnp? ( >=net-libs/miniupnpc-1.7 ) wxwidgets? ( dev-libs/glib:2 x11-libs/gtk+:2 x11-libs/wxGTK:3.0[opengl,X] )
SLOT=0
SRC_URI=https://github.com/dolphin-emu/dolphin/archive/5.0.zip -> dolphin-5.0.zip
_eclasses_=cmake-utils 202a2becc86cb78ba14baad148d06759 desktop 2ccd1dd1dd7bfb8795eea024a4f91bb6 epatch 8233751dc5105a6ae8fcd86ce2bb0247 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 6e7258392d5eda499c1cfa94db650b61 flag-o-matic 02908f00f002f0f07c5b74783d778325 l10n 07318ed5f26525a9d302ca87d20b2865 ltprune 2770eed66a9b8ef944714cd0e968182e multilib 97f470f374f2e94ccab04a2fb21d811e multiprocessing cac3169468f893670dac3e7cb940e045 ninja-utils ebb2eaddc6331c4fa000b8eb8f6fe074 pax-utils 4f95120230a315c8caaabeb2307b7eee preserve-libs ef207dc62baddfddfd39a164d9797648 toolchain-funcs 885c7d8dd70a58825f3d17e35a3cd1e9 versionator ce21313503c41896ebcd7d58b0607e37 wxwidgets 04e063b0eff26daaea83d859dd9d6e05 xdg-utils f2c8335407f0b935b0a96d4adf23ef25
-_md5_=cae8542629f48bf14b400df97fe34f03
+_md5_=8a4b3b1b16ebb407f6c4e0c59d41cd3b
diff --git a/metadata/md5-cache/net-analyzer/Manifest.gz b/metadata/md5-cache/net-analyzer/Manifest.gz
index ef64accbb6db..68a57bcdc97c 100644
Binary files a/metadata/md5-cache/net-analyzer/Manifest.gz and b/metadata/md5-cache/net-analyzer/Manifest.gz differ
diff --git a/metadata/md5-cache/net-analyzer/linkchecker-9.3.1 b/metadata/md5-cache/net-analyzer/linkchecker-9.3.1-r1
similarity index 69%
rename from metadata/md5-cache/net-analyzer/linkchecker-9.3.1
rename to metadata/md5-cache/net-analyzer/linkchecker-9.3.1-r1
index f7f6348e84d6..a90f2376fe6f 100644
--- a/metadata/md5-cache/net-analyzer/linkchecker-9.3.1
+++ b/metadata/md5-cache/net-analyzer/linkchecker-9.3.1-r1
@@ -6,10 +6,10 @@ HOMEPAGE=https://github.com/linkcheck/linkchecker
IUSE=gnome sqlite X python_targets_python2_7
KEYWORDS=~amd64 ~x86 ~ppc-macos ~x64-solaris
LICENSE=GPL-2
-RDEPEND=virtual/python-dnspython[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] =dev-lang/python-2.7.5-r2:2.7[sqlite?] ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
+RDEPEND=virtual/python-dnspython[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/requests[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] gnome? ( dev-python/pygtk:2[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) X? ( dev-python/PyQt4[X,help,python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/qscintilla-python[qt4(+),python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[sqlite?] ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
REQUIRED_USE=|| ( python_targets_python2_7 )
RESTRICT=test
SLOT=0
SRC_URI=https://github.com/linkcheck/linkchecker/archive/v9.3.1.tar.gz -> linkchecker-9.3.1.tar.gz
_eclasses_=bash-completion-r1 8e447753aaf658afa609fbf961d80ab7 desktop 2ccd1dd1dd7bfb8795eea024a4f91bb6 distutils-r1 372bbe39047c0a2550319a3a82f3e063 epatch 8233751dc5105a6ae8fcd86ce2bb0247 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 6e7258392d5eda499c1cfa94db650b61 ltprune 2770eed66a9b8ef944714cd0e968182e multibuild 72647e255187a1fadc81097b3657e5c3 multilib 97f470f374f2e94ccab04a2fb21d811e multiprocessing cac3169468f893670dac3e7cb940e045 preserve-libs ef207dc62baddfddfd39a164d9797648 python-r1 e9350ec46bb5c9f3504b4fbe8b8d8987 python-utils-r1 c9de01becf9df3f8c10aeec3dc693f5d toolchain-funcs 885c7d8dd70a58825f3d17e35a3cd1e9 xdg-utils f2c8335407f0b935b0a96d4adf23ef25
-_md5_=2860e9ed3e5d182427ebcbb4f0a62327
+_md5_=4bf7f837c288f0507ed5a6d9ba3b5c4d
diff --git a/metadata/md5-cache/net-ftp/Manifest.gz b/metadata/md5-cache/net-ftp/Manifest.gz
index 25440bece542..a0663fe945ce 100644
Binary files a/metadata/md5-cache/net-ftp/Manifest.gz and b/metadata/md5-cache/net-ftp/Manifest.gz differ
diff --git a/metadata/md5-cache/net-ftp/pure-ftpd-1.0.45-r1 b/metadata/md5-cache/net-ftp/pure-ftpd-1.0.45-r2
similarity index 97%
rename from metadata/md5-cache/net-ftp/pure-ftpd-1.0.45-r1
rename to metadata/md5-cache/net-ftp/pure-ftpd-1.0.45-r2
index 394699994f05..4ee8ae9065b4 100644
--- a/metadata/md5-cache/net-ftp/pure-ftpd-1.0.45-r1
+++ b/metadata/md5-cache/net-ftp/pure-ftpd-1.0.45-r2
@@ -11,4 +11,4 @@ REQUIRED_USE=implicittls? ( ssl )
SLOT=0
SRC_URI=ftp://ftp.pureftpd.org/pub/pure-ftpd/releases/pure-ftpd-1.0.45.tar.bz2 http://download.pureftpd.org/pub/pure-ftpd/releases/pure-ftpd-1.0.45.tar.bz2
_eclasses_=desktop 2ccd1dd1dd7bfb8795eea024a4f91bb6 epatch 8233751dc5105a6ae8fcd86ce2bb0247 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 6e7258392d5eda499c1cfa94db650b61 flag-o-matic 02908f00f002f0f07c5b74783d778325 ltprune 2770eed66a9b8ef944714cd0e968182e multilib 97f470f374f2e94ccab04a2fb21d811e preserve-libs ef207dc62baddfddfd39a164d9797648 toolchain-funcs 885c7d8dd70a58825f3d17e35a3cd1e9
-_md5_=de5f6e1aa8427d005106e4803d6ea0c8
+_md5_=60d6a3c6dfd5e7dbde264843b84d82ad
diff --git a/metadata/md5-cache/net-ftp/pure-ftpd-1.0.46 b/metadata/md5-cache/net-ftp/pure-ftpd-1.0.47-r1
similarity index 88%
rename from metadata/md5-cache/net-ftp/pure-ftpd-1.0.46
rename to metadata/md5-cache/net-ftp/pure-ftpd-1.0.47-r1
index ae417e277dd5..6a3b18e2d7e7 100644
--- a/metadata/md5-cache/net-ftp/pure-ftpd-1.0.46
+++ b/metadata/md5-cache/net-ftp/pure-ftpd-1.0.47-r1
@@ -4,11 +4,11 @@ DESCRIPTION=Fast, production-quality, standard-conformant FTP server
EAPI=6
HOMEPAGE=http://www.pureftpd.org/
IUSE=anondel anonperm anonren anonres caps charconv implicittls ldap libressl mysql noiplog pam paranoidmsg postgres resolveids selinux ssl sysquota vchroot xinetd
-KEYWORDS=~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86
LICENSE=BSD
RDEPEND=caps? ( sys-libs/libcap ) charconv? ( virtual/libiconv ) ldap? ( >=net-nds/openldap-2.0.25 ) mysql? ( virtual/mysql ) pam? ( virtual/pam ) postgres? ( dev-db/postgresql:= ) ssl? ( !libressl? ( >=dev-libs/openssl-0.9.6g:0=[-bindist] ) libressl? ( dev-libs/libressl:= ) ) sysquota? ( sys-fs/quota[-rpc] ) xinetd? ( virtual/inetd ) dev-libs/libsodium:= net-ftp/ftpbase selinux? ( sec-policy/selinux-ftp )
REQUIRED_USE=implicittls? ( ssl )
SLOT=0
-SRC_URI=ftp://ftp.pureftpd.org/pub/pure-ftpd/releases/pure-ftpd-1.0.46.tar.bz2 http://download.pureftpd.org/pub/pure-ftpd/releases/pure-ftpd-1.0.46.tar.bz2
+SRC_URI=ftp://ftp.pureftpd.org/pub/pure-ftpd/releases/pure-ftpd-1.0.47.tar.bz2 http://download.pureftpd.org/pub/pure-ftpd/releases/pure-ftpd-1.0.47.tar.bz2
_eclasses_=desktop 2ccd1dd1dd7bfb8795eea024a4f91bb6 epatch 8233751dc5105a6ae8fcd86ce2bb0247 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 6e7258392d5eda499c1cfa94db650b61 flag-o-matic 02908f00f002f0f07c5b74783d778325 ltprune 2770eed66a9b8ef944714cd0e968182e multilib 97f470f374f2e94ccab04a2fb21d811e preserve-libs ef207dc62baddfddfd39a164d9797648 toolchain-funcs 885c7d8dd70a58825f3d17e35a3cd1e9
-_md5_=b47d0b12333a62e3cfba14c91de0aaf1
+_md5_=724c563425a36ef43c6cc6a46903a88e
diff --git a/metadata/md5-cache/net-im/Manifest.gz b/metadata/md5-cache/net-im/Manifest.gz
index 8d47bf9a63ac..76ddcc22a787 100644
Binary files a/metadata/md5-cache/net-im/Manifest.gz and b/metadata/md5-cache/net-im/Manifest.gz differ
diff --git a/metadata/md5-cache/net-im/skypeforlinux-8.13.0.2 b/metadata/md5-cache/net-im/skypeforlinux-8.13.0.2
new file mode 100644
index 000000000000..6c52e0cbdbf5
--- /dev/null
+++ b/metadata/md5-cache/net-im/skypeforlinux-8.13.0.2
@@ -0,0 +1,15 @@
+DEFINED_PHASES=install postinst postrm prepare unpack
+DEPEND=>=sys-apps/sed-4 >=app-arch/rpm2targz-9.0.0.3g
+DESCRIPTION=Instant messaging client, with support for audio and video
+EAPI=6
+HOMEPAGE=https://www.skype.com/
+IUSE=pax_kernel abi_x86_64
+KEYWORDS=~amd64 -*
+LICENSE=Skype-TOS MIT MIT-with-advertising BSD-1 BSD-2 BSD Apache-2.0 Boost-1.0 ISC CC-BY-SA-3.0 CC0-1.0 openssl ZLIB APSL-2 icu Artistic-2 LGPL-2.1
+RDEPEND=app-crypt/libsecret[abi_x86_64(-)?] dev-libs/atk[abi_x86_64(-)?] dev-libs/expat[abi_x86_64(-)?] dev-libs/glib:2[abi_x86_64(-)?] dev-libs/nspr[abi_x86_64(-)?] dev-libs/nss[abi_x86_64(-)?] gnome-base/gconf:2[abi_x86_64(-)?] media-libs/alsa-lib[abi_x86_64(-)?] media-libs/fontconfig:1.0[abi_x86_64(-)?] media-libs/freetype:2[abi_x86_64(-)?] media-libs/libv4l[abi_x86_64(-)?] net-print/cups[abi_x86_64(-)?] sys-apps/dbus[abi_x86_64(-)?] sys-devel/gcc[cxx] virtual/ttf-fonts x11-libs/cairo[abi_x86_64(-)?] x11-libs/gdk-pixbuf:2[abi_x86_64(-)?] x11-libs/gtk+:2[abi_x86_64(-)?] x11-libs/libX11[abi_x86_64(-)?] x11-libs/libXScrnSaver[abi_x86_64(-)?] x11-libs/libXcomposite[abi_x86_64(-)?] x11-libs/libXcursor[abi_x86_64(-)?] x11-libs/libXdamage[abi_x86_64(-)?] x11-libs/libXext[abi_x86_64(-)?] x11-libs/libXfixes[abi_x86_64(-)?] x11-libs/libXi[abi_x86_64(-)?] x11-libs/libXrandr[abi_x86_64(-)?] x11-libs/libXrender[abi_x86_64(-)?] x11-libs/libXtst[abi_x86_64(-)?] x11-libs/libxcb[abi_x86_64(-)?] x11-libs/libxkbfile[abi_x86_64(-)?] x11-libs/pango[abi_x86_64(-)?]
+REQUIRED_USE=|| ( abi_x86_64 )
+RESTRICT=mirror bindist strip
+SLOT=0
+SRC_URI=https://repo.skype.com/rpm/stable/skypeforlinux_8.13.0.2-1.x86_64.rpm
+_eclasses_=desktop 2ccd1dd1dd7bfb8795eea024a4f91bb6 epatch 8233751dc5105a6ae8fcd86ce2bb0247 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 6e7258392d5eda499c1cfa94db650b61 gnome2-utils 4d211d7614f303710fca59db6ec12c88 ltprune 2770eed66a9b8ef944714cd0e968182e multibuild 72647e255187a1fadc81097b3657e5c3 multilib 97f470f374f2e94ccab04a2fb21d811e multilib-build 8ffb5e2112a70fef5f37fcacad308726 pax-utils 4f95120230a315c8caaabeb2307b7eee preserve-libs ef207dc62baddfddfd39a164d9797648 rpm f52cfa3a435468d86d3b49c357b9cb35 toolchain-funcs 885c7d8dd70a58825f3d17e35a3cd1e9 xdg-utils f2c8335407f0b935b0a96d4adf23ef25
+_md5_=8523b4dae203741adc033ffdefb59aee
diff --git a/metadata/md5-cache/sci-libs/Manifest.gz b/metadata/md5-cache/sci-libs/Manifest.gz
index 4f722862e203..a26357818d21 100644
Binary files a/metadata/md5-cache/sci-libs/Manifest.gz and b/metadata/md5-cache/sci-libs/Manifest.gz differ
diff --git a/metadata/md5-cache/sci-libs/fftw-9999 b/metadata/md5-cache/sci-libs/fftw-9999
index 0c4d42c7ef0e..1e88827c18e3 100644
--- a/metadata/md5-cache/sci-libs/fftw-9999
+++ b/metadata/md5-cache/sci-libs/fftw-9999
@@ -1,11 +1,11 @@
-DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=mpi? ( virtual/mpi ) test? ( dev-lang/perl ) fortran? ( virtual/fortran ) >=app-portage/elt-patches-20170422 !=sys-devel/automake-1.15:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 >=dev-vcs/git-1.8.2.1
+DEFINED_PHASES=compile configure install prepare pretend setup test unpack
+DEPEND=mpi? ( >=virtual/mpi-2.0-r4[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) test? ( dev-lang/perl ) dev-ml/ocamlbuild fortran? ( virtual/fortran ) >=app-portage/elt-patches-20170422 !=sys-devel/automake-1.15:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 >=dev-vcs/git-1.8.2.1
DESCRIPTION=Fast C library for the Discrete Fourier Transform
EAPI=6
HOMEPAGE=http://www.fftw.org/
IUSE=altivec cpu_flags_x86_avx cpu_flags_x86_avx2 cpu_flags_x86_fma3 cpu_flags_x86_fma4 cpu_flags_x86_sse cpu_flags_x86_sse2 doc fortran mpi neon openmp quad static-libs test threads zbus abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_ppc_32 abi_ppc_64 abi_s390_32 abi_s390_64
LICENSE=GPL-2+
-RDEPEND=mpi? ( virtual/mpi ) fortran? ( virtual/fortran )
+RDEPEND=mpi? ( >=virtual/mpi-2.0-r4[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) fortran? ( virtual/fortran )
SLOT=3.0/3
_eclasses_=autotools dc412f38566b91012efd58b9c203e6c3 desktop 2ccd1dd1dd7bfb8795eea024a4f91bb6 epatch 8233751dc5105a6ae8fcd86ce2bb0247 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 6e7258392d5eda499c1cfa94db650b61 flag-o-matic 02908f00f002f0f07c5b74783d778325 fortran-2 9e7f20c99213f0627ff7f873d4aaa25d git-r3 fec09a83ae965b041b47f5ff7c8ba29a libtool 0081a71a261724730ec4c248494f044d ltprune 2770eed66a9b8ef944714cd0e968182e multibuild 72647e255187a1fadc81097b3657e5c3 multilib 97f470f374f2e94ccab04a2fb21d811e multilib-build 8ffb5e2112a70fef5f37fcacad308726 multilib-minimal 9139c3a57e077cb8e0d0f73ceb080b89 preserve-libs ef207dc62baddfddfd39a164d9797648 toolchain-funcs 885c7d8dd70a58825f3d17e35a3cd1e9 versionator ce21313503c41896ebcd7d58b0607e37
-_md5_=beb32cf207a42263094411f066924aeb
+_md5_=9640ad3f953b02cdb9b863f29df1849e
diff --git a/metadata/md5-cache/sys-kernel/Manifest.gz b/metadata/md5-cache/sys-kernel/Manifest.gz
index b3398ef211c3..ee16a0c5383c 100644
Binary files a/metadata/md5-cache/sys-kernel/Manifest.gz and b/metadata/md5-cache/sys-kernel/Manifest.gz differ
diff --git a/metadata/md5-cache/sys-kernel/dracut-044-r3 b/metadata/md5-cache/sys-kernel/dracut-044-r3
index 23b28301cf04..c5410cf369f7 100644
--- a/metadata/md5-cache/sys-kernel/dracut-044-r3
+++ b/metadata/md5-cache/sys-kernel/dracut-044-r3
@@ -10,5 +10,5 @@ RDEPEND=virtual/udev systemd? ( >=sys-apps/systemd-199 virtual/pkgconfig ) app-a
RESTRICT=test
SLOT=0
SRC_URI=mirror://kernel/linux/utils/boot/dracut/dracut-044.tar.xz
-_eclasses_=bash-completion-r1 8e447753aaf658afa609fbf961d80ab7 estack 43ddf5aaffa7a8d0482df54d25a66a1f linux-info ca370deef9d44125d829f2eb6ebc83e0 multilib 97f470f374f2e94ccab04a2fb21d811e systemd 8f5286f89e265842f5b5189666eae88b toolchain-funcs 885c7d8dd70a58825f3d17e35a3cd1e9 versionator ce21313503c41896ebcd7d58b0607e37
-_md5_=70bf8de0aa84668280131f20766293f0
+_eclasses_=bash-completion-r1 8e447753aaf658afa609fbf961d80ab7 desktop 2ccd1dd1dd7bfb8795eea024a4f91bb6 epatch 8233751dc5105a6ae8fcd86ce2bb0247 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 6e7258392d5eda499c1cfa94db650b61 linux-info ca370deef9d44125d829f2eb6ebc83e0 ltprune 2770eed66a9b8ef944714cd0e968182e multilib 97f470f374f2e94ccab04a2fb21d811e preserve-libs ef207dc62baddfddfd39a164d9797648 systemd 8f5286f89e265842f5b5189666eae88b toolchain-funcs 885c7d8dd70a58825f3d17e35a3cd1e9 versionator ce21313503c41896ebcd7d58b0607e37
+_md5_=bf1a03da6119ae011b04e8f8da0b7a5f
diff --git a/metadata/md5-cache/sys-kernel/dracut-045-r2 b/metadata/md5-cache/sys-kernel/dracut-045-r2
index 6ba3d2991aed..fb0a9d4a423a 100644
--- a/metadata/md5-cache/sys-kernel/dracut-045-r2
+++ b/metadata/md5-cache/sys-kernel/dracut-045-r2
@@ -10,5 +10,5 @@ RDEPEND=virtual/udev virtual/pkgconfig >=sys-apps/kmod-15[tools] app-arch/cpio >
RESTRICT=test
SLOT=0
SRC_URI=mirror://kernel/linux/utils/boot/dracut/dracut-045.tar.xz
-_eclasses_=bash-completion-r1 8e447753aaf658afa609fbf961d80ab7 estack 43ddf5aaffa7a8d0482df54d25a66a1f linux-info ca370deef9d44125d829f2eb6ebc83e0 multilib 97f470f374f2e94ccab04a2fb21d811e systemd 8f5286f89e265842f5b5189666eae88b toolchain-funcs 885c7d8dd70a58825f3d17e35a3cd1e9 versionator ce21313503c41896ebcd7d58b0607e37
-_md5_=b274b47e0883287fa6b33b0b8e0ae3b2
+_eclasses_=bash-completion-r1 8e447753aaf658afa609fbf961d80ab7 desktop 2ccd1dd1dd7bfb8795eea024a4f91bb6 epatch 8233751dc5105a6ae8fcd86ce2bb0247 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 6e7258392d5eda499c1cfa94db650b61 linux-info ca370deef9d44125d829f2eb6ebc83e0 ltprune 2770eed66a9b8ef944714cd0e968182e multilib 97f470f374f2e94ccab04a2fb21d811e preserve-libs ef207dc62baddfddfd39a164d9797648 systemd 8f5286f89e265842f5b5189666eae88b toolchain-funcs 885c7d8dd70a58825f3d17e35a3cd1e9 versionator ce21313503c41896ebcd7d58b0607e37
+_md5_=700e16cb1ada4eca8ad29bdca4226ec3
diff --git a/metadata/md5-cache/sys-kernel/dracut-046-r1 b/metadata/md5-cache/sys-kernel/dracut-046-r1
index 0b6aceaeaa42..d6a964fc306e 100644
--- a/metadata/md5-cache/sys-kernel/dracut-046-r1
+++ b/metadata/md5-cache/sys-kernel/dracut-046-r1
@@ -10,5 +10,5 @@ RDEPEND=virtual/udev virtual/pkgconfig >=sys-apps/kmod-15[tools] app-arch/cpio >
RESTRICT=test
SLOT=0
SRC_URI=mirror://kernel/linux/utils/boot/dracut/dracut-046.tar.xz
-_eclasses_=bash-completion-r1 8e447753aaf658afa609fbf961d80ab7 estack 43ddf5aaffa7a8d0482df54d25a66a1f linux-info ca370deef9d44125d829f2eb6ebc83e0 multilib 97f470f374f2e94ccab04a2fb21d811e systemd 8f5286f89e265842f5b5189666eae88b toolchain-funcs 885c7d8dd70a58825f3d17e35a3cd1e9 versionator ce21313503c41896ebcd7d58b0607e37
-_md5_=06c263a20801bb98d819b319973e7080
+_eclasses_=bash-completion-r1 8e447753aaf658afa609fbf961d80ab7 desktop 2ccd1dd1dd7bfb8795eea024a4f91bb6 epatch 8233751dc5105a6ae8fcd86ce2bb0247 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 6e7258392d5eda499c1cfa94db650b61 linux-info ca370deef9d44125d829f2eb6ebc83e0 ltprune 2770eed66a9b8ef944714cd0e968182e multilib 97f470f374f2e94ccab04a2fb21d811e preserve-libs ef207dc62baddfddfd39a164d9797648 systemd 8f5286f89e265842f5b5189666eae88b toolchain-funcs 885c7d8dd70a58825f3d17e35a3cd1e9 versionator ce21313503c41896ebcd7d58b0607e37
+_md5_=526bb7174f3e8aef43ca7152611ff685
diff --git a/metadata/md5-cache/www-apps/Manifest.gz b/metadata/md5-cache/www-apps/Manifest.gz
index d88fab2f1480..4d4810c3636e 100644
Binary files a/metadata/md5-cache/www-apps/Manifest.gz and b/metadata/md5-cache/www-apps/Manifest.gz differ
diff --git a/metadata/md5-cache/www-apps/rutorrent-3.8 b/metadata/md5-cache/www-apps/rutorrent-3.8-r1
similarity index 91%
rename from metadata/md5-cache/www-apps/rutorrent-3.8
rename to metadata/md5-cache/www-apps/rutorrent-3.8-r1
index 86ebf4b067f8..ae4c99eead47 100644
--- a/metadata/md5-cache/www-apps/rutorrent-3.8
+++ b/metadata/md5-cache/www-apps/rutorrent-3.8-r1
@@ -7,7 +7,7 @@ IUSE=vhosts
KEYWORDS=~alpha ~amd64 ~ppc ~x86
LICENSE=GPL-2
RDEPEND=virtual/httpd-php >=app-admin/webapp-config-1.50.15
-SLOT=3.8
+SLOT=3.8-r1
SRC_URI=https://github.com/Novik/ruTorrent/archive/v3.8.tar.gz -> rutorrent-3.8.tar.gz
_eclasses_=webapp a76ebd3cb5649737496e8238992dd7ca
-_md5_=3697c3d3e419f6e11d364013b0f316a6
+_md5_=aedbdca363febe9f4a87b952a8d423ad
diff --git a/metadata/md5-cache/x11-libs/Manifest.gz b/metadata/md5-cache/x11-libs/Manifest.gz
index f20d8aa67055..147692bca92e 100644
Binary files a/metadata/md5-cache/x11-libs/Manifest.gz and b/metadata/md5-cache/x11-libs/Manifest.gz differ
diff --git a/metadata/md5-cache/x11-libs/gtkmathview-0.8.0-r3 b/metadata/md5-cache/x11-libs/gtkmathview-0.8.0-r3
index 2b000ea74cb4..0ff0acd3bb74 100644
--- a/metadata/md5-cache/x11-libs/gtkmathview-0.8.0-r3
+++ b/metadata/md5-cache/x11-libs/gtkmathview-0.8.0-r3
@@ -10,4 +10,4 @@ RDEPEND=>=dev-libs/glib-2.2.1:2 >=dev-libs/popt-1.7 >=dev-libs/libxml2-2.6.7:2 g
SLOT=0
SRC_URI=http://helm.cs.unibo.it/mml-widget/sources/gtkmathview-0.8.0.tar.gz
_eclasses_=autotools dc412f38566b91012efd58b9c203e6c3 libtool 0081a71a261724730ec4c248494f044d multilib 97f470f374f2e94ccab04a2fb21d811e toolchain-funcs 885c7d8dd70a58825f3d17e35a3cd1e9
-_md5_=3a71f0bd1b33a700329b9a5a4bfbbb99
+_md5_=3333991fc4c7b02866de42590d9d607d
diff --git a/metadata/md5-cache/x11-terms/Manifest.gz b/metadata/md5-cache/x11-terms/Manifest.gz
index 6542c4df647e..8cb0e77fddbc 100644
Binary files a/metadata/md5-cache/x11-terms/Manifest.gz and b/metadata/md5-cache/x11-terms/Manifest.gz differ
diff --git a/metadata/md5-cache/x11-terms/xterm-329 b/metadata/md5-cache/x11-terms/xterm-329
deleted file mode 100644
index 814ef0cbeea7..000000000000
--- a/metadata/md5-cache/x11-terms/xterm-329
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=configure install setup
-DEPEND=kernel_linux? ( sys-libs/libutempter ) kernel_FreeBSD? ( || ( >=sys-freebsd/freebsd-lib-9.0 sys-libs/libutempter ) ) >=sys-libs/ncurses-5.7-r7:0= x11-apps/xmessage x11-libs/libX11 x11-libs/libXaw x11-libs/libXft x11-libs/libxkbfile x11-libs/libXmu x11-libs/libXrender x11-libs/libXt unicode? ( x11-apps/luit ) Xaw3d? ( x11-libs/libXaw3d ) xinerama? ( x11-libs/libXinerama ) virtual/pkgconfig x11-proto/kbproto x11-proto/xproto
-DESCRIPTION=Terminal Emulator for X Windows
-EAPI=5
-HOMEPAGE=https://invisible-island.net/xterm/
-IUSE=+openpty toolbar truetype unicode Xaw3d xinerama
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
-LICENSE=MIT
-RDEPEND=kernel_linux? ( sys-libs/libutempter ) kernel_FreeBSD? ( || ( >=sys-freebsd/freebsd-lib-9.0 sys-libs/libutempter ) ) >=sys-libs/ncurses-5.7-r7:0= x11-apps/xmessage x11-libs/libX11 x11-libs/libXaw x11-libs/libXft x11-libs/libxkbfile x11-libs/libXmu x11-libs/libXrender x11-libs/libXt unicode? ( x11-apps/luit ) Xaw3d? ( x11-libs/libXaw3d ) xinerama? ( x11-libs/libXinerama ) media-fonts/font-misc-misc x11-apps/rgb
-SLOT=0
-SRC_URI=ftp://ftp.invisible-island.net/xterm/xterm-329.tgz
-_eclasses_=desktop 2ccd1dd1dd7bfb8795eea024a4f91bb6 epatch 8233751dc5105a6ae8fcd86ce2bb0247 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 6e7258392d5eda499c1cfa94db650b61 flag-o-matic 02908f00f002f0f07c5b74783d778325 ltprune 2770eed66a9b8ef944714cd0e968182e multilib 97f470f374f2e94ccab04a2fb21d811e preserve-libs ef207dc62baddfddfd39a164d9797648 toolchain-funcs 885c7d8dd70a58825f3d17e35a3cd1e9
-_md5_=f09120854963262bc44019b1fef7feda
diff --git a/metadata/md5-cache/x11-terms/xterm-328 b/metadata/md5-cache/x11-terms/xterm-331
similarity index 94%
rename from metadata/md5-cache/x11-terms/xterm-328
rename to metadata/md5-cache/x11-terms/xterm-331
index 8f9ab79c6390..58466762ffd8 100644
--- a/metadata/md5-cache/x11-terms/xterm-328
+++ b/metadata/md5-cache/x11-terms/xterm-331
@@ -8,6 +8,6 @@ KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~spar
LICENSE=MIT
RDEPEND=kernel_linux? ( sys-libs/libutempter ) kernel_FreeBSD? ( || ( >=sys-freebsd/freebsd-lib-9.0 sys-libs/libutempter ) ) >=sys-libs/ncurses-5.7-r7:0= x11-apps/xmessage x11-libs/libX11 x11-libs/libXaw x11-libs/libXft x11-libs/libxkbfile x11-libs/libXmu x11-libs/libXrender x11-libs/libXt unicode? ( x11-apps/luit ) Xaw3d? ( x11-libs/libXaw3d ) xinerama? ( x11-libs/libXinerama ) media-fonts/font-misc-misc x11-apps/rgb
SLOT=0
-SRC_URI=ftp://ftp.invisible-island.net/xterm/xterm-328.tgz
+SRC_URI=ftp://ftp.invisible-island.net/xterm/xterm-331.tgz
_eclasses_=desktop 2ccd1dd1dd7bfb8795eea024a4f91bb6 epatch 8233751dc5105a6ae8fcd86ce2bb0247 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 6e7258392d5eda499c1cfa94db650b61 flag-o-matic 02908f00f002f0f07c5b74783d778325 ltprune 2770eed66a9b8ef944714cd0e968182e multilib 97f470f374f2e94ccab04a2fb21d811e preserve-libs ef207dc62baddfddfd39a164d9797648 toolchain-funcs 885c7d8dd70a58825f3d17e35a3cd1e9
-_md5_=f09120854963262bc44019b1fef7feda
+_md5_=afc4b828414ea72b528aa15647f9d91b
diff --git a/metadata/news/timestamp.chk b/metadata/news/timestamp.chk
index 2b967556862a..5e14f7acd01b 100644
--- a/metadata/news/timestamp.chk
+++ b/metadata/news/timestamp.chk
@@ -1 +1 @@
-Thu, 11 Jan 2018 03:39:28 +0000
+Thu, 11 Jan 2018 13:09:31 +0000
diff --git a/metadata/projects.xml b/metadata/projects.xml
index b76e317f4289..fc4f13192f57 100644
--- a/metadata/projects.xml
+++ b/metadata/projects.xml
@@ -1697,7 +1697,7 @@
alicef@gentoo.org
Alice Ferrazzi
- General system administration
+ General system administration, Kernel
blueknight@gentoo.org
diff --git a/metadata/timestamp b/metadata/timestamp
index 4cca0986650b..28f3bd210128 100644
--- a/metadata/timestamp
+++ b/metadata/timestamp
@@ -1 +1 @@
-Thu Jan 11 03:39:28 UTC 2018
+Thu Jan 11 13:09:31 UTC 2018
diff --git a/metadata/timestamp.chk b/metadata/timestamp.chk
index 8248889ea3bc..f5d10df51538 100644
--- a/metadata/timestamp.chk
+++ b/metadata/timestamp.chk
@@ -1 +1 @@
-Thu, 11 Jan 2018 04:00:01 +0000
+Thu, 11 Jan 2018 13:30:01 +0000
diff --git a/metadata/timestamp.commit b/metadata/timestamp.commit
index 4b59cbcb263d..efde9b300c55 100644
--- a/metadata/timestamp.commit
+++ b/metadata/timestamp.commit
@@ -1 +1 @@
-0fa7925a87b4bda933fdca2b0de94e0da05d7b05 1515641239 2018-01-11T03:27:19+00:00
+0a6fcc38163ff9d4dfeb58c3504b98311e28a172 1515675295 2018-01-11T12:54:55+00:00
diff --git a/metadata/timestamp.x b/metadata/timestamp.x
index 1f1f8eaa8165..cd774c3fdf9f 100644
--- a/metadata/timestamp.x
+++ b/metadata/timestamp.x
@@ -1 +1 @@
-1515641701 Thu 11 Jan 2018 03:35:01 AM UTC
+1515676201 Thu 11 Jan 2018 01:10:01 PM UTC
diff --git a/metadata/xml-schema/timestamp.chk b/metadata/xml-schema/timestamp.chk
index 2b967556862a..5e14f7acd01b 100644
--- a/metadata/xml-schema/timestamp.chk
+++ b/metadata/xml-schema/timestamp.chk
@@ -1 +1 @@
-Thu, 11 Jan 2018 03:39:28 +0000
+Thu, 11 Jan 2018 13:09:31 +0000
diff --git a/net-analyzer/Manifest.gz b/net-analyzer/Manifest.gz
index 5673f1cd3c91..33abe960fcfe 100644
Binary files a/net-analyzer/Manifest.gz and b/net-analyzer/Manifest.gz differ
diff --git a/net-analyzer/linkchecker/files/linkchecker-9.3.1-requests.patch b/net-analyzer/linkchecker/files/linkchecker-9.3.1-requests.patch
new file mode 100644
index 000000000000..56c57fa37997
--- /dev/null
+++ b/net-analyzer/linkchecker/files/linkchecker-9.3.1-requests.patch
@@ -0,0 +1,46 @@
+From 9b12b5d66fa9b832f4d9e19a0b9dcb92607ee3e5 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Antoine=20Beaupr=C3=A9?=
+Date: Mon, 2 Oct 2017 20:18:54 -0400
+Subject: [PATCH] workaround new limitation in requests
+
+newer requests do not expose the internal SSL socket object so we
+cannot verify certificates. there was work to allow custom
+verification routines which we could use, but this never finished:
+
+https://github.com/shazow/urllib3/pull/257
+
+so right now, just treat missing socket information as if the cert was
+missing.
+
+Closes: #76
+---
+ linkcheck/checker/httpurl.py | 9 ++++++++-
+ 1 file changed, 8 insertions(+), 1 deletion(-)
+
+diff --git a/linkcheck/checker/httpurl.py b/linkcheck/checker/httpurl.py
+index 161619c5..bde77c70 100644
+--- a/linkcheck/checker/httpurl.py
++++ b/linkcheck/checker/httpurl.py
+@@ -194,6 +194,10 @@ def _get_ssl_sock(self):
+ """Get raw SSL socket."""
+ assert self.scheme == u"https", self
+ raw_connection = self.url_connection.raw._connection
++ if not raw_connection:
++ # this happens with newer requests versions:
++ # https://github.com/linkcheck/linkchecker/issues/76
++ return None
+ if raw_connection.sock is None:
+ # sometimes the socket is not yet connected
+ # see https://github.com/kennethreitz/requests/issues/1966
+@@ -204,7 +208,10 @@ def _add_ssl_info(self):
+ """Add SSL cipher info."""
+ if self.scheme == u'https':
+ sock = self._get_ssl_sock()
+- if hasattr(sock, 'cipher'):
++ if not sock:
++ log.debug(LOG_CHECK, "cannot extract SSL certificate from connection")
++ self.ssl_cert = None
++ elif hasattr(sock, 'cipher'):
+ self.ssl_cert = sock.getpeercert()
+ else:
+ # using pyopenssl
diff --git a/net-analyzer/linkchecker/linkchecker-9.3.1.ebuild b/net-analyzer/linkchecker/linkchecker-9.3.1-r1.ebuild
similarity index 93%
rename from net-analyzer/linkchecker/linkchecker-9.3.1.ebuild
rename to net-analyzer/linkchecker/linkchecker-9.3.1-r1.ebuild
index 512db84e331a..109499f785bb 100644
--- a/net-analyzer/linkchecker/linkchecker-9.3.1.ebuild
+++ b/net-analyzer/linkchecker/linkchecker-9.3.1-r1.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
@@ -19,7 +19,7 @@ IUSE="gnome sqlite X"
RDEPEND="
virtual/python-dnspython[${PYTHON_USEDEP}]
-
+Date: Sat, 4 Nov 2017 20:46:16 +0100
+Subject: [PATCH] Increase MAX_DATA_SIZE due to Argon2id requirements
+
+---
+ src/ftpd.h | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/src/ftpd.h b/src/ftpd.h
+index 1beeab8..5bb1f6b 100644
+--- a/src/ftpd.h
++++ b/src/ftpd.h
+@@ -557,7 +557,7 @@ Your platform has a very large PATH_MAX, we should not trust it.
+
+ #ifndef MAX_DATA_SIZE
+ # ifdef HAVE_LIBSODIUM
+-# define MAX_DATA_SIZE (40 * 1024 * 1024)
++# define MAX_DATA_SIZE (70 * 1024 * 1024)
+ # elif defined(WITH_LDAP) || defined(WITH_MYSQL) || defined(WITH_PGSQL)
+ # define MAX_DATA_SIZE (16 * 1024 * 1024) /* Max memory usage - SQL/LDAP need more */
+ # else
diff --git a/net-ftp/pure-ftpd/pure-ftpd-1.0.45-r1.ebuild b/net-ftp/pure-ftpd/pure-ftpd-1.0.45-r2.ebuild
similarity index 95%
rename from net-ftp/pure-ftpd/pure-ftpd-1.0.45-r1.ebuild
rename to net-ftp/pure-ftpd/pure-ftpd-1.0.45-r2.ebuild
index 7dcc0d9aee3d..d448d8f15cd2 100644
--- a/net-ftp/pure-ftpd/pure-ftpd-1.0.45-r1.ebuild
+++ b/net-ftp/pure-ftpd/pure-ftpd-1.0.45-r2.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
@@ -37,8 +37,9 @@ RDEPEND="${DEPEND}
selinux? ( sec-policy/selinux-ftp )"
PATCHES=(
- "${FILESDIR}"/${PN}-1.0.28-pam.patch
- "${FILESDIR}"/${P}-openssl-1.1.patch
+ "${FILESDIR}/${PN}-1.0.28-pam.patch"
+ "${FILESDIR}/${P}-openssl-1.1.patch"
+ "${FILESDIR}/${PN}-1.0.47-MAX_DATA_SIZE.patch"
)
src_configure() {
diff --git a/net-ftp/pure-ftpd/pure-ftpd-1.0.46.ebuild b/net-ftp/pure-ftpd/pure-ftpd-1.0.47-r1.ebuild
similarity index 94%
rename from net-ftp/pure-ftpd/pure-ftpd-1.0.46.ebuild
rename to net-ftp/pure-ftpd/pure-ftpd-1.0.47-r1.ebuild
index 0666f54ec764..412951b81a3a 100644
--- a/net-ftp/pure-ftpd/pure-ftpd-1.0.46.ebuild
+++ b/net-ftp/pure-ftpd/pure-ftpd-1.0.47-r1.ebuild
@@ -1,10 +1,10 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
EAPI=6
-inherit eutils flag-o-matic
+inherit flag-o-matic
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86"
DESCRIPTION="Fast, production-quality, standard-conformant FTP server"
HOMEPAGE="http://www.pureftpd.org/"
@@ -37,7 +37,8 @@ RDEPEND="${DEPEND}
selinux? ( sec-policy/selinux-ftp )"
PATCHES=(
- "${FILESDIR}"/${PN}-1.0.28-pam.patch
+ "${FILESDIR}/${PN}-1.0.28-pam.patch"
+ "${FILESDIR}/${PN}-1.0.47-MAX_DATA_SIZE.patch"
)
src_configure() {
diff --git a/net-im/Manifest.gz b/net-im/Manifest.gz
index 6ff1b8d624da..40e1042859cf 100644
Binary files a/net-im/Manifest.gz and b/net-im/Manifest.gz differ
diff --git a/net-im/skypeforlinux/Manifest b/net-im/skypeforlinux/Manifest
index fcdd3ec46046..77022681a949 100644
--- a/net-im/skypeforlinux/Manifest
+++ b/net-im/skypeforlinux/Manifest
@@ -1 +1,2 @@
DIST skypeforlinux_8.11.0.4-1.x86_64.rpm 94517788 BLAKE2B 5cec1184c566822dab55a2e01424400d46c9894fe77c0031c59063359c50b017f485ee1505db961fa4dacce9c1bd2634bbabd88b6b03925c4cff80d7a7d9b408 SHA512 580183fb278b12974e28be10cdb13925048e4692ac12e5f1abab219ede12b0ec8567d49e58e2c3a7b4d4bcfc56e3ec1cb91117c0056d86dca7d9f1e2ec363b3e
+DIST skypeforlinux_8.13.0.2-1.x86_64.rpm 102816632 BLAKE2B 402b95a4dfaebf93200f46fb226d907fe99bb42141f629750ec34c97bae576b79953178c21cfb5309e20867a227577998887e063b9aa2a7e4aacfd0c747911e6 SHA512 2628cb5be1d95b838afd2bc51f200e7c2591e5620c45019ff179fb2f8a480dea0f643676ab0cfea5946a1a5d79d0e181b1b1e4c8f7bade60ffe176e5cb8b3795
diff --git a/net-im/skypeforlinux/skypeforlinux-8.13.0.2.ebuild b/net-im/skypeforlinux/skypeforlinux-8.13.0.2.ebuild
new file mode 100644
index 000000000000..e7683f76434b
--- /dev/null
+++ b/net-im/skypeforlinux/skypeforlinux-8.13.0.2.ebuild
@@ -0,0 +1,116 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+MULTILIB_COMPAT=( abi_x86_64 )
+
+inherit eutils gnome2-utils pax-utils rpm multilib-build xdg-utils
+
+DESCRIPTION="Instant messaging client, with support for audio and video"
+HOMEPAGE="https://www.skype.com/"
+SRC_URI="https://repo.skype.com/rpm/stable/${PN}_${PV}-1.x86_64.rpm"
+
+LICENSE="Skype-TOS MIT MIT-with-advertising BSD-1 BSD-2 BSD Apache-2.0 Boost-1.0 ISC CC-BY-SA-3.0 CC0-1.0 openssl ZLIB APSL-2 icu Artistic-2 LGPL-2.1"
+SLOT="0"
+KEYWORDS="~amd64 -*"
+IUSE="pax_kernel"
+
+S="${WORKDIR}"
+QA_PREBUILT="*"
+RESTRICT="mirror bindist strip" #299368
+
+RDEPEND="
+ app-crypt/libsecret[${MULTILIB_USEDEP}]
+ dev-libs/atk[${MULTILIB_USEDEP}]
+ dev-libs/expat[${MULTILIB_USEDEP}]
+ dev-libs/glib:2[${MULTILIB_USEDEP}]
+ dev-libs/nspr[${MULTILIB_USEDEP}]
+ dev-libs/nss[${MULTILIB_USEDEP}]
+ gnome-base/gconf:2[${MULTILIB_USEDEP}]
+ media-libs/alsa-lib[${MULTILIB_USEDEP}]
+ media-libs/fontconfig:1.0[${MULTILIB_USEDEP}]
+ media-libs/freetype:2[${MULTILIB_USEDEP}]
+ media-libs/libv4l[${MULTILIB_USEDEP}]
+ net-print/cups[${MULTILIB_USEDEP}]
+ sys-apps/dbus[${MULTILIB_USEDEP}]
+ sys-devel/gcc[cxx]
+ virtual/ttf-fonts
+ x11-libs/cairo[${MULTILIB_USEDEP}]
+ x11-libs/gdk-pixbuf:2[${MULTILIB_USEDEP}]
+ x11-libs/gtk+:2[${MULTILIB_USEDEP}]
+ x11-libs/libX11[${MULTILIB_USEDEP}]
+ x11-libs/libXScrnSaver[${MULTILIB_USEDEP}]
+ x11-libs/libXcomposite[${MULTILIB_USEDEP}]
+ x11-libs/libXcursor[${MULTILIB_USEDEP}]
+ x11-libs/libXdamage[${MULTILIB_USEDEP}]
+ x11-libs/libXext[${MULTILIB_USEDEP}]
+ x11-libs/libXfixes[${MULTILIB_USEDEP}]
+ x11-libs/libXi[${MULTILIB_USEDEP}]
+ x11-libs/libXrandr[${MULTILIB_USEDEP}]
+ x11-libs/libXrender[${MULTILIB_USEDEP}]
+ x11-libs/libXtst[${MULTILIB_USEDEP}]
+ x11-libs/libxcb[${MULTILIB_USEDEP}]
+ x11-libs/libxkbfile[${MULTILIB_USEDEP}]
+ x11-libs/pango[${MULTILIB_USEDEP}]"
+
+src_unpack() {
+ rpm_src_unpack ${A}
+}
+
+src_prepare() {
+ default
+ sed -e "s!^SKYPE_PATH=.*!SKYPE_PATH=${EPREFIX}/opt/skypeforlinux/skypeforlinux!" \
+ -i usr/bin/skypeforlinux || die
+ sed -e "s!^Exec=/usr/!Exec=${EPREFIX}/opt/!" \
+ -e "s!^Categories=.*!Categories=Network;InstantMessaging;Telephony;!" \
+ -e "/^OnlyShowIn=/d" \
+ -i usr/share/applications/skypeforlinux.desktop || die
+}
+
+src_install() {
+ dodir /opt
+ cp -a usr/share/skypeforlinux "${D}"/opt || die
+
+ into /opt
+ dobin usr/bin/skypeforlinux
+
+ dodoc usr/share/skypeforlinux/*.html
+ dodoc -r usr/share/doc/skypeforlinux/.
+ # symlink required for the "Help->3rd Party Notes" menu entry (otherwise frozen skype -> xdg-open)
+ dosym ${P} usr/share/doc/skypeforlinux
+
+ doicon usr/share/pixmaps/skypeforlinux.png
+
+ # compat symlink for the autostart desktop file
+ dosym ../../opt/bin/skypeforlinux usr/bin/skypeforlinux
+
+ local res
+ for res in 16 32 256 512; do
+ newicon -s ${res} usr/share/icons/hicolor/${res}x${res}/apps/skypeforlinux.png skypeforlinux.png
+ done
+
+ domenu usr/share/applications/skypeforlinux.desktop
+
+ if use pax_kernel; then
+ pax-mark -m "${ED%/}"/opt/skypeforlinux/skypeforlinux
+ pax-mark -m "${ED%/}"/opt/skypeforlinux/resources/app.asar.unpacked/node_modules/slimcore/bin/slimcore.node
+ eqawarn "You have set USE=pax_kernel meaning that you intend to run"
+ eqawarn "${PN} under a PaX enabled kernel. To do so, we must modify"
+ eqawarn "the ${PN} binary itself and this *may* lead to breakage! If"
+ eqawarn "you suspect that ${PN} is being broken by this modification,"
+ eqawarn "please open a bug."
+ fi
+}
+
+pkg_postinst() {
+ xdg_desktop_database_update
+ xdg_mimeinfo_database_update
+ gnome2_icon_cache_update
+}
+
+pkg_postrm() {
+ xdg_desktop_database_update
+ xdg_mimeinfo_database_update
+ gnome2_icon_cache_update
+}
diff --git a/sci-libs/Manifest.gz b/sci-libs/Manifest.gz
index bbbd11214215..f07d1ac9887b 100644
Binary files a/sci-libs/Manifest.gz and b/sci-libs/Manifest.gz differ
diff --git a/sci-libs/fftw/fftw-9999.ebuild b/sci-libs/fftw/fftw-9999.ebuild
index af34cba86168..bef41e83ea09 100644
--- a/sci-libs/fftw/fftw-9999.ebuild
+++ b/sci-libs/fftw/fftw-9999.ebuild
@@ -10,11 +10,13 @@ inherit flag-o-matic fortran-2 toolchain-funcs versionator multibuild multilib-m
DESCRIPTION="Fast C library for the Discrete Fourier Transform"
HOMEPAGE="http://www.fftw.org/"
+MY_P=${PN}-${PV/_p/-pl}
+
if [[ ${PV} = *9999 ]]; then
inherit autotools git-r3
EGIT_REPO_URI="https://github.com/FFTW/fftw3.git"
else
- SRC_URI="http://www.fftw.org/${P}.tar.gz"
+ SRC_URI="http://www.fftw.org/${PN}-${PV/_p/-pl}.tar.gz"
KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
fi
@@ -23,22 +25,24 @@ SLOT="3.0/3"
IUSE="altivec cpu_flags_x86_avx cpu_flags_x86_avx2 cpu_flags_x86_fma3 cpu_flags_x86_fma4 cpu_flags_x86_sse cpu_flags_x86_sse2 doc fortran mpi neon openmp quad static-libs test threads zbus"
RDEPEND="
- mpi? ( virtual/mpi )"
+ mpi? ( >=virtual/mpi-2.0-r4[${MULTILIB_USEDEP}] )"
DEPEND="${RDEPEND}
test? ( dev-lang/perl )"
+if [[ ${PV} = *9999 ]]; then
+ DEPEND="${DEPEND}
+ dev-ml/ocamlbuild"
+fi
-pkg_setup() {
- if [[ ${MERGE_TYPE} != binary ]] && use openmp; then
- if ! tc-has-openmp; then
- ewarn "OpenMP is not available in your current selected compiler"
+S=${WORKDIR}/${MY_P}
+HTML_DOCS=( doc/html/. )
- if tc-is-clang; then
- ewarn "OpenMP support in sys-devel/clang is provided by sys-libs/libomp,"
- ewarn "which you will need to build ${CATEGORY}/${PN} with USE=\"openmp\""
- fi
+pkg_pretend() {
+ [[ ${MERGE_TYPE} != binary ]] && use openmp && tc-check-openmp
+}
- die "need openmp capable compiler"
- fi
+pkg_setup() {
+ if [[ ${MERGE_TYPE} != binary ]] && use openmp; then
+ tc-check-openmp
FORTRAN_NEED_OPENMP=1
fi
@@ -46,7 +50,7 @@ pkg_setup() {
MULTIBUILD_VARIANTS=( single double longdouble )
if use quad; then
- if tc-is-gcc && ! version_is_at_least 4.6 $(gcc-version); then
+ if ! tc-is-gcc; then
ewarn "quad precision only available for gcc >= 4.6"
die "need quad precision capable gcc"
fi
@@ -64,9 +68,6 @@ src_prepare() {
}
multilib_src_configure() {
- # there is no abi_x86_32 port of virtual/mpi right now, bug 519700
- local enable_mpi=$(multilib_native_use_enable mpi)
-
# jlec reported USE=quad on abi_x86_32 has too few registers
# stub Makefiles
if [[ ${MULTILIB_ABI_FLAG} == abi_x86_32 && ${MULTIBUILD_ID} == quad-* ]]; then
@@ -79,6 +80,7 @@ multilib_src_configure() {
local myconf=(
--enable-shared
+ $([[ ${PV} = *9999 ]] && echo "--enable-maintainer-mode")
$(use_enable static-libs static)
$(use_enable "cpu_flags_x86_fma$(usex cpu_flags_x86_fma3 3 4)" fma)
$(use_enable fortran)
@@ -88,7 +90,7 @@ multilib_src_configure() {
)
case "${MULTIBUILD_ID}" in
single-*)
- #altivec, sse, single-paired only work for single
+ # altivec, sse, single-paired only work for single
myconf+=(
--enable-single
$(use_enable altivec)
@@ -97,7 +99,7 @@ multilib_src_configure() {
$(use_enable cpu_flags_x86_sse sse)
$(use_enable cpu_flags_x86_sse2 sse2)
$(use_enable neon)
- ${enable_mpi}
+ $(use_enable mpi)
)
;;
@@ -106,19 +108,19 @@ multilib_src_configure() {
$(use_enable cpu_flags_x86_avx avx)
$(use_enable cpu_flags_x86_avx2 avx2)
$(use_enable cpu_flags_x86_sse2 sse2)
- ${enable_mpi}
+ $(use_enable mpi)
)
;;
longdouble-*)
myconf+=(
--enable-long-double
- ${enable_mpi}
+ $(use_enable mpi)
)
;;
quad-*)
- #quad does not support mpi
+ # quad does not support mpi
myconf+=(
--enable-quad-precision
)
@@ -129,7 +131,14 @@ multilib_src_configure() {
;;
esac
- ECONF_SOURCE="${S}" econf "${myconf[@]}"
+ local MY_S="${S}"
+ #out-of-source build is broken for 9999 due to maintainer mode
+ if [[ ${PV} = *9999 ]]; then
+ cp -al "${S}"/* "${BUILD_DIR}"/
+ MY_S="${BUILD_DIR}"
+ fi
+
+ ECONF_SOURCE="${MY_S}" econf "${myconf[@]}" MPICC="$(tc-getCC -lmpi)"
}
src_configure() {
@@ -155,21 +164,19 @@ src_test() {
}
src_install() {
- DOCS=( AUTHORS ChangeLog NEWS README TODO COPYRIGHT CONVENTIONS )
- HTML_DOCS=( doc/html/ )
-
multibuild_foreach_variant multilib-minimal_src_install
+ dodoc CONVENTIONS
if use doc; then
dodoc doc/*.pdf
docinto faq
dodoc -r doc/FAQ/fftw-faq.html/.
else
- rm -r "${ED}"/usr/share/doc/${PF}/html || die
+ rm -r "${ED%/}"/usr/share/doc/${PF}/html || die
fi
local x
- for x in "${ED}"/usr/lib*/pkgconfig/*.pc; do
+ for x in "${ED%/}"/usr/lib*/pkgconfig/*.pc; do
local u
for u in $(usev mpi) $(usev threads) $(usex openmp omp ""); do
sed -e "s|-lfftw3[flq]\?|&_${u} &|" "$x" > "${x%.pc}_${u}.pc" || die
@@ -177,5 +184,5 @@ src_install() {
done
# fftw uses pkg-config to record its private dependencies
- find "${ED}" -name '*.la' -delete || die
+ find "${D}" -name '*.la' -delete || die
}
diff --git a/sys-kernel/Manifest.gz b/sys-kernel/Manifest.gz
index c59c81dd83ce..1e506ec05794 100644
Binary files a/sys-kernel/Manifest.gz and b/sys-kernel/Manifest.gz differ
diff --git a/sys-kernel/dracut/dracut-044-r3.ebuild b/sys-kernel/dracut/dracut-044-r3.ebuild
index 2af888711a72..912b504799ac 100644
--- a/sys-kernel/dracut/dracut-044-r3.ebuild
+++ b/sys-kernel/dracut/dracut-044-r3.ebuild
@@ -3,7 +3,7 @@
EAPI=6
-inherit bash-completion-r1 linux-info toolchain-funcs systemd
+inherit bash-completion-r1 eutils linux-info toolchain-funcs systemd
DESCRIPTION="Generic initramfs generation tool"
HOMEPAGE="https://dracut.wiki.kernel.org"
diff --git a/sys-kernel/dracut/dracut-045-r2.ebuild b/sys-kernel/dracut/dracut-045-r2.ebuild
index 608b8222ade3..13e9d481ce18 100644
--- a/sys-kernel/dracut/dracut-045-r2.ebuild
+++ b/sys-kernel/dracut/dracut-045-r2.ebuild
@@ -3,7 +3,7 @@
EAPI=6
-inherit bash-completion-r1 linux-info toolchain-funcs systemd
+inherit bash-completion-r1 eutils linux-info toolchain-funcs systemd
DESCRIPTION="Generic initramfs generation tool"
HOMEPAGE="https://dracut.wiki.kernel.org"
diff --git a/sys-kernel/dracut/dracut-046-r1.ebuild b/sys-kernel/dracut/dracut-046-r1.ebuild
index 7372bf1bd0a7..174e2fb68266 100644
--- a/sys-kernel/dracut/dracut-046-r1.ebuild
+++ b/sys-kernel/dracut/dracut-046-r1.ebuild
@@ -3,7 +3,7 @@
EAPI=6
-inherit bash-completion-r1 linux-info toolchain-funcs systemd
+inherit bash-completion-r1 eutils linux-info toolchain-funcs systemd
DESCRIPTION="Generic initramfs generation tool"
HOMEPAGE="https://dracut.wiki.kernel.org"
diff --git a/www-apps/Manifest.gz b/www-apps/Manifest.gz
index d3bab4048fb4..85191d06c790 100644
Binary files a/www-apps/Manifest.gz and b/www-apps/Manifest.gz differ
diff --git a/www-apps/rutorrent/rutorrent-3.8.ebuild b/www-apps/rutorrent/rutorrent-3.8-r1.ebuild
similarity index 91%
rename from www-apps/rutorrent/rutorrent-3.8.ebuild
rename to www-apps/rutorrent/rutorrent-3.8-r1.ebuild
index 06d1d6b36e7f..a45b892d7649 100644
--- a/www-apps/rutorrent/rutorrent-3.8.ebuild
+++ b/www-apps/rutorrent/rutorrent-3.8-r1.ebuild
@@ -29,6 +29,8 @@ pkg_setup() {
src_prepare() {
default
find -name '\.gitignore' -type f -exec rm -rf {} \;
+ # The 3.8 release of ruTorrent includes an .htaccess file that defines a .htpasswd that doesn't exist
+ rm '.htaccess'
}
src_install() {
diff --git a/x11-libs/Manifest.gz b/x11-libs/Manifest.gz
index e8f56aa8364e..8508dc645fa1 100644
Binary files a/x11-libs/Manifest.gz and b/x11-libs/Manifest.gz differ
diff --git a/x11-libs/gtkmathview/files/gtkmathview-0.8.0-gcc7.patch b/x11-libs/gtkmathview/files/gtkmathview-0.8.0-gcc7.patch
new file mode 100644
index 000000000000..917f41bc2889
--- /dev/null
+++ b/x11-libs/gtkmathview/files/gtkmathview-0.8.0-gcc7.patch
@@ -0,0 +1,22 @@
+Patch from FreeBSD
+
+--- a/src/widget/gtkmathview_common.cc
++++ b/src/widget/gtkmathview_common.cc
+@@ -909,7 +909,7 @@ gtk_math_view_button_release_event(GtkWi
+ math_view->select_state == SELECT_STATE_NO &&
+ fabs(math_view->button_press_x - event->x) <= CLICK_SPACE_RANGE &&
+ fabs(math_view->button_press_y - event->y) <= CLICK_SPACE_RANGE &&
+- abs(math_view->button_press_time - event->time) <= CLICK_TIME_RANGE)
++ abs((long)math_view->button_press_time - (long)event->time) <= CLICK_TIME_RANGE)
+ {
+ // the mouse should have not moved more than one pixel in each direction
+ // and the time elapsed from the press event should be no more than 250ms
+@@ -969,7 +969,7 @@ gtk_math_view_motion_notify_event(GtkWid
+ (math_view->select_state == SELECT_STATE_YES ||
+ fabs(math_view->button_press_x - x) > CLICK_SPACE_RANGE ||
+ fabs(math_view->button_press_y - y) > CLICK_SPACE_RANGE ||
+- abs(math_view->button_press_time - event->time) > CLICK_TIME_RANGE))
++ abs((long)math_view->button_press_time - (long)event->time) > CLICK_TIME_RANGE))
+ {
+ if (math_view->select_state == SELECT_STATE_NO)
+ {
diff --git a/x11-libs/gtkmathview/gtkmathview-0.8.0-r3.ebuild b/x11-libs/gtkmathview/gtkmathview-0.8.0-r3.ebuild
index 07ae521431c3..1e4f1c3bf83e 100644
--- a/x11-libs/gtkmathview/gtkmathview-0.8.0-r3.ebuild
+++ b/x11-libs/gtkmathview/gtkmathview-0.8.0-r3.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
@@ -44,6 +44,8 @@ PATCHES=(
"${FILESDIR}"/${P}-underlinking.patch
"${FILESDIR}"/${P}-gcc47.patch
"${FILESDIR}"/${P}-gcc6.patch
+ # Fix building against GCC 7, bug #639448
+ "${FILESDIR}"/${P}-gcc7.patch
)
src_prepare() {
diff --git a/x11-terms/Manifest.gz b/x11-terms/Manifest.gz
index 2fb71ce4f9b2..2e2a845b2488 100644
Binary files a/x11-terms/Manifest.gz and b/x11-terms/Manifest.gz differ
diff --git a/x11-terms/xterm/Manifest b/x11-terms/xterm/Manifest
index 7c9e480c6341..c1d849e395cf 100644
--- a/x11-terms/xterm/Manifest
+++ b/x11-terms/xterm/Manifest
@@ -1,4 +1,3 @@
DIST xterm-327.tgz 1240131 BLAKE2B 7f009ec995fa9f8007cd5497d13f1120440df40ef0801da9be6c708e6e9a31e5c43ddb8fe1af1abfa24ce4c1c9e769bf8d74d0bd7acf94d172ea4cc10ddc177c SHA512 d9d9f3b870fea8db9ae3c076a9d85152488b2d392b9b1e2e4ebbeded287ed4911f1f63e5e035d5b3793b2506b993125c6fca437393b435a28aeb519d76147672
-DIST xterm-328.tgz 1264517 BLAKE2B 7ac6ff7b6e576c0c9a7fb5d096f9aabfd9cd7fe1ddb31a23322a510ce37e7d305231e85ac5085b1543cd0028eb53997c55eca076d22975901881454f1fb5ce71 SHA512 4f3381440394e0cd2d6c4d6645573ab2eac1c1c98e510eb0b3281ed4d2b1082e57ae58b7f756a03704eb275925ae497a1ae6c5907d6ba1b8ec95f92eaf939656
-DIST xterm-329.tgz 1265450 BLAKE2B acfe00128978aae4fd26d7a116137d1d08a8fdf3bcd1b0171ef3082919c9e3c1f07d8fbde8dc1d7f5cc0561fdada1ac8bdb1cae75e26e4a5a2c6e84ac857f4f9 SHA512 b6d68bde0796dc6848c02bb0f780b778226e110e7b495fd8c8d45870b1e78b1b91263a45748ef0fbfbd3a7262f4af78daeca07984c3f4cba4c5da67c4c3f0347
DIST xterm-330.tgz 1273183 BLAKE2B 5a73e251d3c19ed8591962eb280922c89ad8c67b6970d33e83a8900c6aa349e042ef911ccbdecb8d00addbd0f748bca79c34480bccc746675f837313bab3bfd3 SHA512 3886745179ebabc10feea401444a153dc3f9e5f4c91da381870857fe21f514e0e975193af498b7c2b365602f833dd08e6c706e25cfc1e687d565125672136b62
+DIST xterm-331.tgz 1286312 BLAKE2B 4299f2d0d1f79c88e855850b028c7778c71a1d38a8f78ad1344e8a5794dfbb24cacea544b51ba63374d0c634d0051383331084dfe2363d8f68de917934d4b7bc SHA512 88229d682553d4780c7b9c081bba6396f319ecd17461dd344478ae6456e35aff9d7a7411d863d35a03886d9a6b082b5d3325fbb990cea22cb82970173f6f3347
diff --git a/x11-terms/xterm/xterm-329.ebuild b/x11-terms/xterm/xterm-329.ebuild
deleted file mode 100644
index 1dfbec154c2a..000000000000
--- a/x11-terms/xterm/xterm-329.ebuild
+++ /dev/null
@@ -1,94 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-inherit eutils flag-o-matic multilib
-
-DESCRIPTION="Terminal Emulator for X Windows"
-HOMEPAGE="https://invisible-island.net/xterm/"
-SRC_URI="ftp://ftp.invisible-island.net/${PN}/${P}.tgz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-IUSE="+openpty toolbar truetype unicode Xaw3d xinerama"
-
-COMMON_DEPEND="kernel_linux? ( sys-libs/libutempter )
- kernel_FreeBSD? ( || ( >=sys-freebsd/freebsd-lib-9.0 sys-libs/libutempter ) )
- >=sys-libs/ncurses-5.7-r7:0=
- x11-apps/xmessage
- x11-libs/libX11
- x11-libs/libXaw
- x11-libs/libXft
- x11-libs/libxkbfile
- x11-libs/libXmu
- x11-libs/libXrender
- x11-libs/libXt
- unicode? ( x11-apps/luit )
- Xaw3d? ( x11-libs/libXaw3d )
- xinerama? ( x11-libs/libXinerama )"
-RDEPEND="${COMMON_DEPEND}
- media-fonts/font-misc-misc
- x11-apps/rgb"
-DEPEND="${COMMON_DEPEND}
- virtual/pkgconfig
- x11-proto/kbproto
- x11-proto/xproto"
-
-DOCS=( README{,.i18n} ctlseqs.txt )
-
-pkg_setup() {
- DEFAULTS_DIR="${EPREFIX}"/usr/share/X11/app-defaults
-}
-
-src_configure() {
- # 454736
- # Workaround for ncurses[tinfo] until upstream fixes their buildsystem using
- # something sane like pkg-config or ncurses5-config and stops guessing libs
- # Everything gets linked against ncurses anyways, so don't shout
- append-libs $(pkg-config --libs ncurses)
-
- econf \
- --libdir="${EPREFIX}"/etc \
- --disable-full-tgetent \
- --with-app-defaults="${DEFAULTS_DIR}" \
- --disable-setuid \
- --disable-setgid \
- --with-utempter \
- --with-x \
- $(use_with Xaw3d) \
- $(use_with xinerama) \
- --disable-imake \
- --enable-256-color \
- --enable-broken-osc \
- --enable-broken-st \
- --enable-exec-xterm \
- $(use_enable truetype freetype) \
- --enable-i18n \
- --enable-load-vt-fonts \
- --enable-logging \
- $(use_enable openpty) \
- $(use_enable toolbar) \
- $(use_enable unicode mini-luit) \
- $(use_enable unicode luit) \
- --enable-wide-chars \
- --enable-dabbrev \
- --enable-warnings
-}
-
-src_install() {
- default
-
- dohtml xterm.log.html
- domenu *.desktop
-
- # Fix permissions -- it grabs them from live system, and they can
- # be suid or sgid like they were in pre-unix98 pty or pre-utempter days,
- # respectively (#69510).
- # (info from Thomas Dickey) - Donnie Berkholz
- fperms 0755 /usr/bin/xterm
-
- # restore the navy blue
- sed -i -e "s:blue2$:blue:" "${D}${DEFAULTS_DIR}"/XTerm-color || die
-}
diff --git a/x11-terms/xterm/xterm-328.ebuild b/x11-terms/xterm/xterm-331.ebuild
similarity index 98%
rename from x11-terms/xterm/xterm-328.ebuild
rename to x11-terms/xterm/xterm-331.ebuild
index 1dfbec154c2a..c9683e8dda78 100644
--- a/x11-terms/xterm/xterm-328.ebuild
+++ b/x11-terms/xterm/xterm-331.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=5