gentoo resync : 21.10.2017

8 files changed, 75 insertions, 283 deletions

diff --git a/app-admin/github-backup-utils/Manifest b/app-admin/github-backup-utils/Manifest
index 3d1ed7a053cc..f965f573acbe 100644
--- a/app-admin/github-backup-utils/Manifest
+++ b/app-admin/github-backup-utils/Manifest
@@ -1,5 +1,6 @@
 DIST github-backup-utils-2.10.0.tar.gz 73061 SHA256 08c2f24adcbc1554fc6079a46f7b59e1cb2f21950546956f9c4367c25dc716a5 SHA512 e4ec432289da71e7c8d50023e4874b4aef5e99b27f67c42ebadc61473f5b0bce473f768ff19d1d611d91944ce887ad496535f1bc8d6557a31a99353e100f7776 WHIRLPOOL c33ccbff94e5c56f2017ff344170538822637261e7c87037db1e5c9abcae28276424aab0d7ed6b3c489148430a05cd488dca4871b302e69acf821f089a73c479
 DIST github-backup-utils-2.11.0.tar.gz 75105 SHA256 ae28ab08b933a8288e9eb9a92df221b0762cd1e7e399b5c116405a0d5fc3175b SHA512 7d96aff4c2e2bcce7b2b2d32854e759d561de8e683a13d3890bbbc5177cea861a666a60527b4b6ec4d4d7e8123bfff4618b6dfd0c3db73b1829cca0c43c0a9ec WHIRLPOOL 05be640c5f95025cb694d4f8e1f1fda4a1d349889333f9ada1f15b48b3bb01d89b9bd4fb984549916f63815548efb272621d016cebdfddb803ec5fdd41b62377
+DIST github-backup-utils-2.11.1.tar.gz 79378 SHA256 187703c451d85b4c70fd9565de2cf4c4c11e1ff6087237bc5f617b4db06cfe5c SHA512 7bdd34386d8604bfddb07d958d6cc435ec3e00705a83e53730f44a82a02eb98be311b73bba299db80513169a0680641927d9e2e9583b936c4fffa86de2ce2cda WHIRLPOOL d3e507d4eb678a04baa7ad78eca7b76a457e3f09914fe631548f76b56158ae826db3c911de551ad19b3272a662193d95bbea773dad2e8b813ef465b8c0bc8efb
 DIST github-backup-utils-2.5.0.tar.gz 40850 SHA256 9cc7cd40f41e6071c36527ec7983b877e461452cd08d04439efd5fa9352900a0 SHA512 ecd5b85e0e2e300a9f40ecb8f545868554c7b48bdf800a21cf111ead80c185c96d475c67487c9b9e8af676f8c71a001730084abde79e05860b3e24004888292d WHIRLPOOL 15be1d603c9b61a4cff47e319ee1a66b64684dfd19f06c696bffb41b77dc756a895e25074d5a6dd19aeebaa3106fe12842cb22a639ed4abd3a6c2922e8cdbc1f
 DIST github-backup-utils-2.6.0.tar.gz 45970 SHA256 7273cebcb23bc597432a2b66ab7e9367a4fb09a750cf2438f8957dc83dcf27c3 SHA512 a795e439f9d28e27b457c5b6eb42f35d6aea1527c2a01a26b81d6e86829db14a0b27a366d9358214bbe1c16540fe524fb0010d5f509c78ba5398c6bdbf04182e WHIRLPOOL fd1aeec46946190657e61e611a089b4a7cef53beb7b3f9a500b7117fcdbd89c5ef09681aff98ed5d559cc243f76180eb6eec0cc6f2fcfeed0789c159f5a09afe
 DIST github-backup-utils-2.6.3.tar.gz 50884 SHA256 3a5e48ff250b64a9bcec69a269b0e93efda078b8b77afc992c12aa40ee7bb3d9 SHA512 dff092325ad6f3502c8c0afbea90a53469af0ab4b98eaa39a950022c5b4e199cd3b48b5ec0585e3ea39b9bbd707dd037e8e0ed00ed8c6858276ba1a8e1075290 WHIRLPOOL aa19640ee5583d5e64aaab7b5a9d5572c47a09dd11fd0bed30ffc6aad0a10ddfc4e258f4680180547f8327fbedc5866bde4b20bd5e962dfa8162cd8ecf5e6db3
@@ -10,6 +11,7 @@ DIST github-backup-utils-2.8.2.tar.gz 71392 SHA256 7aaa435d007b2697c3540ce6e2d3e
 DIST github-backup-utils-2.9.0.tar.gz 72512 SHA256 c019467eb218e25de0905f56af03bde59f09d06fee1ec2fc8ef21ddddfc8c711 SHA512 81af0842c021c49be8acca775d1ab375e98c2b725893f45d65b670e671892d779408677dfe6ed415101bf88fe549d117957bffef0aa372a74bcd7c6f87c1d12b WHIRLPOOL 9134ba916386f6590b4372992133b358f8284ebb4787bf8ae00c199a78df9fe34cbb6de45de3fcee0d3dffeae58e645d46d17ff8489fe443c682b3b685a5d8ae
 EBUILD github-backup-utils-2.10.0.ebuild 893 SHA256 f6d77c4a8ea2cf9fb7f7517ebc852a1bba5e55c40d256187527d6b0847242791 SHA512 2ade504c613988d9238786435f333572975c9e1f180cea52dac9394c8b380b3e33c33a23951f4add9961bef4dfe9cf1e8e96970fc85086d299841c29fb3716c1 WHIRLPOOL 7973a5cb8f3fa6c26b43c58adca2257789abd57b4dc8a7e1dd032f36013b25d55defcda171ada7b07e253344016b5e0f49d4bd6a345548254589abc2f319bc01
 EBUILD github-backup-utils-2.11.0.ebuild 893 SHA256 f6d77c4a8ea2cf9fb7f7517ebc852a1bba5e55c40d256187527d6b0847242791 SHA512 2ade504c613988d9238786435f333572975c9e1f180cea52dac9394c8b380b3e33c33a23951f4add9961bef4dfe9cf1e8e96970fc85086d299841c29fb3716c1 WHIRLPOOL 7973a5cb8f3fa6c26b43c58adca2257789abd57b4dc8a7e1dd032f36013b25d55defcda171ada7b07e253344016b5e0f49d4bd6a345548254589abc2f319bc01
+EBUILD github-backup-utils-2.11.1.ebuild 893 SHA256 f6d77c4a8ea2cf9fb7f7517ebc852a1bba5e55c40d256187527d6b0847242791 SHA512 2ade504c613988d9238786435f333572975c9e1f180cea52dac9394c8b380b3e33c33a23951f4add9961bef4dfe9cf1e8e96970fc85086d299841c29fb3716c1 WHIRLPOOL 7973a5cb8f3fa6c26b43c58adca2257789abd57b4dc8a7e1dd032f36013b25d55defcda171ada7b07e253344016b5e0f49d4bd6a345548254589abc2f319bc01
 EBUILD github-backup-utils-2.5.0.ebuild 868 SHA256 7792092069a92b97b2e17b23ff389dc0975ef19427cbe12f2b1155e2ecfe53ba SHA512 023dd525af06cd12a7770185d0e0ae5adab996167984bc9c5e3466d0e9e7f69d5f205427b6723c4e16e02ca24732b5c4b4ed2895b5a53ef9bf96ebc2c0141274 WHIRLPOOL c38f96e0d63eb1d7734cb272cb193fc679403af737c93d936cc90b82d880284f53e1984b52ef8e17c180065e7540c55394910347ddadef3b2345a8a042bc3987
 EBUILD github-backup-utils-2.6.0.ebuild 868 SHA256 7792092069a92b97b2e17b23ff389dc0975ef19427cbe12f2b1155e2ecfe53ba SHA512 023dd525af06cd12a7770185d0e0ae5adab996167984bc9c5e3466d0e9e7f69d5f205427b6723c4e16e02ca24732b5c4b4ed2895b5a53ef9bf96ebc2c0141274 WHIRLPOOL c38f96e0d63eb1d7734cb272cb193fc679403af737c93d936cc90b82d880284f53e1984b52ef8e17c180065e7540c55394910347ddadef3b2345a8a042bc3987
 EBUILD github-backup-utils-2.6.3.ebuild 868 SHA256 7792092069a92b97b2e17b23ff389dc0975ef19427cbe12f2b1155e2ecfe53ba SHA512 023dd525af06cd12a7770185d0e0ae5adab996167984bc9c5e3466d0e9e7f69d5f205427b6723c4e16e02ca24732b5c4b4ed2895b5a53ef9bf96ebc2c0141274 WHIRLPOOL c38f96e0d63eb1d7734cb272cb193fc679403af737c93d936cc90b82d880284f53e1984b52ef8e17c180065e7540c55394910347ddadef3b2345a8a042bc3987
diff --git a/app-admin/github-backup-utils/github-backup-utils-2.11.1.ebuild b/app-admin/github-backup-utils/github-backup-utils-2.11.1.ebuild
new file mode 100644
index 000000000000..586f3c415df5
--- /dev/null
+++ b/app-admin/github-backup-utils/github-backup-utils-2.11.1.ebuild
@@ -0,0 +1,48 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+# See https://github.com/github/backup-utils/issues/135
+PYTHON_COMPAT=(python2_7)
+inherit python-any-r1
+
+DESCRIPTION="Backup and recovery utilities for GitHub Enterprise"
+HOMEPAGE="https://github.com/github/backup-utils"
+SRC_URI="https://github.com/github/backup-utils/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64"
+IUSE="test"
+
+DEPEND="test? (
+	dev-util/checkbashisms
+	${PYTHON_DEPS}
+)"
+
+RDEPEND="net-misc/rsync"
+
+MY_PN="${PN/#github-/}"
+S="${WORKDIR}/${MY_PN}-${PV}"
+
+src_compile() {
+	:;
+}
+
+src_install() {
+	dobin bin/*
+	insinto usr/share/${PN}
+	doins share/${PN}/version
+
+	exeinto usr/share/${PN}
+	doexe share/${PN}/bm.sh
+	doexe share/${PN}/ghe-*
+
+	insinto etc/${PN}
+	newins backup.config-example backup.config
+}
+
+src_test() {
+	emake test
+}
diff --git a/app-admin/glance/Manifest b/app-admin/glance/Manifest
index 03e6e5354cdf..15114326b92d 100644
--- a/app-admin/glance/Manifest
+++ b/app-admin/glance/Manifest
@@ -1,14 +1,11 @@
 AUX glance.initd 542 SHA256 44c1619fe4ff0f57d6b33a91f5a51bd051970db51dc2ce753188bfeef41effcd SHA512 3aa35dbc71239d63f52fde3b1ca334b89b2b65a38c8e469ad853f6d2d993a848ac45097a899f13fdb74638024f43cd4a7857f2b3837b74e7fb471c24e9943a52 WHIRLPOOL 3602e032d223837c57a17c557636202d0545e1221c625d771a28e81a526e21bacd317f3592a21179c85e562609614f59c3cd198e51d81909dd8faff46f9edbe7
 AUX glance.initd-2 375 SHA256 0d281ca259aa67b9bb2603d88be1ccb6c67bb0b1c2c34505e9105987a35d8718 SHA512 1ec49c74fc46157262278f03f2e118d79f1eb9d631b45730959b2060048851b27af2964c3a258ebb97c1b0bd35cf7185d48def744d368c371d2a74f15303a4f2 WHIRLPOOL d626f3e40c2b26476f2ebd0ca32622c8f5671c1d06831251cc705928872dbb2373be2bfbef3ac43514441408a6098ba483c51c8af584daa4e3dae512712e2696
 AUX glance.initd-r2 412 SHA256 20fd0771e239f702fc61f3155b32cdbab3415d028cbe9b900ea381080e962438 SHA512 7e8e2d4ee08d845cdd222435abfe2328317a07426b5305933201b233b9a625539f5149ca23607ee28afca0779f73a429413f2e3e8772fb0cd43b2299f4a40916 WHIRLPOOL cc56db85e57aeff55814b29e9cd98bfb008851650462843e89ac17f951af0e1b422d26e91ece524c4b62667bf0a8edd057cbfc072bb2f41e196ef328c06c7a8c
-DIST glance-13.0.0.tar.gz 1742124 SHA256 3ef3594018469ba36425afafa61ae31487b6025e6f8d9d14febcedfa7136160f SHA512 2f49af5c462a10f8132bb50ad62a45026e77db1324384299551cfe2097b166ccb6fab82eacb092ab6c157f27cdb7253062e62881af795b15d8fd400c1fa096d8 WHIRLPOOL 0c859bbe9e87d2658118bdc111fd052ef088489d83d30574ec07271a50674d18b93d80de05a6282f7d43a8630d980340445b7eeee926bda84572df40086e5e5c
 DIST glance-14.0.0.tar.gz 1788173 SHA256 360a9ef92121ed355ea812478933ac4b020adc6ae3bb5440b05cbdf06a2f9f46 SHA512 4d0b6654dc6a9848e164422d138d4f6c1ec3711a7eb56a3c437202aa5c8cf86bf341201c9007b2f12173189f18beb73eadbaaade936ececf705a31e8b6eac155 WHIRLPOOL 40c7959e052cb3f1d93f3542669b3009b83004cce7dbdcbe67651e69af93e01969f70f4586a022ffc60127ce70037d4887ab0d8de4e11de98519bef578632265
 DIST glance-15.0.0.tar.gz 1803491 SHA256 6e0305e5bdc8f22dca083809e86cf82c430d1cb0164364dbc68263e36676e565 SHA512 beb5744f9e8b296356cb731c79f1efd7b60408c1282e8a64ab7d414929c447c4f2ff0562a0d59c0a05f828d420ba190946866543a37dbd2df73ae322cbcabab5 WHIRLPOOL dfb8ec280a161c09a03f2495b9ec26ec8b2a18f14fca0cad13d6c581a735858893bc0dce2de2bbe317ad61cb7fbca5de7d05d6bb85cb7e6949acd49baf91eb8f
-EBUILD glance-13.0.0.ebuild 4874 SHA256 424b09f25a4714a88509e5807ee326f5f0a7d8defa31eccdfee856ab7aa0dcda SHA512 1bf09b4cddd470dcbba65da55ad81770ba07f78524dbe84c60ed6caa6e49120373137c46143fa65147afb4a017ac1d6eef1416d131288ac5f292c5ea2ac86fc0 WHIRLPOOL 22140e1e21d17a17c0e40881033944344ebb76b144a54e21c2a792a9e3cfb3b98a03d805eefbaeba865bc4f0b1c62208793eeba3dd937d6f2cffd5e7f50f2b38
 EBUILD glance-14.0.0-r1.ebuild 4695 SHA256 3cdf6686273e2df63330d4cf2e32e0d68abafe280eccdd6ae12d8ba4ed3b9951 SHA512 9b9b06a73d53ff7de05b271536307c0a7f1d4e5617a940c8307b9b31a60c52f26716cdb36874ec9fb01c1d383075b19995a6463ae6762aa9cc3f8fd705c7d017 WHIRLPOOL 0b1b382ab1415336c524945f0d7bef0b4708c02d8c70108cb47ec4b36b6b5d744b44901a222d6736cb2cacbf737dc62131b976b32015659854f1e5b2e2f248a7
 EBUILD glance-14.0.0.ebuild 4693 SHA256 b74a31ffdb71157d4ca59364d65347372d217c44945ca762137f76dfadf6f15e SHA512 0669cb057f5a89ddf9f145f2974d6bbd85ec6e3e7f82ffe24dc2f313f808bf0ba930736a5422d56d126d9e250e8075f4a84b9593ef0f216eb29955e82165b267 WHIRLPOOL 4c0a0c267c43fc312799460c8e50d5799a680b527d4596b6b199d7cd6db96f1ed617ee24b424322ae366682677486ee72d6220b2f323b22b2bed7290c63330b1
 EBUILD glance-15.0.0.ebuild 5139 SHA256 2e29a6ef3de9a19b7fa8a670d84bef51baf7cc2cb05a74c0e89f978497d87b8e SHA512 eef444849d4d35efc532973d24bdf596a45fac50160631ac89be9e74991c3fb9dda235d091d4a6c93351ddc67abea4cc0870abe61cb09b7d58c3963581374891 WHIRLPOOL 043cc380db4e0439174d2d6847b83edcdb85dee6d2d47e6a03eb79ffa9694187969cfa879142e86f590341341353f4becb2ccb24555b426650e7db9273f86fd8
-EBUILD glance-2016.2.9999.ebuild 4873 SHA256 7b5d381079351de96262c8a2aa3318c77544aee961a97d9f1fd9dce864f92aea SHA512 afe727a6369ee1c222e7156d3b071401f129f0dce79e696e3928e7a9651e74cee1b3eeca35aa1c815ef58776b4c24cabe7d6ed6798e5c56d078a2c914b3eeaba WHIRLPOOL e5143f1796de4e54772750367850c84313ddd541c3de054bf5437937cafd0a13e2ee83325d06958f7d7cf1b5f5d78866ae4f97f62fdf3c05fc4786880551141f
 EBUILD glance-2017.1.9999.ebuild 4711 SHA256 43482e811569d159951de1e0ab1d85b65a9af38ad4c563952057bc434a23fa85 SHA512 c0a57d6b678a1575ca17d1c8935db3f3759fa5edcb670079f6155e729fa69e4e9f9b035c93f010e3bae2690d53e71eb74b8511dedd7a9b54d4e55c3ffdac1d27 WHIRLPOOL ce3c9beacb54a7ecf79a21521ebb9026fdbcfc75b8999e8aad4ab501c35db498d7a8bd0f6907234be597cada709f26fa8d8bde9a66bae624e5f94e23e855ef62
 EBUILD glance-2017.2.9999.ebuild 5153 SHA256 1ad06950a3be3eb131efcd12c865c6504f3c624fcee9cfe58d4af9a7a28f662f SHA512 0d9c66e1eb973c708778316df7315759ed1341c20ade1ad77a64bd834cc5ada837c8bdb5279f8a505d62e8d61779fe02fc21f5d695d0e1fe1ebddcbf37688928 WHIRLPOOL b9e0390b7546db4b601a18979a74b8505e01a5310ad7f5e6319d98f1ffbff14581675e3dc87f2e7312f230667ba9fa1e2e10802d07cb2089e7749e2997c73cba
 MISC ChangeLog 13604 SHA256 d9e99ff0d56a2d7868cca61f5f1669965b9ccf42b9234d75ee1eb0ca8982db7b SHA512 0a83d65179f787f28fbd89614fb028cfe1e6165e64cad12dbddca5802116b1364676d78b810e42bfde5836019e5514584bb0c6415dea837aab37de2673834486 WHIRLPOOL 99252219bb3f8fd5bd7b3ce08ece1027367f72412a1c8ffbe51c3e7a2edf1f8e7c6361736af7c58f5af3464a50d17e1da0062fb4b4060a984c5b01c262eae9e1
diff --git a/app-admin/glance/glance-13.0.0.ebuild b/app-admin/glance/glance-13.0.0.ebuild
deleted file mode 100644
index 35bf1ea85a7b..000000000000
--- a/app-admin/glance/glance-13.0.0.ebuild
+++ /dev/null
@@ -1,140 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-PYTHON_COMPAT=( python2_7 python3_4 python3_5 )
-
-inherit distutils-r1 user
-
-DESCRIPTION="Services for discovering, registering, and retrieving VM images"
-HOMEPAGE="https://launchpad.net/glance"
-SRC_URI="https://tarballs.openstack.org/${PN}/${P}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="amd64 ~arm64 x86"
-IUSE="doc mysql postgres +sqlite +swift"
-REQUIRED_USE="|| ( mysql postgres sqlite )"
-
-CDEPEND=">=dev-python/pbr-1.6.0[${PYTHON_USEDEP}]"
-DEPEND="
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	${CDEPEND}"
-
-#note to self, wsgiref is a python builtin, no need to package it
-#>=dev-python/wsgiref-0.1.2[${PYTHON_USEDEP}]
-
-RDEPEND="
-	${CDEPEND}
-	sqlite? (
-		>=dev-python/sqlalchemy-1.0.10[sqlite,${PYTHON_USEDEP}]
-		<dev-python/sqlalchemy-1.1.0[sqlite,${PYTHON_USEDEP}]
-	)
-	mysql? (
-		>=dev-python/pymysql-0.6.2[${PYTHON_USEDEP}]
-		!~dev-python/pymysql-0.7.7[${PYTHON_USEDEP}]
-		>=dev-python/sqlalchemy-1.0.10[${PYTHON_USEDEP}]
-		<dev-python/sqlalchemy-1.1.0[${PYTHON_USEDEP}]
-	)
-	postgres? (
-		>=dev-python/psycopg-2.5.0[${PYTHON_USEDEP}]
-		>=dev-python/sqlalchemy-1.0.10[${PYTHON_USEDEP}]
-		<dev-python/sqlalchemy-1.1.0[${PYTHON_USEDEP}]
-	)
-	>=dev-python/eventlet-0.18.4[${PYTHON_USEDEP}]
-	>=dev-python/pastedeploy-1.5.0[${PYTHON_USEDEP}]
-	>=dev-python/routes-1.12.3[${PYTHON_USEDEP}]
-	!~dev-python/routes-2.0[${PYTHON_USEDEP}]
-	!~dev-python/routes-2.1[$(python_gen_usedep 'python2_7')]
-	!~dev-python/routes-2.3[${PYTHON_USEDEP}]
-	>=dev-python/webob-1.2.3[${PYTHON_USEDEP}]
-	>=dev-python/sqlalchemy-migrate-0.9.6[${PYTHON_USEDEP}]
-	>=dev-python/httplib2-0.7.5[${PYTHON_USEDEP}]
-	>=dev-python/pycrypto-2.6[${PYTHON_USEDEP}]
-	>=dev-python/oslo-config-3.14.0[${PYTHON_USEDEP}]
-	>=dev-python/oslo-concurrency-3.8.0[${PYTHON_USEDEP}]
-	>=dev-python/oslo-context-2.9.0[${PYTHON_USEDEP}]
-	>=dev-python/oslo-service-1.10.0[${PYTHON_USEDEP}]
-	>=dev-python/oslo-utils-3.16.0[${PYTHON_USEDEP}]
-	>=dev-python/stevedore-1.16.0[${PYTHON_USEDEP}]
-	>=dev-python/futurist-0.11.0[${PYTHON_USEDEP}]
-	!~dev-python/futurist-0.15.0[${PYTHON_USEDEP}]
-	>=dev-python/taskflow-1.26.0[${PYTHON_USEDEP}]
-	>=dev-python/keystoneauth-2.10.0[${PYTHON_USEDEP}]
-	>=dev-python/keystonemiddleware-4.0.0[${PYTHON_USEDEP}]
-	!~dev-python/keystonemiddleware-4.1.0[${PYTHON_USEDEP}]
-	!~dev-python/keystonemiddleware-4.5.0[${PYTHON_USEDEP}]
-	>=dev-python/WSME-0.8.0[${PYTHON_USEDEP}]
-	>=dev-python/prettytable-0.7.0[${PYTHON_USEDEP}]
-	<dev-python/prettytable-0.8.0[${PYTHON_USEDEP}]
-	dev-python/paste[${PYTHON_USEDEP}]
-	>=dev-python/jsonschema-2.0.0[${PYTHON_USEDEP}]
-	!~dev-python/jsonschema-2.5.0[${PYTHON_USEDEP}]
-	<dev-python/jsonschema-3.0.0[${PYTHON_USEDEP}]
-	>=dev-python/python-keystoneclient-2.0.0[${PYTHON_USEDEP}]
-	!~dev-python/python-keystoneclient-2.1.0[${PYTHON_USEDEP}]
-	>=dev-python/pyopenssl-0.14[${PYTHON_USEDEP}]
-	>=dev-python/six-1.9.0[${PYTHON_USEDEP}]
-	>=dev-python/oslo-db-4.10.0[${PYTHON_USEDEP}]
-	!~dev-python/oslo-db-4.13.1[${PYTHON_USEDEP}]
-	!~dev-python/oslo-db-4.13.2[${PYTHON_USEDEP}]
-	>=dev-python/oslo-i18n-2.1.0[${PYTHON_USEDEP}]
-	>=dev-python/oslo-log-1.14.0[${PYTHON_USEDEP}]
-	>=dev-python/oslo-messaging-5.2.0[${PYTHON_USEDEP}]
-	>=dev-python/oslo-middleware-3.0.0[${PYTHON_USEDEP}]
-	>=dev-python/oslo-policy-1.9.0[${PYTHON_USEDEP}]
-	>=dev-python/retrying-1.2.3[${PYTHON_USEDEP}]
-	!~dev-python/retrying-1.3.0[${PYTHON_USEDEP}]
-	>=dev-python/osprofiler-1.4.0[${PYTHON_USEDEP}]
-	>=dev-python/glance_store-0.18.0[${PYTHON_USEDEP}]
-	>=dev-python/semantic_version-2.3.1[${PYTHON_USEDEP}]
-	>=dev-python/debtcollector-1.2.0[${PYTHON_USEDEP}]
-	>=dev-python/cryptography-1.0[${PYTHON_USEDEP}]
-	!~dev-python/cryptography-1.3.0[${PYTHON_USEDEP}]
-	>=dev-python/cursive-0.1.1[${PYTHON_USEDEP}]
-	>=dev-python/iso8601-0.1.11[${PYTHON_USEDEP}]
-	>=dev-python/monotonic-0.6[${PYTHON_USEDEP}]
-"
-
-#PATCHES=(
-#)
-
-pkg_setup() {
-	enewgroup glance
-	enewuser glance -1 -1 /var/lib/glance glance
-}
-
-python_prepare_all() {
-	sed -i '/xattr/d' test-requirements.txt || die
-	sed -i '/pysendfile/d' test-requirements.txt || die
-	sed -i '/^hacking/d' test-requirements.txt || die
-	distutils-r1_python_prepare_all
-}
-
-python_compile_all() {
-	use doc && "${PYTHON}" setup.py build_sphinx
-}
-
-python_install() {
-	distutils-r1_python_install
-
-	for svc in api glare registry scrubber; do
-		newinitd "${FILESDIR}/glance.initd" glance-${svc}
-	done
-
-	diropts -m 0750 -o glance -g glance
-	dodir /var/log/glance /var/lib/glance/images /var/lib/glance/scrubber
-	keepdir /etc/glance
-	keepdir /var/log/glance
-	keepdir /var/lib/glance/images
-	keepdir /var/lib/glance/scrubber
-
-	insinto /etc/glance
-	insopts -m 0640 -o glance -g glance
-	doins -r etc/*.ini etc/*.conf etc/*.sample etc/*.json etc/meta*
-}
-
-python_install_all() {
-	use doc && local HTML_DOCS=( doc/build/html/. )
-	distutils-r1_python_install_all
-}
diff --git a/app-admin/glance/glance-2016.2.9999.ebuild b/app-admin/glance/glance-2016.2.9999.ebuild
deleted file mode 100644
index 3de083614ab3..000000000000
--- a/app-admin/glance/glance-2016.2.9999.ebuild
+++ /dev/null
@@ -1,139 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-PYTHON_COMPAT=( python2_7 python3_4 python3_5 )
-
-inherit distutils-r1 git-r3 user
-
-DESCRIPTION="Services for discovering, registering, and retrieving VM images"
-HOMEPAGE="https://launchpad.net/glance"
-EGIT_REPO_URI="https://github.com/openstack/glance.git"
-EGIT_BRANCH="stable/newton"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS=""
-IUSE="doc mysql postgres +sqlite +swift"
-REQUIRED_USE="|| ( mysql postgres sqlite )"
-
-CDEPEND=">=dev-python/pbr-1.6.0[${PYTHON_USEDEP}]"
-DEPEND="
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	${CDEPEND}"
-
-#note to self, wsgiref is a python builtin, no need to package it
-#>=dev-python/wsgiref-0.1.2[${PYTHON_USEDEP}]
-
-RDEPEND="
-	${CDEPEND}
-	sqlite? (
-		>=dev-python/sqlalchemy-1.0.10[sqlite,${PYTHON_USEDEP}]
-		<dev-python/sqlalchemy-1.1.0[sqlite,${PYTHON_USEDEP}]
-	)
-	mysql? (
-		>=dev-python/pymysql-0.6.2[${PYTHON_USEDEP}]
-		!~dev-python/pymysql-0.7.7[${PYTHON_USEDEP}]
-		>=dev-python/sqlalchemy-1.0.10[${PYTHON_USEDEP}]
-		<dev-python/sqlalchemy-1.1.0[${PYTHON_USEDEP}]
-	)
-	postgres? (
-		>=dev-python/psycopg-2.5.0[${PYTHON_USEDEP}]
-		>=dev-python/sqlalchemy-1.0.10[${PYTHON_USEDEP}]
-		<dev-python/sqlalchemy-1.1.0[${PYTHON_USEDEP}]
-	)
-	>=dev-python/eventlet-0.18.4[${PYTHON_USEDEP}]
-	>=dev-python/pastedeploy-1.5.0[${PYTHON_USEDEP}]
-	>=dev-python/routes-1.12.3[${PYTHON_USEDEP}]
-	!~dev-python/routes-2.0[${PYTHON_USEDEP}]
-	!~dev-python/routes-2.1[$(python_gen_usedep 'python2_7')]
-	!~dev-python/routes-2.3[${PYTHON_USEDEP}]
-	>=dev-python/webob-1.2.3[${PYTHON_USEDEP}]
-	>=dev-python/sqlalchemy-migrate-0.9.6[${PYTHON_USEDEP}]
-	>=dev-python/httplib2-0.7.5[${PYTHON_USEDEP}]
-	>=dev-python/pycrypto-2.6[${PYTHON_USEDEP}]
-	>=dev-python/oslo-config-3.14.0[${PYTHON_USEDEP}]
-	>=dev-python/oslo-concurrency-3.8.0[${PYTHON_USEDEP}]
-	>=dev-python/oslo-context-2.9.0[${PYTHON_USEDEP}]
-	>=dev-python/oslo-service-1.10.0[${PYTHON_USEDEP}]
-	>=dev-python/oslo-utils-3.16.0[${PYTHON_USEDEP}]
-	>=dev-python/stevedore-1.16.0[${PYTHON_USEDEP}]
-	>=dev-python/futurist-0.11.0[${PYTHON_USEDEP}]
-	!~dev-python/futurist-0.15.0[${PYTHON_USEDEP}]
-	>=dev-python/taskflow-1.26.0[${PYTHON_USEDEP}]
-	>=dev-python/keystoneauth-2.10.0[${PYTHON_USEDEP}]
-	>=dev-python/keystonemiddleware-4.0.0[${PYTHON_USEDEP}]
-	!~dev-python/keystonemiddleware-4.1.0[${PYTHON_USEDEP}]
-	!~dev-python/keystonemiddleware-4.5.0[${PYTHON_USEDEP}]
-	>=dev-python/WSME-0.8.0[${PYTHON_USEDEP}]
-	>=dev-python/prettytable-0.7.0[${PYTHON_USEDEP}]
-	<dev-python/prettytable-0.8.0[${PYTHON_USEDEP}]
-	dev-python/paste[${PYTHON_USEDEP}]
-	>=dev-python/jsonschema-2.0.0[${PYTHON_USEDEP}]
-	!~dev-python/jsonschema-2.5.0[${PYTHON_USEDEP}]
-	<dev-python/jsonschema-3.0.0[${PYTHON_USEDEP}]
-	>=dev-python/python-keystoneclient-2.0.0[${PYTHON_USEDEP}]
-	!~dev-python/python-keystoneclient-2.1.0[${PYTHON_USEDEP}]
-	>=dev-python/pyopenssl-0.14[${PYTHON_USEDEP}]
-	>=dev-python/six-1.9.0[${PYTHON_USEDEP}]
-	>=dev-python/oslo-db-4.10.0[${PYTHON_USEDEP}]
-	!~dev-python/oslo-db-4.13.1[${PYTHON_USEDEP}]
-	!~dev-python/oslo-db-4.13.2[${PYTHON_USEDEP}]
-	>=dev-python/oslo-i18n-2.1.0[${PYTHON_USEDEP}]
-	>=dev-python/oslo-log-1.14.0[${PYTHON_USEDEP}]
-	>=dev-python/oslo-messaging-5.2.0[${PYTHON_USEDEP}]
-	>=dev-python/oslo-middleware-3.0.0[${PYTHON_USEDEP}]
-	>=dev-python/oslo-policy-1.9.0[${PYTHON_USEDEP}]
-	>=dev-python/retrying-1.2.3[${PYTHON_USEDEP}]
-	!~dev-python/retrying-1.3.0[${PYTHON_USEDEP}]
-	>=dev-python/osprofiler-1.4.0[${PYTHON_USEDEP}]
-	>=dev-python/glance_store-0.18.0[${PYTHON_USEDEP}]
-	>=dev-python/semantic_version-2.3.1[${PYTHON_USEDEP}]
-	>=dev-python/debtcollector-1.2.0[${PYTHON_USEDEP}]
-	>=dev-python/cryptography-1.0[${PYTHON_USEDEP}]
-	!~dev-python/cryptography-1.3.0[${PYTHON_USEDEP}]
-	>=dev-python/cursive-0.1.1[${PYTHON_USEDEP}]
-	>=dev-python/iso8601-0.1.11[${PYTHON_USEDEP}]
-	>=dev-python/monotonic-0.6[${PYTHON_USEDEP}]
-"
-
-#PATCHES=(
-#)
-
-pkg_setup() {
-	enewgroup glance
-	enewuser glance -1 -1 /var/lib/glance glance
-}
-
-python_prepare_all() {
-	sed -i '/xattr/d' test-requirements.txt || die
-	sed -i '/pysendfile/d' test-requirements.txt || die
-	sed -i '/^hacking/d' test-requirements.txt || die
-	distutils-r1_python_prepare_all
-}
-
-python_compile_all() {
-	use doc && "${PYTHON}" setup.py build_sphinx
-}
-
-python_install_all() {
-	distutils-r1_python_install_all
-
-	for svc in api glare registry scrubber; do
-		newinitd "${FILESDIR}/glance.initd" glance-${svc}
-	done
-
-	diropts -m 0750 -o glance -g glance
-	dodir /var/log/glance /var/lib/glance/images /var/lib/glance/scrubber
-	keepdir /etc/glance
-	keepdir /var/log/glance
-	keepdir /var/lib/glance/images
-	keepdir /var/lib/glance/scrubber
-
-	insinto /etc/glance
-	insopts -m 0640 -o glance -g glance
-	doins -r etc/*.ini etc/*.conf etc/*.sample etc/*.json etc/meta*
-
-	use doc && local HTML_DOCS=( doc/build/html/. )
-	distutils-r1_python_install_all
-}
diff --git a/app-admin/radmind/Manifest b/app-admin/radmind/Manifest
index f04e1368d5c6..eb39e4b51207 100644
--- a/app-admin/radmind/Manifest
+++ b/app-admin/radmind/Manifest
@@ -1,8 +1,9 @@
 AUX radmind-1.14.0-parallel-make.patch 1447 SHA256 53d4006c3c97e56be49d8309186747b133fd4a9449e3cfa409f48d6451f70187 SHA512 6fc839a6a626dd4a3366fc85b185f4f0e944e21a8ad3ab4763f290d15c0ed8dbba3919f19f74f7b2a9e59709b017c6ec9e9c2baab7b31b24fc4c212e3b504c4a WHIRLPOOL bef62979bb6b28fd6199e84268a87595944f9049fc9c6bd70b713b48094ac3db1a4c53902eb85b246c8b793ce3a603dbe686a81a315d6d8d45b3b0ccf859a556
+AUX radmind-1.14.1-glibc225.patch 709 SHA256 913e85f0be420c3b6f62cbabb0f7e93435a0a279b56754ad7d4899c5e044dd48 SHA512 faba25648305e3c5374f37037cf61f22bc2e6d1a3f40395e988f00f6c2335cd22fe962d0a9a6ae3ccfd879afb05965916f8f333fb677e89e7b7080f5c977a3b0 WHIRLPOOL 2ac08a3a2f27ceccc291905b79129c0f95ff908d5edae05a201027e164570440c8af0155ab08471e9a1718cceb8b9707886079c7756ed6195ffdf58c61dafaec
 AUX radmind-1.7.0-gentoo.patch 850 SHA256 3d95b99e1356b0192a8fafa316bbcdb78316e3567c71de2eb613954a1e89ca83 SHA512 9eb98ce293fa9c1dae22ec596353deae2e9262427ead062890ef7848fb5fdff1e061b4bacef681465eee2b17d06c371b01c12e547538e0b9385ebfffb9b46a72 WHIRLPOOL 09def013235dbb83035f1d09168c9bcb073f55fc99b502e1d92e007105ea18d7b31a5873725c7d0f45c581bfe633fa585e7a9328f8cb51f8d433e521ea8d9d28
 AUX radmind-1.7.1-dnssd.patch 493 SHA256 15a25cadfad39c20b835a1675e4f839e6ed796b93c03f3a27544de1ff7dae388 SHA512 95577070b42d8abc754c1ae235a8d40bd15acbea71b560a8defd69f2becf8c89b592420d872b93409eb142731b7ea0a5180394218ed440d7d633a6e004b7aaa7 WHIRLPOOL 3155c5c90b3424d82a393234818525718b33b7f3ab6525133afe274bf6f361fb62053721602695243769adf927ab1eaeb29471ff4b110fd56b94f93d71aa228f
 DIST radmind-1.14.1.tar.gz 403553 SHA256 92ce3d586245b107bf4e412b59eb02ec3e57b4d12a0b9a16b0fadf10983ed21f SHA512 bccf9681a6899be3b500065237dd1e04cd83ffb6f9be0e355412e7b0c556325f7d13435cec65a8a5e156e4411da915744f01a615472f6361d52c4d54d8be20eb WHIRLPOOL ed00a477ec5b35621a2568fba8c2c7913d6f9c18165b13d1405b5a7d5fd8fe0ce89c19f639df5bccbeee3849213d9afa4a3d2eaf58ff461ca35395c30d3a929a
-EBUILD radmind-1.14.1-r1.ebuild 761 SHA256 505d98b7ce0d6acb1f1c5fc24b61de2ab888257d1f859253c6a2de979be9bbb7 SHA512 7b96af94c6a7e7a4b2d148c2e4e9e80be1b69d920ab2f04f6ddab3e497af38068180589ce9d6d6d34af426032a8b759f95430a90b6eb898946236947265c262a WHIRLPOOL 3938296013ee0033dad4b19e33c0572797183ecc300d58dd82c847910e42a206a88ed391587546a28c1de0d94ffe61614f61fd9a94428d4436a2075323c2f28d
+EBUILD radmind-1.14.1-r1.ebuild 811 SHA256 4d8f8a4d3af8b91311fc25d909e8977613853d08d145738fcf21c6596953c040 SHA512 365391ad216019626fd4420f9971667e1a27dbbc268cfbcfb16c0817e3be32e73aa0c6c1a45ffa5707dbed3bd3f730c986d4b98bcdae37299d3020803a02c8fe WHIRLPOOL 5475e860fb1fcfafe2fd1e1f60186e2ae49ca52656ad239da2edde6ea5b7220f3f9ce3266456539133b32fec663205d9dddf9f84dcb3550893673e458d3f6d2d
 MISC ChangeLog 3273 SHA256 ccf9966540aa7938710ee466941aaaaef6a75892265f4050a3ce3399ef35abdd SHA512 ed712bb536dc5b9679003d6e2ef4e85e2be883783903346f69c114391212aab600606df61eb8306f897834ed27a99b4872acb2c823a4b1cd1e8f6f96a499a2fb WHIRLPOOL 550e4f5172b68e73beba26a254a05ed44a39d376b8c3dd4a4f1401a62a17df62062719fb4e1896fd6b95bdad7fceb3d77d1eb5ce3ee1de66aff7af16f2a28394
 MISC ChangeLog-2015 2998 SHA256 54acf4e5466e9496962148c2c06700d2a6735282b13187530e57b3b0485e8014 SHA512 ea12629cbb7e0081c5bd17b47a524c8184117c09a493ac8125fd6708b45d81337677c8259c91ed5cf44f0e5245c86530c654e014a5cf12565788bfda7b6fc91b WHIRLPOOL 462291bdd15161ff73eb5766b4ea8c0864c19e723e89af5352372c415c0d3ebaba498f8a7949cfaaf7baffcbaaf5d026ef1995928d8e96ca9527a7e869fa8ea2
 MISC metadata.xml 404 SHA256 e1fe0e6d0fe6d7b98c63919c22dde4903b30c897694ab4258d63b809a5c5133e SHA512 cac73072027c59e6e34a3eee8cb602d72601306e5f1d8d4b4214d12b900320f0f7cc7f4a8f0a6590e2f6286799d0f96d3edf5c14d85b4f586ae9ad1293138577 WHIRLPOOL 06889eab9879296359f90b4ffb237a19d03c32d17216a4b5ea375e9e205779f62ecdab7a144fd0e54b63dab5582ecbcc9e833db431d34f6ea3a46f27a576f14a
diff --git a/app-admin/radmind/files/radmind-1.14.1-glibc225.patch b/app-admin/radmind/files/radmind-1.14.1-glibc225.patch
new file mode 100644
index 000000000000..60ff5925ae11
--- /dev/null
+++ b/app-admin/radmind/files/radmind-1.14.1-glibc225.patch
@@ -0,0 +1,22 @@
+diff -ruN radmind-1.14.1.orig/transcript.c radmind-1.14.1/transcript.c
+--- radmind-1.14.1.orig/transcript.c	2010-12-13 04:42:49.000000000 +0100
++++ radmind-1.14.1/transcript.c	2017-10-20 23:07:47.126110238 +0200
+@@ -6,6 +6,7 @@
+ #include "config.h"
+ 
+ #include <sys/types.h>
++#include <sys/sysmacros.h>
+ #include <sys/param.h>
+ #ifdef sun
+ #include <sys/mkdev.h>
+diff -ruN radmind-1.14.1.orig/update.c radmind-1.14.1/update.c
+--- radmind-1.14.1.orig/update.c	2010-12-13 04:42:49.000000000 +0100
++++ radmind-1.14.1/update.c	2017-10-20 23:07:29.173898776 +0200
+@@ -6,6 +6,7 @@
+ #include "config.h"
+ 
+ #include <sys/types.h>
++#include <sys/sysmacros.h>
+ #include <sys/stat.h>
+ #include <sys/param.h>
+ #ifdef sun
diff --git a/app-admin/radmind/radmind-1.14.1-r1.ebuild b/app-admin/radmind/radmind-1.14.1-r1.ebuild
index cfc09f32cca2..2637e4c08285 100644
--- a/app-admin/radmind/radmind-1.14.1-r1.ebuild
+++ b/app-admin/radmind/radmind-1.14.1-r1.ebuild
@@ -24,6 +24,7 @@ src_prepare() {
 	# remove dnssd as it doesn't compile
 	epatch "${FILESDIR}"/${PN}-1.7.1-dnssd.patch
 	epatch "${FILESDIR}"/${PN}-1.14.0-parallel-make.patch
+	epatch "${FILESDIR}"/${PN}-1.14.1-glibc225.patch
 }
 
 src_install() {