diff --git a/Manifest.files.gz b/Manifest.files.gz
index 8a281c37c963..7bf13091feda 100644
Binary files a/Manifest.files.gz and b/Manifest.files.gz differ
diff --git a/acct-group/Manifest.gz b/acct-group/Manifest.gz
index 27654857fb59..0c3995fb3b1e 100644
Binary files a/acct-group/Manifest.gz and b/acct-group/Manifest.gz differ
diff --git a/acct-group/ttrssd/Manifest b/acct-group/ttrssd/Manifest
new file mode 100644
index 000000000000..e69de29bb2d1
diff --git a/acct-group/ttrssd/metadata.xml b/acct-group/ttrssd/metadata.xml
new file mode 100644
index 000000000000..3b94165dd3d1
--- /dev/null
+++ b/acct-group/ttrssd/metadata.xml
@@ -0,0 +1,8 @@
+
+
+
+
+ chewi@gentoo.org
+ James Le Cuirot
+
+
diff --git a/acct-group/ttrssd/ttrssd-0.ebuild b/acct-group/ttrssd/ttrssd-0.ebuild
new file mode 100644
index 000000000000..1d5fcc70b9ab
--- /dev/null
+++ b/acct-group/ttrssd/ttrssd-0.ebuild
@@ -0,0 +1,9 @@
+# Copyright 2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit acct-group
+
+DESCRIPTION="Group for www-apps/tt-rss"
+ACCT_GROUP_ID=386
diff --git a/acct-user/Manifest.gz b/acct-user/Manifest.gz
index ebcab8b6b00b..8ad3826f8a03 100644
Binary files a/acct-user/Manifest.gz and b/acct-user/Manifest.gz differ
diff --git a/acct-user/ttrssd/Manifest b/acct-user/ttrssd/Manifest
new file mode 100644
index 000000000000..e69de29bb2d1
diff --git a/acct-user/ttrssd/metadata.xml b/acct-user/ttrssd/metadata.xml
new file mode 100644
index 000000000000..3b94165dd3d1
--- /dev/null
+++ b/acct-user/ttrssd/metadata.xml
@@ -0,0 +1,8 @@
+
+
+
+
+ chewi@gentoo.org
+ James Le Cuirot
+
+
diff --git a/acct-user/ttrssd/ttrssd-0.ebuild b/acct-user/ttrssd/ttrssd-0.ebuild
new file mode 100644
index 000000000000..1d4f4efcaaf8
--- /dev/null
+++ b/acct-user/ttrssd/ttrssd-0.ebuild
@@ -0,0 +1,12 @@
+# Copyright 2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit acct-user
+
+DESCRIPTION="User for www-apps/tt-rss"
+ACCT_USER_ID=386
+ACCT_USER_GROUPS=( ttrssd )
+
+acct-user_add_deps
diff --git a/app-admin/Manifest.gz b/app-admin/Manifest.gz
index d72a7c5d803d..62adab86e1f7 100644
Binary files a/app-admin/Manifest.gz and b/app-admin/Manifest.gz differ
diff --git a/app-admin/checksec/Manifest b/app-admin/checksec/Manifest
index d3302aa86d78..05d882b6e18b 100644
--- a/app-admin/checksec/Manifest
+++ b/app-admin/checksec/Manifest
@@ -1,6 +1,4 @@
DIST checksec-1.11.1.tar.gz 198151 BLAKE2B 2b45834adb045dbf75a0ffab4f03b2640d068a48df20c628223bcf71c94300cf32ccbce8f47c6dd02b6dd9e12b924e4e7221b68eb781351ced52e09ce0cb3848 SHA512 dd742d6c9bc567b10f8d50f5edd2e1f3439b469ced46da05f53e14c0fe5c90310114564e674afc8c7f55170e07beb6359263e1fd153e4b29f3edb4e88cfbf8c0
-DIST checksec-1.7.5.tar.gz 51266 BLAKE2B a77e6d0bf52bc8a0ec18c0f1ffe883b68acccaaee6fd0d1714d456c31c3004b5d9279c3926885be168befba1dc7a75b1269dac5cb5847c247470e765601f08e6 SHA512 7269fb3628907f6fe4e8b720d2dcbd5bf8586e1821bd758533dff6255c6a52be9146b58f60abea798ee92471c3d5ad9e867fa7ad4b8e5ea2d8aa03d5a3b83098
-DIST checksec-1.8.0.tar.gz 52391 BLAKE2B 3720e4faae5aa82172c673ce7ddc662db1433b82d25f25be4c219f1664da8af687d2a5ee9c05703e9f151a998be9226e896e125b7cff05d3881e61e8a9f5c918 SHA512 0236e40ba8b4f7c13ebd3b51f22dd05e6c4442e8646b5a1ee814556d9a6ca19f9bae638af33a6bfec2f8ef95567d222a20dcdcd9eae6ffb7ea5261919f020283
DIST checksec-1.9.0.tar.gz 196168 BLAKE2B f9095a516f166e9a407c9796e28ed7da4ffd97686923745e46b0ab4110f084690781995b6cc190234b8a26fe1e6eb2c8f32f7f15191f0dbc26b38048c87e9a2d SHA512 8bf68dd0b86a6eceb6f5eb016a15ed1bf7d086777c3ec1c62848ec23e62dceed4579404d76824f17b8e1305e679ba6204f0dc4c224f7a11067651f33c2d96515
DIST checksec-2.0.1.tar.gz 199903 BLAKE2B 726d3f868cc73649f7a3cd42270ab1c6965d6bed772f3c612064c54dad569e748f5a2d24df2b8663328442ba8126fe0edac04b0034ba6a23bf6e32ca93a78e30 SHA512 b2466b621b6ddb3fa01cfc5eb3dc301d6d616b26ddd2017a622ba2a24e9daf8f5e294236d1dda695fd9ab25fa411724b5f7dbdabc944cdc124e4369c176f35b4
DIST checksec-2.1.0.tar.gz 200384 BLAKE2B 6e954f574c632da1aee629aecd7ded6286879ba6156252c3d4b5d11f52e3c457bb1d9223934c70f402aaa1e8a8f8d530b55c7f860c024c86c2c2bbcbe9216646 SHA512 66090777de15c492090da3494127037ffe20a169b426b054b3a8f642e9c980b2a99d5c8f8411715d74b1faed41023fb17770d3f07eec5b9efda0a43b64c07a74
diff --git a/app-admin/checksec/checksec-1.7.5.ebuild b/app-admin/checksec/checksec-1.7.5.ebuild
deleted file mode 100644
index da34dcf8e557..000000000000
--- a/app-admin/checksec/checksec-1.7.5.ebuild
+++ /dev/null
@@ -1,36 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="5"
-
-inherit eutils
-
-MY_PN=${PN}.sh
-DESCRIPTION="Tool to check properties of executables (e.g. ASLR/PIE, RELRO, PaX, Canaries)"
-HOMEPAGE="https://github.com/slimm609/checksec.sh"
-SRC_URI="https://github.com/slimm609/${MY_PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="amd64 ~mips ~ppc ~ppc64 x86"
-IUSE=""
-
-S="${WORKDIR}"/${MY_PN}-${PV}
-
-DOCS=( ChangeLog README.md )
-
-src_prepare() {
- epatch "${FILESDIR}"/${PN}-1.7.2-path.patch
- sed 's,^pkg_release=false,pkg_release=true,' -i ${PN} || die
-}
-
-src_install() {
- default
-
- doman extras/man/*
-
- insinto /usr/share/zsh/site-functions
- doins extras/zsh/_${PN}
-
- dobin ${PN}
-}
diff --git a/app-admin/checksec/checksec-1.8.0.ebuild b/app-admin/checksec/checksec-1.8.0.ebuild
deleted file mode 100644
index eb85bc06b860..000000000000
--- a/app-admin/checksec/checksec-1.8.0.ebuild
+++ /dev/null
@@ -1,36 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="5"
-
-inherit eutils
-
-MY_PN=${PN}.sh
-DESCRIPTION="Tool to check properties of executables (e.g. ASLR/PIE, RELRO, PaX, Canaries)"
-HOMEPAGE="https://github.com/slimm609/checksec.sh"
-SRC_URI="https://github.com/slimm609/${MY_PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~amd64 ~mips ~ppc ~ppc64 ~x86"
-IUSE=""
-
-S="${WORKDIR}"/${MY_PN}-${PV}
-
-DOCS=( ChangeLog README.md )
-
-src_prepare() {
- epatch "${FILESDIR}"/${PN}-1.7.2-path.patch
- sed 's,^pkg_release=false,pkg_release=true,' -i ${PN} || die
-}
-
-src_install() {
- default
-
- doman extras/man/*
-
- insinto /usr/share/zsh/site-functions
- doins extras/zsh/_${PN}
-
- dobin ${PN}
-}
diff --git a/app-admin/cpulimit/Manifest b/app-admin/cpulimit/Manifest
index f09ac68d8032..a4a54c346ec9 100644
--- a/app-admin/cpulimit/Manifest
+++ b/app-admin/cpulimit/Manifest
@@ -1,3 +1 @@
-DIST cpulimit-1.8.tar.gz 20610 BLAKE2B 4b80322b035d79267a97a491e51b2ae82488c59f4383e2dbf87d178a4a69d03a4d1aa653eccd8d801fac48e95c2f0780bd46881f4d38626b3c28b73f0a53bd71 SHA512 3098236139b092eb706ec2a6b84528a090b3f4b8b3adfc8debda1b92ffa119ed9adc508898e0f98add593561f5f6b67d52e0966de01a682a6e2e885e3c47b0fa
-DIST cpulimit-2.2.tar.gz 22224 BLAKE2B e59e65c0bd38ff93b2daaef6858c46cc99b8a1345e5a6dc66b871b1b1c7930557b6d6607d9b61e0538195aaf5fc8eda42edacda38a2f729aa56eb582bb9343a7 SHA512 e708b27e969024ed37689341d76979e5041c050c259359c46f988cfc55f571c16c17f48ca63cd93349041b76bb2c314ab69af36634fec5212e49aa0d0cb0a46e
DIST cpulimit-2.4.tar.gz 24669 BLAKE2B e0fe0d6766e76e6e2a68dcdc553039400233daabbb14ce4a9dae46a7b694d2ecd660f4c1d13f417a74b12365c719780c732a03bd91c6384d1e7118d0fce521fb SHA512 008dc3fbdcbd8afd875a2a1ce03d609db595c6e110803140c676d3713ea60f4877a1bb8e7aa0e8b669dce31522ad81e2703f616341a0f4cbc69a6b01865b66d0
diff --git a/app-admin/cpulimit/cpulimit-1.8.ebuild b/app-admin/cpulimit/cpulimit-1.8.ebuild
deleted file mode 100644
index bdc78ff5f3f2..000000000000
--- a/app-admin/cpulimit/cpulimit-1.8.ebuild
+++ /dev/null
@@ -1,29 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-inherit toolchain-funcs
-
-DESCRIPTION="Limits the CPU usage of a process"
-HOMEPAGE="http://cpulimit.sourceforge.net"
-SRC_URI="mirror://sourceforge/limitcpu/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 ~ppc x86"
-IUSE=""
-
-DEPEND=""
-RDEPEND=""
-
-src_prepare() {
- tc-export CC
- # set correct VERSION
- sed -i -e '/^#define VERSION/s/1.7/1.8/' cpulimit.c || die 'sed on VERSION string failed'
-}
-
-src_install() {
- dosbin ${PN}
- doman "${FILESDIR}/${PN}.8"
-}
diff --git a/app-admin/cpulimit/cpulimit-2.2.ebuild b/app-admin/cpulimit/cpulimit-2.2.ebuild
deleted file mode 100644
index 8df40c18cf64..000000000000
--- a/app-admin/cpulimit/cpulimit-2.2.ebuild
+++ /dev/null
@@ -1,29 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-inherit toolchain-funcs
-
-DESCRIPTION="Limits the CPU usage of a process"
-HOMEPAGE="http://cpulimit.sourceforge.net"
-SRC_URI="mirror://sourceforge/limitcpu/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~ppc ~x86"
-IUSE=""
-
-DEPEND=""
-RDEPEND=""
-
-src_prepare() {
- tc-export CC
- # set correct VERSION
- sed -i -e "/^#define VERSION/s@[[:digit:]\.]\+\$@${PV}@" cpulimit.c || die 'sed on VERSION string failed'
-}
-
-src_install() {
- dosbin ${PN}
- doman "${FILESDIR}/${PN}.8"
-}
diff --git a/app-admin/eclean-kernel/Manifest b/app-admin/eclean-kernel/Manifest
index 808940394d7b..ebc1541621bf 100644
--- a/app-admin/eclean-kernel/Manifest
+++ b/app-admin/eclean-kernel/Manifest
@@ -1,3 +1,4 @@
DIST eclean-kernel-0.4.3.tar.gz 10650 BLAKE2B 228d17cfc5bed34e892dd6340498b87cbc32f22e83aff70824ef24f88836e3ad2306eda8704e25b7cfbadb33984edee8effd613dad67ada25519c601ec6b6ec7 SHA512 a2ffbfe800672ad0cd105425497dae72c0779ec9da5ba6a6b4efd8846762467acf6b8e70c67744e7c7639d5ba2ba4643ad344aae193e72d12d12f48b1793ff4c
DIST eclean-kernel-1.99.4.tar.bz2 78909 BLAKE2B 0cac3a001c3180c57bdf9a63366d9950928690328fd560f984c1d35bcf88712e897462a153bc3f0250ebbbb42518798e3407c3533351543ff32bd68ecee2ee5e SHA512 f3263b83b36878104e21fe122eb96a16c5c5a930b062fdd62d6a574db597644222d5a19d7833cbb894a955076b06bcb1a22c94d5f87c2787420dd1de32d0f789
DIST eclean-kernel-2.99.1.tar.gz 18608 BLAKE2B 3573df9b90e35fb9ac9ee4f5522daae5e9287ecd8cf612a3b984d2db663bc692e0a0eb05dcbc8ada63c69d43c821a55be11ccc3167a8a0e88f261d86dff173b5 SHA512 a9d6ccd6b5fe75f25fdd00f4cee3fe1d1c8be950958a2a28941a634e119a1715471ef129c20e077cc21e3a3925f2b8584b901265183fe75ff18e42d43ca52e14
+DIST eclean-kernel-2.99.2.tar.gz 18743 BLAKE2B 493a3f54e92821c76dde0228b382dbca0f9e9d69543e0af2269bdcfb736ef7450179d804f1a97b9e7700d812110c5f32b2667724f7c60e3377a8384e557b2f5c SHA512 48bb628be93922698483208471ec76b47615e80b5a7dead108d4f938664c72b080aa3f54f67056ce4b661ef92fff74f93ef842da1e177225793d13f8a3e16032
diff --git a/app-admin/eclean-kernel/eclean-kernel-2.99.2.ebuild b/app-admin/eclean-kernel/eclean-kernel-2.99.2.ebuild
new file mode 100644
index 000000000000..80c233f40feb
--- /dev/null
+++ b/app-admin/eclean-kernel/eclean-kernel-2.99.2.ebuild
@@ -0,0 +1,22 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+DISTUTILS_USE_SETUPTOOLS=rdepend
+PYTHON_COMPAT=( python3_{6,7,8} )
+
+inherit distutils-r1
+
+DESCRIPTION="Remove outdated built kernels"
+HOMEPAGE="https://github.com/mgorny/eclean-kernel/"
+SRC_URI="https://github.com/mgorny/eclean-kernel/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+RDEPEND="kernel_linux? ( dev-python/pymountboot[${PYTHON_USEDEP}] )"
+
+distutils_enable_tests pytest
diff --git a/app-admin/exo/Manifest b/app-admin/exo/Manifest
index 7ebd9c99ee26..ac797edb64c1 100644
--- a/app-admin/exo/Manifest
+++ b/app-admin/exo/Manifest
@@ -1 +1 @@
-DIST exo-1.17.0.tar.gz 4399134 BLAKE2B d065cdbe698792afe19e1058c3e0e6c112c8ed66a0fdab8b182918022cc10cf51d4d1eb8eff42c2ff27250cbde56b627110f9b581e73d7ccbe32746081bf6de7 SHA512 2a60c80c87d9ca33dc3708c4c60b6219431751a522a9e5869fe255c1c68247c0863e9f098cc85c4652ad1ffde08386634d5374c4ddb2c82828f201a37a214075
+DIST exo-1.18.0.tar.gz 4625622 BLAKE2B 618aec5cec7a41f06963d728c627f043f08ba39695691154118261a6fb71bac93cdb07b039e74e05a464227dca4da66c17c4c319553894f2d46af6203a36a038 SHA512 862dd138a6b6cbf9471206a07cf4447df113a77f44523e72e89a1f87362086fa168ded51d43c32408946b8cf2d6cb9668ff29818494a2eb6d94b0ef7d3bf4420
diff --git a/app-admin/exo/exo-1.17.0.ebuild b/app-admin/exo/exo-1.18.0.ebuild
similarity index 100%
rename from app-admin/exo/exo-1.17.0.ebuild
rename to app-admin/exo/exo-1.18.0.ebuild
diff --git a/app-admin/github-backup-utils/Manifest b/app-admin/github-backup-utils/Manifest
index 219c3244fcb0..cb426f0eeaf0 100644
--- a/app-admin/github-backup-utils/Manifest
+++ b/app-admin/github-backup-utils/Manifest
@@ -13,3 +13,4 @@ DIST github-backup-utils-2.18.0.tar.gz 90357 BLAKE2B e9f6c155246914a36d26ec8cddf
DIST github-backup-utils-2.19.1.tar.gz 90260 BLAKE2B 403feca60cc6037a2fbcb4cc467520fb3283916fdc78e16e960656b695e1c55341c55e74fe246c56fbc2cd86a85e33bcede4d94132adaa446ea48ed8f3f75022 SHA512 60155021d23eadc5ab1ddcadf95dbab43f19456c0e7ef34e93c75d173c1279b354c7019b304d72cabcac674edbd0c4a0c4e50c08606a8559ea662858a9cdb206
DIST github-backup-utils-2.20.2.tar.gz 92628 BLAKE2B a6c9fb91b005d20b15ce0b2fc289a145bbfd8316aca4511300cda8a9f1b1e52afb9619a9f467e6e87eec673244776a0bf469d0d4a4c608af0f462eae7a06dc44 SHA512 0d2c56fd2e98c8f858cf3a03e2c2d84c20555716d015cdf1f0a789171cb6ea301050a41d1314a15316258f3f159123ba21526c1fd69cba548e8f259c70a92ab9
DIST github-backup-utils-2.21.0.tar.gz 89907 BLAKE2B 4261d127a73bc4701521f6c5078444c38b3d97ac4ab883f644e02057090b8a53b6c86849b988175416b6fb0566327b9938f28887417fef109dd59c1b246cf961 SHA512 fc037d180ce6cb238d4613583a1551256ffbc58ec8276945905c0127fb6e29f7d547dfdcbec30bb581202ce0447365642218e18ed8865f01e76037898d0a5126
+DIST github-backup-utils-2.22.0.tar.gz 102576 BLAKE2B ce9007c8a5d2843ccc2b3d11b03c13840b89d6ae7906d63420cc0e18191766c92c91e1072723439610ae8bdfdd0174601d1e3b7211cd6a1c9a748f9f793ff760 SHA512 e77b4afc6f90b16caf61dc4313787dab0751590b4819dca2d7e21acd0ca774d19ea359171b76f2892ca0fb4f86fd4240e77b00e107de79d496fea429fb12cee8
diff --git a/app-admin/github-backup-utils/github-backup-utils-2.22.0.ebuild b/app-admin/github-backup-utils/github-backup-utils-2.22.0.ebuild
new file mode 100644
index 000000000000..cdc41c6dad52
--- /dev/null
+++ b/app-admin/github-backup-utils/github-backup-utils-2.22.0.ebuild
@@ -0,0 +1,56 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+# Python3 support: https://github.com/github/backup-utils/pull/627
+PYTHON_COMPAT=(python3_{6,7,8})
+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"
+RESTRICT="!test? ( test )"
+
+# moreutils parallel is now used for speedups in main code:
+# https://github.com/github/backup-utils/pull/635
+RDEPEND="net-misc/rsync
+ sys-apps/moreutils"
+
+# tests invoke parallel & rsync
+DEPEND="test? (
+ ${RDEPEND}
+ dev-util/checkbashisms
+ ${PYTHON_DEPS}
+)"
+
+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
+
+ dodoc -r docs/*
+}
+
+src_test() {
+ emake test
+}
diff --git a/app-admin/haskell-updater/Manifest b/app-admin/haskell-updater/Manifest
index c58992135177..37eaa83ea1fd 100644
--- a/app-admin/haskell-updater/Manifest
+++ b/app-admin/haskell-updater/Manifest
@@ -1,5 +1,3 @@
-DIST haskell-updater-1.2.10.tar.gz 26586 BLAKE2B adc46f85118fa55e530aa079ef2df0663b178b15311f4f2ff6474db75aacf1277238a27a2bb98841fc1fe50b556d7f01a677861b3ce9559fe809a02db401ef8d SHA512 c0a72ae77362e5ed4ea0e244449175454119b1284756adeb43534bf58b661f3cabb88e08bd5903d415a9f95a6de309753dedf974ddd853b300fd215250e0ad7c
DIST haskell-updater-1.2.12.tar.gz 26708 BLAKE2B d0b040cb3b6211b3c5c60f8cfa3dbccbf9cb15d246b21609a21aac746a8a034e284fe0b99891b5035980252a7aa8b376ad943f32882dc29e16226d95583cb053 SHA512 f3a993cb556919bf2e57fdaca7eea9146abc59096e779cbffb69a5c29fc5f6ef889c8ccf4d8331dbd9279919ea91bb05a16d83ad70085d5ef5a44d61120fe7e7
-DIST haskell-updater-1.2.9.tar.gz 26675 BLAKE2B a3d11cdcee886a07d87cd2888a9deea1d963b7234b4a10a6b78e9467fae4e9382c92f14a6ba0593f86bf9422ab2cb4bec823de96f34b463590ae18429c118edb SHA512 d19b6154d5ef4da176638c237082586688e2ac73a41c075fc3e51979b86b9e48ca5a9bfe6c870d468d66d95c1464456feed8afc388aea282aa7aad5a35f5e0da
DIST haskell-updater-1.3.1.tar.gz 26573 BLAKE2B 68e5357e8f24b9b372dba4feac76595cbf35602d9d9094d616497c9d0040177b5f1def5833770041b693220717f3a4976877e0608858d5d8d4dddd26620c71e5 SHA512 39c36c4a8997806bb4d64625bc9ed72334a68e57f8c32f75d0c3704ab52b3b68605444c89480e5186c04bb275b3608ea9544366ebc5a00e010cc5fb4ae8296df
DIST haskell-updater-1.3.2.tar.gz 26133 BLAKE2B ea72850e5ca35ec18fa00136c654435a852b072aea0402003c962abbb0e0f09e8a84568f78c9186324b0b0ee9658de1b413670e268cfe1c0056810b8c61b479c SHA512 a4d80ecb65efa9ae21008e04b1363ff2196df4ba431fc5ec899bb9904c598c7a109a38f7dd86dd2dc86faca8ed5083d036d700e7f7796840ee5470401c24f3d9
diff --git a/app-admin/haskell-updater/haskell-updater-1.2.10.ebuild b/app-admin/haskell-updater/haskell-updater-1.2.10.ebuild
deleted file mode 100644
index 83ccef6f2133..000000000000
--- a/app-admin/haskell-updater/haskell-updater-1.2.10.ebuild
+++ /dev/null
@@ -1,44 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-CABAL_FEATURES="bin nocabaldep"
-inherit eutils haskell-cabal
-
-DESCRIPTION="Rebuild Haskell dependencies in Gentoo"
-HOMEPAGE="https://wiki.haskell.org/Gentoo#haskell-updater"
-SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86 ~amd64-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x86-solaris"
-IUSE=""
-
-DEPEND=">=dev-lang/ghc-6.12.1"
-
-# Need a lower version for portage to get --keep-going
-RDEPEND="|| ( >=sys-apps/portage-2.1.6
- sys-apps/pkgcore )"
-
-src_prepare() {
- if use prefix; then
- sed -i -e "s,/var/db/pkg,${EPREFIX}&,g" \
- "${S}/Distribution/Gentoo/Packages.hs" || die
-
- sed -i -e 's,"/","'"${EPREFIX}"'/",g' \
- "${S}/Distribution/Gentoo/GHC.hs" || die
- fi
-}
-
-src_configure() {
- cabal_src_configure \
- --bindir="${EPREFIX}/usr/sbin" \
- --constraint="Cabal == $(cabal-version)"
-}
-
-src_install() {
- cabal_src_install
-
- dodoc TODO
-}
diff --git a/app-admin/haskell-updater/haskell-updater-1.2.9.ebuild b/app-admin/haskell-updater/haskell-updater-1.2.9.ebuild
deleted file mode 100644
index 83ccef6f2133..000000000000
--- a/app-admin/haskell-updater/haskell-updater-1.2.9.ebuild
+++ /dev/null
@@ -1,44 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-CABAL_FEATURES="bin nocabaldep"
-inherit eutils haskell-cabal
-
-DESCRIPTION="Rebuild Haskell dependencies in Gentoo"
-HOMEPAGE="https://wiki.haskell.org/Gentoo#haskell-updater"
-SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86 ~amd64-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x86-solaris"
-IUSE=""
-
-DEPEND=">=dev-lang/ghc-6.12.1"
-
-# Need a lower version for portage to get --keep-going
-RDEPEND="|| ( >=sys-apps/portage-2.1.6
- sys-apps/pkgcore )"
-
-src_prepare() {
- if use prefix; then
- sed -i -e "s,/var/db/pkg,${EPREFIX}&,g" \
- "${S}/Distribution/Gentoo/Packages.hs" || die
-
- sed -i -e 's,"/","'"${EPREFIX}"'/",g' \
- "${S}/Distribution/Gentoo/GHC.hs" || die
- fi
-}
-
-src_configure() {
- cabal_src_configure \
- --bindir="${EPREFIX}/usr/sbin" \
- --constraint="Cabal == $(cabal-version)"
-}
-
-src_install() {
- cabal_src_install
-
- dodoc TODO
-}
diff --git a/app-admin/kpcli/kpcli-3.5.ebuild b/app-admin/kpcli/kpcli-3.5.ebuild
index 75d31939498b..73dabd93e84a 100644
--- a/app-admin/kpcli/kpcli-3.5.ebuild
+++ b/app-admin/kpcli/kpcli-3.5.ebuild
@@ -35,7 +35,9 @@ src_install() {
}
pkg_postinst() {
- # Not packaged in Gentoo yet, but we'd be interested in:
- # Data::Password, Data::Password::passwdqc, Crypt::PWSafe3, (Authen::OATH (& Convert::Base32)).
+ optfeature "time-based-one-time-only password support" "dev-perl/Authen-OATH dev-perl/Convert-Base32"
optfeature "X clipboard support" "dev-perl/Capture-Tiny dev-perl/Clipboard"
+ optfeature "password quality check" dev-perl/Data-Password
+ optfeature "better password quality check" dev-perl/Data-Password-passwdqc
+ optfeature "importing Password Safe v3 databases" dev-perl/Crypt-PWSafe3
}
diff --git a/app-admin/mcelog/Manifest b/app-admin/mcelog/Manifest
index 73f1a4893ad7..1b36f6d36380 100644
--- a/app-admin/mcelog/Manifest
+++ b/app-admin/mcelog/Manifest
@@ -1,2 +1,3 @@
DIST mcelog-170.tar.gz 312911 BLAKE2B bab27c60fca937442a0f07929eaedd392c3e8de3e5f705f717d787652b6c0fa91e42169b835ea2527729c487773c7baabfceeebd3fd58d64a853ff17d8fdd8a8 SHA512 f5d29bde88cd3925c0e629850adce7f1040ecc4703c45427424f5d56f28a0add1fb24538e5c4e0749743c92479d3ea6da583c23bb41eb6a8d899626d818cb6a4
DIST mcelog-172.tar.gz 313103 BLAKE2B f3acf5a5ebd1db92f7cddfa0e8a848bd6fbd361932ae52400c26f5aeaf7727f6dfd278ab7c1282229d9208474add124401a4665a4febe0debffad7818bcf6223 SHA512 adfde12b9f6f21ec6276c55d3554a3cdbf156e44df2f85c28d9d608418fa57b3f4a0bfcbacd13e92b77eddc1efdaeacfe3c89d203b8cbd3757f35fe419806547
+DIST mcelog-173.tar.gz 313098 BLAKE2B f9ddcd85294bdcb1d9e8e888040af94e5e17f4902efb47788b69737bb3408e59014481f822ea083947725f75b7db21250f4c645e7b409a6c23ce7a9ce3708a62 SHA512 fd83828d19f889e3cbb2ffda8fca95f3097644161bfe2ede1fd7600718fa56d343cd985b831eb643dc613a453730e07847de0f05fb14b4a03a8dcd73281199e8
diff --git a/app-admin/mcelog/mcelog-173.ebuild b/app-admin/mcelog/mcelog-173.ebuild
new file mode 100644
index 000000000000..e0b67a2d755e
--- /dev/null
+++ b/app-admin/mcelog/mcelog-173.ebuild
@@ -0,0 +1,58 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit linux-info systemd toolchain-funcs
+
+DESCRIPTION="A tool to log and decode Machine Check Exceptions"
+HOMEPAGE="http://mcelog.org/"
+SRC_URI="https://github.com/andikleen/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="selinux"
+
+RDEPEND="selinux? ( sec-policy/selinux-mcelog )"
+
+# TODO: add mce-inject to the tree to support test phase
+RESTRICT="test"
+
+pkg_pretend() {
+ if [[ ${MERGE_TYPE} != buildonly ]]; then
+ local CONFIG_CHECK="~X86_MCE"
+ kernel_is -ge 4 12 && CONFIG_CHECK+=" ~X86_MCELOG_LEGACY"
+ check_extra_config
+ fi
+}
+
+src_prepare() {
+ eapply "${FILESDIR}"/${PN}-0.8_pre1-timestamp-${PN}.patch \
+ "${FILESDIR}"/${PN}-129-debugflags.patch
+ eapply_user
+ tc-export CC
+}
+
+src_install() {
+ default
+
+ insinto /etc/cron.daily
+ newins ${PN}.cron ${PN}
+
+ insinto /etc/logrotate.d/
+ newins ${PN}.logrotate ${PN}
+
+ newinitd "${FILESDIR}"/${PN}.init-r1 ${PN}
+ systemd_dounit "${FILESDIR}"/${PN}.service
+
+ dodoc *.pdf
+}
+
+pkg_postinst() {
+ einfo "The default configuration set is now installed in /etc/${PN}"
+ einfo "you might want to edit those files."
+ einfo
+ einfo "A sample cronjob is installed into /etc/cron.daily"
+ einfo "without executable bit (system service is the preferred method now)"
+}
diff --git a/app-admin/sagan/Manifest b/app-admin/sagan/Manifest
index 3a24e7e63020..2d3c7adb1a1b 100644
--- a/app-admin/sagan/Manifest
+++ b/app-admin/sagan/Manifest
@@ -1,2 +1 @@
-DIST sagan-0.2.3.tar.gz 231774 BLAKE2B b385a4b22f2fe7567dbb0c52ec022794eacf057a0dc797daa0432ef4bdfc344473a500298825f56a32513025e9c7cee3ff70fc577d7a9454e87022510a71edb4 SHA512 2110f3d34db69cb5c453b8e37d06debeea7531ebf15a9b78954ac1657ddce34feaaff87d14695759c3deb2eed5ecc0e6fec5881fb5037af8efa6c3c9600242cc
DIST sagan-1.0.0RC3.tar.gz 285207 BLAKE2B 7322ffc73a8e86f07ef106b04feb9140ba94a51b9e286ef0c0b0d3fa609e8e03cef4c75e1d32502c1b70a4c078d8601d2a1c58058137bb793c8a52cecc4be20b SHA512 29388a339b290bb4de2359c0c54b9e1d43ef207b223a499a1a4faa36de4d9590a777a796dd773948e995d052b71f3ef47ca5bad5c133116c4dbb53b4fe336123
diff --git a/app-admin/sagan/sagan-0.2.3-r1.ebuild b/app-admin/sagan/sagan-0.2.3-r1.ebuild
deleted file mode 100644
index 99142b741816..000000000000
--- a/app-admin/sagan/sagan-0.2.3-r1.ebuild
+++ /dev/null
@@ -1,85 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-AUTOTOOLS_AUTORECONF=1
-AUTOTOOLS_IN_SOURCE_BUILD=1
-
-inherit eutils autotools-utils user
-
-DESCRIPTION="Sagan is a multi-threaded, real time system and event log monitoring system"
-HOMEPAGE="http://sagan.quadrantsec.com/"
-SRC_URI="http://sagan.quadrantsec.com/download/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="+libdnet +lognorm mysql +pcap postgres smtp snort"
-
-RDEPEND="dev-libs/libpcre
- app-admin/sagan-rules[lognorm?]
- smtp? ( net-libs/libesmtp )
- pcap? ( net-libs/libpcap )
- mysql? ( dev-db/mysql-connector-c:= )
- postgres? ( dev-db/postgresql:* )
- lognorm? ( dev-libs/liblognorm )
- libdnet? ( dev-libs/libdnet )
- snort? ( >=net-analyzer/snortsam-2.50 )
- "
-
-DEPEND="virtual/pkgconfig
- ${RDEPEND}"
-
-DOCS=( AUTHORS ChangeLog FAQ INSTALL README NEWS TODO )
-PATCHES=( "${FILESDIR}"/mysql_check.patch )
-
-pkg_setup() {
- enewgroup sagan
- enewuser sagan -1 -1 /dev/null sagan
-}
-
-src_configure() {
- local myeconfargs=(
- $(use_enable mysql)
- $(use_enable postgres postgresql)
- $(use_enable smtp esmtp)
- $(use_enable lognorm)
- $(use_enable libdnet)
- $(use_enable pcap libpcap)
- $(use_enable snort snortsam)
- --disable-prelude
- )
-
- autotools-utils_src_configure
-}
-
-src_install() {
- autotools-utils_src_install
-
- diropts -g sagan -o sagan -m 775
-
- dodir /var/log/sagan
-
- keepdir /var/log/sagan
-
- touch "${ED}"/var/log/sagan/sagan.log
- chown sagan.sagan "${ED}"/var/log/sagan/sagan.log
-
- newinitd "${FILESDIR}"/sagan.init sagan
- newconfd "${FILESDIR}"/sagan.confd sagan
-
- insinto /usr/share/doc/${PF}/examples
- doins -r extra/*
-}
-
-pkg_postinst() {
- if use smtp; then
- ewarn "You have enabled smtp use flag. If you plan on using Sagan with"
- ewarn "email, create valid writable home directory for user 'sagan'"
- ewarn "For security reasons it was created with /dev/null home directory"
- fi
-
- einfo "For configuration assistance see"
- einfo "http://wiki.quadrantsec.com/bin/view/Main/SaganHOWTO"
-}
diff --git a/app-admin/sagan/sagan-0.2.3.ebuild b/app-admin/sagan/sagan-0.2.3.ebuild
deleted file mode 100644
index 64c6a49c8ba3..000000000000
--- a/app-admin/sagan/sagan-0.2.3.ebuild
+++ /dev/null
@@ -1,85 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-AUTOTOOLS_AUTORECONF=1
-AUTOTOOLS_IN_SOURCE_BUILD=1
-
-inherit eutils autotools-utils user
-
-DESCRIPTION="Sagan is a multi-threaded, real time system and event log monitoring system"
-HOMEPAGE="http://sagan.quadrantsec.com/"
-SRC_URI="http://sagan.quadrantsec.com/download/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE="+libdnet +lognorm mysql +pcap postgres smtp snort"
-
-RDEPEND="dev-libs/libpcre
- app-admin/sagan-rules[lognorm?]
- smtp? ( net-libs/libesmtp )
- pcap? ( net-libs/libpcap )
- mysql? ( virtual/mysql )
- postgres? ( dev-db/postgresql:* )
- lognorm? ( dev-libs/liblognorm )
- libdnet? ( dev-libs/libdnet )
- snort? ( >=net-analyzer/snortsam-2.50 )
- "
-
-DEPEND="virtual/pkgconfig
- ${RDEPEND}"
-
-DOCS=( AUTHORS ChangeLog FAQ INSTALL README NEWS TODO )
-PATCHES=( "${FILESDIR}"/mysql_check.patch )
-
-pkg_setup() {
- enewgroup sagan
- enewuser sagan -1 -1 /dev/null sagan
-}
-
-src_configure() {
- local myeconfargs=(
- $(use_enable mysql)
- $(use_enable postgres postgresql)
- $(use_enable smtp esmtp)
- $(use_enable lognorm)
- $(use_enable libdnet)
- $(use_enable pcap libpcap)
- $(use_enable snort snortsam)
- --disable-prelude
- )
-
- autotools-utils_src_configure
-}
-
-src_install() {
- autotools-utils_src_install
-
- diropts -g sagan -o sagan -m 775
-
- dodir /var/log/sagan
-
- keepdir /var/log/sagan
-
- touch "${ED}"/var/log/sagan/sagan.log
- chown sagan.sagan "${ED}"/var/log/sagan/sagan.log
-
- newinitd "${FILESDIR}"/sagan.init sagan
- newconfd "${FILESDIR}"/sagan.confd sagan
-
- insinto /usr/share/doc/${PF}/examples
- doins -r extra/*
-}
-
-pkg_postinst() {
- if use smtp; then
- ewarn "You have enabled smtp use flag. If you plan on using Sagan with"
- ewarn "email, create valid writable home directory for user 'sagan'"
- ewarn "For security reasons it was created with /dev/null home directory"
- fi
-
- einfo "For configuration assistance see"
- einfo "http://wiki.quadrantsec.com/bin/view/Main/SaganHOWTO"
-}
diff --git a/app-admin/sudo/Manifest b/app-admin/sudo/Manifest
index ce7804e414cc..c2e61bee9440 100644
--- a/app-admin/sudo/Manifest
+++ b/app-admin/sudo/Manifest
@@ -1,2 +1,2 @@
DIST sudo-1.9.2.tar.gz 3890859 BLAKE2B 879917b8045c999a17ef36006732509aa546ee6bb04de77191fb637aa0420d54f9e51ec69b697c22119d638393e9c84efcc1ca5e6e8ee5f0c08bb1ca07f3acea SHA512 20afdf2604b1c93395157382b24f225cd1ff88d3a892362e2d69fecd240c4e7171f05032c08be1778cd1dea6e460025e4241f57272fac0ea3550e220b6d73d21
-DIST sudo-1.9.3rc1.tar.gz 3958021 BLAKE2B 432c6a2c12d04f4acc069dd23dbc08f2238c904be607fde231865ac4b4577d2d2d3c8dd5525c393a55dfa0a7dbf1bef954dfbdc4e1dcff8418a4e155c0bbbdd3 SHA512 0db4d2d659853494244b52a3884e7e9247545fb4ea43525d763b31bfa6bdb87fff3aa1c1514d7f5e5155d7cd593d45d71e384261a6a91e36f5cd7ea281686ebd
+DIST sudo-1.9.3p1.tar.gz 3958071 BLAKE2B b681c120faa5dc7f25e27c1be423d68cea70f63dcdfea2183fd386a34dec0376555453399d3f8886c66c6507343648d40b59a058710432154061b210df2a704c SHA512 3ad13fd03e5b371fd6bf7909731ffc11431d2182a744b654f7e5d4b810e47955d49bc78f551afe13ec56acbce694139c33a15bc022cea41b17af5496b8b7f89f
diff --git a/app-admin/sudo/sudo-1.9.3_rc1.ebuild b/app-admin/sudo/sudo-1.9.3_p1.ebuild
similarity index 100%
rename from app-admin/sudo/sudo-1.9.3_rc1.ebuild
rename to app-admin/sudo/sudo-1.9.3_p1.ebuild
diff --git a/app-admin/syslog-summary/syslog-summary-1.14-r1.ebuild b/app-admin/syslog-summary/syslog-summary-1.14-r1.ebuild
deleted file mode 100644
index 616c8e62c12f..000000000000
--- a/app-admin/syslog-summary/syslog-summary-1.14-r1.ebuild
+++ /dev/null
@@ -1,38 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-PYTHON_COMPAT=( python2_7 )
-
-inherit eutils python-single-r1
-
-DESCRIPTION="Summarizes the contents of a syslog log file"
-HOMEPAGE="https://github.com/dpaleino/syslog-summary"
-SRC_URI="https://github.com/downloads/dpaleino/${PN}/${P}.tar.gz"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="amd64 ~sparc x86"
-IUSE=""
-
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-
-DEPEND=""
-RDEPEND="${PYTHON_DEPS}"
-
-src_prepare() {
- python_fix_shebang -f syslog-summary
-
- # Sadly, the makefile is useless for us.
- rm Makefile || die
-}
-
-src_install() {
- dobin syslog-summary
- dodoc AUTHORS ChangeLog NEWS README
- doman syslog-summary.1
-
- insinto /etc/syslog-summary
- doins ignore.rules
-}
diff --git a/app-admin/syslog-summary/syslog-summary-1.14-r2.ebuild b/app-admin/syslog-summary/syslog-summary-1.14-r2.ebuild
deleted file mode 100644
index d6e65dce99c8..000000000000
--- a/app-admin/syslog-summary/syslog-summary-1.14-r2.ebuild
+++ /dev/null
@@ -1,47 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python2_7 )
-
-inherit python-single-r1
-
-DESCRIPTION="Summarizes the contents of a syslog log file"
-HOMEPAGE="https://github.com/dpaleino/syslog-summary"
-SRC_URI="https://github.com/downloads/dpaleino/${PN}/${P}.tar.gz"
-
-LICENSE="GPL-3+"
-SLOT="0"
-KEYWORDS="~amd64 ~sparc ~x86"
-IUSE=""
-
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-
-DEPEND=""
-RDEPEND="${PYTHON_DEPS}"
-
-src_prepare() {
- python_fix_shebang -f syslog-summary
-
- sed -i -e 's:python-magic:sys-apps/file[python]:' "syslog-summary" || die
-
- # Sadly, the makefile is useless for us.
- rm Makefile || die
-
- eapply_user
-}
-
-src_install() {
- dobin syslog-summary
- einstalldocs
- doman syslog-summary.1
-
- insinto /etc/syslog-summary
- doins ignore.rules
-}
-
-pkg_postinst() {
- elog "install sys-apps/file[python] to enable processing"
- elog "of gzip compressed logfiles"
-}
diff --git a/app-admin/syslog-summary/syslog-summary-1.14-r3.ebuild b/app-admin/syslog-summary/syslog-summary-1.14-r3.ebuild
deleted file mode 100644
index 75c1c04b2464..000000000000
--- a/app-admin/syslog-summary/syslog-summary-1.14-r3.ebuild
+++ /dev/null
@@ -1,49 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python2_7 )
-
-inherit python-single-r1
-
-DESCRIPTION="Summarizes the contents of a syslog log file"
-HOMEPAGE="https://github.com/dpaleino/syslog-summary"
-SRC_URI="https://github.com/downloads/dpaleino/${PN}/${P}.tar.gz"
-
-LICENSE="GPL-3+"
-SLOT="0"
-KEYWORDS="~amd64 ~sparc ~x86"
-IUSE=""
-
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-
-DEPEND=""
-RDEPEND="${PYTHON_DEPS}"
-
-PATCHES=( "${FILESDIR}/${P}-fix-ignore-code.patch" )
-
-src_prepare() {
- python_fix_shebang -f syslog-summary
-
- sed -i -e 's:python-magic:sys-apps/file[python]:' "syslog-summary" || die
-
- # Sadly, the makefile is useless for us.
- rm Makefile || die
-
- default
-}
-
-src_install() {
- dobin syslog-summary
- einstalldocs
- doman syslog-summary.1
-
- insinto /etc/syslog-summary
- doins ignore.rules
-}
-
-pkg_postinst() {
- elog "install sys-apps/file[python] to enable processing"
- elog "of gzip compressed logfiles"
-}
diff --git a/app-admin/syslog-summary/syslog-summary-1.14-r4.ebuild b/app-admin/syslog-summary/syslog-summary-1.14-r4.ebuild
deleted file mode 100644
index 1831eb914a2b..000000000000
--- a/app-admin/syslog-summary/syslog-summary-1.14-r4.ebuild
+++ /dev/null
@@ -1,42 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python2_7 )
-
-inherit python-single-r1
-
-DESCRIPTION="Summarizes the contents of a syslog log file"
-HOMEPAGE="https://github.com/dpaleino/syslog-summary"
-SRC_URI="https://github.com/downloads/dpaleino/${PN}/${P}.tar.gz"
-
-LICENSE="GPL-3+"
-SLOT="0"
-KEYWORDS="~amd64 ~sparc ~x86"
-IUSE=""
-
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-
-DEPEND=""
-RDEPEND="${PYTHON_DEPS}"
-
-PATCHES=( "${FILESDIR}/${P}-fix-ignore-code.patch" "${FILESDIR}/${P}-remove-file-magic.patch" )
-
-src_prepare() {
- python_fix_shebang -f syslog-summary
-
- # Sadly, the makefile is useless for us.
- rm Makefile || die
-
- default
-}
-
-src_install() {
- dobin syslog-summary
- einstalldocs
- doman syslog-summary.1
-
- insinto /etc/syslog-summary
- doins ignore.rules
-}
diff --git a/app-admin/syslog-summary/syslog-summary-1.14-r5.ebuild b/app-admin/syslog-summary/syslog-summary-1.14-r5.ebuild
index 4275cdaa85be..6a28fe832410 100644
--- a/app-admin/syslog-summary/syslog-summary-1.14-r5.ebuild
+++ b/app-admin/syslog-summary/syslog-summary-1.14-r5.ebuild
@@ -13,7 +13,7 @@ SRC_URI="https://github.com/downloads/dpaleino/${PN}/${P}.tar.gz"
LICENSE="GPL-3+"
SLOT="0"
-KEYWORDS="~amd64 ~sparc x86"
+KEYWORDS="amd64 ~sparc x86"
IUSE=""
REQUIRED_USE="${PYTHON_REQUIRED_USE}"
diff --git a/app-antivirus/Manifest.gz b/app-antivirus/Manifest.gz
index bef60e9a902c..25027521ac9a 100644
Binary files a/app-antivirus/Manifest.gz and b/app-antivirus/Manifest.gz differ
diff --git a/app-antivirus/clamav/clamav-0.103.0.ebuild b/app-antivirus/clamav/clamav-0.103.0-r1.ebuild
similarity index 86%
rename from app-antivirus/clamav/clamav-0.103.0.ebuild
rename to app-antivirus/clamav/clamav-0.103.0-r1.ebuild
index 16a7129ce1b4..4217bc62b775 100644
--- a/app-antivirus/clamav/clamav-0.103.0.ebuild
+++ b/app-antivirus/clamav/clamav-0.103.0-r1.ebuild
@@ -3,7 +3,7 @@
EAPI=7
-inherit autotools flag-o-matic systemd
+inherit autotools flag-o-matic systemd tmpfiles
DESCRIPTION="Clam Anti-Virus Scanner"
HOMEPAGE="https://www.clamav.net/"
@@ -12,7 +12,7 @@ SRC_URI="https://www.clamav.net/downloads/production/${P}.tar.gz"
LICENSE="GPL-2"
SLOT="0"
KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~sparc-solaris ~x86-solaris"
-IUSE="bzip2 doc clamonacc clamdtop clamsubmit iconv ipv6 libclamav-only libressl milter metadata-analysis-api selinux test uclibc xml"
+IUSE="bzip2 doc clamonacc clamdtop clamsubmit iconv ipv6 libclamav-only libressl milter metadata-analysis-api selinux systemd test uclibc xml"
REQUIRED_USE="libclamav-only? ( !clamonacc !clamdtop !clamsubmit !milter !metadata-analysis-api )"
@@ -118,13 +118,26 @@ src_install() {
rm -rf "${ED}"/var/lib/clamav || die
if ! use libclamav-only ; then
- systemd_dotmpfilesd "${FILESDIR}/tmpfiles.d/clamav.conf"
- systemd_newunit "${FILESDIR}/clamd_at.service" "clamd@.service"
- systemd_dounit "${FILESDIR}/clamd.service"
- systemd_dounit "${FILESDIR}/freshclamd.service"
+ if use systemd; then
+ # The tmpfiles entry is behind USE=systemd because the
+ # upstream OpenRC service files should (and do) ensure that
+ # the directories they need exist and have the correct
+ # permissions without the help of opentmpfiles. There are
+ # years-old root exploits in opentmpfiles, the design is
+ # fundamentally flawed, and the maintainer is not up to
+ # the task of fixing it.
+ dotmpfiles "${FILESDIR}/tmpfiles.d/clamav.conf"
+ systemd_newunit "${FILESDIR}/clamd_at.service" "clamd@.service"
+ systemd_dounit "${FILESDIR}/clamd.service"
+ systemd_newunit "${FILESDIR}/freshclamd.service-r1" \
+ "freshclamd.service"
+ fi
insinto /etc/logrotate.d
- newins "${FILESDIR}"/clamav.logrotate clamav
+ newins "${FILESDIR}/clamd.logrotate" clamd
+ newins "${FILESDIR}/freshclam.logrotate" freshclam
+ use milter && \
+ newins "${FILESDIR}/clamav-milter.logrotate" clamav-milter
# Modify /etc/{clamd,freshclam}.conf to be usable out of the box
sed -i -e "s:^\(Example\):\# \1:" \
diff --git a/app-antivirus/clamav/files/clamav-0.103.0-upstream-openrc.patch b/app-antivirus/clamav/files/clamav-0.103.0-upstream-openrc.patch
index 909c965afbe3..a7676f0ab82a 100644
--- a/app-antivirus/clamav/files/clamav-0.103.0-upstream-openrc.patch
+++ b/app-antivirus/clamav/files/clamav-0.103.0-upstream-openrc.patch
@@ -20,20 +20,6 @@ index 12e7fcc28..a3c47e23a 100644
lcov:
($(MAKE); cd unit_tests; $(MAKE) lcov)
quick-check:
-diff --git a/clamav-config.h.in b/clamav-config.h.in
-index d7aff4a3b..ebd8ac256 100644
---- a/clamav-config.h.in
-+++ b/clamav-config.h.in
-@@ -402,6 +402,9 @@
- /* Use private fts() implementation which is LFS safe */
- #undef HAVE_SYSTEM_LFS_FTS
-
-+/* don't link against system-wide tomsfastmath library */
-+#undef HAVE_SYSTEM_TOMSFASTMATH
-+
- /* Define to 1 if you have the header file. */
- #undef HAVE_SYS_CDEFS_H
-
diff --git a/clamav-milter/Makefile.am b/clamav-milter/Makefile.am
index 1ec4afff6..c75c2b4a3 100644
--- a/clamav-milter/Makefile.am
@@ -207,10 +193,10 @@ index 181e22056..864a7fc2a 100644
diff --git a/clamonacc/openrc/clamonacc.in.in b/clamonacc/openrc/clamonacc.in.in
new file mode 100644
-index 000000000..64acf5d83
+index 000000000..844cd49dd
--- /dev/null
+++ b/clamonacc/openrc/clamonacc.in.in
-@@ -0,0 +1,12 @@
+@@ -0,0 +1,18 @@
+#!/sbin/openrc-run
+
+command="@SBINDIR@/clamonacc"
@@ -223,8 +209,14 @@ index 000000000..64acf5d83
+#
+command_args="--foreground"
+command_background=true
++
++depend() {
++ # Unlike the milter, the on-access scanner will simply fail to start
++ # until clamd is available.
++ need clamd
++}
diff --git a/configure.ac b/configure.ac
-index 461342621..773787e49 100644
+index 7b2a777d4..8e0e810f8 100644
--- a/configure.ac
+++ b/configure.ac
@@ -79,6 +79,12 @@ if test "$enable_experimental" = "yes"; then
@@ -240,7 +232,7 @@ index 461342621..773787e49 100644
build_configure_args=`echo "$ac_configure_args" | sed -e 's/[\"]//g'`
AC_SUBST([BUILD_CONFIGURE_FLAGS], [$build_configure_args])
-@@ -105,6 +111,7 @@ m4_include([m4/reorganization/libs/libz.m4])
+@@ -104,6 +110,7 @@ m4_include([m4/reorganization/libs/libz.m4])
m4_include([m4/reorganization/libs/bzip.m4])
m4_include([m4/reorganization/libs/unrar.m4])
m4_include([m4/reorganization/libs/systemd.m4])
@@ -248,7 +240,7 @@ index 461342621..773787e49 100644
m4_include([m4/reorganization/code_checks/ipv6.m4])
m4_include([m4/reorganization/code_checks/dns.m4])
m4_include([m4/reorganization/code_checks/fanotify.m4])
-@@ -193,7 +200,10 @@ AC_CONFIG_FILES([
+@@ -192,7 +199,10 @@ AC_CONFIG_FILES([
libclamav.pc
platform.h
clamav-types.h
@@ -260,7 +252,7 @@ index 461342621..773787e49 100644
if test "x$enable_libclamav_only" != "xyes"; then
AC_CONFIG_FILES([
clamscan/Makefile
-@@ -203,10 +213,14 @@ if test "x$enable_libclamav_only" != "xyes"; then
+@@ -202,10 +212,14 @@ if test "x$enable_libclamav_only" != "xyes"; then
clamd/Makefile
clamd/clamav-daemon.service
clamd/clamav-daemon.socket
diff --git a/app-antivirus/clamav/files/clamav-milter.logrotate b/app-antivirus/clamav/files/clamav-milter.logrotate
new file mode 100644
index 000000000000..24782df604b6
--- /dev/null
+++ b/app-antivirus/clamav/files/clamav-milter.logrotate
@@ -0,0 +1,25 @@
+# This script is intended to rotate the logs for clamav-milter in its
+# default configuration on Gentoo, where clamav-milter writes to its
+# own log file but does not rotate that file itself. The clamav-milter
+# daemon is capable of rotating its own logs; if you have "LogRotate
+# yes" in clamav-milter.conf then you do not need this script (and
+# should disable it). Likewise, if you are logging to syslog
+# (LogSyslog yes), this is redundant.
+#
+# This is more complicated than the clamd/freshclam scripts because
+# the milter doesn't yet reopen its log files when it receives a
+# SIGHUP. See https://bugzilla.clamav.net/show_bug.cgi?id=12615
+# for that. Instead we have to attempt OpenRC/systemd service
+# restarts on (only) the machines that support them.
+/var/log/clamav/clamav-milter.log {
+ su clamav clamav
+ missingok
+ postrotate
+ if command -v rc-service 2>/dev/null; then
+ rc-service clamav-milter status 2>/dev/null 1>&2 && rc-service clamav-milter restart 1>/dev/null
+ fi
+ if command -v systemctl 2>/dev/null; then
+ systemctl try-restart clamav-milter
+ fi
+ endscript
+}
diff --git a/app-antivirus/clamav/files/clamd.logrotate b/app-antivirus/clamav/files/clamd.logrotate
new file mode 100644
index 000000000000..68ee9b361668
--- /dev/null
+++ b/app-antivirus/clamav/files/clamd.logrotate
@@ -0,0 +1,17 @@
+# This script is intended to rotate the logs for clamd in its default
+# configuration on Gentoo, where clamd writes to its own log file but
+# does not rotate that file itself. The clamd daemon is capable of
+# rotating its own logs; if you have "LogRotate yes" in clamd.conf
+# then you do not need this script (and should disable it). Likewise,
+# if you are logging to syslog (LogSyslog yes), this is redundant.
+/var/log/clamav/clamd.log {
+ su clamav clamav
+ missingok
+ postrotate
+ if test -f /run/clamd.pid; then
+ /bin/kill -HUP $(cat /run/clamd.pid)
+ else
+ true
+ fi
+ endscript
+}
diff --git a/app-antivirus/clamav/files/freshclam.logrotate b/app-antivirus/clamav/files/freshclam.logrotate
new file mode 100644
index 000000000000..ba6b5de3ba1c
--- /dev/null
+++ b/app-antivirus/clamav/files/freshclam.logrotate
@@ -0,0 +1,17 @@
+# This script is intended to rotate the logs for freshclam in its default
+# configuration on Gentoo, where freshclam writes to its own log file but
+# does not rotate that file itself. The freshclam daemon is capable of
+# rotating its own logs; if you have "LogRotate yes" in freshclam.conf
+# then you do not need this script (and should disable it). Likewise,
+# if you are logging to syslog (LogSyslog yes), this is redundant.
+/var/log/clamav/freshclam.log {
+ su clamav clamav
+ missingok
+ postrotate
+ if test -f /run/freshclam.pid; then
+ /bin/kill -HUP $(cat /run/freshclam.pid)
+ else
+ true
+ fi
+ endscript
+}
diff --git a/app-antivirus/clamav/files/freshclamd.service-r1 b/app-antivirus/clamav/files/freshclamd.service-r1
new file mode 100644
index 000000000000..fa1e0139ddda
--- /dev/null
+++ b/app-antivirus/clamav/files/freshclamd.service-r1
@@ -0,0 +1,10 @@
+[Unit]
+Description=clamav updater
+
+[Service]
+Type=forking
+PIDFile=/run/freshclam.pid
+ExecStart=/usr/bin/freshclam -d -p /run/freshclam.pid
+
+[Install]
+WantedBy=multi-user.target
diff --git a/app-backup/Manifest.gz b/app-backup/Manifest.gz
index 26e9a0a1b3ce..ffba425b5841 100644
Binary files a/app-backup/Manifest.gz and b/app-backup/Manifest.gz differ
diff --git a/app-backup/btrbk/Manifest b/app-backup/btrbk/Manifest
index ca1a62dca2d1..80530c27d0de 100644
--- a/app-backup/btrbk/Manifest
+++ b/app-backup/btrbk/Manifest
@@ -7,3 +7,4 @@ DIST btrbk-0.28.2.tar.xz 94888 BLAKE2B 4501a8bbe1c88e2449c67d3c5e2322c8b3d3bd5b8
DIST btrbk-0.28.3.tar.xz 95000 BLAKE2B 95de0eae8621b313e9dce3a90ba416a0e4553b05e7e9e1432bd740941ea4b7bdc154a6dd34c9cf7b7ef9fb98f46fd4bc99a3b37933b4c9bd21ef493a7f51e2a5 SHA512 a2919527ab14486113c075fdb2646ee70fa20c813e5a69fc8a0cd16b75bc7aaccee338b272da938f6223a4be8c2d539839426b55ce72d338c7cf20680a41a849
DIST btrbk-0.29.0.tar.xz 97632 BLAKE2B dc7b63804a2a4ff99ae33e2247363402cfa683bad852c1b70bbb8fc3571730a690589cff1184a3c6e63b66b385430027b55da959e7dca96b7eca6eff900be109 SHA512 e3b0fd45bcaafa4fe53e230bb66cc23ae950dd91251d5e4d19a576021f2dcc52b219cd348b1b747224c2da803b47554266f4fc91c092a62decedc74ac59b9b28
DIST btrbk-0.29.1.tar.xz 98320 BLAKE2B f7e4939fec27cc85847d7cae8797de9c59040de641ed4c3c4dcd37102daad1d3910e2ef40c3ad486614a167a7d2206c92b961ba6e5d78e351dedb8de565e3172 SHA512 78bb24fff3606bcf5cb3f4b7e31c5423ca01208cf667efa6a67978696b06ffd4f368aed372d57372ef268ea9329d51f8abd7e2e9dc59dfb0d3133c992d1d788e
+DIST btrbk-0.30.0.tar.xz 101104 BLAKE2B f963fa64a409810552f1232e42d2d7ed740cbcf498098307ebff31a6e4db06d43a2c4fd5df6120847a009fd606ea4453ca93eaa6cf7a18744d557f94722876f8 SHA512 127d184fda13cb036c737f2cad428ef8313af46ceac0b6d273d670656f874d0e096bcd2daf96a2b6e7087a9985e47a99a905515376a9270171575166ca5d6449
diff --git a/app-backup/btrbk/btrbk-0.30.0.ebuild b/app-backup/btrbk/btrbk-0.30.0.ebuild
new file mode 100644
index 000000000000..73afd3da3703
--- /dev/null
+++ b/app-backup/btrbk/btrbk-0.30.0.ebuild
@@ -0,0 +1,76 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit systemd
+
+if [[ ${PV} == "9999" ]] ; then
+ EGIT_REPO_URI="https://github.com/digint/btrbk.git"
+ inherit git-r3
+ SRC_URI=""
+else
+ SRC_URI="https://digint.ch/download/btrbk/releases/${P}.tar.xz"
+ KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+fi
+
+DESCRIPTION="Tool for creating snapshots and remote backups of btrfs subvolumes"
+HOMEPAGE="https://digint.ch/btrbk/"
+LICENSE="GPL-3+"
+SLOT="0"
+IUSE="+mbuffer +doc"
+
+DEPEND="doc? ( >=dev-ruby/asciidoctor-1.5.7 )"
+
+RDEPEND="dev-lang/perl
+ net-misc/openssh
+ mbuffer? ( >=sys-block/mbuffer-20180505 )
+ >=sys-fs/btrfs-progs-4.12"
+
+src_compile() {
+ emake clean
+ use doc && emake -C doc
+}
+src_install() {
+ local targets="install-bin install-etc install-share install-systemd"
+ use doc && targets="${targets} install-man install-doc"
+ emake \
+ DESTDIR="${D}" \
+ DOCDIR="/usr/share/doc/${PF}" \
+ SYSTEMDDIR="$(systemd_get_systemunitdir)" \
+ ${targets}
+}
+pkg_preinst() {
+ if has_version "<${CATEGORY}/${PN}-0.26.0" ; then
+ upgrade_0_26_0_warning="1"
+ fi
+ if has_version "<${CATEGORY}/${PN}-0.27.0" ; then
+ upgrade_0_27_0_warning="1"
+ fi
+}
+pkg_postinst() {
+ if [[ "${upgrade_0_26_0_warning}" == "1" ]]; then
+ ewarn "If you are using raw targets, make sure to run the"
+ ewarn "\"raw_suffix2sidecar\" utility in each target directory."
+ fi
+ if [[ "${upgrade_0_27_0_warning}" == "1" ]]; then
+ ewarn 'Due to a bugfix in the scheduler [1] [2], previously preserved'
+ ewarn 'monthly/yearly backups could get deleted when upgrading to'
+ ewarn 'btrbk-0.27.0.'
+ ewarn ''
+ ewarn 'Before upgrading to btrbk-0.27.0, make sure to stop all cron jobs'
+ ewarn 'or systemd timers calling btrbk.'
+ ewarn ''
+ ewarn 'After upgrading, run "btrbk prune --dry-run --print-schedule" and'
+ ewarn 'check if any snapshots/backups would get deleted. If you want to'
+ ewarn 'forcibly preserve a snapshot/backup forever, rename it:'
+ ewarn ''
+ ewarn ' mv mysubvol.YYYYMMDD mysubvol.YYYYMMDD.keep_forever'
+ ewarn ''
+ ewarn 'Note that btrbk ignores subvolumes with unknown naming scheme, e.g.'
+ ewarn '(".keep_forever" suffix in the example above).'
+ ewarn ''
+ ewarn ' [1] https://github.com/digint/btrbk/issues/217'
+ ewarn ' [2] https://github.com/digint/btrbk/commit/719fb5f'
+ fi
+}
diff --git a/app-backup/duply/Manifest b/app-backup/duply/Manifest
index 7a49c026d6f5..df8ef18385a2 100644
--- a/app-backup/duply/Manifest
+++ b/app-backup/duply/Manifest
@@ -1,4 +1,3 @@
-DIST duply_1.11.2.tgz 44094 BLAKE2B 0aa52f9654bbb873564aaa180b5762b4a5bae1cf0da85d79fedfa6e59d27ada48061d78481b550615452dfba2428535d7b0665ce421abfdd1902ede0e83f7110 SHA512 20833c774705f83ec7efc88a7605c925ea5e56536a2338c6bd3a65ae789ffa7fabb03206b396fd92fb8ccf13cf0d72dbecdf705780e345a2cb1804783623e420
DIST duply_1.11.3.tgz 44198 BLAKE2B 368c8a5d145068da00fccb970188bc64574365517211d3eca253c34f820dd520777f56ebc0dfddeca2fc910558e73bf6a2adac6287422b47d5a5751d43a74b86 SHA512 5817d4571c27288b227add04e84fa0066e278cdbc819a9332cb6fa2aaf6609e923abe9824ac704fed250b961300c57ca1de945af03370287f7cbf68876513457
DIST duply_1.9.2.tgz 36222 BLAKE2B e1c028423eb8631598b662ad33f3cf24088f11e84ba2b28c818aa580eb69f069885af7cef5780fe457357066b88c7077e3b691ca5a87fc02f429fa416aa39f70 SHA512 9ef5e22f43a6854e413ed1c2b88b10d0ae75cff7b2bcd927d20a588234555e9b7eff25d094f688f9d4f8510eba6bc20f7635c0de9ab9b402966075595922333e
DIST duply_2.0.1.tgz 44914 BLAKE2B 022a99e585a6231e85af84ae161988037fecf885a2a97d078e1a64b2176268ea6ef3c68e4843a967715ff362e8f24826cd800f0c1b32c4b187f5261d2b9cad67 SHA512 28f1670f2579956cb4d0d5727403e8b9f4afcdd8ea79e117536dfb89b3f3cf6a7bc7eb802bc4dcd39fc6a443a9f8fa3fe722f2b8336186517184940ce6fa73ec
diff --git a/app-backup/duply/duply-1.11.2.ebuild b/app-backup/duply/duply-1.11.2.ebuild
deleted file mode 100644
index 4ac44196694c..000000000000
--- a/app-backup/duply/duply-1.11.2.ebuild
+++ /dev/null
@@ -1,28 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-inherit readme.gentoo
-
-DESCRIPTION="A shell frontend for duplicity"
-HOMEPAGE="http://duply.net"
-SRC_URI="mirror://sourceforge/project/ftplicity/duply%20%28simple%20duplicity%29/1.11.x/${PN}_${PV}.tgz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-DEPEND="app-text/txt2man"
-RDEPEND="app-backup/duplicity"
-
-S=${WORKDIR}/${PN}_${PV}
-
-src_install() {
- dobin ${PN}
- ./${PN} txt2man > ${PN}.1 || die
- doman ${PN}.1
- dodoc CHANGELOG.txt
- readme.gentoo_create_doc
-}
diff --git a/app-backup/rear/Manifest b/app-backup/rear/Manifest
index c4971bdf9b46..8ae2cae8ecf4 100644
--- a/app-backup/rear/Manifest
+++ b/app-backup/rear/Manifest
@@ -1,4 +1 @@
-DIST rear-1.15.tar.gz 258153 BLAKE2B 1172806962df7d1a5f278d1aeb696e38d482f1710c6b13dba6b00f60f51fd3c02ba6d28c9c5e4b1a648468f9a6f5987b47ca1f819c8e66c9b6f209c75b0ba0b6 SHA512 dc953c33b82f221de6c2acd7ffbb26c34b86aebcd7f8a4d7d520a1d08c15c723fed75326b8e19614f5e09f6436d392091b362b350ffad06caf10c711eb97fcb2
-DIST rear-1.17.0.tar.gz 299444 BLAKE2B bbada2b5705a5ff0f82b97974f14de728a779847a6b410e0be71033404ae08f0ba6c4bd76c07aba0195aa677c174ebf016bbb6a17f3aa2698bed24bcb50618f3 SHA512 4b9991dc14138e6a2cd28c9fb9f1dcf46ea1a580454bb2c966024481657a102cc849baf6af5ebfa0793ac3f5ebff5b07abc87d1e4b02e1496a0f87b8cf79284e
-DIST rear-1.17.1.tar.gz 303253 BLAKE2B 3c84a76b0aaf1ef72191a49976aa86ce4fcf7c9aee1c6c85af3d68d80e0c6a7ba0d16e109847c7753a626ef34df9ee05f2912b30df5e205303c194831bd5af77 SHA512 66595e962345c0e61c5152f11aee6745ec348acc02d0cbc717faaca8618c83211d8c45ec5e80a17ba9d8c8ad9c6d2ecb109f827d976eb0d126bfc44cf4b49afc
DIST rear-2.4.tar.gz 611731 BLAKE2B f7cb6955302e0be6178393a678f050729b827f822df91d28245655d414892f225e25125f7e3bfad080e139ddc9c728121894b4ebde48c4dff2a8071fb4a5d46e SHA512 8a20c0ffd913b1b4c27f6125c1ca31404daaceccb2bfff7932f1ea402806657252afc3f6719c75dcab2de18b7975f83544dac92f43a742654f90494454d7c088
diff --git a/app-backup/rear/rear-1.15-r1.ebuild b/app-backup/rear/rear-1.15-r1.ebuild
deleted file mode 100644
index 1ea1bebbf87b..000000000000
--- a/app-backup/rear/rear-1.15-r1.ebuild
+++ /dev/null
@@ -1,58 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="5"
-
-inherit eutils
-
-DESCRIPTION="A setup-and-forget Linux bare metal disaster recovery solution"
-HOMEPAGE="http://relax-and-recover.org/"
-SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64"
-
-IUSE="libressl udev"
-
-RDEPEND="
- !libressl? ( dev-libs/openssl:0= )
- libressl? ( dev-libs/libressl:0= )
- net-dialup/mingetty
- net-fs/nfs-utils
- sys-apps/iproute2
- sys-apps/lsb-release
- sys-apps/util-linux
- sys-block/parted
- sys-boot/syslinux
- virtual/cdrtools
- udev? ( virtual/udev )
-"
-
-src_prepare() {
- epatch "${FILESDIR}/${P}-add-support-for-gentoo-kernels.patch"
-}
-
-src_compile() { :; }
-
-src_install() {
- # Deploy udev USB rule and udev will autostart ReaR workflows in case a USB
- # drive with the label 'REAR_000' is connected, which in turn is the
- # default label when running the `rear format` command.
- if use udev ; then
- insinto /lib/udev/rules.d
- doins etc/udev/rules.d/62-${PN}-usb.rules
- fi
-
- # Copy main script-file and documentation.
- dosbin usr/sbin/${PN}
- doman doc/${PN}.8
- dodoc README
-
- # Copy configurations files.
- insinto /etc
- doins -r etc/${PN}/
-
- insinto /usr/share/
- doins -r usr/share/${PN}/
-}
diff --git a/app-backup/rear/rear-1.17.0.ebuild b/app-backup/rear/rear-1.17.0.ebuild
deleted file mode 100644
index cb3a99906765..000000000000
--- a/app-backup/rear/rear-1.17.0.ebuild
+++ /dev/null
@@ -1,56 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="5"
-
-inherit eutils
-
-DESCRIPTION="A setup-and-forget Linux bare metal disaster recovery solution"
-HOMEPAGE="http://relax-and-recover.org/"
-MY_PV=${PV%.*}
-SRC_URI="mirror://sourceforge/project/${PN}/${PN}/${MY_PV}/${PV}/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-
-IUSE="libressl udev"
-
-RDEPEND="
- !libressl? ( dev-libs/openssl:0= )
- libressl? ( dev-libs/libressl:0= )
- net-dialup/mingetty
- net-fs/nfs-utils
- sys-apps/gawk
- sys-apps/iproute2
- sys-apps/lsb-release
- sys-apps/util-linux
- sys-block/parted
- sys-boot/syslinux
- virtual/cdrtools
- udev? ( virtual/udev )
-"
-
-src_compile() { :; }
-
-src_install() {
- # Deploy udev USB rule and udev will autostart ReaR workflows in case a USB
- # drive with the label 'REAR_000' is connected, which in turn is the
- # default label when running the `rear format` command.
- if use udev ; then
- insinto /lib/udev/rules.d
- doins etc/udev/rules.d/62-${PN}-usb.rules
- fi
-
- # Copy main script-file and documentation.
- dosbin usr/sbin/${PN}
- doman doc/${PN}.8
- dodoc README
-
- # Copy configurations files.
- insinto /etc
- doins -r etc/${PN}/
-
- insinto /usr/share/
- doins -r usr/share/${PN}/
-}
diff --git a/app-backup/rear/rear-1.17.1.ebuild b/app-backup/rear/rear-1.17.1.ebuild
deleted file mode 100644
index cb3a99906765..000000000000
--- a/app-backup/rear/rear-1.17.1.ebuild
+++ /dev/null
@@ -1,56 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="5"
-
-inherit eutils
-
-DESCRIPTION="A setup-and-forget Linux bare metal disaster recovery solution"
-HOMEPAGE="http://relax-and-recover.org/"
-MY_PV=${PV%.*}
-SRC_URI="mirror://sourceforge/project/${PN}/${PN}/${MY_PV}/${PV}/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-
-IUSE="libressl udev"
-
-RDEPEND="
- !libressl? ( dev-libs/openssl:0= )
- libressl? ( dev-libs/libressl:0= )
- net-dialup/mingetty
- net-fs/nfs-utils
- sys-apps/gawk
- sys-apps/iproute2
- sys-apps/lsb-release
- sys-apps/util-linux
- sys-block/parted
- sys-boot/syslinux
- virtual/cdrtools
- udev? ( virtual/udev )
-"
-
-src_compile() { :; }
-
-src_install() {
- # Deploy udev USB rule and udev will autostart ReaR workflows in case a USB
- # drive with the label 'REAR_000' is connected, which in turn is the
- # default label when running the `rear format` command.
- if use udev ; then
- insinto /lib/udev/rules.d
- doins etc/udev/rules.d/62-${PN}-usb.rules
- fi
-
- # Copy main script-file and documentation.
- dosbin usr/sbin/${PN}
- doman doc/${PN}.8
- dodoc README
-
- # Copy configurations files.
- insinto /etc
- doins -r etc/${PN}/
-
- insinto /usr/share/
- doins -r usr/share/${PN}/
-}
diff --git a/app-benchmarks/Manifest.gz b/app-benchmarks/Manifest.gz
index 4fb29a663c33..817ec7ead13f 100644
Binary files a/app-benchmarks/Manifest.gz and b/app-benchmarks/Manifest.gz differ
diff --git a/app-benchmarks/siege/siege-4.0.5.ebuild b/app-benchmarks/siege/siege-4.0.5.ebuild
index d4311b3e0f5b..48cafb2e2b8d 100644
--- a/app-benchmarks/siege/siege-4.0.5.ebuild
+++ b/app-benchmarks/siege/siege-4.0.5.ebuild
@@ -10,7 +10,7 @@ HOMEPAGE="https://www.joedog.org/siege-home https://github.com/JoeDog/siege"
SRC_URI="http://download.joedog.org/${PN}/${P}.tar.gz"
LICENSE="GPL-3"
-KEYWORDS="~amd64 ~arm ~hppa ~mips ~ppc x86 ~x64-macos"
+KEYWORDS="amd64 ~arm ~hppa ~mips ppc x86 ~x64-macos"
SLOT="0"
IUSE="libressl ssl"
diff --git a/app-crypt/Manifest.gz b/app-crypt/Manifest.gz
index 9cf7eca8ff14..0e71f4134d9d 100644
Binary files a/app-crypt/Manifest.gz and b/app-crypt/Manifest.gz differ
diff --git a/app-crypt/acme-sh/Manifest b/app-crypt/acme-sh/Manifest
index caf9c58a1e18..31f690766ecf 100644
--- a/app-crypt/acme-sh/Manifest
+++ b/app-crypt/acme-sh/Manifest
@@ -1,2 +1 @@
-DIST acme.sh-2.8.3.tar.gz 163573 BLAKE2B 7436932d79e732b8c419a588f4677ec0338c63d0dfc227e7410b151731e2fc4c028df81f459f7ad140dab857ebdebddab3173095e3efcfad0a971ff6762c8608 SHA512 15e147d0f07af91eab7274df50e274ae41a411c30ee7f6ebc8bcbcb601b66094fc1d8126bfb816caa27dbeb5222da20a25d1c79227bc70ddb6b5d0ce0dcb389e
-DIST acme.sh-2.8.5.tar.gz 176854 BLAKE2B 74eb9bbf4b99984ba77725c6751b713d6971503d1a8542472e75192afc9139705607f629e673af75b6ec7dab68b1a9ad2fd4676cda26871daf475487e28e0848 SHA512 db355d8c60c61b632c62dda376e71c438035d3eaf5630a6dc3ca241f6d988216f046e1588ccfe3da955aacb7897cefac5a8c7b6868f12af8f422182c52ed7b72
+DIST acme.sh-2.8.7.tar.gz 206475 BLAKE2B ac1d51efac6301210ffd8b6e5ff6ed490cbf80e7dd154ec7a2ad0b6a2dd08ac73a325e332192214c964a873ba7c6f01a43a2157963d7edec9e0ec45b47e5b689 SHA512 45599f50a4a45b6fdea58d7a5759e4eb5f8e33acc53d60b264c15662e6bdc1e353af610845056fc67b127242c4ad15eaaf60a2113f2cb0245d4e4861dac6e1c3
diff --git a/app-crypt/acme-sh/acme-sh-2.8.3.ebuild b/app-crypt/acme-sh/acme-sh-2.8.3.ebuild
deleted file mode 100644
index 6aa2342cb37c..000000000000
--- a/app-crypt/acme-sh/acme-sh-2.8.3.ebuild
+++ /dev/null
@@ -1,46 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-MY_PN="${PN/-/.}"
-MY_P="${MY_PN}-${PV}"
-
-DESCRIPTION="An ACME Shell script"
-HOMEPAGE="https://github.com/Neilpang/acme.sh"
-SRC_URI="https://github.com/Neilpang/${MY_PN}/archive/${PV}.tar.gz -> ${MY_P}.tar.gz"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND="net-misc/curl
- || ( dev-libs/libressl dev-libs/openssl:0 )
- || ( net-analyzer/netcat net-analyzer/openbsd-netcat )
- || ( net-misc/socat www-servers/apache:2 www-servers/nginx )
- virtual/cron"
-
-S="${WORKDIR}/${MY_P}"
-
-src_install() {
- einstalldocs
- newdoc dnsapi/README.md README-dnsapi.md
- newdoc deploy/README.md README-deploy.md
-
- keepdir /etc/acme-sh
- doenvd "${FILESDIR}"/99acme-sh
- insinto /etc/bash/bashrc.d
- doins "${FILESDIR}"/acme.sh
-
- exeinto /usr/share/acme.sh
- doexe acme.sh
- insinto /usr/share/acme.sh/dnsapi
- doins -r dnsapi/*.sh
- insinto /usr/share/acme.sh/deploy
- doins -r deploy/*.sh
- insinto /usr/share/acme.sh/notify
- doins -r notify/*.sh
-
- dosym ../share/acme.sh/acme.sh usr/bin/acme.sh
-}
diff --git a/app-crypt/acme-sh/acme-sh-2.8.5.ebuild b/app-crypt/acme-sh/acme-sh-2.8.7.ebuild
similarity index 95%
rename from app-crypt/acme-sh/acme-sh-2.8.5.ebuild
rename to app-crypt/acme-sh/acme-sh-2.8.7.ebuild
index 59253f841d69..af53d7dec342 100644
--- a/app-crypt/acme-sh/acme-sh-2.8.5.ebuild
+++ b/app-crypt/acme-sh/acme-sh-2.8.7.ebuild
@@ -10,18 +10,19 @@ DESCRIPTION="An ACME Shell script"
HOMEPAGE="https://github.com/Neilpang/acme.sh"
SRC_URI="https://github.com/Neilpang/${MY_PN}/archive/${PV}.tar.gz -> ${MY_P}.tar.gz"
+S="${WORKDIR}/${MY_P}"
+
LICENSE="GPL-3"
SLOT="0"
KEYWORDS="~amd64 ~arm64 ~x86"
-IUSE=""
-RDEPEND="net-misc/curl
+RDEPEND="
+ net-misc/curl
|| ( dev-libs/libressl dev-libs/openssl:0 )
|| ( net-analyzer/netcat net-analyzer/openbsd-netcat )
|| ( net-misc/socat www-servers/apache:2 www-servers/nginx )
- virtual/cron"
-
-S="${WORKDIR}/${MY_P}"
+ virtual/cron
+"
src_install() {
einstalldocs
diff --git a/app-crypt/monkeysphere/Manifest b/app-crypt/monkeysphere/Manifest
index d145b8930078..4057543c9562 100644
--- a/app-crypt/monkeysphere/Manifest
+++ b/app-crypt/monkeysphere/Manifest
@@ -1,7 +1,3 @@
DIST monkeysphere_0.36.orig.tar.gz 98876 BLAKE2B 5f8dcd5349cd038208fcc00dff19c7d001ca8b763f223e832c820bc4f09391ff78667f80af691c0234aed810f4d5aa77d26a378a88b41a4b115ab528e0cdd9ed SHA512 eb6776bd9996db8a5d6a1d16b5b06e6733069cbb3cb35f4e3965508575e084c6f08576f31c71429432daf93910d145804ecf155c3d7550a0f4550a056cb4f0c8
-DIST monkeysphere_0.37.orig.tar.gz 99557 BLAKE2B d32d127927bcf3494933282fcc343ffd32841a8afe84c78b9b29ae30fa374328295d3610475aacd8e2cf0962130c2a73b338c702dff4f904b6fd23b33ad0331b SHA512 ebf636caaa0985a2495314375a9d78d131173ccedc116993e02b7bbc0ddc8c43c718dc65cb725619ecf7e72e0b7e11b941f3eb342d7c23d17ca0507b2ab28512
-DIST monkeysphere_0.38.orig.tar.gz 107546 BLAKE2B 627b0fbed52e651d57fd359e79b91689eeca47ea58335125061cba72f863a582d39536504124e18805c39b3c43e5096edb6db0e32c5c80570689bd55e2936a3b SHA512 fd87460fe16b0133fd507ff93926a5dea6419343b45c3ba33e6e981333646f4fa840c127bb1f3e7750bc3ede66c5e07f4155557a8354cf38d89159422dca390f
-DIST monkeysphere_0.39.orig.tar.gz 107735 BLAKE2B 5e4df72c8c78f6325f79c93b7de1407af2ceb1d2b6be43476d3e0dc5b2505ae97c589deec2bcb64a7dbb3a661221891b89e126086d08df09aef07b07452344f7 SHA512 069acbc3e4f1409a130d4efc95875c72b9e4c55af6ff211fb954a90ff26605ecf9cdbbe7d7f7849de479cafaab7957a33fccefd5f2d54a2317f18bc5454190c2
DIST monkeysphere_0.41.orig.tar.gz 109040 BLAKE2B dadbd65c879bc8e73e7dd1360ebe7f7242aef125af3907d4487f8d0711afda6d87736ab82938867201eead5c1008d192dbd90602eff5a4843d990b3c87ee2949 SHA512 fcc3dd6c191635ed7ef27a8219d4c9d7043629dc8a02de947fcc4dfc8e612ec767f68d4e4c41252a0c0fc80e4184018e53991d85fcde50cb5def75b925341962
-DIST monkeysphere_0.42.orig.tar.gz 110415 BLAKE2B 281ce2841b9f088f632aa6f487dc6b669911dc343bd2cbbe3dddfcc2ace9a1f2f747bfbb6d831c071a5ebae9c34d4809b1b1f90277e7d3fe1e8f0d42f363f52f SHA512 82e3b0f5f5532c75c1ccf2bd6269f7f4292f38956236fdb7813117a85ef36852b7d7c000552555ab0e233df9a84d7f4e5e86edd007bfcebdd6cde2e808f489f5
DIST monkeysphere_0.44.orig.tar.gz 110289 BLAKE2B 8a067035d3a40436fd5c27291ab25f15d475d9a0f17b51259c0431c77841807af93cb04d045b77c5f5dda3cd0061ab52561fdb62a704715d0d8cbbf96cb43259 SHA512 cb3c655a08b1c0a382502f8609f57d0c870fe4491b1b967e9931bdfd146b3926470496577949630452e073f04442b91a1ef679254c0f3091a834f3429e0f8e93
diff --git a/app-crypt/monkeysphere/monkeysphere-0.36-r1.ebuild b/app-crypt/monkeysphere/monkeysphere-0.36-r1.ebuild
deleted file mode 100644
index 953836fdace6..000000000000
--- a/app-crypt/monkeysphere/monkeysphere-0.36-r1.ebuild
+++ /dev/null
@@ -1,57 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-inherit eutils user
-
-DESCRIPTION="Leverage the OpenPGP web of trust for OpenSSH and Web authentication"
-HOMEPAGE="http://web.monkeysphere.info/"
-SRC_URI="http://archive.${PN}.info/debian/pool/${PN}/${PN::1}/${PN}/${PN}_${PV}.orig.tar.gz"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~x86"
-IUSE="test"
-
-# Tests do weird things with network and fail OOTB.
-RESTRICT="test"
-
-RDEPEND="
- app-crypt/gnupg
- app-misc/lockfile-progs
- dev-perl/Crypt-OpenSSL-RSA
- dev-perl/Digest-SHA1
- || ( net-analyzer/netcat net-misc/socat )"
-DEPEND="${RDEPEND}
- test? ( net-misc/socat )"
-
-pkg_setup()
-{
- einfo "Creating named group and user"
- enewgroup ${PN}
- enewuser ${PN} -1 -1 /var/lib/${PN} ${PN}
-}
-
-src_prepare()
-{
- epatch "${FILESDIR}/${P}_default_shell.patch" \
- "${FILESDIR}/${P}_non_default_port.patch" \
- "${FILESDIR}/${P}_userid_empty_line.patch"
-
- sed -i "s#share/doc/${PN}#share/doc/${PF}#" Makefile || die
-}
-
-src_install()
-{
- default
-
- dodir /var/lib/${PN}
- fowners root:${PN} /var/lib/${PN}
- fperms 751 /var/lib/${PN}
-}
-
-pkg_postinst()
-{
- ${PN}-authentication setup || die
-}
diff --git a/app-crypt/monkeysphere/monkeysphere-0.37.ebuild b/app-crypt/monkeysphere/monkeysphere-0.37.ebuild
deleted file mode 100644
index 7276dff3dadb..000000000000
--- a/app-crypt/monkeysphere/monkeysphere-0.37.ebuild
+++ /dev/null
@@ -1,57 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-inherit eutils user
-
-DESCRIPTION="Leverage the OpenPGP web of trust for OpenSSH and Web authentication"
-HOMEPAGE="http://web.monkeysphere.info/"
-
-LICENSE="GPL-3"
-SLOT="0/0"
-IUSE=""
-SRC_URI="mirror://debian/pool/monkeysphere/m/monkeysphere/monkeysphere_${PV}.orig.tar.gz http://archive.monkeysphere.info/debian/pool/monkeysphere/m/monkeysphere/monkeysphere_${PV}.orig.tar.gz"
-KEYWORDS="amd64 ~arm x86"
-
-DOCS=( README Changelog )
-
-# Tests fail upstream for SSH connection. Issue has been reported.
-RESTRICT="test"
-
-DEPEND="app-crypt/gnupg:0=
- net-misc/socat:0=
- dev-perl/Crypt-OpenSSL-RSA:0=
- dev-perl/Digest-SHA1:0=
- app-misc/lockfile-progs:0="
-
-RDEPEND="${DEPEND}"
-
-pkg_setup()
-{
- einfo "Creating named group and user"
- enewgroup monkeysphere
- enewuser monkeysphere -1 -1 /var/lib/monkeysphere monkeysphere
- # Using fperms and fowner in src_install leave unusable config with error
- # Authentication refused: bad ownership or modes for directory /var/lib/monkeysphere
- chown root:monkeysphere /var/lib/monkeysphere
- chmod 751 /var/lib/monkeysphere
-}
-
-src_prepare()
-{
- epatch "${FILESDIR}/${P}_default_shell.patch"\
- "${FILESDIR}/${P}_hd_od.patch"
-
- sed -i "s#share/doc/monkeysphere#share/doc/${PF}#" Makefile || die
-}
-
-src_install()
-{
- default
- dodir /var/lib/monkeysphere
-}
-
-pkg_postinst()
-{
- monkeysphere-authentication setup || die
-}
diff --git a/app-crypt/monkeysphere/monkeysphere-0.38.ebuild b/app-crypt/monkeysphere/monkeysphere-0.38.ebuild
deleted file mode 100644
index a919d40924de..000000000000
--- a/app-crypt/monkeysphere/monkeysphere-0.38.ebuild
+++ /dev/null
@@ -1,61 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-inherit eutils user
-
-DESCRIPTION="Leverage the OpenPGP web of trust for OpenSSH and Web authentication"
-HOMEPAGE="http://web.monkeysphere.info/"
-
-LICENSE="GPL-3"
-SLOT="0/0"
-IUSE=""
-SRC_URI="mirror://debian/pool/monkeysphere/m/monkeysphere/monkeysphere_${PV}.orig.tar.gz http://archive.monkeysphere.info/debian/pool/monkeysphere/m/monkeysphere/monkeysphere_${PV}.orig.tar.gz"
-KEYWORDS="~amd64 ~arm ~x86"
-
-DOCS=( README Changelog )
-
-# Tests fail upstream for SSH connection. Issue has been reported.
-RESTRICT="test"
-
-DEPEND="app-crypt/gnupg:0=
- net-misc/socat:0=
- dev-perl/Crypt-OpenSSL-RSA:0=
- dev-perl/Digest-SHA1:0=
- app-misc/lockfile-progs:0="
-
-RDEPEND="${DEPEND}"
-
-pkg_setup()
-{
- einfo "Creating named group and user"
- enewgroup monkeysphere
- enewuser monkeysphere -1 -1 /var/lib/monkeysphere monkeysphere
- # Using fperms and fowner in src_install leave unusable config with error
- # Authentication refused: bad ownership or modes for directory /var/lib/monkeysphere
- chown root:monkeysphere /var/lib/monkeysphere
- chmod 751 /var/lib/monkeysphere
-}
-
-src_prepare()
-{
- epatch \
- "${FILESDIR}/${P}-asprintf.patch" \
- "${FILESDIR}/${P}-revert-executable-patch.patch" \
- "${FILESDIR}/${P}-syssharedir-whitespace.patch" \
- "${FILESDIR}/${PN}-0.37_default_shell.patch" \
- "${FILESDIR}/${PN}-0.37_hd_od.patch"
-
- sed -i "s#share/doc/monkeysphere#share/doc/${PF}#" Makefile || die
-}
-
-src_install()
-{
- default
- dodir /var/lib/monkeysphere
-}
-
-pkg_postinst()
-{
- monkeysphere-authentication setup || die
-}
diff --git a/app-crypt/monkeysphere/monkeysphere-0.39.ebuild b/app-crypt/monkeysphere/monkeysphere-0.39.ebuild
deleted file mode 100644
index a7f0efd409b1..000000000000
--- a/app-crypt/monkeysphere/monkeysphere-0.39.ebuild
+++ /dev/null
@@ -1,56 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-inherit eutils user
-
-DESCRIPTION="Leverage the OpenPGP web of trust for OpenSSH and Web authentication"
-HOMEPAGE="http://web.monkeysphere.info/"
-
-LICENSE="GPL-3"
-SLOT="0/0"
-IUSE=""
-SRC_URI="mirror://debian/pool/monkeysphere/m/monkeysphere/monkeysphere_${PV}.orig.tar.gz http://archive.monkeysphere.info/debian/pool/monkeysphere/m/monkeysphere/monkeysphere_${PV}.orig.tar.gz"
-KEYWORDS="~amd64 ~arm ~x86"
-
-DOCS=( README Changelog )
-
-# Tests fail upstream for SSH connection. Issue has been reported.
-RESTRICT="test"
-
-DEPEND="app-crypt/gnupg:0=
- net-misc/socat:0=
- dev-perl/Crypt-OpenSSL-RSA:0=
- dev-perl/Digest-SHA1:0=
- app-misc/lockfile-progs:0="
-
-RDEPEND="${DEPEND}"
-
-pkg_setup()
-{
- einfo "Creating named group and user"
- enewgroup monkeysphere
- enewuser monkeysphere -1 -1 /var/lib/monkeysphere monkeysphere
- # Using fperms and fowner in src_install leave unusable config with error
- # Authentication refused: bad ownership or modes for directory /var/lib/monkeysphere
- chown root:monkeysphere /var/lib/monkeysphere
- chmod 751 /var/lib/monkeysphere
-}
-
-src_prepare()
-{
- epatch "${FILESDIR}/${P}-make-tests-work-with-gnupg-2.1.15.patch"
-
- sed -i "s#share/doc/monkeysphere#share/doc/${PF}#" Makefile || die
-}
-
-src_install()
-{
- default
- dodir /var/lib/monkeysphere
-}
-
-pkg_postinst()
-{
- monkeysphere-authentication setup || die
-}
diff --git a/app-crypt/monkeysphere/monkeysphere-0.42.ebuild b/app-crypt/monkeysphere/monkeysphere-0.42.ebuild
deleted file mode 100644
index 4223ab8f9879..000000000000
--- a/app-crypt/monkeysphere/monkeysphere-0.42.ebuild
+++ /dev/null
@@ -1,54 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-inherit eutils user
-
-DESCRIPTION="Leverage the OpenPGP web of trust for OpenSSH and Web authentication"
-HOMEPAGE="http://web.monkeysphere.info/"
-
-LICENSE="GPL-3"
-SLOT="0/0"
-IUSE=""
-SRC_URI="mirror://debian/pool/monkeysphere/m/monkeysphere/monkeysphere_${PV}.orig.tar.gz http://archive.monkeysphere.info/debian/pool/monkeysphere/m/monkeysphere/monkeysphere_${PV}.orig.tar.gz"
-KEYWORDS="~amd64 ~arm ~x86"
-
-DOCS=( README Changelog )
-
-## Tests fail upstream for SSH connection. Issue has been reported.
-RESTRICT="test"
-
-DEPEND="app-crypt/gnupg:0=
- net-misc/socat:0=
- dev-perl/Crypt-OpenSSL-RSA:0=
- dev-perl/Digest-SHA1:0=
- app-misc/lockfile-progs:0="
-
-RDEPEND="${DEPEND}"
-
-pkg_setup()
-{
- einfo "Creating named group and user"
- enewgroup monkeysphere
- enewuser monkeysphere -1 -1 /var/lib/monkeysphere monkeysphere
- # Using fperms and fowner in src_install leave unusable config with error
- # Authentication refused: bad ownership or modes for directory /var/lib/monkeysphere
- chown root:monkeysphere /var/lib/monkeysphere
- chmod 751 /var/lib/monkeysphere
-}
-
-src_prepare()
-{
- sed -i "s#share/doc/monkeysphere#share/doc/${PF}#" Makefile || die
-}
-
-src_install()
-{
- default
- dodir /var/lib/monkeysphere
-}
-
-pkg_postinst()
-{
- monkeysphere-authentication setup || die
-}
diff --git a/app-dicts/Manifest.gz b/app-dicts/Manifest.gz
index c360e6dcb50e..9ba015fb7b5c 100644
Binary files a/app-dicts/Manifest.gz and b/app-dicts/Manifest.gz differ
diff --git a/app-dicts/verbiste/Manifest b/app-dicts/verbiste/Manifest
index 4228de1be8d9..b8e4ece9defe 100644
--- a/app-dicts/verbiste/Manifest
+++ b/app-dicts/verbiste/Manifest
@@ -1,3 +1 @@
-DIST verbiste-0.1.38.tar.gz 706222 BLAKE2B 2ec6f5da9ae410faf422afc7717db5c77d288c6994ec4076c9ace1f3589ee98cbe624a82601415e2c736e127a96225da5afda8ada6a26b2b926a501316b723df SHA512 b5d99d08a9d1a7c91c1dbb86e0d4465a46403db881cd28d2abaf8d376adef6b4d4f5ac93e528d45beb639b77aff7e1730dbb436624674ff21c1f5781173db787
-DIST verbiste-0.1.41.tar.gz 751059 BLAKE2B 503411520a2b76463d20cae09af33f28255db5450a6721da248a87f4df102b64084e224261416bff9fba62cf6e1605363c4aae1090e91da06b65892c37ee9e5b SHA512 f89bb1074cd8c65f8516004c89aae50c65b5bd426d78a01b5e6b7418d86b5c348d2c554ab202c9f34cc9c5586a54518160fc225afa237cdb140ff99f78563702
DIST verbiste-0.1.44.tar.gz 780465 BLAKE2B 692fd3bdf00323b08d4c8a66baaf9f6800c4593428d36efb4cd4bfc51eea912297154e4b0610b94b66d1354317ac7cf24d6dca083d521c648338a0974f6d0899 SHA512 36c8a2af31f948dc3970bef260d5cd7f9d230f4966f846bcc823f006cd98ab98229544b7470466529344ac5735d1189c859c539f526cd58410d9a521510db5e5
diff --git a/app-dicts/verbiste/verbiste-0.1.38-r1.ebuild b/app-dicts/verbiste/verbiste-0.1.38-r1.ebuild
deleted file mode 100644
index 3d3ccc0033df..000000000000
--- a/app-dicts/verbiste/verbiste-0.1.38-r1.ebuild
+++ /dev/null
@@ -1,68 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="5"
-
-inherit eutils gnome2-utils fdo-mime ltprune
-
-DESCRIPTION="French conjugation system"
-HOMEPAGE="http://sarrazip.com/dev/verbiste.html"
-SRC_URI="http://sarrazip.com/dev/${P}.tar.gz"
-
-SLOT="0"
-LICENSE="GPL-2"
-KEYWORDS="amd64 ppc x86"
-
-IUSE="gtk"
-
-RDEPEND="
- >=dev-libs/libxml2-2.4.0:2
- gtk? ( >=x11-libs/gtk+-2.6:2 )
-"
-DEPEND="${RDEPEND}
- sys-devel/gettext
- virtual/pkgconfig
-"
-
-src_configure() {
- econf \
- --with-console-app \
- --without-gnome-app \
- --without-gnome-applet \
- $(use_with gtk gtk-app)
-}
-
-src_install() {
- default
- prune_libtool_files
- dodoc HACKING LISEZMOI
- # file is only installed with USE=gnome
- if use gtk; then
- sed -e 's/Exec=.*/Exec=verbiste-gtk/' \
- -i src/gnome/verbiste.desktop || die
- insinto usr/share/applications
- doins src/gnome/verbiste.desktop
- fi
-}
-
-pkg_preinst() {
- if use gtk; then
- gnome2_icon_savelist
- fi
-}
-
-pkg_postinst() {
- if use gtk; then
- fdo-mime_desktop_database_update
- fdo-mime_mime_database_update
- gnome2_icon_cache_update
- fi
-}
-
-pkg_postrm() {
- if use gtk; then
- fdo-mime_desktop_database_update
- fdo-mime_mime_database_update
- gnome2_icon_cache_update
- fi
-}
diff --git a/app-dicts/verbiste/verbiste-0.1.41.ebuild b/app-dicts/verbiste/verbiste-0.1.41.ebuild
deleted file mode 100644
index 4648b20ec985..000000000000
--- a/app-dicts/verbiste/verbiste-0.1.41.ebuild
+++ /dev/null
@@ -1,66 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="5"
-
-inherit eutils gnome2-utils ltprune xdg-utils
-
-DESCRIPTION="French conjugation system"
-HOMEPAGE="http://sarrazip.com/dev/verbiste.html"
-SRC_URI="http://sarrazip.com/dev/${P}.tar.gz"
-
-SLOT="0"
-LICENSE="GPL-2"
-KEYWORDS="~amd64 ~ppc ~x86"
-
-IUSE="gtk"
-
-RDEPEND="
- >=dev-libs/libxml2-2.4.0:2
- gtk? ( >=x11-libs/gtk+-2.6:2 )
-"
-DEPEND="${RDEPEND}
- sys-devel/gettext
- virtual/pkgconfig
-"
-
-src_configure() {
- econf \
- --with-console-app \
- --without-gnome-app \
- --without-gnome-applet \
- $(use_with gtk gtk-app)
-}
-
-src_install() {
- default
- prune_libtool_files
- dodoc HACKING LISEZMOI
- # file is only installed with USE=gnome
- if use gtk; then
- sed -e 's/Exec=.*/Exec=verbiste-gtk/' \
- -i src/gnome/verbiste.desktop || die
- insinto usr/share/applications
- doins src/gnome/verbiste.desktop
- fi
-}
-
-pkg_preinst() {
- if use gtk; then
- gnome2_icon_savelist
- fi
-}
-
-pkg_postinst() {
- if use gtk; then
- xdg_desktop_database_update
- gnome2_icon_cache_update
- fi
-}
-
-pkg_postrm() {
- if use gtk; then
- xdg_desktop_database_update
- gnome2_icon_cache_update
- fi
-}
diff --git a/app-doc/Manifest.gz b/app-doc/Manifest.gz
index f553b1e9bcd3..2e15cb9d2e38 100644
Binary files a/app-doc/Manifest.gz and b/app-doc/Manifest.gz differ
diff --git a/app-doc/gimp-help/Manifest b/app-doc/gimp-help/Manifest
index 9024553a992c..037747728007 100644
--- a/app-doc/gimp-help/Manifest
+++ b/app-doc/gimp-help/Manifest
@@ -1,2 +1 @@
DIST gimp-help-2.10.0.tar.bz2 187092180 BLAKE2B 29a7fbe3fcb6f3210aeda4bc514d7e0eeca05f9fabd3b9022c7ed1e5a9432876cc3bf530632648e2eb50509add4e387106d9705a1c17469e33496daec737d21b SHA512 2f6d5e7cf0c3b4960c92074ef02d51a1d089c148f6453a66e453a3084cdede280f72c6b77d35f66777adbda8aa273ec2a472fb538142e51bb263c3077eec473a
-DIST gimp-help-2.8.2.tar.bz2 158504580 BLAKE2B d0023a4290879f97e3365f1208427997d1facc09a7ed4ac0a274615e9eff378c9a4da0d7c5190bc24ad27c2b03d6c513003297d835562b0fa3e02685443d15e9 SHA512 3afdaa8b2f005d939d039d2e22c8306145e7b7acaca5ef89279998e87931e99d1fe607f1337f7796d667d5c6be456ba976b3c8a937c9dd6b1888d7158cfbed67
diff --git a/app-doc/gimp-help/gimp-help-2.10.0-r1.ebuild b/app-doc/gimp-help/gimp-help-2.10.0-r1.ebuild
index e710f44f3198..2aa0ad8601dd 100644
--- a/app-doc/gimp-help/gimp-help-2.10.0-r1.ebuild
+++ b/app-doc/gimp-help/gimp-help-2.10.0-r1.ebuild
@@ -12,7 +12,7 @@ SRC_URI="mirror://gimp/help/${P}.tar.bz2"
LICENSE="FDL-1.2"
SLOT="2"
-KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc x86"
+KEYWORDS="~alpha amd64 ~hppa ~ia64 ppc ppc64 sparc x86"
IUSE=""
BDEPEND="${PYTHON_DEPS}
diff --git a/app-doc/gimp-help/gimp-help-2.8.2.ebuild b/app-doc/gimp-help/gimp-help-2.8.2.ebuild
deleted file mode 100644
index a4c033714438..000000000000
--- a/app-doc/gimp-help/gimp-help-2.8.2.ebuild
+++ /dev/null
@@ -1,35 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python2_7 )
-inherit python-any-r1
-
-DESCRIPTION="GNU Image Manipulation Program help files"
-HOMEPAGE="https://docs.gimp.org/"
-SRC_URI="mirror://gimp/help/${P}.tar.bz2"
-
-LICENSE="FDL-1.2"
-SLOT="2"
-KEYWORDS="~alpha amd64 ~hppa ~ia64 ppc ppc64 sparc x86"
-IUSE=""
-
-DEPEND="${PYTHON_DEPS}
- $(python_gen_any_dep 'dev-libs/libxml2[python,${PYTHON_USEDEP}]')
- dev-libs/libxslt
- sys-devel/gettext
-"
-
-python_check_deps() {
- has_version "dev-libs/libxml2[${PYTHON_USEDEP}]"
-}
-
-src_configure() {
- econf --without-gimp
-}
-
-src_compile() {
- # see https://bugs.gentoo.org/677198
- emake -j 1
-}
diff --git a/app-emacs/Manifest.gz b/app-emacs/Manifest.gz
index 147604098c78..89ea6f26f8a8 100644
Binary files a/app-emacs/Manifest.gz and b/app-emacs/Manifest.gz differ
diff --git a/app-emacs/meson-mode/Manifest b/app-emacs/meson-mode/Manifest
index d7042c03cda0..5a607459118b 100644
--- a/app-emacs/meson-mode/Manifest
+++ b/app-emacs/meson-mode/Manifest
@@ -1 +1,2 @@
DIST meson-mode-0.2.tar.gz 28194 BLAKE2B a11b7659dfb7883a624706ee3a80ab2de69c3f3830d363a767e2a2fc644a9d1d946269a7d30af4ec93180341807519e5bf0bd55e1500513076e7aa07e0ec888b SHA512 05a9554f2ff1520834648ef6b7c27d09d5f9355fe980d19a67eba39e1e0a4a402e64284e17c6d544b8e95bdee3e204b79d73c6166d6d8c48683036821bad532f
+DIST meson-mode-0.3.tar.gz 30159 BLAKE2B d4d3256b1b9838d9816433c422207f99b6ad8a61d344d1ba34d00a2b1463c8d6d35cb87fa885667df95cd9622715e2f805f5e0e16bf21d404bbec9244916b70f SHA512 95dbe9b706ff9a25e9b235f5d09cbbca035ad9a9bc67abb5fee791ebf3e51cfc3d16e03cea037e9a810ff2bbd8b77caa515e8a26dbfbfe0b46b4cc019138375b
diff --git a/app-emacs/meson-mode/meson-mode-0.3.ebuild b/app-emacs/meson-mode/meson-mode-0.3.ebuild
new file mode 100644
index 000000000000..c075622402fb
--- /dev/null
+++ b/app-emacs/meson-mode/meson-mode-0.3.ebuild
@@ -0,0 +1,20 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+NEED_EMACS=26.1
+
+inherit elisp
+
+DESCRIPTION="A GNU Emacs major mode for Meson build-system files"
+HOMEPAGE="https://github.com/wentasah/meson-mode"
+SRC_URI="https://github.com/wentasah/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="GPL-3+"
+SLOT="0"
+KEYWORDS="~amd64"
+
+DOCS=( README.md )
+
+SITEFILE="50${PN}-gentoo.el"
diff --git a/app-emulation/Manifest.gz b/app-emulation/Manifest.gz
index 0aa0618fdeef..91dc8f599420 100644
Binary files a/app-emulation/Manifest.gz and b/app-emulation/Manifest.gz differ
diff --git a/app-emulation/containerd/Manifest b/app-emulation/containerd/Manifest
index 50dea9321e92..c00825bee4e3 100644
--- a/app-emulation/containerd/Manifest
+++ b/app-emulation/containerd/Manifest
@@ -7,3 +7,4 @@ DIST containerd-1.3.0.tar.gz 5697153 BLAKE2B c334cfd2aa11dd430c74bc9f3fe6f31d83f
DIST containerd-1.3.1.tar.gz 5703741 BLAKE2B 6eae3fe9714128e7a5378484115378629baf6c4f7ef4b795e625cc1fbc05323a123c2337c5b203a2c3c3b34486c81f7e5b3ad200c000c961931fc99347ef4513 SHA512 4991286d1a8a221dad24121c5e6cd31a00685d91e652546d0d97745624486450bc05ff4f889f2975c178c4c175fedd7b15f89121a7ce4e6687919aabd04501b4
DIST containerd-1.3.2.tar.gz 5704320 BLAKE2B 32ea22ff445cc66f4c8db8abdbaaa7fa0c8c620b294bda54f2319045af1925398057ba1a5cb5c265cfc73bcff5b49943013b517ecb3bd05f4504920c4a8d6f29 SHA512 768a19eb0829e196a61ddedaa11b0d6691caf8f9cc590a3e47ac77c1acad62e64b7a55017a1a6cccfcb87785a083d5ce131048b0e39e48c65e6cd5922382fc3c
DIST containerd-1.3.4.tar.gz 5700890 BLAKE2B 9d5642399eafbf3df25d2bdb6ffeb8e98362e9f2c6cdcd7a64fff12bad40f58fa97451228a607def408cc8a8cfbfce67c47fcfdf86865d8086d0b7aad7595d5a SHA512 b186d5aef3e5a0d35c12dcc3cfa5d48a9602f6278c4650942859a1ab6abd1299d33a1bc623376955a834a2626491196b604591d92a05d39745dfc33ff51ad5aa
+DIST containerd-1.3.7.tar.gz 5709989 BLAKE2B 0cfa6f5bcd41c1591e64f41dbba2720bed5f25d61625b6d09be19df56fe74b61532b627c35a830e1e4937333f790f7ff8a5fad18b8869a679a6fec18daf238d3 SHA512 7c6de27b6529e3fb3f924ec67a260a51bc45186d69baa4cae6720a08e5c3b74aeb43d236c0a4739f297b2863233bde7d2246a597c9e17713c48bec767c6bbfee
diff --git a/app-emulation/containerd/containerd-1.3.7.ebuild b/app-emulation/containerd/containerd-1.3.7.ebuild
new file mode 100644
index 000000000000..9a7b8db286a6
--- /dev/null
+++ b/app-emulation/containerd/containerd-1.3.7.ebuild
@@ -0,0 +1,84 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+# update on bump, look for https://github.com/docker\
+# docker-ce/blob//components/engine/hack/dockerfile/install/containerd.installer
+CONTAINERD_COMMIT="8fba4e9a7d01810a393d5d25a3621dc101981175"
+EGO_PN="github.com/containerd/${PN}"
+
+inherit golang-vcs-snapshot toolchain-funcs
+
+DESCRIPTION="A daemon to control runC"
+HOMEPAGE="https://containerd.io/"
+SRC_URI="https://github.com/containerd/${PN}/archive/${CONTAINERD_COMMIT}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
+IUSE="apparmor btrfs device-mapper +cri hardened +seccomp selinux test"
+
+DEPEND="
+ btrfs? ( sys-fs/btrfs-progs )
+ seccomp? ( sys-libs/libseccomp )
+"
+
+RDEPEND="
+ ${DEPEND}
+ ~app-emulation/runc-1.0.0_rc10
+"
+
+BDEPEND="
+ dev-go/go-md2man
+ virtual/pkgconfig
+ test? ( "${RDEPEND}" )
+"
+
+# tests require root or docker
+# upstream does not recommend stripping binary
+RESTRICT+=" strip test"
+
+S="${WORKDIR}/${P}/src/${EGO_PN}"
+
+src_prepare() {
+ default
+ sed -i -e "s/git describe --match.*$/echo ${PV})/"\
+ -e "s/git rev-parse HEAD.*$/echo ${CONTAINERD_COMMIT})/"\
+ -e "s/-s -w//" \
+ Makefile || die
+}
+
+src_compile() {
+ local options=(
+ $(usev apparmor)
+ $(usex btrfs "" "no_btrfs")
+ $(usex cri "" "no_cri")
+ $(usex device-mapper "" "no_devmapper")
+ $(usev seccomp)
+ $(usev selinux)
+ )
+
+ myemakeargs=(
+ BUILDTAGS="${options[*]}"
+ DESTDIR="${ED}"
+ LDFLAGS=$(usex hardened '-extldflags -fno-PIC' '')
+ )
+
+ export GOPATH="${WORKDIR}/${P}" # ${PWD}/vendor
+ export GOFLAGS="-v -x -mod=vendor"
+ emake "${myemakeargs[@]}" all man
+}
+
+src_install() {
+ dobin bin/*
+ doman man/*
+ newinitd "${FILESDIR}"/${PN}.initd-r1 "${PN}"
+ keepdir /var/lib/containerd
+
+ # we already installed manpages, remove markdown source
+ # before installing docs directory
+ rm -rf docs/man || die
+ local DOCS=( README.md PLUGINS.md docs/. )
+ einstalldocs
+}
diff --git a/app-emulation/containerd/files/containerd.initd-r1 b/app-emulation/containerd/files/containerd.initd-r1
new file mode 100644
index 000000000000..6536fc9ef209
--- /dev/null
+++ b/app-emulation/containerd/files/containerd.initd-r1
@@ -0,0 +1,26 @@
+#!/sbin/openrc-run
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+description="Containerd container runtime"
+command="/usr/bin/containerd"
+command_args="${command_args:-}"
+command_background="true"
+pidfile="${pidfile:-/run/${RC_SVCNAME}.pid}"
+start_stop_daemon_args="--stderr /var/log/${RC_SVCNAME}/${RC_SVCNAME}.log --stdout /var/log/${RC_SVCNAME}/${RC_SVCNAME}.log"
+
+start_pre() {
+ checkpath -m 0750 -d "/var/log/${RC_SVCNAME}"
+
+ ulimit -n 1048576
+
+ # Having non-zero limits causes performance problems due to accounting overhead
+ # in the kernel. We recommend using cgroups to do container-local accounting.
+ ulimit -u unlimited
+
+ return 0
+}
+
+start_post() {
+ ewaitfile 5 /run/containerd/containerd.sock
+}
diff --git a/app-emulation/containerd/metadata.xml b/app-emulation/containerd/metadata.xml
index 148cffdb35a3..534d7d6a1880 100644
--- a/app-emulation/containerd/metadata.xml
+++ b/app-emulation/containerd/metadata.xml
@@ -20,6 +20,7 @@
Support for AppArmor
Support for BTRFS snapshot driver
Support for Kubernetes CRI
+ Support for device mapper snapshot driver
containerd/containerd
diff --git a/app-emulation/crun/crun-0.14.1.ebuild b/app-emulation/crun/crun-0.14.1.ebuild
index 998223b4abf8..651d5f88be89 100644
--- a/app-emulation/crun/crun-0.14.1.ebuild
+++ b/app-emulation/crun/crun-0.14.1.ebuild
@@ -14,7 +14,7 @@ SRC_URI="https://github.com/containers/${PN}/releases/download/${PV}/${P}.tar.gz
LICENSE="GPL-2+ LGPL-2.1+"
SLOT="0"
-KEYWORDS="~amd64 ~arm64"
+KEYWORDS="~amd64 ~arm64 ~ppc64"
IUSE="bpf +caps man seccomp systemd static-libs"
DEPEND="
@@ -38,14 +38,14 @@ DOCS=( README.md )
src_unpack() {
# dont' try to unpack the .lds file
- A=( ${A[@]/libcrun.lds} )
- unpack ${A}
+ MY_A=( ${A[@]/libcrun.lds} )
+ unpack ${MY_A}
}
src_prepare() {
default
eautoreconf
- cp -v ${DISTDIR}/libcrun.lds ${S}/ || die "libcrun.lds could not be copied"
+ cp -v "${DISTDIR}"/libcrun.lds "${S}"/ || die "libcrun.lds could not be copied"
}
src_configure() {
diff --git a/app-emulation/distrobuilder/metadata.xml b/app-emulation/distrobuilder/metadata.xml
index d9d7286d829f..b495e2e1bb0b 100644
--- a/app-emulation/distrobuilder/metadata.xml
+++ b/app-emulation/distrobuilder/metadata.xml
@@ -9,4 +9,8 @@
posting@vodacomm.ca
Stephen Bosch
+
+ virtualization@gentoo.org
+ Gentoo Virtualization Project
+
diff --git a/app-emulation/docker-compose/Manifest b/app-emulation/docker-compose/Manifest
index a3fcf0725051..240475af83e6 100644
--- a/app-emulation/docker-compose/Manifest
+++ b/app-emulation/docker-compose/Manifest
@@ -2,3 +2,4 @@ DIST docker-compose-1.25.5.tar.gz 308569 BLAKE2B 5d5d1fd60f9bcb87f7e9628dbe10b27
DIST docker-compose-1.26.2.tar.gz 313494 BLAKE2B 656bac181547a3484c45d0ede7111384007db8109aaf3673a06b848bb9b27059cfb8b2cd583e6bc7acd0ebbd90d40e485251d473eefe56a6493abe187132e520 SHA512 4cb8a2f5e25f17eb842e36dea96fae8862df099d706ec590e6fc0790c7a814bed3bb60ec00207e4afc15bf8ad4ca37075320fd28ee0bea5bbec1646f3aed681f
DIST docker-compose-1.27.2.tar.gz 309004 BLAKE2B 1017016989b25afa812d2e7251c6dbf45922867d66ef0c69292889a5de8f31908c8d2f418b2c29c319fbd7d0ba4e213d932665e7128b61164295105f35b23579 SHA512 2156a2b283d0ace6a8bfb0d6bbe93bfca7cd651c30fdeea4e1fa2acc6a85790d34a869d4625ef83ad11e9ecc1fbc1e9acac6f40eb8ef5225ccc36bab2ddcf847
DIST docker-compose-1.27.3.tar.gz 309220 BLAKE2B eaf066f24bfff893e515a460be9abba79a59e5112a3a34a9002870babefd93950cf92ef66db469102c37e781d7fb986de069eef3fa09e4041b3a43d8bf1a3d30 SHA512 43e34760574d1ec009faa7a1fa09d621a2708f01f05819b46c67fe7ebf280807f97d9a5867cbfe75e9af6f097cd3f7c8c8fee66aa5392a4c62cdf44c7fb38075
+DIST docker-compose-1.27.4.tar.gz 309308 BLAKE2B 098af5e0308de4fe72f8f7d5c9cbdb285ec1cb6fbd492baef8a4223f93591321c585ebabd4c7e4a40d7a1bce3ab2d7ccf4cee1d0a15e7f59bb80eb4df5b6c8d6 SHA512 b41b7cf88b1380021a30f9becb7567d1e154ef875c42b37483673b5107f1a26dae6868b92c6a61f695001eb63759b25f3729e6783272eb784047717cafea3b80
diff --git a/app-emulation/docker-compose/docker-compose-1.27.4.ebuild b/app-emulation/docker-compose/docker-compose-1.27.4.ebuild
new file mode 100644
index 000000000000..21b5b42471fc
--- /dev/null
+++ b/app-emulation/docker-compose/docker-compose-1.27.4.ebuild
@@ -0,0 +1,73 @@
+# Copyright 2018-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{6,7,8,9} )
+DISTUTILS_USE_SETUPTOOLS=rdepend
+
+inherit bash-completion-r1 distutils-r1
+
+MY_PV=${PV/_/-}
+DESCRIPTION="Multi-container orchestration for Docker"
+HOMEPAGE="https://github.com/docker/compose"
+SRC_URI="https://github.com/docker/compose/archive/${MY_PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~arm64"
+IUSE="test"
+RESTRICT="!test? ( test )"
+
+RDEPEND="dev-python/setuptools[${PYTHON_USEDEP}]
+ >=dev-python/cached-property-1.2.0[${PYTHON_USEDEP}]
+ >=dev-python/distro-1.5.0[${PYTHON_USEDEP}]
+ >=dev-python/docker-py-4.3.1[${PYTHON_USEDEP}]
+ >=dev-python/dockerpty-0.4.1[${PYTHON_USEDEP}]
+ >=dev-python/docopt-0.6.1[${PYTHON_USEDEP}]
+ >=dev-python/python-dotenv-0.13.0[${PYTHON_USEDEP}]
+ >=dev-python/jsonschema-2.5.1[${PYTHON_USEDEP}]
+ dev-python/paramiko[${PYTHON_USEDEP}]
+ >=dev-python/PySocks-1.6.0[${PYTHON_USEDEP}]
+ >=dev-python/pyyaml-3.10[${PYTHON_USEDEP}]
+ >=dev-python/requests-2.20.0[${PYTHON_USEDEP}]
+ >=dev-python/six-1.3.0[${PYTHON_USEDEP}]
+ >=dev-python/texttable-0.9.0[${PYTHON_USEDEP}]
+ >=dev-python/websocket-client-0.32.0[${PYTHON_USEDEP}]"
+
+DEPEND="${RDEPEND}
+ test? (
+ >=dev-python/pytest-5[${PYTHON_USEDEP}]
+ >=dev-python/ddt-1.2.2[${PYTHON_USEDEP}]
+ )"
+
+S="${WORKDIR}/compose-${MY_PV}"
+
+PATCHES=(
+ # Bug #679968 -- https://bugs.gentoo.org/679968
+ # Bug #681002 -- https://bugs.gentoo.org/681002
+ "${FILESDIR}"/${PN}-1.27.0_rc3-setup-py.patch
+)
+
+DOCS=( CHANGELOG.md README.md )
+
+src_prepare() {
+ # Address QA issue "docker-compose.exe: missing alias (symlink) for completed command."
+ sed 's,^\(complete.*\) docker-compose\.exe\(.*\),\1\2,' -i contrib/completion/bash/docker-compose || die
+
+ default
+}
+
+python_test() {
+ distutils_install_for_testing
+ ${PYTHON} -m pytest tests/unit/ || die "tests failed under ${EPYTHON}"
+}
+
+python_install_all() {
+ newbashcomp contrib/completion/bash/docker-compose ${PN}
+
+ insinto /usr/share/zsh/site-functions
+ doins contrib/completion/zsh/*
+
+ distutils-r1_python_install_all
+}
diff --git a/app-emulation/docker-proxy/Manifest b/app-emulation/docker-proxy/Manifest
index 40b22745d58b..aea9f8853f1d 100644
--- a/app-emulation/docker-proxy/Manifest
+++ b/app-emulation/docker-proxy/Manifest
@@ -2,3 +2,4 @@ DIST docker-proxy-0.8.0_p20190513.tar.gz 2705298 BLAKE2B ff897b18b8265b3d718caf7
DIST docker-proxy-0.8.0_p20190604.tar.gz 2721379 BLAKE2B edc36302ca4b2be297505a5bfd8acd45f17bc752e88bcaa72f34e2d972230d92b9bfe3d0dccbb2f1e04718fb1adc95631fc0f533ca5572bdcfc468d843ce480e SHA512 dea31fd82ab2d445fbd39fe15550a91f7e489a06f6dedd32ea1925f7e9a7971952d26b874f9687249609a0d204ea35da357e0a957b819df2026a0cf8109cb354
DIST docker-proxy-0.8.0_p20190807.tar.gz 3377742 BLAKE2B c1ccc76dd9157c715d09db27b6800a86b0dc7532089d87eb78a6e656f3b42d4c4824c34e972196038f915e3b08b12197f305fd1a86e3fe75fec621ed49e5e71a SHA512 ffe18805dc6b85f8b058e342cde2baedf2497465298daa444fecba8222885606c85242ca59016bc32a5c2c0164c1c980b92ed3d5f82e011a7e9871a67d67b947
DIST docker-proxy-0.8.0_p20191011.tar.gz 3377526 BLAKE2B 10dd1817ffa65dc75855daba5efbe6dc7c8a048e8868354d2ad7c2cc4e99dcedb95ba4c5e37a54d60e4bd89c5f5bcac5fde4db8d21b7cc903fd42e4224a084e0 SHA512 a21b9b5883056cf75dda9f229ff199e6daad63d94dcf75ebe3e21204bdeef89c41ddd5730bb6bb4387af9a84a8a81e7adfaf726b2fdd299d8aa9d6d35a096ce2
+DIST docker-proxy-0.8.0_p20200617.tar.gz 3386043 BLAKE2B b32c3b6ef97f656414fdf026307f4054d4dd11cc91dc44a235eb5e5dc9f5f3da0cc4b001eaa28387b79f8f79f0124e6c01b8aab56d5c9e37d777e21cc186cb9c SHA512 fe8644611e975c051ee6e7ad4871624fb45862d9b4a2fd62ea4283e76ad9804d91d585e2165915b09356f11f9dfb31c40dd9ce6a66d63c5032c8c62354960538
diff --git a/app-emulation/docker-proxy/docker-proxy-0.8.0_p20200617.ebuild b/app-emulation/docker-proxy/docker-proxy-0.8.0_p20200617.ebuild
new file mode 100644
index 000000000000..20556e5fc46e
--- /dev/null
+++ b/app-emulation/docker-proxy/docker-proxy-0.8.0_p20200617.ebuild
@@ -0,0 +1,35 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+EGO_PN="github.com/docker/libnetwork"
+
+if [[ ${PV} == *9999 ]]; then
+ inherit golang-vcs
+else
+ EGIT_COMMIT="026aabaa659832804b01754aaadd2c0f420c68b6"
+ SRC_URI="https://${EGO_PN}/archive/${EGIT_COMMIT}.tar.gz -> ${P}.tar.gz"
+ KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
+ inherit golang-vcs-snapshot
+fi
+
+DESCRIPTION="Docker container networking"
+HOMEPAGE="https://github.com/docker/libnetwork"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+IUSE=""
+
+S=${WORKDIR}/${P}/src/${EGO_PN}
+
+# needs dockerd
+RESTRICT="test"
+
+src_compile() {
+ GOPATH="${WORKDIR}/${P}" go build -o "bin/docker-proxy" ./cmd/proxy || die
+}
+
+src_install() {
+ dodoc README.md CHANGELOG.md
+ dobin bin/docker-proxy
+}
diff --git a/app-emulation/docker/Manifest b/app-emulation/docker/Manifest
index 1dd498354435..7ae436f7bd75 100644
--- a/app-emulation/docker/Manifest
+++ b/app-emulation/docker/Manifest
@@ -1 +1,2 @@
DIST docker-19.03.12.tar.gz 18218138 BLAKE2B a018a1677d36c01a9eb8d9c597e6b264304a742929bf7f8bb3c12b03c75748bc6f3313f8e7c293323bc3ae013b5555044f7cf1ad7a8750a5794418bee05e405a SHA512 6ede7e0c5494882d88dae5b4ae45049937dfc65b9d655988ae4c0d6f9759bcac8799251f37a3e4ce49cdfbb04e31f9a6a05d131fb5005b382d2306ca0d5fcfa3
+DIST docker-19.03.13.tar.gz 18242693 BLAKE2B c19afed62694274298b42fc9af3b36c4cc6429b40f7e5447a996b87636a0d2e916476875652e20abd7aeab4e5e0e1cf887a04dcade1de03ded549fc36d911ac4 SHA512 5f34a14ef0b36a309d4a08926ac482ca82d24cdd873aa359c5ba7c65473cbb2e987fe615c38c1bc1c50135284da78a7eb98a8a0106d7d073aeda0cd8f1c31873
diff --git a/app-emulation/docker/docker-19.03.13-r2.ebuild b/app-emulation/docker/docker-19.03.13-r2.ebuild
new file mode 100644
index 000000000000..466ac242d032
--- /dev/null
+++ b/app-emulation/docker/docker-19.03.13-r2.ebuild
@@ -0,0 +1,316 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+EGO_PN="github.com/docker/docker-ce"
+
+if [[ ${PV} = *9999* ]]; then
+ # Docker cannot be fetched via "go get", thanks to autogenerated code
+ EGIT_REPO_URI="https://${EGO_PN}.git"
+ EGIT_CHECKOUT_DIR="${WORKDIR}/${P}/src/${EGO_PN}"
+ inherit git-r3
+else
+ DOCKER_GITCOMMIT=4484c46d9d
+ MY_PV=${PV/_/-}
+ SRC_URI="https://${EGO_PN}/archive/v${MY_PV}.tar.gz -> ${P}.tar.gz"
+ KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
+ [ "$DOCKER_GITCOMMIT" ] || die "DOCKER_GITCOMMIT must be added manually for each bump!"
+ inherit golang-vcs-snapshot
+fi
+inherit bash-completion-r1 golang-base linux-info systemd udev
+
+DESCRIPTION="The core functions you need to create Docker images and run Docker containers"
+HOMEPAGE="https://www.docker.com/"
+LICENSE="Apache-2.0"
+SLOT="0"
+IUSE="apparmor aufs btrfs +container-init device-mapper hardened overlay seccomp selinux"
+
+# https://github.com/docker/docker/blob/master/project/PACKAGERS.md#build-dependencies
+BDEPEND="
+ >=dev-lang/go-1.13.12
+ dev-go/go-md2man
+ virtual/pkgconfig
+"
+
+DEPEND="
+ acct-group/docker
+ >=dev-db/sqlite-3.7.9:3
+ apparmor? ( sys-libs/libapparmor )
+ btrfs? ( >=sys-fs/btrfs-progs-3.16.1 )
+ device-mapper? ( >=sys-fs/lvm2-2.02.89[thin] )
+ seccomp? ( >=sys-libs/libseccomp-2.2.1 )
+"
+
+# https://github.com/docker/docker/blob/master/project/PACKAGERS.md#runtime-dependencies
+# https://github.com/docker/docker/blob/master/project/PACKAGERS.md#optional-dependencies
+# https://github.com/docker/docker-ce/tree/master/components/engine/hack/dockerfile/install
+# make sure containerd, docker-proxy, runc and tini pinned to exact versions from ^,
+# for appropriate brachch/version of course
+RDEPEND="
+ ${DEPEND}
+ !sys-apps/systemd[-cgroup-hybrid(+)]
+ >=net-firewall/iptables-1.4
+ sys-process/procps
+ >=dev-vcs/git-1.7
+ >=app-arch/xz-utils-4.9
+ dev-libs/libltdl
+ ~app-emulation/containerd-1.3.7[apparmor?,btrfs?,device-mapper?,seccomp?,selinux?]
+ ~app-emulation/runc-1.0.0_rc10[apparmor?,seccomp?,selinux(-)?]
+ ~app-emulation/docker-proxy-0.8.0_p20200617
+ container-init? ( >=sys-process/tini-0.18.0[static] )
+"
+
+RESTRICT="installsources strip"
+
+S="${WORKDIR}/${P}/src/${EGO_PN}"
+
+# see "contrib/check-config.sh" from upstream's sources
+CONFIG_CHECK="
+ ~NAMESPACES ~NET_NS ~PID_NS ~IPC_NS ~UTS_NS
+ ~CGROUPS ~CGROUP_CPUACCT ~CGROUP_DEVICE ~CGROUP_FREEZER ~CGROUP_SCHED ~CPUSETS ~MEMCG
+ ~KEYS
+ ~VETH ~BRIDGE ~BRIDGE_NETFILTER
+ ~IP_NF_FILTER ~IP_NF_TARGET_MASQUERADE
+ ~NETFILTER_XT_MATCH_ADDRTYPE ~NETFILTER_XT_MATCH_CONNTRACK ~NETFILTER_XT_MATCH_IPVS
+ ~IP_NF_NAT ~NF_NAT
+ ~POSIX_MQUEUE
+
+ ~USER_NS
+ ~SECCOMP
+ ~CGROUP_PIDS
+ ~MEMCG_SWAP
+
+ ~BLK_CGROUP ~BLK_DEV_THROTTLING
+ ~CGROUP_PERF
+ ~CGROUP_HUGETLB
+ ~NET_CLS_CGROUP
+ ~CFS_BANDWIDTH ~FAIR_GROUP_SCHED ~RT_GROUP_SCHED
+ ~IP_VS ~IP_VS_PROTO_TCP ~IP_VS_PROTO_UDP ~IP_VS_NFCT ~IP_VS_RR
+
+ ~VXLAN
+ ~CRYPTO ~CRYPTO_AEAD ~CRYPTO_GCM ~CRYPTO_SEQIV ~CRYPTO_GHASH ~XFRM_ALGO ~XFRM_USER
+ ~IPVLAN
+ ~MACVLAN ~DUMMY
+
+ ~OVERLAY_FS
+ ~EXT4_FS_SECURITY
+ ~EXT4_FS_POSIX_ACL
+"
+
+ERROR_KEYS="CONFIG_KEYS: is mandatory"
+ERROR_MEMCG_SWAP="CONFIG_MEMCG_SWAP: is required if you wish to limit swap usage of containers"
+ERROR_RESOURCE_COUNTERS="CONFIG_RESOURCE_COUNTERS: is optional for container statistics gathering"
+
+ERROR_BLK_CGROUP="CONFIG_BLK_CGROUP: is optional for container statistics gathering"
+ERROR_IOSCHED_CFQ="CONFIG_IOSCHED_CFQ: is optional for container statistics gathering"
+ERROR_CGROUP_PERF="CONFIG_CGROUP_PERF: is optional for container statistics gathering"
+ERROR_CFS_BANDWIDTH="CONFIG_CFS_BANDWIDTH: is optional for container statistics gathering"
+ERROR_XFRM_ALGO="CONFIG_XFRM_ALGO: is optional for secure networks"
+ERROR_XFRM_USER="CONFIG_XFRM_USER: is optional for secure networks"
+
+pkg_setup() {
+ if kernel_is lt 3 10; then
+ ewarn ""
+ ewarn "Using Docker with kernels older than 3.10 is unstable and unsupported."
+ ewarn " - http://docs.docker.com/engine/installation/binaries/#check-kernel-dependencies"
+ fi
+
+ if kernel_is le 3 18; then
+ CONFIG_CHECK+="
+ ~RESOURCE_COUNTERS
+ "
+ fi
+
+ if kernel_is le 3 13; then
+ CONFIG_CHECK+="
+ ~NETPRIO_CGROUP
+ "
+ else
+ CONFIG_CHECK+="
+ ~CGROUP_NET_PRIO
+ "
+ fi
+
+ if kernel_is lt 4 5; then
+ CONFIG_CHECK+="
+ ~MEMCG_KMEM
+ "
+ ERROR_MEMCG_KMEM="CONFIG_MEMCG_KMEM: is optional"
+ fi
+
+ if kernel_is lt 4 7; then
+ CONFIG_CHECK+="
+ ~DEVPTS_MULTIPLE_INSTANCES
+ "
+ fi
+
+ if kernel_is lt 5 1; then
+ CONFIG_CHECK+="
+ ~NF_NAT_IPV4
+ ~IOSCHED_CFQ
+ ~CFQ_GROUP_IOSCHED
+ "
+ fi
+
+ if kernel_is lt 5 2; then
+ CONFIG_CHECK+="
+ ~NF_NAT_NEEDED
+ "
+ fi
+
+ if kernel_is lt 5 8; then
+ CONFIG_CHECK+="
+ ~MEMCG_SWAP_ENABLED
+ "
+ fi
+
+ if use aufs; then
+ CONFIG_CHECK+="
+ ~AUFS_FS
+ ~EXT4_FS_POSIX_ACL ~EXT4_FS_SECURITY
+ "
+ ERROR_AUFS_FS="CONFIG_AUFS_FS: is required to be set if and only if aufs-sources are used instead of aufs4/aufs3"
+ fi
+
+ if use btrfs; then
+ CONFIG_CHECK+="
+ ~BTRFS_FS
+ ~BTRFS_FS_POSIX_ACL
+ "
+ fi
+
+ if use device-mapper; then
+ CONFIG_CHECK+="
+ ~BLK_DEV_DM ~DM_THIN_PROVISIONING ~EXT4_FS ~EXT4_FS_POSIX_ACL ~EXT4_FS_SECURITY
+ "
+ fi
+
+ linux-info_pkg_setup
+}
+
+src_compile() {
+ export GOPATH="${WORKDIR}/${P}"
+
+ # setup CFLAGS and LDFLAGS for separate build target
+ # see https://github.com/tianon/docker-overlay/pull/10
+ export CGO_CFLAGS="-I${ROOT}/usr/include"
+ export CGO_LDFLAGS="-L${ROOT}/usr/$(get_libdir)"
+
+ # if we're building from a tarball, we need the GITCOMMIT value
+ [[ ${DOCKER_GITCOMMIT} ]] && export DOCKER_GITCOMMIT
+
+ # fake golang layout
+ ln -s docker-ce/components/engine ../docker || die
+ ln -s docker-ce/components/cli ../cli || die
+
+ # let's set up some optional features :)
+ export DOCKER_BUILDTAGS=''
+ for gd in aufs btrfs device-mapper overlay; do
+ if ! use $gd; then
+ DOCKER_BUILDTAGS+=" exclude_graphdriver_${gd//-/}"
+ fi
+ done
+
+ for tag in apparmor seccomp selinux; do
+ if use $tag; then
+ DOCKER_BUILDTAGS+=" $tag"
+ fi
+ done
+
+ pushd components/engine || die
+
+ if use hardened; then
+ sed -i "s/EXTLDFLAGS_STATIC='/&-fno-PIC /" hack/make.sh || die
+ grep -q -- '-fno-PIC' hack/make.sh || die 'hardened sed failed'
+ sed "s/LDFLAGS_STATIC_DOCKER='/&-extldflags -fno-PIC /" \
+ -i hack/make/dynbinary-daemon || die
+ grep -q -- '-fno-PIC' hack/make/dynbinary-daemon || die 'hardened sed failed'
+ fi
+
+ # build daemon
+ VERSION="$(cat ../../VERSION)" \
+ ./hack/make.sh dynbinary || die 'dynbinary failed'
+
+ popd || die # components/engine
+
+ pushd components/cli || die
+
+ # build cli
+ DISABLE_WARN_OUTSIDE_CONTAINER=1 emake \
+ LDFLAGS="$(usex hardened '-extldflags -fno-PIC' '')" \
+ VERSION="$(cat ../../VERSION)" \
+ GITCOMMIT="${DOCKER_GITCOMMIT}" \
+ dynbinary
+
+ # build man pages
+ go build -o gen-manpages github.com/docker/cli/man || die
+ ./gen-manpages --root . --target ./man/man1 || die
+ ./man/md2man-all.sh -q || die
+ rm gen-manpages || die
+ # see "components/cli/scripts/docs/generate-man.sh" (which also does "go get" for go-md2man)
+
+ popd || die # components/cli
+}
+
+src_install() {
+ dosym containerd /usr/bin/docker-containerd
+ dosym containerd-shim /usr/bin/docker-containerd-shim
+ dosym runc /usr/bin/docker-runc
+ use container-init && dosym tini /usr/bin/docker-init
+
+ pushd components/engine || die
+ newbin bundles/dynbinary-daemon/dockerd-${PV} dockerd
+
+ newinitd contrib/init/openrc/docker.initd docker
+ newconfd contrib/init/openrc/docker.confd docker
+
+ systemd_dounit contrib/init/systemd/docker.{service,socket}
+
+ udev_dorules contrib/udev/*.rules
+
+ dodoc AUTHORS CONTRIBUTING.md CHANGELOG.md NOTICE README.md
+ dodoc -r docs/*
+
+ insinto /usr/share/vim/vimfiles
+ doins -r contrib/syntax/vim/ftdetect
+ doins -r contrib/syntax/vim/syntax
+
+ # note: intentionally not using "doins" so that we preserve +x bits
+ dodir /usr/share/${PN}/contrib
+ cp -R contrib/* "${ED}/usr/share/${PN}/contrib"
+ popd || die # components/engine
+
+ pushd components/cli || die
+
+ newbin build/docker-* docker
+
+ doman man/man*/*
+
+ sed -i 's@dockerd\?\.exe@@g' contrib/completion/bash/docker || die
+ dobashcomp contrib/completion/bash/*
+ bashcomp_alias docker dockerd
+ insinto /usr/share/fish/vendor_completions.d/
+ doins contrib/completion/fish/docker.fish
+ insinto /usr/share/zsh/site-functions
+ doins contrib/completion/zsh/_*
+ popd || die # components/cli
+}
+
+pkg_postinst() {
+ udev_reload
+
+ elog
+ elog "To use Docker, the Docker daemon must be running as root. To automatically"
+ elog "start the Docker daemon at boot, add Docker to the default runlevel:"
+ elog " rc-update add docker default"
+ elog "Similarly for systemd:"
+ elog " systemctl enable docker.service"
+ elog
+ elog "To use Docker as a non-root user, add yourself to the 'docker' group:"
+ elog " usermod -aG docker youruser"
+ elog
+
+ elog " Devicemapper storage driver has been deprecated"
+ elog " It will be removed in a future release"
+}
diff --git a/app-emulation/libpod/Manifest b/app-emulation/libpod/Manifest
index 93c86fe3f2ae..6afb95c4974d 100644
--- a/app-emulation/libpod/Manifest
+++ b/app-emulation/libpod/Manifest
@@ -1,8 +1 @@
-DIST libpod-1.8.2.tar.gz 30065262 BLAKE2B 1bf4ca9b9547a710f1882ac40aee0cf295fecdb9d43dc6fa30633331ca9e19d15e6d671075627939167cdf100d30e8299e50bd51425226ff1994778782cf261b SHA512 c6e1426f66299a21be66be033460c44830b422f8a3319f37bbe53030f6a2bf84b140a29f30b83f6b61199f1df373f81a6d73787d16423ad942fc8a9154c68366
-DIST libpod-1.9.3.tar.gz 8869143 BLAKE2B 52c049c3a9c96729f32c1b7a9fc4b182614d18edd12ee1d5b19730a870b694f5c4489577bbf547cf86baf51b6fadfdf1a1513ff784a4c549f5b737549187f3a3 SHA512 d85cdf49b740f47a341b7717a4bc22ff326d22234e224bd572a3d879b75eaa33139bebdc293c2e7bc41a9902289d89380b9b56975a0826172324e9a54f8f5e03
-DIST libpod-2.0.0.tar.gz 9126598 BLAKE2B 3c2d18a921b88ef235b14f069e7571f83b1add39ec4ecd20b98f4879d287c481a525e01969c9b62f8b81e0be43eb864266f32f78af3f1a5ca92c4b1c4a9a16ce SHA512 29f7e365dbd4ab6d20ee3e85939804f74dcfe95f65a6d030d1c10a36512c29d3934907cbb014047d659fd96ed3a2946570ef7922cd77cc729370ac099b4b58a2
-DIST libpod-2.0.1.tar.gz 9136153 BLAKE2B 4c60dc047ae7fd6a2918589a30f6dc94c13251ed0002e77919adfb9dbe0a3c7b14e40e204c5879273589673a573aa318a3d5b972c32236143e166cb96a7cc3c8 SHA512 e52d3eef3d698360a0196dca6338c319511b6685c0237bd4d24a3763eb5e46262946d7609d1f36798dec6eb63d4511efdc8b77fa22c06bd55b666505f4fe6730
-DIST podman-2.0.2.tar.gz 9192157 BLAKE2B b8635ea5b166082be03a041f74d6c7a5c8bed04131b039ba505f87240a1a2e4503a3dc14c037eeb41955ff7f949dc0978571ec63f011adb9e5a6efa1157b6bce SHA512 5bcdca28021c8b36b5689e69c00232ca20404af0903ea632cea350ecf6b6eed091260f1b8fea8fe6d06caa7a475ba87ef4f3e86e83807ffdd187f9ccc41cb194
-DIST podman-2.0.3.tar.gz 9303421 BLAKE2B c0882c7fff60f33d1dc6752120a36ce35ce321c661ec29ae940f392b5ef9fb6176fea556a89ca9823b4981997d6e61545531d39d95b31d23602b0d3e1a78870a SHA512 ee6d4f4735196fc07e03e9c1e99aa62650d9651bd5f24657398d42b3f2ebf59240a49fecfbf71a3d90636ea44c243cc4f7504c43d8f48e76ee504b3d10762240
-DIST podman-2.0.4.tar.gz 9305631 BLAKE2B a6a5760886d112b6cd69625137ec0aa9e368e8ff09f114123ff0b17ad2ef5b26b5eb645a5bbabc30a7cb900d7844587e0051969fefba9d5e8b5652a571857e09 SHA512 39313615b4c0befec3a073b7bf4a689208e39cb7bcba81f6d8982e188402c457cbe4835a128274761e55ab1272a780f9747caa07746fe62af7a568eebc96ad6a
-DIST podman-2.0.5.tar.gz 9338371 BLAKE2B 8bf86ac438c2a7c250d77df46d315dfa9d3326097a332e32de08b4d9acfeae9ace0b1825f242cddaf6178fd34d4c7542e9c59c4ce462525371c081b60cf0e9a7 SHA512 efe1bdfd1fec61d470c748ac1cfff8ec4a64a47751becac2c35d85e61f1f1d511781f4fafb3463558bd5df347f3ee021c4f9ed00823b6cb5dd8963a2c2bc570b
+DIST podman-2.1.0.tar.gz 9444707 BLAKE2B 62dacd316a8d6ae8aab0523338d818c69cf1228120e828a89301c9fdbb98082b85328c03c61f9f2a36c7a50105ce5fd025ad2b0e9ba2705c86b0d7e263fc92a6 SHA512 eb9b0cb184138af022e6d8e145fc6c4188c75c0695e0c6e62d54112a6b143424dd0caf9686f83637d08ff1fdbc24afca564c89f8cb4ab68b8f8d07345856398e
diff --git a/app-emulation/libpod/libpod-1.8.2.ebuild b/app-emulation/libpod/libpod-1.8.2.ebuild
deleted file mode 100644
index f409cd2a3e0d..000000000000
--- a/app-emulation/libpod/libpod-1.8.2.ebuild
+++ /dev/null
@@ -1,141 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-EGIT_COMMIT="028e3317eb1494b9b2acba4a0a295df80fae66cc"
-
-inherit bash-completion-r1 flag-o-matic go-module
-
-DESCRIPTION="Library and podman tool for running OCI-based containers in Pods"
-HOMEPAGE="https://github.com/containers/libpod/"
-SRC_URI="https://github.com/containers/libpod/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-LICENSE="Apache-2.0 BSD BSD-2 CC-BY-SA-4.0 ISC MIT MPL-2.0"
-SLOT="0"
-
-KEYWORDS="~amd64"
-IUSE="apparmor btrfs +rootless selinux"
-RESTRICT="test"
-
-COMMON_DEPEND="
- app-crypt/gpgme:=
- >=app-emulation/conmon-2.0.0
- || ( >=app-emulation/runc-1.0.0_rc6 app-emulation/crun )
- dev-libs/libassuan:=
- dev-libs/libgpg-error:=
- >=net-misc/cni-plugins-0.8.6
- sys-fs/lvm2
- sys-libs/libseccomp:=
-
- apparmor? ( sys-libs/libapparmor )
- btrfs? ( sys-fs/btrfs-progs )
- rootless? ( app-emulation/slirp4netns )
- selinux? ( sys-libs/libselinux:= )
-"
-DEPEND="
- ${COMMON_DEPEND}
- dev-go/go-md2man"
-RDEPEND="${COMMON_DEPEND}"
-
-src_prepare() {
- default
-
- # Disable installation of python modules here, since those are
- # installed by separate ebuilds.
- local makefile_sed_args=(
- -e '/^GIT_.*/d'
- -e 's/$(GO) build/$(GO) build -v -work -x/'
- -e 's/^\(install:.*\) install\.python$/\1/'
- )
-
- has_version -b '>=dev-lang/go-1.13.9' || makefile_sed_args+=(-e 's:GO111MODULE=off:GO111MODULE=on:')
-
- sed "${makefile_sed_args[@]}" -i Makefile || die
-
- sed -e 's|OUTPUT="${CIRRUS_TAG:.*|OUTPUT='v${PV}'|' \
- -i hack/get_release_info.sh || die
-}
-
-src_compile() {
- # Filter unsupported linker flags
- filter-flags '-Wl,*'
-
- [[ -f hack/apparmor_tag.sh ]] || die
- if use apparmor; then
- echo -e "#!/bin/sh\necho apparmor" > hack/apparmor_tag.sh || die
- else
- echo -e "#!/bin/sh\ntrue" > hack/apparmor_tag.sh || die
- fi
-
- [[ -f hack/btrfs_installed_tag.sh ]] || die
- if use btrfs; then
- echo -e "#!/bin/sh\ntrue" > hack/btrfs_installed_tag.sh || die
- else
- echo -e "#!/bin/sh\necho exclude_graphdriver_btrfs" > \
- hack/btrfs_installed_tag.sh || die
- fi
-
- [[ -f hack/selinux_tag.sh ]] || die
- if use selinux; then
- echo -e "#!/bin/sh\necho selinux" > hack/selinux_tag.sh || die
- else
- echo -e "#!/bin/sh\ntrue" > hack/selinux_tag.sh || die
- fi
-
- export -n GOCACHE GOPATH XDG_CACHE_HOME
- GOBIN="${S}/bin" \
- emake all \
- GIT_BRANCH=master \
- GIT_BRANCH_CLEAN=master \
- COMMIT_NO="${EGIT_COMMIT}" \
- GIT_COMMIT="${EGIT_COMMIT}"
-}
-
-src_install() {
- emake DESTDIR="${D}" PREFIX="${EPREFIX}/usr" install
-
- insinto /etc/containers
- newins test/registries.conf registries.conf.example
- newins test/policy.json policy.json.example
-
- insinto /usr/share/containers
- doins seccomp.json
-
- newinitd "${FILESDIR}"/podman.initd podman
-
- insinto /etc/logrotate.d
- newins "${FILESDIR}/podman.logrotated" podman
-
- dobashcomp completions/bash/*
-
- keepdir /var/lib/containers
-}
-
-pkg_preinst() {
- LIBPOD_ROOTLESS_UPGRADE=false
- if use rootless; then
- has_version 'app-emulation/libpod[rootless]' || LIBPOD_ROOTLESS_UPGRADE=true
- fi
-}
-
-pkg_postinst() {
- local want_newline=false
- if [[ ! ( -e ${EROOT%/*}/etc/containers/policy.json && -e ${EROOT%/*}/etc/containers/registries.conf ) ]]; then
- elog "You need to create the following config files:"
- elog "/etc/containers/registries.conf"
- elog "/etc/containers/policy.json"
- elog "To copy over default examples, use:"
- elog "cp /etc/containers/registries.conf{.example,}"
- elog "cp /etc/containers/policy.json{.example,}"
- want_newline=true
- fi
- if [[ ${LIBPOD_ROOTLESS_UPGRADE} == true ]] ; then
- ${want_newline} && elog ""
- elog "For rootless operation, you need to configure subuid/subgid"
- elog "for user running podman. In case subuid/subgid has only been"
- elog "configured for root, run:"
- elog "usermod --add-subuids 1065536-1131071 "
- elog "usermod --add-subgids 1065536-1131071 "
- want_newline=true
- fi
-}
diff --git a/app-emulation/libpod/libpod-1.9.3.ebuild b/app-emulation/libpod/libpod-1.9.3.ebuild
deleted file mode 100644
index 4a3ce8c2baa8..000000000000
--- a/app-emulation/libpod/libpod-1.9.3.ebuild
+++ /dev/null
@@ -1,142 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-EGIT_COMMIT="5d44534fff6877b1cb15b760242279ae6293154c"
-
-inherit bash-completion-r1 flag-o-matic go-module
-
-DESCRIPTION="Library and podman tool for running OCI-based containers in Pods"
-HOMEPAGE="https://github.com/containers/libpod/"
-SRC_URI="https://github.com/containers/libpod/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-LICENSE="Apache-2.0 BSD BSD-2 CC-BY-SA-4.0 ISC MIT MPL-2.0"
-SLOT="0"
-
-KEYWORDS="~amd64"
-IUSE="apparmor btrfs +fuse +rootless selinux"
-RESTRICT="test"
-
-COMMON_DEPEND="
- app-crypt/gpgme:=
- >=app-emulation/conmon-2.0.0
- || ( >=app-emulation/runc-1.0.0_rc6 app-emulation/crun )
- dev-libs/libassuan:=
- dev-libs/libgpg-error:=
- >=net-misc/cni-plugins-0.8.6
- sys-fs/lvm2
- sys-libs/libseccomp:=
-
- apparmor? ( sys-libs/libapparmor )
- btrfs? ( sys-fs/btrfs-progs )
- rootless? ( app-emulation/slirp4netns )
- selinux? ( sys-libs/libselinux:= )
-"
-DEPEND="
- ${COMMON_DEPEND}
- dev-go/go-md2man"
-RDEPEND="${COMMON_DEPEND}
- fuse? ( sys-fs/fuse-overlayfs )"
-
-src_prepare() {
- default
-
- # Disable installation of python modules here, since those are
- # installed by separate ebuilds.
- local makefile_sed_args=(
- -e '/^GIT_.*/d'
- -e 's/$(GO) build/$(GO) build -v -work -x/'
- -e 's/^\(install:.*\) install\.python$/\1/'
- )
-
- has_version -b '>=dev-lang/go-1.13.9' || makefile_sed_args+=(-e 's:GO111MODULE=off:GO111MODULE=on:')
-
- sed "${makefile_sed_args[@]}" -i Makefile || die
-
- sed -e 's|OUTPUT="${CIRRUS_TAG:.*|OUTPUT='v${PV}'|' \
- -i hack/get_release_info.sh || die
-}
-
-src_compile() {
- # Filter unsupported linker flags
- filter-flags '-Wl,*'
-
- [[ -f hack/apparmor_tag.sh ]] || die
- if use apparmor; then
- echo -e "#!/bin/sh\necho apparmor" > hack/apparmor_tag.sh || die
- else
- echo -e "#!/bin/sh\ntrue" > hack/apparmor_tag.sh || die
- fi
-
- [[ -f hack/btrfs_installed_tag.sh ]] || die
- if use btrfs; then
- echo -e "#!/bin/sh\ntrue" > hack/btrfs_installed_tag.sh || die
- else
- echo -e "#!/bin/sh\necho exclude_graphdriver_btrfs" > \
- hack/btrfs_installed_tag.sh || die
- fi
-
- [[ -f hack/selinux_tag.sh ]] || die
- if use selinux; then
- echo -e "#!/bin/sh\necho selinux" > hack/selinux_tag.sh || die
- else
- echo -e "#!/bin/sh\ntrue" > hack/selinux_tag.sh || die
- fi
-
- export -n GOCACHE GOPATH XDG_CACHE_HOME
- GOBIN="${S}/bin" \
- emake all \
- GIT_BRANCH=master \
- GIT_BRANCH_CLEAN=master \
- COMMIT_NO="${EGIT_COMMIT}" \
- GIT_COMMIT="${EGIT_COMMIT}"
-}
-
-src_install() {
- emake DESTDIR="${D}" PREFIX="${EPREFIX}/usr" install
-
- insinto /etc/containers
- newins test/registries.conf registries.conf.example
- newins test/policy.json policy.json.example
-
- insinto /usr/share/containers
- doins seccomp.json
-
- newinitd "${FILESDIR}"/podman.initd podman
-
- insinto /etc/logrotate.d
- newins "${FILESDIR}/podman.logrotated" podman
-
- dobashcomp completions/bash/*
-
- keepdir /var/lib/containers
-}
-
-pkg_preinst() {
- LIBPOD_ROOTLESS_UPGRADE=false
- if use rootless; then
- has_version 'app-emulation/libpod[rootless]' || LIBPOD_ROOTLESS_UPGRADE=true
- fi
-}
-
-pkg_postinst() {
- local want_newline=false
- if [[ ! ( -e ${EROOT%/*}/etc/containers/policy.json && -e ${EROOT%/*}/etc/containers/registries.conf ) ]]; then
- elog "You need to create the following config files:"
- elog "/etc/containers/registries.conf"
- elog "/etc/containers/policy.json"
- elog "To copy over default examples, use:"
- elog "cp /etc/containers/registries.conf{.example,}"
- elog "cp /etc/containers/policy.json{.example,}"
- want_newline=true
- fi
- if [[ ${LIBPOD_ROOTLESS_UPGRADE} == true ]] ; then
- ${want_newline} && elog ""
- elog "For rootless operation, you need to configure subuid/subgid"
- elog "for user running podman. In case subuid/subgid has only been"
- elog "configured for root, run:"
- elog "usermod --add-subuids 1065536-1131071 "
- elog "usermod --add-subgids 1065536-1131071 "
- want_newline=true
- fi
-}
diff --git a/app-emulation/libpod/libpod-2.0.0.ebuild b/app-emulation/libpod/libpod-2.0.0.ebuild
deleted file mode 100644
index 3e87211f35f4..000000000000
--- a/app-emulation/libpod/libpod-2.0.0.ebuild
+++ /dev/null
@@ -1,150 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-EGIT_COMMIT="5d44534fff6877b1cb15b760242279ae6293154c"
-
-inherit bash-completion-r1 flag-o-matic go-module
-
-DESCRIPTION="Library and podman tool for running OCI-based containers in Pods"
-HOMEPAGE="https://github.com/containers/libpod/"
-SRC_URI="https://github.com/containers/libpod/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-LICENSE="Apache-2.0 BSD BSD-2 CC-BY-SA-4.0 ISC MIT MPL-2.0"
-SLOT="0"
-
-KEYWORDS="~amd64"
-IUSE="apparmor btrfs +fuse +rootless selinux"
-RESTRICT="test"
-
-COMMON_DEPEND="
- app-crypt/gpgme:=
- >=app-emulation/conmon-2.0.0
- || ( >=app-emulation/runc-1.0.0_rc6 app-emulation/crun )
- dev-libs/libassuan:=
- dev-libs/libgpg-error:=
- >=net-misc/cni-plugins-0.8.6
- sys-fs/lvm2
- sys-libs/libseccomp:=
-
- apparmor? ( sys-libs/libapparmor )
- btrfs? ( sys-fs/btrfs-progs )
- rootless? ( app-emulation/slirp4netns )
- selinux? ( sys-libs/libselinux:= )
-"
-DEPEND="
- ${COMMON_DEPEND}
- dev-go/go-md2man"
-RDEPEND="${COMMON_DEPEND}
- fuse? ( sys-fs/fuse-overlayfs )"
-
-src_prepare() {
- default
-
- # Disable installation of python modules here, since those are
- # installed by separate ebuilds.
- local makefile_sed_args=(
- -e '/^GIT_.*/d'
- -e 's/$(GO) build/$(GO) build -v -work -x/'
- -e 's/^\(install:.*\) install\.python$/\1/'
- -e 's|^pkg/varlink/iopodman.go: .gopathok pkg/varlink/io.podman.varlink$|pkg/varlink/iopodman.go: pkg/varlink/io.podman.varlink|'
- )
-
- has_version -b '>=dev-lang/go-1.13.9' || makefile_sed_args+=(-e 's:GO111MODULE=off:GO111MODULE=on:')
-
- sed "${makefile_sed_args[@]}" -i Makefile || die
-
- sed -e 's|OUTPUT="${CIRRUS_TAG:.*|OUTPUT='v${PV}'|' \
- -i hack/get_release_info.sh || die
-}
-
-src_compile() {
- # Filter unsupported linker flags
- filter-flags '-Wl,*'
-
- [[ -f hack/apparmor_tag.sh ]] || die
- if use apparmor; then
- echo -e "#!/bin/sh\necho apparmor" > hack/apparmor_tag.sh || die
- else
- echo -e "#!/bin/sh\ntrue" > hack/apparmor_tag.sh || die
- fi
-
- [[ -f hack/btrfs_installed_tag.sh ]] || die
- if use btrfs; then
- echo -e "#!/bin/sh\ntrue" > hack/btrfs_installed_tag.sh || die
- else
- echo -e "#!/bin/sh\necho exclude_graphdriver_btrfs" > \
- hack/btrfs_installed_tag.sh || die
- fi
-
- [[ -f hack/selinux_tag.sh ]] || die
- if use selinux; then
- echo -e "#!/bin/sh\necho selinux" > hack/selinux_tag.sh || die
- else
- echo -e "#!/bin/sh\ntrue" > hack/selinux_tag.sh || die
- fi
-
- # Avoid this error when generating pkg/varlink/iopodman.go:
- # cannot find package "github.com/varlink/go/varlink/idl"
- mkdir -p _output || die
- ln -snf ../vendor _output/src || die
- GO111MODULE=off GOPATH=${PWD}/_output go generate ./pkg/varlink/... || die
- rm _output/src || die
-
- export -n GOCACHE GOPATH XDG_CACHE_HOME
- GOBIN="${S}/bin" \
- emake all \
- GIT_BRANCH=master \
- GIT_BRANCH_CLEAN=master \
- COMMIT_NO="${EGIT_COMMIT}" \
- GIT_COMMIT="${EGIT_COMMIT}"
-}
-
-src_install() {
- emake DESTDIR="${D}" PREFIX="${EPREFIX}/usr" install
-
- insinto /etc/containers
- newins test/registries.conf registries.conf.example
- newins test/policy.json policy.json.example
-
- insinto /usr/share/containers
- doins seccomp.json
-
- newinitd "${FILESDIR}"/podman.initd podman
-
- insinto /etc/logrotate.d
- newins "${FILESDIR}/podman.logrotated" podman
-
- dobashcomp completions/bash/*
-
- keepdir /var/lib/containers
-}
-
-pkg_preinst() {
- LIBPOD_ROOTLESS_UPGRADE=false
- if use rootless; then
- has_version 'app-emulation/libpod[rootless]' || LIBPOD_ROOTLESS_UPGRADE=true
- fi
-}
-
-pkg_postinst() {
- local want_newline=false
- if [[ ! ( -e ${EROOT%/*}/etc/containers/policy.json && -e ${EROOT%/*}/etc/containers/registries.conf ) ]]; then
- elog "You need to create the following config files:"
- elog "/etc/containers/registries.conf"
- elog "/etc/containers/policy.json"
- elog "To copy over default examples, use:"
- elog "cp /etc/containers/registries.conf{.example,}"
- elog "cp /etc/containers/policy.json{.example,}"
- want_newline=true
- fi
- if [[ ${LIBPOD_ROOTLESS_UPGRADE} == true ]] ; then
- ${want_newline} && elog ""
- elog "For rootless operation, you need to configure subuid/subgid"
- elog "for user running podman. In case subuid/subgid has only been"
- elog "configured for root, run:"
- elog "usermod --add-subuids 1065536-1131071 "
- elog "usermod --add-subgids 1065536-1131071 "
- want_newline=true
- fi
-}
diff --git a/app-emulation/libpod/libpod-2.0.1.ebuild b/app-emulation/libpod/libpod-2.0.1.ebuild
deleted file mode 100644
index bfded9611d46..000000000000
--- a/app-emulation/libpod/libpod-2.0.1.ebuild
+++ /dev/null
@@ -1,150 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-EGIT_COMMIT="a11c4ead10177a66ef2810a0a92ea8ce2299da07"
-
-inherit bash-completion-r1 flag-o-matic go-module
-
-DESCRIPTION="Library and podman tool for running OCI-based containers in Pods"
-HOMEPAGE="https://github.com/containers/libpod/"
-SRC_URI="https://github.com/containers/libpod/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-LICENSE="Apache-2.0 BSD BSD-2 CC-BY-SA-4.0 ISC MIT MPL-2.0"
-SLOT="0"
-
-KEYWORDS="~amd64"
-IUSE="apparmor btrfs +fuse +rootless selinux"
-RESTRICT="test"
-
-COMMON_DEPEND="
- app-crypt/gpgme:=
- >=app-emulation/conmon-2.0.0
- || ( >=app-emulation/runc-1.0.0_rc6 app-emulation/crun )
- dev-libs/libassuan:=
- dev-libs/libgpg-error:=
- >=net-misc/cni-plugins-0.8.6
- sys-fs/lvm2
- sys-libs/libseccomp:=
-
- apparmor? ( sys-libs/libapparmor )
- btrfs? ( sys-fs/btrfs-progs )
- rootless? ( app-emulation/slirp4netns )
- selinux? ( sys-libs/libselinux:= )
-"
-DEPEND="
- ${COMMON_DEPEND}
- dev-go/go-md2man"
-RDEPEND="${COMMON_DEPEND}
- fuse? ( sys-fs/fuse-overlayfs )"
-
-src_prepare() {
- default
-
- # Disable installation of python modules here, since those are
- # installed by separate ebuilds.
- local makefile_sed_args=(
- -e '/^GIT_.*/d'
- -e 's/$(GO) build/$(GO) build -v -work -x/'
- -e 's/^\(install:.*\) install\.python$/\1/'
- -e 's|^pkg/varlink/iopodman.go: .gopathok pkg/varlink/io.podman.varlink$|pkg/varlink/iopodman.go: pkg/varlink/io.podman.varlink|'
- )
-
- has_version -b '>=dev-lang/go-1.13.9' || makefile_sed_args+=(-e 's:GO111MODULE=off:GO111MODULE=on:')
-
- sed "${makefile_sed_args[@]}" -i Makefile || die
-
- sed -e 's|OUTPUT="${CIRRUS_TAG:.*|OUTPUT='v${PV}'|' \
- -i hack/get_release_info.sh || die
-}
-
-src_compile() {
- # Filter unsupported linker flags
- filter-flags '-Wl,*'
-
- [[ -f hack/apparmor_tag.sh ]] || die
- if use apparmor; then
- echo -e "#!/bin/sh\necho apparmor" > hack/apparmor_tag.sh || die
- else
- echo -e "#!/bin/sh\ntrue" > hack/apparmor_tag.sh || die
- fi
-
- [[ -f hack/btrfs_installed_tag.sh ]] || die
- if use btrfs; then
- echo -e "#!/bin/sh\ntrue" > hack/btrfs_installed_tag.sh || die
- else
- echo -e "#!/bin/sh\necho exclude_graphdriver_btrfs" > \
- hack/btrfs_installed_tag.sh || die
- fi
-
- [[ -f hack/selinux_tag.sh ]] || die
- if use selinux; then
- echo -e "#!/bin/sh\necho selinux" > hack/selinux_tag.sh || die
- else
- echo -e "#!/bin/sh\ntrue" > hack/selinux_tag.sh || die
- fi
-
- # Avoid this error when generating pkg/varlink/iopodman.go:
- # cannot find package "github.com/varlink/go/varlink/idl"
- mkdir -p _output || die
- ln -snf ../vendor _output/src || die
- GO111MODULE=off GOPATH=${PWD}/_output go generate ./pkg/varlink/... || die
- rm _output/src || die
-
- export -n GOCACHE GOPATH XDG_CACHE_HOME
- GOBIN="${S}/bin" \
- emake all \
- GIT_BRANCH=master \
- GIT_BRANCH_CLEAN=master \
- COMMIT_NO="${EGIT_COMMIT}" \
- GIT_COMMIT="${EGIT_COMMIT}"
-}
-
-src_install() {
- emake DESTDIR="${D}" PREFIX="${EPREFIX}/usr" install
-
- insinto /etc/containers
- newins test/registries.conf registries.conf.example
- newins test/policy.json policy.json.example
-
- insinto /usr/share/containers
- doins seccomp.json
-
- newinitd "${FILESDIR}"/podman.initd podman
-
- insinto /etc/logrotate.d
- newins "${FILESDIR}/podman.logrotated" podman
-
- dobashcomp completions/bash/*
-
- keepdir /var/lib/containers
-}
-
-pkg_preinst() {
- LIBPOD_ROOTLESS_UPGRADE=false
- if use rootless; then
- has_version 'app-emulation/libpod[rootless]' || LIBPOD_ROOTLESS_UPGRADE=true
- fi
-}
-
-pkg_postinst() {
- local want_newline=false
- if [[ ! ( -e ${EROOT%/*}/etc/containers/policy.json && -e ${EROOT%/*}/etc/containers/registries.conf ) ]]; then
- elog "You need to create the following config files:"
- elog "/etc/containers/registries.conf"
- elog "/etc/containers/policy.json"
- elog "To copy over default examples, use:"
- elog "cp /etc/containers/registries.conf{.example,}"
- elog "cp /etc/containers/policy.json{.example,}"
- want_newline=true
- fi
- if [[ ${LIBPOD_ROOTLESS_UPGRADE} == true ]] ; then
- ${want_newline} && elog ""
- elog "For rootless operation, you need to configure subuid/subgid"
- elog "for user running podman. In case subuid/subgid has only been"
- elog "configured for root, run:"
- elog "usermod --add-subuids 1065536-1131071 "
- elog "usermod --add-subgids 1065536-1131071 "
- want_newline=true
- fi
-}
diff --git a/app-emulation/libpod/libpod-2.0.2.ebuild b/app-emulation/libpod/libpod-2.0.2.ebuild
deleted file mode 100644
index ae24fd7a5df1..000000000000
--- a/app-emulation/libpod/libpod-2.0.2.ebuild
+++ /dev/null
@@ -1,154 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-EGIT_COMMIT="201c9505b88f451ca877d29a73ed0f1836bb96c7"
-
-inherit bash-completion-r1 flag-o-matic go-module
-
-DESCRIPTION="Library and podman tool for running OCI-based containers in Pods"
-HOMEPAGE="https://github.com/containers/podman/"
-MY_PN=podman
-MY_P=${MY_PN}-${PV}
-SRC_URI="https://github.com/containers/podman/archive/v${PV}.tar.gz -> ${MY_P}.tar.gz"
-LICENSE="Apache-2.0 BSD BSD-2 CC-BY-SA-4.0 ISC MIT MPL-2.0"
-SLOT="0"
-
-KEYWORDS="~amd64"
-IUSE="apparmor btrfs +fuse +rootless selinux"
-RESTRICT="test"
-
-COMMON_DEPEND="
- app-crypt/gpgme:=
- >=app-emulation/conmon-2.0.0
- || ( >=app-emulation/runc-1.0.0_rc6 app-emulation/crun )
- dev-libs/libassuan:=
- dev-libs/libgpg-error:=
- >=net-misc/cni-plugins-0.8.6
- sys-fs/lvm2
- sys-libs/libseccomp:=
-
- apparmor? ( sys-libs/libapparmor )
- btrfs? ( sys-fs/btrfs-progs )
- rootless? ( app-emulation/slirp4netns )
- selinux? ( sys-libs/libselinux:= )
-"
-DEPEND="
- ${COMMON_DEPEND}
- dev-go/go-md2man"
-RDEPEND="${COMMON_DEPEND}
- fuse? ( sys-fs/fuse-overlayfs )"
-
-S=${WORKDIR}/${MY_P}
-
-src_prepare() {
- default
-
- # Disable installation of python modules here, since those are
- # installed by separate ebuilds.
- local makefile_sed_args=(
- -e '/^GIT_.*/d'
- -e 's/$(GO) build/$(GO) build -v -work -x/'
- -e 's/^\(install:.*\) install\.python$/\1/'
- -e 's|^pkg/varlink/iopodman.go: .gopathok pkg/varlink/io.podman.varlink$|pkg/varlink/iopodman.go: pkg/varlink/io.podman.varlink|'
- )
-
- has_version -b '>=dev-lang/go-1.13.9' || makefile_sed_args+=(-e 's:GO111MODULE=off:GO111MODULE=on:')
-
- sed "${makefile_sed_args[@]}" -i Makefile || die
-
- sed -e 's|OUTPUT="${CIRRUS_TAG:.*|OUTPUT='v${PV}'|' \
- -i hack/get_release_info.sh || die
-}
-
-src_compile() {
- # Filter unsupported linker flags
- filter-flags '-Wl,*'
-
- [[ -f hack/apparmor_tag.sh ]] || die
- if use apparmor; then
- echo -e "#!/bin/sh\necho apparmor" > hack/apparmor_tag.sh || die
- else
- echo -e "#!/bin/sh\ntrue" > hack/apparmor_tag.sh || die
- fi
-
- [[ -f hack/btrfs_installed_tag.sh ]] || die
- if use btrfs; then
- echo -e "#!/bin/sh\ntrue" > hack/btrfs_installed_tag.sh || die
- else
- echo -e "#!/bin/sh\necho exclude_graphdriver_btrfs" > \
- hack/btrfs_installed_tag.sh || die
- fi
-
- [[ -f hack/selinux_tag.sh ]] || die
- if use selinux; then
- echo -e "#!/bin/sh\necho selinux" > hack/selinux_tag.sh || die
- else
- echo -e "#!/bin/sh\ntrue" > hack/selinux_tag.sh || die
- fi
-
- # Avoid this error when generating pkg/varlink/iopodman.go:
- # cannot find package "github.com/varlink/go/varlink/idl"
- mkdir -p _output || die
- ln -snf ../vendor _output/src || die
- GO111MODULE=off GOPATH=${PWD}/_output go generate ./pkg/varlink/... || die
- rm _output/src || die
-
- export -n GOCACHE GOPATH XDG_CACHE_HOME
- GOBIN="${S}/bin" \
- emake all \
- GIT_BRANCH=master \
- GIT_BRANCH_CLEAN=master \
- COMMIT_NO="${EGIT_COMMIT}" \
- GIT_COMMIT="${EGIT_COMMIT}"
-}
-
-src_install() {
- emake DESTDIR="${D}" PREFIX="${EPREFIX}/usr" install
-
- insinto /etc/containers
- newins test/registries.conf registries.conf.example
- newins test/policy.json policy.json.example
-
- insinto /usr/share/containers
- doins seccomp.json
-
- newinitd "${FILESDIR}"/podman.initd podman
-
- insinto /etc/logrotate.d
- newins "${FILESDIR}/podman.logrotated" podman
-
- dobashcomp completions/bash/*
-
- keepdir /var/lib/containers
-}
-
-pkg_preinst() {
- LIBPOD_ROOTLESS_UPGRADE=false
- if use rootless; then
- has_version 'app-emulation/libpod[rootless]' || LIBPOD_ROOTLESS_UPGRADE=true
- fi
-}
-
-pkg_postinst() {
- local want_newline=false
- if [[ ! ( -e ${EROOT%/*}/etc/containers/policy.json && -e ${EROOT%/*}/etc/containers/registries.conf ) ]]; then
- elog "You need to create the following config files:"
- elog "/etc/containers/registries.conf"
- elog "/etc/containers/policy.json"
- elog "To copy over default examples, use:"
- elog "cp /etc/containers/registries.conf{.example,}"
- elog "cp /etc/containers/policy.json{.example,}"
- want_newline=true
- fi
- if [[ ${LIBPOD_ROOTLESS_UPGRADE} == true ]] ; then
- ${want_newline} && elog ""
- elog "For rootless operation, you need to configure subuid/subgid"
- elog "for user running podman. In case subuid/subgid has only been"
- elog "configured for root, run:"
- elog "usermod --add-subuids 1065536-1131071 "
- elog "usermod --add-subgids 1065536-1131071 "
- want_newline=true
- fi
-}
diff --git a/app-emulation/libpod/libpod-2.0.3.ebuild b/app-emulation/libpod/libpod-2.0.3.ebuild
deleted file mode 100644
index 055a6ae84595..000000000000
--- a/app-emulation/libpod/libpod-2.0.3.ebuild
+++ /dev/null
@@ -1,154 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-EGIT_COMMIT="2349723f89bdb3033d064f6278ca04da8b8ae42d"
-
-inherit bash-completion-r1 flag-o-matic go-module
-
-DESCRIPTION="Library and podman tool for running OCI-based containers in Pods"
-HOMEPAGE="https://github.com/containers/podman/"
-MY_PN=podman
-MY_P=${MY_PN}-${PV}
-SRC_URI="https://github.com/containers/podman/archive/v${PV}.tar.gz -> ${MY_P}.tar.gz"
-LICENSE="Apache-2.0 BSD BSD-2 CC-BY-SA-4.0 ISC MIT MPL-2.0"
-SLOT="0"
-
-KEYWORDS="~amd64"
-IUSE="apparmor btrfs +fuse +rootless selinux"
-RESTRICT="test"
-
-COMMON_DEPEND="
- app-crypt/gpgme:=
- >=app-emulation/conmon-2.0.0
- || ( >=app-emulation/runc-1.0.0_rc6 app-emulation/crun )
- dev-libs/libassuan:=
- dev-libs/libgpg-error:=
- >=net-misc/cni-plugins-0.8.6
- sys-fs/lvm2
- sys-libs/libseccomp:=
-
- apparmor? ( sys-libs/libapparmor )
- btrfs? ( sys-fs/btrfs-progs )
- rootless? ( app-emulation/slirp4netns )
- selinux? ( sys-libs/libselinux:= )
-"
-DEPEND="
- ${COMMON_DEPEND}
- dev-go/go-md2man"
-RDEPEND="${COMMON_DEPEND}
- fuse? ( sys-fs/fuse-overlayfs )"
-
-S=${WORKDIR}/${MY_P}
-
-src_prepare() {
- default
-
- # Disable installation of python modules here, since those are
- # installed by separate ebuilds.
- local makefile_sed_args=(
- -e '/^GIT_.*/d'
- -e 's/$(GO) build/$(GO) build -v -work -x/'
- -e 's/^\(install:.*\) install\.python$/\1/'
- -e 's|^pkg/varlink/iopodman.go: .gopathok pkg/varlink/io.podman.varlink$|pkg/varlink/iopodman.go: pkg/varlink/io.podman.varlink|'
- )
-
- has_version -b '>=dev-lang/go-1.13.9' || makefile_sed_args+=(-e 's:GO111MODULE=off:GO111MODULE=on:')
-
- sed "${makefile_sed_args[@]}" -i Makefile || die
-
- sed -e 's|OUTPUT="${CIRRUS_TAG:.*|OUTPUT='v${PV}'|' \
- -i hack/get_release_info.sh || die
-}
-
-src_compile() {
- # Filter unsupported linker flags
- filter-flags '-Wl,*'
-
- [[ -f hack/apparmor_tag.sh ]] || die
- if use apparmor; then
- echo -e "#!/bin/sh\necho apparmor" > hack/apparmor_tag.sh || die
- else
- echo -e "#!/bin/sh\ntrue" > hack/apparmor_tag.sh || die
- fi
-
- [[ -f hack/btrfs_installed_tag.sh ]] || die
- if use btrfs; then
- echo -e "#!/bin/sh\ntrue" > hack/btrfs_installed_tag.sh || die
- else
- echo -e "#!/bin/sh\necho exclude_graphdriver_btrfs" > \
- hack/btrfs_installed_tag.sh || die
- fi
-
- [[ -f hack/selinux_tag.sh ]] || die
- if use selinux; then
- echo -e "#!/bin/sh\necho selinux" > hack/selinux_tag.sh || die
- else
- echo -e "#!/bin/sh\ntrue" > hack/selinux_tag.sh || die
- fi
-
- # Avoid this error when generating pkg/varlink/iopodman.go:
- # cannot find package "github.com/varlink/go/varlink/idl"
- mkdir -p _output || die
- ln -snf ../vendor _output/src || die
- GO111MODULE=off GOPATH=${PWD}/_output go generate ./pkg/varlink/... || die
- rm _output/src || die
-
- export -n GOCACHE GOPATH XDG_CACHE_HOME
- GOBIN="${S}/bin" \
- emake all \
- GIT_BRANCH=master \
- GIT_BRANCH_CLEAN=master \
- COMMIT_NO="${EGIT_COMMIT}" \
- GIT_COMMIT="${EGIT_COMMIT}"
-}
-
-src_install() {
- emake DESTDIR="${D}" PREFIX="${EPREFIX}/usr" install
-
- insinto /etc/containers
- newins test/registries.conf registries.conf.example
- newins test/policy.json policy.json.example
-
- insinto /usr/share/containers
- doins seccomp.json
-
- newinitd "${FILESDIR}"/podman.initd podman
-
- insinto /etc/logrotate.d
- newins "${FILESDIR}/podman.logrotated" podman
-
- dobashcomp completions/bash/*
-
- keepdir /var/lib/containers
-}
-
-pkg_preinst() {
- LIBPOD_ROOTLESS_UPGRADE=false
- if use rootless; then
- has_version 'app-emulation/libpod[rootless]' || LIBPOD_ROOTLESS_UPGRADE=true
- fi
-}
-
-pkg_postinst() {
- local want_newline=false
- if [[ ! ( -e ${EROOT%/*}/etc/containers/policy.json && -e ${EROOT%/*}/etc/containers/registries.conf ) ]]; then
- elog "You need to create the following config files:"
- elog "/etc/containers/registries.conf"
- elog "/etc/containers/policy.json"
- elog "To copy over default examples, use:"
- elog "cp /etc/containers/registries.conf{.example,}"
- elog "cp /etc/containers/policy.json{.example,}"
- want_newline=true
- fi
- if [[ ${LIBPOD_ROOTLESS_UPGRADE} == true ]] ; then
- ${want_newline} && elog ""
- elog "For rootless operation, you need to configure subuid/subgid"
- elog "for user running podman. In case subuid/subgid has only been"
- elog "configured for root, run:"
- elog "usermod --add-subuids 1065536-1131071 "
- elog "usermod --add-subgids 1065536-1131071 "
- want_newline=true
- fi
-}
diff --git a/app-emulation/libpod/libpod-2.0.5.ebuild b/app-emulation/libpod/libpod-2.0.5.ebuild
deleted file mode 100644
index ae5e98e013ce..000000000000
--- a/app-emulation/libpod/libpod-2.0.5.ebuild
+++ /dev/null
@@ -1,154 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-EGIT_COMMIT="776abc52106ec7652ced6dbc0869020123ed393d"
-
-inherit bash-completion-r1 flag-o-matic go-module
-
-DESCRIPTION="Library and podman tool for running OCI-based containers in Pods"
-HOMEPAGE="https://github.com/containers/podman/"
-MY_PN=podman
-MY_P=${MY_PN}-${PV}
-SRC_URI="https://github.com/containers/podman/archive/v${PV}.tar.gz -> ${MY_P}.tar.gz"
-LICENSE="Apache-2.0 BSD BSD-2 CC-BY-SA-4.0 ISC MIT MPL-2.0"
-SLOT="0"
-
-KEYWORDS="~amd64 ~arm64"
-IUSE="apparmor btrfs +fuse +rootless selinux"
-RESTRICT="test"
-
-COMMON_DEPEND="
- app-crypt/gpgme:=
- >=app-emulation/conmon-2.0.0
- || ( >=app-emulation/runc-1.0.0_rc6 app-emulation/crun )
- dev-libs/libassuan:=
- dev-libs/libgpg-error:=
- >=net-misc/cni-plugins-0.8.6
- sys-fs/lvm2
- sys-libs/libseccomp:=
-
- apparmor? ( sys-libs/libapparmor )
- btrfs? ( sys-fs/btrfs-progs )
- rootless? ( app-emulation/slirp4netns )
- selinux? ( sys-libs/libselinux:= )
-"
-DEPEND="
- ${COMMON_DEPEND}
- dev-go/go-md2man"
-RDEPEND="${COMMON_DEPEND}
- fuse? ( sys-fs/fuse-overlayfs )"
-
-S=${WORKDIR}/${MY_P}
-
-src_prepare() {
- default
-
- # Disable installation of python modules here, since those are
- # installed by separate ebuilds.
- local makefile_sed_args=(
- -e '/^GIT_.*/d'
- -e 's/$(GO) build/$(GO) build -v -work -x/'
- -e 's/^\(install:.*\) install\.python$/\1/'
- -e 's|^pkg/varlink/iopodman.go: .gopathok pkg/varlink/io.podman.varlink$|pkg/varlink/iopodman.go: pkg/varlink/io.podman.varlink|'
- )
-
- has_version -b '>=dev-lang/go-1.13.9' || makefile_sed_args+=(-e 's:GO111MODULE=off:GO111MODULE=on:')
-
- sed "${makefile_sed_args[@]}" -i Makefile || die
-
- sed -e 's|OUTPUT="${CIRRUS_TAG:.*|OUTPUT='v${PV}'|' \
- -i hack/get_release_info.sh || die
-}
-
-src_compile() {
- # Filter unsupported linker flags
- filter-flags '-Wl,*'
-
- [[ -f hack/apparmor_tag.sh ]] || die
- if use apparmor; then
- echo -e "#!/bin/sh\necho apparmor" > hack/apparmor_tag.sh || die
- else
- echo -e "#!/bin/sh\ntrue" > hack/apparmor_tag.sh || die
- fi
-
- [[ -f hack/btrfs_installed_tag.sh ]] || die
- if use btrfs; then
- echo -e "#!/bin/sh\ntrue" > hack/btrfs_installed_tag.sh || die
- else
- echo -e "#!/bin/sh\necho exclude_graphdriver_btrfs" > \
- hack/btrfs_installed_tag.sh || die
- fi
-
- [[ -f hack/selinux_tag.sh ]] || die
- if use selinux; then
- echo -e "#!/bin/sh\necho selinux" > hack/selinux_tag.sh || die
- else
- echo -e "#!/bin/sh\ntrue" > hack/selinux_tag.sh || die
- fi
-
- # Avoid this error when generating pkg/varlink/iopodman.go:
- # cannot find package "github.com/varlink/go/varlink/idl"
- mkdir -p _output || die
- ln -snf ../vendor _output/src || die
- GO111MODULE=off GOPATH=${PWD}/_output go generate ./pkg/varlink/... || die
- rm _output/src || die
-
- export -n GOCACHE GOPATH XDG_CACHE_HOME
- GOBIN="${S}/bin" \
- emake all \
- GIT_BRANCH=master \
- GIT_BRANCH_CLEAN=master \
- COMMIT_NO="${EGIT_COMMIT}" \
- GIT_COMMIT="${EGIT_COMMIT}"
-}
-
-src_install() {
- emake DESTDIR="${D}" PREFIX="${EPREFIX}/usr" install
-
- insinto /etc/containers
- newins test/registries.conf registries.conf.example
- newins test/policy.json policy.json.example
-
- insinto /usr/share/containers
- doins seccomp.json
-
- newinitd "${FILESDIR}"/podman.initd podman
-
- insinto /etc/logrotate.d
- newins "${FILESDIR}/podman.logrotated" podman
-
- dobashcomp completions/bash/*
-
- keepdir /var/lib/containers
-}
-
-pkg_preinst() {
- LIBPOD_ROOTLESS_UPGRADE=false
- if use rootless; then
- has_version 'app-emulation/libpod[rootless]' || LIBPOD_ROOTLESS_UPGRADE=true
- fi
-}
-
-pkg_postinst() {
- local want_newline=false
- if [[ ! ( -e ${EROOT%/*}/etc/containers/policy.json && -e ${EROOT%/*}/etc/containers/registries.conf ) ]]; then
- elog "You need to create the following config files:"
- elog "/etc/containers/registries.conf"
- elog "/etc/containers/policy.json"
- elog "To copy over default examples, use:"
- elog "cp /etc/containers/registries.conf{.example,}"
- elog "cp /etc/containers/policy.json{.example,}"
- want_newline=true
- fi
- if [[ ${LIBPOD_ROOTLESS_UPGRADE} == true ]] ; then
- ${want_newline} && elog ""
- elog "For rootless operation, you need to configure subuid/subgid"
- elog "for user running podman. In case subuid/subgid has only been"
- elog "configured for root, run:"
- elog "usermod --add-subuids 1065536-1131071 "
- elog "usermod --add-subgids 1065536-1131071 "
- want_newline=true
- fi
-}
diff --git a/app-emulation/libpod/libpod-2.0.4.ebuild b/app-emulation/libpod/libpod-2.1.0.ebuild
similarity index 97%
rename from app-emulation/libpod/libpod-2.0.4.ebuild
rename to app-emulation/libpod/libpod-2.1.0.ebuild
index 0454872e1218..8335388f9f6f 100644
--- a/app-emulation/libpod/libpod-2.0.4.ebuild
+++ b/app-emulation/libpod/libpod-2.1.0.ebuild
@@ -3,7 +3,7 @@
EAPI=7
-EGIT_COMMIT="cab27868766a3b01ac14ff46180af8644c41d1cd"
+EGIT_COMMIT="d8868746fd3f45b9bfd79e37bf2aa0c7103245fd"
inherit bash-completion-r1 flag-o-matic go-module
@@ -112,7 +112,7 @@ src_install() {
newins test/policy.json policy.json.example
insinto /usr/share/containers
- doins seccomp.json
+ doins vendor/github.com/containers/common/pkg/seccomp/seccomp.json
newinitd "${FILESDIR}"/podman.initd podman
diff --git a/app-emulation/lxc-templates/metadata.xml b/app-emulation/lxc-templates/metadata.xml
index 2cf03a0ac7ec..8c511deb056f 100644
--- a/app-emulation/lxc-templates/metadata.xml
+++ b/app-emulation/lxc-templates/metadata.xml
@@ -1,6 +1,10 @@
+
+ juippis@gentoo.org
+ Joonas Niilola
+
virtualization@gentoo.org
Gentoo Virtualization Project
diff --git a/app-emulation/lxc/metadata.xml b/app-emulation/lxc/metadata.xml
index ca4eb37df6c9..20b6c295215f 100644
--- a/app-emulation/lxc/metadata.xml
+++ b/app-emulation/lxc/metadata.xml
@@ -1,6 +1,10 @@
+
+ juippis@gentoo.org
+ Joonas Niilola
+
virtualization@gentoo.org
Gentoo Virtualization Project
diff --git a/app-emulation/lxd/metadata.xml b/app-emulation/lxd/metadata.xml
index 8a3feb504936..db7a11f18d78 100644
--- a/app-emulation/lxd/metadata.xml
+++ b/app-emulation/lxd/metadata.xml
@@ -2,8 +2,8 @@
- stasibear@gentoo.org
- Erik Mackdanz
+ juippis@gentoo.org
+ Joonas Niilola
virtualization@gentoo.org
diff --git a/app-emulation/runc/runc-1.0.0_rc10-r1.ebuild b/app-emulation/runc/runc-1.0.0_rc10-r1.ebuild
new file mode 100644
index 000000000000..71ec6fbe3a47
--- /dev/null
+++ b/app-emulation/runc/runc-1.0.0_rc10-r1.ebuild
@@ -0,0 +1,78 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit golang-vcs-snapshot linux-info
+
+# update on bump, look for https://github.com/docker\
+# docker-ce/blob//components/engine/hack/dockerfile/install/runc.installer
+RUNC_COMMIT="dc9208a3303feef5b3839f4323d9beb36df0a9dd"
+CONFIG_CHECK="~USER_NS"
+EGO_PN="github.com/opencontainers/${PN}"
+
+DESCRIPTION="runc container cli tools"
+HOMEPAGE="http://runc.io"
+SRC_URI="https://github.com/opencontainers/${PN}/archive/v${RUNC_COMMIT}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="Apache-2.0 BSD-2 BSD MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
+IUSE="apparmor +ambient hardened +kmem +seccomp selinux test"
+
+DEPEND="seccomp? ( sys-libs/libseccomp )"
+
+RDEPEND="
+ ${DEPEND}
+ !app-emulation/docker-runc
+ apparmor? ( sys-libs/libapparmor )
+"
+
+BDEPEND="
+ dev-go/go-md2man
+ test? ( "${RDEPEND}" )
+"
+
+# tests need busybox binary, and portage namespace
+# sandboxing disabled: mount-sandbox pid-sandbox ipc-sandbox
+# majority of tests pass
+RESTRICT+=" test"
+
+src_compile() {
+ # Taken from app-emulation/docker-1.7.0-r1
+ export CGO_CFLAGS="-I${ROOT}/usr/include"
+ export CGO_LDFLAGS="$(usex hardened '-fno-PIC ' '')
+ -L${ROOT}/usr/$(get_libdir)"
+
+ # build up optional flags
+ local options=(
+ $(usev ambient)
+ $(usev apparmor)
+ $(usev seccomp)
+ $(usev selinux)
+ $(usex kmem '' 'nokmem')
+ )
+
+ myemakeargs=(
+ BINDIR="${ED}/usr/bin"
+ BUILDTAGS="${options[*]}"
+ COMMIT=${RUNC_COMMIT}
+ DESTDIR="${ED}"
+ PREFIX="${ED}/usr"
+ GOPATH="${S}"
+ -C "src/${EGO_PN}"
+ )
+
+ emake "${myemakeargs[@]}" runc man
+}
+
+src_install() {
+ emake "${myemakeargs[@]}" install install-man install-bash
+
+ local DOCS=( src/"${EGO_PN}"/{README.md,PRINCIPLES.md,docs/.} )
+ einstalldocs
+}
+
+src_test() {
+ emake "${myemakeargs[@]}" localunittest
+}
diff --git a/app-eselect/Manifest.gz b/app-eselect/Manifest.gz
index 83629a744a1e..62573172d07c 100644
Binary files a/app-eselect/Manifest.gz and b/app-eselect/Manifest.gz differ
diff --git a/app-eselect/eselect-lua/eselect-lua-2.ebuild b/app-eselect/eselect-lua/eselect-lua-2.ebuild
index f9013c396acf..82abd3207ea4 100644
--- a/app-eselect/eselect-lua/eselect-lua-2.ebuild
+++ b/app-eselect/eselect-lua/eselect-lua-2.ebuild
@@ -13,6 +13,10 @@ IUSE=""
DEPEND="
!dev-lang/lua:0
+ >=app-admin/eselect-1.2.4
+"
+RDEPEND="${DEPEND}"
+PDEPEND="
|| (
dev-lang/lua:5.1
dev-lang/lua:5.2
@@ -22,12 +26,9 @@ DEPEND="
app-eselect/eselect-luajit
)
)
- >=app-admin/eselect-1.2.4
"
# dev-lang/lua:5.4
# TODO: ^
-RDEPEND="${DEPEND}"
-
S="${WORKDIR}"
src_install() {
diff --git a/app-eselect/eselect-luajit/eselect-luajit-1.ebuild b/app-eselect/eselect-luajit/eselect-luajit-1.ebuild
index a68f42f7e2e7..8af9b87635fd 100644
--- a/app-eselect/eselect-luajit/eselect-luajit-1.ebuild
+++ b/app-eselect/eselect-luajit/eselect-luajit-1.ebuild
@@ -4,7 +4,7 @@
EAPI=7
DESCRIPTION="Manages LuaJIT symlinks"
-HOMEPAGE="https://www.gentoo.org/"
+HOMEPAGE="https://wiki.gentoo.org/wiki/No_homepage"
SRC_URI=""
LICENSE="GPL-2"
diff --git a/app-eselect/eselect-luajit/metadata.xml b/app-eselect/eselect-luajit/metadata.xml
index d16e4728b93f..b0783342d4b3 100644
--- a/app-eselect/eselect-luajit/metadata.xml
+++ b/app-eselect/eselect-luajit/metadata.xml
@@ -5,6 +5,4 @@
mva@gentoo.org
Vadim Misbakh-Soloviov
- eselect-module for choosing default LuaJIT interpreter
- eselect-модуль для выбора интерпретатора LuaJIT по умолчанию
diff --git a/app-forensics/Manifest.gz b/app-forensics/Manifest.gz
index b9cbf3abdcd7..1eb5756990bf 100644
Binary files a/app-forensics/Manifest.gz and b/app-forensics/Manifest.gz differ
diff --git a/app-forensics/libewf/libewf-20171104.ebuild b/app-forensics/libewf/libewf-20171104-r1.ebuild
similarity index 94%
rename from app-forensics/libewf/libewf-20171104.ebuild
rename to app-forensics/libewf/libewf-20171104-r1.ebuild
index d9ec629f937c..47d43b87427d 100644
--- a/app-forensics/libewf/libewf-20171104.ebuild
+++ b/app-forensics/libewf/libewf-20171104-r1.ebuild
@@ -1,7 +1,7 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
-EAPI=6
+EAPI=7
DESCRIPTION="Implementation of the EWF (SMART and EnCase) image format"
HOMEPAGE="https://github.com/libyal/libewf"
@@ -16,6 +16,7 @@ IUSE="bfio bzip2 debug +fuse nls +ssl static-libs +uuid unicode zlib"
# uses bundled libbfio until tree version is bumped
RDEPEND="
+ bzip2? ( app-arch/bzip2 )
fuse? ( sys-fs/fuse:0= )
nls? (
virtual/libintl
diff --git a/app-i18n/Manifest.gz b/app-i18n/Manifest.gz
index 5a1205d50d59..11f14b861808 100644
Binary files a/app-i18n/Manifest.gz and b/app-i18n/Manifest.gz differ
diff --git a/app-i18n/fcitx-configtool/fcitx-configtool-0.4.10.ebuild b/app-i18n/fcitx-configtool/fcitx-configtool-0.4.10.ebuild
index 9fe46f55f860..1f5e7d08ada6 100644
--- a/app-i18n/fcitx-configtool/fcitx-configtool-0.4.10.ebuild
+++ b/app-i18n/fcitx-configtool/fcitx-configtool-0.4.10.ebuild
@@ -24,7 +24,8 @@ SLOT="4"
KEYWORDS="amd64 ppc ppc64 x86"
IUSE=""
-BDEPEND="virtual/pkgconfig"
+BDEPEND="dev-libs/glib:2
+ virtual/pkgconfig"
DEPEND=">=app-i18n/fcitx-4.2.9:4
app-text/iso-codes
dev-libs/glib:2
diff --git a/app-i18n/fcitx-configtool/fcitx-configtool-4.9999.ebuild b/app-i18n/fcitx-configtool/fcitx-configtool-4.9999.ebuild
index 19655e98c974..9ef906f089f5 100644
--- a/app-i18n/fcitx-configtool/fcitx-configtool-4.9999.ebuild
+++ b/app-i18n/fcitx-configtool/fcitx-configtool-4.9999.ebuild
@@ -24,7 +24,8 @@ SLOT="4"
KEYWORDS=""
IUSE=""
-BDEPEND="virtual/pkgconfig"
+BDEPEND="dev-libs/glib:2
+ virtual/pkgconfig"
DEPEND=">=app-i18n/fcitx-4.2.9:4
app-text/iso-codes
dev-libs/glib:2
diff --git a/app-i18n/fcitx-libpinyin/fcitx-libpinyin-0.5.3.ebuild b/app-i18n/fcitx-libpinyin/fcitx-libpinyin-0.5.3.ebuild
index 941ab64d0264..079c6e3c5fa3 100644
--- a/app-i18n/fcitx-libpinyin/fcitx-libpinyin-0.5.3.ebuild
+++ b/app-i18n/fcitx-libpinyin/fcitx-libpinyin-0.5.3.ebuild
@@ -3,7 +3,7 @@
EAPI="6"
-inherit cmake-utils gnome2-utils
+inherit cmake-utils xdg-utils
if [[ "${PV}" =~ (^|\.)9999$ ]]; then
inherit git-r3
@@ -60,9 +60,9 @@ src_configure() {
}
pkg_postinst() {
- gnome2_icon_cache_update
+ xdg_icon_cache_update
}
pkg_postrm() {
- gnome2_icon_cache_update
+ xdg_icon_cache_update
}
diff --git a/app-i18n/fcitx-libpinyin/fcitx-libpinyin-4.9999.ebuild b/app-i18n/fcitx-libpinyin/fcitx-libpinyin-4.9999.ebuild
index 66cc6ae0ed8d..af2da3f65dcd 100644
--- a/app-i18n/fcitx-libpinyin/fcitx-libpinyin-4.9999.ebuild
+++ b/app-i18n/fcitx-libpinyin/fcitx-libpinyin-4.9999.ebuild
@@ -3,7 +3,7 @@
EAPI="6"
-inherit cmake-utils gnome2-utils
+inherit cmake-utils xdg-utils
if [[ "${PV}" =~ (^|\.)9999$ ]]; then
inherit git-r3
@@ -60,9 +60,9 @@ src_configure() {
}
pkg_postinst() {
- gnome2_icon_cache_update
+ xdg_icon_cache_update
}
pkg_postrm() {
- gnome2_icon_cache_update
+ xdg_icon_cache_update
}
diff --git a/app-i18n/fcitx-rime/fcitx-rime-0.3.2.ebuild b/app-i18n/fcitx-rime/fcitx-rime-0.3.2.ebuild
index a028f7f8ff9e..273db4b0c27a 100644
--- a/app-i18n/fcitx-rime/fcitx-rime-0.3.2.ebuild
+++ b/app-i18n/fcitx-rime/fcitx-rime-0.3.2.ebuild
@@ -3,7 +3,7 @@
EAPI="6"
-inherit cmake-utils gnome2-utils
+inherit cmake-utils xdg-utils
if [[ "${PV}" =~ (^|\.)9999$ ]]; then
inherit git-r3
@@ -42,9 +42,9 @@ src_configure() {
}
pkg_postinst() {
- gnome2_icon_cache_update
+ xdg_icon_cache_update
}
pkg_postrm() {
- gnome2_icon_cache_update
+ xdg_icon_cache_update
}
diff --git a/app-i18n/fcitx-rime/fcitx-rime-4.9999.ebuild b/app-i18n/fcitx-rime/fcitx-rime-4.9999.ebuild
index 5b17c2b01487..382c68ff7502 100644
--- a/app-i18n/fcitx-rime/fcitx-rime-4.9999.ebuild
+++ b/app-i18n/fcitx-rime/fcitx-rime-4.9999.ebuild
@@ -3,7 +3,7 @@
EAPI="6"
-inherit cmake-utils gnome2-utils
+inherit cmake-utils xdg-utils
if [[ "${PV}" =~ (^|\.)9999$ ]]; then
inherit git-r3
@@ -50,9 +50,9 @@ src_configure() {
}
pkg_postinst() {
- gnome2_icon_cache_update
+ xdg_icon_cache_update
}
pkg_postrm() {
- gnome2_icon_cache_update
+ xdg_icon_cache_update
}
diff --git a/app-i18n/fcitx-table-extra/fcitx-table-extra-0.3.8.ebuild b/app-i18n/fcitx-table-extra/fcitx-table-extra-0.3.8.ebuild
index 24bb5f73b8b4..473763dfd10b 100644
--- a/app-i18n/fcitx-table-extra/fcitx-table-extra-0.3.8.ebuild
+++ b/app-i18n/fcitx-table-extra/fcitx-table-extra-0.3.8.ebuild
@@ -1,9 +1,9 @@
# Copyright 2012-2020 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
-EAPI="6"
+EAPI="7"
-inherit cmake-utils gnome2-utils
+inherit cmake xdg-utils
if [[ "${PV}" =~ (^|\.)9999$ ]]; then
inherit git-r3
@@ -24,16 +24,17 @@ SLOT="4"
KEYWORDS="amd64 ppc ppc64 x86"
IUSE=""
-RDEPEND=">=app-i18n/fcitx-4.2.9:4[table]"
-DEPEND="${RDEPEND}
+BDEPEND=">=app-i18n/fcitx-4.2.9:4
virtual/pkgconfig"
+DEPEND=">=app-i18n/fcitx-4.2.9:4[table]"
+RDEPEND="${DEPEND}"
DOCS=(AUTHORS)
pkg_postinst() {
- gnome2_icon_cache_update
+ xdg_icon_cache_update
}
pkg_postrm() {
- gnome2_icon_cache_update
+ xdg_icon_cache_update
}
diff --git a/app-i18n/fcitx-table-extra/fcitx-table-extra-4.9999.ebuild b/app-i18n/fcitx-table-extra/fcitx-table-extra-4.9999.ebuild
index ac818b0f0b30..19721f5620a3 100644
--- a/app-i18n/fcitx-table-extra/fcitx-table-extra-4.9999.ebuild
+++ b/app-i18n/fcitx-table-extra/fcitx-table-extra-4.9999.ebuild
@@ -1,9 +1,9 @@
# Copyright 2012-2020 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
-EAPI="6"
+EAPI="7"
-inherit cmake-utils gnome2-utils
+inherit cmake xdg-utils
if [[ "${PV}" =~ (^|\.)9999$ ]]; then
inherit git-r3
@@ -24,16 +24,17 @@ SLOT="4"
KEYWORDS=""
IUSE=""
-RDEPEND=">=app-i18n/fcitx-4.2.9:4[table]"
-DEPEND="${RDEPEND}
+BDEPEND=">=app-i18n/fcitx-4.2.9:4
virtual/pkgconfig"
+DEPEND=">=app-i18n/fcitx-4.2.9:4[table]"
+RDEPEND="${DEPEND}"
DOCS=(AUTHORS)
pkg_postinst() {
- gnome2_icon_cache_update
+ xdg_icon_cache_update
}
pkg_postrm() {
- gnome2_icon_cache_update
+ xdg_icon_cache_update
}
diff --git a/app-i18n/fcitx-unikey/fcitx-unikey-0.2.7.ebuild b/app-i18n/fcitx-unikey/fcitx-unikey-0.2.7.ebuild
index 05e9166a8900..778af9552b8b 100644
--- a/app-i18n/fcitx-unikey/fcitx-unikey-0.2.7.ebuild
+++ b/app-i18n/fcitx-unikey/fcitx-unikey-0.2.7.ebuild
@@ -1,9 +1,9 @@
# Copyright 2013-2020 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
-EAPI="6"
+EAPI="7"
-inherit cmake-utils gnome2-utils
+inherit cmake xdg-utils
if [[ "${PV}" =~ (^|\.)9999$ ]]; then
inherit git-r3
@@ -24,7 +24,11 @@ SLOT="4"
KEYWORDS="amd64 ppc ppc64 x86"
IUSE="+macro-editor"
-RDEPEND=">=app-i18n/fcitx-4.2.9:4
+BDEPEND=">=app-i18n/fcitx-4.2.9:4
+ sys-devel/gettext
+ virtual/pkgconfig
+ macro-editor? ( >=dev-qt/qtwidgets-5.7:5 )"
+DEPEND=">=app-i18n/fcitx-4.2.9:4
virtual/libintl
macro-editor? (
>=app-i18n/fcitx-qt5-1.1:4
@@ -32,9 +36,7 @@ RDEPEND=">=app-i18n/fcitx-4.2.9:4
>=dev-qt/qtgui-5.7:5
>=dev-qt/qtwidgets-5.7:5
)"
-DEPEND="${RDEPEND}
- sys-devel/gettext
- virtual/pkgconfig"
+RDEPEND="${DEPEND}"
DOCS=()
@@ -43,13 +45,13 @@ src_configure() {
-DENABLE_QT=$(usex macro-editor)
)
- cmake-utils_src_configure
+ cmake_src_configure
}
pkg_postinst() {
- gnome2_icon_cache_update
+ xdg_icon_cache_update
}
pkg_postrm() {
- gnome2_icon_cache_update
+ xdg_icon_cache_update
}
diff --git a/app-i18n/fcitx-unikey/fcitx-unikey-4.9999.ebuild b/app-i18n/fcitx-unikey/fcitx-unikey-4.9999.ebuild
index c20cc8cad7a2..23a3d96150a7 100644
--- a/app-i18n/fcitx-unikey/fcitx-unikey-4.9999.ebuild
+++ b/app-i18n/fcitx-unikey/fcitx-unikey-4.9999.ebuild
@@ -1,9 +1,9 @@
# Copyright 2013-2020 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
-EAPI="6"
+EAPI="7"
-inherit cmake-utils gnome2-utils
+inherit cmake xdg-utils
if [[ "${PV}" =~ (^|\.)9999$ ]]; then
inherit git-r3
@@ -24,7 +24,11 @@ SLOT="4"
KEYWORDS=""
IUSE="+macro-editor"
-RDEPEND=">=app-i18n/fcitx-4.2.9:4
+BDEPEND=">=app-i18n/fcitx-4.2.9:4
+ sys-devel/gettext
+ virtual/pkgconfig
+ macro-editor? ( >=dev-qt/qtwidgets-5.7:5 )"
+DEPEND=">=app-i18n/fcitx-4.2.9:4
virtual/libintl
macro-editor? (
>=app-i18n/fcitx-qt5-1.1:4
@@ -32,9 +36,7 @@ RDEPEND=">=app-i18n/fcitx-4.2.9:4
>=dev-qt/qtgui-5.7:5
>=dev-qt/qtwidgets-5.7:5
)"
-DEPEND="${RDEPEND}
- sys-devel/gettext
- virtual/pkgconfig"
+RDEPEND="${DEPEND}"
DOCS=()
@@ -43,13 +45,13 @@ src_configure() {
-DENABLE_QT=$(usex macro-editor)
)
- cmake-utils_src_configure
+ cmake_src_configure
}
pkg_postinst() {
- gnome2_icon_cache_update
+ xdg_icon_cache_update
}
pkg_postrm() {
- gnome2_icon_cache_update
+ xdg_icon_cache_update
}
diff --git a/app-misc/Manifest.gz b/app-misc/Manifest.gz
index 010abdbff9fe..c74b772ea12c 100644
Binary files a/app-misc/Manifest.gz and b/app-misc/Manifest.gz differ
diff --git a/app-misc/realpath/Manifest b/app-misc/realpath/Manifest
index cf85094c16a1..1c60942c3fc0 100644
--- a/app-misc/realpath/Manifest
+++ b/app-misc/realpath/Manifest
@@ -1,4 +1,2 @@
-DIST realpath_1.17.tar.gz 17800 BLAKE2B f2df9d9f3c73aaf6b4240518cc8ff361b97fa60c9493fa0148de6f14ad18dfa2ef05557932dec95a8b734b5d78881f0e239be41cba7bdaf4e353c092093ada3d SHA512 d4f8105e9256b140918dfa400eaac07bec9c29bced7284ab2a3a96282b13b59dca32ab0af38836dfe89dd4e3bf8b038ef4cf61a96d19951f46ac13264ceeec96
-DIST realpath_1.17_i386.deb 16372 BLAKE2B c8d7c2eb410c8c8129d6847d7cfe13265136fedcb51eb4bdaf62dda0dace1b9c0383445c1f407b404085306d6deff1a196b26cb7bb68b225710054b6bea582fe SHA512 15704a27f3f140c4d69411bfd9c319e3205e7b70cccefdc5bec94ad10d6b6c6ad948c2fa51cf2ed69c8884928ba6dcb83a865185f3b010dc6eb343c2125c2118
DIST realpath_1.18.tar.gz 17618 BLAKE2B c42cbade8022a0aaafbf012c5f4db899bdadac6d06743a64fa0cf58c0533e9574fe1389939d296986fc1307362399753f58650d9029bf240fc6dc980c17a59f4 SHA512 98daa53b7a6d4b40ea3ff9ea89b7cb97782dd53f031e41a228a5aa8d2a41ae7920cbc1e2213f568098496e5c25da1381f08fb939f8668733a3c391f744fd16ed
DIST realpath_1.18_i386.deb 16426 BLAKE2B 934d4d61bda3ce069959f3cf818b8d0b206c95ef458487f12c8afa59014dc141dcdf0ebd18a9540dd3104358139ce7f9317aabd8027dca6883f55905cc198d83 SHA512 fb2062041f8089a5ff07f76a9833e9d8bbe9560d72d4d5803c9524aeb782f9f4a135921b9984432ccfa361edc785a0f33785377ddf031a07ed316861a00a6f37
diff --git a/app-misc/realpath/realpath-1.17.ebuild b/app-misc/realpath/realpath-1.17.ebuild
deleted file mode 100644
index 1e56a2e82dd2..000000000000
--- a/app-misc/realpath/realpath-1.17.ebuild
+++ /dev/null
@@ -1,68 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=4
-inherit eutils toolchain-funcs flag-o-matic multilib prefix
-
-DESCRIPTION="Return the canonicalized absolute pathname"
-HOMEPAGE="http://packages.debian.org/unstable/utils/realpath"
-SRC_URI="
- mirror://debian/pool/main/r/${PN}/${PN}_${PV}.tar.gz
- nls? ( mirror://debian/pool/main/r/${PN}/${PN}_${PV}_i386.deb )"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm hppa ~ia64 ~m68k ~mips ppc ppc64 s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-IUSE="nls"
-
-RDEPEND="
- nls? ( virtual/libintl )"
-DEPEND="${RDEPEND}
- nls? ( sys-devel/gettext )
- elibc_mintlib? ( virtual/libiconv )"
-
-src_unpack() {
- unpack ${PN}_${PV}.tar.gz
-
- if use nls; then
- # Unpack the .deb file, in order to get the preprocessed man page
- # translations. This way we avoid a dependency on app-text/po4a.
- mkdir deb
- cd deb
- unpack ${PN}_${PV}_i386.deb
- unpack ./data.tar.gz
- fi
-}
-
-src_prepare() {
- use nls || epatch "${FILESDIR}"/${PN}-1.16-nonls.patch
- epatch "${FILESDIR}"/${PN}-1.17-build.patch
- epatch "${FILESDIR}"/${PN}-1.14-no-po4a.patch
- epatch "${FILESDIR}"/${PN}-1.15-prefix.patch
- eprefixify common.mk
-}
-
-src_compile() {
- tc-export CC
- use nls && use !elibc_glibc && append-libs -lintl
- [[ ${CHOST} == *-mint* ]] && append-libs "-liconv"
-
- local subdir
- for subdir in src man $(usex nls po ''); do
- emake MAKE_VERBOSE=yes VERSION="${PV}" -C ${subdir}
- done
-}
-
-src_install() {
- emake VERSION="${PV}" SUBDIRS="src man $(usex nls po '')" \
- DESTDIR="${D}" install
- newdoc debian/changelog ChangeLog.debian
-
- if use nls; then
- local dir
- for dir in "${WORKDIR}"/deb/usr/share/man/*; do
- [ -f "${dir}"/man1/realpath.1 ] || continue
- newman "${dir}"/man1/realpath.1 realpath.${dir##*/}.1
- done
- fi
-}
diff --git a/app-misc/rpick/rpick-0.7.0.ebuild b/app-misc/rpick/rpick-0.7.0.ebuild
index 1e49f1ba9167..fbbb7e691692 100644
--- a/app-misc/rpick/rpick-0.7.0.ebuild
+++ b/app-misc/rpick/rpick-0.7.0.ebuild
@@ -98,7 +98,7 @@ SRC_URI="$(cargo_crate_uris ${CRATES})"
# use cargo-license for a more accurate license picture
LICENSE="GPL-3 Apache-2.0 Apache-2.0-with-LLVM-exceptions BSD BSD-2 Boost-1.0 CC0-1.0 MIT Unlicense"
SLOT="0"
-KEYWORDS="~amd64 ~ppc64 x86"
+KEYWORDS="amd64 ppc64 x86"
DOCS=( CHANGELOG.md README.md )
diff --git a/app-mobilephone/Manifest.gz b/app-mobilephone/Manifest.gz
index 3da9bb69fa3d..eb078f55b8b9 100644
Binary files a/app-mobilephone/Manifest.gz and b/app-mobilephone/Manifest.gz differ
diff --git a/app-mobilephone/sobexsrv/sobexsrv-1.0.1-r3.ebuild b/app-mobilephone/sobexsrv/sobexsrv-1.0.1-r3.ebuild
index e748963f7b5d..44078281901f 100644
--- a/app-mobilephone/sobexsrv/sobexsrv-1.0.1-r3.ebuild
+++ b/app-mobilephone/sobexsrv/sobexsrv-1.0.1-r3.ebuild
@@ -14,7 +14,7 @@ HOMEPAGE="http://www.mulliner.org/bluetooth/sobexsrv.php"
SLOT="0"
LICENSE="GPL-2"
-KEYWORDS="~amd64 ~ppc ~x86"
+KEYWORDS="amd64 ppc x86"
DEPEND="
>=dev-libs/openobex-1.7.2-r1
diff --git a/app-office/Manifest.gz b/app-office/Manifest.gz
index f78f29f2b705..b7fea94fc39b 100644
Binary files a/app-office/Manifest.gz and b/app-office/Manifest.gz differ
diff --git a/app-office/upwork/Manifest b/app-office/upwork/Manifest
index 9a6646d204e9..72fb20028cf6 100644
--- a/app-office/upwork/Manifest
+++ b/app-office/upwork/Manifest
@@ -1,4 +1,2 @@
-DIST upwork-5.3.3.860_i386.rpm 74067471 BLAKE2B 6b2092a851e1f35dfa0dc180f225d26aeb5a04edd30eeaca3125480b94fb8504d2005c42a0b86c293c7367c538ef9103bce2a2bb45f5257cb003fd7cd25eb851 SHA512 7dbbbbf7a4254d1213942d836cf944c94b5b6dd7905435c75b1f0225dd362f4bdb3c7ea0716b2fd04fb926d965fd56d21c41f713cf26f2ad6cb240e5f2643394
-DIST upwork-5.3.3.860_x86_64.rpm 72487294 BLAKE2B 56dfedc12b5d0661f01d34238256a372b9e6d760c33ba13474996e4c24050cc9931e592cba91df0719c33c6785e6fe8d63add54986bc86cafad55379a35d9358 SHA512 a3d1c6b36a23743a1b953b7cb956107baacd39984bc9289eff349539235a7e95d0aa80880985522b985dd37de68e284a17b750561ce091166b4186d01c437aba
-DIST upwork-5.4.2.8_i386.rpm 52586152 BLAKE2B 61e1dc1652a4aee6c91b8206d32f6e05e2dcbfa0bbb1af529c1b9b33e2a6bd4226c77707667662ee79c3151dade89c33b3c3a74df18aa14f4ccb0683f41612bb SHA512 69925d3afadfd4944ff813241d5dab27d6bd1e8f0622c7b8c2d686b8024b998a4ee4a8647c3361043dc8a38114e149aae5965bac203480bd85046ec738a1fe8a
-DIST upwork-5.4.2.8_x86_64.rpm 50903574 BLAKE2B 35ebf317157e4f33eca0b957c0fd4040d28338cd09e93c86bb234faf56f61b173e98a8c869c2da79b067b9936f6d5a95d435220dd66f4c057310987e3ab6db10 SHA512 79a91aba88002020f99822e44540f1d98bf06811856a4a4e5cb10a1d9f68cbc78d3c7d6f09035c705a97634e65e81ff72d13d169e6005371717c0455d87e5199
+DIST upwork-5.4.5.1_i386.rpm 52638856 BLAKE2B 95e598f96a9a8165875cc0f94bcddf80138ef1f9281434d33e3eec997e6df6b96c6bffc3de57163b6c4dcf6261b74e593dd801dfc38706d6644d3bd87f4141d5 SHA512 bf2a18cdb563aca8155ddd1f5844e6726d38df8207999d6f64be47e9c0a636e64cf5012eb6b31682c272d3584c1a067aebdf1ce4b11f8927cc58a569168b2449
+DIST upwork-5.4.5.1_x86_64.rpm 50954566 BLAKE2B 1547cc49a9029f65942398088786e9261812ce7a9a32e212199f5e0c56ebef5188988715f2f1a88d1ad2b426b78dc299ad5921d8df729666d5a8ab295b20456c SHA512 dd000abd53c79d5655c71aad3e566d4baf09cfb5e4f3a5c83806c61bc7e9a5ef8513b8553cf04049e8b7bbbeffc90ef388f09b620f85113efc4586aadf23555a
diff --git a/app-office/upwork/upwork-5.3.3.860.ebuild b/app-office/upwork/upwork-5.3.3.860.ebuild
deleted file mode 100644
index 3425689d329c..000000000000
--- a/app-office/upwork/upwork-5.3.3.860.ebuild
+++ /dev/null
@@ -1,48 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit desktop pax-utils rpm
-
-DESCRIPTION="Project collaboration and tracking software for upwork.com"
-HOMEPAGE="https://www.upwork.com/"
-SRC_URI="
- amd64? ( https://updates-desktopapp.upwork.com/binaries/v$(ver_rs 1- _)_wub7hae1mtgzk09u/upwork-${PV}-1fc24.x86_64.rpm -> ${P}_x86_64.rpm )
- x86? ( https://updates-desktopapp.upwork.com/binaries/v$(ver_rs 1- _)_wub7hae1mtgzk09u/upwork-${PV}-1fc24.i386.rpm -> ${P}_i386.rpm )"
-
-LICENSE="ODESK"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-RESTRICT="bindist mirror"
-
-RDEPEND="
- dev-libs/expat
- dev-libs/nspr
- dev-libs/nss
- gnome-base/gconf
- media-libs/alsa-lib
- media-libs/freetype
- sys-apps/dbus
- sys-libs/libcap
- x11-libs/gtk+:3[cups]"
-
-S="${WORKDIR}"
-
-PATCHES=( "${FILESDIR}"/${PN}-desktop-r1.patch )
-
-# Binary only distribution
-QA_PREBUILT="*"
-
-src_install() {
- pax-mark m usr/share/upwork/upwork
-
- dobin usr/bin/upwork
-
- insinto /usr/share
- doins -r usr/share/upwork
- fperms 0755 /usr/share/upwork/upwork
-
- domenu usr/share/applications/upwork.desktop
- doicon usr/share/pixmaps/upwork.png
-}
diff --git a/app-office/upwork/upwork-5.4.2.8.ebuild b/app-office/upwork/upwork-5.4.5.1.ebuild
similarity index 65%
rename from app-office/upwork/upwork-5.4.2.8.ebuild
rename to app-office/upwork/upwork-5.4.5.1.ebuild
index 48ab98c73786..809b4cdce15f 100644
--- a/app-office/upwork/upwork-5.4.2.8.ebuild
+++ b/app-office/upwork/upwork-5.4.5.1.ebuild
@@ -3,13 +3,13 @@
EAPI=7
-inherit desktop pax-utils rpm
+inherit desktop pax-utils rpm xdg-utils
DESCRIPTION="Project collaboration and tracking software for upwork.com"
HOMEPAGE="https://www.upwork.com/"
SRC_URI="
- amd64? ( https://updates-desktopapp.upwork.com/binaries/v5_4_2_8_17caa201e7ae4660/upwork-5.4.2.8-1fc24.x86_64.rpm -> ${P}_x86_64.rpm )
- x86? ( https://updates-desktopapp.upwork.com/binaries/v5_4_2_8_17caa201e7ae4660/upwork-5.4.2.8-1fc24.i386.rpm -> ${P}_i386.rpm )"
+ amd64? ( https://updates-desktopapp.upwork.com/binaries/v5_4_5_1_941af939eff74e21/upwork-5.4.5.1-1fc24.x86_64.rpm -> ${P}_x86_64.rpm )
+ x86? ( https://updates-desktopapp.upwork.com/binaries/v5_4_5_1_941af939eff74e21/upwork-5.4.5.1-1fc24.i386.rpm -> ${P}_i386.rpm )"
LICENSE="ODESK"
SLOT="0"
@@ -25,7 +25,10 @@ RDEPEND="
media-libs/freetype
sys-apps/dbus
sys-libs/libcap
- x11-libs/gtk+:3[cups]"
+ x11-libs/gtk+:3[cups]
+ x11-libs/libXinerama
+ x11-libs/libXScrnSaver
+"
S="${WORKDIR}"
@@ -47,3 +50,11 @@ src_install() {
domenu usr/share/applications/upwork.desktop
doicon usr/share/icons/hicolor/128x128/apps/upwork.png
}
+
+pkg_postinst() {
+ xdg_icon_cache_update
+}
+
+pkg_postrm() {
+ xdg_icon_cache_update
+}
diff --git a/app-pda/Manifest.gz b/app-pda/Manifest.gz
index 1d686401b4ec..32ee4addad5b 100644
Binary files a/app-pda/Manifest.gz and b/app-pda/Manifest.gz differ
diff --git a/app-pda/pilot-link/pilot-link-0.12.5-r2.ebuild b/app-pda/pilot-link/pilot-link-0.12.5-r2.ebuild
deleted file mode 100644
index 3bcc02fd6ec9..000000000000
--- a/app-pda/pilot-link/pilot-link-0.12.5-r2.ebuild
+++ /dev/null
@@ -1,117 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-PYTHON_COMPAT=( python2_7 )
-
-inherit autotools distutils-r1 perl-module java-pkg-opt-2
-
-DESCRIPTION="Suite of tools for moving data between a Palm device and a desktop"
-HOMEPAGE="https://wiki.gentoo.org/wiki/No_homepage"
-SRC_URI="mirror://gentoo/${P}.tar.bz2
- https://dev.gentoo.org/~mgorny/dist/${P}-gentoo-patchset.tar.bz2"
-
-LICENSE="|| ( GPL-2 LGPL-2 )"
-SLOT="0"
-KEYWORDS="~alpha amd64 ~arm hppa ~ia64 ppc ppc64 x86 ~amd64-linux ~x86-linux"
-IUSE="bluetooth debug java perl png python static-libs threads usb"
-
-COMMON_DEPEND="
- dev-libs/popt
- >=sys-libs/ncurses-5.7-r7:0=
- >=sys-libs/readline-6:0=
- virtual/libiconv
- bluetooth? ( net-wireless/bluez )
- perl? ( >=dev-lang/perl-5.12 )
- png? ( media-libs/libpng:0= )
- usb? ( virtual/libusb:0 )
-"
-DEPEND="${COMMON_DEPEND}
- java? ( >=virtual/jdk-1.4 )
-"
-RDEPEND="${COMMON_DEPEND}
- java? ( >=virtual/jre-1.4 )
-"
-
-RESTRICT="test" #672872
-
-src_prepare() {
- default
-
- eapply -p0 "${WORKDIR}/${P}-gentoo-patchset"/${PN}-0.12.3-java-install.patch
- eapply -p0 "${WORKDIR}/${P}-gentoo-patchset"/${PN}-0.12.3-respect-javacflags.patch
- eapply -p0 "${WORKDIR}/${P}-gentoo-patchset"/${PN}-0.12.2-werror_194921.patch
- eapply -p1 "${WORKDIR}/${P}-gentoo-patchset"/${PN}-0.12.2-threads.patch
- eapply -p0 "${WORKDIR}/${P}-gentoo-patchset"/${PN}-0.12.3-libpng14.patch
- eapply -p1 "${WORKDIR}/${P}-gentoo-patchset"/${PN}-0.12.3-png.patch
- eapply -p0 "${WORKDIR}/${P}-gentoo-patchset"/${PN}-0.12.3-distutils.patch
- eapply -p1 "${WORKDIR}/${P}-gentoo-patchset"/${PN}-0.12.3-libusb-compat-usb_open.patch
- eapply -p1 "${WORKDIR}/${P}-gentoo-patchset"/${PN}-0.12.5-perl514.patch
-
- sed -i -e 's:AM_CONFIG_HEADER:AC_CONFIG_HEADERS:' configure.ac || die #467600
-
- AT_M4DIR="m4" eautoreconf
-}
-
-src_configure() {
- # tcl/tk support is disabled as per upstream request.
- # readline is not really optional, bug #626504
- econf \
- --includedir="${EPREFIX}"/usr/include/libpisock \
- $(use_enable static-libs static) \
- --enable-conduits \
- --with-readline \
- $(use_enable threads) \
- $(use_enable usb libusb) \
- $(use_enable debug) \
- $(use_with png libpng) \
- $(use_with bluetooth bluez) \
- $(use_with perl) \
- $(use_with java) \
- --without-tcl \
- $(use_with python)
-}
-
-src_compile() {
- emake
-
- if use perl; then
- cd "${S}"/bindings/Perl
- perl-module_src_configure
- local mymake=( OTHERLDFLAGS="${LDFLAGS} -L../../libpisock/.libs -lpisock" ) #308629
- perl-module_src_compile
- fi
-
- if use python; then
- cd "${S}"/bindings/Python
- distutils-r1_src_compile
- fi
-}
-
-src_install() {
- emake DESTDIR="${D}" install
- dodoc ChangeLog NEWS README doc/{README*,TODO}
-
- if use java; then
- cd "${S}"/bindings/Java
- java-pkg_newjar ${PN}.jar
- java-pkg_doso libjpisock.so
- fi
-
- if use perl; then
- cd "${S}"/bindings/Perl
- perl-module_src_install
- fi
-
- if use python; then
- cd "${S}"/bindings/Python
- distutils-r1_src_install
- fi
-
- find "${D}" -name '*.la' -delete || die
-}
-
-pkg_preinst() {
- perl_set_version
- java-pkg-opt-2_pkg_preinst
-}
diff --git a/app-pda/pilot-link/pilot-link-0.12.5-r3.ebuild b/app-pda/pilot-link/pilot-link-0.12.5-r3.ebuild
index 6e88956efa7f..9bd001479e31 100644
--- a/app-pda/pilot-link/pilot-link-0.12.5-r3.ebuild
+++ b/app-pda/pilot-link/pilot-link-0.12.5-r3.ebuild
@@ -15,7 +15,7 @@ SRC_URI="mirror://gentoo/${P}.tar.bz2
LICENSE="|| ( GPL-2 LGPL-2 )"
SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm hppa ~ia64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 ~arm hppa ~ia64 ppc ppc64 x86 ~amd64-linux ~x86-linux"
IUSE="bluetooth debug perl png static-libs threads usb"
COMMON_DEPEND="
diff --git a/app-portage/Manifest.gz b/app-portage/Manifest.gz
index 13badcb25a29..ef8ff06db423 100644
Binary files a/app-portage/Manifest.gz and b/app-portage/Manifest.gz differ
diff --git a/app-portage/gemato/gemato-15.2.ebuild b/app-portage/gemato/gemato-15.2.ebuild
index 1ab542e69972..80a7515050e6 100644
--- a/app-portage/gemato/gemato-15.2.ebuild
+++ b/app-portage/gemato/gemato-15.2.ebuild
@@ -15,7 +15,7 @@ SRC_URI="mirror://pypi/${PN::1}/${PN}/${P}.tar.gz"
LICENSE="BSD-2"
SLOT="0"
-KEYWORDS="~amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux"
IUSE="+gpg tools"
RDEPEND="
diff --git a/app-portage/gemato/gemato-16.1.ebuild b/app-portage/gemato/gemato-16.1.ebuild
index fdff5ec75554..e32c11a2c082 100644
--- a/app-portage/gemato/gemato-16.1.ebuild
+++ b/app-portage/gemato/gemato-16.1.ebuild
@@ -15,7 +15,7 @@ SRC_URI="mirror://pypi/${PN::1}/${PN}/${P}.tar.gz"
LICENSE="BSD-2"
SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~x64-cygwin ~amd64-linux ~x86-linux"
+KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-cygwin ~amd64-linux ~x86-linux"
IUSE="+gpg tools"
RDEPEND="
diff --git a/app-portage/gpyutils/Manifest b/app-portage/gpyutils/Manifest
index 2953fec635b1..c4860f775fe1 100644
--- a/app-portage/gpyutils/Manifest
+++ b/app-portage/gpyutils/Manifest
@@ -1,4 +1,2 @@
-DIST gpyutils-0.4.2.tar.gz 19771 BLAKE2B a5b58efcaad803a3eeb4a04b51811c2832f5a61154ac60b67c31e1962efd5f1a801e06fd3245c2336e6440b03fae2c30642e99c7588af89b7a3d0173b93f0c87 SHA512 699132833ddbaffe26bec8b3cb8914a609cc98ee2d8b852b59162265ee3daf6a0a0bd8ccc4d693e319d4e413c441ca94bd6837f07f1a132bda383350593792c4
DIST gpyutils-0.4.3.tar.gz 19951 BLAKE2B 2d15c6c714a7f75be4a5398b7287d6281a201f1b5806c6cac34093cd74ae3449fcd103d023edc54ab088807e8a7b24e08bb223ae9f40d156ade97706cf4b9355 SHA512 02067d6d075afc6670eea75a0e9ed12bf02eecb623accd010701c45d4176bb23b1dd0fb9eda3a4e899d3fb90581c5f3fc46b5fc8760b491c31fddf592aa7a291
-DIST gpyutils-0.4.4.tar.gz 20030 BLAKE2B e94e8472b92835400c6d4b1ec07ec810eec88b0ae8160621fe329b4c7c4981f4c4cad45c4f2e7f70bd80a4031d5bbf8ffefe9614b94f255fbc39ce87411ab8fb SHA512 94b941220e431ea4f45b2824e3d58cc2d7571ab87c15a77217293afa68e2b9a7f833d5ed47f28cc5eb35a62415ae03618dcc2b96ee015a685314ef6be6350eaf
DIST gpyutils-0.4.5.tar.gz 20037 BLAKE2B f628c11e0ae2c9bb02a024e1b7dcab7092e7b01c14078683c47a8ca00d71021b988c51d80ab8b322891f9ecd4bb11c7bfe7d300f3bcbe489a977b18244ead085 SHA512 f68c87b5a35aece182bf2f9f93fe89f061dd49b4b75fabb7637038aee1e5301797af1d889a75829048eeb05dda0233461a2f2600e185214600a282cea50d1d3c
diff --git a/app-portage/gpyutils/gpyutils-0.4.2.ebuild b/app-portage/gpyutils/gpyutils-0.4.2.ebuild
deleted file mode 100644
index ac5c7dac4d64..000000000000
--- a/app-portage/gpyutils/gpyutils-0.4.2.ebuild
+++ /dev/null
@@ -1,24 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-DISTUTILS_USE_SETUPTOOLS=no
-PYTHON_COMPAT=( python3_{6..9} )
-
-inherit distutils-r1
-
-DESCRIPTION="Utitilies for maintaining Python packages"
-HOMEPAGE="https://github.com/mgorny/gpyutils/"
-SRC_URI="https://github.com/mgorny/gpyutils/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE=""
-
-RDEPEND=">=app-portage/gentoopm-0.3.1[${PYTHON_USEDEP}]"
-
-python_test() {
- esetup.py test
-}
diff --git a/app-portage/gpyutils/gpyutils-0.4.3.ebuild b/app-portage/gpyutils/gpyutils-0.4.3.ebuild
index a519e2a5c0f2..ac5c7dac4d64 100644
--- a/app-portage/gpyutils/gpyutils-0.4.3.ebuild
+++ b/app-portage/gpyutils/gpyutils-0.4.3.ebuild
@@ -14,7 +14,7 @@ SRC_URI="https://github.com/mgorny/gpyutils/archive/v${PV}.tar.gz -> ${P}.tar.gz
LICENSE="BSD"
SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
IUSE=""
RDEPEND=">=app-portage/gentoopm-0.3.1[${PYTHON_USEDEP}]"
diff --git a/app-portage/gpyutils/gpyutils-0.4.4.ebuild b/app-portage/gpyutils/gpyutils-0.4.4.ebuild
deleted file mode 100644
index fa25bd96a86c..000000000000
--- a/app-portage/gpyutils/gpyutils-0.4.4.ebuild
+++ /dev/null
@@ -1,26 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-DISTUTILS_USE_SETUPTOOLS=no
-PYTHON_COMPAT=( python3_{6..9} )
-
-inherit distutils-r1
-
-DESCRIPTION="Utitilies for maintaining Python packages"
-HOMEPAGE="https://github.com/mgorny/gpyutils/"
-SRC_URI="
- https://github.com/mgorny/gpyutils/archive/v${PV}.tar.gz
- -> ${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND=">=app-portage/gentoopm-0.3.2[${PYTHON_USEDEP}]"
-
-python_test() {
- esetup.py test
-}
diff --git a/app-portage/nattka/nattka-0.2.10.ebuild b/app-portage/nattka/nattka-0.2.10.ebuild
index 615f48512154..57a65e264ac8 100644
--- a/app-portage/nattka/nattka-0.2.10.ebuild
+++ b/app-portage/nattka/nattka-0.2.10.ebuild
@@ -14,7 +14,7 @@ SRC_URI="https://github.com/mgorny/nattka/archive/v${PV}.tar.gz -> ${P}.tar.gz"
LICENSE="BSD-2"
SLOT="0"
-KEYWORDS="~alpha ~amd64 arm arm64 hppa ~ia64 ppc ppc64 ~s390 ~sparc x86"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ppc ppc64 ~s390 sparc x86"
IUSE="depgraph-order"
RDEPEND="
diff --git a/app-shells/Manifest.gz b/app-shells/Manifest.gz
index 471f24270365..f65006b080f5 100644
Binary files a/app-shells/Manifest.gz and b/app-shells/Manifest.gz differ
diff --git a/app-shells/bash/bash-2.05b_p13.ebuild b/app-shells/bash/bash-2.05b_p13.ebuild
index f5a44266db77..9c9eb79db32a 100644
--- a/app-shells/bash/bash-2.05b_p13.ebuild
+++ b/app-shells/bash/bash-2.05b_p13.ebuild
@@ -1,19 +1,19 @@
# Copyright 1999-2020 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
-EAPI="4"
+EAPI=7
-inherit eutils flag-o-matic toolchain-funcs
+inherit flag-o-matic toolchain-funcs
# Official patchlevel
# See ftp://ftp.cwru.edu/pub/bash/bash-2.05b-patches/
-PLEVEL=${PV##*_p}
-MY_PV=${PV/_p*}
-MY_PV=${MY_PV/_/-}
-MY_P=${PN}-${MY_PV}
+PLEVEL="${PV##*_p}"
+MY_PV="${PV/_p*}"
+MY_PV="${MY_PV/_/-}"
+MY_P="${PN}-${MY_PV}"
[[ ${PV} != *_p* ]] && PLEVEL=0
patches() {
- local opt=$1 plevel=${2:-${PLEVEL}} pn=${3:-${PN}} pv=${4:-${MY_PV}}
+ local opt=${1} plevel=${2:-${PLEVEL}} pn=${3:-${PN}} pv=${4:-${MY_PV}}
[[ ${plevel} -eq 0 ]] && return 1
eval set -- {1..${plevel}}
set -- $(printf "${pn}${pv/\.}-%03d " "$@")
@@ -43,7 +43,19 @@ RDEPEND="!static? ( ${LIB_DEPEND//\[static-libs(+)]} )"
DEPEND="${RDEPEND}
static? ( ${LIB_DEPEND} )"
-S=${WORKDIR}/${MY_P}
+S="${WORKDIR}/${MY_P}"
+
+PATCHES=(
+ "${FILESDIR}"/${PN}-2.05b-destdir.patch
+ "${FILESDIR}"/autoconf-mktime-2.53.patch #220040
+ "${FILESDIR}"/${PN}-2.05b-protos.patch
+ "${FILESDIR}"/${PN}-2.05b-empty-herestring.patch
+ "${FILESDIR}"/${PN}-2.05b-rbash.patch #26854
+ "${FILESDIR}"/${PN}-2.05b-parallel-build.patch #41002
+ "${FILESDIR}"/${PN}-2.05b-jobs.patch
+ "${FILESDIR}"/${PN}-2.05b-fix-job-warning.patch
+ "${FILESDIR}"/${PN}-3.1-dev-fd-buffer-overflow.patch #431850
+)
pkg_setup() {
if is-flag -malign-double ; then #7332
@@ -59,28 +71,28 @@ src_unpack() {
src_prepare() {
# Include official patches
- [[ ${PLEVEL} -gt 0 ]] && epatch $(patches -s)
+ [[ ${PLEVEL} -gt 0 ]] && eapply -p0 $(patches -s)
# Clean out local libs so we know we use system ones
- rm -rf lib/{readline,termcap}/*
- touch lib/{readline,termcap}/Makefile.in # for config.status
+ rm -rf lib/{readline,termcap}/* || die
+ touch lib/{readline,termcap}/Makefile.in || die # for config.status
sed -ri -e 's:\$[(](RL|HIST)_LIBSRC[)]/[[:alpha:]]*.h::g' Makefile.in || die
- epatch "${FILESDIR}"/${PN}-2.05b-destdir.patch
- epatch "${FILESDIR}"/autoconf-mktime-2.53.patch #220040
- epatch "${FILESDIR}"/${PN}-2.05b-protos.patch
- epatch "${FILESDIR}"/${PN}-2.05b-empty-herestring.patch
- epatch "${FILESDIR}"/${PN}-2.05b-rbash.patch #26854
- epatch "${FILESDIR}"/${PN}-2.05b-parallel-build.patch #41002
- epatch "${FILESDIR}"/${PN}-2.05b-jobs.patch
- epatch "${FILESDIR}"/${PN}-2.05b-fix-job-warning.patch
- epatch "${FILESDIR}"/${PN}-3.1-dev-fd-buffer-overflow.patch #431850
-
- epatch_user
+ default
}
src_configure() {
- local myconf=()
+ local myconf=(
+ --with-installed-readline=.
+ --with-curses
+ $(use_with afs)
+ $(use_enable net net-redirections)
+ --disable-profiling
+ --without-gnu-malloc
+ $(use_enable readline)
+ $(use_enable readline history)
+ $(use_enable readline bang-history)
+ )
# Force pgrp synchronization
# https://bugzilla.redhat.com/bugzilla/show_bug.cgi?id=81653
@@ -118,18 +130,7 @@ src_configure() {
# This old autoconf script does not re-exec itself properly and fails when
# /bin/sh is not bash. Rather than try to regen everything, just force the
# use of bash directly.
- CONFIG_SHELL="/bin/bash" \
- econf \
- --with-installed-readline=. \
- --with-curses \
- $(use_with afs) \
- $(use_enable net net-redirections) \
- --disable-profiling \
- --without-gnu-malloc \
- $(use_enable readline) \
- $(use_enable readline history) \
- $(use_enable readline bang-history) \
- "${myconf[@]}"
+ CONFIG_SHELL="/bin/bash" econf "${myconf[@]}"
}
src_install() {
diff --git a/app-shells/bash/bash-3.0_p22.ebuild b/app-shells/bash/bash-3.0_p22.ebuild
index cfd3e4195cb0..6437d45fb536 100644
--- a/app-shells/bash/bash-3.0_p22.ebuild
+++ b/app-shells/bash/bash-3.0_p22.ebuild
@@ -1,19 +1,19 @@
# Copyright 1999-2020 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
-EAPI="4"
+EAPI=7
-inherit eutils flag-o-matic toolchain-funcs
+inherit flag-o-matic toolchain-funcs
# Official patchlevel
# See ftp://ftp.cwru.edu/pub/bash/bash-3.0-patches/
-PLEVEL=${PV##*_p}
-MY_PV=${PV/_p*}
-MY_PV=${MY_PV/_/-}
-MY_P=${PN}-${MY_PV}
+PLEVEL="${PV##*_p}"
+MY_PV="${PV/_p*}"
+MY_PV="${MY_PV/_/-}"
+MY_P="${PN}-${MY_PV}"
[[ ${PV} != *_p* ]] && PLEVEL=0
patches() {
- local opt=$1 plevel=${2:-${PLEVEL}} pn=${3:-${PN}} pv=${4:-${MY_PV}}
+ local opt=${1} plevel=${2:-${PLEVEL}} pn=${3:-${PN}} pv=${4:-${MY_PV}}
[[ ${plevel} -eq 0 ]] && return 1
eval set -- {1..${plevel}}
set -- $(printf "${pn}${pv/\.}-%03d " "$@")
@@ -43,7 +43,22 @@ RDEPEND="!static? ( ${LIB_DEPEND//\[static-libs(+)]} )"
DEPEND="${RDEPEND}
static? ( ${LIB_DEPEND} )"
-S=${WORKDIR}/${MY_P}
+S="${WORKDIR}/${MY_P}"
+
+PATCHES=(
+ "${FILESDIR}"/autoconf-mktime-2.53.patch #220040
+ "${FILESDIR}"/${PN}-3.0-protos.patch
+ "${FILESDIR}"/${PN}-3.0-rbash.patch #26854
+ "${FILESDIR}"/${PN}-2.05b-parallel-build.patch #41002
+ "${FILESDIR}"/${PN}-3.0-darwin-conn.patch #79124
+ # read patch headers for more info ... many ripped from Fedora/Debian[17]/SuSe/upstream
+ "${FILESDIR}"/${PN}-3.0-{afs,crash,jobs,manpage,pwd,ulimit,histtimeformat,locale,multibyteifs,subshell,volatile-command}.patch
+ "${FILESDIR}"/${PN}-3.0-read-builtin-pipe.patch #87093
+ "${FILESDIR}"/${PN}-3.0-trap-fg-signals.patch
+ "${FILESDIR}"/${PN}-3.0-pgrp-pipe-fix.patch #92349
+ "${FILESDIR}"/${PN}-3.0-strnlen.patch
+ "${FILESDIR}"/${PN}-3.1-dev-fd-buffer-overflow.patch #431850
+)
pkg_setup() {
if is-flag -malign-double ; then #7332
@@ -59,36 +74,28 @@ src_unpack() {
src_prepare() {
# Include official patches
- [[ ${PLEVEL} -gt 0 ]] && epatch $(patches -s)
+ [[ ${PLEVEL} -gt 0 ]] && eapply -p0 $(patches -s)
# Clean out local libs so we know we use system ones
- rm -rf lib/{readline,termcap}/*
- touch lib/{readline,termcap}/Makefile.in # for config.status
+ rm -rf lib/{readline,termcap}/* || die
+ touch lib/{readline,termcap}/Makefile.in || die # for config.status
sed -ri -e 's:\$[(](RL|HIST)_LIBSRC[)]/[[:alpha:]]*.h::g' Makefile.in || die
- epatch "${FILESDIR}"/autoconf-mktime-2.53.patch #220040
- epatch "${FILESDIR}"/${PN}-3.0-protos.patch
- epatch "${FILESDIR}"/${PN}-3.0-rbash.patch #26854
- epatch "${FILESDIR}"/${PN}-2.05b-parallel-build.patch #41002
- epatch "${FILESDIR}"/${PN}-3.0-darwin-conn.patch #79124
- # read patch headers for more info ... many ripped from Fedora/Debian[17]/SuSe/upstream
- for i in afs crash jobs manpage pwd ulimit histtimeformat \
- locale multibyteifs subshell \
- volatile-command
- do
- epatch "${FILESDIR}"/${PN}-3.0-${i}.patch
- done
- epatch "${FILESDIR}"/${PN}-3.0-read-builtin-pipe.patch #87093
- epatch "${FILESDIR}"/${PN}-3.0-trap-fg-signals.patch
- epatch "${FILESDIR}"/${PN}-3.0-pgrp-pipe-fix.patch #92349
- epatch "${FILESDIR}"/${PN}-3.0-strnlen.patch
- epatch "${FILESDIR}"/${PN}-3.1-dev-fd-buffer-overflow.patch #431850
-
- epatch_user
+ default
}
src_configure() {
- local myconf=()
+ local myconf=(
+ --with-installed-readline=.
+ --with-curses
+ $(use_with afs)
+ $(use_enable net net-redirections)
+ --disable-profiling
+ --without-gnu-malloc
+ $(use_enable readline)
+ $(use_enable readline history)
+ $(use_enable readline bang-history)
+ )
# Force pgrp synchronization
# https://bugzilla.redhat.com/bugzilla/show_bug.cgi?id=81653
@@ -123,17 +130,7 @@ src_configure() {
# ncurses in one or two small places :(.
tc-export AR #444070
- econf \
- --with-installed-readline=. \
- --with-curses \
- $(use_with afs) \
- $(use_enable net net-redirections) \
- --disable-profiling \
- --without-gnu-malloc \
- $(use_enable readline) \
- $(use_enable readline history) \
- $(use_enable readline bang-history) \
- "${myconf[@]}"
+ econf "${myconf[@]}"
}
src_install() {
diff --git a/app-shells/bash/bash-3.1_p23.ebuild b/app-shells/bash/bash-3.1_p23.ebuild
index 05a7f9dd6087..ad1a7e46c428 100644
--- a/app-shells/bash/bash-3.1_p23.ebuild
+++ b/app-shells/bash/bash-3.1_p23.ebuild
@@ -1,19 +1,19 @@
# Copyright 1999-2020 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
-EAPI="4"
+EAPI=7
-inherit eutils flag-o-matic toolchain-funcs
+inherit flag-o-matic toolchain-funcs
# Official patchlevel
# See ftp://ftp.cwru.edu/pub/bash/bash-3.1-patches/
-PLEVEL=${PV##*_p}
-MY_PV=${PV/_p*}
-MY_PV=${MY_PV/_/-}
-MY_P=${PN}-${MY_PV}
+PLEVEL="${PV##*_p}"
+MY_PV="${PV/_p*}"
+MY_PV="${MY_PV/_/-}"
+MY_P="${PN}-${MY_PV}"
[[ ${PV} != *_p* ]] && PLEVEL=0
patches() {
- local opt=$1 plevel=${2:-${PLEVEL}} pn=${3:-${PN}} pv=${4:-${MY_PV}}
+ local opt=${1} plevel=${2:-${PLEVEL}} pn=${3:-${PN}} pv=${4:-${MY_PV}}
[[ ${plevel} -eq 0 ]] && return 1
eval set -- {1..${plevel}}
set -- $(printf "${pn}${pv/\.}-%03d " "$@")
@@ -43,7 +43,19 @@ RDEPEND="!static? ( ${LIB_DEPEND//\[static-libs(+)]} )"
DEPEND="${RDEPEND}
static? ( ${LIB_DEPEND} )"
-S=${WORKDIR}/${MY_P}
+S="${WORKDIR}/${MY_P}"
+
+PATCHES=(
+ "${FILESDIR}"/autoconf-mktime-2.53.patch #220040
+ "${FILESDIR}"/${PN}-2.05b-parallel-build.patch #41002
+ "${FILESDIR}"/${PN}-3.1-protos.patch
+ "${FILESDIR}"/${PN}-3.1-ulimit.patch
+ "${FILESDIR}"/${PN}-3.0-read-memleak.patch
+ "${FILESDIR}"/${PN}-3.0-trap-fg-signals.patch
+ "${FILESDIR}"/${PN}-3.1-fix-dash-login-shell.patch #118257
+ "${FILESDIR}"/${PN}-3.1-dev-fd-test-as-user.patch #131875
+ "${FILESDIR}"/${PN}-3.1-dev-fd-buffer-overflow.patch #431850
+)
pkg_setup() {
if is-flag -malign-double ; then #7332
@@ -59,28 +71,28 @@ src_unpack() {
src_prepare() {
# Include official patches
- [[ ${PLEVEL} -gt 0 ]] && epatch $(patches -s)
+ [[ ${PLEVEL} -gt 0 ]] && eapply -p0 $(patches -s)
# Clean out local libs so we know we use system ones
- rm -rf lib/{readline,termcap}/*
- touch lib/{readline,termcap}/Makefile.in # for config.status
+ rm -rf lib/{readline,termcap}/* || die
+ touch lib/{readline,termcap}/Makefile.in || die # for config.status
sed -ri -e 's:\$[(](RL|HIST)_LIBSRC[)]/[[:alpha:]]*.h::g' Makefile.in || die
- epatch "${FILESDIR}"/autoconf-mktime-2.53.patch #220040
- epatch "${FILESDIR}"/${PN}-2.05b-parallel-build.patch #41002
- epatch "${FILESDIR}"/${PN}-3.1-protos.patch
- epatch "${FILESDIR}"/${PN}-3.1-ulimit.patch
- epatch "${FILESDIR}"/${PN}-3.0-read-memleak.patch
- epatch "${FILESDIR}"/${PN}-3.0-trap-fg-signals.patch
- epatch "${FILESDIR}"/${PN}-3.1-fix-dash-login-shell.patch #118257
- epatch "${FILESDIR}"/${PN}-3.1-dev-fd-test-as-user.patch #131875
- epatch "${FILESDIR}"/${PN}-3.1-dev-fd-buffer-overflow.patch #431850
-
- epatch_user
+ default
}
src_configure() {
- local myconf=()
+ local myconf=(
+ --with-installed-readline=.
+ --with-curses
+ $(use_with afs)
+ $(use_enable net net-redirections)
+ --disable-profiling
+ --without-gnu-malloc
+ $(use_enable readline)
+ $(use_enable readline history)
+ $(use_enable readline bang-history)
+ )
# Force pgrp synchronization
# https://bugzilla.redhat.com/bugzilla/show_bug.cgi?id=81653
@@ -115,17 +127,7 @@ src_configure() {
# ncurses in one or two small places :(.
tc-export AR #444070
- econf \
- --with-installed-readline=. \
- --with-curses \
- $(use_with afs) \
- $(use_enable net net-redirections) \
- --disable-profiling \
- --without-gnu-malloc \
- $(use_enable readline) \
- $(use_enable readline history) \
- $(use_enable readline bang-history) \
- "${myconf[@]}"
+ econf "${myconf[@]}"
}
src_install() {
diff --git a/app-shells/bash/bash-3.2_p57.ebuild b/app-shells/bash/bash-3.2_p57.ebuild
index 1c31b22879b6..f555e3f03de1 100644
--- a/app-shells/bash/bash-3.2_p57.ebuild
+++ b/app-shells/bash/bash-3.2_p57.ebuild
@@ -1,19 +1,19 @@
# Copyright 1999-2020 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
-EAPI="4"
+EAPI=7
-inherit eutils flag-o-matic toolchain-funcs
+inherit flag-o-matic toolchain-funcs
# Official patchlevel
# See ftp://ftp.cwru.edu/pub/bash/bash-3.2-patches/
-PLEVEL=${PV##*_p}
-MY_PV=${PV/_p*}
-MY_PV=${MY_PV/_/-}
-MY_P=${PN}-${MY_PV}
+PLEVEL="${PV##*_p}"
+MY_PV="${PV/_p*}"
+MY_PV="${MY_PV/_/-}"
+MY_P="${PN}-${MY_PV}"
[[ ${PV} != *_p* ]] && PLEVEL=0
patches() {
- local opt=$1 plevel=${2:-${PLEVEL}} pn=${3:-${PN}} pv=${4:-${MY_PV}}
+ local opt=${1} plevel=${2:-${PLEVEL}} pn=${3:-${PN}} pv=${4:-${MY_PV}}
[[ ${plevel} -eq 0 ]] && return 1
eval set -- {1..${plevel}}
set -- $(printf "${pn}${pv/\.}-%03d " "$@")
@@ -43,7 +43,21 @@ RDEPEND="!static? ( ${LIB_DEPEND//\[static-libs(+)]} )"
DEPEND="${RDEPEND}
static? ( ${LIB_DEPEND} )"
-S=${WORKDIR}/${MY_P}
+S="${WORKDIR}/${MY_P}"
+
+PATCHES=(
+ "${FILESDIR}"/autoconf-mktime-2.59.patch #220040
+ "${FILESDIR}"/${PN}-3.2-loadables.patch
+ "${FILESDIR}"/${PN}-2.05b-parallel-build.patch #41002
+ "${FILESDIR}"/${PN}-3.2-protos.patch
+ "${FILESDIR}"/${PN}-3.2-session-leader.patch #231775
+ "${FILESDIR}"/${PN}-3.2-ldflags-for-build.patch #211947
+ "${FILESDIR}"/${PN}-3.2-process-subst.patch
+ "${FILESDIR}"/${PN}-3.2-ulimit.patch
+ "${FILESDIR}"/${PN}-3.0-trap-fg-signals.patch
+ "${FILESDIR}"/${PN}-3.2-dev-fd-test-as-user.patch #131875
+ "${FILESDIR}"/${PN}-4.2-dev-fd-buffer-overflow.patch #431850
+)
pkg_setup() {
if is-flag -malign-double ; then #7332
@@ -59,30 +73,28 @@ src_unpack() {
src_prepare() {
# Include official patches
- [[ ${PLEVEL} -gt 0 ]] && epatch $(patches -s)
+ [[ ${PLEVEL} -gt 0 ]] && eapply -p0 $(patches -s)
# Clean out local libs so we know we use system ones
- rm -rf lib/{readline,termcap}/*
- touch lib/{readline,termcap}/Makefile.in # for config.status
+ rm -rf lib/{readline,termcap}/* || die
+ touch lib/{readline,termcap}/Makefile.in || die # for config.status
sed -ri -e 's:\$[(](RL|HIST)_LIBSRC[)]/[[:alpha:]]*.h::g' Makefile.in || die
- epatch "${FILESDIR}"/autoconf-mktime-2.59.patch #220040
- epatch "${FILESDIR}"/${PN}-3.2-loadables.patch
- epatch "${FILESDIR}"/${PN}-2.05b-parallel-build.patch #41002
- epatch "${FILESDIR}"/${PN}-3.2-protos.patch
- epatch "${FILESDIR}"/${PN}-3.2-session-leader.patch #231775
- epatch "${FILESDIR}"/${PN}-3.2-ldflags-for-build.patch #211947
- epatch "${FILESDIR}"/${PN}-3.2-process-subst.patch
- epatch "${FILESDIR}"/${PN}-3.2-ulimit.patch
- epatch "${FILESDIR}"/${PN}-3.0-trap-fg-signals.patch
- epatch "${FILESDIR}"/${PN}-3.2-dev-fd-test-as-user.patch #131875
- epatch "${FILESDIR}"/${PN}-4.2-dev-fd-buffer-overflow.patch #431850
-
- epatch_user
+ default
}
src_configure() {
- local myconf=()
+ local myconf=(
+ --with-installed-readline=.
+ --with-curses
+ $(use_with afs)
+ $(use_enable net net-redirections)
+ --disable-profiling
+ --without-gnu-malloc
+ $(use_enable readline)
+ $(use_enable readline history)
+ $(use_enable readline bang-history)
+ )
# Force pgrp synchronization
# https://bugzilla.redhat.com/bugzilla/show_bug.cgi?id=81653
@@ -117,17 +129,7 @@ src_configure() {
# ncurses in one or two small places :(.
tc-export AR #444070
- econf \
- --with-installed-readline=. \
- --with-curses \
- $(use_with afs) \
- $(use_enable net net-redirections) \
- --disable-profiling \
- --without-gnu-malloc \
- $(use_enable readline) \
- $(use_enable readline history) \
- $(use_enable readline bang-history) \
- "${myconf[@]}"
+ econf "${myconf[@]}"
}
src_install() {
diff --git a/app-shells/bash/bash-4.0_p44.ebuild b/app-shells/bash/bash-4.0_p44.ebuild
index a3dd97b7f88c..560929519b51 100644
--- a/app-shells/bash/bash-4.0_p44.ebuild
+++ b/app-shells/bash/bash-4.0_p44.ebuild
@@ -1,19 +1,19 @@
# Copyright 1999-2020 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
-EAPI="4"
+EAPI=7
-inherit eutils flag-o-matic toolchain-funcs
+inherit flag-o-matic toolchain-funcs
# Official patchlevel
# See ftp://ftp.cwru.edu/pub/bash/bash-4.0-patches/
-PLEVEL=${PV##*_p}
-MY_PV=${PV/_p*}
-MY_PV=${MY_PV/_/-}
-MY_P=${PN}-${MY_PV}
+PLEVEL="${PV##*_p}"
+MY_PV="${PV/_p*}"
+MY_PV="${MY_PV/_/-}"
+MY_P="${PN}-${MY_PV}"
[[ ${PV} != *_p* ]] && PLEVEL=0
patches() {
- local opt=$1 plevel=${2:-${PLEVEL}} pn=${3:-${PN}} pv=${4:-${MY_PV}}
+ local opt=${1} plevel=${2:-${PLEVEL}} pn=${3:-${PN}} pv=${4:-${MY_PV}}
[[ ${plevel} -eq 0 ]] && return 1
eval set -- {1..${plevel}}
set -- $(printf "${pn}${pv/\.}-%03d " "$@")
@@ -43,7 +43,18 @@ RDEPEND="!static? ( ${LIB_DEPEND//\[static-libs(+)]} )"
DEPEND="${RDEPEND}
static? ( ${LIB_DEPEND} )"
-S=${WORKDIR}/${MY_P}
+S="${WORKDIR}/${MY_P}"
+
+PATCHES=(
+ "${FILESDIR}"/${PN}-4.0-configure.patch #304901
+ "${FILESDIR}"/${PN}-4.x-deferred-heredocs.patch
+
+ "${FILESDIR}"/${PN}-2.05b-parallel-build.patch #41002
+ "${FILESDIR}"/${PN}-4.0-ldflags-for-build.patch #211947
+ "${FILESDIR}"/${PN}-4.0-negative-return.patch
+ "${FILESDIR}"/${PN}-4.0-parallel-build.patch #267613
+ "${FILESDIR}"/${PN}-4.2-dev-fd-buffer-overflow.patch #431850
+)
pkg_setup() {
if is-flag -malign-double ; then #7332
@@ -59,28 +70,32 @@ src_unpack() {
src_prepare() {
# Include official patches
- [[ ${PLEVEL} -gt 0 ]] && epatch $(patches -s)
+ [[ ${PLEVEL} -gt 0 ]] && eapply -p0 $(patches -s)
# Clean out local libs so we know we use system ones
- rm -rf lib/{readline,termcap}/*
- touch lib/{readline,termcap}/Makefile.in # for config.status
+ rm -rf lib/{readline,termcap}/* || die
+ touch lib/{readline,termcap}/Makefile.in || die # for config.status
sed -ri -e 's:\$[(](RL|HIST)_LIBSRC[)]/[[:alpha:]]*.h::g' Makefile.in || die
- epatch "${FILESDIR}"/${PN}-4.0-configure.patch #304901
- epatch "${FILESDIR}"/${PN}-4.x-deferred-heredocs.patch
- sed -i '1i#define NEED_FPURGE_DECL' execute_cmd.c # needs fpurge() decl
- epatch "${FILESDIR}"/${PN}-2.05b-parallel-build.patch #41002
- epatch "${FILESDIR}"/${PN}-4.0-ldflags-for-build.patch #211947
- epatch "${FILESDIR}"/${PN}-4.0-negative-return.patch
- epatch "${FILESDIR}"/${PN}-4.0-parallel-build.patch #267613
- epatch "${FILESDIR}"/${PN}-4.2-dev-fd-buffer-overflow.patch #431850
- sed -i '/\.o: .*shell\.h/s:$: pathnames.h:' Makefile.in #267613
-
- epatch_user
+ default
+
+ sed -i '1i#define NEED_FPURGE_DECL' execute_cmd.c || die # needs fpurge() decl
+ sed -i '/\.o: .*shell\.h/s:$: pathnames.h:' Makefile.in || die #267613
}
src_configure() {
- local myconf=()
+ local myconf=(
+ --with-installed-readline=.
+ --with-curses
+ $(use_with afs)
+ $(use_enable net net-redirections)
+ --disable-profiling
+ $(use_enable mem-scramble)
+ $(use_with mem-scramble bash-malloc)
+ $(use_enable readline)
+ $(use_enable readline history)
+ $(use_enable readline bang-history)
+ )
# For descriptions of these, see config-top.h
# bashrc/#26952 bash_logout/#90488 ssh/#24762 mktemp/#574426
@@ -111,18 +126,7 @@ src_configure() {
# ncurses in one or two small places :(.
tc-export AR #444070
- econf \
- --with-installed-readline=. \
- --with-curses \
- $(use_with afs) \
- $(use_enable net net-redirections) \
- --disable-profiling \
- $(use_enable mem-scramble) \
- $(use_with mem-scramble bash-malloc) \
- $(use_enable readline) \
- $(use_enable readline history) \
- $(use_enable readline bang-history) \
- "${myconf[@]}"
+ econf "${myconf[@]}"
}
src_install() {
diff --git a/app-shells/bash/bash-4.1_p17.ebuild b/app-shells/bash/bash-4.1_p17.ebuild
index bf95280c8391..9c68ac62d283 100644
--- a/app-shells/bash/bash-4.1_p17.ebuild
+++ b/app-shells/bash/bash-4.1_p17.ebuild
@@ -1,19 +1,19 @@
# Copyright 1999-2020 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
-EAPI="4"
+EAPI=7
-inherit eutils flag-o-matic toolchain-funcs
+inherit flag-o-matic toolchain-funcs
# Official patchlevel
# See ftp://ftp.cwru.edu/pub/bash/bash-4.1-patches/
-PLEVEL=${PV##*_p}
-MY_PV=${PV/_p*}
-MY_PV=${MY_PV/_/-}
-MY_P=${PN}-${MY_PV}
+PLEVEL="${PV##*_p}"
+MY_PV="${PV/_p*}"
+MY_PV="${MY_PV/_/-}"
+MY_P="${PN}-${MY_PV}"
[[ ${PV} != *_p* ]] && PLEVEL=0
patches() {
- local opt=$1 plevel=${2:-${PLEVEL}} pn=${3:-${PN}} pv=${4:-${MY_PV}}
+ local opt=${1} plevel=${2:-${PLEVEL}} pn=${3:-${PN}} pv=${4:-${MY_PV}}
[[ ${plevel} -eq 0 ]] && return 1
eval set -- {1..${plevel}}
set -- $(printf "${pn}${pv/\.}-%03d " "$@")
@@ -43,7 +43,14 @@ RDEPEND="!static? ( ${LIB_DEPEND//\[static-libs(+)]} )"
DEPEND="${RDEPEND}
static? ( ${LIB_DEPEND} )"
-S=${WORKDIR}/${MY_P}
+S="${WORKDIR}/${MY_P}"
+
+PATCHES=(
+ "${FILESDIR}"/${PN}-4.1-fbsd-eaccess.patch #303411
+
+ "${FILESDIR}"/${PN}-4.1-parallel-build.patch
+ "${FILESDIR}"/${PN}-4.2-dev-fd-buffer-overflow.patch #431850
+)
pkg_setup() {
if is-flag -malign-double ; then #7332
@@ -59,23 +66,31 @@ src_unpack() {
src_prepare() {
# Include official patches
- [[ ${PLEVEL} -gt 0 ]] && epatch $(patches -s)
+ [[ ${PLEVEL} -gt 0 ]] && eapply -p0 $(patches -s)
# Clean out local libs so we know we use system ones
- rm -rf lib/{readline,termcap}/*
- touch lib/{readline,termcap}/Makefile.in # for config.status
+ rm -rf lib/{readline,termcap}/* || die
+ touch lib/{readline,termcap}/Makefile.in || die # for config.status
sed -ri -e 's:\$[(](RL|HIST)_LIBSRC[)]/[[:alpha:]]*.h::g' Makefile.in || die
- epatch "${FILESDIR}"/${PN}-4.1-fbsd-eaccess.patch #303411
- sed -i '1i#define NEED_FPURGE_DECL' execute_cmd.c # needs fpurge() decl
- epatch "${FILESDIR}"/${PN}-4.1-parallel-build.patch
- epatch "${FILESDIR}"/${PN}-4.2-dev-fd-buffer-overflow.patch #431850
+ default
- epatch_user
+ sed -i '1i#define NEED_FPURGE_DECL' execute_cmd.c || die # needs fpurge() decl
}
src_configure() {
- local myconf=()
+ local myconf=(
+ --with-installed-readline=.
+ --with-curses
+ $(use_with afs)
+ $(use_enable net net-redirections)
+ --disable-profiling
+ $(use_enable mem-scramble)
+ $(use_with mem-scramble bash-malloc)
+ $(use_enable readline)
+ $(use_enable readline history)
+ $(use_enable readline bang-history)
+ )
myconf+=( --without-lispdir ) #335896
@@ -108,18 +123,7 @@ src_configure() {
# ncurses in one or two small places :(.
tc-export AR #444070
- econf \
- --with-installed-readline=. \
- --with-curses \
- $(use_with afs) \
- $(use_enable net net-redirections) \
- --disable-profiling \
- $(use_enable mem-scramble) \
- $(use_with mem-scramble bash-malloc) \
- $(use_enable readline) \
- $(use_enable readline history) \
- $(use_enable readline bang-history) \
- "${myconf[@]}"
+ econf "${myconf[@]}"
}
src_install() {
diff --git a/app-shells/bash/bash-4.2_p53.ebuild b/app-shells/bash/bash-4.2_p53.ebuild
index 000f5397f9cd..1e566e163edc 100644
--- a/app-shells/bash/bash-4.2_p53.ebuild
+++ b/app-shells/bash/bash-4.2_p53.ebuild
@@ -1,19 +1,19 @@
# Copyright 1999-2020 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
-EAPI="4"
+EAPI=7
-inherit eutils flag-o-matic toolchain-funcs
+inherit flag-o-matic toolchain-funcs
# Official patchlevel
# See ftp://ftp.cwru.edu/pub/bash/bash-4.2-patches/
-PLEVEL=${PV##*_p}
-MY_PV=${PV/_p*}
-MY_PV=${MY_PV/_/-}
-MY_P=${PN}-${MY_PV}
+PLEVEL="${PV##*_p}"
+MY_PV="${PV/_p*}"
+MY_PV="${MY_PV/_/-}"
+MY_P="${PN}-${MY_PV}"
[[ ${PV} != *_p* ]] && PLEVEL=0
patches() {
- local opt=$1 plevel=${2:-${PLEVEL}} pn=${3:-${PN}} pv=${4:-${MY_PV}}
+ local opt=${1} plevel=${2:-${PLEVEL}} pn=${3:-${PN}} pv=${4:-${MY_PV}}
[[ ${plevel} -eq 0 ]] && return 1
eval set -- {1..${plevel}}
set -- $(printf "${pn}${pv/\.}-%03d " "$@")
@@ -40,12 +40,20 @@ LIB_DEPEND=">=sys-libs/ncurses-5.2-r2[static-libs(+)]
nls? ( virtual/libintl )
readline? ( >=sys-libs/readline-6.2[static-libs(+)] )"
RDEPEND="!static? ( ${LIB_DEPEND//\[static-libs(+)]} )"
-# we only need yacc when the .y files get patched (bash42-005)
DEPEND="${RDEPEND}
- virtual/yacc
static? ( ${LIB_DEPEND} )"
+# we only need yacc when the .y files get patched (bash42-005)
+BDEPEND="virtual/yacc"
-S=${WORKDIR}/${MY_P}
+S="${WORKDIR}/${MY_P}"
+
+PATCHES=(
+ "${FILESDIR}"/${PN}-4.2-execute-job-control.patch #383237
+ "${FILESDIR}"/${PN}-4.2-parallel-build.patch
+ "${FILESDIR}"/${PN}-4.2-no-readline.patch
+ "${FILESDIR}"/${PN}-4.2-read-retry.patch #447810
+ "${FILESDIR}"/${PN}-4.2-speed-up-read-N.patch
+)
pkg_setup() {
if is-flag -malign-double ; then #7332
@@ -61,28 +69,33 @@ src_unpack() {
src_prepare() {
# Include official patches
- [[ ${PLEVEL} -gt 0 ]] && epatch $(patches -s)
+ [[ ${PLEVEL} -gt 0 ]] && eapply -p0 $(patches -s)
# Clean out local libs so we know we use system ones
- rm -rf lib/{readline,termcap}/*
- touch lib/{readline,termcap}/Makefile.in # for config.status
+ rm -rf lib/{readline,termcap}/* || die
+ touch lib/{readline,termcap}/Makefile.in || die # for config.status
sed -ri -e 's:\$[(](RL|HIST)_LIBSRC[)]/[[:alpha:]]*.h::g' Makefile.in || die
# Avoid regenerating docs after patches #407985
sed -i -r '/^(HS|RL)USER/s:=.*:=:' doc/Makefile.in || die
- touch -r . doc/*
-
- epatch "${FILESDIR}"/${PN}-4.2-execute-job-control.patch #383237
- epatch "${FILESDIR}"/${PN}-4.2-parallel-build.patch
- epatch "${FILESDIR}"/${PN}-4.2-no-readline.patch
- epatch "${FILESDIR}"/${PN}-4.2-read-retry.patch #447810
- epatch "${FILESDIR}"/${PN}-4.2-speed-up-read-N.patch
+ touch -r . doc/* || die
- epatch_user
+ default
}
src_configure() {
- local myconf=()
+ local myconf=(
+ --with-installed-readline=.
+ --with-curses
+ $(use_with afs)
+ $(use_enable net net-redirections)
+ --disable-profiling
+ $(use_enable mem-scramble)
+ $(use_with mem-scramble bash-malloc)
+ $(use_enable readline)
+ $(use_enable readline history)
+ $(use_enable readline bang-history)
+ )
# For descriptions of these, see config-top.h
# bashrc/#26952 bash_logout/#90488 ssh/#24762 mktemp/#574426
@@ -113,18 +126,7 @@ src_configure() {
# ncurses in one or two small places :(.
tc-export AR #444070
- econf \
- --with-installed-readline=. \
- --with-curses \
- $(use_with afs) \
- $(use_enable net net-redirections) \
- --disable-profiling \
- $(use_enable mem-scramble) \
- $(use_with mem-scramble bash-malloc) \
- $(use_enable readline) \
- $(use_enable readline history) \
- $(use_enable readline bang-history) \
- "${myconf[@]}"
+ econf "${myconf[@]}"
}
src_install() {
diff --git a/app-shells/bash/bash-4.3_p48-r2.ebuild b/app-shells/bash/bash-4.3_p48-r2.ebuild
index 97bf26b8e8fc..d535737ea7ee 100644
--- a/app-shells/bash/bash-4.3_p48-r2.ebuild
+++ b/app-shells/bash/bash-4.3_p48-r2.ebuild
@@ -1,19 +1,19 @@
# Copyright 1999-2020 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
-EAPI="5"
+EAPI=7
-inherit eutils flag-o-matic toolchain-funcs multilib
+inherit flag-o-matic toolchain-funcs multilib
# Official patchlevel
# See ftp://ftp.cwru.edu/pub/bash/bash-4.3-patches/
-PLEVEL=${PV##*_p}
-MY_PV=${PV/_p*}
-MY_PV=${MY_PV/_/-}
-MY_P=${PN}-${MY_PV}
+PLEVEL="${PV##*_p}"
+MY_PV="${PV/_p*}"
+MY_PV="${MY_PV/_/-}"
+MY_P="${PN}-${MY_PV}"
[[ ${PV} != *_p* ]] && PLEVEL=0
patches() {
- local opt=$1 plevel=${2:-${PLEVEL}} pn=${3:-${PN}} pv=${4:-${MY_PV}}
+ local opt=${1} plevel=${2:-${PLEVEL}} pn=${3:-${PN}} pv=${4:-${MY_PV}}
[[ ${plevel} -eq 0 ]] && return 1
eval set -- {1..${plevel}}
set -- $(printf "${pn}${pv/\.}-%03d " "$@")
@@ -46,7 +46,7 @@ DEPEND=">=sys-libs/ncurses-5.2-r2:0=
RDEPEND="${DEPEND}
!>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
diff --git a/app-shells/bash/files/bash-3.0-crash.patch b/app-shells/bash/files/bash-3.0-crash.patch
index 984e85d82ed3..38577e2a67ea 100644
--- a/app-shells/bash/files/bash-3.0-crash.patch
+++ b/app-shells/bash/files/bash-3.0-crash.patch
@@ -14,8 +14,8 @@
Thanks for the report. Here's a quick fix:
-*** arrayfunc.c~ Sat Nov 6 15:08:29 2004
---- arrayfunc.c Mon Jan 31 11:56:21 2005
+*** a/arrayfunc.c
+--- b/arrayfunc.c
***************
*** 709,713 ****
return ((char *)NULL);
diff --git a/app-shells/bash/files/bash-3.0-pgrp-pipe-fix.patch b/app-shells/bash/files/bash-3.0-pgrp-pipe-fix.patch
index 35b0b7d05924..46df6213b7a4 100644
--- a/app-shells/bash/files/bash-3.0-pgrp-pipe-fix.patch
+++ b/app-shells/bash/files/bash-3.0-pgrp-pipe-fix.patch
@@ -6,8 +6,8 @@ http://bugs.gentoo.org/92349
Patch from upstream
-*** jobs.c Wed Sep 8 11:08:16 2004
---- jobs.c Thu Jun 30 17:21:26 2005
+*** a/jobs.c
+--- b/jobs.c
***************
*** 3456,3459 ****
--- 3901,3907 ----
diff --git a/app-shells/bash/files/bash-3.0-read-builtin-pipe.patch b/app-shells/bash/files/bash-3.0-read-builtin-pipe.patch
index 466e45ae3004..0b90cc3dc2b2 100644
--- a/app-shells/bash/files/bash-3.0-read-builtin-pipe.patch
+++ b/app-shells/bash/files/bash-3.0-read-builtin-pipe.patch
@@ -7,8 +7,8 @@ http://lists.gnu.org/archive/html/bug-bash/2005-03/msg00168.html
http://lists.gnu.org/archive/html/bug-bash/2005-03/msg00173.html
http://bugs.gentoo.org/show_bug.cgi?id=87093
---- builtins/read.def
-+++ builtins/read.def
+--- a/builtins/read.def
++++ b/builtins/read.def
@@ -276,7 +276,7 @@
input_is_tty = isatty (fd);
if (input_is_tty == 0)
diff --git a/app-shells/bash/files/bash-3.0-trap-fg-signals.patch b/app-shells/bash/files/bash-3.0-trap-fg-signals.patch
index cde18326ed2d..c7010511853f 100644
--- a/app-shells/bash/files/bash-3.0-trap-fg-signals.patch
+++ b/app-shells/bash/files/bash-3.0-trap-fg-signals.patch
@@ -2,8 +2,8 @@ Don't barf on handled signals inside of scripts. Makes for nicer output.
patch by Martin Schlemmer
---- jobs.c
-+++ jobs.c
+--- a/jobs.c
++++ b/jobs.c
@@ -2893,11 +2893,11 @@
}
else if (IS_FOREGROUND (job))
diff --git a/app-shells/bash/files/bash-3.0-volatile-command.patch b/app-shells/bash/files/bash-3.0-volatile-command.patch
index 8b89b35914b1..87b9f25ffc21 100644
--- a/app-shells/bash/files/bash-3.0-volatile-command.patch
+++ b/app-shells/bash/files/bash-3.0-volatile-command.patch
@@ -4,8 +4,8 @@ Ripped from Debian
# being optimized away as dead code. In reality, the use of setjmp/longjmp
# makes it not dead code at all.
---- eval.old 2003-12-18 23:44:15.000000000 -0500
-+++ eval.c 2005-10-03 01:59:31.000000000 -0400
+--- a/eval.c
++++ b/eval.c
@@ -63,7 +63,7 @@
reader_loop ()
{
diff --git a/app-shells/bash/files/bash-3.1-ulimit.patch b/app-shells/bash/files/bash-3.1-ulimit.patch
index 432fb54966b8..8c2474825cf1 100644
--- a/app-shells/bash/files/bash-3.1-ulimit.patch
+++ b/app-shells/bash/files/bash-3.1-ulimit.patch
@@ -3,8 +3,8 @@ Ripped from Fedora
Add support for RLIMIT_NICE/RLIMIT_RTPRIO and add missing documentation
for many other options
---- builtins/ulimit.def
-+++ builtins/ulimit.def
+--- a/builtins/ulimit.def
++++ b/builtins/ulimit.def
@@ -24,7 +24,7 @@
$BUILTIN ulimit
$FUNCTION ulimit_builtin
@@ -58,8 +58,8 @@ for many other options
#ifdef RLIMIT_STACK
{ 's', RLIMIT_STACK, 1024, "stack size", "kbytes" },
#endif
---- doc/bashref.texi
-+++ doc/bashref.texi
+--- a/doc/bashref.texi
++++ b/doc/bashref.texi
@@ -3833,7 +3833,7 @@
@item ulimit
@btindex ulimit
@@ -89,8 +89,8 @@ for many other options
@item -s
The maximum stack size.
---- doc/bash.1
-+++ doc/bash.1
+--- a/doc/bash.1
++++ b/doc/bash.1
@@ -8490,7 +8490,7 @@
returns true if any of the arguments are found, false if
none are found.
diff --git a/app-shells/bash/files/bash-3.2-process-subst.patch b/app-shells/bash/files/bash-3.2-process-subst.patch
index bd0b3f4e1792..94877c62b316 100644
--- a/app-shells/bash/files/bash-3.2-process-subst.patch
+++ b/app-shells/bash/files/bash-3.2-process-subst.patch
@@ -1,7 +1,7 @@
Fix process substitution on BSD
---- execute_cmd.c
-+++ execute_cmd.c
+--- a/execute_cmd.c
++++ b/execute_cmd.c
@@ -2672,6 +2672,7 @@
do_piping (pipe_in, pipe_out);
diff --git a/app-shells/bash/files/bash-3.2-session-leader.patch b/app-shells/bash/files/bash-3.2-session-leader.patch
index 82f7d9806333..2e9286f34d40 100644
--- a/app-shells/bash/files/bash-3.2-session-leader.patch
+++ b/app-shells/bash/files/bash-3.2-session-leader.patch
@@ -7,8 +7,8 @@ condition. A result is that the child can then not then execute some commands
(like stty) from its init script (e.g. .bashrc). The result I (and others)
have seen is that the bash shell will hang while reading the init script.
-*** jobs.c.20080704 2008-07-10 15:14:13.000000000 -0400
---- jobs.c 2008-07-10 15:17:59.000000000 -0400
+*** a/jobs.c
+--- b/jobs.c
***************
*** 266,269 ****
--- 266,270 ----
diff --git a/app-shells/bash/files/bash-3.2-ulimit.patch b/app-shells/bash/files/bash-3.2-ulimit.patch
index a0975cb6e9a8..19ea7e6e5e33 100644
--- a/app-shells/bash/files/bash-3.2-ulimit.patch
+++ b/app-shells/bash/files/bash-3.2-ulimit.patch
@@ -1,7 +1,7 @@
add missing docs for -e and -r options
---- builtins/ulimit.def
-+++ builtins/ulimit.def
+--- a/builtins/ulimit.def
++++ b/builtins/ulimit.def
@@ -24,7 +24,7 @@
$BUILTIN ulimit
$FUNCTION ulimit_builtin
diff --git a/app-shells/bash/files/bash-4.1-fbsd-eaccess.patch b/app-shells/bash/files/bash-4.1-fbsd-eaccess.patch
index 576a8a47a619..3c5b5dd98d9b 100644
--- a/app-shells/bash/files/bash-4.1-fbsd-eaccess.patch
+++ b/app-shells/bash/files/bash-4.1-fbsd-eaccess.patch
@@ -4,8 +4,8 @@ executable files when run by root on FreeBSD.
See http://bugs.gentoo.org/303411
Patch from Johan Hattne
---- lib/sh/eaccess.c.orig
-+++ lib/sh/eaccess.c
+--- a/lib/sh/eaccess.c.orig
++++ b/lib/sh/eaccess.c
@@ -198,11 +198,19 @@
char *path;
int mode;
diff --git a/app-shells/bash/files/bash-4.2-dev-fd-buffer-overflow.patch b/app-shells/bash/files/bash-4.2-dev-fd-buffer-overflow.patch
index bef960ab980c..d50c269b7e71 100644
--- a/app-shells/bash/files/bash-4.2-dev-fd-buffer-overflow.patch
+++ b/app-shells/bash/files/bash-4.2-dev-fd-buffer-overflow.patch
@@ -20,8 +20,8 @@ buffer to avoid buffer overflow.
Patch (apply with `patch -p0'):
-*** ../bash-4.2-patched/lib/sh/eaccess.c 2011-01-08 20:50:10.000000000 -0500
---- lib/sh/eaccess.c 2012-06-04 21:06:43.000000000 -0400
+*** bash-4.2/lib/sh/eaccess.c
+--- bash-4.2/lib/sh/eaccess.c
***************
*** 83,86 ****
--- 83,88 ----
diff --git a/app-shells/bash/files/bash-4.4-popd-offset-overflow.patch b/app-shells/bash/files/bash-4.4-popd-offset-overflow.patch
index c6ef19d03f5a..cc6b622eca34 100644
--- a/app-shells/bash/files/bash-4.4-popd-offset-overflow.patch
+++ b/app-shells/bash/files/bash-4.4-popd-offset-overflow.patch
@@ -1,8 +1,8 @@
https://bugs.gentoo.org/600174
https://lists.gnu.org/archive/html/bug-bash/2016-11/msg00099.html
-*** ../bash-4.4-patched/builtins/pushd.def 2016-01-25 13:31:49.000000000 -0500
---- builtins/pushd.def 2016-10-28 10:46:49.000000000 -0400
+*** bash-4.4/builtins/pushd.def
+--- bash-4.4/builtins/pushd.def
***************
*** 366,370 ****
}
diff --git a/app-shells/bash/files/bash-4.x-deferred-heredocs.patch b/app-shells/bash/files/bash-4.x-deferred-heredocs.patch
index 698d277a3db5..c6a6de44d36d 100644
--- a/app-shells/bash/files/bash-4.x-deferred-heredocs.patch
+++ b/app-shells/bash/files/bash-4.x-deferred-heredocs.patch
@@ -3,8 +3,8 @@ http://lists.gnu.org/archive/html/bug-bash/2010-03/msg00063.html
fix heredocs handling in `set` output
-*** ../bash-4.1-patched/print_cmd.c 2009-09-16 15:32:26.000000000 -0400
---- print_cmd.c 2010-03-22 21:15:30.000000000 -0400
+*** bash-4.1/print_cmd.c
+--- bash-4.1/print_cmd.c
***************
*** 114,117 ****
--- 114,123 ----
diff --git a/app-shells/quoter/quoter-4.2.ebuild b/app-shells/quoter/quoter-4.2.ebuild
index 71913b702e01..43d1bc0ddaa2 100644
--- a/app-shells/quoter/quoter-4.2.ebuild
+++ b/app-shells/quoter/quoter-4.2.ebuild
@@ -10,7 +10,7 @@ SRC_URI="https://github.com/vaeth/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
LICENSE="MIT"
SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~ppc-aix ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x86-solaris"
+KEYWORDS="~alpha ~amd64 arm ~arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv s390 sparc x86 ~ppc-aix ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x86-solaris"
src_configure() {
tc-export CC
diff --git a/app-text/Manifest.gz b/app-text/Manifest.gz
index dd7e073fa3db..1cd64ae57454 100644
Binary files a/app-text/Manifest.gz and b/app-text/Manifest.gz differ
diff --git a/app-text/asciidoc/Manifest b/app-text/asciidoc/Manifest
index 53acfdadb8bb..99b52aacb626 100644
--- a/app-text/asciidoc/Manifest
+++ b/app-text/asciidoc/Manifest
@@ -1,2 +1 @@
-DIST asciidoc-8.6.10_p20181016.tar.gz 576694 BLAKE2B 4d255606675346d00ab03398bf48cb30d357f9f9366944e4faf66ae4c96dafce49acdd930fc848f3dbb2d704a004bb5815d17b53416a76c8368a92e4716328b2 SHA512 801f360b0c444e932f1c50897d446de0ec3f0fb2206080b5aa6dda396fede96065f7bb629a84c8a8e40c5d8897f305fdb1877512f04ae757f3b142fd3a7305d0
DIST asciidoc-9.0.2.tar.gz 1144308 BLAKE2B 5f5deca6b8c15d4b86e2bd6fdb131908eecd862a5fdbbd8418937050d335a25ad012a3b1bc716379f5623db676176fc6da1a09691c2b42a213a6230281626b69 SHA512 ea8f64ce54d2f1aa38eceb3c1c9be17b388776de58038f3b888ac5ebed76337fa2779e43eb7f47174adf0a0446ee808dbd1e4f8f7e1d7db99db7c4c8584d5624
diff --git a/app-text/asciidoc/asciidoc-8.6.10_p20181016-r1.ebuild b/app-text/asciidoc/asciidoc-8.6.10_p20181016-r1.ebuild
deleted file mode 100644
index df890701933c..000000000000
--- a/app-text/asciidoc/asciidoc-8.6.10_p20181016-r1.ebuild
+++ /dev/null
@@ -1,95 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{6,7} pypy3 )
-
-inherit autotools python-single-r1 readme.gentoo-r1
-
-DESCRIPTION="A plain text human readable/writable document format"
-HOMEPAGE="https://asciidoc.org/ https://github.com/asciidoc/asciidoc-py3/"
-MY_COMMIT="618f6e6f6b558ed1e5f2588cd60a5a6b4f881ca0"
-SRC_URI="https://github.com/${PN}/${PN}-py3/archive/${MY_COMMIT}.tar.gz -> ${P}.tar.gz"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-
-LICENSE="GPL-2"
-SLOT="0"
-IUSE="examples graphviz highlight test"
-RESTRICT="!test? ( test )"
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-
-RDEPEND="
- app-text/docbook-xml-dtd:4.5
- >=app-text/docbook-xsl-stylesheets-1.75
- dev-libs/libxslt
- dev-libs/libxml2
- ${PYTHON_DEPS}
- graphviz? ( media-gfx/graphviz )
- highlight? (
- || (
- dev-util/source-highlight
- $(python_gen_cond_dep '
- dev-python/pygments[${PYTHON_MULTI_USEDEP}]
- ')
- app-text/highlight
- )
- )"
-DEPEND="
- test? (
- app-text/dvipng
- dev-texlive/texlive-latex
- dev-util/source-highlight
- media-gfx/graphviz
- media-gfx/imagemagick
- media-sound/lilypond
- ${PYTHON_DEPS}
- )"
-
-DOC_CONTENTS="
-If you are going to use a2x, please also look at a2x(1) under
-REQUISITES for a list of runtime dependencies.
-"
-
-S="${WORKDIR}/${PN}-py3-${MY_COMMIT}"
-
-src_prepare() {
- default
- # Only needed for prefix - harmless (does nothing) otherwise
- sed -i -e "s:^CONF_DIR=.*:CONF_DIR='${EPREFIX}/etc/asciidoc':" \
- "${S}/asciidoc.py" || die
-
- eautoreconf
-}
-
-src_configure() {
- econf --sysconfdir="${EPREFIX}"/usr/share
-}
-
-src_test() {
- local -x ASCIIDOC_PY=asciidoc.py
- "${EPYTHON}" tests/test${PN}.py update || die
- "${EPYTHON}" tests/test${PN}.py run || die
-}
-
-src_install() {
- default
- python_fix_shebang "${ED}"/usr/bin/*.py
-
- readme.gentoo_create_doc
- dodoc BUGS.txt CHANGELOG.txt README.asciidoc docbook-xsl/asciidoc-docbook-xsl.txt \
- dblatex/dblatex-readme.txt filters/code/code-filter-readme.txt
-
- # Below results in some files being installed twice in different locations, but they are
- # in the right place, uncompressed, and there won't be any broken links. See bug #483336
- if use examples; then
- # examples/website is full of relative symlinks,
- # deref them for copying, which dodoc doesn't do
- cp -rL examples/website "${ED}"/usr/share/doc/${PF}/examples || die
- docompress -x /usr/share/doc/${PF}/examples
- fi
-}
-
-pkg_postinst() {
- readme.gentoo_print_elog
-}
diff --git a/app-text/asciidoc/asciidoc-9.0.2.ebuild b/app-text/asciidoc/asciidoc-9.0.2.ebuild
index 509c4f171bc5..261ecd80a732 100644
--- a/app-text/asciidoc/asciidoc-9.0.2.ebuild
+++ b/app-text/asciidoc/asciidoc-9.0.2.ebuild
@@ -13,7 +13,7 @@ SRC_URI="https://github.com/${PN}/${PN}-py3/archive/${PV/_/}.tar.gz -> ${P}.tar.
LICENSE="GPL-2"
SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ~ppc64 ~riscv s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
IUSE="doc test"
REQUIRED_USE="${PYTHON_REQUIRED_USE}"
diff --git a/app-text/asciidoc/metadata.xml b/app-text/asciidoc/metadata.xml
index 33454ff9d090..00433b60b17c 100644
--- a/app-text/asciidoc/metadata.xml
+++ b/app-text/asciidoc/metadata.xml
@@ -9,9 +9,6 @@
proxy-maint@gentoo.org
Proxy Maintainers
-
asciidoc
diff --git a/app-vim/Manifest.gz b/app-vim/Manifest.gz
index 94f3be735305..8490715fcbf3 100644
Binary files a/app-vim/Manifest.gz and b/app-vim/Manifest.gz differ
diff --git a/app-vim/c-support/Manifest b/app-vim/c-support/Manifest
index faa539c8c51c..f9a7284f8d58 100644
--- a/app-vim/c-support/Manifest
+++ b/app-vim/c-support/Manifest
@@ -1,3 +1 @@
-DIST c-support-6.0.tar.bz2 130832 BLAKE2B 0cec691b367904647b2d8ea0e284027b3b7ce0d3f8db0c8e8d5c9ceac996d0cdcd2899cc4432425fd2ab0ee205069ab95a239686de81c13c77dbf7c16db06811 SHA512 280e8e91b8961ad856524f1869ecd580870ccbb6064c02aefdd5cec7f55a7bf12a17c76a4de91c8d2a7fed25bd96e793909f7cc258b9664f295e1324e0b392da
DIST c-support-6.1.1.tar.bz2 167371 BLAKE2B 2c1d333d377eb57c52845f215c98d41e15029bd34fbef9cd8844cc2f237d129ed471d64dc71a55495189500de90b6e7fc3bb41cec18d62c51ba3b4ceb0331cc3 SHA512 dda33732505341bc260b9c3f73f95c70c3ee6f0eb50b9d1fd534fc8e83fb21d0caa3feea0ae50cf59da4abbef455c31fe1c02c80bb9168423cfa332941ff0886
-DIST c-support-6.1.tar.bz2 164255 BLAKE2B d57ab7d74eb0cc13767401aa2bad1f7883842d24e47ec0a03fb5354d5a6950029021ec1084acd7e5e86c42e9682eb4b1cc19c8c1f4c4f9d0a147571d88d51f8c SHA512 6fdc4f757ba0febfebe0c8898b6b0d582e03d6f7d08523e8663368011c41d6444df2620f96c6276d959b4a05b7c83a0e377bc5a8e75aaed5cf478f8bc83ce9ec
diff --git a/app-vim/c-support/c-support-6.0.ebuild b/app-vim/c-support/c-support-6.0.ebuild
deleted file mode 100644
index 9432efcde238..000000000000
--- a/app-vim/c-support/c-support-6.0.ebuild
+++ /dev/null
@@ -1,21 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="5"
-
-inherit vim-plugin
-
-DESCRIPTION="vim plugin: C/C++-IDE -- Write and run programs using menus and hotkeys"
-HOMEPAGE="https://www.vim.org/scripts/script.php?script_id=213"
-LICENSE="public-domain"
-KEYWORDS="amd64 x86"
-IUSE=""
-
-VIM_PLUGIN_HELPFILES="${PN}"
-
-src_install() {
- dodoc ${PN}/doc/{ChangeLog,c-hotkeys.pdf}
- rm -r ${PN}/doc || die
-
- vim-plugin_src_install
-}
diff --git a/app-vim/c-support/c-support-6.1.ebuild b/app-vim/c-support/c-support-6.1.ebuild
deleted file mode 100644
index b845e2e7abfc..000000000000
--- a/app-vim/c-support/c-support-6.1.ebuild
+++ /dev/null
@@ -1,20 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="5"
-
-inherit vim-plugin
-
-DESCRIPTION="vim plugin: C/C++-IDE -- Write and run programs using menus and hotkeys"
-HOMEPAGE="https://www.vim.org/scripts/script.php?script_id=213"
-LICENSE="public-domain"
-KEYWORDS="amd64 x86"
-
-VIM_PLUGIN_HELPFILES="${PN}"
-
-src_install() {
- dodoc ${PN}/doc/{ChangeLog,c-hotkeys.pdf}
- rm -r ${PN}/doc || die
-
- vim-plugin_src_install
-}
diff --git a/app-vim/sleuth/Manifest b/app-vim/sleuth/Manifest
index e42917e334b3..c9c0f6e0be09 100644
--- a/app-vim/sleuth/Manifest
+++ b/app-vim/sleuth/Manifest
@@ -1,2 +1 @@
-DIST sleuth-1.0.tar.bz2 1839 BLAKE2B 884c1e3ad2e5202e4827d9973611584dff0ec7c0dff6f310a192a757daa2ae8342c62d15f075249550880843f3596b195ab358ba186a764cdc51080abce5d76c SHA512 19fb158a28bfa02e7364208f11911d0afcda77f4a35a410202b0342130e48b99b52db56aa687b2484ba0ac9595970ae040c349e7a0fd350f07c40b6b58d43a13
DIST sleuth-1.1.tar.bz2 1972 BLAKE2B ca16a57f180bde63fd06510013c7e695ebe9111d42975b577932f860321286379dc71bb840135ce1d60f1f27de942792889ff9de974b1366988b2407413838c8 SHA512 76a2bbb651452cb7a2336cebed5f7e8ff79e995bc7ba11d36089f7e58f607df031306bf38fd161e7af728aa6699b37fa8c2c322b8a8cfa7889dfaa3e96d400c9
diff --git a/app-vim/sleuth/sleuth-1.0.ebuild b/app-vim/sleuth/sleuth-1.0.ebuild
deleted file mode 100644
index fa42aff92d2b..000000000000
--- a/app-vim/sleuth/sleuth-1.0.ebuild
+++ /dev/null
@@ -1,14 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="5"
-
-inherit vim-plugin
-
-DESCRIPTION="vim plugin: heuristically set buffer options"
-HOMEPAGE="https://www.vim.org/scripts/script.php?script_id=4375 https://github.com/tpope/vim-sleuth"
-LICENSE="vim"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-VIM_PLUGIN_HELPFILES="${PN}"
diff --git a/dev-cpp/Manifest.gz b/dev-cpp/Manifest.gz
index 03d5357b62f0..3be85e75f22f 100644
Binary files a/dev-cpp/Manifest.gz and b/dev-cpp/Manifest.gz differ
diff --git a/dev-cpp/ctemplate/Manifest b/dev-cpp/ctemplate/Manifest
index 184cb62669cb..2f6b74dd23a9 100644
--- a/dev-cpp/ctemplate/Manifest
+++ b/dev-cpp/ctemplate/Manifest
@@ -1,2 +1 @@
-DIST ctemplate-2.3.tar.bz2 564389 BLAKE2B e0c95ac534eb0b7fdff3e87e08f3b1b8aa735bec8eef05bebcf87a51375cbc93e768a18ba005248edda023869b21679dbadaf3d6462e71666fa5d85b96172851 SHA512 546645389a8bfed59686b62b43cb7d53714ac98e1b75311c217bb0f3b6201d5d486766b1ce7e35bf15032372e45c36b27008f54085bd0c9ef0dd0b7e04b8e3f5
DIST ctemplate-2.4.tar.gz 391923 BLAKE2B 96b585ed6ca323fc461857e1f2f381e0ca5c229d8c6039c24efcf34fb9ddf45cc36bef141af337e591e1cdd95ca510ea5ba1e539554322c578c25187b1906195 SHA512 4955489e7327bce18802d50fd9dfc8ac12af685e556d1c9d0eb2b7a2f4a9b6086e30be8388d694ec8912623738973d0c76e9ca97196c63c139ee5b468d4858b7
diff --git a/dev-cpp/ctemplate/ctemplate-2.3-r1.ebuild b/dev-cpp/ctemplate/ctemplate-2.3-r1.ebuild
deleted file mode 100644
index 36ba44df7ed2..000000000000
--- a/dev-cpp/ctemplate/ctemplate-2.3-r1.ebuild
+++ /dev/null
@@ -1,77 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python2_7 )
-
-inherit autotools elisp-common python-any-r1
-
-DESCRIPTION="A simple but powerful template language for C++"
-HOMEPAGE="https://github.com/olafvdspek/ctemplate"
-SRC_URI="https://dev.gentoo.org/~pinkbyte/distfiles/${P}.tar.bz2"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="amd64 arm ppc x86 ~amd64-linux ~x86-linux"
-IUSE="doc emacs vim-syntax static-libs test"
-
-DEPEND="test? ( ${PYTHON_DEPS} )"
-RDEPEND="
- emacs? ( >=app-editors/emacs-23.1:* )
- vim-syntax? ( >=app-editors/vim-core-7 )"
-
-SITEFILE="70ctemplate-gentoo.el"
-
-# Some tests are broken in 2.3
-RESTRICT="test"
-
-PATCHES=( "${FILESDIR}"/${PN}-2.3-fix-build-system.patch )
-
-src_prepare() {
- default
- eautoreconf
-}
-
-src_configure() {
- econf $(use_enable static-libs static)
-}
-
-src_compile() {
- default
-
- if use emacs; then
- elisp-compile contrib/tpl-mode.el
- fi
-}
-
-src_install() {
- default
- if ! use doc; then
- rm -r "${ED%/}"/usr/share/doc/${PF}/html || die
- fi
-
- if use vim-syntax; then
- cd "${S}/contrib" || die
- sh highlighting.vim || die "unpacking vim scripts failed"
- insinto /usr/share/vim/vimfiles
- doins -r .vim/.
- fi
-
- if use emacs; then
- cd "${S}/contrib" || die
- elisp-install ${PN} tpl-mode.el tpl-mode.elc
- elisp-site-file-install "${FILESDIR}/${SITEFILE}"
- fi
-
- # package provides .pc files
- find "${D}" -name '*.la' -delete || die
-}
-
-pkg_postinst() {
- use emacs && elisp-site-regen
-}
-
-pkg_postrm() {
- use emacs && elisp-site-regen
-}
diff --git a/dev-cpp/ctemplate/ctemplate-2.4.ebuild b/dev-cpp/ctemplate/ctemplate-2.4.ebuild
index f1cf69f3547a..514ad67f7a8e 100644
--- a/dev-cpp/ctemplate/ctemplate-2.4.ebuild
+++ b/dev-cpp/ctemplate/ctemplate-2.4.ebuild
@@ -14,7 +14,7 @@ S="${WORKDIR}/ctemplate-${P}"
LICENSE="BSD"
SLOT="0"
-KEYWORDS="~amd64 arm ~ppc ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 arm ppc x86 ~amd64-linux ~x86-linux"
IUSE="doc emacs vim-syntax static-libs test"
DEPEND="test? ( ${PYTHON_DEPS} )"
diff --git a/dev-cpp/ctemplate/files/ctemplate-2.3-fix-build-system.patch b/dev-cpp/ctemplate/files/ctemplate-2.3-fix-build-system.patch
deleted file mode 100644
index 4178f5ed3655..000000000000
--- a/dev-cpp/ctemplate/files/ctemplate-2.3-fix-build-system.patch
+++ /dev/null
@@ -1,29 +0,0 @@
-* Do not override $(docdir) as userflag in the GNU conventions
-* Only build tests programs when running 'make check'
-
---- a/Makefile.am
-+++ b/Makefile.am
-@@ -54,12 +54,11 @@
- src/ctemplate/per_expand_data.h.in \
- src/ctemplate/str_ref.h.in
-
--docdir = $(prefix)/share/doc/$(PACKAGE)-$(VERSION)
- ## This is for HTML and other documentation you want to install.
- ## Add your documentation files (in doc/) in addition to these
- ## top-level boilerplate files. Also add a TODO file if you have one.
--dist_doc_DATA = AUTHORS COPYING ChangeLog INSTALL NEWS README README_windows.txt \
-- doc/designstyle.css doc/index.html \
-+dist_doc_DATA = AUTHORS ChangeLog NEWS README README_windows.txt
-+dist_html_DATA = doc/designstyle.css doc/index.html \
- doc/howto.html doc/guide.html doc/reference.html \
- doc/tips.html doc/example.html doc/auto_escape.html \
- doc/xss_resources.html
-@@ -452,7 +451,7 @@
-
- ## This should always include $(TESTS), but may also include other
- ## binaries that you compile but don't want automatically installed.
--noinst_PROGRAMS = $(TESTS)
-+check_PROGRAMS = $(TESTS)
-
- rpm: dist-gzip packages/rpm.sh packages/rpm/rpm.spec
- @cd packages && ./rpm.sh ${PACKAGE} ${VERSION}
diff --git a/dev-cpp/popl/popl-1.2.0.ebuild b/dev-cpp/popl/popl-1.2.0.ebuild
index 28fb84b2f4e1..a83ee4c545b4 100644
--- a/dev-cpp/popl/popl-1.2.0.ebuild
+++ b/dev-cpp/popl/popl-1.2.0.ebuild
@@ -16,7 +16,7 @@ if [[ ${PV} == *9999 ]] ; then
else
SRC_URI="https://github.com/badaix/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
- KEYWORDS="~amd64 x86"
+ KEYWORDS="amd64 x86"
fi
LICENSE="MIT"
diff --git a/dev-db/Manifest.gz b/dev-db/Manifest.gz
index 9f580a77c496..2681101ca32d 100644
Binary files a/dev-db/Manifest.gz and b/dev-db/Manifest.gz differ
diff --git a/dev-db/apgdiff/Manifest b/dev-db/apgdiff/Manifest
index e71c6ff7e68b..e2443ad6aba5 100644
--- a/dev-db/apgdiff/Manifest
+++ b/dev-db/apgdiff/Manifest
@@ -1,5 +1 @@
-DIST apgdiff-1.4-src.zip 178608 BLAKE2B 5ea0c4ea151a4bb60711b90ecd27a42b02ab08f16034d194646a8b3d3b22fc7d98862b4629a4411127ba6a2898d25264311287d9299cd801969d5d8d04ffd036 SHA512 c1dcd3f39e931f90e65a439a610d5b264b790419a59b2c90f6d9107c1b5151c602887588f378110a2e9420428414fc333c7919e2137e2dc35168654ceb3ae8d0
-DIST apgdiff-2.2.1-src.zip 194305 BLAKE2B 9c4d5eb7639038b591d31a6059efa0c78cdd1e21826ab5992a236abc492d3ef9e8712b0a7516253903bb88055d8594e83a1f5892e6fae90336e76258eecee4bd SHA512 cab6b2349d5822ca579c1e021ea7f02f5ddf39d56559f841d0cadfdccc1c1c61399c494302ea5909984b9a8a6d91cf08868f012dd3487a8633f65e3bbd28f19c
-DIST apgdiff-2.2.2-src.zip 198814 BLAKE2B b044f16475576fd714b6196da55ec1b744255aeb3cdccc2fd654500235cd0b500b8188e7d06962bb8fd28dc1a77e3526cf39550eb89da101d6255b1b6b9fe59d SHA512 273ba473b5b4ccfe2ae1b3f34ce2c2b825e446fad166f28a4575528190c20922e6794563ae3e5b2918ade5a3292a792ea363e9e5ec0900e924332d8771548c0b
-DIST apgdiff-2.3-src.zip 215881 BLAKE2B 05482ec11e278f5408305e16ee57bef99eb3e362ebdc5055781017ff40890a56936b515dd9973b557ad64d4a7e934b1bb5886207a9d9a9e0365d0e41f3fe008c SHA512 e716143ff4378fc27c4781076c51826583c2ad9dab17f4364acbfed0f9a0958dca0de9a72171816bbce41653ad33834158cb9277dd8790649da4bd24e013bbb5
DIST apgdiff-2.4-src.zip 227714 BLAKE2B 1c62c94592b28a7caf5a56f4ef4206cc2655f2da278d5a71e165f409587d1573dd44b62261817f0b994ed95a398555190dee6a2873fe493f695e91c6cf9dd22c SHA512 f37e0f86ff8a8bc53a43cac1748ab3a2c96ab6c972b37ee63f281ee397b31a7b48986cbc963d89ea773f1bb7b10b798de74a4c88a03f2db7672501b93355261b
diff --git a/dev-db/apgdiff/apgdiff-1.4.ebuild b/dev-db/apgdiff/apgdiff-1.4.ebuild
deleted file mode 100644
index b23143f348bd..000000000000
--- a/dev-db/apgdiff/apgdiff-1.4.ebuild
+++ /dev/null
@@ -1,51 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="5"
-JAVA_PKG_IUSE="doc source"
-inherit eutils java-pkg-2 java-ant-2
-
-DESCRIPTION="A simple PostgreSQL diff tool that is useful for schema upgrades"
-HOMEPAGE="https://www.apgdiff.com/"
-SRC_URI="mirror://sourceforge/${PN}/${P}-src.zip"
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="test"
-RESTRICT="!test? ( test )"
-
-DEPEND=">=virtual/jdk-1.5
- >=dev-java/ant-core-1.7.0:0
- >=dev-java/ant-junit-1.7.0:0
- app-arch/zip:0
- test? (
- dev-java/hamcrest-core:0
- >=dev-java/junit-4.4:4
- )"
-
-RDEPEND=">=virtual/jre-1.5"
-
-java_prepare() {
- mkdir "${S}"/lib
- cd "${S}"/lib
- if use test ; then
- java-pkg_jar-from --build-only hamcrest-core
- java-pkg_jar-from --build-only junit-4
- fi
-}
-
-src_compile() {
- eant -Dnoget=true jar $(use_doc)
-}
-
-src_install() {
- java-pkg_newjar dist/${P}.jar ${PN}.jar
- java-pkg_dolauncher apgdiff --jar ${PN}.jar
-
- use doc && java-pkg_dojavadoc dist/javadoc
- use source && java-pkg_dosrc src/main/java/*
-}
-
-src_test() {
- ANT_TASKS="ant-junit" eant -Dnoget=true test
-}
diff --git a/dev-db/apgdiff/apgdiff-2.2.1.ebuild b/dev-db/apgdiff/apgdiff-2.2.1.ebuild
deleted file mode 100644
index 82e2382f3931..000000000000
--- a/dev-db/apgdiff/apgdiff-2.2.1.ebuild
+++ /dev/null
@@ -1,51 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="5"
-JAVA_PKG_IUSE="doc source"
-inherit eutils java-pkg-2 java-ant-2
-
-DESCRIPTION="A simple PostgreSQL diff tool that is useful for schema upgrades"
-HOMEPAGE="https://apgdiff.com"
-SRC_URI="https://apgdiff.com/download/${P}-src.zip"
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="test"
-RESTRICT="!test? ( test )"
-
-DEPEND=">=virtual/jdk-1.6
- >=dev-java/ant-core-1.7.0:0
- >=dev-java/ant-junit-1.7.0:0
- app-arch/zip:0
- test? (
- dev-java/hamcrest-core:1.3
- >=dev-java/junit-4.4:4
- )"
-
-RDEPEND=">=virtual/jre-1.6"
-
-java_prepare() {
- mkdir "${S}"/lib
- cd "${S}"/lib
- if use test ; then
- java-pkg_jar-from --build-only hamcrest-core-1.3
- java-pkg_jar-from --build-only junit-4
- fi
-}
-
-src_compile() {
- eant -Dnoget=true jar $(use_doc)
-}
-
-src_install() {
- java-pkg_newjar dist/${P}.jar ${PN}.jar
- java-pkg_dolauncher apgdiff --jar ${PN}.jar
-
- use doc && java-pkg_dojavadoc dist/javadoc
- use source && java-pkg_dosrc src/main/java/*
-}
-
-src_test() {
- ANT_TASKS="ant-junit" eant -Dnoget=true test
-}
diff --git a/dev-db/apgdiff/apgdiff-2.2.2.ebuild b/dev-db/apgdiff/apgdiff-2.2.2.ebuild
deleted file mode 100644
index 8066c91411e7..000000000000
--- a/dev-db/apgdiff/apgdiff-2.2.2.ebuild
+++ /dev/null
@@ -1,51 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="5"
-JAVA_PKG_IUSE="doc source"
-inherit eutils java-pkg-2 java-ant-2
-
-DESCRIPTION="A simple PostgreSQL diff tool that is useful for schema upgrades"
-HOMEPAGE="https://apgdiff.com"
-SRC_URI="https://apgdiff.com/download/${P}-src.zip"
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="test"
-RESTRICT="!test? ( test )"
-
-DEPEND=">=virtual/jdk-1.6
- >=dev-java/ant-core-1.7.0:0
- >=dev-java/ant-junit-1.7.0:0
- app-arch/zip:0
- test? (
- dev-java/hamcrest-core:0
- >=dev-java/junit-4.4:4
- )"
-
-RDEPEND=">=virtual/jre-1.6"
-
-java_prepare() {
- mkdir "${S}"/lib
- cd "${S}"/lib
- if use test ; then
- java-pkg_jar-from --build-only hamcrest-core
- java-pkg_jar-from --build-only junit-4
- fi
-}
-
-src_compile() {
- eant -Dnoget=true jar $(use_doc)
-}
-
-src_install() {
- java-pkg_newjar dist/${P}.jar ${PN}.jar
- java-pkg_dolauncher apgdiff --jar ${PN}.jar
-
- use doc && java-pkg_dojavadoc dist/javadoc
- use source && java-pkg_dosrc src/main/java/*
-}
-
-src_test() {
- ANT_TASKS="ant-junit" eant -Dnoget=true test
-}
diff --git a/dev-db/apgdiff/apgdiff-2.3.ebuild b/dev-db/apgdiff/apgdiff-2.3.ebuild
deleted file mode 100644
index 8066c91411e7..000000000000
--- a/dev-db/apgdiff/apgdiff-2.3.ebuild
+++ /dev/null
@@ -1,51 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="5"
-JAVA_PKG_IUSE="doc source"
-inherit eutils java-pkg-2 java-ant-2
-
-DESCRIPTION="A simple PostgreSQL diff tool that is useful for schema upgrades"
-HOMEPAGE="https://apgdiff.com"
-SRC_URI="https://apgdiff.com/download/${P}-src.zip"
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="test"
-RESTRICT="!test? ( test )"
-
-DEPEND=">=virtual/jdk-1.6
- >=dev-java/ant-core-1.7.0:0
- >=dev-java/ant-junit-1.7.0:0
- app-arch/zip:0
- test? (
- dev-java/hamcrest-core:0
- >=dev-java/junit-4.4:4
- )"
-
-RDEPEND=">=virtual/jre-1.6"
-
-java_prepare() {
- mkdir "${S}"/lib
- cd "${S}"/lib
- if use test ; then
- java-pkg_jar-from --build-only hamcrest-core
- java-pkg_jar-from --build-only junit-4
- fi
-}
-
-src_compile() {
- eant -Dnoget=true jar $(use_doc)
-}
-
-src_install() {
- java-pkg_newjar dist/${P}.jar ${PN}.jar
- java-pkg_dolauncher apgdiff --jar ${PN}.jar
-
- use doc && java-pkg_dojavadoc dist/javadoc
- use source && java-pkg_dosrc src/main/java/*
-}
-
-src_test() {
- ANT_TASKS="ant-junit" eant -Dnoget=true test
-}
diff --git a/dev-db/pgadmin4/Manifest b/dev-db/pgadmin4/Manifest
index e1f3d8ac927c..ced823d7b029 100644
--- a/dev-db/pgadmin4/Manifest
+++ b/dev-db/pgadmin4/Manifest
@@ -1,2 +1,3 @@
DIST pgadmin4-4.17.tar.gz 28007097 BLAKE2B d296f2b9372c23067db899fa82e1b8e732837b01a6172dd2d70520f815aafde161715eea9d9d53e7507a6a715dbfdaabf001a10d143c1aa0505237b2b138e334 SHA512 f9e292ba7ff1e5edaa8738188eb01744d69d0eb134700feb0623806425c998e7f298f74cd498a09f2d9a073a9a349c82f7a3f617e1da3c8dd757cc982d941c9f
DIST pgadmin4-4.25.tar.gz 33167393 BLAKE2B 5a40e45c53f79ea66c6f685d1605ddce7b1758540bf3a6863d4b092cc4dab5b00daff15832cd6feee28aa348c7a5376e25a93508fd348d8ffd4d29031e2b6c68 SHA512 a1944f9c65b8aa7ec5bd83ef75702293d869ae341ea73f81fb4358bfbc7f91a6981237eb9f1b20055c5f3fa182428afe19dc170963265789c34d73f2e240c268
+DIST pgadmin4-4.26.tar.gz 33525278 BLAKE2B 2a4061f59299bc48b029a4a93f410538170b6c3d97597074d2b3b6eed1de0f9a1ac88bc187614d9e46d8fe872941f173ba0f0a02def590451dad09e6a3b78e5a SHA512 952a4771f80541c54234fcaa9c870283fdf4887246d0d9751a77c28340b7e39ba871141f230086efda9a274d5e6bd567305047cdc7edf766ccd41112281fdf94
diff --git a/dev-db/pgadmin4/pgadmin4-4.26.ebuild b/dev-db/pgadmin4/pgadmin4-4.26.ebuild
new file mode 100644
index 000000000000..239acf0a8228
--- /dev/null
+++ b/dev-db/pgadmin4/pgadmin4-4.26.ebuild
@@ -0,0 +1,128 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{6,7,8} )
+PYTHON_REQ_USE="sqlite"
+inherit desktop python-single-r1 qmake-utils xdg
+
+DESCRIPTION="GUI administration and development platform for PostgreSQL"
+HOMEPAGE="https://www.pgadmin.org/"
+SRC_URI="https://ftp.postgresql.org/pub/pgadmin/${PN}/v${PV}/source/${P}.tar.gz"
+
+LICENSE="POSTGRESQL"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="doc"
+
+REQUIRED_USE="${PYTHON_REQUIRED_USE}"
+
+RESTRICT="test"
+
+# libsodium dep added because of 689678
+COMMON_DEPEND="${PYTHON_DEPS}
+ dev-libs/libsodium[-minimal]
+ dev-qt/qtcore:5
+ dev-qt/qtgui:5
+ dev-qt/qtnetwork:5[ssl]
+ dev-qt/qtwidgets:5
+"
+DEPEND="${COMMON_DEPEND}
+ doc? (
+ $(python_gen_cond_dep '
+ dev-python/sphinx[${PYTHON_MULTI_USEDEP}]
+ ')
+ )
+ virtual/imagemagick-tools[png]
+"
+
+# In 4.25's requirement.txt, bcrypt is listed as <=3.17, but upstream's
+# git history shows this is just for compatibility with /dev/null || die
+ eapply_user
+ popd > /dev/null || die
+
java-pkg-2_src_prepare
}
diff --git a/dev-java/protobuf-java/protobuf-java-3.13.0.ebuild b/dev-java/protobuf-java/protobuf-java-3.13.0.ebuild
index 00495e65a87c..e26dfe9374b2 100644
--- a/dev-java/protobuf-java/protobuf-java-3.13.0.ebuild
+++ b/dev-java/protobuf-java/protobuf-java-3.13.0.ebuild
@@ -39,7 +39,10 @@ if [[ "${PV}" == "9999" ]]; then
fi
src_prepare() {
- default
+ pushd "${WORKDIR}/protobuf-${PV}" > /dev/null || die
+ eapply_user
+ popd > /dev/null || die
+
java-pkg-2_src_prepare
}
diff --git a/dev-java/protobuf-java/protobuf-java-9999.ebuild b/dev-java/protobuf-java/protobuf-java-9999.ebuild
index fe8374195d67..8f4365200b10 100644
--- a/dev-java/protobuf-java/protobuf-java-9999.ebuild
+++ b/dev-java/protobuf-java/protobuf-java-9999.ebuild
@@ -39,7 +39,10 @@ if [[ "${PV}" == "9999" ]]; then
fi
src_prepare() {
- default
+ pushd "${WORKDIR}/protobuf-${PV}" > /dev/null || die
+ eapply_user
+ popd > /dev/null || die
+
java-pkg-2_src_prepare
}
diff --git a/dev-java/tomcat-servlet-api/Manifest b/dev-java/tomcat-servlet-api/Manifest
index 41bfaa342a2a..9e9cad5e1f42 100644
--- a/dev-java/tomcat-servlet-api/Manifest
+++ b/dev-java/tomcat-servlet-api/Manifest
@@ -2,6 +2,7 @@ DIST apache-tomcat-4.1.40-src.tar.gz 3709719 BLAKE2B f7ca82052c1148a5c384fcbc387
DIST apache-tomcat-5.5.36-src.tar.gz 3743113 BLAKE2B dbfcfd123a23b0ceb9f1fdd936e42324ea8b10cf327a1d0abf1703006535859c7122690a08b5ec27b86b526cc7709a7199b4f35f123538ff11f23f3b489358f3 SHA512 845636b5b992fbbb7d657d192afbab1e6a924bfd0c71b025cf22776eb4527d92d63f9b3f33475d4349a0df4cebd984ba3776eedd7482b820abdea909e90a97b7
DIST apache-tomcat-6.0.53-src.tar.gz 3522914 BLAKE2B 054b097c16861abaa8bdbeba713b49bc1dfcff573bb3f4bd0ff5807c33a2a0fb991af618f6e11e5b3ce3fa55c589fc6569342cab5d5a00349c79bc7061d81e40 SHA512 915a0a18f5c2883625c9441eed6465973eff4f6bf41e08e925c7edaea89ef8f6ee9476d3e06fa38228d4bcb4decaf53e3a7bdb7ec7e899e6250db3e12a9f5f2c
DIST apache-tomcat-7.0.105-src.tar.gz 5312024 BLAKE2B 0eaad66c6dcc3e2f6a2d8e142a7832cbd413724cab8b10f00e87d5535f4f20d5ba4712794e09444a8b3e0cf23f036da7c6923f038a6a11714682b129ed4ac5dd SHA512 249e039775e833d75b631cec26132b42e4aed25491a29f2349fa41b81737688b0a2e453072d8e3c5fc28763a9d1922f59da7529378ce8fd472eca7bbc73a6bd2
+DIST apache-tomcat-7.0.106-src.tar.gz 5302091 BLAKE2B f60975ef5570501b03e71645969170c44450f2b56f37688001ad1b4dce3a394f6800e9b28a8fabf59241116345fb7e2a287441f3eace020bc5c0203d57630c91 SHA512 5ce5a5af93c58e69c4758c2c0dedeadeceb6be920421b9d3b3d071d32fc8eb59ba8312c98d037b8434fe43d57a9f720ad8790de29a26ed2959f6c761fe1fd573
DIST apache-tomcat-8.5.57-src.tar.gz 5730658 BLAKE2B f9bd2e159abc6af62c8681c38ea4eae8155f95df11f7c244e45018929189ef6b6a37a11e84119c3ddcb134a8ab58773add19cbab7506bb87c43b0039899fde60 SHA512 8bf4334b190c36900b708ee7097097e513f2d4572f119173bee732c76b5b660350fe516e58ac867250c2ef7a1371b55c116d3a1abd18323ceb92337f1dcb0f60
DIST apache-tomcat-8.5.58-src.tar.gz 5773000 BLAKE2B e361cc359f86bb02fa4c39ebd51b52b4552aa78603c4d8fa5c5c8d87bcb89f6ed391408e3713a5011b7b8cc29506ad65f25b6047ec1009267ce8a68d396b3bc6 SHA512 f9e21c0c60b80e1a15049ff4ee6a4914036d19ed171c40bc614fc999c81c59c394c0a6595ac969a5b86662fa6c366676e7ecb2695c28518473b3f6c79e9a0e05
DIST apache-tomcat-9.0.37-src.tar.gz 5894559 BLAKE2B 63148418ef96e90f212ce8a00dc6a274a8da2a1aa8a53ad0f6d3960efc8e876dd2812f425c0f21c73ee291752c5fd3bc8025eed46d18d31ae72e8bbe6dc1ba10 SHA512 6e819fe255c467b0081e91c17a53fa383fe84d922492c62d7dd93cabf00e22ab30872ecaa298a9b12977b8c7518f36c8429091b24c9fb5200db64e80e853ce98
diff --git a/dev-java/tomcat-servlet-api/tomcat-servlet-api-7.0.106.ebuild b/dev-java/tomcat-servlet-api/tomcat-servlet-api-7.0.106.ebuild
new file mode 100644
index 000000000000..8da54889a0bd
--- /dev/null
+++ b/dev-java/tomcat-servlet-api/tomcat-servlet-api-7.0.106.ebuild
@@ -0,0 +1,38 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+JAVA_PKG_IUSE="source"
+
+inherit eutils java-pkg-2 java-ant-2
+
+MY_A="apache-${P}-src"
+MY_P="${MY_A/-servlet-api/}"
+DESCRIPTION="Tomcat's Servlet API 3.0/JSP API 2.2 implementation"
+HOMEPAGE="https://tomcat.apache.org/"
+SRC_URI="mirror://apache/tomcat/tomcat-7/v${PV}/src/${MY_P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="3.0"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86 ~amd64-linux ~x86-linux ~x64-solaris ~x86-solaris"
+IUSE=""
+
+DEPEND=">=virtual/jdk-1.6"
+RDEPEND=">=virtual/jre-1.6"
+
+S="${WORKDIR}/${MY_P}/"
+
+src_prepare() {
+ default
+
+ cp "${FILESDIR}/${SLOT}-build.xml" build.xml || die "Could not replace build.xml"
+ rm -fR */*/build.xml ||die
+ java-pkg_clean
+
+ java-pkg-2_src_prepare
+}
+
+src_install() {
+ java-pkg_dojar "${S}"/output/build/lib/*.jar
+ use source && java-pkg_dosrc java/javax/servlet/
+}
diff --git a/dev-lang/Manifest.gz b/dev-lang/Manifest.gz
index 9d7b02d48289..086d5ecaf985 100644
Binary files a/dev-lang/Manifest.gz and b/dev-lang/Manifest.gz differ
diff --git a/dev-lang/duktape/duktape-2.5.0-r1.ebuild b/dev-lang/duktape/duktape-2.5.0-r1.ebuild
index 096bdf229105..b682d6b186fc 100644
--- a/dev-lang/duktape/duktape-2.5.0-r1.ebuild
+++ b/dev-lang/duktape/duktape-2.5.0-r1.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://duktape.org/${P}.tar.xz"
LICENSE="MIT"
SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86"
+KEYWORDS="amd64 ~arm ~arm64 ~ppc ~ppc64 x86"
IUSE=""
DEPEND=""
diff --git a/dev-lang/polyml/Manifest b/dev-lang/polyml/Manifest
index 2c0f434a74b3..58d163f18bef 100644
--- a/dev-lang/polyml/Manifest
+++ b/dev-lang/polyml/Manifest
@@ -1,6 +1,2 @@
DIST polyml-5.6.tar.gz 6066166 BLAKE2B dc7e35ad1f51f270f9043736bca8b3d8a96e208dfa2833a2de3c06c969e8bb9d5e92c3ab025e4e55539188a9d6d5000b7befdd3cfc17aa3b0e54315778ab71b0 SHA512 cd4f25c225831dec512f7136dfda4ba31abd6939d9e8e0cacdb6d48212488b56ba5969c76e76fcbfcfa83d015a67d9cf62457286086f3c2b3f7914a7939d7b59
DIST polyml-5.8.tar.gz 9817105 BLAKE2B 93992c8baa78017bfda6c2151d1f48805829b77c0b7ed9bec87c951fc4a4236459ed59aab1eca88ed4a1d7aa10eb9734f93324583e012b18bb7d8cce84b5a35b SHA512 50baed79b50b14bd87acc637de93fd6d0f05e61fe0f03682a12a1d2c5f382313488d48f84b49ad915b01acc5a3a5769fb05fcaa7b24499c56402ddd3ba393930
-DIST polyml.5.4.1.tar.gz 6107319 BLAKE2B 1fdff3b26fa7554a0f3d31cca0dc4a4e013fb930e6295cd6107012bc67e87db1f64916087edb34e403c3e1a88b26bff947c1cc9d946fe93ac7a1144434d15081 SHA512 4a7b404ed648b5a9fd9d52917214688d15f4f9a5f4570ba13b52a8304bde1cc4b534f539ffc3c9554283816ae130e4c898a179d776df6d3220fba9743a19b175
-DIST polyml.5.5.1.tar.gz 5465794 BLAKE2B 0ae6973c866cdf33e0eeb26475c95f26f11eca13458ab52c2c6fd3f4b3034cd5e71a7e4dbff5574070a11833479bff2723066bfc71367d71cd6e4f9f17a5cba1 SHA512 283954c8bf5599d83ea69916b827b1acae7137fe4add67537026092da2e6f1a89d71d3a394dbba599bbe9e967ded1446f39f4d81afb90301532db6be949f7a6f
-DIST polyml.5.5.2.tar.gz 5599140 BLAKE2B 08b7c4be7c52bd8f57c53f6caa24be7ab457c7419459192f33369bf3c7024002ffd98dfd7af4db53c3a2484f9c966010a635f4e09e9edf8a62b5d5230f9a04bf SHA512 248c2a38c4691898bc1243a041f4683bf227d9c8a98c6c3545af2a8a3249ed5ed96f33f90cb2dede8809b42f33c0557650147302cfe046a5fba965ccd93cbc5b
-DIST polyml.5.5.tar.gz 5504389 BLAKE2B 8ad51504e4bc4a3f6090052d641389b7378aa56295ebe8503ea09082a0bb85ee157c04ac19ca66ab8b8c8b49b0d645339d499ea7d4eba18eae6f90be8afcc907 SHA512 4725c2e4a786b8c63bc6fc1cadad0de818ed935014d51040af43defa07b03ba7bedb2185bfb2e39a0db7284479e79e698b31ec7fe8463c306b668de1eda69b89
diff --git a/dev-lang/polyml/polyml-5.4.1.ebuild b/dev-lang/polyml/polyml-5.4.1.ebuild
deleted file mode 100644
index 022401f5434b..000000000000
--- a/dev-lang/polyml/polyml-5.4.1.ebuild
+++ /dev/null
@@ -1,45 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="5"
-
-inherit base autotools
-
-MY_P=${PN}.${PV}
-
-DESCRIPTION="Poly/ML is a full implementation of Standard ML"
-HOMEPAGE="https://www.polyml.org"
-SRC_URI="mirror://sourceforge/${PN}/${MY_P}.tar.gz"
-
-LICENSE="LGPL-2.1"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE="X elibc_glibc +gmp portable test +threads"
-RESTRICT="!test? ( test )"
-
-RDEPEND="X? ( x11-libs/motif:0 )
- gmp? ( >=dev-libs/gmp-5 )
- elibc_glibc? ( threads? ( >=sys-libs/glibc-2.13 ) )"
-DEPEND="${RDEPEND}"
-
-S=${WORKDIR}/${MY_P}
-
-PATCHES=("${FILESDIR}/${PN}-5.4.1-configure.patch"
- "${FILESDIR}/${PN}-5.4.1-asm.patch")
-
-src_prepare() {
- base_src_prepare
- eautoreconf
-}
-
-src_configure() {
- econf \
- $(use_with X x) \
- $(use_with gmp) \
- $(use_with portable) \
- $(use_with threads)
-}
-
-src_test() {
- emake tests
-}
diff --git a/dev-lang/polyml/polyml-5.5.0.ebuild b/dev-lang/polyml/polyml-5.5.0.ebuild
deleted file mode 100644
index 3cde23196400..000000000000
--- a/dev-lang/polyml/polyml-5.5.0.ebuild
+++ /dev/null
@@ -1,51 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="5"
-
-inherit base autotools versionator
-
-# Although the download is called 5.5, after building it poly -v says
-# it is 5.5.0.
-MY_PV=$(get_version_component_range "1-2" "${PV}")
-MY_P="${PN}.${MY_PV}"
-
-DESCRIPTION="Poly/ML is a full implementation of Standard ML"
-HOMEPAGE="https://www.polyml.org"
-SRC_URI="mirror://sourceforge/${PN}/${MY_P}.tar.gz"
-
-LICENSE="LGPL-2.1"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE="X elibc_glibc +gmp portable test +threads"
-RESTRICT="!test? ( test )"
-
-RDEPEND="X? ( x11-libs/motif:0 )
- gmp? ( >=dev-libs/gmp-5 )
- elibc_glibc? ( threads? ( >=sys-libs/glibc-2.13 ) )
- virtual/libffi"
-DEPEND="${RDEPEND}"
-
-S=${WORKDIR}/${MY_P}
-
-PATCHES=("${FILESDIR}/${PN}-5.5.0-configure.patch"
- "${FILESDIR}/${PN}-5.5.0-x-it-basis.patch"
- "${FILESDIR}/${PN}-5.5.0-asm.patch")
-
-src_prepare() {
- base_src_prepare
- eautoreconf
-}
-
-src_configure() {
- econf \
- --with-system-libffi \
- $(use_with X x) \
- $(use_with gmp) \
- $(use_with portable) \
- $(use_with threads)
-}
-
-src_test() {
- emake tests
-}
diff --git a/dev-lang/polyml/polyml-5.5.1.ebuild b/dev-lang/polyml/polyml-5.5.1.ebuild
deleted file mode 100644
index 0ceb98cb5d9c..000000000000
--- a/dev-lang/polyml/polyml-5.5.1.ebuild
+++ /dev/null
@@ -1,72 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="5"
-
-inherit base autotools pax-utils
-
-MY_P="${PN}.${PV}"
-
-DESCRIPTION="Poly/ML is a full implementation of Standard ML"
-HOMEPAGE="https://www.polyml.org"
-SRC_URI="mirror://sourceforge/${PN}/${MY_P}.tar.gz"
-
-LICENSE="LGPL-2.1"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE="X elibc_glibc +gmp portable test +threads"
-RESTRICT="!test? ( test )"
-
-RDEPEND="X? ( x11-libs/motif:0 )
- gmp? ( >=dev-libs/gmp-5 )
- elibc_glibc? ( threads? ( >=sys-libs/glibc-2.13 ) )
- virtual/libffi"
-DEPEND="${RDEPEND}"
-
-S=${WORKDIR}/${MY_P}
-
-PATCHES=(
- # Bug 256679 - patch the assembler code. The remaining executable stacks in ./.libs/poly
- # comes from the polyml generated ./polyexport.o file.
- "${FILESDIR}/${PN}-5.5.0-asm.patch"
- # https://sourceforge.net/p/polyml/code/1875/ for isabelle-2013.2
- "${FILESDIR}/${PN}-5.5.1-inputN-return-for-zero-chars.patch"
- # https://sourceforge.net/p/polyml/code/1869/
- # Adds Test146.ML that fails, applying it anyway as it is required by
- # sci-mathematics/isabelle-2013.2
- "${FILESDIR}/${PN}-5.5.1-optimize-closure.patch"
-)
-
-src_prepare() {
- base_src_prepare
- eautoreconf
- if [ -f "${S}/Tests/Succeed/Test146.ML" ]; then
- mv "${S}/Tests/Succeed/Test146.ML" "${S}/Tests/Succeed/Test146.ML.disable-test-as-it-fails"
- fi
-}
-
-src_configure() {
- econf \
- --enable-shared \
- --disable-static \
- --with-system-libffi \
- $(use_with X x) \
- $(use_with gmp) \
- $(use_with portable) \
- $(use_with threads)
-}
-
-src_compile() {
- # Bug 453146 - dev-lang/polyml-5.5.0: fails to build (pax kernel?)
- pushd libpolyml || die "Could not cd to libpolyml"
- emake
- popd
- emake polyimport
- pax-mark m "${S}/.libs/polyimport"
- emake
- pax-mark m "${S}/.libs/poly"
-}
-
-src_test() {
- emake tests
-}
diff --git a/dev-lang/polyml/polyml-5.5.2.ebuild b/dev-lang/polyml/polyml-5.5.2.ebuild
deleted file mode 100644
index 0cb11d7b3447..000000000000
--- a/dev-lang/polyml/polyml-5.5.2.ebuild
+++ /dev/null
@@ -1,72 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="5"
-
-inherit base autotools pax-utils
-
-MY_P="${PN}.${PV}"
-
-DESCRIPTION="Poly/ML is a full implementation of Standard ML"
-HOMEPAGE="https://www.polyml.org"
-SRC_URI="mirror://sourceforge/${PN}/${MY_P}.tar.gz"
-
-LICENSE="LGPL-2.1"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE="X elibc_glibc +gmp portable test +threads"
-RESTRICT="!test? ( test )"
-
-RDEPEND="X? ( x11-libs/motif:0 )
- gmp? ( >=dev-libs/gmp-5 )
- elibc_glibc? ( threads? ( >=sys-libs/glibc-2.13 ) )
- virtual/libffi"
-DEPEND="${RDEPEND}"
-
-S=${WORKDIR}/${MY_P}
-
-PATCHES=(
- # Bug 256679 - patch the assembler code. The remaining executable stacks in ./.libs/poly
- # comes from the polyml generated ./polyexport.o file.
- "${FILESDIR}/${PN}-5.5.0-asm.patch"
- # Patches from https://sourceforge.net/p/polyml/code/HEAD/tree/fixes-5.5.2
- # which are required to build and run sci-mathematics/isabelle-2015
- "${FILESDIR}/${PN}-5.5.2-r1952-check_for_negative_sized_array.patch"
- "${FILESDIR}/${PN}-5.5.2-r1954_Fix_segfault_in_FFI_when_malloc_runs_out_of_memory.patch"
- "${FILESDIR}/${PN}-5.5.2-r2007_Ensure_the_large_object_cache_pointer_is_cleared.patch"
- "${FILESDIR}/${PN}-5.5.2-r2009_Initialise_the_largeObjectCache_fully_in_the_constructor.patch"
-)
-
-src_prepare() {
- base_src_prepare
- eautoreconf
- if [ -f "${S}/Tests/Succeed/Test146.ML" ]; then
- mv "${S}/Tests/Succeed/Test146.ML" "${S}/Tests/Succeed/Test146.ML.disable-test-as-it-fails"
- fi
-}
-
-src_configure() {
- econf \
- --enable-shared \
- --disable-static \
- --with-system-libffi \
- $(use_with X x) \
- $(use_with gmp) \
- $(use_with portable) \
- $(use_with threads)
-}
-
-src_compile() {
- # Bug 453146 - dev-lang/polyml-5.5.0: fails to build (pax kernel?)
- pushd libpolyml || die "Could not cd to libpolyml"
- emake
- popd
- emake polyimport
- pax-mark m "${S}/.libs/polyimport"
- emake
- pax-mark m "${S}/.libs/poly"
-}
-
-src_test() {
- emake tests
-}
diff --git a/dev-lang/yasm/yasm-1.3.0-r1.ebuild b/dev-lang/yasm/yasm-1.3.0-r1.ebuild
index 78e1068772bd..5d0209b792f0 100644
--- a/dev-lang/yasm/yasm-1.3.0-r1.ebuild
+++ b/dev-lang/yasm/yasm-1.3.0-r1.ebuild
@@ -9,12 +9,12 @@ if [[ ${PV} == 9999* ]] ; then
EGIT_REPO_URI="https://github.com/yasm/yasm.git"
inherit autotools git-r3
else
- SRC_URI="http://www.tortall.net/projects/yasm/releases/${P}.tar.gz"
- KEYWORDS="~amd64 ~arm64 ~ppc64 x86 ~amd64-linux ~x86-linux ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris"
+ SRC_URI="https://www.tortall.net/projects/yasm/releases/${P}.tar.gz"
+ KEYWORDS="amd64 ~arm64 ~ppc64 x86 ~amd64-linux ~x86-linux ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris"
fi
DESCRIPTION="An assembler for x86 and x86_64 instruction sets"
-HOMEPAGE="http://yasm.tortall.net/"
+HOMEPAGE="https://yasm.tortall.net/"
LICENSE="BSD-2 BSD || ( Artistic GPL-2 LGPL-2 )"
SLOT="0"
diff --git a/dev-lang/yasm/yasm-1.3.0.ebuild b/dev-lang/yasm/yasm-1.3.0.ebuild
deleted file mode 100644
index 7104a751fd07..000000000000
--- a/dev-lang/yasm/yasm-1.3.0.ebuild
+++ /dev/null
@@ -1,47 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-PYTHON_COMPAT=( python2_7 )
-
-inherit python-single-r1 toolchain-funcs
-
-DESCRIPTION="An assembler for x86 and x86_64 instruction sets"
-HOMEPAGE="http://yasm.tortall.net/"
-SRC_URI="http://www.tortall.net/projects/yasm/releases/${P}.tar.gz"
-
-LICENSE="BSD-2 BSD || ( Artistic GPL-2 LGPL-2 )"
-SLOT="0"
-KEYWORDS="-* amd64 ~arm64 x86 ~amd64-linux ~x86-linux ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris"
-IUSE="nls python"
-REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
-
-RDEPEND="
- nls? ( virtual/libintl )
- python? ( ${PYTHON_DEPS} )"
-DEPEND="
- ${RDEPEND}
- nls? ( sys-devel/gettext )
- python? ( $(python_gen_cond_dep '>=dev-python/cython-0.14[${PYTHON_USEDEP}]') )"
-
-pkg_setup() {
- : # Avoid python-single-r1_pkg_setup
-}
-
-src_configure() {
- use python && python_setup
-
- XMLTO=: \
- econf \
- CC_FOR_BUILD=$(tc-getBUILD_CC) \
- CCLD_FOR_BUILD=$(tc-getBUILD_CC) \
- $(use_enable python) \
- $(use_enable python python-bindings) \
- $(use_enable nls)
-}
-
-src_test() {
- # https://bugs.gentoo.org/718870
- emake -j1 check
-}
diff --git a/dev-lang/yasm/yasm-9999.ebuild b/dev-lang/yasm/yasm-9999.ebuild
deleted file mode 100644
index 05fea044d20c..000000000000
--- a/dev-lang/yasm/yasm-9999.ebuild
+++ /dev/null
@@ -1,65 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit toolchain-funcs
-
-if [[ ${PV} == 9999* ]] ; then
- EGIT_REPO_URI="https://github.com/yasm/yasm.git"
- inherit autotools git-r3
-else
- SRC_URI="http://www.tortall.net/projects/yasm/releases/${P}.tar.gz"
- KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86 ~amd64-linux ~x86-linux ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris"
-fi
-
-DESCRIPTION="An assembler for x86 and x86_64 instruction sets"
-HOMEPAGE="http://yasm.tortall.net/"
-
-LICENSE="BSD-2 BSD || ( Artistic GPL-2 LGPL-2 )"
-SLOT="0"
-IUSE="nls"
-
-BDEPEND="
- nls? ( sys-devel/gettext )
-"
-DEPEND="
- nls? ( virtual/libintl )
-"
-RDEPEND="${DEPEND}
-"
-
-if [[ ${PV} == 9999* ]]; then
- BDEPEND+="
- app-text/xmlto
- app-text/docbook-xml-dtd:4.1.2
- dev-lang/python
- "
-fi
-
-src_prepare() {
- default
-
- if [[ ${PV} == 9999* ]]; then
- eautoreconf
- python modules/arch/x86/gen_x86_insn.py || die
- fi
-}
-
-src_configure() {
- local myconf=(
- CC_FOR_BUILD="$(tc-getBUILD_CC)"
- CCLD_FOR_BUILD="$(tc-getBUILD_CC)"
- --disable-warnerror
- --disable-python
- --disable-python-bindings
- $(use_enable nls)
- )
-
- econf "${myconf[@]}"
-}
-
-src_test() {
- # https://bugs.gentoo.org/718870
- emake -j1 check
-}
diff --git a/dev-libs/Manifest.gz b/dev-libs/Manifest.gz
index a0e872b1f089..785b6ecd0417 100644
Binary files a/dev-libs/Manifest.gz and b/dev-libs/Manifest.gz differ
diff --git a/dev-libs/capnproto/capnproto-0.8.0.ebuild b/dev-libs/capnproto/capnproto-0.8.0.ebuild
index 2905a51fc563..7a3fb3d64f2b 100644
--- a/dev-libs/capnproto/capnproto-0.8.0.ebuild
+++ b/dev-libs/capnproto/capnproto-0.8.0.ebuild
@@ -12,11 +12,14 @@ SRC_URI="https://github.com/sandstorm-io/capnproto/archive/v${PV}.tar.gz -> ${P}
LICENSE="MIT"
SLOT="0/080"
KEYWORDS="~amd64 ~arm ~arm64 ~x86"
-IUSE="+ssl static-libs test zlib"
+IUSE="libressl +ssl static-libs test zlib"
RESTRICT="!test? ( test )"
RDEPEND="
- ssl? ( dev-libs/openssl:0= )
+ ssl? (
+ !libressl? ( dev-libs/openssl:0= )
+ libressl? ( dev-libs/libressl:0= )
+ )
zlib? ( sys-libs/zlib:0= )
"
DEPEND="${RDEPEND} test? ( dev-cpp/gtest )"
diff --git a/dev-libs/efl/Manifest b/dev-libs/efl/Manifest
index f801c3eec4a1..d1c12cbfe9d8 100644
--- a/dev-libs/efl/Manifest
+++ b/dev-libs/efl/Manifest
@@ -1 +1,2 @@
DIST efl-1.24.3.tar.xz 72278592 BLAKE2B c5d07e947139087976a0a974c3129ea31211be4c235e94d6fc3c2b9c7ec0be97b78fcf6a18aebd4b4d476224c9e6f5a29ad41d93e6c10065ff7591c2792b8481 SHA512 3791955c588bc1b2ca55caa19dc0fb351c9f6c681791bfe76a435255edd55257c9c5ab2f16d0d91ec2d55113bd9d24d45c0f9026ae72d9f6afbddfd093975089
+DIST efl-1.25.0.tar.xz 72308216 BLAKE2B 11cafe753b28eaf273e5458008bcb027b25b2768952246835d81996ca7e5acf3878e1c80dd1aa47ad2af86da2d7e96c7391120ababf1bfd85ffab83ba4d8cbda SHA512 1362e46399d4f22bd16abd5356fc57da0eb3d92dde36413cf671c1279ca6ff24ba91b358e2cff7158fa0dc9646ed83282f952e2a23e1fd92d3e37c03ba47cf1f
diff --git a/dev-libs/efl/efl-1.24.3-r1.ebuild b/dev-libs/efl/efl-1.24.3-r1.ebuild
new file mode 100644
index 000000000000..f7493cc7904a
--- /dev/null
+++ b/dev-libs/efl/efl-1.24.3-r1.ebuild
@@ -0,0 +1,293 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit meson xdg-utils
+
+DESCRIPTION="Enlightenment Foundation Libraries all-in-one package"
+HOMEPAGE="https://www.enlightenment.org"
+SRC_URI="https://download.enlightenment.org/rel/libs/${PN}/${P}.tar.xz"
+
+LICENSE="BSD-2 GPL-2 LGPL-2.1 ZLIB"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~hppa ~ppc ~ppc64 ~x86"
+IUSE="+X bmp connman cpu_flags_arm_neon dds debug doc drm +eet elogind examples
+ fbcon +fontconfig fribidi gif gles2-only gnutls glib +gstreamer harfbuzz
+ hyphen ibus ico libressl lua +luajit jpeg2k json nls mono opengl +pdf
+ physics pmaps postscript psd pulseaudio raw scim sdl +sound +ssl +svg
+ +system-lz4 systemd tga tgv tiff tslib unwind v4l vnc wayland webp xcf xim
+ xpm xpresent zeroconf"
+
+REQUIRED_USE="
+ ?? ( elogind systemd )
+ ?? ( gles2-only opengl )
+ ^^ ( lua luajit )
+ ssl
+ drm? ( gles2-only )
+ examples? ( eet svg )
+ gles2-only? ( || ( wayland X ) )
+ pulseaudio? ( sound )
+ wayland? ( gles2-only !opengl )
+ xim? ( X )
+ xpresent? ( X )
+"
+
+# Requires everything to be enabled unconditionally.
+RESTRICT="test"
+
+RDEPEND="
+ dev-libs/check
+ net-misc/curl
+ media-libs/giflib:=
+ media-libs/libpng:0=
+ sys-apps/dbus
+ sys-libs/zlib
+ virtual/jpeg:0=
+ X? (
+ media-libs/freetype
+ x11-libs/libX11
+ x11-libs/libXcomposite
+ x11-libs/libXcursor
+ x11-libs/libXdamage
+ x11-libs/libXdmcp
+ x11-libs/libXext
+ x11-libs/libXfixes
+ x11-libs/libXi
+ x11-libs/libXinerama
+ x11-libs/libXrandr
+ x11-libs/libXrender
+ x11-libs/libXtst
+ x11-libs/libXScrnSaver
+ wayland? ( x11-libs/libxkbcommon[X] )
+ )
+ connman? ( net-misc/connman )
+ drm? (
+ dev-libs/libinput
+ dev-libs/wayland
+ media-libs/mesa[gbm]
+ x11-libs/libdrm
+ x11-libs/libxkbcommon
+ )
+ elogind? (
+ sys-auth/elogind
+ virtual/libudev
+ )
+ fontconfig? ( media-libs/fontconfig )
+ fribidi? ( dev-libs/fribidi )
+ gles2-only? (
+ media-libs/mesa[egl,gles2]
+ virtual/opengl
+ )
+ glib? ( dev-libs/glib:2 )
+ gstreamer? (
+ media-libs/gstreamer:1.0
+ media-libs/gst-plugins-base:1.0
+ )
+ hyphen? ( dev-libs/hyphen )
+ ibus? ( app-i18n/ibus )
+ jpeg2k? ( media-libs/openjpeg:= )
+ json? ( >=media-libs/rlottie-0.0.1_pre20200424:= )
+ lua? ( dev-lang/lua:* )
+ luajit? ( dev-lang/luajit:* )
+ mono? ( dev-lang/mono )
+ opengl? ( virtual/opengl )
+ pdf? ( app-text/poppler:=[cxx] )
+ physics? ( sci-physics/bullet:= )
+ postscript? ( app-text/libspectre )
+ pulseaudio? ( media-sound/pulseaudio )
+ raw? ( media-libs/libraw:= )
+ scim? ( app-i18n/scim )
+ sdl? ( media-libs/libsdl2 )
+ sound? ( media-libs/libsndfile )
+ ssl? (
+ gnutls? ( net-libs/gnutls:= )
+ !gnutls? (
+ !libressl? ( dev-libs/openssl:0= )
+ libressl? ( dev-libs/libressl:= )
+ )
+ )
+ svg? ( gnome-base/librsvg )
+ system-lz4? ( app-arch/lz4 )
+ systemd? ( sys-apps/systemd:= )
+ tiff? ( media-libs/tiff:0= )
+ tslib? ( x11-libs/tslib:= )
+ unwind? ( sys-libs/libunwind )
+ v4l? ( media-libs/libv4l )
+ vnc? ( net-libs/libvncserver )
+ wayland? (
+ dev-libs/wayland
+ media-libs/mesa[gles2,wayland]
+ x11-libs/libxkbcommon
+ )
+ webp? ( media-libs/libwebp:= )
+ xpm? ( x11-libs/libXpm )
+ xpresent? ( x11-libs/libXpresent )
+ zeroconf? ( net-dns/avahi )
+"
+DEPEND="${RDEPEND}"
+BDEPEND="virtual/pkgconfig
+ doc? ( app-doc/doxygen )
+ nls? ( sys-devel/gettext )"
+
+src_prepare() {
+ default
+
+ # Remove automagic unwind configure option, #743154
+ if ! use unwind; then
+ sed -i "/config_h.set('HAVE_UNWIND/,/eina_deps += unwind/d" src/lib/eina/meson.build ||
+ die "Failed to remove libunwind dep"
+ fi
+}
+
+src_configure() {
+ local emesonargs=(
+ --buildtype=release
+
+ -D buffer=false
+ -D cocoa=false
+ -D drm-deprecated=false
+ -D g-mainloop=false
+ -D install-eo-files=true
+ -D mono-beta=false
+ -D dotnet=false
+ -D pixman=false
+ -D wl-deprecated=false
+ -D dotnet-stylecop-severity=Warning
+
+ -D edje-sound-and-video=true
+ -D eeze=true
+ -D libmount=true
+ -D native-arch-optimization=true
+ -D xinput2=true
+ -D xinput22=true
+
+ $(meson_use X x11)
+ $(meson_use debug debug-threads)
+ $(meson_use drm)
+ $(meson_use elogind)
+ $(meson_use examples build-examples)
+ $(meson_use fbcon fb)
+ $(meson_use fontconfig)
+ $(meson_use fribidi)
+ $(meson_use glib)
+ $(meson_use gstreamer)
+ $(meson_use harfbuzz)
+ $(meson_use hyphen)
+ $(meson_use luajit elua)
+ $(meson_use nls)
+ $(meson_use physics)
+ $(meson_use pulseaudio)
+ $(meson_use sdl)
+ $(meson_use sound audio)
+ $(meson_use systemd)
+ $(meson_use tslib)
+ $(meson_use v4l v4l2)
+ $(meson_use vnc vnc-server)
+ $(meson_use wayland wl)
+ $(meson_use xpresent)
+ $(meson_use zeroconf avahi)
+
+ $(meson_use !system-lz4 embedded-lz4)
+ )
+
+ if use opengl; then
+ emesonargs+=( -D opengl=full )
+ elif use gles2-only; then
+ emesonargs+=( -D opengl=es-egl )
+ else
+ emesonargs+=( -D opengl=none )
+ fi
+
+ if use gnutls; then
+ emesonargs+=( -D crypto=gnutls )
+ else
+ emesonargs+=( -D crypto=openssl )
+ fi
+
+ if use connman; then
+ emesonargs+=( -D network-backend=connman )
+ else
+ emesonargs+=( -D network-backend=none )
+ fi
+
+ local disabledEvasLoaders=""
+ ! use bmp && disabledEvasLoaders+="bmp,wbmp,"
+ ! use dds && disabledEvasLoaders+="dds,"
+ ! use eet && disabledEvasLoaders+="eet,"
+ ! use gstreamer && disabledEvasLoaders+="gst,"
+ ! use ico && disabledEvasLoaders+="ico,"
+ ! use jpeg2k && disabledEvasLoaders+="jp2k,"
+ ! use json && disabledEvasLoaders+="json,"
+ ! use pdf && disabledEvasLoaders+="pdf,"
+ ! use pmaps && disabledEvasLoaders+="pmaps,"
+ ! use postscript && disabledEvasLoaders+="ps,"
+ ! use psd && disabledEvasLoaders+="psd,"
+ ! use raw && disabledEvasLoaders+="raw,"
+ ! use svg && disabledEvasLoaders+="rsvg,svg,"
+ ! use tga && disabledEvasLoaders+="tga,"
+ ! use tgv && disabledEvasLoaders+="tgv,"
+ ! use tiff && disabledEvasLoaders+="tiff,"
+ ! use webp && disabledEvasLoaders+="webp,"
+ ! use xcf && disabledEvasLoaders+="xcf,"
+ ! use xpm && disabledEvasLoaders+="xpm,"
+ [[ ! -z "$disabledEvasLoaders" ]] && disabledEvasLoaders=${disabledEvasLoaders::-1}
+ emesonargs+=( -D evas-loaders-disabler="${disabledEvasLoaders}" )
+
+ local disabledImfLoaders=""
+ ! use ibus && disabledImfLoaders+="ibus,"
+ ! use scim && disabledImfLoaders+="scim,"
+ ! use xim && disabledImfLoaders+="xim,"
+ [[ ! -z "$disabledImfLoaders" ]] && disabledImfLoaders=${disabledImfLoaders::-1}
+ emesonargs+=( -D ecore-imf-loaders-disabler="${disabledImfLoaders}" )
+
+ local bindingsList="cxx,"
+ use luajit && bindingsList+="luajit,"
+ use mono && bindingsList+="mono,"
+ [[ ! -z "$bindingsList" ]] && bindingsList=${bindingsList::-1}
+ emesonargs+=( -D bindings="${bindingsList}" )
+
+ local luaChoice=""
+ if use luajit; then
+ luaChoice+="luajit"
+ else
+ luaChoice+="lua"
+ fi
+ emesonargs+=( -D lua-interpreter="${luaChoice}" )
+
+ # Not all arm CPU's have neon instruction set, #722552
+ if use arm && ! use cpu_flags_arm_neon; then
+ emesonargs+=( -D native-arch-optimization=false )
+ fi
+
+ meson_src_configure
+}
+
+src_compile() {
+ meson_src_compile
+
+ if use doc; then
+ cd doc/ || die "Failed to switch into doc/ dir."
+ doxygen . || die "Doxygen failed to run."
+ fi
+}
+
+src_install() {
+ use doc && local HTML_DOCS=( "${S}"/doc/html/. )
+ meson_src_install
+
+ if use examples; then
+ docompress -x /usr/share/doc/${PF}/examples/
+ dodoc -r "${BUILD_DIR}"/src/examples/
+ fi
+}
+
+pkg_postinst() {
+ xdg_icon_cache_update
+ xdg_mimeinfo_database_update
+}
+
+pkg_postrm() {
+ xdg_icon_cache_update
+ xdg_mimeinfo_database_update
+}
diff --git a/dev-libs/efl/efl-1.25.0.ebuild b/dev-libs/efl/efl-1.25.0.ebuild
new file mode 100644
index 000000000000..fd0d1587fa97
--- /dev/null
+++ b/dev-libs/efl/efl-1.25.0.ebuild
@@ -0,0 +1,300 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit meson xdg-utils
+
+DESCRIPTION="Enlightenment Foundation Libraries all-in-one package"
+HOMEPAGE="https://www.enlightenment.org"
+SRC_URI="https://download.enlightenment.org/rel/libs/${PN}/${P}.tar.xz"
+
+LICENSE="BSD-2 GPL-2 LGPL-2.1 ZLIB"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~hppa ~ppc ~ppc64 ~x86"
+IUSE="+X avif bmp connman cpu_flags_arm_neon dds debug doc drm +eet efl-one elogind examples fbcon
+ +fontconfig fribidi gif gles2-only gnutls glib +gstreamer harfbuzz hyphen ibus ico libressl
+ lua +luajit jpeg2k json nls mono opengl +pdf physics pmaps postscript psd pulseaudio raw scim
+ sdl +sound +ssl +svg +system-lz4 systemd tga tgv tiff tslib unwind v4l vnc wayland webp xcf
+ xim xpm xpresent zeroconf"
+
+REQUIRED_USE="
+ ?? ( elogind systemd )
+ ?? ( gles2-only opengl )
+ ^^ ( lua luajit )
+ ssl
+ drm? ( gles2-only )
+ examples? ( eet svg )
+ gles2-only? ( || ( wayland X ) )
+ pulseaudio? ( sound )
+ wayland? ( gles2-only !opengl )
+ xim? ( X )
+ xpresent? ( X )
+"
+
+# Requires everything to be enabled unconditionally.
+RESTRICT="test"
+
+RDEPEND="
+ dev-libs/check
+ net-misc/curl
+ media-libs/giflib:=
+ media-libs/libpng:0=
+ sys-apps/dbus
+ sys-libs/zlib
+ virtual/jpeg:0=
+ X? (
+ media-libs/freetype
+ x11-libs/libX11
+ x11-libs/libXcomposite
+ x11-libs/libXcursor
+ x11-libs/libXdamage
+ x11-libs/libXdmcp
+ x11-libs/libXext
+ x11-libs/libXfixes
+ x11-libs/libXi
+ x11-libs/libXinerama
+ x11-libs/libXrandr
+ x11-libs/libXrender
+ x11-libs/libXtst
+ x11-libs/libXScrnSaver
+ wayland? ( x11-libs/libxkbcommon[X] )
+ )
+ avif? ( media-libs/libavif )
+ connman? ( net-misc/connman )
+ drm? (
+ dev-libs/libinput
+ dev-libs/wayland
+ media-libs/mesa[gbm]
+ x11-libs/libdrm
+ x11-libs/libxkbcommon
+ )
+ elogind? (
+ sys-auth/elogind
+ virtual/libudev
+ )
+ fontconfig? ( media-libs/fontconfig )
+ fribidi? ( dev-libs/fribidi )
+ gles2-only? (
+ media-libs/mesa[egl,gles2]
+ virtual/opengl
+ )
+ glib? ( dev-libs/glib:2 )
+ gstreamer? (
+ media-libs/gstreamer:1.0
+ media-libs/gst-plugins-base:1.0
+ )
+ hyphen? ( dev-libs/hyphen )
+ ibus? ( app-i18n/ibus )
+ jpeg2k? ( media-libs/openjpeg:= )
+ json? ( >=media-libs/rlottie-0.0.1_pre20200424:= )
+ lua? ( dev-lang/lua:* )
+ luajit? ( dev-lang/luajit:* )
+ mono? ( dev-lang/mono )
+ opengl? ( virtual/opengl )
+ pdf? ( app-text/poppler:=[cxx] )
+ physics? ( sci-physics/bullet:= )
+ postscript? ( app-text/libspectre )
+ pulseaudio? ( media-sound/pulseaudio )
+ raw? ( media-libs/libraw:= )
+ scim? ( app-i18n/scim )
+ sdl? ( media-libs/libsdl2 )
+ sound? ( media-libs/libsndfile )
+ ssl? (
+ gnutls? ( net-libs/gnutls:= )
+ !gnutls? (
+ !libressl? ( dev-libs/openssl:0= )
+ libressl? ( dev-libs/libressl:= )
+ )
+ )
+ svg? ( gnome-base/librsvg )
+ system-lz4? ( app-arch/lz4 )
+ systemd? ( sys-apps/systemd:= )
+ tiff? ( media-libs/tiff:0= )
+ tslib? ( x11-libs/tslib:= )
+ unwind? ( sys-libs/libunwind )
+ v4l? ( media-libs/libv4l )
+ vnc? ( net-libs/libvncserver )
+ wayland? (
+ dev-libs/wayland
+ media-libs/mesa[gles2,wayland]
+ x11-libs/libxkbcommon
+ )
+ webp? ( media-libs/libwebp:= )
+ xpm? ( x11-libs/libXpm )
+ xpresent? ( x11-libs/libXpresent )
+ zeroconf? ( net-dns/avahi )
+"
+DEPEND="${RDEPEND}"
+BDEPEND="virtual/pkgconfig
+ doc? ( app-doc/doxygen )
+ nls? ( sys-devel/gettext )"
+
+pkg_setup() {
+ # Deprecated, provided for backward-compatibility. Everything is moved to libefreet.so.
+ QA_FLAGS_IGNORED="/usr/$(get_libdir)/libefreet_trash.so.1.25.0
+ /usr/$(get_libdir)/libefreet_mime.so.1.25.0"
+}
+
+src_prepare() {
+ default
+
+ # Remove automagic unwind configure option, #743154
+ if ! use unwind; then
+ sed -i "/config_h.set('HAVE_UNWIND/,/eina_ext_deps += unwind/d" src/lib/eina/meson.build ||
+ die "Failed to remove libunwind dep"
+ fi
+}
+
+src_configure() {
+ local emesonargs=(
+ --buildtype=release
+
+ -D buffer=false
+ -D cocoa=false
+ -D drm-deprecated=false
+ -D g-mainloop=false
+ -D install-eo-files=true
+ -D mono-beta=false
+ -D dotnet=false
+ -D pixman=false
+ -D wl-deprecated=false
+ -D dotnet-stylecop-severity=Warning
+
+ -D edje-sound-and-video=true
+ -D eeze=true
+ -D libmount=true
+ -D native-arch-optimization=true
+ -D xinput2=true
+ -D xinput22=true
+
+ $(meson_use X x11)
+ $(meson_use debug debug-threads)
+ $(meson_use drm)
+ $(meson_use elogind systemd)
+ $(meson_use examples build-examples)
+ $(meson_use fbcon fb)
+ $(meson_use fontconfig)
+ $(meson_use fribidi)
+ $(meson_use glib)
+ $(meson_use gstreamer)
+ $(meson_use harfbuzz)
+ $(meson_use hyphen)
+ $(meson_use luajit elua)
+ $(meson_use nls)
+ $(meson_use physics)
+ $(meson_use pulseaudio)
+ $(meson_use sdl)
+ $(meson_use sound audio)
+ $(meson_use systemd)
+ $(meson_use tslib)
+ $(meson_use v4l v4l2)
+ $(meson_use vnc vnc-server)
+ $(meson_use wayland wl)
+ $(meson_use xpresent)
+ $(meson_use zeroconf avahi)
+
+ $(meson_use !system-lz4 embedded-lz4)
+ )
+
+ if use opengl; then
+ emesonargs+=( -D opengl=full )
+ elif use gles2-only; then
+ emesonargs+=( -D opengl=es-egl )
+ else
+ emesonargs+=( -D opengl=none )
+ fi
+
+ if use gnutls; then
+ emesonargs+=( -D crypto=gnutls )
+ else
+ emesonargs+=( -D crypto=openssl )
+ fi
+
+ if use connman; then
+ emesonargs+=( -D network-backend=connman )
+ else
+ emesonargs+=( -D network-backend=none )
+ fi
+
+ local disabledEvasLoaders=""
+ ! use avif && disabledEvasLoaders="avif,"
+ ! use bmp && disabledEvasLoaders+="bmp,wbmp,"
+ ! use dds && disabledEvasLoaders+="dds,"
+ ! use eet && disabledEvasLoaders+="eet,"
+ ! use gstreamer && disabledEvasLoaders+="gst,"
+ ! use ico && disabledEvasLoaders+="ico,"
+ ! use jpeg2k && disabledEvasLoaders+="jp2k,"
+ ! use json && disabledEvasLoaders+="json,"
+ ! use pdf && disabledEvasLoaders+="pdf,"
+ ! use pmaps && disabledEvasLoaders+="pmaps,"
+ ! use postscript && disabledEvasLoaders+="ps,"
+ ! use psd && disabledEvasLoaders+="psd,"
+ ! use raw && disabledEvasLoaders+="raw,"
+ ! use svg && disabledEvasLoaders+="rsvg,svg,"
+ ! use tga && disabledEvasLoaders+="tga,"
+ ! use tgv && disabledEvasLoaders+="tgv,"
+ ! use tiff && disabledEvasLoaders+="tiff,"
+ ! use webp && disabledEvasLoaders+="webp,"
+ ! use xcf && disabledEvasLoaders+="xcf,"
+ ! use xpm && disabledEvasLoaders+="xpm,"
+ [[ ! -z "$disabledEvasLoaders" ]] && disabledEvasLoaders=${disabledEvasLoaders::-1}
+ emesonargs+=( -D evas-loaders-disabler="${disabledEvasLoaders}" )
+
+ local disabledImfLoaders=""
+ ! use ibus && disabledImfLoaders+="ibus,"
+ ! use scim && disabledImfLoaders+="scim,"
+ ! use xim && disabledImfLoaders+="xim,"
+ [[ ! -z "$disabledImfLoaders" ]] && disabledImfLoaders=${disabledImfLoaders::-1}
+ emesonargs+=( -D ecore-imf-loaders-disabler="${disabledImfLoaders}" )
+
+ local bindingsList="cxx,"
+ use luajit && bindingsList+="lua,"
+ use mono && bindingsList+="mono,"
+ [[ ! -z "$bindingsList" ]] && bindingsList=${bindingsList::-1}
+ emesonargs+=( -D bindings="${bindingsList}" )
+
+ local luaChoice=""
+ if use luajit; then
+ luaChoice+="luajit"
+ else
+ luaChoice+="lua"
+ fi
+ emesonargs+=( -D lua-interpreter="${luaChoice}" )
+
+ # Not all arm CPU's have neon instruction set, #722552
+ if use arm && ! use cpu_flags_arm_neon; then
+ emesonargs+=( -D native-arch-optimization=false )
+ fi
+
+ meson_src_configure
+}
+
+src_compile() {
+ meson_src_compile
+
+ if use doc; then
+ cd doc/ || die "Failed to switch into doc/ dir."
+ doxygen . || die "Doxygen failed to run."
+ fi
+}
+
+src_install() {
+ use doc && local HTML_DOCS=( "${S}"/doc/html/. )
+ meson_src_install
+
+ if use examples; then
+ docompress -x /usr/share/doc/${PF}/examples/
+ dodoc -r "${BUILD_DIR}"/src/examples/
+ fi
+}
+
+pkg_postinst() {
+ xdg_icon_cache_update
+ xdg_mimeinfo_database_update
+}
+
+pkg_postrm() {
+ xdg_icon_cache_update
+ xdg_mimeinfo_database_update
+}
diff --git a/dev-libs/efl/metadata.xml b/dev-libs/efl/metadata.xml
index de7dc1cf76d8..f9203b5c554c 100644
--- a/dev-libs/efl/metadata.xml
+++ b/dev-libs/efl/metadata.xml
@@ -6,10 +6,12 @@
Joonas Niilola
diff --git a/dev-python/fqdn/Manifest b/dev-python/fqdn/Manifest
index 2e958ef421fa..04484d55d492 100644
--- a/dev-python/fqdn/Manifest
+++ b/dev-python/fqdn/Manifest
@@ -1 +1,2 @@
DIST fqdn-1.2.0.tar.gz 12275 BLAKE2B 0bc862863ee3b196ea08a1f4f50f98dca88e8b81f37d2cb97bd3fd74ef9844157ea7a9f38707047fad17b95fb95c2f0e7ace8ad2c2310171cba6ff43471ae63d SHA512 ddfcfd82860d597075fd2d989d4bb1cd8c1dc79b711da432732bf786032e78b9356e04851a491c5299b336dcde173a66ddae0e23aea59b67c758d997554b494e
+DIST fqdn-1.4.0.tar.gz 12962 BLAKE2B 76b7bd7f2ebfd77b2bba04f7e07cdab42f0ff6c7ad5967f52e4c108fc3c3345c88a220b9f0330d998dc5abc53909d5768b1b52e08e48bc1e16009fa39f3afa16 SHA512 e2a67e97bc832526e234bbf19600af2e7eda8f7ede13ba33ec8c736888d19693727eded4b895efd4c88ab2e232db768d42761f44a479e615e13da8ddbf6d03a3
diff --git a/dev-python/fqdn/files/1.4.0-tests.patch b/dev-python/fqdn/files/1.4.0-tests.patch
new file mode 100644
index 000000000000..0804be7d175b
--- /dev/null
+++ b/dev-python/fqdn/files/1.4.0-tests.patch
@@ -0,0 +1,24 @@
+From 0d6a6191a49fac252a96f72bd3193f21ae56424f Mon Sep 17 00:00:00 2001
+From: ypcrts <32625281+ypcrts@users.noreply.github.com>
+Date: Sun, 26 Apr 2020 01:51:43 -0400
+Subject: [PATCH] test __str__ to be congruent with absolute
+
+---
+ tests/test_fqdn.py | 4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/tests/test_fqdn.py b/tests/test_fqdn.py
+index 37fcf52..60c8607 100644
+--- a/tests/test_fqdn.py
++++ b/tests/test_fqdn.py
+@@ -21,8 +21,8 @@ def test_constructor_raises_on_bytes(self):
+
+ def test_str(self):
+ d = "greatdomain.com"
+- assert d == str(FQDN(d))
+- assert d == str(FQDN(d + "."))
++ f = FQDN(d)
++ assert f.absolute == str(f)
+
+ def test_rfc_1035_s_2_3_4__label_max_length(self):
+ self.__assert_valid(
diff --git a/dev-python/fqdn/fqdn-1.4.0.ebuild b/dev-python/fqdn/fqdn-1.4.0.ebuild
new file mode 100644
index 000000000000..bec42af9f411
--- /dev/null
+++ b/dev-python/fqdn/fqdn-1.4.0.ebuild
@@ -0,0 +1,23 @@
+# Copyright 2018-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{6,7,8} )
+
+inherit distutils-r1
+
+DESCRIPTION="RFC-compliant FQDN validation and manipulation for Python"
+HOMEPAGE="https://github.com/guyhughes/fqdn"
+SRC_URI="https://github.com/guyhughes/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="MPL-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc64 ~x86"
+
+RDEPEND="dev-python/cached-property[${PYTHON_USEDEP}]"
+
+PATCHES=( "${FILESDIR}/1.4.0-tests.patch" )
+
+distutils_enable_tests unittest
+distutils_enable_sphinx docs
diff --git a/dev-python/fqdn/metadata.xml b/dev-python/fqdn/metadata.xml
index 8a3fbf73a49a..38e8c03d3dc6 100644
--- a/dev-python/fqdn/metadata.xml
+++ b/dev-python/fqdn/metadata.xml
@@ -5,10 +5,15 @@
gyakovlev@gentoo.org
Georgy Yakovlev
+
+ python@gentoo.org
+ Python
+
Validate fully-qualified domain names compliant
to RFC 1035 and the preferred form in RFC 3686 s. 2.
+
guyhughes/fqdn
fqdn
diff --git a/dev-python/gevent/Manifest b/dev-python/gevent/Manifest
index a5155708321a..47f2379319ef 100644
--- a/dev-python/gevent/Manifest
+++ b/dev-python/gevent/Manifest
@@ -1 +1,2 @@
DIST gevent-20.6.2.tar.gz 5806612 BLAKE2B 8b1fbd991cb169292d33001bb0df06702d36eb3849c9251e4fac9e2fb5826eda3435971e39e209f1f537536081ce2730e561e91c398ee66a9b1d55c9d0e5a81a SHA512 65caa9caf8a2913b4c3bcc9a303169ce5837a0d7ccf4fb6b7583bf4ec3a0b288d65fc7e28399f0715e61aed128ffc6e67fc9b455474e47263236136a492021f4
+DIST gevent-20.9.0.tar.gz 5806581 BLAKE2B 6b1b653fa6e22539e049a9bba3d3a2b9d798a5555ce4ba60ce33ecbdf14bb5201967d22d677e1ce3170129b0763fddfcc5991347186fb102d10ae39e22538c44 SHA512 966efc945b623df2521fffadca3b7e56cae1efe6de904a724765e0593389e8b1305094baa6fbc9f4fa376b1157d0f230b01e2a90de21e4b9650614363edec9f4
diff --git a/dev-python/gevent/gevent-20.9.0.ebuild b/dev-python/gevent/gevent-20.9.0.ebuild
new file mode 100644
index 000000000000..426eeee02faa
--- /dev/null
+++ b/dev-python/gevent/gevent-20.9.0.ebuild
@@ -0,0 +1,86 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+DISTUTILS_USE_SETUPTOOLS=rdepend
+PYTHON_COMPAT=( python3_{6,7,8,9} )
+PYTHON_REQ_USE="ssl(+),threads(+)"
+
+inherit distutils-r1 flag-o-matic
+
+DESCRIPTION="Coroutine-based network library"
+HOMEPAGE="https://www.gevent.org/ https://pypi.org/project/gevent/"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux"
+IUSE="doc examples test"
+RESTRICT="!test? ( test )"
+
+RDEPEND="
+ >=dev-libs/libev-4.23:=
+ dev-libs/libuv:=
+ >=net-dns/c-ares-1.12:=
+ >=dev-python/greenlet-0.4.17
+ dev-python/zope-event[${PYTHON_USEDEP}]
+ dev-python/zope-interface[${PYTHON_USEDEP}]
+ virtual/python-greenlet[${PYTHON_USEDEP}]"
+DEPEND="${RDEPEND}
+ test? (
+ dev-python/psutil[${PYTHON_USEDEP}]
+ dev-python/requests[${PYTHON_USEDEP}]
+ )"
+
+distutils_enable_sphinx doc
+
+# Tests take long and fail terribly a few times.
+# It also seems that they require network access.
+#RESTRICT="test"
+
+python_prepare_all() {
+ export LIBEV_EMBED="false"
+ export CARES_EMBED="false"
+ export EMBED="false"
+
+ distutils-r1_python_prepare_all
+}
+
+python_configure_all() {
+ append-flags -fno-strict-aliasing
+}
+
+python_test() {
+ cd src/gevent/tests || die
+ # TODO: figure out how to make them work and not hang
+# GEVENT_RESOLVER=ares \
+# "${EPYTHON}" -m gevent.tests \
+# -uall,-network \
+# --config known_failures.py \
+# --ignore tests_that_dont_use_resolver.txt || die
+# GEVENT_RESOLVER=dnspython \
+# "${EPYTHON}" -m gevent.tests \
+# -uall,-network \
+# --config known_failures.py \
+# --ignore tests_that_dont_use_resolver.txt || die
+# GEVENT_RESOLVER=thread \
+# "${EPYTHON}" -m gevent.tests \
+# --verbose \
+# -uall,-network \
+# --config known_failures.py \
+# --ignore tests_that_dont_use_resolver.txt || die
+ GEVENT_FILE=thread \
+ "${EPYTHON}" -m gevent.tests \
+ --verbose \
+ -uall,-network \
+ --config known_failures.py \
+ test__*subprocess*.py || die
+}
+
+python_install_all() {
+ local DOCS=( AUTHORS README.rst )
+ use examples && dodoc -r examples
+
+ distutils-r1_python_install_all
+}
diff --git a/dev-python/greenlet/Manifest b/dev-python/greenlet/Manifest
index 2b227c87d349..be50f662ec7c 100644
--- a/dev-python/greenlet/Manifest
+++ b/dev-python/greenlet/Manifest
@@ -1 +1,2 @@
DIST greenlet-0.4.16.tar.gz 60576 BLAKE2B e0c53af4b6886fe00f0299a1779e478b7cbce5ff733669e8a62757cef49f034e19b7b932e7900b09e288ff4ab7e883fc2dd5f97f78c0e1b5702e5ba9c9f62fa1 SHA512 0dc473c05c1d54a830c009fe8197fd2017b8f3117532af0fc7970eb5abd93a82bbaa1a8403375a0ac7148fcff63cdc3faa663d0c5e442f3dd10ea3b2f98b306e
+DIST greenlet-0.4.17.tar.gz 61381 BLAKE2B fd5b8ed72acd390f3d5fe3ca1d5894bc47278b1f0e04e4fe5c6015c60dfb3109e766dc6072bf85b96760f673a1af08cd546171906800a1221a216899077a908e SHA512 41afd80a6cd5e9cf9c8149016f24d0944d2651288d50094ef04bb6759202903c436af639872d7aab631ed8fe13aad7d4405beb428415b198a3ba30a96d4bd3de
diff --git a/dev-python/greenlet/greenlet-0.4.17.ebuild b/dev-python/greenlet/greenlet-0.4.17.ebuild
new file mode 100644
index 000000000000..66523de5fde0
--- /dev/null
+++ b/dev-python/greenlet/greenlet-0.4.17.ebuild
@@ -0,0 +1,36 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+# setuptools is used only if one of the fancy commands are used
+DISTUTILS_USE_SETUPTOOLS=no
+# Note: greenlet is built-in in pypy
+PYTHON_COMPAT=( python3_{6,7,8,9} )
+
+inherit distutils-r1 flag-o-matic
+
+DESCRIPTION="Lightweight in-process concurrent programming"
+HOMEPAGE="https://pypi.org/project/greenlet/"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 -hppa -ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux"
+
+DISTUTILS_IN_SOURCE_BUILD=1
+
+distutils_enable_sphinx doc --no-autodoc
+
+python_compile() {
+ if ! python_is_python3; then
+ local CFLAGS=${CFLAGS} CXXFLAGS=${CXXFLAGS}
+ append-flags -fno-strict-aliasing
+ fi
+
+ distutils-r1_python_compile
+}
+
+python_test() {
+ "${PYTHON}" run-tests.py -n || die "Tests fail with ${EPYTHON}"
+}
diff --git a/dev-python/hypothesis/Manifest b/dev-python/hypothesis/Manifest
index 7154242d2999..47ef2ed15d7e 100644
--- a/dev-python/hypothesis/Manifest
+++ b/dev-python/hypothesis/Manifest
@@ -2,3 +2,4 @@ DIST hypothesis-python-5.24.4.tar.gz 9054743 BLAKE2B 5c64c86ed58d8f0e4a07390b1b1
DIST hypothesis-python-5.29.4.tar.gz 9071060 BLAKE2B 0668f3c7859fae7024c15f693b1f56ce8d02d6f3b8187d24b2d84e38e7bdb73c0824d2b02cfecc6b40bdfbbb1c91c0aa83d40848c499a97ab7e9223aaa6c78d4 SHA512 9da4b487fd3c56540a20e2fbff635704f0720f422d8a398d0accd24a1fb9517476b0d29135b9113a96e8dc98fcfc31cc53215ad82cb727be54e4e77b44d4c8e4
DIST hypothesis-python-5.35.3.tar.gz 9084707 BLAKE2B ff0638194067a1c52a0297254be572ba66d67afa49c1f2fbcc42bff694ab4fe545d408d9144118314a6decfdffdbe950e2b72e89b689ae99b82ad3d3321e72fd SHA512 d862cba17444b36fa05877419495b5e49e8686980e0203da388e2dc4e528ace928f0bcb244afc8512f97bf466f2e5a2a421a2c873053849af61de71421d5c61a
DIST hypothesis-python-5.35.4.tar.gz 9084892 BLAKE2B 5545f2b1f3e97eafb4c83d7918f1558124102b1b58854bf0ca3a75fa3f6f08c0cc862c0ec32f5fdcbbf12e6cfc849e7081fe82ab0bb24e6de8fe41108525816b SHA512 db26d0b8d23b753c4880e0ee54ef89957c68c75496847aaefd538196188e7734513d737e2073bdced5eb7a8677b096b2cf9d6d48e572922d8a3e5a5c930bc795
+DIST hypothesis-python-5.36.0.tar.gz 9086288 BLAKE2B 9deba5f50168185d5e9ef35a47bcb0dc6dfdf38b7da7a2aedee0a6fe18740fa9a353b0985e25a40da1a30d26900c6294161a1dfe03e5c7c9c31f74aa1b2cec9f SHA512 e7324f98ac8609c1ce7ed957d0ee0280d177e9a6d369cc3bdb2cc8bde7f5e79d8f19b53c6b19fdfc732c9f84e4cd7dffa9c2af3cc004b3b5dbe703d73ce64009
diff --git a/dev-python/hypothesis/hypothesis-5.36.0.ebuild b/dev-python/hypothesis/hypothesis-5.36.0.ebuild
new file mode 100644
index 000000000000..c8d53477c0bc
--- /dev/null
+++ b/dev-python/hypothesis/hypothesis-5.36.0.ebuild
@@ -0,0 +1,63 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+DISTUTILS_USE_SETUPTOOLS=rdepend
+PYTHON_COMPAT=( python3_{6,7,8,9} pypy3 )
+PYTHON_REQ_USE="threads(+),sqlite"
+
+inherit distutils-r1 eutils multiprocessing optfeature
+
+DESCRIPTION="A library for property based testing"
+HOMEPAGE="https://github.com/HypothesisWorks/hypothesis https://pypi.org/project/hypothesis/"
+SRC_URI="https://github.com/HypothesisWorks/${PN}/archive/${PN}-python-${PV}.tar.gz"
+S="${WORKDIR}/${PN}-${PN}-python-${PV}/${PN}-python"
+
+LICENSE="MPL-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~riscv ~sparc ~x86"
+IUSE="cli test"
+RESTRICT="!test? ( test )"
+
+RDEPEND="
+ >=dev-python/attrs-19.2.0[${PYTHON_USEDEP}]
+ >=dev-python/sortedcontainers-2.1.0[${PYTHON_USEDEP}]
+ cli? (
+ $(python_gen_cond_dep '
+ dev-python/black[${PYTHON_USEDEP}]
+ dev-python/click[${PYTHON_USEDEP}]
+ ' python3_{6..9})
+ )
+"
+BDEPEND="
+ test? (
+ ${RDEPEND}
+ dev-python/mock[${PYTHON_USEDEP}]
+ dev-python/pexpect[${PYTHON_USEDEP}]
+ >=dev-python/pytest-5.3.5[${PYTHON_USEDEP}]
+ dev-python/pytest-xdist[${PYTHON_USEDEP}]
+ !!= 3.8
+PYTHON_COMPAT=( pypy3 python3_{6,7,8} )
+
+inherit distutils-r1
+
+DESCRIPTION="Read metadata from Python packages"
+HOMEPAGE="https://importlib-metadata.readthedocs.io/"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+
+RDEPEND="dev-python/zipp[${PYTHON_USEDEP}]"
+BDEPEND="
+ dev-python/setuptools_scm[${PYTHON_USEDEP}]
+ test? (
+ ${RDEPEND}
+ >=dev-python/importlib_resources-1.3.0[${PYTHON_USEDEP}]
+ dev-python/packaging[${PYTHON_USEDEP}]
+ dev-python/pyfakefs[${PYTHON_USEDEP}]
+ )
+"
+
+distutils_enable_sphinx "${PN}/docs" \
+ '>=dev-python/rst-linker-1.9'
+distutils_enable_tests unittest
+
+python_prepare_all() {
+ # Skip a test that requires pep517 which is not in the tree
+ sed -e 's:test_find_local:_&:' \
+ -i importlib_metadata/tests/test_integration.py || die
+
+ distutils-r1_python_prepare_all
+}
diff --git a/dev-python/iniconfig/iniconfig-1.0.0.ebuild b/dev-python/iniconfig/iniconfig-1.0.0.ebuild
index 635312b96011..ec22ae4c7ce3 100644
--- a/dev-python/iniconfig/iniconfig-1.0.0.ebuild
+++ b/dev-python/iniconfig/iniconfig-1.0.0.ebuild
@@ -14,7 +14,7 @@ SRC_URI="mirror://pypi/${PN::1}/${PN}/${P}.tar.gz"
LICENSE="MIT"
SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~riscv ~sparc ~x86"
+KEYWORDS="~amd64 arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~riscv ~sparc x86"
BDEPEND="dev-python/setuptools_scm[${PYTHON_USEDEP}]"
diff --git a/dev-python/isort/isort-4.3.21_p2-r1.ebuild b/dev-python/isort/isort-4.3.21_p2-r1.ebuild
index 6086f5b770a6..5d9e679b4968 100644
--- a/dev-python/isort/isort-4.3.21_p2-r1.ebuild
+++ b/dev-python/isort/isort-4.3.21_p2-r1.ebuild
@@ -20,10 +20,6 @@ KEYWORDS="~alpha amd64 arm arm64 ~ia64 ppc ppc64 sparc x86"
RDEPEND="
dev-python/pipfile[${PYTHON_USEDEP}]
- $(python_gen_cond_dep '
- dev-python/backports-functools-lru-cache[${PYTHON_USEDEP}]
- dev-python/futures[${PYTHON_USEDEP}]
- ' -2)
"
BDEPEND="${RDEPEND}"
@@ -32,3 +28,8 @@ PATCHES=(
)
distutils_enable_tests pytest
+
+python_test() {
+ distutils_install_for_testing
+ pytest -vv || die "Tests failed with ${EPYTHON}"
+}
diff --git a/dev-python/libsass/libsass-0.20.0.ebuild b/dev-python/libsass/libsass-0.20.0.ebuild
index b745260bad65..4db2ec619f46 100644
--- a/dev-python/libsass/libsass-0.20.0.ebuild
+++ b/dev-python/libsass/libsass-0.20.0.ebuild
@@ -14,7 +14,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
LICENSE="MIT"
SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
DEPEND="dev-libs/libsass
dev-python/six[${PYTHON_USEDEP}]
diff --git a/dev-python/lit/Manifest b/dev-python/lit/Manifest
index 8ceb93829922..dff4b05ec630 100644
--- a/dev-python/lit/Manifest
+++ b/dev-python/lit/Manifest
@@ -1,5 +1,4 @@
DIST llvmorg-10.0.0.tar.gz 120804856 BLAKE2B 6b0254f5b913398cdcf2b2ec1ff219888706d2b79d5296590934714e42ac79f6a6547941ac2b1d2c4e6313dd18b6c7068e748aa6ac033e49fccbf5d355aa8191 SHA512 baa182d62fef1851836013ae8a1a00861ea89769778d67fb97b407a9de664e6c85da2af9c5b3f75d2bf34ff6b00004e531ca7e4b3115a26c0e61c575cf2303a0
DIST llvmorg-10.0.1.tar.gz 120880730 BLAKE2B 30f19f56c4d1f6abcda5fec76256219d1e3c8a6ff1a1f152f94bfe362c07884339fe571ff7fe903ed3b3deb150b2fa868c387887a0dea2930dc08b81db71a5b1 SHA512 48078fff9293a87f1a973f3348f79506f04c3da774295f5eb67d74dd2d1aa94f0973f8ced3f4ab9e8339902071f82c603b43d5608ad7227046c4da769c5d2151
-DIST llvmorg-11.0.0-rc1.tar.gz 122688246 BLAKE2B 10ff3f08ff3780abb1d86ac67942e6aac52ff5daf820a2e3d23d8b79dbade1c5b1d398d0a577028d2d7c8759ab9a8b552a0305b5750310a015585c06cdadf844 SHA512 09564ed903902a5795fffaa4679badc30bf49739889a48074b5ae2c93bd29000cfb36a650208d5cae5d74899bade066f84b4aa023fc852eec246ff67bf64a267
-DIST llvmorg-11.0.0-rc2.tar.gz 122728230 BLAKE2B 7944adf41ec7cd82489666a0a38a857de628879d59a2e3bb566b67c18500092430db66ff214d45cb324128c874a74a72c367b452df3b88ec95b33c284dd35512 SHA512 25eb2879eb22e79a1e840ef24cf3f5eec602e947101db299393e06e3d09f2d1531eef214264636e1b511eafff7f51b1834d5a03976ccd088eb680745b147e9f3
+DIST llvmorg-11.0.0-rc3.tar.gz 122766783 BLAKE2B 052fdc864fed52692141284ebdc41d52d21fbeaf24ac5ed3e67701537baa683bae61b1c06de68322e0578a27a1f5a8856088cdc001d2b8d34d2ec88ae65ff739 SHA512 a28ce74775373c63fe23b3116cd25db0efb95c6fdb60e56f2522659a404a59576f3d9429a109cb0f90534927259289aa1c712673f36f92272d642bf8dce5699f
DIST llvmorg-9.0.1.tar.gz 113193320 BLAKE2B b86e405f2b8e00436045fd409fe19cdde75c797b1192c62a22b5ec75e6b4dc8e874a0f33008dc31562445e4cbe53a992b6f48c684255a6a1ef261e595b8b161f SHA512 fa88beeaae94b6d0cd9b5ba38658d0ffed8004035d7d8a4f95c3d31a709b88b581ae9bd7761333c8e5375c44b8f6be01768b5a3be901163159d7e6c43b71da59
diff --git a/dev-python/lit/lit-11.0.0_rc2.ebuild b/dev-python/lit/lit-11.0.0_rc2.ebuild
deleted file mode 100644
index eafbdc683987..000000000000
--- a/dev-python/lit/lit-11.0.0_rc2.ebuild
+++ /dev/null
@@ -1,39 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-DISTUTILS_USE_SETUPTOOLS=rdepend
-PYTHON_COMPAT=( python3_{6..9} )
-
-inherit distutils-r1 llvm.org
-
-DESCRIPTION="A stand-alone install of the LLVM suite testing tool"
-HOMEPAGE="https://llvm.org/"
-LLVM_COMPONENTS=( llvm/utils/lit )
-llvm.org_set_globals
-
-LICENSE="Apache-2.0-with-LLVM-exceptions UoI-NCSA"
-SLOT="0"
-KEYWORDS=""
-IUSE="test"
-RESTRICT="!test? ( test )"
-
-# Tests require 'FileCheck' and 'not' utilities (from llvm)
-BDEPEND="
- test? (
- dev-python/psutil[${PYTHON_USEDEP}]
- sys-devel/llvm )"
-
-# TODO: move the manpage generation here (from sys-devel/llvm)
-
-src_prepare() {
- cd "${WORKDIR}" || die
- distutils-r1_src_prepare
-}
-
-python_test() {
- local -x LIT_PRESERVES_TMP=1
- local litflags=$(get_lit_flags)
- ./lit.py ${litflags//;/ } tests || die
-}
diff --git a/dev-python/lit/lit-11.0.0_rc1.ebuild b/dev-python/lit/lit-11.0.0_rc3.ebuild
similarity index 100%
rename from dev-python/lit/lit-11.0.0_rc1.ebuild
rename to dev-python/lit/lit-11.0.0_rc3.ebuild
diff --git a/dev-python/nbconvert/Manifest b/dev-python/nbconvert/Manifest
index 5d1c166a0180..3809b6a6622f 100644
--- a/dev-python/nbconvert/Manifest
+++ b/dev-python/nbconvert/Manifest
@@ -1,3 +1,5 @@
DIST nbconvert-5.6.1.tar.gz 703233 BLAKE2B e75d558aee6c66fe8e7455ecf22dbbcd2a0698380ffec80eff15aea6c70bc853daa9ab2fd1d114453bd5dfe7e75617afb9f5c1075704bfadbb59fef34bca88a9 SHA512 0c68adcb9f28ead9ec058fc2e02a9a1e6f65818709c99f7a006a59a7562b5f5ee74afe5287e41568c35542898dc1b43c4543d2386cc05a721b3f99d5cc789435
DIST nbconvert-6.0.3.tar.gz 848214 BLAKE2B 4265486536cfe0cf220b8080374726cc68be4f15033c8248806579b1ea1f759caa667ae11738acce1ecc812c65b954be1c21db0abe69db7bfdf67533ea052c3c SHA512 55e6fc1f136f8bc3b4b662011172ac3f61354ee1afa6904b5df34a382ae96f46e13f097f6067ca5e42d3fd0049f81a8a27d7b7faf605fa948e22d6067bc971ef
DIST nbconvert-6.0.4.tar.gz 841651 BLAKE2B 080f60103709bd6ddb8258750a51e7bf8891adb1eb2921619cfbb0e774a585f3d3722758d8895f67a76e2705a15a0b35ffcb7c59842ec986a13315e5b10f4eca SHA512 46c2d250e25ad0e2fee0be0fefacc198687acd7ffcb4205bb8cf0ed263e90878cf659f352d551911b0025cb150302ea9ffd67b9453ec23fc5821908f7b56dd75
+DIST nbconvert-6.0.5.tar.gz 841650 BLAKE2B 7f8bb3849374284c90bd7b17c27a313c69694e42d4fd7b5913d3b210a15f17b89ffca8436ce31fa5bfc2b586feb536522106522f3d1741ad0fb6c2995a2e562e SHA512 79164546164eada6998bd6898833dfbada0a1476af8796bea40794f6caf121d0b9560f0f50e3d477357e977222a3b75f3de85ccfa03c4aec93be75801cf6f97c
+DIST nbconvert-6.0.6.tar.gz 888348 BLAKE2B 7662437e1436a4ee9694bc05b8472b64d0773c38cc5fda3372ce9009f5d6d20e2ffb28c4baf3442cbc88414ce97870cf15a102ee609f4aae2c951d3f7ac5202f SHA512 2be6a65ed86dd10fc4fd08536db304dc359da1af66c4f907753a419b8d9caec08274c07d110a060bdae5626bb48a4f6d209e423b8eacee420d3a4c6ef0f6bbf5
diff --git a/dev-python/nbconvert/nbconvert-6.0.5.ebuild b/dev-python/nbconvert/nbconvert-6.0.5.ebuild
new file mode 100644
index 000000000000..58b0853ec91c
--- /dev/null
+++ b/dev-python/nbconvert/nbconvert-6.0.5.ebuild
@@ -0,0 +1,73 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+DISTUTILS_USE_SETUPTOOLS=rdepend
+PYTHON_COMPAT=( python3_{7..9} )
+
+inherit distutils-r1
+
+DESCRIPTION="Converting Jupyter Notebooks"
+HOMEPAGE="https://nbconvert.readthedocs.io/"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~arm64 ~x86"
+
+RDEPEND="
+ dev-python/bleach[${PYTHON_USEDEP}]
+ dev-python/defusedxml[${PYTHON_USEDEP}]
+ >=dev-python/entrypoints-0.2.2[${PYTHON_USEDEP}]
+ dev-python/jinja[${PYTHON_USEDEP}]
+ dev-python/jupyter_core[${PYTHON_USEDEP}]
+ dev-python/jupyterlab_pygments[${PYTHON_USEDEP}]
+ >=dev-python/mistune-0.7.4[${PYTHON_USEDEP}]
+ dev-python/nbclient[${PYTHON_USEDEP}]
+ dev-python/nbformat[${PYTHON_USEDEP}]
+ >=dev-python/pandocfilters-1.4.1[${PYTHON_USEDEP}]
+ dev-python/pygments[${PYTHON_USEDEP}]
+ >=dev-python/traitlets-4.2.1[${PYTHON_USEDEP}]
+ dev-python/testpath[${PYTHON_USEDEP}]
+ www-servers/tornado[${PYTHON_USEDEP}]
+"
+BDEPEND="
+ test? (
+ dev-python/pebble[${PYTHON_USEDEP}]
+ dev-python/ipykernel[${PYTHON_USEDEP}]
+ dev-python/ipywidgets[${PYTHON_USEDEP}]
+ >=dev-python/jupyter_client-4.2[${PYTHON_USEDEP}]
+ media-gfx/inkscape
+ )
+"
+
+distutils_enable_tests pytest
+
+src_test() {
+ mkdir -p "${HOME}/.local" || die
+ cp -r share "${HOME}/.local/" || die
+ distutils-r1_src_test
+}
+
+python_test() {
+ local deselect=(
+ # Missing pyppeteer for now
+ # TODO: Doesn't skip?
+ --deselect exporters/tests/test_webpdf.py
+ # Needs pyppeteer too
+ --deselect 'tests/test_nbconvertapp.py::TestNbConvertApp::test_webpdf_with_chromium'
+ )
+
+ distutils_install_for_testing bdist_egg
+ cd "${TEST_DIR}"/lib || die
+ pytest -vv "${deselect[@]}" --pyargs nbconvert || die "Tests failed with ${EPYTHON}"
+}
+
+pkg_postinst() {
+ if ! has_version app-text/pandoc ; then
+ einfo "Pandoc is required for converting to formats other than Python,"
+ einfo "HTML, and Markdown. If you need this functionality, install"
+ einfo "app-text/pandoc."
+ fi
+}
diff --git a/dev-python/nbconvert/nbconvert-6.0.6.ebuild b/dev-python/nbconvert/nbconvert-6.0.6.ebuild
new file mode 100644
index 000000000000..58b0853ec91c
--- /dev/null
+++ b/dev-python/nbconvert/nbconvert-6.0.6.ebuild
@@ -0,0 +1,73 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+DISTUTILS_USE_SETUPTOOLS=rdepend
+PYTHON_COMPAT=( python3_{7..9} )
+
+inherit distutils-r1
+
+DESCRIPTION="Converting Jupyter Notebooks"
+HOMEPAGE="https://nbconvert.readthedocs.io/"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~arm64 ~x86"
+
+RDEPEND="
+ dev-python/bleach[${PYTHON_USEDEP}]
+ dev-python/defusedxml[${PYTHON_USEDEP}]
+ >=dev-python/entrypoints-0.2.2[${PYTHON_USEDEP}]
+ dev-python/jinja[${PYTHON_USEDEP}]
+ dev-python/jupyter_core[${PYTHON_USEDEP}]
+ dev-python/jupyterlab_pygments[${PYTHON_USEDEP}]
+ >=dev-python/mistune-0.7.4[${PYTHON_USEDEP}]
+ dev-python/nbclient[${PYTHON_USEDEP}]
+ dev-python/nbformat[${PYTHON_USEDEP}]
+ >=dev-python/pandocfilters-1.4.1[${PYTHON_USEDEP}]
+ dev-python/pygments[${PYTHON_USEDEP}]
+ >=dev-python/traitlets-4.2.1[${PYTHON_USEDEP}]
+ dev-python/testpath[${PYTHON_USEDEP}]
+ www-servers/tornado[${PYTHON_USEDEP}]
+"
+BDEPEND="
+ test? (
+ dev-python/pebble[${PYTHON_USEDEP}]
+ dev-python/ipykernel[${PYTHON_USEDEP}]
+ dev-python/ipywidgets[${PYTHON_USEDEP}]
+ >=dev-python/jupyter_client-4.2[${PYTHON_USEDEP}]
+ media-gfx/inkscape
+ )
+"
+
+distutils_enable_tests pytest
+
+src_test() {
+ mkdir -p "${HOME}/.local" || die
+ cp -r share "${HOME}/.local/" || die
+ distutils-r1_src_test
+}
+
+python_test() {
+ local deselect=(
+ # Missing pyppeteer for now
+ # TODO: Doesn't skip?
+ --deselect exporters/tests/test_webpdf.py
+ # Needs pyppeteer too
+ --deselect 'tests/test_nbconvertapp.py::TestNbConvertApp::test_webpdf_with_chromium'
+ )
+
+ distutils_install_for_testing bdist_egg
+ cd "${TEST_DIR}"/lib || die
+ pytest -vv "${deselect[@]}" --pyargs nbconvert || die "Tests failed with ${EPYTHON}"
+}
+
+pkg_postinst() {
+ if ! has_version app-text/pandoc ; then
+ einfo "Pandoc is required for converting to formats other than Python,"
+ einfo "HTML, and Markdown. If you need this functionality, install"
+ einfo "app-text/pandoc."
+ fi
+}
diff --git a/dev-python/networkx/metadata.xml b/dev-python/networkx/metadata.xml
index 9b4b8c4f40d2..1183be08b85b 100644
--- a/dev-python/networkx/metadata.xml
+++ b/dev-python/networkx/metadata.xml
@@ -16,6 +16,7 @@
The potential audience for NetworkX includes: mathematicians, physicists,
biologists, computer scientists, social scientists.
+
networkx
networkx/networkx
diff --git a/dev-python/networkx/networkx-2.5.ebuild b/dev-python/networkx/networkx-2.5.ebuild
index e3df9c8c3bcf..452500338b0e 100644
--- a/dev-python/networkx/networkx-2.5.ebuild
+++ b/dev-python/networkx/networkx-2.5.ebuild
@@ -12,7 +12,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
LICENSE="BSD"
SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
+KEYWORDS="amd64 ~arm ~arm64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
IUSE="examples extras pandas scipy test xml yaml"
RESTRICT="!test? ( test )"
diff --git a/dev-python/numpy/numpy-1.19.1.ebuild b/dev-python/numpy/numpy-1.19.1.ebuild
index 48984ec1246c..d550852de8d8 100644
--- a/dev-python/numpy/numpy-1.19.1.ebuild
+++ b/dev-python/numpy/numpy-1.19.1.ebuild
@@ -24,7 +24,7 @@ SRC_URI="
)"
LICENSE="BSD"
SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
IUSE="doc lapack"
RDEPEND="
diff --git a/dev-python/pandas/pandas-1.1.1.ebuild b/dev-python/pandas/pandas-1.1.1.ebuild
index fac714b52820..347189e62999 100644
--- a/dev-python/pandas/pandas-1.1.1.ebuild
+++ b/dev-python/pandas/pandas-1.1.1.ebuild
@@ -18,7 +18,7 @@ S="${WORKDIR}/${P/_/}"
SLOT="0"
LICENSE="BSD"
-KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+KEYWORDS="~amd64 ~arm ~arm64 x86"
IUSE="doc full-support minimal test X"
RESTRICT="!test? ( test )"
diff --git a/dev-python/process-tests/process-tests-2.1.1.ebuild b/dev-python/process-tests/process-tests-2.1.1.ebuild
index bd0aebc70432..b38f6e259400 100644
--- a/dev-python/process-tests/process-tests-2.1.1.ebuild
+++ b/dev-python/process-tests/process-tests-2.1.1.ebuild
@@ -13,7 +13,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
SLOT="0"
LICENSE="BSD"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha ~amd64 arm ~arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv s390 sparc x86 ~amd64-linux ~x86-linux"
# There are no tests at all, under TODO
# see https://pypi.org/project/process-tests/2.0.2/
diff --git a/dev-python/protobuf-python/files/protobuf-python-3.13.0-google.protobuf.pyext._message.PyUnknownFieldRef.patch b/dev-python/protobuf-python/files/protobuf-python-3.13.0-google.protobuf.pyext._message.PyUnknownFieldRef.patch
new file mode 100644
index 000000000000..68318320b909
--- /dev/null
+++ b/dev-python/protobuf-python/files/protobuf-python-3.13.0-google.protobuf.pyext._message.PyUnknownFieldRef.patch
@@ -0,0 +1,22 @@
+https://github.com/protocolbuffers/protobuf/issues/6205
+https://github.com/protocolbuffers/protobuf/pull/7016
+
+--- /python/google/protobuf/pyext/unknown_fields.cc
++++ /python/google/protobuf/pyext/unknown_fields.cc
+@@ -277,13 +277,13 @@
+ PyObject* data = NULL;
+ switch (field->type()) {
+ case UnknownField::TYPE_VARINT:
+- data = PyInt_FromLong(field->varint());
++ data = PyLong_FromUnsignedLongLong(field->varint());
+ break;
+ case UnknownField::TYPE_FIXED32:
+- data = PyInt_FromLong(field->fixed32());
++ data = PyLong_FromUnsignedLong(field->fixed32());
+ break;
+ case UnknownField::TYPE_FIXED64:
+- data = PyInt_FromLong(field->fixed64());
++ data = PyLong_FromUnsignedLongLong(field->fixed64());
+ break;
+ case UnknownField::TYPE_LENGTH_DELIMITED:
+ data = PyBytes_FromStringAndSize(field->length_delimited().data(),
diff --git a/dev-python/protobuf-python/protobuf-python-3.11.4.ebuild b/dev-python/protobuf-python/protobuf-python-3.11.4.ebuild
index d95a668e36a0..832edea23443 100644
--- a/dev-python/protobuf-python/protobuf-python-3.11.4.ebuild
+++ b/dev-python/protobuf-python/protobuf-python-3.11.4.ebuild
@@ -3,7 +3,7 @@
EAPI="7"
PYTHON_COMPAT=(python{2_7,3_6,3_7,3_8})
-DISTUTILS_USE_SETUPTOOLS="manual"
+DISTUTILS_USE_SETUPTOOLS="rdepend"
inherit distutils-r1
@@ -30,7 +30,6 @@ IUSE=""
BDEPEND="${PYTHON_DEPS}
~dev-libs/protobuf-${PV}
dev-python/namespace-google[${PYTHON_USEDEP}]
- dev-python/setuptools[${PYTHON_USEDEP}]
dev-python/six[${PYTHON_USEDEP}]"
DEPEND="${PYTHON_DEPS}
~dev-libs/protobuf-${PV}"
@@ -43,6 +42,15 @@ if [[ "${PV}" == "9999" ]]; then
EGIT_CHECKOUT_DIR="${WORKDIR}/protobuf-${PV}"
fi
+python_prepare_all() {
+ pushd "${WORKDIR}/protobuf-${PV}" > /dev/null || die
+ eapply "${FILESDIR}/${PN}-3.13.0-google.protobuf.pyext._message.PyUnknownFieldRef.patch"
+ eapply_user
+ popd > /dev/null || die
+
+ distutils-r1_python_prepare_all
+}
+
python_configure_all() {
mydistutilsargs=(--cpp_implementation)
}
diff --git a/dev-python/protobuf-python/protobuf-python-3.12.2.ebuild b/dev-python/protobuf-python/protobuf-python-3.12.2.ebuild
index a6ada7b300a8..ccd1e09b3679 100644
--- a/dev-python/protobuf-python/protobuf-python-3.12.2.ebuild
+++ b/dev-python/protobuf-python/protobuf-python-3.12.2.ebuild
@@ -3,7 +3,7 @@
EAPI="7"
PYTHON_COMPAT=(python{2_7,3_{6..9}})
-DISTUTILS_USE_SETUPTOOLS="manual"
+DISTUTILS_USE_SETUPTOOLS="rdepend"
inherit distutils-r1
@@ -30,7 +30,6 @@ IUSE=""
BDEPEND="${PYTHON_DEPS}
~dev-libs/protobuf-${PV}
dev-python/namespace-google[${PYTHON_USEDEP}]
- dev-python/setuptools[${PYTHON_USEDEP}]
dev-python/six[${PYTHON_USEDEP}]"
DEPEND="${PYTHON_DEPS}
~dev-libs/protobuf-${PV}"
@@ -43,6 +42,15 @@ if [[ "${PV}" == "9999" ]]; then
EGIT_CHECKOUT_DIR="${WORKDIR}/protobuf-${PV}"
fi
+python_prepare_all() {
+ pushd "${WORKDIR}/protobuf-${PV}" > /dev/null || die
+ eapply "${FILESDIR}/${PN}-3.13.0-google.protobuf.pyext._message.PyUnknownFieldRef.patch"
+ eapply_user
+ popd > /dev/null || die
+
+ distutils-r1_python_prepare_all
+}
+
python_configure_all() {
mydistutilsargs=(--cpp_implementation)
}
diff --git a/dev-python/protobuf-python/protobuf-python-3.12.4.ebuild b/dev-python/protobuf-python/protobuf-python-3.12.4.ebuild
index 45575c8ab012..33a2a3bc672d 100644
--- a/dev-python/protobuf-python/protobuf-python-3.12.4.ebuild
+++ b/dev-python/protobuf-python/protobuf-python-3.12.4.ebuild
@@ -3,7 +3,7 @@
EAPI="7"
PYTHON_COMPAT=(python{2_7,3_6,3_7,3_8,3_9})
-DISTUTILS_USE_SETUPTOOLS="manual"
+DISTUTILS_USE_SETUPTOOLS="rdepend"
inherit distutils-r1
@@ -24,13 +24,12 @@ fi
LICENSE="BSD"
SLOT="0/23"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~x64-macos ~x86-macos"
+KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc x86 ~amd64-linux ~x86-linux ~x64-macos ~x86-macos"
IUSE=""
BDEPEND="${PYTHON_DEPS}
~dev-libs/protobuf-${PV}
dev-python/namespace-google[${PYTHON_USEDEP}]
- dev-python/setuptools[${PYTHON_USEDEP}]
dev-python/six[${PYTHON_USEDEP}]"
DEPEND="${PYTHON_DEPS}
~dev-libs/protobuf-${PV}"
@@ -43,6 +42,15 @@ if [[ "${PV}" == "9999" ]]; then
EGIT_CHECKOUT_DIR="${WORKDIR}/protobuf-${PV}"
fi
+python_prepare_all() {
+ pushd "${WORKDIR}/protobuf-${PV}" > /dev/null || die
+ eapply "${FILESDIR}/${PN}-3.13.0-google.protobuf.pyext._message.PyUnknownFieldRef.patch"
+ eapply_user
+ popd > /dev/null || die
+
+ distutils-r1_python_prepare_all
+}
+
python_configure_all() {
mydistutilsargs=(--cpp_implementation)
}
diff --git a/dev-python/protobuf-python/protobuf-python-3.13.0.ebuild b/dev-python/protobuf-python/protobuf-python-3.13.0.ebuild
index 51f7d5f7b7f2..d7e474dcdb9f 100644
--- a/dev-python/protobuf-python/protobuf-python-3.13.0.ebuild
+++ b/dev-python/protobuf-python/protobuf-python-3.13.0.ebuild
@@ -2,9 +2,8 @@
# Distributed under the terms of the GNU General Public License v2
EAPI="7"
-
-DISTUTILS_USE_SETUPTOOLS=rdepend
PYTHON_COMPAT=(python{2_7,3_6,3_7,3_8,3_9})
+DISTUTILS_USE_SETUPTOOLS="rdepend"
inherit distutils-r1
@@ -44,6 +43,11 @@ if [[ "${PV}" == "9999" ]]; then
fi
python_prepare_all() {
+ pushd "${WORKDIR}/protobuf-${PV}" > /dev/null || die
+ eapply "${FILESDIR}/${PN}-3.13.0-google.protobuf.pyext._message.PyUnknownFieldRef.patch"
+ eapply_user
+ popd > /dev/null || die
+
distutils-r1_python_prepare_all
sed -e "/^[[:space:]]*setup_requires = \['wheel'\],$/d" -i setup.py || die
diff --git a/dev-python/protobuf-python/protobuf-python-9999.ebuild b/dev-python/protobuf-python/protobuf-python-9999.ebuild
index fc808ec3a2a3..77f252e252b3 100644
--- a/dev-python/protobuf-python/protobuf-python-9999.ebuild
+++ b/dev-python/protobuf-python/protobuf-python-9999.ebuild
@@ -2,9 +2,8 @@
# Distributed under the terms of the GNU General Public License v2
EAPI="7"
-
-DISTUTILS_USE_SETUPTOOLS=rdepend
PYTHON_COMPAT=(python{2_7,3_6,3_7,3_8,3_9})
+DISTUTILS_USE_SETUPTOOLS="rdepend"
inherit distutils-r1
@@ -44,6 +43,11 @@ if [[ "${PV}" == "9999" ]]; then
fi
python_prepare_all() {
+ pushd "${WORKDIR}/protobuf-${PV}" > /dev/null || die
+ eapply "${FILESDIR}/${PN}-3.13.0-google.protobuf.pyext._message.PyUnknownFieldRef.patch"
+ eapply_user
+ popd > /dev/null || die
+
distutils-r1_python_prepare_all
sed -e "/^[[:space:]]*setup_requires = \['wheel'\],$/d" -i setup.py || die
diff --git a/dev-python/pyglet/pyglet-1.5.7.ebuild b/dev-python/pyglet/pyglet-1.5.7-r1.ebuild
similarity index 98%
rename from dev-python/pyglet/pyglet-1.5.7.ebuild
rename to dev-python/pyglet/pyglet-1.5.7-r1.ebuild
index 5251ca366911..13aa03ae4b4a 100644
--- a/dev-python/pyglet/pyglet-1.5.7.ebuild
+++ b/dev-python/pyglet/pyglet-1.5.7-r1.ebuild
@@ -23,6 +23,7 @@ BDEPEND="
)
"
RDEPEND="
+ virtual/glu
virtual/opengl
image? ( || (
dev-python/pillow[${PYTHON_USEDEP}]
diff --git a/dev-python/pygraphviz/pygraphviz-1.6.ebuild b/dev-python/pygraphviz/pygraphviz-1.6.ebuild
index e53d8c412382..3caab34f5442 100644
--- a/dev-python/pygraphviz/pygraphviz-1.6.ebuild
+++ b/dev-python/pygraphviz/pygraphviz-1.6.ebuild
@@ -13,7 +13,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.zip"
LICENSE="BSD"
SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86 ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
+KEYWORDS="~amd64 ~arm ~arm64 ppc ~ppc64 x86 ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
# Note: only C API of graphviz is used, PYTHON_USEDEP unnecessary.
RDEPEND="media-gfx/graphviz"
diff --git a/dev-python/pyh2o/Manifest b/dev-python/pyh2o/Manifest
index e69de29bb2d1..8f5b4245b529 100644
--- a/dev-python/pyh2o/Manifest
+++ b/dev-python/pyh2o/Manifest
@@ -0,0 +1 @@
+DIST pyh2o-1.tar.gz 7327 BLAKE2B 9d6b308d17dd799e2c83a191c346a3d78fc0a097de2a2fd5cb6277a1525992aa18f6c6b61b2c2503ae4a9e7ddd3575e092aef77a0e84223a5a2c702c0a808f1d SHA512 529fa4d8e9c477346fcbd23d7172d41de96789797f0e1ad0557f4c0bdaea8a519a8e8735845d0080cf171182874ce0819e76357ca7c7db1d62a9544f907095db
diff --git a/dev-python/pyh2o/pyh2o-9999.ebuild b/dev-python/pyh2o/pyh2o-1.ebuild
similarity index 56%
rename from dev-python/pyh2o/pyh2o-9999.ebuild
rename to dev-python/pyh2o/pyh2o-1.ebuild
index 1da3c13679c3..f8392f678f6c 100644
--- a/dev-python/pyh2o/pyh2o-9999.ebuild
+++ b/dev-python/pyh2o/pyh2o-1.ebuild
@@ -2,19 +2,22 @@
# Distributed under the terms of the GNU General Public License v2
EAPI=7
-PYTHON_COMPAT=( python3_{6,7,8} )
-inherit distutils-r1 git-r3
+DISTUTILS_USE_SETUPTOOLS=no
+PYTHON_COMPAT=( python3_{6..9} )
+
+inherit distutils-r1
DESCRIPTION="Python API for sci-libs/libh2o"
HOMEPAGE="https://github.com/mgorny/pyh2o/"
-SRC_URI=""
-EGIT_REPO_URI="https://github.com/mgorny/pyh2o.git"
+SRC_URI="
+ https://github.com/mgorny/pyh2o/archive/v${PV}.tar.gz -> ${P}.tar.gz"
LICENSE="BSD"
SLOT="0"
-KEYWORDS=""
-IUSE=""
+KEYWORDS="~amd64 ~x86"
RDEPEND=">=sci-libs/libh2o-0.2.1:="
DEPEND="${RDEPEND}"
+
+distutils_enable_tests pytest
diff --git a/dev-python/pymysql/metadata.xml b/dev-python/pymysql/metadata.xml
index 365b14f4cc88..1a0959784174 100644
--- a/dev-python/pymysql/metadata.xml
+++ b/dev-python/pymysql/metadata.xml
@@ -9,6 +9,7 @@
python@gentoo.org
Python
+
PyMySQL/PyMySQL
diff --git a/dev-python/pytest-xdist/pytest-xdist-2.1.0.ebuild b/dev-python/pytest-xdist/pytest-xdist-2.1.0.ebuild
index 75f1a49f1a2f..ef6d90f384cc 100644
--- a/dev-python/pytest-xdist/pytest-xdist-2.1.0.ebuild
+++ b/dev-python/pytest-xdist/pytest-xdist-2.1.0.ebuild
@@ -13,7 +13,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
SLOT="0"
LICENSE="MIT"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ppc ppc64 ~riscv ~s390 sparc x86"
# please do not depend on pytest to avoid unnecessary USEDEP enforcement
RDEPEND="
diff --git a/dev-python/pytest/pytest-6.0.1.ebuild b/dev-python/pytest/pytest-6.0.1.ebuild
index ef8c99c827b4..24afe199a799 100644
--- a/dev-python/pytest/pytest-6.0.1.ebuild
+++ b/dev-python/pytest/pytest-6.0.1.ebuild
@@ -14,7 +14,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
LICENSE="MIT"
SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc64 ~riscv ~sparc ~x86"
+KEYWORDS="~amd64 arm ~arm64 ~hppa ~ia64 ~ppc64 ~riscv ~sparc x86"
IUSE="test"
RESTRICT="!test? ( test )"
diff --git a/dev-python/python-efl/files/python-efl-1.24-clang.patch b/dev-python/python-efl/files/python-efl-1.24-clang.patch
index 7702c38d9f3e..a6f18d866300 100644
--- a/dev-python/python-efl/files/python-efl-1.24-clang.patch
+++ b/dev-python/python-efl/files/python-efl-1.24-clang.patch
@@ -1,21 +1,7 @@
-From 5a02f132107abc6a7d022eb349f7ff6338b71feb Mon Sep 17 00:00:00 2001
-From: Dave Andreoli
-Date: Thu, 25 Jun 2020 18:54:03 +0200
-Subject: Do not fail when build with CC="clang"
-
-clang seems much better in building elementary, while gcc need a lot
-of ram and tend to fail badly
-
-So for now on clang is the suggested compiler to use
----
- setup.py | 16 ++++++++++------
- 1 file changed, 10 insertions(+), 6 deletions(-)
-
-diff --git a/setup.py b/setup.py
-index 3ed0028..a863a19 100755
---- a/setup.py
-+++ b/setup.py
-@@ -211,13 +211,17 @@ ext_modules = []
+diff -Naur a/setup.py b/setup.py
+--- a/setup.py 2020-04-23 08:20:55.742402600 +0300
++++ b/setup.py 2020-09-22 08:29:43.065243208 +0300
+@@ -211,13 +211,21 @@
py_modules = []
packages = ["efl"]
common_cflags = [
@@ -35,10 +21,11 @@ index 3ed0028..a863a19 100755
+# remove clang unknown flags
+if os.getenv("CC") == "clang":
+ common_cflags.remove('-fno-var-tracking-assignments')
++if os.getenv("CC") == "x86_64-pc-linux-gnu-clang":
++ common_cflags.remove('-fno-var-tracking-assignments')
++if os.getenv("CC") == "i686-pc-linux-gnu-clang":
++ common_cflags.remove('-fno-var-tracking-assignments')
+
if set(("build", "build_ext", "install", "bdist", "sdist")) & set(sys.argv):
sys.stdout.write("Python-EFL: %s\n" % RELEASE)
---
-cgit v1.2.1
-
diff --git a/dev-python/python-jsonrpc-server/Manifest b/dev-python/python-jsonrpc-server/Manifest
index 31efd0bc4240..f6e2573f25eb 100644
--- a/dev-python/python-jsonrpc-server/Manifest
+++ b/dev-python/python-jsonrpc-server/Manifest
@@ -1 +1,2 @@
DIST python-jsonrpc-server-0.3.4.tar.gz 26123 BLAKE2B 5d3c7b910cc91999f7f03a70a1f954decd11801b4dad39cb940625a3456fb69a8e6a146c128d29d347f1513a9f27208f1f39208d3449443be8278e0d175e6598 SHA512 a00af318baf89fe38ececc2080d7b3af8c2476280f9eb89670e5b0d3ceac046573be964bc2882c1b1894edc8ab4cb5fd69366980abe17bb1df857181821bcbd0
+DIST python-jsonrpc-server-0.4.0.tar.gz 26491 BLAKE2B 524dbd0692861bff538d9db06facda4bdad74c84d3c047a374db658adc31eeb799ba0c4b0219597b04c75cd6e2db3968ba0cf4084ba235509c2457c22b3e1497 SHA512 062e5b75253b95e64918a9da86ad7e29d8a29019670e451b9a28d44cde064339953004c343be0e7dd40968ec9fc2420b5722265f56c2db8057d0f1eaf088dacc
diff --git a/dev-python/python-jsonrpc-server/python-jsonrpc-server-0.4.0.ebuild b/dev-python/python-jsonrpc-server/python-jsonrpc-server-0.4.0.ebuild
new file mode 100644
index 000000000000..858c1bae05a0
--- /dev/null
+++ b/dev-python/python-jsonrpc-server/python-jsonrpc-server-0.4.0.ebuild
@@ -0,0 +1,37 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{7,8,9} )
+
+inherit distutils-r1
+
+DESCRIPTION="A Python 2 and 3 asynchronous JSON RPC server"
+HOMEPAGE="https://github.com/palantir/python-jsonrpc-server"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+BDEPEND="dev-python/versioneer[${PYTHON_USEDEP}]
+ test? (
+ dev-python/mock[${PYTHON_USEDEP}]
+ dev-python/pycodestyle[${PYTHON_USEDEP}]
+)"
+
+RDEPEND="~dev-python/ujson-1.35[${PYTHON_USEDEP}]"
+
+distutils_enable_tests pytest
+
+python_prepare_all() {
+ # Remove pytest-cov dep
+ sed -i -e '0,/addopts/I!d' setup.cfg || die
+
+ # jsonrpc-server does not actually work with ujson>3.0.0: tests fail
+ sed -i -e 's/ujson>=3.0.0/ujson==1.35/g' setup.py || die
+ sed -i -e 's/ujson>=3.0.0/ujson==1.35/g' python_jsonrpc_server.egg-info/requires.txt || die
+
+ distutils-r1_python_prepare_all
+}
diff --git a/dev-python/python-language-server/Manifest b/dev-python/python-language-server/Manifest
index a73cd14e3ccf..b0c0516bc628 100644
--- a/dev-python/python-language-server/Manifest
+++ b/dev-python/python-language-server/Manifest
@@ -1 +1,2 @@
DIST python-language-server-0.34.1.tar.gz 70238 BLAKE2B 55ec41875907bb6c09f682c8ce6165e7e2fab5d03c3d4758bcbe658968aeeee7f0316a472efe68ddd87872b0e2d34908c8a7e9528aa5eec6d3359b2565a2cbbc SHA512 12404753f4271ec3606cee535ba8e886037bf0c61cc5c4415358066be837e2248f6393124340551387cba7351dee924b4f5ebc9c4e35b1ab0943067968967a90
+DIST python-language-server-0.35.1.tar.gz 72944 BLAKE2B fe469e5365dec4a2192a2ca2f75fc9f05476434c0f6db26d851521149053455b256678ed98c5f1209d30b262808b615a3f7ac77fb604adf1455203e40f93c96f SHA512 278f281c8c82729ad60db2785b3f4b64568de529edb7a6f1b5683d09838ea43ed79182c50e42210e766b9a3f3c10b0c0256121b9925803c45f9e948f144ca994
diff --git a/dev-python/python-language-server/python-language-server-0.34.1.ebuild b/dev-python/python-language-server/python-language-server-0.34.1.ebuild
index 03dbc1d1dd8d..362f4d094a9e 100644
--- a/dev-python/python-language-server/python-language-server-0.34.1.ebuild
+++ b/dev-python/python-language-server/python-language-server-0.34.1.ebuild
@@ -15,7 +15,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
LICENSE="MIT"
SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="~amd64 x86"
BDEPEND="dev-python/versioneer[${PYTHON_USEDEP}]"
diff --git a/dev-python/python-language-server/python-language-server-0.35.1.ebuild b/dev-python/python-language-server/python-language-server-0.35.1.ebuild
new file mode 100644
index 000000000000..947c489ba063
--- /dev/null
+++ b/dev-python/python-language-server/python-language-server-0.35.1.ebuild
@@ -0,0 +1,74 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{7,8} )
+
+DISTUTILS_USE_SETUPTOOLS=rdepend
+
+inherit distutils-r1 optfeature
+
+DESCRIPTION="An implementation of the Language Server Protocol for Python"
+HOMEPAGE="https://github.com/palantir/python-language-server"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+BDEPEND="dev-python/versioneer[${PYTHON_USEDEP}]
+ test? (
+ dev-python/autopep8[${PYTHON_USEDEP}]
+ dev-python/flaky[${PYTHON_USEDEP}]
+ >=dev-python/flake8-3.8.0[${PYTHON_USEDEP}]
+ dev-python/matplotlib[${PYTHON_USEDEP}]
+ >=dev-python/mccabe-0.6.0[${PYTHON_USEDEP}]
+ =dev-python/pycodestyle-2.6.0[${PYTHON_USEDEP}]
+ =dev-python/pydocstyle-2.0.0[${PYTHON_USEDEP}]
+ >=dev-python/pyflakes-2.2.0[${PYTHON_USEDEP}]
+ =dev-python/pylint-2.5.0[${PYTHON_USEDEP}]
+ dev-python/QtPy[gui,testlib,${PYTHON_USEDEP}]
+ >=dev-python/rope-0.10.5[${PYTHON_USEDEP}]
+ dev-python/yapf[${PYTHON_USEDEP}]
+)"
+
+RDEPEND="
+ >=dev-python/jedi-0.17.0[${PYTHON_USEDEP}]
+ =dev-python/python-jsonrpc-server-0.4.0[${PYTHON_USEDEP}]
+ ~dev-python/ujson-1.35[${PYTHON_USEDEP}]
+"
+
+distutils_enable_tests pytest
+
+python_prepare_all() {
+ # remove pytest-cov dep
+ sed -i -e '0,/addopts/I!d' setup.cfg || die
+
+ # jsonrpc-server does not actually work with ujson>3.0.0: test fail
+ sed -i -e 's/ujson>=3.0.0/ujson==1.35/g' setup.py || die
+ sed -i -e 's/ujson>=3.0.0/ujson==1.35/g' python_language_server.egg-info/requires.txt || die
+
+ distutils-r1_python_prepare_all
+}
+
+pkg_postinst() {
+ elog "To get additional features, optional runtime dependencies may be installed:"
+ optfeature "Automatically formats Python code to conform to the PEP 8 style guide" dev-python/autopep8
+ optfeature "A wrapper around PyFlakes, pep8 & mccabe" dev-python/flake8
+ optfeature "flake8 plugin: McCabe complexity checker" dev-python/mccabe
+ optfeature "Python style guide checker (fka pep8)" dev-python/pycodestyle
+ optfeature "Python docstring style checker" dev-python/pydocstyle
+ optfeature "Passive checker for Python programs" dev-python/pyflakes
+ optfeature "Python code static checker" dev-python/pylint
+ optfeature "Python refactoring library" dev-python/rope
+ optfeature "A formatter for Python files" dev-python/yapf
+}
diff --git a/dev-python/qtsass/qtsass-0.3.0.ebuild b/dev-python/qtsass/qtsass-0.3.0.ebuild
index 55b1d70e7d73..47eeabc1bdd5 100644
--- a/dev-python/qtsass/qtsass-0.3.0.ebuild
+++ b/dev-python/qtsass/qtsass-0.3.0.ebuild
@@ -15,7 +15,7 @@ SRC_URI="https://github.com/spyder-ide/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.g
LICENSE="MIT"
SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
DEPEND="dev-python/libsass[${PYTHON_USEDEP}]"
diff --git a/dev-python/reportlab/reportlab-3.5.48.ebuild b/dev-python/reportlab/reportlab-3.5.48.ebuild
index 292bdd0ebb40..0f5eb0960b35 100644
--- a/dev-python/reportlab/reportlab-3.5.48.ebuild
+++ b/dev-python/reportlab/reportlab-3.5.48.ebuild
@@ -17,7 +17,7 @@ SRC_URI="
LICENSE="BSD"
SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha ~amd64 arm ~arm64 ~hppa ~ia64 ppc ppc64 ~sparc x86 ~amd64-linux ~x86-linux"
IUSE="test"
RESTRICT="!test? ( test )"
diff --git a/dev-python/responses/responses-0.12.0.ebuild b/dev-python/responses/responses-0.12.0.ebuild
index d950831eb075..54f6f3eefa3f 100644
--- a/dev-python/responses/responses-0.12.0.ebuild
+++ b/dev-python/responses/responses-0.12.0.ebuild
@@ -12,7 +12,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
LICENSE="Apache-2.0"
SLOT="0"
-KEYWORDS="~amd64 arm arm64 hppa ~ia64 ppc ppc64 sparc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 arm arm64 hppa ~ia64 ppc ppc64 ~riscv sparc x86 ~amd64-linux ~x86-linux"
IUSE="test"
RDEPEND="
diff --git a/dev-python/retrying/Manifest b/dev-python/retrying/Manifest
index ef840b4c0d4b..8044ec16f43a 100644
--- a/dev-python/retrying/Manifest
+++ b/dev-python/retrying/Manifest
@@ -1 +1 @@
-DIST retrying-1.3.3.tar.gz 10890 BLAKE2B b7f2dd9488e99089e842f832666c6b71f94cb7fa9394bd504c27b5bb83fac2eb3dd1b7ed59cabe0c74a17c17483520502b65027d36887580744621d1776a2342 SHA512 99b81560caf63416f0301721ed9b9f9e3527a2fee4c53aeb0630b6e860ed81baf4b12b9819ca5b81346d45c4f40dfcb479a0b25305da1f560657fd3fdf2ffa75
+DIST retrying-1.3.3.tar.gz 11648 BLAKE2B 2c518ca887dddc35bad421ad75c76cb88f08a0965272816af8667b1b151eca2dda1b0b198607f26dcda2df547ba2cb317ac927ebfc5891cd8c6203ded619f1e1 SHA512 e053e62cb71b31573b89b8fffa706c3410794b5cced829582c373a09af78158f7a16948e6ce52078589cf7d8f5bba726c889180588a2628be343f242bc40c035
diff --git a/dev-python/retrying/retrying-1.3.3.ebuild b/dev-python/retrying/retrying-1.3.3.ebuild
index a51261d188fa..6af95ca658e4 100644
--- a/dev-python/retrying/retrying-1.3.3.ebuild
+++ b/dev-python/retrying/retrying-1.3.3.ebuild
@@ -2,22 +2,19 @@
# Distributed under the terms of the GNU General Public License v2
EAPI=7
-PYTHON_COMPAT=( python3_{6,7} pypy3 )
+
+PYTHON_COMPAT=( python3_{6..9} pypy3 )
inherit distutils-r1
DESCRIPTION="General-purpose retrying library"
HOMEPAGE="https://github.com/rholder/retrying"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+SRC_URI="https://github.com/rholder/retrying/archive/v${PV}.tar.gz -> ${P}.tar.gz"
LICENSE="Apache-2.0"
SLOT="0"
KEYWORDS="~alpha amd64 arm ~arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~s390 sparc x86"
-IUSE=""
-DEPEND="
- dev-python/setuptools[${PYTHON_USEDEP}]
-"
-RDEPEND="
- >=dev-python/six-1.7.0[${PYTHON_USEDEP}]
-"
+RDEPEND=">=dev-python/six-1.7.0[${PYTHON_USEDEP}]"
+
+distutils_enable_tests unittest
diff --git a/dev-python/sentry-sdk/Manifest b/dev-python/sentry-sdk/Manifest
index c49f15bd3882..08ddd53d261f 100644
--- a/dev-python/sentry-sdk/Manifest
+++ b/dev-python/sentry-sdk/Manifest
@@ -1,2 +1,4 @@
DIST sentry-sdk-0.16.3.tar.gz 170145 BLAKE2B bf619313fb3f49800f5384f0dfec3aa34ef4bb030c5e038a485a8861a733a537ee7c834c8c200a2244335c3c61e7d564005b81d4e5c5f603d2864b2a943a5384 SHA512 e8589f7bd433d4aff068099e860c0cf012fc88dc63806873573a338bb91848d73e0a2af76dad0a5e023a1b25b0be85507346b77dec5c5a265942005219541699
DIST sentry-sdk-0.17.6.tar.gz 183157 BLAKE2B ea0f6af54c31abc785274fc75238a02b8c9f7a978881a01203e0928e100c18df2257ec4a3cef608141b6846c616566388134a4ec31364f26d0bc2b0fadbb0dac SHA512 1af433b5c2311612ad650ea196ddfedb444e9ccb424df72422759f8647fe6cc22bb81a15933f2716cf40313ce3b2e262c077168aa831758d057a1f2e5e1499ff
+DIST sentry-sdk-0.17.7.tar.gz 184034 BLAKE2B de71b2e270594abe2e16d7e2fb9db3028e3c2abd4539269562e8786e6d937352153da21d6366d5e0384e3de1dbd6fbabe3d5060a6f0f9953bd260fbd865c893d SHA512 2360321ec0231ba76c968ff4e6dc78d42a48106aa6aade73a1c1194f9406fbafea3b533994da42027b3479302756ed3ec6e44ce551cb01ce60397939beaeb6d4
+DIST sentry-sdk-0.17.8.tar.gz 184271 BLAKE2B d34f881632e66d5db5cad0c6979de6c3c6205119af30b34996122ff7aff1ed7c3dd0c1603e57163f5d72c8525921f9af7c3e1c729adb14b43dbcee0aa4bd9fc5 SHA512 84ae0ca888457ed833b416320c45040e522a656d7c3ca0d64639f179e7be3237f53cfe4827e986a50d37bd7b61da765ed8c00ea663d478874cc47623ccf47a51
diff --git a/dev-python/sentry-sdk/sentry-sdk-0.17.7.ebuild b/dev-python/sentry-sdk/sentry-sdk-0.17.7.ebuild
new file mode 100644
index 000000000000..1e52e8d55106
--- /dev/null
+++ b/dev-python/sentry-sdk/sentry-sdk-0.17.7.ebuild
@@ -0,0 +1,85 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{6..9} )
+
+inherit distutils-r1
+
+DESCRIPTION="Python client for Sentry"
+HOMEPAGE="https://getsentry.com https://pypi.org/project/sentry-sdk/"
+SRC_URI="https://github.com/getsentry/sentry-python/archive/${PV}.tar.gz -> ${P}.tar.gz"
+S="${WORKDIR}/sentry-python-${PV}"
+
+LICENSE="PSF-2"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86"
+
+RDEPEND="
+ dev-python/urllib3[${PYTHON_USEDEP}]
+ dev-python/certifi[${PYTHON_USEDEP}]
+"
+BDEPEND="
+ test? (
+ dev-python/asttokens[${PYTHON_USEDEP}]
+ =dev-python/jaraco-packaging-3.2" \
+ ">=dev-python/rst-linker-1.9"
+distutils_enable_tests pytest
+
+python_prepare_all() {
+ # Skip a potentially flaky performance test
+ sed -i -e '/^import func_timeout\|^ *@func_timeout\.func_set_timeout/d' \
+ -e 's/test_implied_dirs_performance/_&/' test_zipp.py || die
+ distutils-r1_python_prepare_all
+}
+
+python_test() {
+ # Ignoring zipp.py from ${S} avoids ImportPathMismatchError with Python < 3.8
+ # by ensuring only zipp from ${BUILD_DIR} is loaded
+ pytest --ignore zipp.py -vv || die "Tests fail with ${EPYTHON}"
+}
diff --git a/dev-ruby/Manifest.gz b/dev-ruby/Manifest.gz
index 3d9ca54e665f..74e64163c12f 100644
Binary files a/dev-ruby/Manifest.gz and b/dev-ruby/Manifest.gz differ
diff --git a/dev-ruby/bundler/bundler-2.1.4.ebuild b/dev-ruby/bundler/bundler-2.1.4.ebuild
index a5107b1f839f..5f7ce6757824 100644
--- a/dev-ruby/bundler/bundler-2.1.4.ebuild
+++ b/dev-ruby/bundler/bundler-2.1.4.ebuild
@@ -29,4 +29,4 @@ IUSE="+doc test"
ruby_add_rdepend virtual/rubygems
-RDEPEND+=" dev-vcs/git !!=dev-ruby/coderay-1.1.0 =dev-ruby/coderay-1.1*
diff --git a/dev-ruby/ruby2ruby/ruby2ruby-2.4.4.ebuild b/dev-ruby/ruby2ruby/ruby2ruby-2.4.4.ebuild
index 9b3609e0f520..d44f10f3af2e 100644
--- a/dev-ruby/ruby2ruby/ruby2ruby-2.4.4.ebuild
+++ b/dev-ruby/ruby2ruby/ruby2ruby-2.4.4.ebuild
@@ -14,7 +14,7 @@ HOMEPAGE="https://github.com/seattlerb/ruby2ruby"
LICENSE="GPL-2"
SLOT="2"
-KEYWORDS="~alpha ~amd64 arm ~hppa ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm ~hppa ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris"
IUSE="test"
ruby_add_rdepend "
diff --git a/dev-ruby/ruby_parser/ruby_parser-3.14.2.ebuild b/dev-ruby/ruby_parser/ruby_parser-3.14.2.ebuild
index ccf169068242..217de7cc7ed0 100644
--- a/dev-ruby/ruby_parser/ruby_parser-3.14.2.ebuild
+++ b/dev-ruby/ruby_parser/ruby_parser-3.14.2.ebuild
@@ -14,7 +14,7 @@ HOMEPAGE="https://github.com/seattlerb/ruby_parser"
LICENSE="MIT"
SLOT="3"
-KEYWORDS="~alpha ~amd64 arm hppa ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm hppa ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
IUSE=""
ruby_add_rdepend ">=dev-ruby/sexp_processor-4.9.0:4"
diff --git a/dev-ruby/sexp_processor/sexp_processor-4.15.0.ebuild b/dev-ruby/sexp_processor/sexp_processor-4.15.0.ebuild
index 821f9a8e411a..5ca9606a6375 100644
--- a/dev-ruby/sexp_processor/sexp_processor-4.15.0.ebuild
+++ b/dev-ruby/sexp_processor/sexp_processor-4.15.0.ebuild
@@ -15,7 +15,7 @@ HOMEPAGE="https://www.zenspider.com/projects/sexp_processor.html"
LICENSE="GPL-2"
SLOT="4"
-KEYWORDS="~alpha ~amd64 arm hppa ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm hppa ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
IUSE=""
ruby_add_bdepend "
diff --git a/dev-scheme/Manifest.gz b/dev-scheme/Manifest.gz
index 756cb31f23f3..6fc4fb338555 100644
Binary files a/dev-scheme/Manifest.gz and b/dev-scheme/Manifest.gz differ
diff --git a/dev-scheme/guile/guile-2.2.6.ebuild b/dev-scheme/guile/guile-2.2.6.ebuild
index 64f74ff3c0df..d668bfec4ad1 100644
--- a/dev-scheme/guile/guile-2.2.6.ebuild
+++ b/dev-scheme/guile/guile-2.2.6.ebuild
@@ -10,7 +10,7 @@ SRC_URI="mirror://gnu/guile/${P}.tar.gz"
LICENSE="LGPL-3+"
SLOT="12/2.2-1" # libguile-2.2.so.1 => 2.2-1
-KEYWORDS="~alpha ~amd64 arm arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc x86 ~ppc-aix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv s390 sparc x86 ~ppc-aix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
IUSE="debug debug-malloc +deprecated +networking +nls +regex +threads" # upstream recommended +networking +nls
REQUIRED_USE="regex" # workaround for bug 596322
RESTRICT="strip"
diff --git a/dev-tcltk/Manifest.gz b/dev-tcltk/Manifest.gz
index d368c5df4dba..924e96f15d45 100644
Binary files a/dev-tcltk/Manifest.gz and b/dev-tcltk/Manifest.gz differ
diff --git a/dev-tcltk/snack/snack-2.2.10-r9.ebuild b/dev-tcltk/snack/snack-2.2.10-r9.ebuild
index 57dedee24d99..82c47cba6353 100644
--- a/dev-tcltk/snack/snack-2.2.10-r9.ebuild
+++ b/dev-tcltk/snack/snack-2.2.10-r9.ebuild
@@ -3,7 +3,7 @@
EAPI=7
-PYTHON_COMPAT=( python{2_7,3_7} )
+PYTHON_COMPAT=( python3_7 )
DISTUTILS_USE_SETUPTOOLS=no
DISTUTILS_OPTIONAL=yes
@@ -14,7 +14,7 @@ HOMEPAGE="http://www.speech.kth.se/snack/"
SRC_URI="http://www.speech.kth.se/snack/dist/${PN}${PV}.tar.gz"
LICENSE="GPL-2"
-KEYWORDS="~amd64 hppa ~ppc ~ppc64 sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos"
+KEYWORDS="~amd64 hppa ppc ~ppc64 sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos"
SLOT="0"
IUSE="alsa examples python vorbis"
RESTRICT="!test? ( test )"
diff --git a/dev-util/Manifest.gz b/dev-util/Manifest.gz
index f4e83de078fb..683eb8337e04 100644
Binary files a/dev-util/Manifest.gz and b/dev-util/Manifest.gz differ
diff --git a/dev-util/android-sdk-update-manager/Manifest b/dev-util/android-sdk-update-manager/Manifest
index 5a4fb8ea2af9..9b10cdee2a4c 100644
--- a/dev-util/android-sdk-update-manager/Manifest
+++ b/dev-util/android-sdk-update-manager/Manifest
@@ -1,12 +1 @@
-DIST android-sdk_r21-linux.tgz 91378351 BLAKE2B ed16738d018c3ff8c51bb833ecd329594379280e55e6558a5f5e5731c4e11f6f562675d8a79a252e318b01d5c20f0d13aa2ff6bcd4160a527d85816abb6d94e7 SHA512 3a3338265a2d00f8b7fbb35783d7449498afd8107ddd4ed4c2c34e47582d83eb23f78d02fe01db54c12c48dba0167f60118c1061f1bfeb0048147674fee8d87c
-DIST android-sdk_r21.1-linux.tgz 91617112 BLAKE2B 0b566613d0143b0136844a88f3d4f916a79b4e21588d828bc1bbd037f5290c0a6686cae4de1c34adc3b925132627ee7541501019438b659c12ce5158f82f878d SHA512 160cd51f965a23120cf63abe02b9a9ce8913d1239a848bc423b33ad10eff65b30147c6b11ab751aa12154292ce0a7837aa60def1cd31a2ccb5d4fc6fcb6d2c24
-DIST android-sdk_r22-linux.tgz 99643077 BLAKE2B 58bf529757a4ff0061961be89b080faf8250a0282354bf7742cde395ab2fa91cafd85a36037c02d04fd9bc230437120f4ce91582c9fa2f539a24dd420bf7f025 SHA512 9beda1ae872dde3ca7884d1c389566ce2c8b511ef74d95bc9ddf53683445cc454f9a5a1871a80d5826083d98713040cb1b8b239a77a8eadf56daf30440c7108d
-DIST android-sdk_r22.0.1-linux.tgz 105617062 BLAKE2B 026158fa5be24756f9da3c4dc1258f990d1b04169f6ff88d78da48ebe34e03639b56e77831000ffd805c9057b4d8b561a15ff2919a13b1ae2f4af2b87bbb493f SHA512 7c97ba8daf4a1b8b6e422d8fca21a5e23f3a5e92d769e13ab5e649a967f2662c71ae201a6c1d40202bda98c4fb80eaa60a3ff5e4af9f613cfab1366f63774ac7
-DIST android-sdk_r22.0.4-linux.tgz 105640988 BLAKE2B 30e26a4b23cb44a045353b2878f5c9584dcb783860c42203145471c3c5e384dd979b416661050ec2a294d357f9addc6c8592f3ff8c634cd33bbbf881f15d84d2 SHA512 10e047f6b5384d6c2d3f87e883203f2ab384ac826def16c07f1969d59dc79f97ccba36f0185d564fe0dd4811425fe18767c326b3712ee47b5515f0aba47ed612
-DIST android-sdk_r22.0.5-linux.tgz 105641005 BLAKE2B 938bafd72bb023bf2ae306944035cc77b34dea843e8fa2d22b27b8e76231aa256b0835bcfb83403ba8168f9e78071c5174054eadcfb025f23573bf9c89e863f1 SHA512 655f709994a8c5f9bd78216d8587bda66f23b7fccd556fd78adc989a835540af89529f2fb4d846e28196952a0a3c5bc919563c83fb73e6ecf7a4ad0560eb7f81
-DIST android-sdk_r22.2.1-linux.tgz 100918342 BLAKE2B ddd1bc701c554af04f0c9de995c5f30531a702e5e18eca709265b96210c99afb23092fc975b47c714d26ceb52e8f407b36993405c635be1f6e720f6df4e473f1 SHA512 4eb7087c27db2b2435aa11bba01fccd09617ea58dd84aca8b249d81b3d15c913844d204463a6d83064c6cf8f07e26c0f70130315b281b1bbfd32c01d6e53bfef
-DIST android-sdk_r22.3-linux.tgz 100968558 BLAKE2B 41f853635fba6973a0e78465553ac455fa9a995421327a31d554b80aef0f80305237c8ee2da2440ad27513b0e9b263ebed293f898bca13fedd6e5511e25d1654 SHA512 c05e610e0979f61d217b6612bccd48120719123cf80282cca442e81be6e0c4cfd5a4b3f398d1c8835c86bc67b730a7bf5a5e511abe57a1d70b6c1f62940832a3
-DIST android-sdk_r22.6-linux.tgz 100992666 BLAKE2B f3dd0d6ab53f7323dd911af4e4271cd2169627bd3ebf11901e1afea942b3f4af4b29a9192c88d6c71887a79762d34109666c1fb922d96871ac9126c8398d5baf SHA512 2e632e31725a7c8c5e99cba70388c928d553d52177a2a0d49abfae125d1ccb57857171f10cd28da57664d0d9ab0f7b6ae409c943ad4d4433b05e0b8fb1bfe322
-DIST android-sdk_r22.6.1-linux.tgz 101052129 BLAKE2B b1eb0a3a298bab8f4c4e085831221f795fe0e668ab407d71c2c79778b921d09e57ad393dfe53d34e7d8c49cb05dd655762ca266b82982c898b0eea8f5a0e6035 SHA512 5789a6b11a1a5c18145900042b15707f58afd6db82d345550c33e72cfbaf719c7c16667a7561e4c6ca624c2d2466430db7f8138bf0cd6449762639a63c6cf9ca
-DIST android-sdk_r23-linux.tgz 137880977 BLAKE2B 3a0e0d321bf89bddd4f4e3ed4e6b6ef0276623168d482c0d152f7946b93f8ff72ade780e6c5bdd2dc2ef633bc5df446a640bd52062373fdae162aff71c5ed154 SHA512 c6d8de870e8697b31132b25db93d6b494b44240ca421cab6a48bbf53d142ba488d08ac77a9995ed06953e311dd14ea1ecf4d2039428ed31ab255f9aaaf94ad60
DIST android-sdk_r24.4.1-linux.tgz 326412652 BLAKE2B 4263a5e942f0ee35069f4fc075504c637381820f40485c9753f5f586f713e614c204b3e5c35968acbc665644aaab4c2e05660e00675d956422cd7d1fc6445ed2 SHA512 96fb71d78a8c2833afeba6df617edcd6cc4e37ecd0c3bec38c39e78204ed3c2bd54b138a56086bf5ccd95e372e3c36e72c1550c13df8232ec19537da93049284
diff --git a/dev-util/android-sdk-update-manager/android-sdk-update-manager-21.1.ebuild b/dev-util/android-sdk-update-manager/android-sdk-update-manager-21.1.ebuild
deleted file mode 100644
index 9b40483c021f..000000000000
--- a/dev-util/android-sdk-update-manager/android-sdk-update-manager-21.1.ebuild
+++ /dev/null
@@ -1,99 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-inherit eutils user
-
-MY_P="android-sdk_r${PV}-linux"
-
-DESCRIPTION="Open Handset Alliance's Android SDK"
-HOMEPAGE="https://developer.android.com"
-SRC_URI="https://dl.google.com/android/${MY_P}.tgz"
-IUSE=""
-RESTRICT="mirror"
-
-LICENSE="android"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-
-DEPEND="app-arch/tar
- app-arch/gzip"
-RDEPEND=">=virtual/jdk-1.5
- >=dev-java/ant-core-1.6.5
- >=dev-java/swt-3.5[cairo]
- >=x11-libs/gtk+-2.24.23-r2:2[abi_x86_32(-)]
-"
-
-ANDROID_SDK_DIR="/opt/${PN}"
-QA_FLAGS_IGNORED_x86="
- ${ANDROID_SDK_DIR/\/}/tools/emulator
- ${ANDROID_SDK_DIR/\/}/tools/adb
- ${ANDROID_SDK_DIR/\/}/tools/mksdcard
- ${ANDROID_SDK_DIR/\/}/tools/sqlite3
- ${ANDROID_SDK_DIR/\/}/tools/hprof-conv
- ${ANDROID_SDK_DIR/\/}/tools/zipalign
- ${ANDROID_SDK_DIR/\/}/tools/dmtracedump
-"
-QA_FLAGS_IGNORED_amd64="${QA_FLAGS_IGNORED_x86}"
-
-QA_PREBUILT="${ANDROID_SDK_DIR/\/}/tools/*"
-
-S="${WORKDIR}/android-sdk-linux"
-
-pkg_setup() {
- enewgroup android
-}
-
-src_prepare() {
- rm -rf tools/lib/x86*
-}
-
-src_install() {
- dodoc tools/NOTICE.txt "SDK Readme.txt"
- rm -f tools/NOTICE.txt "SDK Readme.txt"
-
- dodir "${ANDROID_SDK_DIR}/tools"
- cp -pPR tools/* "${ED}${ANDROID_SDK_DIR}/tools" || die "failed to install tools"
-
- # Maybe this is needed for the tools directory too.
- dodir "${ANDROID_SDK_DIR}"/{add-ons,docs,platforms,temp}
-
- fowners root:android "${ANDROID_SDK_DIR}"/{,add-ons,docs,platforms,temp,tools}
- fperms 0775 "${ANDROID_SDK_DIR}"/{,add-ons,docs,platforms,temp,tools}
-
- echo "PATH=\"${EPREFIX}${ANDROID_SDK_DIR}/tools:${EPREFIX}${ANDROID_SDK_DIR}/platform-tools\"" > "${T}/80${PN}" || die
-
- SWT_PATH=
- SWT_VERSIONS="4.2 3.7 3.6 3.5"
- for version in $SWT_VERSIONS; do
- # redirecting stderr to /dev/null
- # not sure if this is best, but avoids misleading error messages
- SWT_PATH="`dirname \`java-config -p swt-\$version 2>/dev/null\` 2>/dev/null`"
- if [ $SWT_PATH ]; then
- einfo "SWT_PATH=$SWT_PATH selecting version $version of SWT."
- break
- fi
- done
-
- echo "ANDROID_SWT=\"${SWT_PATH}\"" >> "${T}/80${PN}" || die
-
- doenvd "${T}/80${PN}"
-
- echo "SEARCH_DIRS_MASK=\"${EPREFIX}${ANDROID_SDK_DIR}\"" > "${T}/80${PN}" || die
-
- insinto "/etc/revdep-rebuild" && doins "${T}/80${PN}"
-
-}
-
-pkg_postinst() {
- elog "The Android SDK now uses its own manager for the development environment."
- elog "Run 'android' to download the full SDK, including some of the platform tools."
- elog "You must be in the android group to manage the development environment."
- elog "Just run 'gpasswd -a android', then have re-login."
- elog "See https://developer.android.com/sdk/adding-components.html for more"
- elog "information."
- elog "If you have problems downloading the SDK, see https://code.google.com/p/android/issues/detail?id=4406"
- elog "You need to run env-update and source /etc/profile in any open shells"
- elog "if you get an SWT error."
-}
diff --git a/dev-util/android-sdk-update-manager/android-sdk-update-manager-21.ebuild b/dev-util/android-sdk-update-manager/android-sdk-update-manager-21.ebuild
deleted file mode 100644
index 28f7786e0f2c..000000000000
--- a/dev-util/android-sdk-update-manager/android-sdk-update-manager-21.ebuild
+++ /dev/null
@@ -1,99 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-inherit eutils user
-
-MY_P="android-sdk_r${PV}-linux"
-
-DESCRIPTION="Open Handset Alliance's Android SDK"
-HOMEPAGE="https://developer.android.com"
-SRC_URI="https://dl.google.com/android/${MY_P}.tgz"
-IUSE=""
-RESTRICT="mirror"
-
-LICENSE="android"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-
-DEPEND="app-arch/tar
- app-arch/gzip"
-RDEPEND="
- >=virtual/jdk-1.5
- >=dev-java/ant-core-1.6.5
- >=dev-java/swt-3.5[cairo]
- >=x11-libs/gtk+-2.24.23-r2:2[abi_x86_32(-)]
-"
-
-ANDROID_SDK_DIR="/opt/${PN}"
-QA_FLAGS_IGNORED_x86="
- ${ANDROID_SDK_DIR/\/}/tools/emulator
- ${ANDROID_SDK_DIR/\/}/tools/adb
- ${ANDROID_SDK_DIR/\/}/tools/mksdcard
- ${ANDROID_SDK_DIR/\/}/tools/sqlite3
- ${ANDROID_SDK_DIR/\/}/tools/hprof-conv
- ${ANDROID_SDK_DIR/\/}/tools/zipalign
- ${ANDROID_SDK_DIR/\/}/tools/dmtracedump
-"
-QA_FLAGS_IGNORED_amd64="${QA_FLAGS_IGNORED_x86}"
-
-QA_PREBUILT="${ANDROID_SDK_DIR/\/}/tools/*"
-
-S="${WORKDIR}/android-sdk-linux"
-
-pkg_setup() {
- enewgroup android
-}
-
-src_prepare() {
- rm -rf tools/lib/x86*
-}
-
-src_install() {
- dodoc tools/NOTICE.txt "SDK Readme.txt"
- rm -f tools/NOTICE.txt "SDK Readme.txt"
-
- dodir "${ANDROID_SDK_DIR}/tools"
- cp -pPR tools/* "${ED}${ANDROID_SDK_DIR}/tools" || die "failed to install tools"
-
- # Maybe this is needed for the tools directory too.
- dodir "${ANDROID_SDK_DIR}"/{add-ons,docs,platforms,temp}
-
- fowners root:android "${ANDROID_SDK_DIR}"/{,add-ons,docs,platforms,temp,tools}
- fperms 0775 "${ANDROID_SDK_DIR}"/{,add-ons,docs,platforms,temp,tools}
-
- echo "PATH=\"${EPREFIX}${ANDROID_SDK_DIR}/tools:${EPREFIX}${ANDROID_SDK_DIR}/platform-tools\"" > "${T}/80${PN}" || die
-
- SWT_PATH=
- SWT_VERSIONS="4.2 3.7 3.6 3.5"
- for version in $SWT_VERSIONS; do
- # redirecting stderr to /dev/null
- # not sure if this is best, but avoids misleading error messages
- SWT_PATH="`dirname \`java-config -p swt-\$version 2>/dev/null\` 2>/dev/null`"
- if [ $SWT_PATH ]; then
- einfo "SWT_PATH=$SWT_PATH selecting version $version of SWT."
- break
- fi
- done
-
- echo "ANDROID_SWT=\"${SWT_PATH}\"" >> "${T}/80${PN}" || die
-
- doenvd "${T}/80${PN}"
-
- echo "SEARCH_DIRS_MASK=\"${EPREFIX}${ANDROID_SDK_DIR}\"" > "${T}/80${PN}" || die
-
- insinto "/etc/revdep-rebuild" && doins "${T}/80${PN}"
-}
-
-pkg_postinst() {
- elog "The Android SDK now uses its own manager for the development environment."
- elog "Run 'android' to download the full SDK, including some of the platform tools."
- elog "You must be in the android group to manage the development environment."
- elog "Just run 'gpasswd -a android', then have re-login."
- elog "See https://developer.android.com/sdk/adding-components.html for more"
- elog "information."
- elog "If you have problems downloading the SDK, see https://code.google.com/p/android/issues/detail?id=4406"
- elog "You need to run env-update and source /etc/profile in any open shells"
- elog "if you get an SWT error."
-}
diff --git a/dev-util/android-sdk-update-manager/android-sdk-update-manager-22.0.1-r1.ebuild b/dev-util/android-sdk-update-manager/android-sdk-update-manager-22.0.1-r1.ebuild
deleted file mode 100644
index b54ac2b090fc..000000000000
--- a/dev-util/android-sdk-update-manager/android-sdk-update-manager-22.0.1-r1.ebuild
+++ /dev/null
@@ -1,99 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="5"
-
-inherit eutils user
-
-MY_P="android-sdk_r${PV}-linux"
-
-DESCRIPTION="Open Handset Alliance's Android SDK"
-HOMEPAGE="https://developer.android.com"
-SRC_URI="https://dl.google.com/android/${MY_P}.tgz"
-IUSE=""
-RESTRICT="mirror"
-
-LICENSE="android"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-
-DEPEND="app-arch/tar
- app-arch/gzip"
-RDEPEND=">=virtual/jdk-1.5
- >=dev-java/ant-core-1.6.5
- dev-java/swt:3.7[cairo]
- >=x11-libs/gtk+-2.24.23-r2:2[abi_x86_32(-)]
-"
-
-ANDROID_SDK_DIR="/opt/${PN}"
-QA_FLAGS_IGNORED_x86="
- ${ANDROID_SDK_DIR/\/}/tools/emulator
- ${ANDROID_SDK_DIR/\/}/tools/adb
- ${ANDROID_SDK_DIR/\/}/tools/mksdcard
- ${ANDROID_SDK_DIR/\/}/tools/sqlite3
- ${ANDROID_SDK_DIR/\/}/tools/hprof-conv
- ${ANDROID_SDK_DIR/\/}/tools/zipalign
- ${ANDROID_SDK_DIR/\/}/tools/dmtracedump
-"
-QA_FLAGS_IGNORED_amd64="${QA_FLAGS_IGNORED_x86}"
-
-QA_PREBUILT="${ANDROID_SDK_DIR/\/}/tools/*"
-
-S="${WORKDIR}/android-sdk-linux"
-
-pkg_setup() {
- enewgroup android
-}
-
-src_prepare() {
- rm -rf tools/lib/x86*
-}
-
-src_install() {
- dodoc tools/NOTICE.txt "SDK Readme.txt"
- rm -f tools/NOTICE.txt "SDK Readme.txt"
-
- dodir "${ANDROID_SDK_DIR}/tools"
- cp -pPR tools/* "${ED}${ANDROID_SDK_DIR}/tools" || die "failed to install tools"
-
- # Maybe this is needed for the tools directory too.
- dodir "${ANDROID_SDK_DIR}"/{add-ons,build-tools,docs,extras,platforms,platform-tools,samples,sources,system-images,temp}
-
- fowners root:android "${ANDROID_SDK_DIR}"/{.,add-ons,build-tools,docs,extras,platforms,platform-tools,samples,sources,system-images,temp,tools}
- fperms 0775 "${ANDROID_SDK_DIR}"/{.,add-ons,build-tools,docs,extras,platforms,platform-tools,samples,sources,system-images,temp,tools}
-
- echo "PATH=\"${EPREFIX}${ANDROID_SDK_DIR}/tools:${EPREFIX}${ANDROID_SDK_DIR}/platform-tools\"" > "${T}/80${PN}" || die
-
- SWT_PATH=
- SWT_VERSIONS="3.7 3.6"
- for version in $SWT_VERSIONS; do
- # redirecting stderr to /dev/null
- # not sure if this is best, but avoids misleading error messages
- SWT_PATH="`dirname \`java-config -p swt-\$version 2>/dev/null\` 2>/dev/null`"
- if [ $SWT_PATH ]; then
- einfo "SWT_PATH=$SWT_PATH selecting version $version of SWT."
- break
- fi
- done
-
- echo "ANDROID_SWT=\"${SWT_PATH}\"" >> "${T}/80${PN}" || die
-
- doenvd "${T}/80${PN}"
-
- echo "SEARCH_DIRS_MASK=\"${EPREFIX}${ANDROID_SDK_DIR}\"" > "${T}/80${PN}" || die
-
- insinto "/etc/revdep-rebuild" && doins "${T}/80${PN}"
-
-}
-
-pkg_postinst() {
- elog "The Android SDK now uses its own manager for the development environment."
- elog "Run 'android' to download the full SDK, including some of the platform tools."
- elog "You must be in the android group to manage the development environment."
- elog "Just run 'gpasswd -a android', then have re-login."
- elog "See https://developer.android.com/sdk/adding-components.html for more"
- elog "information."
- elog "If you have problems downloading the SDK, see https://code.google.com/p/android/issues/detail?id=4406"
- elog "You need to run env-update and source /etc/profile in any open shells"
- elog "if you get an SWT error."
-}
diff --git a/dev-util/android-sdk-update-manager/android-sdk-update-manager-22.0.1.ebuild b/dev-util/android-sdk-update-manager/android-sdk-update-manager-22.0.1.ebuild
deleted file mode 100644
index 1353edbc0ba4..000000000000
--- a/dev-util/android-sdk-update-manager/android-sdk-update-manager-22.0.1.ebuild
+++ /dev/null
@@ -1,99 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-inherit eutils user
-
-MY_P="android-sdk_r${PV}-linux"
-
-DESCRIPTION="Open Handset Alliance's Android SDK"
-HOMEPAGE="https://developer.android.com"
-SRC_URI="https://dl.google.com/android/${MY_P}.tgz"
-IUSE=""
-RESTRICT="mirror"
-
-LICENSE="android"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-
-DEPEND="app-arch/tar
- app-arch/gzip"
-RDEPEND=">=virtual/jdk-1.5
- >=dev-java/ant-core-1.6.5
- >=dev-java/swt-3.5[cairo]
- >=x11-libs/gtk+-2.24.23-r2:2[abi_x86_32(-)]
-"
-
-ANDROID_SDK_DIR="/opt/${PN}"
-QA_FLAGS_IGNORED_x86="
- ${ANDROID_SDK_DIR/\/}/tools/emulator
- ${ANDROID_SDK_DIR/\/}/tools/adb
- ${ANDROID_SDK_DIR/\/}/tools/mksdcard
- ${ANDROID_SDK_DIR/\/}/tools/sqlite3
- ${ANDROID_SDK_DIR/\/}/tools/hprof-conv
- ${ANDROID_SDK_DIR/\/}/tools/zipalign
- ${ANDROID_SDK_DIR/\/}/tools/dmtracedump
-"
-QA_FLAGS_IGNORED_amd64="${QA_FLAGS_IGNORED_x86}"
-
-QA_PREBUILT="${ANDROID_SDK_DIR/\/}/tools/*"
-
-S="${WORKDIR}/android-sdk-linux"
-
-pkg_setup() {
- enewgroup android
-}
-
-src_prepare() {
- rm -rf tools/lib/x86*
-}
-
-src_install() {
- dodoc tools/NOTICE.txt "SDK Readme.txt"
- rm -f tools/NOTICE.txt "SDK Readme.txt"
-
- dodir "${ANDROID_SDK_DIR}/tools"
- cp -pPR tools/* "${ED}${ANDROID_SDK_DIR}/tools" || die "failed to install tools"
-
- # Maybe this is needed for the tools directory too.
- dodir "${ANDROID_SDK_DIR}"/{add-ons,build-tools,docs,extras,platforms,platform-tools,samples,sources,system-images,temp}
-
- fowners root:android "${ANDROID_SDK_DIR}"/{add-ons,build-tools,docs,extras,platforms,platform-tools,samples,sources,system-images,temp,tools}
- fperms 0775 "${ANDROID_SDK_DIR}"/{add-ons,build-tools,docs,extras,platforms,platform-tools,samples,sources,system-images,temp,tools}
-
- echo "PATH=\"${EPREFIX}${ANDROID_SDK_DIR}/tools:${EPREFIX}${ANDROID_SDK_DIR}/platform-tools\"" > "${T}/80${PN}" || die
-
- SWT_PATH=
- SWT_VERSIONS="4.2 3.7 3.6 3.5"
- for version in $SWT_VERSIONS; do
- # redirecting stderr to /dev/null
- # not sure if this is best, but avoids misleading error messages
- SWT_PATH="`dirname \`java-config -p swt-\$version 2>/dev/null\` 2>/dev/null`"
- if [ $SWT_PATH ]; then
- einfo "SWT_PATH=$SWT_PATH selecting version $version of SWT."
- break
- fi
- done
-
- echo "ANDROID_SWT=\"${SWT_PATH}\"" >> "${T}/80${PN}" || die
-
- doenvd "${T}/80${PN}"
-
- echo "SEARCH_DIRS_MASK=\"${EPREFIX}${ANDROID_SDK_DIR}\"" > "${T}/80${PN}" || die
-
- insinto "/etc/revdep-rebuild" && doins "${T}/80${PN}"
-
-}
-
-pkg_postinst() {
- elog "The Android SDK now uses its own manager for the development environment."
- elog "Run 'android' to download the full SDK, including some of the platform tools."
- elog "You must be in the android group to manage the development environment."
- elog "Just run 'gpasswd -a android', then have re-login."
- elog "See https://developer.android.com/sdk/adding-components.html for more"
- elog "information."
- elog "If you have problems downloading the SDK, see https://code.google.com/p/android/issues/detail?id=4406"
- elog "You need to run env-update and source /etc/profile in any open shells"
- elog "if you get an SWT error."
-}
diff --git a/dev-util/android-sdk-update-manager/android-sdk-update-manager-22.0.4.ebuild b/dev-util/android-sdk-update-manager/android-sdk-update-manager-22.0.4.ebuild
deleted file mode 100644
index b54ac2b090fc..000000000000
--- a/dev-util/android-sdk-update-manager/android-sdk-update-manager-22.0.4.ebuild
+++ /dev/null
@@ -1,99 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="5"
-
-inherit eutils user
-
-MY_P="android-sdk_r${PV}-linux"
-
-DESCRIPTION="Open Handset Alliance's Android SDK"
-HOMEPAGE="https://developer.android.com"
-SRC_URI="https://dl.google.com/android/${MY_P}.tgz"
-IUSE=""
-RESTRICT="mirror"
-
-LICENSE="android"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-
-DEPEND="app-arch/tar
- app-arch/gzip"
-RDEPEND=">=virtual/jdk-1.5
- >=dev-java/ant-core-1.6.5
- dev-java/swt:3.7[cairo]
- >=x11-libs/gtk+-2.24.23-r2:2[abi_x86_32(-)]
-"
-
-ANDROID_SDK_DIR="/opt/${PN}"
-QA_FLAGS_IGNORED_x86="
- ${ANDROID_SDK_DIR/\/}/tools/emulator
- ${ANDROID_SDK_DIR/\/}/tools/adb
- ${ANDROID_SDK_DIR/\/}/tools/mksdcard
- ${ANDROID_SDK_DIR/\/}/tools/sqlite3
- ${ANDROID_SDK_DIR/\/}/tools/hprof-conv
- ${ANDROID_SDK_DIR/\/}/tools/zipalign
- ${ANDROID_SDK_DIR/\/}/tools/dmtracedump
-"
-QA_FLAGS_IGNORED_amd64="${QA_FLAGS_IGNORED_x86}"
-
-QA_PREBUILT="${ANDROID_SDK_DIR/\/}/tools/*"
-
-S="${WORKDIR}/android-sdk-linux"
-
-pkg_setup() {
- enewgroup android
-}
-
-src_prepare() {
- rm -rf tools/lib/x86*
-}
-
-src_install() {
- dodoc tools/NOTICE.txt "SDK Readme.txt"
- rm -f tools/NOTICE.txt "SDK Readme.txt"
-
- dodir "${ANDROID_SDK_DIR}/tools"
- cp -pPR tools/* "${ED}${ANDROID_SDK_DIR}/tools" || die "failed to install tools"
-
- # Maybe this is needed for the tools directory too.
- dodir "${ANDROID_SDK_DIR}"/{add-ons,build-tools,docs,extras,platforms,platform-tools,samples,sources,system-images,temp}
-
- fowners root:android "${ANDROID_SDK_DIR}"/{.,add-ons,build-tools,docs,extras,platforms,platform-tools,samples,sources,system-images,temp,tools}
- fperms 0775 "${ANDROID_SDK_DIR}"/{.,add-ons,build-tools,docs,extras,platforms,platform-tools,samples,sources,system-images,temp,tools}
-
- echo "PATH=\"${EPREFIX}${ANDROID_SDK_DIR}/tools:${EPREFIX}${ANDROID_SDK_DIR}/platform-tools\"" > "${T}/80${PN}" || die
-
- SWT_PATH=
- SWT_VERSIONS="3.7 3.6"
- for version in $SWT_VERSIONS; do
- # redirecting stderr to /dev/null
- # not sure if this is best, but avoids misleading error messages
- SWT_PATH="`dirname \`java-config -p swt-\$version 2>/dev/null\` 2>/dev/null`"
- if [ $SWT_PATH ]; then
- einfo "SWT_PATH=$SWT_PATH selecting version $version of SWT."
- break
- fi
- done
-
- echo "ANDROID_SWT=\"${SWT_PATH}\"" >> "${T}/80${PN}" || die
-
- doenvd "${T}/80${PN}"
-
- echo "SEARCH_DIRS_MASK=\"${EPREFIX}${ANDROID_SDK_DIR}\"" > "${T}/80${PN}" || die
-
- insinto "/etc/revdep-rebuild" && doins "${T}/80${PN}"
-
-}
-
-pkg_postinst() {
- elog "The Android SDK now uses its own manager for the development environment."
- elog "Run 'android' to download the full SDK, including some of the platform tools."
- elog "You must be in the android group to manage the development environment."
- elog "Just run 'gpasswd -a android', then have re-login."
- elog "See https://developer.android.com/sdk/adding-components.html for more"
- elog "information."
- elog "If you have problems downloading the SDK, see https://code.google.com/p/android/issues/detail?id=4406"
- elog "You need to run env-update and source /etc/profile in any open shells"
- elog "if you get an SWT error."
-}
diff --git a/dev-util/android-sdk-update-manager/android-sdk-update-manager-22.0.5-r1.ebuild b/dev-util/android-sdk-update-manager/android-sdk-update-manager-22.0.5-r1.ebuild
deleted file mode 100644
index d335afb3378a..000000000000
--- a/dev-util/android-sdk-update-manager/android-sdk-update-manager-22.0.5-r1.ebuild
+++ /dev/null
@@ -1,100 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="5"
-
-inherit eutils user
-
-MY_P="android-sdk_r${PV}-linux"
-
-DESCRIPTION="Open Handset Alliance's Android SDK"
-HOMEPAGE="https://developer.android.com"
-SRC_URI="https://dl.google.com/android/${MY_P}.tgz"
-IUSE=""
-RESTRICT="mirror"
-
-LICENSE="android"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-
-DEPEND="app-arch/tar
- app-arch/gzip"
-RDEPEND=">=virtual/jdk-1.5
- >=dev-java/ant-core-1.6.5
- dev-java/swt:3.7[cairo]
- >=x11-libs/gtk+-2.24.23-r2:2[abi_x86_32(-)]
-"
-
-ANDROID_SDK_DIR="/opt/${PN}"
-QA_FLAGS_IGNORED_x86="
- ${ANDROID_SDK_DIR/\/}/tools/emulator
- ${ANDROID_SDK_DIR/\/}/tools/adb
- ${ANDROID_SDK_DIR/\/}/tools/mksdcard
- ${ANDROID_SDK_DIR/\/}/tools/sqlite3
- ${ANDROID_SDK_DIR/\/}/tools/hprof-conv
- ${ANDROID_SDK_DIR/\/}/tools/zipalign
- ${ANDROID_SDK_DIR/\/}/tools/dmtracedump
-"
-QA_FLAGS_IGNORED_amd64="${QA_FLAGS_IGNORED_x86}"
-
-QA_PREBUILT="${ANDROID_SDK_DIR/\/}/tools/*"
-
-S="${WORKDIR}/android-sdk-linux"
-
-pkg_setup() {
- enewgroup android
-}
-
-src_prepare() {
- rm -rf tools/lib/x86*
-}
-
-src_install() {
- dodoc tools/NOTICE.txt "SDK Readme.txt"
- rm -f tools/NOTICE.txt "SDK Readme.txt"
-
- dodir "${ANDROID_SDK_DIR}/tools"
- cp -pPR tools/* "${ED}${ANDROID_SDK_DIR}/tools" || die "failed to install tools"
-
- # Maybe this is needed for the tools directory too.
- dodir "${ANDROID_SDK_DIR}"/{add-ons,build-tools,docs,extras,platforms,platform-tools,samples,sources,system-images,temp}
-
- fowners root:android "${ANDROID_SDK_DIR}"/{.,add-ons,build-tools,docs,extras,platforms,platform-tools,samples,sources,system-images,temp,tools}
- fperms 0775 "${ANDROID_SDK_DIR}"/{.,add-ons,build-tools,docs,extras,platforms,platform-tools,samples,sources,system-images,temp,tools}
-
- echo "PATH=\"${EPREFIX}${ANDROID_SDK_DIR}/tools:${EPREFIX}${ANDROID_SDK_DIR}/platform-tools\"" > "${T}/80${PN}" || die
-
- SWT_PATH=
- SWT_VERSIONS="3.7 3.6"
- for version in $SWT_VERSIONS; do
- # redirecting stderr to /dev/null
- # not sure if this is best, but avoids misleading error messages
- SWT_PATH="`dirname \`java-config -p swt-\$version 2>/dev/null\` 2>/dev/null`"
- if [ $SWT_PATH ]; then
- einfo "SWT_PATH=$SWT_PATH selecting version $version of SWT."
- break
- fi
- done
-
- echo "ANDROID_SWT=\"${SWT_PATH}\"" >> "${T}/80${PN}" || die
- echo "ANDROID_HOME=\"${EPREFIX}${ANDROID_SDK_DIR}\"" >> "${T}/80${PN}" || die
-
- doenvd "${T}/80${PN}"
-
- echo "SEARCH_DIRS_MASK=\"${EPREFIX}${ANDROID_SDK_DIR}\"" > "${T}/80${PN}" || die
-
- insinto "/etc/revdep-rebuild" && doins "${T}/80${PN}"
-
-}
-
-pkg_postinst() {
- elog "The Android SDK now uses its own manager for the development environment."
- elog "Run 'android' to download the full SDK, including some of the platform tools."
- elog "You must be in the android group to manage the development environment."
- elog "Just run 'gpasswd -a android', then have re-login."
- elog "See https://developer.android.com/sdk/adding-components.html for more"
- elog "information."
- elog "If you have problems downloading the SDK, see https://code.google.com/p/android/issues/detail?id=4406"
- elog "You need to run env-update and source /etc/profile in any open shells"
- elog "if you get an SWT error."
-}
diff --git a/dev-util/android-sdk-update-manager/android-sdk-update-manager-22.0.5.ebuild b/dev-util/android-sdk-update-manager/android-sdk-update-manager-22.0.5.ebuild
deleted file mode 100644
index b54ac2b090fc..000000000000
--- a/dev-util/android-sdk-update-manager/android-sdk-update-manager-22.0.5.ebuild
+++ /dev/null
@@ -1,99 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="5"
-
-inherit eutils user
-
-MY_P="android-sdk_r${PV}-linux"
-
-DESCRIPTION="Open Handset Alliance's Android SDK"
-HOMEPAGE="https://developer.android.com"
-SRC_URI="https://dl.google.com/android/${MY_P}.tgz"
-IUSE=""
-RESTRICT="mirror"
-
-LICENSE="android"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-
-DEPEND="app-arch/tar
- app-arch/gzip"
-RDEPEND=">=virtual/jdk-1.5
- >=dev-java/ant-core-1.6.5
- dev-java/swt:3.7[cairo]
- >=x11-libs/gtk+-2.24.23-r2:2[abi_x86_32(-)]
-"
-
-ANDROID_SDK_DIR="/opt/${PN}"
-QA_FLAGS_IGNORED_x86="
- ${ANDROID_SDK_DIR/\/}/tools/emulator
- ${ANDROID_SDK_DIR/\/}/tools/adb
- ${ANDROID_SDK_DIR/\/}/tools/mksdcard
- ${ANDROID_SDK_DIR/\/}/tools/sqlite3
- ${ANDROID_SDK_DIR/\/}/tools/hprof-conv
- ${ANDROID_SDK_DIR/\/}/tools/zipalign
- ${ANDROID_SDK_DIR/\/}/tools/dmtracedump
-"
-QA_FLAGS_IGNORED_amd64="${QA_FLAGS_IGNORED_x86}"
-
-QA_PREBUILT="${ANDROID_SDK_DIR/\/}/tools/*"
-
-S="${WORKDIR}/android-sdk-linux"
-
-pkg_setup() {
- enewgroup android
-}
-
-src_prepare() {
- rm -rf tools/lib/x86*
-}
-
-src_install() {
- dodoc tools/NOTICE.txt "SDK Readme.txt"
- rm -f tools/NOTICE.txt "SDK Readme.txt"
-
- dodir "${ANDROID_SDK_DIR}/tools"
- cp -pPR tools/* "${ED}${ANDROID_SDK_DIR}/tools" || die "failed to install tools"
-
- # Maybe this is needed for the tools directory too.
- dodir "${ANDROID_SDK_DIR}"/{add-ons,build-tools,docs,extras,platforms,platform-tools,samples,sources,system-images,temp}
-
- fowners root:android "${ANDROID_SDK_DIR}"/{.,add-ons,build-tools,docs,extras,platforms,platform-tools,samples,sources,system-images,temp,tools}
- fperms 0775 "${ANDROID_SDK_DIR}"/{.,add-ons,build-tools,docs,extras,platforms,platform-tools,samples,sources,system-images,temp,tools}
-
- echo "PATH=\"${EPREFIX}${ANDROID_SDK_DIR}/tools:${EPREFIX}${ANDROID_SDK_DIR}/platform-tools\"" > "${T}/80${PN}" || die
-
- SWT_PATH=
- SWT_VERSIONS="3.7 3.6"
- for version in $SWT_VERSIONS; do
- # redirecting stderr to /dev/null
- # not sure if this is best, but avoids misleading error messages
- SWT_PATH="`dirname \`java-config -p swt-\$version 2>/dev/null\` 2>/dev/null`"
- if [ $SWT_PATH ]; then
- einfo "SWT_PATH=$SWT_PATH selecting version $version of SWT."
- break
- fi
- done
-
- echo "ANDROID_SWT=\"${SWT_PATH}\"" >> "${T}/80${PN}" || die
-
- doenvd "${T}/80${PN}"
-
- echo "SEARCH_DIRS_MASK=\"${EPREFIX}${ANDROID_SDK_DIR}\"" > "${T}/80${PN}" || die
-
- insinto "/etc/revdep-rebuild" && doins "${T}/80${PN}"
-
-}
-
-pkg_postinst() {
- elog "The Android SDK now uses its own manager for the development environment."
- elog "Run 'android' to download the full SDK, including some of the platform tools."
- elog "You must be in the android group to manage the development environment."
- elog "Just run 'gpasswd -a android', then have re-login."
- elog "See https://developer.android.com/sdk/adding-components.html for more"
- elog "information."
- elog "If you have problems downloading the SDK, see https://code.google.com/p/android/issues/detail?id=4406"
- elog "You need to run env-update and source /etc/profile in any open shells"
- elog "if you get an SWT error."
-}
diff --git a/dev-util/android-sdk-update-manager/android-sdk-update-manager-22.2.1.ebuild b/dev-util/android-sdk-update-manager/android-sdk-update-manager-22.2.1.ebuild
deleted file mode 100644
index d335afb3378a..000000000000
--- a/dev-util/android-sdk-update-manager/android-sdk-update-manager-22.2.1.ebuild
+++ /dev/null
@@ -1,100 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="5"
-
-inherit eutils user
-
-MY_P="android-sdk_r${PV}-linux"
-
-DESCRIPTION="Open Handset Alliance's Android SDK"
-HOMEPAGE="https://developer.android.com"
-SRC_URI="https://dl.google.com/android/${MY_P}.tgz"
-IUSE=""
-RESTRICT="mirror"
-
-LICENSE="android"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-
-DEPEND="app-arch/tar
- app-arch/gzip"
-RDEPEND=">=virtual/jdk-1.5
- >=dev-java/ant-core-1.6.5
- dev-java/swt:3.7[cairo]
- >=x11-libs/gtk+-2.24.23-r2:2[abi_x86_32(-)]
-"
-
-ANDROID_SDK_DIR="/opt/${PN}"
-QA_FLAGS_IGNORED_x86="
- ${ANDROID_SDK_DIR/\/}/tools/emulator
- ${ANDROID_SDK_DIR/\/}/tools/adb
- ${ANDROID_SDK_DIR/\/}/tools/mksdcard
- ${ANDROID_SDK_DIR/\/}/tools/sqlite3
- ${ANDROID_SDK_DIR/\/}/tools/hprof-conv
- ${ANDROID_SDK_DIR/\/}/tools/zipalign
- ${ANDROID_SDK_DIR/\/}/tools/dmtracedump
-"
-QA_FLAGS_IGNORED_amd64="${QA_FLAGS_IGNORED_x86}"
-
-QA_PREBUILT="${ANDROID_SDK_DIR/\/}/tools/*"
-
-S="${WORKDIR}/android-sdk-linux"
-
-pkg_setup() {
- enewgroup android
-}
-
-src_prepare() {
- rm -rf tools/lib/x86*
-}
-
-src_install() {
- dodoc tools/NOTICE.txt "SDK Readme.txt"
- rm -f tools/NOTICE.txt "SDK Readme.txt"
-
- dodir "${ANDROID_SDK_DIR}/tools"
- cp -pPR tools/* "${ED}${ANDROID_SDK_DIR}/tools" || die "failed to install tools"
-
- # Maybe this is needed for the tools directory too.
- dodir "${ANDROID_SDK_DIR}"/{add-ons,build-tools,docs,extras,platforms,platform-tools,samples,sources,system-images,temp}
-
- fowners root:android "${ANDROID_SDK_DIR}"/{.,add-ons,build-tools,docs,extras,platforms,platform-tools,samples,sources,system-images,temp,tools}
- fperms 0775 "${ANDROID_SDK_DIR}"/{.,add-ons,build-tools,docs,extras,platforms,platform-tools,samples,sources,system-images,temp,tools}
-
- echo "PATH=\"${EPREFIX}${ANDROID_SDK_DIR}/tools:${EPREFIX}${ANDROID_SDK_DIR}/platform-tools\"" > "${T}/80${PN}" || die
-
- SWT_PATH=
- SWT_VERSIONS="3.7 3.6"
- for version in $SWT_VERSIONS; do
- # redirecting stderr to /dev/null
- # not sure if this is best, but avoids misleading error messages
- SWT_PATH="`dirname \`java-config -p swt-\$version 2>/dev/null\` 2>/dev/null`"
- if [ $SWT_PATH ]; then
- einfo "SWT_PATH=$SWT_PATH selecting version $version of SWT."
- break
- fi
- done
-
- echo "ANDROID_SWT=\"${SWT_PATH}\"" >> "${T}/80${PN}" || die
- echo "ANDROID_HOME=\"${EPREFIX}${ANDROID_SDK_DIR}\"" >> "${T}/80${PN}" || die
-
- doenvd "${T}/80${PN}"
-
- echo "SEARCH_DIRS_MASK=\"${EPREFIX}${ANDROID_SDK_DIR}\"" > "${T}/80${PN}" || die
-
- insinto "/etc/revdep-rebuild" && doins "${T}/80${PN}"
-
-}
-
-pkg_postinst() {
- elog "The Android SDK now uses its own manager for the development environment."
- elog "Run 'android' to download the full SDK, including some of the platform tools."
- elog "You must be in the android group to manage the development environment."
- elog "Just run 'gpasswd -a android', then have re-login."
- elog "See https://developer.android.com/sdk/adding-components.html for more"
- elog "information."
- elog "If you have problems downloading the SDK, see https://code.google.com/p/android/issues/detail?id=4406"
- elog "You need to run env-update and source /etc/profile in any open shells"
- elog "if you get an SWT error."
-}
diff --git a/dev-util/android-sdk-update-manager/android-sdk-update-manager-22.3.ebuild b/dev-util/android-sdk-update-manager/android-sdk-update-manager-22.3.ebuild
deleted file mode 100644
index 42c6e14d981e..000000000000
--- a/dev-util/android-sdk-update-manager/android-sdk-update-manager-22.3.ebuild
+++ /dev/null
@@ -1,102 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="5"
-
-inherit eutils user udev
-
-MY_P="android-sdk_r${PV}-linux"
-
-DESCRIPTION="Open Handset Alliance's Android SDK"
-HOMEPAGE="https://developer.android.com"
-SRC_URI="https://dl.google.com/android/${MY_P}.tgz"
-IUSE=""
-RESTRICT="mirror"
-
-LICENSE="android"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-
-DEPEND="app-arch/tar
- app-arch/gzip"
-RDEPEND=">=virtual/jdk-1.5
- >=dev-java/ant-core-1.6.5
- dev-java/swt:3.7[cairo]
- >=x11-libs/gtk+-2.24.23-r2:2[abi_x86_32(-)]
-"
-
-ANDROID_SDK_DIR="/opt/${PN}"
-QA_FLAGS_IGNORED_x86="
- ${ANDROID_SDK_DIR/\/}/tools/emulator
- ${ANDROID_SDK_DIR/\/}/tools/adb
- ${ANDROID_SDK_DIR/\/}/tools/mksdcard
- ${ANDROID_SDK_DIR/\/}/tools/sqlite3
- ${ANDROID_SDK_DIR/\/}/tools/hprof-conv
- ${ANDROID_SDK_DIR/\/}/tools/zipalign
- ${ANDROID_SDK_DIR/\/}/tools/dmtracedump
-"
-QA_FLAGS_IGNORED_amd64="${QA_FLAGS_IGNORED_x86}"
-
-QA_PREBUILT="${ANDROID_SDK_DIR/\/}/tools/*"
-
-S="${WORKDIR}/android-sdk-linux"
-
-pkg_setup() {
- enewgroup android
-}
-
-src_prepare() {
- rm -rf tools/lib/x86*
-}
-
-src_install() {
- dodoc tools/NOTICE.txt "SDK Readme.txt"
- rm -f tools/NOTICE.txt "SDK Readme.txt"
-
- dodir "${ANDROID_SDK_DIR}/tools"
- cp -pPR tools/* "${ED}${ANDROID_SDK_DIR}/tools" || die "failed to install tools"
-
- # Maybe this is needed for the tools directory too.
- dodir "${ANDROID_SDK_DIR}"/{add-ons,build-tools,docs,extras,platforms,platform-tools,samples,sources,system-images,temp}
-
- fowners root:android "${ANDROID_SDK_DIR}"/{.,add-ons,build-tools,docs,extras,platforms,platform-tools,samples,sources,system-images,temp,tools}
- fperms 0775 "${ANDROID_SDK_DIR}"/{.,add-ons,build-tools,docs,extras,platforms,platform-tools,samples,sources,system-images,temp,tools}
-
- echo "PATH=\"${EPREFIX}${ANDROID_SDK_DIR}/tools:${EPREFIX}${ANDROID_SDK_DIR}/platform-tools\"" > "${T}/80${PN}" || die
-
- SWT_PATH=
- SWT_VERSIONS="3.7 3.6"
- for version in $SWT_VERSIONS; do
- # redirecting stderr to /dev/null
- # not sure if this is best, but avoids misleading error messages
- SWT_PATH="`dirname \`java-config -p swt-\$version 2>/dev/null\` 2>/dev/null`"
- if [ $SWT_PATH ]; then
- einfo "SWT_PATH=$SWT_PATH selecting version $version of SWT."
- break
- fi
- done
-
- echo "ANDROID_SWT=\"${SWT_PATH}\"" >> "${T}/80${PN}" || die
- echo "ANDROID_HOME=\"${EPREFIX}${ANDROID_SDK_DIR}\"" >> "${T}/80${PN}" || die
-
- doenvd "${T}/80${PN}"
-
- echo "SEARCH_DIRS_MASK=\"${EPREFIX}${ANDROID_SDK_DIR}\"" > "${T}/80${PN}" || die
-
- insinto "/etc/revdep-rebuild" && doins "${T}/80${PN}"
-
- udev_dorules "${FILESDIR}"/80-android.rules || die
- domenu "${FILESDIR}"/android-sdk-update-manager.desktop
-}
-
-pkg_postinst() {
- elog "The Android SDK now uses its own manager for the development environment."
- elog "Run 'android' to download the full SDK, including some of the platform tools."
- elog "You must be in the android group to manage the development environment."
- elog "Just run 'gpasswd -a android', then have re-login."
- elog "See https://developer.android.com/sdk/adding-components.html for more"
- elog "information."
- elog "If you have problems downloading the SDK, see https://code.google.com/p/android/issues/detail?id=4406"
- elog "You need to run env-update and source /etc/profile in any open shells"
- elog "if you get an SWT error."
-}
diff --git a/dev-util/android-sdk-update-manager/android-sdk-update-manager-22.6.1.ebuild b/dev-util/android-sdk-update-manager/android-sdk-update-manager-22.6.1.ebuild
deleted file mode 100644
index 42c6e14d981e..000000000000
--- a/dev-util/android-sdk-update-manager/android-sdk-update-manager-22.6.1.ebuild
+++ /dev/null
@@ -1,102 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="5"
-
-inherit eutils user udev
-
-MY_P="android-sdk_r${PV}-linux"
-
-DESCRIPTION="Open Handset Alliance's Android SDK"
-HOMEPAGE="https://developer.android.com"
-SRC_URI="https://dl.google.com/android/${MY_P}.tgz"
-IUSE=""
-RESTRICT="mirror"
-
-LICENSE="android"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-
-DEPEND="app-arch/tar
- app-arch/gzip"
-RDEPEND=">=virtual/jdk-1.5
- >=dev-java/ant-core-1.6.5
- dev-java/swt:3.7[cairo]
- >=x11-libs/gtk+-2.24.23-r2:2[abi_x86_32(-)]
-"
-
-ANDROID_SDK_DIR="/opt/${PN}"
-QA_FLAGS_IGNORED_x86="
- ${ANDROID_SDK_DIR/\/}/tools/emulator
- ${ANDROID_SDK_DIR/\/}/tools/adb
- ${ANDROID_SDK_DIR/\/}/tools/mksdcard
- ${ANDROID_SDK_DIR/\/}/tools/sqlite3
- ${ANDROID_SDK_DIR/\/}/tools/hprof-conv
- ${ANDROID_SDK_DIR/\/}/tools/zipalign
- ${ANDROID_SDK_DIR/\/}/tools/dmtracedump
-"
-QA_FLAGS_IGNORED_amd64="${QA_FLAGS_IGNORED_x86}"
-
-QA_PREBUILT="${ANDROID_SDK_DIR/\/}/tools/*"
-
-S="${WORKDIR}/android-sdk-linux"
-
-pkg_setup() {
- enewgroup android
-}
-
-src_prepare() {
- rm -rf tools/lib/x86*
-}
-
-src_install() {
- dodoc tools/NOTICE.txt "SDK Readme.txt"
- rm -f tools/NOTICE.txt "SDK Readme.txt"
-
- dodir "${ANDROID_SDK_DIR}/tools"
- cp -pPR tools/* "${ED}${ANDROID_SDK_DIR}/tools" || die "failed to install tools"
-
- # Maybe this is needed for the tools directory too.
- dodir "${ANDROID_SDK_DIR}"/{add-ons,build-tools,docs,extras,platforms,platform-tools,samples,sources,system-images,temp}
-
- fowners root:android "${ANDROID_SDK_DIR}"/{.,add-ons,build-tools,docs,extras,platforms,platform-tools,samples,sources,system-images,temp,tools}
- fperms 0775 "${ANDROID_SDK_DIR}"/{.,add-ons,build-tools,docs,extras,platforms,platform-tools,samples,sources,system-images,temp,tools}
-
- echo "PATH=\"${EPREFIX}${ANDROID_SDK_DIR}/tools:${EPREFIX}${ANDROID_SDK_DIR}/platform-tools\"" > "${T}/80${PN}" || die
-
- SWT_PATH=
- SWT_VERSIONS="3.7 3.6"
- for version in $SWT_VERSIONS; do
- # redirecting stderr to /dev/null
- # not sure if this is best, but avoids misleading error messages
- SWT_PATH="`dirname \`java-config -p swt-\$version 2>/dev/null\` 2>/dev/null`"
- if [ $SWT_PATH ]; then
- einfo "SWT_PATH=$SWT_PATH selecting version $version of SWT."
- break
- fi
- done
-
- echo "ANDROID_SWT=\"${SWT_PATH}\"" >> "${T}/80${PN}" || die
- echo "ANDROID_HOME=\"${EPREFIX}${ANDROID_SDK_DIR}\"" >> "${T}/80${PN}" || die
-
- doenvd "${T}/80${PN}"
-
- echo "SEARCH_DIRS_MASK=\"${EPREFIX}${ANDROID_SDK_DIR}\"" > "${T}/80${PN}" || die
-
- insinto "/etc/revdep-rebuild" && doins "${T}/80${PN}"
-
- udev_dorules "${FILESDIR}"/80-android.rules || die
- domenu "${FILESDIR}"/android-sdk-update-manager.desktop
-}
-
-pkg_postinst() {
- elog "The Android SDK now uses its own manager for the development environment."
- elog "Run 'android' to download the full SDK, including some of the platform tools."
- elog "You must be in the android group to manage the development environment."
- elog "Just run 'gpasswd -a android', then have re-login."
- elog "See https://developer.android.com/sdk/adding-components.html for more"
- elog "information."
- elog "If you have problems downloading the SDK, see https://code.google.com/p/android/issues/detail?id=4406"
- elog "You need to run env-update and source /etc/profile in any open shells"
- elog "if you get an SWT error."
-}
diff --git a/dev-util/android-sdk-update-manager/android-sdk-update-manager-22.6.ebuild b/dev-util/android-sdk-update-manager/android-sdk-update-manager-22.6.ebuild
deleted file mode 100644
index 42c6e14d981e..000000000000
--- a/dev-util/android-sdk-update-manager/android-sdk-update-manager-22.6.ebuild
+++ /dev/null
@@ -1,102 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="5"
-
-inherit eutils user udev
-
-MY_P="android-sdk_r${PV}-linux"
-
-DESCRIPTION="Open Handset Alliance's Android SDK"
-HOMEPAGE="https://developer.android.com"
-SRC_URI="https://dl.google.com/android/${MY_P}.tgz"
-IUSE=""
-RESTRICT="mirror"
-
-LICENSE="android"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-
-DEPEND="app-arch/tar
- app-arch/gzip"
-RDEPEND=">=virtual/jdk-1.5
- >=dev-java/ant-core-1.6.5
- dev-java/swt:3.7[cairo]
- >=x11-libs/gtk+-2.24.23-r2:2[abi_x86_32(-)]
-"
-
-ANDROID_SDK_DIR="/opt/${PN}"
-QA_FLAGS_IGNORED_x86="
- ${ANDROID_SDK_DIR/\/}/tools/emulator
- ${ANDROID_SDK_DIR/\/}/tools/adb
- ${ANDROID_SDK_DIR/\/}/tools/mksdcard
- ${ANDROID_SDK_DIR/\/}/tools/sqlite3
- ${ANDROID_SDK_DIR/\/}/tools/hprof-conv
- ${ANDROID_SDK_DIR/\/}/tools/zipalign
- ${ANDROID_SDK_DIR/\/}/tools/dmtracedump
-"
-QA_FLAGS_IGNORED_amd64="${QA_FLAGS_IGNORED_x86}"
-
-QA_PREBUILT="${ANDROID_SDK_DIR/\/}/tools/*"
-
-S="${WORKDIR}/android-sdk-linux"
-
-pkg_setup() {
- enewgroup android
-}
-
-src_prepare() {
- rm -rf tools/lib/x86*
-}
-
-src_install() {
- dodoc tools/NOTICE.txt "SDK Readme.txt"
- rm -f tools/NOTICE.txt "SDK Readme.txt"
-
- dodir "${ANDROID_SDK_DIR}/tools"
- cp -pPR tools/* "${ED}${ANDROID_SDK_DIR}/tools" || die "failed to install tools"
-
- # Maybe this is needed for the tools directory too.
- dodir "${ANDROID_SDK_DIR}"/{add-ons,build-tools,docs,extras,platforms,platform-tools,samples,sources,system-images,temp}
-
- fowners root:android "${ANDROID_SDK_DIR}"/{.,add-ons,build-tools,docs,extras,platforms,platform-tools,samples,sources,system-images,temp,tools}
- fperms 0775 "${ANDROID_SDK_DIR}"/{.,add-ons,build-tools,docs,extras,platforms,platform-tools,samples,sources,system-images,temp,tools}
-
- echo "PATH=\"${EPREFIX}${ANDROID_SDK_DIR}/tools:${EPREFIX}${ANDROID_SDK_DIR}/platform-tools\"" > "${T}/80${PN}" || die
-
- SWT_PATH=
- SWT_VERSIONS="3.7 3.6"
- for version in $SWT_VERSIONS; do
- # redirecting stderr to /dev/null
- # not sure if this is best, but avoids misleading error messages
- SWT_PATH="`dirname \`java-config -p swt-\$version 2>/dev/null\` 2>/dev/null`"
- if [ $SWT_PATH ]; then
- einfo "SWT_PATH=$SWT_PATH selecting version $version of SWT."
- break
- fi
- done
-
- echo "ANDROID_SWT=\"${SWT_PATH}\"" >> "${T}/80${PN}" || die
- echo "ANDROID_HOME=\"${EPREFIX}${ANDROID_SDK_DIR}\"" >> "${T}/80${PN}" || die
-
- doenvd "${T}/80${PN}"
-
- echo "SEARCH_DIRS_MASK=\"${EPREFIX}${ANDROID_SDK_DIR}\"" > "${T}/80${PN}" || die
-
- insinto "/etc/revdep-rebuild" && doins "${T}/80${PN}"
-
- udev_dorules "${FILESDIR}"/80-android.rules || die
- domenu "${FILESDIR}"/android-sdk-update-manager.desktop
-}
-
-pkg_postinst() {
- elog "The Android SDK now uses its own manager for the development environment."
- elog "Run 'android' to download the full SDK, including some of the platform tools."
- elog "You must be in the android group to manage the development environment."
- elog "Just run 'gpasswd -a android', then have re-login."
- elog "See https://developer.android.com/sdk/adding-components.html for more"
- elog "information."
- elog "If you have problems downloading the SDK, see https://code.google.com/p/android/issues/detail?id=4406"
- elog "You need to run env-update and source /etc/profile in any open shells"
- elog "if you get an SWT error."
-}
diff --git a/dev-util/android-sdk-update-manager/android-sdk-update-manager-22.ebuild b/dev-util/android-sdk-update-manager/android-sdk-update-manager-22.ebuild
deleted file mode 100644
index 1353edbc0ba4..000000000000
--- a/dev-util/android-sdk-update-manager/android-sdk-update-manager-22.ebuild
+++ /dev/null
@@ -1,99 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-inherit eutils user
-
-MY_P="android-sdk_r${PV}-linux"
-
-DESCRIPTION="Open Handset Alliance's Android SDK"
-HOMEPAGE="https://developer.android.com"
-SRC_URI="https://dl.google.com/android/${MY_P}.tgz"
-IUSE=""
-RESTRICT="mirror"
-
-LICENSE="android"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-
-DEPEND="app-arch/tar
- app-arch/gzip"
-RDEPEND=">=virtual/jdk-1.5
- >=dev-java/ant-core-1.6.5
- >=dev-java/swt-3.5[cairo]
- >=x11-libs/gtk+-2.24.23-r2:2[abi_x86_32(-)]
-"
-
-ANDROID_SDK_DIR="/opt/${PN}"
-QA_FLAGS_IGNORED_x86="
- ${ANDROID_SDK_DIR/\/}/tools/emulator
- ${ANDROID_SDK_DIR/\/}/tools/adb
- ${ANDROID_SDK_DIR/\/}/tools/mksdcard
- ${ANDROID_SDK_DIR/\/}/tools/sqlite3
- ${ANDROID_SDK_DIR/\/}/tools/hprof-conv
- ${ANDROID_SDK_DIR/\/}/tools/zipalign
- ${ANDROID_SDK_DIR/\/}/tools/dmtracedump
-"
-QA_FLAGS_IGNORED_amd64="${QA_FLAGS_IGNORED_x86}"
-
-QA_PREBUILT="${ANDROID_SDK_DIR/\/}/tools/*"
-
-S="${WORKDIR}/android-sdk-linux"
-
-pkg_setup() {
- enewgroup android
-}
-
-src_prepare() {
- rm -rf tools/lib/x86*
-}
-
-src_install() {
- dodoc tools/NOTICE.txt "SDK Readme.txt"
- rm -f tools/NOTICE.txt "SDK Readme.txt"
-
- dodir "${ANDROID_SDK_DIR}/tools"
- cp -pPR tools/* "${ED}${ANDROID_SDK_DIR}/tools" || die "failed to install tools"
-
- # Maybe this is needed for the tools directory too.
- dodir "${ANDROID_SDK_DIR}"/{add-ons,build-tools,docs,extras,platforms,platform-tools,samples,sources,system-images,temp}
-
- fowners root:android "${ANDROID_SDK_DIR}"/{add-ons,build-tools,docs,extras,platforms,platform-tools,samples,sources,system-images,temp,tools}
- fperms 0775 "${ANDROID_SDK_DIR}"/{add-ons,build-tools,docs,extras,platforms,platform-tools,samples,sources,system-images,temp,tools}
-
- echo "PATH=\"${EPREFIX}${ANDROID_SDK_DIR}/tools:${EPREFIX}${ANDROID_SDK_DIR}/platform-tools\"" > "${T}/80${PN}" || die
-
- SWT_PATH=
- SWT_VERSIONS="4.2 3.7 3.6 3.5"
- for version in $SWT_VERSIONS; do
- # redirecting stderr to /dev/null
- # not sure if this is best, but avoids misleading error messages
- SWT_PATH="`dirname \`java-config -p swt-\$version 2>/dev/null\` 2>/dev/null`"
- if [ $SWT_PATH ]; then
- einfo "SWT_PATH=$SWT_PATH selecting version $version of SWT."
- break
- fi
- done
-
- echo "ANDROID_SWT=\"${SWT_PATH}\"" >> "${T}/80${PN}" || die
-
- doenvd "${T}/80${PN}"
-
- echo "SEARCH_DIRS_MASK=\"${EPREFIX}${ANDROID_SDK_DIR}\"" > "${T}/80${PN}" || die
-
- insinto "/etc/revdep-rebuild" && doins "${T}/80${PN}"
-
-}
-
-pkg_postinst() {
- elog "The Android SDK now uses its own manager for the development environment."
- elog "Run 'android' to download the full SDK, including some of the platform tools."
- elog "You must be in the android group to manage the development environment."
- elog "Just run 'gpasswd -a android', then have re-login."
- elog "See https://developer.android.com/sdk/adding-components.html for more"
- elog "information."
- elog "If you have problems downloading the SDK, see https://code.google.com/p/android/issues/detail?id=4406"
- elog "You need to run env-update and source /etc/profile in any open shells"
- elog "if you get an SWT error."
-}
diff --git a/dev-util/android-sdk-update-manager/android-sdk-update-manager-23-r1.ebuild b/dev-util/android-sdk-update-manager/android-sdk-update-manager-23-r1.ebuild
deleted file mode 100644
index 4f77f8ba0d62..000000000000
--- a/dev-util/android-sdk-update-manager/android-sdk-update-manager-23-r1.ebuild
+++ /dev/null
@@ -1,102 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="5"
-
-inherit eutils user udev
-
-MY_P="android-sdk_r${PV}-linux"
-
-DESCRIPTION="Open Handset Alliance's Android SDK"
-HOMEPAGE="https://developer.android.com"
-SRC_URI="https://dl.google.com/android/${MY_P}.tgz"
-IUSE=""
-RESTRICT="mirror"
-
-LICENSE="android"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-
-DEPEND="app-arch/tar
- app-arch/gzip"
-RDEPEND=">=virtual/jdk-1.5
- >=dev-java/ant-core-1.6.5
- dev-java/swt:3.7[cairo]
- sys-libs/zlib[abi_x86_32(-)]
-"
-
-ANDROID_SDK_DIR="/opt/${PN}"
-QA_FLAGS_IGNORED_x86="
- ${ANDROID_SDK_DIR/\/}/tools/emulator
- ${ANDROID_SDK_DIR/\/}/tools/adb
- ${ANDROID_SDK_DIR/\/}/tools/mksdcard
- ${ANDROID_SDK_DIR/\/}/tools/sqlite3
- ${ANDROID_SDK_DIR/\/}/tools/hprof-conv
- ${ANDROID_SDK_DIR/\/}/tools/zipalign
- ${ANDROID_SDK_DIR/\/}/tools/dmtracedump
-"
-QA_FLAGS_IGNORED_amd64="${QA_FLAGS_IGNORED_x86}"
-
-QA_PREBUILT="${ANDROID_SDK_DIR/\/}/tools/*"
-
-S="${WORKDIR}/android-sdk-linux"
-
-pkg_setup() {
- enewgroup android
-}
-
-src_prepare() {
- rm -rf tools/lib/x86*
-}
-
-src_install() {
- dodoc tools/NOTICE.txt "SDK Readme.txt"
- rm -f tools/NOTICE.txt "SDK Readme.txt"
-
- dodir "${ANDROID_SDK_DIR}/tools"
- cp -pPR tools/* "${ED}${ANDROID_SDK_DIR}/tools" || die "failed to install tools"
-
- # Maybe this is needed for the tools directory too.
- dodir "${ANDROID_SDK_DIR}"/{add-ons,build-tools,docs,extras,platforms,platform-tools,samples,sources,system-images,temp}
-
- fowners -R root:android "${ANDROID_SDK_DIR}"/{.,add-ons,build-tools,docs,extras,platforms,platform-tools,samples,sources,system-images,temp,tools}
- fperms -R 0775 "${ANDROID_SDK_DIR}"/{.,add-ons,build-tools,docs,extras,platforms,platform-tools,samples,sources,system-images,temp,tools}
-
- echo "PATH=\"${EPREFIX}${ANDROID_SDK_DIR}/tools:${EPREFIX}${ANDROID_SDK_DIR}/platform-tools\"" > "${T}/80${PN}" || die
-
- SWT_PATH=
- SWT_VERSIONS="3.7 3.6"
- for version in $SWT_VERSIONS; do
- # redirecting stderr to /dev/null
- # not sure if this is best, but avoids misleading error messages
- SWT_PATH="`dirname \`java-config -p swt-\$version 2>/dev/null\` 2>/dev/null`"
- if [ $SWT_PATH ]; then
- einfo "SWT_PATH=$SWT_PATH selecting version $version of SWT."
- break
- fi
- done
-
- echo "ANDROID_SWT=\"${SWT_PATH}\"" >> "${T}/80${PN}" || die
- echo "ANDROID_HOME=\"${EPREFIX}${ANDROID_SDK_DIR}\"" >> "${T}/80${PN}" || die
-
- doenvd "${T}/80${PN}"
-
- echo "SEARCH_DIRS_MASK=\"${EPREFIX}${ANDROID_SDK_DIR}\"" > "${T}/80${PN}" || die
-
- insinto "/etc/revdep-rebuild" && doins "${T}/80${PN}"
-
- udev_dorules "${FILESDIR}"/80-android.rules || die
- domenu "${FILESDIR}"/android-sdk-update-manager.desktop
-}
-
-pkg_postinst() {
- elog "The Android SDK now uses its own manager for the development environment."
- elog "Run 'android' to download the full SDK, including some of the platform tools."
- elog "You must be in the android group to manage the development environment."
- elog "Just run 'gpasswd -a android', then have re-login."
- elog "See https://developer.android.com/sdk/adding-components.html for more"
- elog "information."
- elog "If you have problems downloading the SDK, see https://code.google.com/p/android/issues/detail?id=4406"
- elog "You need to run env-update and source /etc/profile in any open shells"
- elog "if you get an SWT error."
-}
diff --git a/dev-util/android-sdk-update-manager/android-sdk-update-manager-23.ebuild b/dev-util/android-sdk-update-manager/android-sdk-update-manager-23.ebuild
deleted file mode 100644
index 895cf67fd7db..000000000000
--- a/dev-util/android-sdk-update-manager/android-sdk-update-manager-23.ebuild
+++ /dev/null
@@ -1,102 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="5"
-
-inherit eutils user udev
-
-MY_P="android-sdk_r${PV}-linux"
-
-DESCRIPTION="Open Handset Alliance's Android SDK"
-HOMEPAGE="https://developer.android.com"
-SRC_URI="https://dl.google.com/android/${MY_P}.tgz"
-IUSE=""
-RESTRICT="mirror"
-
-LICENSE="android"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-
-DEPEND="app-arch/tar
- app-arch/gzip"
-RDEPEND=">=virtual/jdk-1.5
- >=dev-java/ant-core-1.6.5
- dev-java/swt:3.7[cairo]
- sys-libs/zlib[abi_x86_32(-)]
-"
-
-ANDROID_SDK_DIR="/opt/${PN}"
-QA_FLAGS_IGNORED_x86="
- ${ANDROID_SDK_DIR/\/}/tools/emulator
- ${ANDROID_SDK_DIR/\/}/tools/adb
- ${ANDROID_SDK_DIR/\/}/tools/mksdcard
- ${ANDROID_SDK_DIR/\/}/tools/sqlite3
- ${ANDROID_SDK_DIR/\/}/tools/hprof-conv
- ${ANDROID_SDK_DIR/\/}/tools/zipalign
- ${ANDROID_SDK_DIR/\/}/tools/dmtracedump
-"
-QA_FLAGS_IGNORED_amd64="${QA_FLAGS_IGNORED_x86}"
-
-QA_PREBUILT="${ANDROID_SDK_DIR/\/}/tools/*"
-
-S="${WORKDIR}/android-sdk-linux"
-
-pkg_setup() {
- enewgroup android
-}
-
-src_prepare() {
- rm -rf tools/lib/x86*
-}
-
-src_install() {
- dodoc tools/NOTICE.txt "SDK Readme.txt"
- rm -f tools/NOTICE.txt "SDK Readme.txt"
-
- dodir "${ANDROID_SDK_DIR}/tools"
- cp -pPR tools/* "${ED}${ANDROID_SDK_DIR}/tools" || die "failed to install tools"
-
- # Maybe this is needed for the tools directory too.
- dodir "${ANDROID_SDK_DIR}"/{add-ons,build-tools,docs,extras,platforms,platform-tools,samples,sources,system-images,temp}
-
- fowners root:android "${ANDROID_SDK_DIR}"/{.,add-ons,build-tools,docs,extras,platforms,platform-tools,samples,sources,system-images,temp,tools}
- fperms 0775 "${ANDROID_SDK_DIR}"/{.,add-ons,build-tools,docs,extras,platforms,platform-tools,samples,sources,system-images,temp,tools}
-
- echo "PATH=\"${EPREFIX}${ANDROID_SDK_DIR}/tools:${EPREFIX}${ANDROID_SDK_DIR}/platform-tools\"" > "${T}/80${PN}" || die
-
- SWT_PATH=
- SWT_VERSIONS="3.7 3.6"
- for version in $SWT_VERSIONS; do
- # redirecting stderr to /dev/null
- # not sure if this is best, but avoids misleading error messages
- SWT_PATH="`dirname \`java-config -p swt-\$version 2>/dev/null\` 2>/dev/null`"
- if [ $SWT_PATH ]; then
- einfo "SWT_PATH=$SWT_PATH selecting version $version of SWT."
- break
- fi
- done
-
- echo "ANDROID_SWT=\"${SWT_PATH}\"" >> "${T}/80${PN}" || die
- echo "ANDROID_HOME=\"${EPREFIX}${ANDROID_SDK_DIR}\"" >> "${T}/80${PN}" || die
-
- doenvd "${T}/80${PN}"
-
- echo "SEARCH_DIRS_MASK=\"${EPREFIX}${ANDROID_SDK_DIR}\"" > "${T}/80${PN}" || die
-
- insinto "/etc/revdep-rebuild" && doins "${T}/80${PN}"
-
- udev_dorules "${FILESDIR}"/80-android.rules || die
- domenu "${FILESDIR}"/android-sdk-update-manager.desktop
-}
-
-pkg_postinst() {
- elog "The Android SDK now uses its own manager for the development environment."
- elog "Run 'android' to download the full SDK, including some of the platform tools."
- elog "You must be in the android group to manage the development environment."
- elog "Just run 'gpasswd -a android', then have re-login."
- elog "See https://developer.android.com/sdk/adding-components.html for more"
- elog "information."
- elog "If you have problems downloading the SDK, see https://code.google.com/p/android/issues/detail?id=4406"
- elog "You need to run env-update and source /etc/profile in any open shells"
- elog "if you get an SWT error."
-}
diff --git a/dev-util/aruba/aruba-1.0.3-r1.ebuild b/dev-util/aruba/aruba-1.0.3-r1.ebuild
index 0e20ab19c5b0..02c6b6cb9ab7 100644
--- a/dev-util/aruba/aruba-1.0.3-r1.ebuild
+++ b/dev-util/aruba/aruba-1.0.3-r1.ebuild
@@ -18,7 +18,7 @@ HOMEPAGE="https://github.com/cucumber/aruba"
SRC_URI="https://github.com/cucumber/aruba/archive/v${PV}.tar.gz -> ${P}.tar.gz"
LICENSE="MIT"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~s390 ~x86"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~s390 ~sparc ~x86"
SLOT="$(ver_cut 1)"
IUSE=""
diff --git a/dev-util/bpftrace/Manifest b/dev-util/bpftrace/Manifest
index 05368aaf51b3..dfcb4d56f4df 100644
--- a/dev-util/bpftrace/Manifest
+++ b/dev-util/bpftrace/Manifest
@@ -1,2 +1,3 @@
DIST bpftrace-0.10.0.tar.gz 835854 BLAKE2B 623369bb2a2ad8d5eec364afa98bdae3fbe5e66182d8f1187fe86a8bd70ee357a554eb063fdbe5476eab23912adf2cf027092cac3e6989d8f716e91aa5d01212 SHA512 da400efe78cea505a32deead594b047ec4394d3eefe86e7b6853fe2dc715c5847a3abcbd26c1fac39d0a534f1e57d6c0bc3625e0c3f1054b0d84b7b1d6eb69b9
DIST bpftrace-0.11.0.tar.gz 867444 BLAKE2B a99255befadea0b4cb54299a8318c0a7a667ac2258b612750705b4d351ac59f4411f2567bc0100929291e3c9756d276671e41af9d398b118b3d486dace2953d7 SHA512 32bf0c23a7b0e1a57d0e0b8fc845a9e184e201ac3f6018a3d3cee8c97096093b333578cb898ede02fb3ab8d55ba9bcd2bb67ac70b81a49461c0f6e5c03c2a6f5
+DIST bpftrace-0.11.1.tar.gz 867481 BLAKE2B d77e69e21a1cdd65c610b57a8e16d02ff2da69bbb6fd207ff312d2ee3dd4ccbaded205e4b9f16a7ff24177fbc227304ffbb447cd974f44c7828d54f38ad573d5 SHA512 361cedc6ce8a950188717db5ffd005b9709371010810cf6bc870ca945c1db9bdc7ab99b55b694345d580d03145b3eb6ca169f2f1f9909f3e9fc34250df9999f3
diff --git a/dev-util/bpftrace/bpftrace-0.11.1.ebuild b/dev-util/bpftrace/bpftrace-0.11.1.ebuild
new file mode 100644
index 000000000000..6eeeb6c28d67
--- /dev/null
+++ b/dev-util/bpftrace/bpftrace-0.11.1.ebuild
@@ -0,0 +1,85 @@
+# Copyright 2019-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit toolchain-funcs llvm linux-info cmake
+
+DESCRIPTION="High-level tracing language for eBPF"
+HOMEPAGE="https://github.com/iovisor/bpftrace"
+
+if [[ ${PV} =~ 9{4,} ]]; then
+ inherit git-r3
+ EGIT_REPO_URI="https://github.com/iovisor/${PN}"
+ BDEPEND=""
+else
+ MY_PV="${PV//_/}"
+ SRC_URI="https://github.com/iovisor/${PN}/archive/v${MY_PV}.tar.gz -> ${P}.tar.gz"
+ KEYWORDS="~amd64 ~arm64 ~x86"
+ BDEPEND="app-arch/xz-utils "
+fi
+
+LICENSE="Apache-2.0"
+SLOT="0"
+IUSE="test"
+
+COMMON_DEPEND="
+ dev-util/systemtap
+ sys-devel/clang:=
+ dev-libs/libbpf:=
+ >=sys-devel/llvm-3.7.1:=[llvm_targets_BPF(+)]
+ sys-devel/clang:=
+ >=dev-util/bcc-0.13.0:=
+ virtual/libelf
+"
+DEPEND="${COMMON_DEPEND}
+ test? ( dev-cpp/gtest )
+"
+RDEPEND="${COMMON_DEPEND}"
+BDEPEND+="
+ >=dev-util/cmake-3.8
+ sys-devel/flex
+ sys-devel/bison
+"
+
+S="${WORKDIR}/${PN}-${MY_PV:-${PV}}"
+QA_DT_NEEDED="/usr/lib.*/libbpftraceresources.so"
+
+PATCHES=(
+ "${FILESDIR}/bpftrace-0.11.0-install-libs.patch"
+ "${FILESDIR}/bpftrace-0.10.0-dont-compress-man.patch"
+)
+
+# lots of fixing needed
+RESTRICT="test"
+
+pkg_pretend() {
+ local CONFIG_CHECK="
+ ~BPF
+ ~BPF_EVENTS
+ ~BPF_JIT
+ ~BPF_SYSCALL
+ ~FTRACE_SYSCALLS
+ ~HAVE_EBPF_JIT
+ "
+
+ check_extra_config
+}
+
+pkg_setup() {
+ LLVM_MAX_SLOT=11 llvm_pkg_setup
+}
+
+src_prepare() {
+ cmake_src_prepare
+}
+
+src_configure() {
+ local -a mycmakeargs
+ mycmakeargs=(
+ "-DSTATIC_LINKING:BOOL=OFF"
+ "-DBUILD_TESTING:BOOL=OFF"
+ )
+
+ cmake_src_configure
+}
diff --git a/dev-util/cmake/Manifest b/dev-util/cmake/Manifest
index 5ee7baca2596..6b6e19a4f08a 100644
--- a/dev-util/cmake/Manifest
+++ b/dev-util/cmake/Manifest
@@ -2,3 +2,4 @@ DIST cmake-3.13.5.tar.gz 8618821 BLAKE2B 765678bc92821207c53bfb4ac995a791b938f20
DIST cmake-3.16.5.tar.gz 9111262 BLAKE2B 5f996113a4979563d7b9f298b4b1a32d6f91eebaa79af42e1cbf247884e443de47e30030fd0f16c7755c4086e2bff0c0741911753ea7c889b68c393c0b98c876 SHA512 204ce83501c8068ff660c30a68641a354764135e1600a9a95b39476d072876e400961377e19bbe03a7b18412b36dcf21a693946a2a81cff5985e637e9f193671
DIST cmake-3.17.4.tar.gz 9473549 BLAKE2B 2ce29415525b5292ae9e06d73570ed0af2173d8d15612f4d645f22d4f55cb99018663c374c4282731e09f8c6e4ffd59316d65f38aef9db5c34d874ca8992382b SHA512 6af879502e52388f3be02a4edfb006274840ad1afa8f28ffd6ec69b0310c7f718812b2272e5f77ffa422717f61407a6d482deb95941555c21c73fc5f62356a4e
DIST cmake-3.18.2.tar.gz 8970663 BLAKE2B 10924eabbcd20bc3dc2cb6f2d619d824ed0a28fdf35ce6b92ed46d0d85320343d797b0c810aa90ab740477548e3390ed98ec5d2777f635920bff84eecb8e0531 SHA512 74915e643d09af1d8451e57120f2e5963f6fd34ca2cfa0cd573bd7f234924458105e7cc76952c022732de7566cd590141127b243933a564ac575a0dcbb8cc6e7
+DIST cmake-3.18.3.tar.gz 8976093 BLAKE2B 266432f8647828359e0f1a4390d62ac6449fcee5c7bc95d96fea62bc0ae94af9734edf6e0366efe95e3c65c5f29e16abbec0ae6b086781926ac0ae0a08a64b19 SHA512 28c0c310b6cd8117d4a8b9ad60064b22b00bdc170303b190994e9a3d4fe83fbd9cae6c8f36da62faf6c356b5acf430c78878f19210386ec26844b56334d3941e
diff --git a/dev-util/cmake/cmake-3.18.3.ebuild b/dev-util/cmake/cmake-3.18.3.ebuild
new file mode 100644
index 000000000000..7334e72c320d
--- /dev/null
+++ b/dev-util/cmake/cmake-3.18.3.ebuild
@@ -0,0 +1,214 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+CMAKE_MAKEFILE_GENERATOR="emake" # TODO: Re-check with 3.19, see commit 491dddfb; bug #596460
+CMAKE_REMOVE_MODULES_LIST=( none )
+inherit bash-completion-r1 cmake elisp-common flag-o-matic multiprocessing \
+ toolchain-funcs virtualx xdg-utils
+
+MY_P="${P/_/-}"
+
+DESCRIPTION="Cross platform Make"
+HOMEPAGE="https://cmake.org/"
+SRC_URI="https://cmake.org/files/v$(ver_cut 1-2)/${MY_P}.tar.gz"
+
+LICENSE="CMake"
+SLOT="0"
+[[ "${PV}" = *_rc* ]] || \
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
+IUSE="doc emacs ncurses qt5 test"
+RESTRICT="!test? ( test )"
+
+RDEPEND="
+ >=app-arch/libarchive-3.3.3:=
+ app-crypt/rhash
+ >=dev-libs/expat-2.0.1
+ >=dev-libs/jsoncpp-1.9.2-r2:0=
+ >=dev-libs/libuv-1.10.0:=
+ >=net-misc/curl-7.21.5[ssl]
+ sys-libs/zlib
+ virtual/pkgconfig
+ emacs? ( >=app-editors/emacs-23.1:* )
+ ncurses? ( sys-libs/ncurses:0= )
+ qt5? (
+ dev-qt/qtcore:5
+ dev-qt/qtgui:5
+ dev-qt/qtwidgets:5
+ )
+"
+DEPEND="${RDEPEND}"
+BDEPEND="
+ doc? (
+ dev-python/requests
+ dev-python/sphinx
+ )
+"
+
+S="${WORKDIR}/${MY_P}"
+
+SITEFILE="50${PN}-gentoo.el"
+
+PATCHES=(
+ # prefix
+ "${FILESDIR}"/${PN}-3.16.0_rc4-darwin-bundle.patch
+ "${FILESDIR}"/${PN}-3.14.0_rc3-prefix-dirs.patch
+ # Next patch requires new work from prefix people
+ #"${FILESDIR}"/${PN}-3.1.0-darwin-isysroot.patch
+
+ # handle gentoo packaging in find modules
+ "${FILESDIR}"/${PN}-3.17.0_rc1-FindBLAS.patch
+ "${FILESDIR}"/${PN}-3.17.0_rc1-FindLAPACK.patch
+ "${FILESDIR}"/${PN}-3.5.2-FindQt4.patch
+
+ # respect python eclasses
+ "${FILESDIR}"/${PN}-2.8.10.2-FindPythonLibs.patch
+ "${FILESDIR}"/${PN}-3.9.0_rc2-FindPythonInterp.patch
+
+ "${FILESDIR}"/${PN}-3.18.0-filter_distcc_warning.patch # bug 691544
+
+ # upstream fixes (can usually be removed with a version bump)
+)
+
+cmake_src_bootstrap() {
+ # disable running of cmake in bootstrap command
+ sed -i \
+ -e '/"${cmake_bootstrap_dir}\/cmake"/s/^/#DONOTRUN /' \
+ bootstrap || die "sed failed"
+
+ # execinfo.h on Solaris isn't quite what it is on Darwin
+ if [[ ${CHOST} == *-solaris* ]] ; then
+ sed -i -e 's/execinfo\.h/blablabla.h/' \
+ Source/kwsys/CMakeLists.txt || die
+ fi
+
+ # bootstrap script isn't exactly /bin/sh compatible
+ tc-env_build ${CONFIG_SHELL:-sh} ./bootstrap \
+ --prefix="${T}/cmakestrap/" \
+ --parallel=$(makeopts_jobs "${MAKEOPTS}" "$(get_nproc)") \
+ || die "Bootstrap failed"
+}
+
+cmake_src_test() {
+ # fix OutDir and SelectLibraryConfigurations tests
+ # these are altered thanks to our eclass
+ sed -i -e 's:^#_cmake_modify_IGNORE ::g' \
+ "${S}"/Tests/{OutDir,CMakeOnly/SelectLibraryConfigurations}/CMakeLists.txt \
+ || die
+
+ pushd "${BUILD_DIR}" > /dev/null
+
+ local ctestargs
+ [[ -n ${TEST_VERBOSE} ]] && ctestargs="--extra-verbose --output-on-failure"
+
+ # Excluded tests:
+ # BootstrapTest: we actually bootstrap it every time so why test it.
+ # BundleUtilities: bundle creation broken
+ # CMakeOnly.AllFindModules: pthread issues
+ # CTest.updatecvs: fails to commit as root
+ # Fortran: requires fortran
+ # RunCMake.CommandLineTar: whatever...
+ # RunCMake.CompilerLauncher: also requires fortran
+ # RunCMake.CPack_RPM: breaks if app-arch/rpm is installed because
+ # debugedit binary is not in the expected location
+ # RunCMake.CPack_DEB: breaks if app-arch/dpkg is installed because
+ # it can't find a deb package that owns libc
+ # RunCMake.{IncompatibleQt,ObsoleteQtMacros}: Require Qt4
+ # TestUpload: requires network access
+ "${BUILD_DIR}"/bin/ctest \
+ -j "$(makeopts_jobs)" \
+ --test-load "$(makeopts_loadavg)" \
+ ${ctestargs} \
+ -E "(BootstrapTest|BundleUtilities|CMakeOnly.AllFindModules|CompileOptions|CTest.UpdateCVS|Fortran|RunCMake.CommandLineTar|RunCMake.CompilerLauncher|RunCMake.IncompatibleQt|RunCMake.ObsoleteQtMacros|RunCMake.PrecompileHeaders|RunCMake.CPack_(DEB|RPM)|TestUpload)" \
+ || die "Tests failed"
+
+ popd > /dev/null
+}
+
+src_prepare() {
+ cmake_src_prepare
+
+ # disable Xcode hooks, bug #652134
+ if [[ ${CHOST} == *-darwin* ]] ; then
+ sed -i -e 's/__APPLE__/__DISABLED_APPLE__/' \
+ Source/cmGlobalXCodeGenerator.cxx || die
+ fi
+
+ # Add gcc libs to the default link paths
+ sed -i \
+ -e "s|@GENTOO_PORTAGE_GCCLIBDIR@|${EPREFIX}/usr/${CHOST}/lib/|g" \
+ -e "$(usex prefix-guest "s|@GENTOO_HOST@||" "/@GENTOO_HOST@/d")" \
+ -e "s|@GENTOO_PORTAGE_EPREFIX@|${EPREFIX}/|g" \
+ Modules/Platform/{UnixPaths,Darwin}.cmake || die "sed failed"
+ if ! has_version -b \>=${CATEGORY}/${PN}-3.4.0_rc1 || ! cmake --version &>/dev/null ; then
+ CMAKE_BINARY="${S}/Bootstrap.cmk/cmake"
+ cmake_src_bootstrap
+ fi
+}
+
+src_configure() {
+ # Fix linking on Solaris
+ [[ ${CHOST} == *-solaris* ]] && append-ldflags -lsocket -lnsl
+
+ local mycmakeargs=(
+ -DCMAKE_USE_SYSTEM_LIBRARIES=ON
+ -DCMAKE_DOC_DIR=/share/doc/${PF}
+ -DCMAKE_MAN_DIR=/share/man
+ -DCMAKE_DATA_DIR=/share/${PN}
+ -DSPHINX_MAN=$(usex doc)
+ -DSPHINX_HTML=$(usex doc)
+ -DBUILD_CursesDialog="$(usex ncurses)"
+ -DBUILD_TESTING=$(usex test)
+ )
+ use qt5 && mycmakeargs+=( -DBUILD_QtDialog=ON )
+
+ cmake_src_configure
+}
+
+src_compile() {
+ cmake_src_compile
+ use emacs && elisp-compile Auxiliary/cmake-mode.el
+}
+
+src_test() {
+ virtx cmake_src_test
+}
+
+src_install() {
+ cmake_src_install
+
+ if use emacs; then
+ elisp-install ${PN} Auxiliary/cmake-mode.el Auxiliary/cmake-mode.elc
+ elisp-site-file-install "${FILESDIR}/${SITEFILE}"
+ fi
+
+ insinto /usr/share/vim/vimfiles/syntax
+ doins Auxiliary/vim/syntax/cmake.vim
+
+ insinto /usr/share/vim/vimfiles/indent
+ doins Auxiliary/vim/indent/cmake.vim
+
+ insinto /usr/share/vim/vimfiles/ftdetect
+ doins "${FILESDIR}/${PN}.vim"
+
+ dobashcomp Auxiliary/bash-completion/{${PN},ctest,cpack}
+}
+
+pkg_postinst() {
+ use emacs && elisp-site-regen
+ if use qt5; then
+ xdg_icon_cache_update
+ xdg_desktop_database_update
+ xdg_mimeinfo_database_update
+ fi
+}
+
+pkg_postrm() {
+ use emacs && elisp-site-regen
+ if use qt5; then
+ xdg_icon_cache_update
+ xdg_desktop_database_update
+ xdg_mimeinfo_database_update
+ fi
+}
diff --git a/dev-util/cvise/cvise-1.6.0.ebuild b/dev-util/cvise/cvise-1.6.0.ebuild
index 819ee2f921ed..ac8d916a8431 100644
--- a/dev-util/cvise/cvise-1.6.0.ebuild
+++ b/dev-util/cvise/cvise-1.6.0.ebuild
@@ -14,7 +14,7 @@ SRC_URI="
LICENSE="UoI-NCSA"
SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
IUSE="test"
RESTRICT="!test? ( test )"
REQUIRED_USE=${PYTHON_REQUIRED_USE}
diff --git a/dev-util/cwdiff/Manifest b/dev-util/cwdiff/Manifest
index 399d9aacc26d..6a65184adeec 100644
--- a/dev-util/cwdiff/Manifest
+++ b/dev-util/cwdiff/Manifest
@@ -1,4 +1 @@
-DIST cwdiff-0.2.8.tar.gz 4246 BLAKE2B 6161bda18738c5b7c5605349fdf7a726d63f6fadc8c5fe5d36587b06674c74a41de86910aec67e12926f9fa586b485bfee02895d8d8e3bb6f50970a6e4814d5d SHA512 bb1fb3790cc2d8f4e5f199e7abc9bf6a999ded0d25fc9e62ca1e003505f1d33b6c8575b0172a2e55128c4e5c853147304c928d0f1094c5b30e6a015b9fbcae09
-DIST cwdiff-0.3.0.tar.gz 4666 BLAKE2B 9f3b660647723dd34939bdc29450c02001f7430955fbfd0197cc0713b516fcb4124e853b9c8828606f20c3cc363aa5f4cb0d6d38004f021a47c0ed2494229523 SHA512 40401a0541209c83cd78ff55c62ce71dd362cf8674b07c1cdd56ad7a505741e818003f07c87fe0303cd2bfd911d99b8f560697612b32b6fee794a7671e7e86f0
-DIST cwdiff-0.3.1.tar.gz 4706 BLAKE2B 644d1a42a8fa4119f844f55910b625343f757939ff82babd7d3702ee3759efcf005e4d7405505bba593795af79da452eaae469b550892ab5f37ebdca47f93ed0 SHA512 ffea1f699d333655eebfe96048dcc96c57408d42915d707e10b9231a27cc7a8803c3b47876227e24da67376ec18f9261739b9fb13889f8b47d336ca048cbfa72
DIST cwdiff-0.4.0.tar.gz 4468 BLAKE2B 3c2310c5f57d932d46df1e53a130f4df7f8c5206689df00412507949f7e613e13dbe72b006be1d9adc7c9d630fc91303c900f17914fefa66fd9fa9a9f11f4918 SHA512 b5deda44d94bd3aa93a68da136f4170996ee02c683c38329cbc16a108e0795e86c3543759e1d7adc3d512d4dcbc416436e733341e1b4f3d96325e999e84a4fbe
diff --git a/dev-util/cwdiff/cwdiff-0.2.8.ebuild b/dev-util/cwdiff/cwdiff-0.2.8.ebuild
deleted file mode 100644
index f8776fd6d4f2..000000000000
--- a/dev-util/cwdiff/cwdiff-0.2.8.ebuild
+++ /dev/null
@@ -1,32 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-DESCRIPTION="A script that wraps wdiff to support directories and colorize the output"
-HOMEPAGE="https://github.com/junghans/cwdiff"
-SRC_URI="https://github.com/junghans/cwdiff/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~x86 ~amd64-linux ~x64-macos ~x86-macos"
-IUSE="a2ps mercurial"
-
-DEPEND=""
-RDEPEND="
- sys-apps/sed
- app-shells/bash
- app-text/wdiff
- sys-apps/diffutils
- a2ps? ( app-text/a2ps )
- mercurial? ( dev-vcs/mercurial )
- "
-
-src_install() {
- dobin "${PN}"
- if use mercurial ; then
- insinto /etc/mercurial/hgrc.d
- doins hgrc.d/"${PN}".rc
- fi
- dodoc README.md
-}
diff --git a/dev-util/cwdiff/cwdiff-0.3.0.ebuild b/dev-util/cwdiff/cwdiff-0.3.0.ebuild
deleted file mode 100644
index 95a7d5783001..000000000000
--- a/dev-util/cwdiff/cwdiff-0.3.0.ebuild
+++ /dev/null
@@ -1,36 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-if [ "${PV}" = "9999" ]; then
- EGIT_REPO_URI="https://github.com/junghans/${PN}.git"
- inherit git-r3
- KEYWORDS=""
-else
- SRC_URI="https://github.com/junghans/cwdiff/archive/v${PV}.tar.gz -> ${P}.tar.gz"
- KEYWORDS="~amd64 ~arm ~x86 ~amd64-linux ~x64-macos ~x86-macos"
-fi
-
-DESCRIPTION="A script that wraps wdiff to support directories and colorize the output"
-HOMEPAGE="https://github.com/junghans/cwdiff"
-
-LICENSE="GPL-2"
-SLOT="0"
-IUSE="a2ps mercurial"
-
-DEPEND="sys-apps/help2man
- sys-apps/coreutils"
-RDEPEND="
- sys-apps/sed
- app-shells/bash
- app-text/wdiff
- sys-apps/diffutils
- a2ps? ( app-text/a2ps )
- mercurial? ( dev-vcs/mercurial )
- "
-
-src_install() {
- emake DESTDIR="${ED}" $(usex mercurial '' 'HGRCDIR=') install
- dodoc README.md
-}
diff --git a/dev-util/cwdiff/cwdiff-0.3.1.ebuild b/dev-util/cwdiff/cwdiff-0.3.1.ebuild
deleted file mode 100644
index 95a7d5783001..000000000000
--- a/dev-util/cwdiff/cwdiff-0.3.1.ebuild
+++ /dev/null
@@ -1,36 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-if [ "${PV}" = "9999" ]; then
- EGIT_REPO_URI="https://github.com/junghans/${PN}.git"
- inherit git-r3
- KEYWORDS=""
-else
- SRC_URI="https://github.com/junghans/cwdiff/archive/v${PV}.tar.gz -> ${P}.tar.gz"
- KEYWORDS="~amd64 ~arm ~x86 ~amd64-linux ~x64-macos ~x86-macos"
-fi
-
-DESCRIPTION="A script that wraps wdiff to support directories and colorize the output"
-HOMEPAGE="https://github.com/junghans/cwdiff"
-
-LICENSE="GPL-2"
-SLOT="0"
-IUSE="a2ps mercurial"
-
-DEPEND="sys-apps/help2man
- sys-apps/coreutils"
-RDEPEND="
- sys-apps/sed
- app-shells/bash
- app-text/wdiff
- sys-apps/diffutils
- a2ps? ( app-text/a2ps )
- mercurial? ( dev-vcs/mercurial )
- "
-
-src_install() {
- emake DESTDIR="${ED}" $(usex mercurial '' 'HGRCDIR=') install
- dodoc README.md
-}
diff --git a/dev-util/lldb/Manifest b/dev-util/lldb/Manifest
index 8ceb93829922..dff4b05ec630 100644
--- a/dev-util/lldb/Manifest
+++ b/dev-util/lldb/Manifest
@@ -1,5 +1,4 @@
DIST llvmorg-10.0.0.tar.gz 120804856 BLAKE2B 6b0254f5b913398cdcf2b2ec1ff219888706d2b79d5296590934714e42ac79f6a6547941ac2b1d2c4e6313dd18b6c7068e748aa6ac033e49fccbf5d355aa8191 SHA512 baa182d62fef1851836013ae8a1a00861ea89769778d67fb97b407a9de664e6c85da2af9c5b3f75d2bf34ff6b00004e531ca7e4b3115a26c0e61c575cf2303a0
DIST llvmorg-10.0.1.tar.gz 120880730 BLAKE2B 30f19f56c4d1f6abcda5fec76256219d1e3c8a6ff1a1f152f94bfe362c07884339fe571ff7fe903ed3b3deb150b2fa868c387887a0dea2930dc08b81db71a5b1 SHA512 48078fff9293a87f1a973f3348f79506f04c3da774295f5eb67d74dd2d1aa94f0973f8ced3f4ab9e8339902071f82c603b43d5608ad7227046c4da769c5d2151
-DIST llvmorg-11.0.0-rc1.tar.gz 122688246 BLAKE2B 10ff3f08ff3780abb1d86ac67942e6aac52ff5daf820a2e3d23d8b79dbade1c5b1d398d0a577028d2d7c8759ab9a8b552a0305b5750310a015585c06cdadf844 SHA512 09564ed903902a5795fffaa4679badc30bf49739889a48074b5ae2c93bd29000cfb36a650208d5cae5d74899bade066f84b4aa023fc852eec246ff67bf64a267
-DIST llvmorg-11.0.0-rc2.tar.gz 122728230 BLAKE2B 7944adf41ec7cd82489666a0a38a857de628879d59a2e3bb566b67c18500092430db66ff214d45cb324128c874a74a72c367b452df3b88ec95b33c284dd35512 SHA512 25eb2879eb22e79a1e840ef24cf3f5eec602e947101db299393e06e3d09f2d1531eef214264636e1b511eafff7f51b1834d5a03976ccd088eb680745b147e9f3
+DIST llvmorg-11.0.0-rc3.tar.gz 122766783 BLAKE2B 052fdc864fed52692141284ebdc41d52d21fbeaf24ac5ed3e67701537baa683bae61b1c06de68322e0578a27a1f5a8856088cdc001d2b8d34d2ec88ae65ff739 SHA512 a28ce74775373c63fe23b3116cd25db0efb95c6fdb60e56f2522659a404a59576f3d9429a109cb0f90534927259289aa1c712673f36f92272d642bf8dce5699f
DIST llvmorg-9.0.1.tar.gz 113193320 BLAKE2B b86e405f2b8e00436045fd409fe19cdde75c797b1192c62a22b5ec75e6b4dc8e874a0f33008dc31562445e4cbe53a992b6f48c684255a6a1ef261e595b8b161f SHA512 fa88beeaae94b6d0cd9b5ba38658d0ffed8004035d7d8a4f95c3d31a709b88b581ae9bd7761333c8e5375c44b8f6be01768b5a3be901163159d7e6c43b71da59
diff --git a/dev-util/lldb/lldb-10.0.1.ebuild b/dev-util/lldb/lldb-10.0.1.ebuild
index 943331abc987..8f08cb60395e 100644
--- a/dev-util/lldb/lldb-10.0.1.ebuild
+++ b/dev-util/lldb/lldb-10.0.1.ebuild
@@ -85,7 +85,8 @@ src_configure() {
src_test() {
local -x LIT_PRESERVES_TMP=1
cmake_build check-lldb-lit
- use python && cmake_build check-lldb
+ # failures + hangs
+ #use python && cmake_build check-lldb
}
src_install() {
diff --git a/dev-util/lldb/lldb-11.0.0.9999.ebuild b/dev-util/lldb/lldb-11.0.0.9999.ebuild
index 2dfe01834ca3..a5b3aee8c3df 100644
--- a/dev-util/lldb/lldb-11.0.0.9999.ebuild
+++ b/dev-util/lldb/lldb-11.0.0.9999.ebuild
@@ -85,7 +85,8 @@ src_configure() {
src_test() {
local -x LIT_PRESERVES_TMP=1
cmake_build check-lldb-lit
- use python && cmake_build check-lldb
+ # failures + hangs
+ #use python && cmake_build check-lldb
}
src_install() {
diff --git a/dev-util/lldb/lldb-11.0.0_rc1.ebuild b/dev-util/lldb/lldb-11.0.0_rc1.ebuild
deleted file mode 100644
index 2dfe01834ca3..000000000000
--- a/dev-util/lldb/lldb-11.0.0_rc1.ebuild
+++ /dev/null
@@ -1,96 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{6..9} )
-inherit cmake llvm llvm.org python-single-r1 toolchain-funcs
-
-DESCRIPTION="The LLVM debugger"
-HOMEPAGE="https://llvm.org/"
-LLVM_COMPONENTS=( lldb )
-LLVM_TEST_COMPONENTS=( llvm/lib/Testing/Support llvm/utils/unittest )
-llvm.org_set_globals
-
-LICENSE="Apache-2.0-with-LLVM-exceptions UoI-NCSA"
-SLOT="0"
-KEYWORDS=""
-IUSE="libedit lzma ncurses +python test"
-REQUIRED_USE=${PYTHON_REQUIRED_USE}
-RESTRICT="!test? ( test )"
-
-RDEPEND="
- libedit? ( dev-libs/libedit:0= )
- lzma? ( app-arch/xz-utils:= )
- ncurses? ( >=sys-libs/ncurses-5.9-r3:0= )
- python? (
- $(python_gen_cond_dep '
- dev-python/six[${PYTHON_MULTI_USEDEP}]
- ')
- ${PYTHON_DEPS}
- )
- ~sys-devel/clang-${PV}[xml]
- ~sys-devel/llvm-${PV}
- ! "${T}/${PN}.vim"
- insinto /usr/share/vim/vimfiles/ftdetect
- doins "${T}/${PN}.vim"
- fi
-
- insinto /usr/share/zsh/site-functions
- newins misc/zsh-completion _ninja
-
- if use emacs; then
- cd misc || die
- elisp-install ${PN} ninja-mode.el* || die
- fi
-}
-
-pkg_postinst() {
- use emacs && elisp-site-regen
-}
-
-pkg_postrm() {
- use emacs && elisp-site-regen
-}
diff --git a/dev-util/ninja/ninja-1.8.2-r2.ebuild b/dev-util/ninja/ninja-1.8.2-r2.ebuild
deleted file mode 100644
index 17b2dfc3f74c..000000000000
--- a/dev-util/ninja/ninja-1.8.2-r2.ebuild
+++ /dev/null
@@ -1,128 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python3_6 )
-
-inherit bash-completion-r1 elisp-common python-any-r1 toolchain-funcs
-
-if [[ ${PV} == 9999 ]]; then
- inherit git-r3
- EGIT_REPO_URI="https://github.com/ninja-build/ninja.git"
-else
- KITWARE_VERSION="1.8.2.g81279.kitware.dyndep-1.jobserver-1"
- MY_P="ninja-${KITWARE_VERSION}"
- S="${WORKDIR}/${MY_P}"
- SRC_URI="https://github.com/Kitware/ninja/archive/v${KITWARE_VERSION}.tar.gz -> ${MY_P}.tar.gz"
- KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris"
-fi
-
-DESCRIPTION="A small build system similar to make"
-HOMEPAGE="https://ninja-build.org/"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-
-IUSE="doc emacs test vim-syntax"
-RESTRICT="!test? ( test )"
-
-DEPEND="
- ${PYTHON_DEPS}
- dev-util/re2c
- doc? (
- app-text/asciidoc
- app-doc/doxygen
- dev-libs/libxslt
- )
- test? ( dev-cpp/gtest )
-"
-RDEPEND="
- emacs? ( >=app-editors/emacs-23.1:* )
- vim-syntax? (
- || (
- app-editors/vim
- app-editors/gvim
- )
- )"
-
-run_for_build() {
- if tc-is-cross-compiler; then
- local -x AR=$(tc-getBUILD_AR)
- local -x CXX=$(tc-getBUILD_CXX)
- local -x CFLAGS=${BUILD_CXXFLAGS}
- local -x LDFLAGS=${BUILD_LDFLAGS}
- fi
- "$@"
-}
-
-src_compile() {
- tc-export AR CXX
-
- # configure.py uses CFLAGS instead of CXXFLAGS
- export CFLAGS=${CXXFLAGS}
-
- run_for_build "${PYTHON}" configure.py --bootstrap --verbose || die
-
- if tc-is-cross-compiler; then
- mv ninja ninja-build || die
- "${PYTHON}" configure.py || die
- ./ninja-build -v ninja || die
- else
- ln ninja ninja-build || die
- fi
-
- if use doc; then
- ./ninja-build -v doxygen manual || die
- fi
-
- if use emacs; then
- elisp-compile misc/ninja-mode.el || die
- fi
-}
-
-src_test() {
- if ! tc-is-cross-compiler; then
- # Bug 485772
- ulimit -n 2048
- ./ninja-build -v ninja_test || die
- ./ninja_test || die
- fi
-}
-
-src_install() {
- dodoc README HACKING.md
- if use doc; then
- docinto html
- dodoc -r doc/doxygen/html/.
- dodoc doc/manual.html
- fi
- dobin ninja
-
- newbashcomp misc/bash-completion "${PN}"
-
- if use vim-syntax; then
- insinto /usr/share/vim/vimfiles/syntax/
- doins misc/"${PN}".vim
-
- echo 'au BufNewFile,BufRead *.ninja set ft=ninja' > "${T}/${PN}.vim"
- insinto /usr/share/vim/vimfiles/ftdetect
- doins "${T}/${PN}.vim"
- fi
-
- insinto /usr/share/zsh/site-functions
- newins misc/zsh-completion _ninja
-
- if use emacs; then
- cd misc || die
- elisp-install ${PN} ninja-mode.el* || die
- fi
-}
-
-pkg_postinst() {
- use emacs && elisp-site-regen
-}
-
-pkg_postrm() {
- use emacs && elisp-site-regen
-}
diff --git a/dev-util/ninja/ninja-1.8.2.ebuild b/dev-util/ninja/ninja-1.8.2.ebuild
deleted file mode 100644
index 6f2d2e97d8bd..000000000000
--- a/dev-util/ninja/ninja-1.8.2.ebuild
+++ /dev/null
@@ -1,125 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python3_6 )
-
-inherit bash-completion-r1 elisp-common python-any-r1 toolchain-funcs
-
-if [[ ${PV} == 9999 ]]; then
- inherit git-r3
- EGIT_REPO_URI="https://github.com/ninja-build/ninja.git"
-else
- SRC_URI="https://github.com/ninja-build/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
- KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris"
-fi
-
-DESCRIPTION="A small build system similar to make"
-HOMEPAGE="https://ninja-build.org/"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-
-IUSE="doc emacs test vim-syntax"
-RESTRICT="!test? ( test )"
-
-DEPEND="
- ${PYTHON_DEPS}
- dev-util/re2c
- doc? (
- app-text/asciidoc
- app-doc/doxygen
- dev-libs/libxslt
- )
- test? ( dev-cpp/gtest )
-"
-RDEPEND="
- emacs? ( >=app-editors/emacs-23.1:* )
- vim-syntax? (
- || (
- app-editors/vim
- app-editors/gvim
- )
- )"
-
-run_for_build() {
- if tc-is-cross-compiler; then
- local -x AR=$(tc-getBUILD_AR)
- local -x CXX=$(tc-getBUILD_CXX)
- local -x CFLAGS=${BUILD_CXXFLAGS}
- local -x LDFLAGS=${BUILD_LDFLAGS}
- fi
- "$@"
-}
-
-src_compile() {
- tc-export AR CXX
-
- # configure.py uses CFLAGS instead of CXXFLAGS
- export CFLAGS=${CXXFLAGS}
-
- run_for_build "${PYTHON}" configure.py --bootstrap --verbose || die
-
- if tc-is-cross-compiler; then
- mv ninja ninja-build || die
- "${PYTHON}" configure.py || die
- ./ninja-build -v ninja || die
- else
- ln ninja ninja-build || die
- fi
-
- if use doc; then
- ./ninja-build -v doxygen manual || die
- fi
-
- if use emacs; then
- elisp-compile misc/ninja-mode.el || die
- fi
-}
-
-src_test() {
- if ! tc-is-cross-compiler; then
- # Bug 485772
- ulimit -n 2048
- ./ninja-build -v ninja_test || die
- ./ninja_test || die
- fi
-}
-
-src_install() {
- dodoc README HACKING.md
- if use doc; then
- docinto html
- dodoc -r doc/doxygen/html/.
- dodoc doc/manual.html
- fi
- dobin ninja
-
- newbashcomp misc/bash-completion "${PN}"
-
- if use vim-syntax; then
- insinto /usr/share/vim/vimfiles/syntax/
- doins misc/"${PN}".vim
-
- echo 'au BufNewFile,BufRead *.ninja set ft=ninja' > "${T}/${PN}.vim"
- insinto /usr/share/vim/vimfiles/ftdetect
- doins "${T}/${PN}.vim"
- fi
-
- insinto /usr/share/zsh/site-functions
- newins misc/zsh-completion _ninja
-
- if use emacs; then
- cd misc || die
- elisp-install ${PN} ninja-mode.el* || die
- fi
-}
-
-pkg_postinst() {
- use emacs && elisp-site-regen
-}
-
-pkg_postrm() {
- use emacs && elisp-site-regen
-}
diff --git a/dev-util/ninja/ninja-9999.ebuild b/dev-util/ninja/ninja-9999.ebuild
index 95a15369f8c9..4c3e5779de6a 100644
--- a/dev-util/ninja/ninja-9999.ebuild
+++ b/dev-util/ninja/ninja-9999.ebuild
@@ -3,7 +3,7 @@
EAPI=7
-PYTHON_COMPAT=( python{3_6,3_7} )
+PYTHON_COMPAT=( python3_{6,7,8,9} )
inherit bash-completion-r1 elisp-common python-any-r1 toolchain-funcs
diff --git a/dev-util/pkgcheck/Manifest b/dev-util/pkgcheck/Manifest
index b120eec4bdcc..51c10bfc90b1 100644
--- a/dev-util/pkgcheck/Manifest
+++ b/dev-util/pkgcheck/Manifest
@@ -1,2 +1 @@
-DIST pkgcheck-0.7.6.tar.gz 234637 BLAKE2B 31c31d987aed03e4a61f58a3dc3074985a4f436e3598f11257d602a668525f24e45c540d56e5779237cd36299b0ab73b9a59e3482099cb5accbb3ea8437cd7c5 SHA512 cfded3a5a0249ee9279fe93156ef524cafe7302915dfbbb01acd0bdc3acefcd1e90c6bcfbf3dc40bd5cb71680cc6453b1de045878d75a9ade00c432e663fd136
DIST pkgcheck-0.7.7.tar.gz 236359 BLAKE2B 46628e6fe1ab711773209785f3160ad5521f7173a676363a44102bd26b443eafe4f88829d9a6c9cf10538ebfa7ca8b28cb8c27f9719f98217ff626d1b5a9a0b3 SHA512 ac88a3aa689983bfac0efa85240e3a02c822a075095ff9940fac0cdc188428126e7612807e57a7582f21fcf1d668dba29d4785d062d757f6444fa024d0437751
diff --git a/dev-util/pkgcheck/pkgcheck-0.7.6-r1.ebuild b/dev-util/pkgcheck/pkgcheck-0.7.6-r1.ebuild
deleted file mode 100644
index 840d6dec3bad..000000000000
--- a/dev-util/pkgcheck/pkgcheck-0.7.6-r1.ebuild
+++ /dev/null
@@ -1,57 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-PYTHON_COMPAT=( python3_{6..9} )
-DISTUTILS_IN_SOURCE_BUILD=1
-inherit distutils-r1 optfeature
-
-if [[ ${PV} == *9999 ]] ; then
- EGIT_REPO_URI="https://github.com/pkgcore/pkgcheck.git"
- inherit git-r3
-else
- KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ppc ppc64 ~s390 sparc x86"
- SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-fi
-
-DESCRIPTION="pkgcore-based QA utility for ebuild repos"
-HOMEPAGE="https://github.com/pkgcore/pkgcheck"
-
-LICENSE="BSD"
-SLOT="0"
-IUSE="test"
-RESTRICT="!test? ( test )"
-
-if [[ ${PV} == *9999 ]]; then
- RDEPEND="
- ~dev-python/snakeoil-9999[${PYTHON_USEDEP}]
- ~sys-apps/pkgcore-9999[${PYTHON_USEDEP}]"
-else
- RDEPEND="
- >=dev-python/snakeoil-0.8.8[${PYTHON_USEDEP}]
- >=sys-apps/pkgcore-0.10.11[${PYTHON_USEDEP}]"
-fi
-RDEPEND+="
- dev-python/chardet[${PYTHON_USEDEP}]
- dev-python/lxml[${PYTHON_USEDEP}]
- dev-python/pathspec[${PYTHON_USEDEP}]
-"
-DEPEND="${RDEPEND}
- dev-python/setuptools[${PYTHON_USEDEP}]
- test? ( dev-python/pytest[${PYTHON_USEDEP}] )
-"
-
-python_test() {
- esetup.py test
-}
-
-python_install_all() {
- local DOCS=( NEWS.rst )
- [[ ${PV} == *9999 ]] || doman man/*
- distutils-r1_python_install_all
-}
-
-pkg_postinst() {
- optfeature "Network check support" dev-python/requests
- optfeature "Perl module version check support" dev-perl/Gentoo-PerlMod-Version
-}
diff --git a/dev-util/pkgcheck/pkgcheck-0.7.7.ebuild b/dev-util/pkgcheck/pkgcheck-0.7.7.ebuild
index 931de679b4fb..057a5bafc42b 100644
--- a/dev-util/pkgcheck/pkgcheck-0.7.7.ebuild
+++ b/dev-util/pkgcheck/pkgcheck-0.7.7.ebuild
@@ -10,7 +10,7 @@ if [[ ${PV} == *9999 ]] ; then
EGIT_REPO_URI="https://github.com/pkgcore/pkgcheck.git"
inherit git-r3
else
- KEYWORDS="~alpha ~amd64 arm arm64 hppa ~ia64 ppc ppc64 ~s390 sparc x86"
+ KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ppc ppc64 ~s390 sparc x86"
SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
fi
diff --git a/dev-util/rocminfo/Manifest b/dev-util/rocminfo/Manifest
index 1a4231a2ce6a..e79a96708c03 100644
--- a/dev-util/rocminfo/Manifest
+++ b/dev-util/rocminfo/Manifest
@@ -1 +1,2 @@
DIST rocminfo-3.7.0.tar.gz 15104 BLAKE2B 728ce471e52dadca8b59aa3196c2f75933650e3002335014accd7f8eada19d4936a7404f908d50747a0e51faa8a65764200072cf598f9d0855a3052db8290160 SHA512 25a6a9216366e310ece9db50a21bc0eb7741760a7b46fa1818ee102557000348f430f9269e2ba9e872437dfafcb31ac563476e2bf83a10705fde8dd5fc854404
+DIST rocminfo-3.8.0.tar.gz 15103 BLAKE2B afa6a2cd3315b18f2711cf1de4701e672beac76d08548453f9377c865f2b108f4f50340f545a9040450c7acded3ac093d334908a7ceddba35c847136fe92aa77 SHA512 c75fa7a4116b9cfa75d6b7ff3920c85ad19fea09ab5f6a7abebde9cd184763905aea8684574f6b1919044806af8ab35a81d7f6010cbd0fb18b36699a182b5f39
diff --git a/dev-util/rocminfo/rocminfo-3.8.0.ebuild b/dev-util/rocminfo/rocminfo-3.8.0.ebuild
new file mode 100644
index 000000000000..6de4e9b7cca0
--- /dev/null
+++ b/dev-util/rocminfo/rocminfo-3.8.0.ebuild
@@ -0,0 +1,23 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit cmake
+
+if [[ ${PV} == *9999 ]] ; then
+ EGIT_REPO_URI="https://github.com/RadeonOpenCompute/rocminfo/"
+ inherit git-r3
+else
+ SRC_URI="https://github.com/RadeonOpenCompute/rocminfo/archive/rocm-${PV}.tar.gz -> ${P}.tar.gz"
+ KEYWORDS="~amd64"
+ S="${WORKDIR}/rocminfo-rocm-${PV}"
+fi
+
+DESCRIPTION="ROCm Application for Reporting System Info"
+HOMEPAGE="https://github.com/RadeonOpenCompute/rocminfo"
+LICENSE="MIT"
+SLOT="0/$(ver_cut 1-2)"
+
+RDEPEND=">=dev-libs/rocr-runtime-${PV}"
+DEPEND="${RDEPEND}"
diff --git a/dev-util/rocminfo/rocminfo-9999.ebuild b/dev-util/rocminfo/rocminfo-9999.ebuild
index cac515f5ca2b..c993e808caf5 100644
--- a/dev-util/rocminfo/rocminfo-9999.ebuild
+++ b/dev-util/rocminfo/rocminfo-9999.ebuild
@@ -21,12 +21,3 @@ SLOT="0/$(ver_cut 1-2)"
RDEPEND="dev-libs/rocr-runtime"
DEPEND="${RDEPEND}"
-
-src_configure() {
- local mycmakeargs=(
- -DROCM_DIR="${ESYSROOT}/usr"
- -DROCR_INC_DIR="${ESYSROOT}/usr/include"
- -DROCR_LIB_DIR="${EPREFIX}/usr/$(get_libdir)"
- )
- cmake_src_configure
-}
diff --git a/dev-util/rustup/rustup-1.22.1-r1.ebuild b/dev-util/rustup/rustup-1.22.1-r1.ebuild
index fa40b7f00826..9f951ef8aa7d 100644
--- a/dev-util/rustup/rustup-1.22.1-r1.ebuild
+++ b/dev-util/rustup/rustup-1.22.1-r1.ebuild
@@ -251,7 +251,7 @@ SRC_URI="https://github.com/rust-lang/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz
LICENSE="Apache-2.0 Apache-2.0-with-LLVM-exceptions BSD Boost-1.0 CC0-1.0 MIT Unlicense ZLIB"
SLOT="0"
-KEYWORDS="~amd64 ~ppc64"
+KEYWORDS="~amd64 ~arm64 ~ppc64"
IUSE=""
# requires old libressl-2.5, so openssl only for now.
@@ -274,13 +274,18 @@ src_prepare() {
sed -i "/^home =/s:.*:home = { path = \"../home-${HOME_CRATE_COMMIT}\" }:" Cargo.toml || die
}
+src_configure() {
+ local myfeatures=( no-self-update )
+ cargo_src_configure
+}
+
src_compile() {
export OPENSSL_NO_VENDOR=true
- cargo_src_compile --features no-self-update
+ cargo_src_compile
}
src_install() {
- cargo_src_install --features no-self-update
+ cargo_src_install
einstalldocs
exeinto /usr/share/rustup
newexe "$(prefixify_ro "${FILESDIR}"/symlink_rustup.sh)" symlink_rustup
@@ -295,10 +300,6 @@ src_install() {
doins "${T}/_rustup"
}
-src_test() {
- cargo_src_test --features no-self-update
-}
-
pkg_postinst() {
einfo "No rustup toolchains installed by default"
einfo "system rust toolchain can be added to rustup by running"
diff --git a/dev-util/rustup/rustup-9999.ebuild b/dev-util/rustup/rustup-9999.ebuild
new file mode 100644
index 000000000000..5db8a446ae65
--- /dev/null
+++ b/dev-util/rustup/rustup-9999.ebuild
@@ -0,0 +1,81 @@
+# Copyright 2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+CRATES=""
+
+inherit bash-completion-r1 cargo prefix
+
+DESCRIPTION="Rust toolchain installer"
+HOMEPAGE="https://rust-lang.github.io/rustup/"
+
+if [[ ${PV} == "9999" ]] ; then
+ inherit git-r3
+ EGIT_REPO_URI="https://github.com/rust-lang/${PN}.git"
+else
+ SRC_URI="https://github.com/rust-lang/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz
+ $(cargo_crate_uris ${CRATES})"
+ KEYWORDS="~amd64 ~arm64 ~ppc64"
+fi
+
+LICENSE="Apache-2.0 Apache-2.0-with-LLVM-exceptions BSD Boost-1.0 CC0-1.0 MIT Unlicense ZLIB"
+SLOT="0"
+IUSE=""
+
+DEPEND="
+ app-arch/xz-utils
+ net-misc/curl:=[http2,ssl]
+ dev-libs/openssl:0=
+"
+RDEPEND="${DEPEND}"
+BDEPEND="virtual/rust"
+
+QA_FLAGS_IGNORED="usr/bin/.*"
+
+# uses network
+RESTRICT="test"
+
+src_unpack() {
+ if [[ "${PV}" == *9999* ]]; then
+ git-r3_src_unpack
+ cargo_live_src_unpack
+ else
+ cargo_src_unpack
+ fi
+}
+
+src_configure() {
+ local myfeatures=( no-self-update )
+ cargo_src_configure
+}
+
+src_compile() {
+ export OPENSSL_NO_VENDOR=true
+ cargo_src_compile
+}
+
+src_install() {
+ cargo_src_install
+ einstalldocs
+ exeinto /usr/share/rustup
+ newexe "$(prefixify_ro "${FILESDIR}"/symlink_rustup.sh)" symlink_rustup
+
+ ln -s "${ED}/usr/bin/rustup-init" rustup || die
+ ./rustup completions bash rustup > "${T}/rustup" || die
+ ./rustup completions zsh rustup > "${T}/_rustup" || die
+
+ dobashcomp "${T}/rustup"
+
+ insinto /usr/share/zsh/site-functions
+ doins "${T}/_rustup"
+}
+
+pkg_postinst() {
+ einfo "No rustup toolchains installed by default"
+ einfo "system rust toolchain can be added to rustup by running"
+ einfo "helper script installed to ${EPREFIX}/usr/share/rustup/symlink_rustup"
+ einfo "it will create proper symlinks in user home directory"
+ einfo "and rustup updates will be managed by portage"
+ einfo "please delete current rustup installation (if any) before running the script"
+}
diff --git a/dev-util/sccache/Manifest b/dev-util/sccache/Manifest
index 25a6f2e6d87c..d7321c443684 100644
--- a/dev-util/sccache/Manifest
+++ b/dev-util/sccache/Manifest
@@ -1,82 +1,53 @@
-DIST adler32-1.0.3.crate 5734 BLAKE2B 31cd43d1e13b5e854a195824084dc34a157ef59cccabaa335cfba2de532096046bbb66a9fce2430979b243509d608bfef752c46d80bdcc7e420e039269d575a3 SHA512 2128cc34abc74a363b18eec5abf414b95e4d84bfd99b6508ac807e13c026ad0e37e67b5a8c429212b85e78071f03e0df24ee70db5995772c4bc78acfb0234459
DIST adler32-1.0.4.crate 5105 BLAKE2B 344a5258e77328a24a545e32f9bc653fa25b7ea43803ed7861db261bce227aa1599520a42acea3de1f2acebb8fa9fad251e2688413b752eafe2401ca1a2ee34a SHA512 5990e1e277a1c3aae5adef5e4601b807a756a40e88578bb91f1c70d70babfa97fb3f2c1b963482ec8e18c16d5e722bf90fb42f9646c8dd840373f28965a2d123
-DIST aho-corasick-0.6.9.crate 25979 BLAKE2B a1bbec11c322d20d435d8683151b144e31f04b07ca47fc1c8128464533256f4004c8d346fe59a1e1c41be5609fdf768fad5f1afa5df94d1a02ced5c4f02c4bac SHA512 8dfc817b435d8a44fb4ca79bb20e283659c2fe9a75a4892389958f5880acc436bbe32552098429f15585ee025d064fdb5806b814f0e9d67a4261ffd23852172b
DIST aho-corasick-0.7.6.crate 108953 BLAKE2B d713366d0783e1ffbe65408e4d38ef9f12276f61043c768265de5d47e446a378306096a70252c9a49a6e7d3b97a09f30405a3d8df6b40dc2dfeb7407ed574c95 SHA512 120aa28e72279f561d7f51657aa0800dd46504cd92f758f848284e5f3695be6f5e24056a66b0f2d971c527277e92ae938e2357ade37b5cbe1c93913a5dc308b1
DIST ansi_term-0.11.0.crate 17087 BLAKE2B 9bd35c045a01ce4c6c4a5db1b4f15e9412bb97426eec19d4421dffbec633de8d13452c13c1dc1b30998690b78d7ed38311aca700087f13a81f66bd1d5d7300c4 SHA512 a637466a380748f939b3af090b8c0333f35581925bc03f4dda9b3f95d338836403cf5487ae3af9ff68f8245a837f8ab061aabe57a126a6a2c20f2e972c77d1fa
-DIST ar-0.6.1.crate 13383 BLAKE2B d52fe70cb51dc473a7f1947628db963fd52e0959b60bff684bb466509cf9f3f4867a47ce06fe6b82887f8175dfb2f5d36bf3b48c46f16c2ccb625a4a1c7de7b3 SHA512 38f1863cb1265ab4de71b2b9dd8e9de35cf0da9af5a6276704cdf10c596c92c43e0128c334f6f4a1a94d4b39ee04770f99dbd4a8697b2e47abffa8ff7e1577a5
DIST ar-0.6.2.crate 13681 BLAKE2B 2f5ee35b94c9f8424161d229ce7658b78e30e5de12822f4af01c7633d068aeb0b78a87bac9909ab0661fe210ce5ce7882ef868c1aca62b9e85548aaf61f7ff30 SHA512 0ff23ebcf206ecc0d2ee4133d721e5eef378235e8c3b1dda967da77c3ac35decc7388b35e6134c9b7fb475298e198ea5533436f2221503e1ecaa77cd2980befe
-DIST arc-swap-0.3.6.crate 41603 BLAKE2B c340a43ce48a7e0b418dbfd9957e840c8e51f65fef4e08fbb2759e6ef8c29f36b4b74b75d0277c8b774311c6ae798497139a944e585ceb8734c3d7c4b6e0126a SHA512 6cdf0fd63c813c9c11ae5587b4a681412873f71531054e119b5771a29089e344d44d2a4cc8347cefa76b33cb7a313308ea069251f66fc63e85f38705191d46e1
DIST arc-swap-0.4.4.crate 47969 BLAKE2B c307ae6cf4f3ff2b75557e9806bdc46869ee058b5c6289d051df1973d0278147016ada7e03efb851be9c62105882c74343cc2ee90bcbf9e641ed52498f913a16 SHA512 7e0045d24d82c5624b22563ddbcf150a35903d165bd3f2b71787922839cf52ad846da563b1c0d240db52c3b6405d145cbb675ead3d6cbabbf0204dd2afd474a9
-DIST arraydeque-0.4.3.crate 17884 BLAKE2B 7c104ffc8c3fce4664a21240ef3e921ed07205ad2bf204c0910ead05231ecc64e6ebd2ee832ebef2aea10382433309ea10153f1466e970f1949543ff24b2cf3a SHA512 3fde1697f1b64a9abdaa996b36c45c64e67d9f081807d95c0ca9c262382839f10a527909cc99558878e21a9e3a4463dff2fe2734f62dde67df55d508cc34e342
DIST arrayref-0.3.5.crate 7644 BLAKE2B d1dae7b54208b842155dc77c226236bfa3fd671fad39a101246f4b1496d28608e657fcb96fc8447ba5b0835260484b46ff35e2fdac8e092a0b5b79646ff39d18 SHA512 6417e092a896e118a69e219f4e40f94756748986769e24ac233ea33a3a0a6e15fbebec5f4d6dc3592da7eb5b2e572cb28ad330838875323c6e925275b5a3f5b8
-DIST arrayvec-0.4.7.crate 22946 BLAKE2B 93d17ae9e706969e319980b4e00dd0a6c040c8d62cd41d1de34ab997e28798329e00d3dc3893da45ce5bc066fcf70dd5d8e98a79fbac8fc06d33a073a97b7b89 SHA512 195faecd7709eb908227cda7111e1b736ecf96120f9b615f1dc0a9a1cc61947e2ad4fedc7fc81d14405b51a4c8a216f81b8ed1d1d603a9fa451a38b4637e2bae
DIST arrayvec-0.5.1.crate 26816 BLAKE2B 172dab8f0129134dfc89c6032c5fc15e2f86a5cd1e5be18b87fe2108d18a1bdb0f597a6ed4cd214dc663fbfb27b05c66846fba4543b5e068b5c75d075bdc5bff SHA512 53db2fafea1f60ac1af9ecc0bc9b69010e9f8573048481d55969ecdc9f3d19832fe05824acf10a0186b0464f0fbfe898d73500fba39ed63650c64dac2c2e8043
DIST ascii-0.8.7.crate 23773 BLAKE2B 52a81c714d4478af4298bf96e376c48bff248de825d1bc1f69d58380ee5b5e09ed76db713dffd0f8697f74f694775deb754b91c7b11595e526da11b877299693 SHA512 255efb6df7a297db6ada9571749e62bf041f5e777ba69dd367273db76282f244244e0c9e4c002f59e8d542a4c1f75a6a26a618d5962fe051ffb16349285186bc
-DIST ascii-0.9.1.crate 25317 BLAKE2B 4cbb9afe82675c5d4419bce5dcb640f56ed168aff32b39bafd6f4539729159eb44130ea3802800357c8a618278f824f71a5b5c6b3d8724d04372fcbaa34828d1 SHA512 3e74dc12133e4530453daccdffd2fce2fc48d41b93509d3153f3d58803a7a00cde0543b96089d637539b97a5ad859270dfa4202d0b11658a51a6b6c88adb2f3b
DIST ascii-0.9.3.crate 28283 BLAKE2B fce32863fd75ef1badd496db55387f1abfce5eac7a7a61ea07e1475f555fcfaeb2726ca80e69577c4cd05c366f8c46842f064fd9325955eacb8ad38d0cee990e SHA512 ee8ad37b0a3db9524db22a9abe0c348e30364f108039bf761aea8e3eed07c08849924a0a287fb17c019e14b654d2c6db3848112047a1fa8db58247c9e138dca8
DIST assert_cmd-0.9.1.crate 17844 BLAKE2B fbdb8c2e0a185d9d4f275021295e0edb74ca46f41d278e9f2fecb1ac115499b6a26729b31e0538a8ea82136909b073ff3a8f8cbec9b795c6c035de949b649bc6 SHA512 761d43b5be35eba9ca5d49f6ec32e1e37f25dda18469b22f8d2e9efe78fd23ab298ff28bf1239399e4fc783659665969762a529e69db96ade3392a155b39cc61
-DIST atty-0.2.11.crate 5916 BLAKE2B e502c23faaa9dd27cc5865b68a721b0403071edb483fca0c745707f4c0ca1b1787b5677b2d8ad7f327b8f5588ba784126ce78496c1db54f7ca4ce0ccea669499 SHA512 9d6417dc1e8abdb4969418525b36c451274fd76769adb57bef9875ef62ef521c50d58626ebc4f96d2bea32cbadb6999fd67653b570293d7253b403b6d0736c79
DIST atty-0.2.13.crate 4764 BLAKE2B 673eea1d377fc3aca792a3a8bd2a5c058f3041abc76a8760dd6acab7f19fa610f812c57d81a4dbf773675cad3df483904c66e66b45d83393402f747c6db60d89 SHA512 4554ca7dedb4c2e8693e5847ef1fe66161ed4cb2c19156bb03f41ce7e7ea21838369dabaf447a60d1468de8bfbb7087438c12934c4569dde63df074f168569ad
DIST autocfg-0.1.7.crate 12158 BLAKE2B 4120306f0f7c1cc0cf8d1d994c080cbf42e4b107cb51af910504c8c8d264289654dad23a0c6b9eb28d888157e5a68ef2460c3d38537ae9d5e9bf73b66ffc3015 SHA512 667ca520f2b46140d2f3519b43e5155426a6e7a2130879860eb10b974f84465600077f53abed4c0e6bf2612471f01786bfb3531ea8773d0f50f29d48e05f7925
DIST backtrace-0.3.40.crate 68183 BLAKE2B e1c01acc706617c66558dcd3ed1ebc33bf3fe56d03ecd5ec00eb78df3d5fa745cd899108a779894396636da461ad7a2775f6d77cd35fa96f97181f3e80694a5e SHA512 8b9da3d6c515ef7bc5b04cf4abd53221cc114c912eb5033558b1c45eb6d85e56c0fc39579711fcd26f69fa364a823945901e4c2e5560436013b7523adf267d27
-DIST backtrace-0.3.9.crate 31054 BLAKE2B 5d90d098d149198eabe4665b1eb2cf41c5f392ddc1c5cc499047dd72533d79b679943781445f7d86f269a15d3f8ca2775dfe89123935d32ccef4b8151547283e SHA512 edb485ad27d19e0cccea123cc6a9db5b3222831e48722d8fcec7349fd1c4b62b67ab1f488fea4973da82c8f17a86aeba4ea8f2fc1aa60f6528833cda39efa637
-DIST backtrace-sys-0.1.24.crate 522332 BLAKE2B aebfee4b257b44ce127f3bc13d7622dcb0d6cb4c1e73d504b8d77b6c0b1ed47e7ca310cb6b41798cd13e6589739c352d9e33072e20fae0547d292312604a27d9 SHA512 7e7b279bbe5f3d8bc2ff3234df11d7b08cb09209c861c24b3fa67dcd89699bd80a6fbf93d3b0b287544f73792983172bfb5e5c86caedee59f09ee66d259fd0c7
DIST backtrace-sys-0.1.32.crate 518920 BLAKE2B fbbd3b59533830400a788fd117ced47461d2f2b04d205d03f242d596c284e89ef2dbaead81e6974aa65197a6c69c0293f18dbe89daf3323d0c01dbc92462a075 SHA512 199658b1f95611f7c68a7b4fdd76044fb6784a7ab777a9f5fbe3a4a770bd6c31ac08dfea1297dd85053f0b28b1a686c076a78b120ac46fc3c639c30c937d49c3
DIST base64-0.10.1.crate 41988 BLAKE2B 6e28a70cc0d5e426d9a3944825952851928ec2e32fa2543a8e1d1b886ad306f38fd6e673da62e96581e56613f133265feeff5b0d2f1e2e34593e58c0424eee9e SHA512 674a8cbee95a41f755499a4e3bb93ebd3f80140c3e8e2d44a0b73890ee423754e7ba8abcd92132683cd54501ff5d14438d023a202eaf12776aecbe36df9e5535
DIST base64-0.11.0.crate 48362 BLAKE2B 90d2a64496e20c4bcca6f21c2546474ec88283679ccae95303ea7521133414eba021810e64e5916e3980b6878f90281f09295ebadcc12324fc9a9060ac41a707 SHA512 31b5f56d4907a5e4ae40e92ef1629a446126525186f5236afc2475829bf2e5e067554db200a18f7b3ab741d0cc9c01e20612e77cc0cbc1bc2a4a8d11c0fdbf33
DIST base64-0.9.3.crate 37993 BLAKE2B c0943b223d0d35438c647aa53fec5f85e65a78a5d272e4c65865bf182607b44c45b3ed1a0353e081a9dc5d9f4c9cda6cc6b8d68929a2676a512a7907cc94d8b6 SHA512 4790e4de201123e7b3e3c8a574c92089e38900a67f1bb4868987da4088785ea05e4258559c1c32be67341c2ba8a19deacd156492d8383949e1c9a6ae218b7eeb
DIST bincode-0.8.0.crate 71632 BLAKE2B 4aa94a42641a905069701955ce23717f75c1a5a91b743e44e574d1f0f9b4fa693fd9a8541dd618e2cb03aa88b52642269f2b8bfccd897bbaeda981e0f5c76bf3 SHA512 fa6bd7a7670d510cb1ed422a49bf30e77760b333899bec2b2af2c74f6cc6429b0ea1b630fdf24c490d121ae03183d3e034921a98d3f562a00e9cd9e234b38a99
-DIST bincode-1.0.1.crate 14071 BLAKE2B 99edd46decd97925e2af882411c9cc986311e936a0e8c05ffb29e49b44460cb6fe6cf17e75301743cdf02d5b30bba7ea1efaf70dd1d3b770061c7fb6db4dd459 SHA512 1294b89089b457ce2bc4d9471ae677d6d06e64eaa01948e9db4ab49fc23638ba79e7aa1d6ca3a0df5fb61bd90cadc811df724053a321ca99d16b8ce650abbd59
DIST bincode-1.2.0.crate 15433 BLAKE2B a0940c61c37b09308ce58be6137cf05a351081e88ff32a14af351fdcb36998c2f4d260b80edbc03115c67534b35f422e25961fec3d2c1bf6963be0179ff8ac11 SHA512 9b599115ff33531eaad003e2c928e83211373101a5ad6cac0dcc09af0b97a0cb157abfc432c1a8c68f303e07732ebd6e0ab776c771250356da9f50187e92b1d9
DIST bincode-1.2.1.crate 15489 BLAKE2B 98d8a7b3653dc75aed07a637707a8a0d7b574c9a7e9ab8aa39d6f235d003ee15dc4abdd76e3ba171b10aafc98dc16f9ef8413f4154c30848ca0c12d4972f527e SHA512 b86915db2079128d6abe52c8f3fa0ec21815faa988bf678a162c2caaeb0d2ecf2f5df496d5dab08f399578b4f0258f252e890d9ab9e8347c50e5d7a2ab374db7
-DIST bitflags-0.9.1.crate 12406 BLAKE2B e89527c5411150c09bc16072e0e4e5b2dde4b50fb2ed76984c1b58db225912db580f96c7954cbbf597036e9d743658364977ba24d0d7660312c3b8d38306d879 SHA512 3c106186aa8b5b8d0fba377818618e6428af38f60e4f707873142b44cb6f64d1d7f347840c8bfba084ff569ac8c57d87f2288c4a1d79e282bc02544d69f976c0
-DIST bitflags-1.0.4.crate 15282 BLAKE2B 63f5feb47460c344983cef8822804b1c4ac2f3adfffcf206df2b05fafb9c7bfd73986721cde46705a3e4a0dc72a40683e4d369f2339adfc1b55208bad1766875 SHA512 81850d2be62eabb8486024ab263da67e6eb8ebfa732cac3a5d46a9186c564b2065cba15fa3da468bbd26eaf2b67038680e5de19d5dd99d78f60dae8a1776c8de
DIST bitflags-1.2.1.crate 16745 BLAKE2B 0fa6d3ce44aad7616d5cd02aad8c1d0b0fed4022650eb43067c4a72e6fc88da05442674fa51826e4858a47c9de233e1ba2229820af094197cd11bb416ceffb2b SHA512 ad89b3798845e23737a620bba581c2ff1ff3e15bac12555c765e201d2c0b90ecea0cdbc5b5b1a3fa9858c385e8e041f8226f5acfae5bbbe9925643fff2bf3f0b
DIST blake2b_simd-0.5.9.crate 33575 BLAKE2B f5bd6efad39b7727bdf033bea9796eb0eb24ffdcccf9d9682c22942a5acfac6c566377f635e3030d2ec9cea05129632627c1906031a1c395744c787354e4948c SHA512 cb7ea3db1911976e48fbf64df4c9dd071d26f54b95d4f14adae2767bd18e5b7948a4f908bf9e5fbecc6e17d4849b878262cd8144d07c04e2d0745fa644ecd19e
DIST block-buffer-0.7.3.crate 7179 BLAKE2B 549e8532358f9a77fdfbd5ef7a06d60f20f034fcf69072757811cb4a95f5cee5589bebd40fe87af36127254ec42ef3240cc7542828085f590fb774faab8f0e21 SHA512 74c8b89777a006bd72511b32df94f8bd78e2b53c30d85d39ea3c52acf199c357140fb6181f7f7ab5e30dd80d37181582cad740c95b89328a7a4b0f84f77ad6bf
DIST block-padding-0.1.5.crate 7342 BLAKE2B 876421fa89251d011a455163baa49e0931e0692ed928fad71357fc93b87493eeab4cfcf8fc4aa94638a90a8dce8ec1ad95e9ba91da9557008e5fc19c1f618ab4 SHA512 acf5369cdae38b6b1a5c1561a9df18b8a39c8fd434fa50c49a8f73d2654a835269b7b22876354c903514c49c77aa860c68cd84d3c1efcb36bdfa8b01af300a9a
DIST buf_redux-0.6.3.crate 16159 BLAKE2B 13ac3c513ce794e52b73ebfb5ab5deeba5bc9169988464d05276384a548cd7fb8b1c0f8016cca11a8ae1e771a15cee647943fc2ad3a563599b1475f3939aa201 SHA512 1c8adc5b87248b6e6aa1405ea3b081aab15cd7aa3ef24926dbcf76540f91d261468d19e5e83fe9b96b02fcc330dc500ca3df3a9eeaec9deaac1662d877e826d9
DIST bufstream-0.1.4.crate 8741 BLAKE2B ee8913b2efc3b0b507d8abcfb86ada7924e4f30554907f9cd690b42616ddae7644dbf9f69d6d0ad599f6db1d4ce3ffecff1c8cdf5900fff110871f76a1417b0a SHA512 bc5029c826280e51231e2893474a964762fa6456a7fee043ba32ce262ea4f0240056e352267c5e66510e737217c8841061672336631b5eb763212a6e5df5ac9e
-DIST build_const-0.2.1.crate 4499 BLAKE2B da7f1040560862b76447426be8884bf0ac62d2f2faca0a572b8cf566fcbbaaf27dd1f260fb1333c3cf9410251433239616aaf0ca1a2be644fd4cbcc2b908eeb1 SHA512 4e210078ad781bd645381f469285f0e4d20cc8c416818c27d98c0033f070b708a6ab27933f9c3660c83e6cbfb3afcb7ec753f9c186b0c75b99db37dff1cde658
DIST byte-tools-0.3.1.crate 5526 BLAKE2B e87163b1f2abde9c6ad5002c37b21308a98a879dc7af14059839be7b5a019d2487ef03867f3f5cd436b7081cb78a930abce79b5cce23eb95cc60e05067e1b1df SHA512 18e0f248a1e9780706e3a184d63558f03f30002646abc6d46ef49db9d5f6768af3d24d210b688aa4ad33d41248429e4df46bc3926f27851f90c92d260e5c4baa
-DIST byteorder-1.2.7.crate 19640 BLAKE2B e5225871a7b55be755a28878f330f165092d576e4e4447816d4908998d4c6103eccd7f1d962c06709823331143ec8279c5cb1ebc9ed49f7bc30b20586568cdfa SHA512 166bf831dac44332fb05679add5ed8c54d692a582cdb8584486dee8295080a625d12eebe40de6f3b82ef98a1f4c65503da9c84d570b14d58dd5e31a3cc6b7391
DIST byteorder-1.3.2.crate 21596 BLAKE2B 2ac70cff46af36e96b8b41c3adf9e09134af4d3d5b17c14233047fc3b70c829bffe6c129def84f529c1017ab2882c1bb66e86eab7b749a0d40daf2650da85d0a SHA512 2ef6b986926a4671dd945583730b0bfd4bd5e75b62a8a70c2875328157ba95f2c1b17c534d905e9b287457bd34363c1a33fd3dee9217c371032393ebbe206a8f
-DIST bytes-0.4.11.crate 45988 BLAKE2B 617fa9bdd07bf22a6f0089e8acfc44cd1444af07174b7a02a00f21438405620cd2cafb9574d04811464316108a05c60e6066b8d87d6662a5791ecd17a7f8f8d5 SHA512 3a0354981488c354b2aaa664f320b18cfb09ed07a5f74a10f8fc120279d660dc7899306bd01b1b3405fc92eec5de3f6f8e9d6c1e5d4a2374da865d5a8a8405d3
DIST bytes-0.4.12.crate 46361 BLAKE2B 991f1d9170e7d3438c7d74507e6274df551d483883b3be2d99f7bbc0611ee6bd3f8f45c0e086cfa5488e8fc00e36e9a549fc71a325ff62b9bb83bd8fd412b5df SHA512 5f603532ea2f04cbc53044422feed1667bf0486af398c9c8e2ce7b4601b37e1c47223201970fb0d17fed77fef7e89961e0ac05a30e6cc9bf13462d98bc587250
DIST c2-chacha-0.2.3.crate 13336 BLAKE2B 0b548907ce4c9ee502ec96307ca003d168e8bcf9007ec667661d158f33de36fc2e832cb3c36cadc2523f6ba8b9aeff4dcb16e7f95a9a34ae02e8bd5d00f65cf2 SHA512 302498f75d1befdb8bf8b61d0eff2762f0e86000c3909d819a377be2fec72e830bfb4530e24059906b499cef17ab56229f5627fb998ad9ba34a7c6c0de748538
DIST case-0.1.0.crate 2629 BLAKE2B 065ab6572d90205f031f3a01f83ab3937d9c9556d649b05f31340c997b3fa63aab03702c03e7a70a78faf7271cc92b4d89b6f263a233ead2448c366cf655cfc0 SHA512 6c12254cd2274ddd28b2da55d78d3306e0f3b2f6a495d7aadf9c86f82366e766fef2283eab407a6273324c80305cc7d1cebad4dc1bd0a28319c69b0fc1cacca7
-DIST cc-1.0.25.crate 43191 BLAKE2B 2f715c36150ea81406ac34224ebc5e0b95ba1bc5f80d36e78af6e6f4027521bd5e163c3ff0f08dac8b0791b797e1498c8a1151dfbc72a8a8008546e0b44ecf83 SHA512 0ae0d47c9ceb67aa0ec25b7b98ab4d378bd7a58fb7bbcd9bcc804a0deadcfae904f9353c218d63b8e7046b388c67d5316248accf1f8b69822c0f58ff465652a3
DIST cc-1.0.48.crate 49885 BLAKE2B 98bc13fca4b9b39f61916c4cc6a0e4123f5805263a633dd329e0c943d6a3dc8e0572d5b382d61e207ef0e7ca96a66e4720fb7f1a817fd61b1ed842ecf09f5f08 SHA512 4392c4455195dabfefc920e3692dc41fc763f7ca9e7163be395d7acefdcd1cf4f5e7a2356a9d8be367d43cb3e4320ad8e7513e5532118a418cd38e98748fe165
DIST cfg-if-0.1.10.crate 7933 BLAKE2B 063a96ed176f34f788666b40adc483d147fc011dee941ab60569ddd0e57502b5dd06ed71090f4e14ce005d06e240500a286f74652615e9d068fba649610d8cf8 SHA512 9d22616bfb4a75770a828a0a3cddac6787297a5fdc53eb17e25811cc94de717f2de8bd66d53c5d65ba1c83d8892aefee5ae758cf56a1ef0a0c3120f70b244339
-DIST cfg-if-0.1.6.crate 7411 BLAKE2B 0a19f5afaa89acfa7877e06e747c1e73af8b8a9886c97a803fc3d61d075b43f3fee6089c67ed28efe70aaf4082fc21dd5b24ea514fb1d761ba3d939dad496fee SHA512 e393816f659bb5b1e64ebc72a4b6e3e673afd00cba302c3c92c6f2e98db341a29197f6cf413107e569175a86aad85e74a93e2cd3a9fa9fa2d1b70b01c3fcf378
DIST chrono-0.4.10.crate 136101 BLAKE2B 728e1a25601aae8047aae009a3943b985c4cff314aa193cfb57e5897f2a449a1dbfdfe7d270ee26180532efd671e5821f811cb8ff0ea353e874c5025b7361266 SHA512 dc5234407e5845a4934e7da7d5293e79804c6e73d3a7c9d3a78a4062b98fd112d31e3c31a2518fa6ad6b28b98472fc2ca6c6f95515bf3bf971e8c128ac763f47
-DIST chrono-0.4.6.crate 133108 BLAKE2B ac9573577f4ea6516007df2f9948f9df4e8170e53119ba7cf1e55592bc594bd1cbf05759ce2baf9b6397b68a72aa9e0518ab0b7a9c63bd043ee4a7a8b81e36b4 SHA512 c869cab6da906d50531476c892510042eeccb3daf790ef13b3014121c805b3f8e23c7a6ffccb3bb11d15a1615e997df4180e41f0140a2c327cc816b94f28976d
DIST chunked_transfer-0.3.1.crate 7730 BLAKE2B 5bd1fff872af6efb54ccf5f4597ed816d87154340dee0e8295d40db7d9f28979d32ac3ab54f2e83327014900a26f91f34badbb81499401b4b0863a61020667ad SHA512 9f3ae572c75203a86602596434ad2b3fdc443ac9eb50330f57ae3050ad355897eb22feecff537e7c01c871b466cfbe57686906729f5ee0914bbf6bc71ab24638
-DIST clap-2.32.0.crate 196073 BLAKE2B c262241a3ad1d0f944467f4ea9884ca3dc05b5e05656fd7b73700e0daeec035c07a5d06316cc1273e37f74f2c00429b0ee99da298804dc4deff9a252ca56ce07 SHA512 ee2a66cec0d867d73fce35c055bcac77cc3ea9537b355be04be3ee17ddabefebfe3649cbdfc30ea356c54cf9f066369540eac4f5dc67e60cdadc9c66be014ef0
DIST clap-2.33.0.crate 196458 BLAKE2B 3bb62d817afc77b421a6282746b9b61367d224de6b614c7ed66bde452ce1046728077dab3368a46635b5c74d82ba3196586d87c0201478ce5b89638910dadb1a SHA512 f1075031414d48e4340bfe308904a95a31b72460724773c52a0bc8c004e625a04c904a39fc5420cb8c26a633321f9b5f4f69019c7aae5ed89900b63ed8c21a91
DIST cloudabi-0.0.3.crate 22156 BLAKE2B e12054fd474754031f8f5038d5e2829e1586db974d38230cfd8774db591a58dfdcaea9fb61fc0b35366889d348b2c73ceaabbb462f1abeeffeaab167013c986f SHA512 691ed793e9b35ba382f03897f4c0efc31a528394862a27b814ba8993ad30bbe0ebc9808484baf580e8b69d9c13ad1612776a1efd0f6981545b420139ff83592c
-DIST combine-3.6.3.crate 101445 BLAKE2B 9874d0f456e752941ee6d57f85c3a87fc20590b437b0c3e33097aea170f40b515460a3f39acc48932595da5b88efe9af1b3185ea0f058fd672b7eeded2b3519b SHA512 69a7cf4a582bb4cf6e00012b4590630c2da7416a23cd9de40fe88f8b9a375bfb33ffee59e51207349d08141e09191a2b5b5a72d10a1c6a0d6aab9dda0a6a8e7f
DIST combine-3.8.1.crate 103773 BLAKE2B c8ecccda28eb7253e14ef112707166f14892fec858941adb302a866eb0495878d091592c770307948fc040fe459a525af643db9798a601aaa331ca7959ebadd9 SHA512 12cf00c23fa6ce6a73d562214456799a9aa98eaf2defe9e4884dc729cdaca26efe2965ada3390892940644e6cae4644363a65ff5aca1bf1a1a684cfd4a8d7f60
DIST conhash-0.4.0.crate 3548 BLAKE2B 4d1f8ee3689bbff8cc8a070f15733ca05f23f4ce30584965a2d8727473b67112fca2ee284c5662eddb9c8988a633bf1d173a3d15f0fa0c8681edccbd100d9476 SHA512 f5bdd628966881ca17f04b22d4cd73821575c74efaf19069028b814bde6d1ed1f931f88955c9bb7435f10c9223a1a72ebfe18d681939d9c488f92c313d6d6f4b
DIST constant_time_eq-0.1.4.crate 4654 BLAKE2B fbceff4653396f9ee4c6d184d60fe78b77acd9b90986e83183b25acbf44d92b6d936df8ccbb1e7aef5c7487703058b93078fd90cee5eab4d14796886e3c6a863 SHA512 65b72c522f7ff0abfe0e562476bbbcbeb1271bc9cf61f9663ea5c08730787242b30df472e7b74a2ea9979466c251030c35f36c916d20e0c6b99826fbecbd8f96
DIST cookie-0.12.0.crate 25953 BLAKE2B 630dcb365132e952c81813a772f94266230fb1e83cac63d39713aefb0a4fc6449c144a7e9630ba8aa65194bbd732fb42b3fc150530f950ddeb6a2d6373a78197 SHA512 4a802118306d25f1e53444e143913ca2a14a9e5584b26c5aca67b5ce0ac5111c4469fc5d7ee6b5877f8ac59143739b749edac83ceedcef7b53ba1e15cd97a821
DIST cookie_store-0.7.0.crate 25211 BLAKE2B 1c201c5baace2c595b2bd7c214140d1c97fab1c4143eb91adcdcaaba4cba8f1c97ebc8ecea626c77a1b482ca6c326f220920458c11f23e5a497b75f220c9bff3 SHA512 40584ddc3189ee798b5ba262934d0a48455376d9cab4d715e6c4dd476b75c62ec09fe0c2f1b748b266d20f2b84fd97e58cf1ec88cc6b245290a572fb29fbc4d4
-DIST core-foundation-0.2.3.crate 8323 BLAKE2B cf848a8345a2d2952b2646772bdf204b56e4406a4ee6b5820424b3d633e0eb3993fe0269aac0fedfebe84221a9693b7bc53f60e85a7e95a6da19178d24a660fa SHA512 e14659d440f2ade3d4db9b307d649a4dffe7dfd7dac5f0e7df5f391531fc94f66e10fb5a22c2ff0b95d44d1fb539d6b11c4088beff43632dd6edca270c5b1719
-DIST core-foundation-0.5.1.crate 22519 BLAKE2B bc411c7a7bd1dcb00b4f02d75cbdb9d8422c2802cd6a3aebb7ac5136b19756f7ad5e48553e15b6c5a7ff85fa3f4f3fa98e8644a0eb13b4525fe2edd3a5b3daf4 SHA512 209b06bf889ef75451b9d055505dcd19eeb8ed6b6f57f7b3288556ec9be90fbe716175679f7d0a650c1d55644b3c56eee9b1116f2c8b533b4b4580008c79cdb2
DIST core-foundation-0.6.4.crate 25233 BLAKE2B 720cb670e0ce589fcb75e583c3f70b54669407481f61b67bb5df1a5056f07c88f568f2adeb65188004424b26b623ac42b03d830239571c15f241216e55fd8dfa SHA512 5dce50f15aa48f38e1bf287fdd3c5276d8e5f1d64bcf29da7d8a68008414f6ee560a940040361eb2f4e65657ca4329958dbec8105cc6d3606ecfe9e71ccb7632
-DIST core-foundation-sys-0.2.3.crate 9128 BLAKE2B edb0757a904b40ae5b403af2d3d396b50ec70dd918ca9e03e90a9a40b71ec8de6c70cfbcc20107549ba5be7ae4de57f0cd2b6373256201b54dae1ef9398c4197 SHA512 bb650b13251288fae1f83998684aad7869d9a6aaea4cec8e1164e626d4cf4833337ccb9d3ad3a84a7ade711cc650fa03f1d945e2e10d6cbcb7b55d857cd46ad0
-DIST core-foundation-sys-0.5.1.crate 15974 BLAKE2B 5065520f9d7661523edd7018e77d43346f39bcdef407ffe7bafbdec019e39389118b90a11599d5afb4f78c8b454dbf4530a6c81c834fd9952557529f87cdcb0f SHA512 9cb023399eb660ca318c9d3461b9f177206792c3542564d990c08ba4788dc41da2f2c6070f0b55550b2ded0278c3f3d21a159212a20d18c12997658df3df5052
DIST core-foundation-sys-0.6.2.crate 16204 BLAKE2B 32766d4b23a2b108777c57b2115cc718a0cdb42fcd2e3973a0adf944d326e0796a6953756c42140eb4e6e96a2609bfb41f84a54c59b4b840d7213f3c5dd4234e SHA512 bfbe4e77a5e2644952c66a2afd21058a07583d3a1776c34dbfc316d159289073d92b8672eaab2f39fa46c48cd7f22d88f0354f02b3208482d700473a807ebf07
DIST counted-array-0.1.2.crate 2959 BLAKE2B eef6d7175447df795e3cd7da7ff91649232eafc412a7e4f637fc3060c69a379b5a5250d800b75da6c53eab1c3cf6ed3519c2e6d1d8b79f2b55fbd7a52f019470 SHA512 91d088b07c9a21880b2ad813b7395d5135f9697f5beea22323155fe0276a7bce5a8b8364326750355b8ea45a10b9be16cefe1b29f4b2673688d1d97605db65e3
-DIST crc-1.8.1.crate 9114 BLAKE2B cd96400652888e700c326a2842005c8bee699ccf3c61b87320c01196b455a55da511749241af75e903a76847beb8172598dc8f770779aefe945db7934976afbb SHA512 db0b3d0ca197cb2a2049720b753061f1532d1ba2c86c7befce36a18cb4e8008b061e39e26960b4d9dcf1e7ea55348f55c441da5d17cd0a424402a8489d52ed1a
DIST crc32fast-1.2.0.crate 39161 BLAKE2B f71c85801f945602d53f93ce251c978c91f63fcd92fecba5083fff0f06738697e99d92c17a824605d5d56b3224db224ff32e4b147b6f6af47ae714dcd511e7cd SHA512 2ee73e0642f83e28034c1baca65156e65d751214e83f2a4ce94b6add5ba11f74ffc80832a3348ece1c099367be2b11e820dfb349fae89fbced1b68bd6b0466f0
-DIST crossbeam-deque-0.6.2.crate 14037 BLAKE2B 28276d69b715b6ebd620256ac81a5dc0dbb148caa465a7efd3bd545bc7bae913f8eca4619aa289565941d5fb5a18b72b2b14b4113df03dd3d61ae7e7d3d68ccd SHA512 f010545e12dfecbb5004d91846a7e41d2142d2194b3671ae2ae383a74e6f2cbb80f3d086109a8fbd3c6c88ac187d7ba45c97cce3ac91e8102daaec59853ff930
DIST crossbeam-deque-0.7.2.crate 19557 BLAKE2B d0be481c85d0a9e22b6b85ad109aecfa227ee2c7748774805d3f487f39540c5620dbef6c89a35459afdbab2df9ba28a48a741fc4f9dd79fb9325dd4523a7bf37 SHA512 1ac3112c3904751ff3540e14740b04b23f8e64b5dc1097deeffd4e7c39af76626bc4b7d1f402cd44f7ab4ab33b275048f5c2d48f941a6bc555b0d98a53d64551
-DIST crossbeam-epoch-0.6.1.crate 34089 BLAKE2B e99a20c26bbf6cd94978d0aebba43b5e49e76a97ffd4113cd050c262140e257a3d3640f85b0ef7b217064dfd2f53ba016fd14f33906b9f50567eeddbb9ba00b4 SHA512 f2be7ffda167935b4a30ff0264762477690bd7e7916ad26e6bdfe8a7a0a6fe0bea5e8662b2a6e7fa7dba26baf4c2c2944307cf19b5565a957af1f9f3b336e7ed
DIST crossbeam-epoch-0.8.0.crate 38711 BLAKE2B 97fea09cab0da60998f640b7cd13cf4f3c07081f0ca569418c0565d8e87f2c6f1da036c3acb318dd12ec56ba2109f74600cd2ae6b4362afeed39b1076b02fca8 SHA512 e7eca59128d5ae6fefdbd34e912e10b08783436858636c0905d65f651a3af8cb6a2b6d872f4136e31d242d05019391d31ba1be424e8ed5c951f15dfd46162892
DIST crossbeam-queue-0.1.2.crate 14104 BLAKE2B b084846e3adaefb33991770d53130b361f2dfa76ac9f4793618643afff09c4ebeae1545c33c59211d09427bf8d13d13d3ed0965211568884b0b2042e5542327d SHA512 f799ec04a78ee86051bc6a0b99dc95766c83d2ae8672015d1fa95e53aa0f93232f3816b7b2d38bfbcc577516f45af009a5aac04be21f521550347fe87ca0b444
DIST crossbeam-utils-0.5.0.crate 12162 BLAKE2B 63366fee26c4012ba705ad415db867e0b9bcf81b0880ee3c5ec3c06d2ec8776e64585ddc04ad072d363ddff3acd1382069e591c25daa27141bbbf75412d96113 SHA512 eebb6bf81517c930fdb4c15a8eaf92693907fe58dbf1913a9c2f4315a6c0550eb772cb15c47e2ac4e3f4decdd47f69ea8e42910ea649bd2e2279ad4cbf9d02c4
-DIST crossbeam-utils-0.6.1.crate 13987 BLAKE2B 89a08fe3aee4b709fa87355bf18f8f80ae8f32975c152d319018fe762a233a2bc7037df6fde08d6b9e55ee6d68d56fa65ce66d9d4c0166d62f4a48196ee8aa22 SHA512 49e02da3d2bf9451048363faf59fe06a80b5b9590935971d39fd903c09d72bbcb7e8a70aff36dbc9467246c18a2608e32ec9d5460e085a98f2c359c728db732e
DIST crossbeam-utils-0.6.6.crate 32836 BLAKE2B 48290733712549c46bcf99641ddff571cf2fff72b2a70e86a554899987fd71a61a8ab6a15c75e468164755fcc3218a1db54a4fa406f766f9a9f03bcb3d9bcd02 SHA512 771ac1a55a043600e7d8b720f9b5a32da2ec09efaa4dec4202f7b78a505eb391a842b7abc91516ccd287c3207c634b342b0bc8ebb3c0c7a0d73b7fb29badc9f5
DIST crossbeam-utils-0.7.0.crate 34202 BLAKE2B 7a080ce1cbb33f28788738ab9c0a68ad9f535075633de1bcf9267f52759c679bd4d013bfab8e316294dabedbdf8c3b4b902b082a9993600db7bf6c98126fd1db SHA512 260d4f2e209172128da1470be16fee4ada3f6675649c681c0e311ef7da273cd6f04671cd06483e906948f4c0b505c403622456e9fe68d77e0c8b56ff4bb35c3c
DIST crypto-mac-0.7.0.crate 7636 BLAKE2B 30158db3eb9511373013558e5e430ab4412705843375d6a48f015a534199dc16beadfe6b94c601ea5df329b0aed9392bb20fc0c95d01b7b0f42408756a73c000 SHA512 7297396fc06aae578644d47c8ef1053895e0a29d1c007f303631166cf12711f106eb91c9c11d01497e7a85fb461b84a16d2e0f1020444ab16fb4b8f2dfee18b1
@@ -86,27 +57,19 @@ DIST difference-2.0.0.crate 147616 BLAKE2B d720202ba8d73fb9b3cc6a982208e4fbe22ed
DIST digest-0.8.1.crate 9449 BLAKE2B a610eb0144fdd49dbd846a86e88781b69ccb6a4f918b09fb4562ee9e3d535d12a1e499e36e5eb894d1d81f7a06ca00296b3aa35063f434fdcf22ff202890650c SHA512 186c3ddc01fefff6a134ea0be633a9fe8067b8db34f31e9991069e7a9b82ed595a1105283a87e3021af2337ad332faf1b85a6bb513a4482df7d24e3e7a5ba055
DIST directories-1.0.2.crate 16020 BLAKE2B 76fe417487118cad8dc8a6a64b07f62d83550b00fa230f06902d9252dfe74134bcf722d33967d65131cd1e036bd1b4b117b8f56a3f96a073e24509ee0add5410 SHA512 6b1ed06a66e43115c5446ad19d6960ae6ed7956982b23727422ed49e285ba0b86ec9721a83a7949772faf7d1db28abb499f0983c53e70da529a54ef7fadb26f5
DIST dirs-1.0.5.crate 12908 BLAKE2B 0a5c1428087adeca310d7db53850ca0ee4b27df34a7629f13ca0f3c69c019c0ca2339949022317ec55ca0be35aa721e0a9040d9c9d011e1516d99772ccf8f730 SHA512 12ebc3e92511373b11c2b7913b7bf74f8022344758057a2c71e36ec262e7ea6ac386bc75c323317406f1b25e965e047ddb308ff5017a1e607b48b978414e7416
-DIST dtoa-0.4.3.crate 14456 BLAKE2B e310c71454a3ebe77e9b3f479b45b8dc15b988823eeea4549198df1ef3dbce05888ca6f34701b27dc5e8c0748d99e03a14af96e4901be740bc98ba1342589ae6 SHA512 e400efb07317fd605e93fad6670bb4569f52abc66139042649a4112ad1eb2bbdf4b819ac5771fae133a60248da7a440e30109e68e919867d3fd29853618d7315
DIST dtoa-0.4.4.crate 14818 BLAKE2B b7abe646e02193a30ba17e17aa8ef19c59c4d925d8988b5f40c73f1c07ef3b9c5e6572a953d99b10ec24b100aabdb5d9d9968ea9864ccb2bba52f0fa2379c23f SHA512 d2ca487cf950dbab9cfa20eb8b712e07276e40f2cb8b0c5c56f60719ae18d8a1c7fbed2bbea869255b0d5286b9890ad6fc6b3d7be2cc13af28c84c2882de8044
-DIST either-1.5.0.crate 10900 BLAKE2B 5db7e6758a91dbb7ea7c9f49b17d03e98463894e9fb95914e519542367f9f87986358b4ce0f34e261b31c204af532ed962b2ddee2e6fee9ab001e7f372371711 SHA512 9dc046f2c27bf12f57413443586171cb1d7574e5de76e02af892f9027bc66c2cab840180ad85af3833aee61d5fec033c77a15809492e8c2a78b541addbc81df0
DIST either-1.5.3.crate 12278 BLAKE2B ffbe3878098daadcef9a554b60b2904d8d4814ea38cb915ee0003d3cd11243e04813dfb41384545e7b180f7d542c7aa2c0a351b736d4f449e70fa11d0a09cca1 SHA512 5e283412597bc3a1341d42c6cfe824606e056aaac82cbf3f662e7074ab74f1f80befe9de1b1011ce2dc970a0ec159ade5ed5b3e71c9984facee6314eac20d0f2
-DIST encoding_rs-0.8.10.crate 1244099 BLAKE2B 855a2af8075d8ac81e24978b6d03017db408319e8fe485b372af06addfd9930df0841d99f986edc7c16bc9822bdac72bf7af56582a3ca441e66f4cf0266f213c SHA512 b6ad406bb549c0a0e7aeaf11961eb45f640ce0f83baadc54408827db04d69a70e490f8bff54dd01a0457a9fe717ae42b9d5c59d89f8246219fe640f77a4208bc
DIST encoding_rs-0.8.20.crate 1403599 BLAKE2B 23b3ed8c65d0002abd7d2deaf6ac04ef9bce374adb6ad3f4ca993a0f487d57543188ad8b58756d5268bcb130f0a4d6c7e3199c9c9c0c952510cb0ca925cdfc4f SHA512 601e0a8ac8eb39def2336463b38de3052123f62653e22f5a48b8015912f946ab7e78610eca65e7663b2158c908e7f7f4f9f6b48f188c18319ef5594fb7e86e9d
DIST env_logger-0.5.13.crate 25275 BLAKE2B 02d13c40bafa9e403ba1e3582e296d132061ef020183d39a071f9ab4606a8f45cd211708ab8757d6dd9c04bf4b79b429c0db4bc293a8dbce0506b643d1a6aba5 SHA512 46739cbdcfb34e56b65c7839a5d62ec0f285359dd415bcdcbd2de5ad8e8015aee5a31e92c202c94da5d75235dee4f49ad8585fb852be1f8b2852438922ed4a99
DIST error-chain-0.11.0.crate 27207 BLAKE2B e50c4e2d6a173e9866311bb81adbde4bddd64d529bfcc919ecade60926112b537cff491a4ba8e84586b3dc63e87e2b3c0695452c165ddf202d6901b2d6247f2c SHA512 a7c06be660a554b4c50deacaf6ef0699cf6e8cf234d9610324c70dac0cffeff1540dfbf10efd41427858551b095c998d670f1287c9459c35217bd78d8887c60b
DIST error-chain-0.12.1.crate 27906 BLAKE2B 66c54c3448b8968a70395861469d7b80aa101210a3c96d2f28b0933fce6d77ec28f4ee18d7666402abc8162f567029fe93f7dc80b93644ef6e488ad4062832bf SHA512 1a8baeac9f4d96214a878b5c80ec2c5753c2232a166515c96ad6a42424bbe32410f2acd3aefa70d9dda7036e1965d83aeb9fd1a393b11464fed751aaebc9bbdc
DIST escargot-0.3.1.crate 12708 BLAKE2B b6beb0243d791576070ed0662e39944c28204aed3345d63be96d2e43851840e6bad084e5d38aad2e775169c25661aded27fa866048b4725e5c2d654e7db55411 SHA512 4d7b28c08aba0cb8d61c0df4ad1fec2c2e940495384160dc16dafaaa0f65a603d9acd4b53ce6c87fd55f255ff28aa78265c17254bea8489c7b6b9b27f9f7c92f
-DIST failure-0.1.3.crate 34107 BLAKE2B 6ed7b1f978bc88b5a8c3e6b30854cf0718ec7882c88834f7464bdf2864a784026a90034239c09ae433b4938293be7fe8034bc32b295350db1bf38e76f140a47d SHA512 b77170bb749da6a8af01cb9bbd42c5e75ff72ed74886d8ae1223bf6a7c2089c0bd37420e9e2eb5fa74c58214e49c0d00ff632008d7f6d6c831ede92db8de7e64
DIST failure-0.1.6.crate 37950 BLAKE2B e203ce20e1e0276a779407b43aee8479d620ce097b6264fd092e3911b2a771c393c931426f48e98fac5a2bfb8331cdc0c7acc6a8c6c6e056a5a0934dfa82dd27 SHA512 9f962b30c3d242e59b22aa0df59524ab8a996e9f1c9c32677d22208edc37f0f9d4727e9e6e8f1841270d3ac1e1bf8057085e067bff23478b7e5f020f475690b8
-DIST failure_derive-0.1.3.crate 4349 BLAKE2B 1e5b282737425c0ce9c6bbfa3ee47748c65ad5914fe253ead5dd684770078bee4748418510080e47e4b6c6b7be60e99cf214b42055bcedf2653c3668c9c6ece0 SHA512 22e75f72a5bb739003a65e6d8d0f8a8b4f02b605829bc1c4e5b1f87a45e5e46b0a6dd4ddce0d3b3bb029fa5d177a2e01de510e29103e24038c795d4354c76eb4
DIST failure_derive-0.1.6.crate 4902 BLAKE2B ffbdaf135c6baf66d5ac37cee6050bbad6f1cf6399ac4635a96ffb9f8b9cc80ed8533573a3c8ffd63f207b9ed809ce1ba7825da256c264b558673fdb6e563cef SHA512 5134df91747949e5f697ea98ea17716d1fd11f67fdb94230739d57bd8abba367474d45a1409319973a96bbfa0204d6f6854524ae41e9377e44f6eef66a5dfcc3
DIST fake-simd-0.1.2.crate 5398 BLAKE2B 40437b18ca7b77258577f518232dcf67e2bf09b64234dc3f02b9eba0c5c1fede8f8d1dc7cbc112ce80e4f0bf317387d1b8046d41a4f83a7c54981fd2b71fc8e2 SHA512 d57242c54ea3283185eaecbf8d96a4c9decbada3ae3aceb516a79710be9bf038a6e06a29b9ba4ebcd41b8f42943a3024a983ea23e36b17edc445a8c4980f2893
DIST filetime-0.1.15.crate 11211 BLAKE2B ee1661d356f7b6d7cf20cc0dbc822e04ea7e558118b41c29f060f02df4987ed7bdf69be5dcf66106c1573ed586b03dc0b0196be7716227d97c7fc857f81fbac5 SHA512 81d6e80f3da3ce12295ce8d85bf174eac3ee3dcc7d57e5a65f2ae91ab4f3dcf294582788af24db9ce2f18cb0e43080fb1baac76929dacec32d5ba4d09928b962
-DIST filetime-0.2.4.crate 12044 BLAKE2B 563df5750ef95e392f8458c0a23f106eb310d8e8e7253fba6b2b8245afb103a37b505fa41b915691b8f93ac9d6277e2940ee219a4993232781269c9876c5eb24 SHA512 a27ea45b6de09c93a818f56436e49ed358cd7cdab2a39913de159144da239bef14677b5b521633c68bb9a4f38e71d7e2404b6bf628348b3573e509c9440d0863
DIST filetime-0.2.8.crate 13527 BLAKE2B 49b9f7a786e3920fd0d457e8ef09fb729dcf557483e17940091ea7079d3bf331e28b7d9029b3840608c8abd6ef1ecd559644826bf5f9bec66881022da9ff72e4 SHA512 c94d3c3926972f3105be52a48654afe3ebc7822d2ef77a2000113c3a85e7f0084b3598c6845a09e8e530d68f50637c3c0b9a058fdfb68052117af3ddcee89d2a
DIST flate2-1.0.13.crate 74039 BLAKE2B ee9411cccbf4e304dd3eebfe62676007eedc72cb6fdf673eba824883d2f4d2adcbe292eba3cf9315da4b509f29ffee7371ef6d8f503c3bedb8d9fdfd5f91d1e6 SHA512 4b3b9e9a9251f0158aa89e4ccd65aef07a48afabe2323a2edc402f36404b632fe47df418d597de1de66898808d88f765444198cfe16ca228ac20406dcd158089
-DIST flate2-1.0.5.crate 65990 BLAKE2B 81a21446ff62d000b4ced19cf54ca5e10de59a2df290999f77886c222f87df501e7496534f49fd21d8eb317a2f0d968336129d9b1f9c51d712ef3410a1bb1e1e SHA512 95bb4857a8a267c67e34e12c711b56794643ed39ae6320ebed1c75c225d80da4482a2ca800301d439dbf08a592dc93681dc230035bae14e9343e2cf61adcbed6
-DIST flate2-crc-0.1.1.crate 8985 BLAKE2B eacec2d0f07bd97d8de530ca9250ec10867d06eb3974527735ef5fd50e857e2ad3812f36ae8e15bd64e3232ac790aad15404359f773d06100f7a8b2ac5d999ac SHA512 dad46e30c81aa31f3efc92e6a1e5da77a124b1eacaa2c7a049e11c981bc3e0bd7cbd3ae8bb5af0762304813e9afb6dff14e0240d74d7dca32453c0518993abbe
DIST float-cmp-0.4.0.crate 8774 BLAKE2B d8c4854b7147e938565d68e8f4890f0a0c25a886e78a2f61dc7fff595488e3a2655b2f942586546466a10087a0bc415b18acd41dd828c26427adb655c1fbedb8 SHA512 62aa5623affe11bc65f3153f8d0b923cce82ad6ce38dafb25ed30fd9d2d239fcd09baa10f0f4f9a58ea1a84b12688ce43e48c7e57c9751e940d32e9719c54a63
DIST fnv-1.0.6.crate 11131 BLAKE2B 220cf5463749b21e1560419ab9b1f235de08dd548c4a9a7fa6190d9516ce7db884f877b67174ee50b66b22be80d3be73ccafca80e06e94e0fa6e96fbb94475f6 SHA512 f1356b3da25f76cb3ccb4336ff54d4967f1dc7523eae6cba21a4349b8ce563516f6a2aa10d626cd5bb6046b55ac2f246e61e4e526a03fad5e78d0ea174841844
DIST foreign-types-0.3.2.crate 7504 BLAKE2B 520818b702d990d296ecd31a8646850202509ccfa18edd0e1b260289619a6c351e758f317ec0824bd76eccb209b6f087057c25f1bd01a47897715013dd834867 SHA512 bf27b8243ed482c202d120383374f19ff09422535e24b9c1aebccc66529bf300ca17b8bbc76d67f98ac092e614497afe3add9dc68aa69c93074df05762f91232
@@ -114,67 +77,41 @@ DIST foreign-types-shared-0.1.1.crate 5672 BLAKE2B d2e42e04b6657e7a69fe0bd20c672
DIST fuchsia-cprng-0.1.1.crate 2950 BLAKE2B 8519407ab5d1f04d03cc946a07050db4dd7bc70e03894e35b9e66910a3be11224084a86ba45103fdec845e94b7ba4defbd7c5217b035a0796c0c4a94b9562cd7 SHA512 ea9f5beb0dfcb023c22cfc2b37ce52dfcf3a2cbbed0f79ffffc332878858386805c65dce8469a431002367562d857a6c064e075688540c27fcb4056a110059d2
DIST fuchsia-zircon-0.3.3.crate 22565 BLAKE2B a4dac3457036efab8f79fe5d5b4545e4091e994d3dc63188f71fafbcc28bf98ef359dcd20add30ac1d990ab2e66159723302fb66697349c65fab0aa58d54535e SHA512 a43ee59452d49742111e506d6bdd8b8399a3a646e08648e25292864d7f71460c1dd1f2d77b8efa8ed09ac21fa4ff0442a2709f16d8833a3849bde0c388d83a93
DIST fuchsia-zircon-sys-0.3.3.crate 7191 BLAKE2B 530bb5d475ac828843af248c6bbd24ca3b5dd8118c8884ccc6d7261818cff1c79038077114ffa04bc73a078177527824c4d9d20a9b022e4057afee3330258cff SHA512 978b7e8795a5877a68409ed3a1d7b4246263f8e7e7ce9ba8a022643be98f58f329cc1c234717df80a509db849da4394f39e90a8e2a6f56f8fa8dd3c07e7d4386
-DIST futures-0.1.25.crate 158626 BLAKE2B 88b8f274a4cd5673760ec57e0d6a1d92eacc34346b5b81935a1ae8a5f7067c12438af81ce3cc30c57891047683fe9cc395f6dbb8f89e8c2568259448644cf188 SHA512 5bba3ed715e5ecb40450b3911d2f3d469bfd93935c94a526d70c2b6604de7953f8b1e4ed80a276e42870771f581d3c7f0b40dfb9cd076bd215a3dcffc78136b3
DIST futures-0.1.29.crate 158346 BLAKE2B 943336cf753166f852f9dcbeb8e0b76d1d26cf6d688449a99f9f1885912cbc79327115514ad93d28bbdf1b8a91b2d22f8f62d7e5f5feb61f3024e9a749e11da5 SHA512 16b16ff65c75cc565c5364406f5d9c0d120a07a520f6ea2dc86aaf4644b9ad6fb32bc021b44fb7c74246cb7a700b3df3bfa813908541eec079bd7eb7beee0200
DIST futures-cpupool-0.1.8.crate 10583 BLAKE2B 5832359dc451551a3cb77e48b73054ec1505e28e04b2307af5d8e17a3be9e0552941deaaa94d477082b924daade1a2aeb15a0e095629e29ce983b0788a15251a SHA512 49d7a75e2e0a6a6d2103212a9ad9474119f4f33cf3748b605dfbb461ec822330115cada6bbf6457f2093f4af4cc04b4db63dbab8c0faa8b25ee31fea29f660e6
-DIST gcc-0.3.55.crate 37262 BLAKE2B 3341dc7136c14fa822a67fdeb72f7ea50b1264823e695e189d69604b8b8cce898ee2d40d8a536d0f520f5e190576afde16afa5d9cbe0a2c4b8600cf50bbd1447 SHA512 b045b60cf65c1deae44e4f40d0f511dab05c82be5065390dfbdaf5b51ee2d0653c3a6d8d1e7606e4bb6d234adfd22a8c68bde724406f3edb4bb6366617d46a86
DIST generic-array-0.12.3.crate 18017 BLAKE2B 0d24e12365b31ba77cff37db6841428abf7f37f9722d629c168fd96a3a88390999a95e27adbb6aae697ca99bb9ecb4728af49d4166ea2bf89ad5ee09bf2c943d SHA512 75f3c19d3aa9db42909298b207564b2df40e7e8b8d54ad18972a833748942b5293a0edb881de894b58b5210c870ad546752c200710c5549144d11a4a0d7417d8
-DIST getopts-0.2.18.crate 18416 BLAKE2B e90b0cd8fb5dc33076e98833a03713c35b50cae6a5dfc542e4b28627221fb40082bfdefae61888d7856a3b684d4ec4c2dfa55c961abadbbbf035738926215741 SHA512 68236eda2645c92e09fe4f7408dc8fc07d7f143bcfc179d297b307ceea0420dd999586deb37fa4600e929228db5cf2c6f1217aecca500b4f5534ebd934b6dacc
DIST getopts-0.2.21.crate 18457 BLAKE2B 10651e947e49acc768d99ae56ca5a7f37c1f61bbd1674e2ca58e3ae563fd64f3563d53ccdd0ae7a878710a39e13a99ac8c274974157db2c691f8c222de14992d SHA512 5515ae6ccb0f03efb783683f46cfd1755342c4e83bb673ff8914c7f9dea0dae333f8d9703865e992659a359067df0e8b0e2253de0d4b0c7707cbe7d73401bb1f
DIST getrandom-0.1.13.crate 24581 BLAKE2B a61df4369526f860eef6952a021c3f473562cc4171c373c105d8944c305370592cd98a6c28cc0f8d00496f6b47cb900a4498dad942d0b6f60b4d8163d8904f14 SHA512 534b01d28bc9e69a5ad1e84f34aa4154939c27d70c5f557f15e669fa8894c375486ee945a6a6d8adaf1b6b7accda0e24963f70e77dd51ee0638a6ae6daa38925
-DIST h2-0.1.13.crate 140232 BLAKE2B bbf7477e6ae9dc307301895c296b67c6872f173c4e3f15554f435da9733e0d49224ff67a5bbf9b72a750d2eb1482b625c90f99fe77d3f9845957869d16609386 SHA512 10a9333a2f4b968b238bcc966a2a9ac775043d1803bcc0adb8856a658eb5880442b6f6aa36f21d279f228a5460ac71402bda0ea0cc8855acb5b7fc6889b017c2
DIST h2-0.1.26.crate 153921 BLAKE2B 4a84716e37abeeebbf0771720c5af636576cff47158eca1c7bc76f21c0531b41a75bf3ad7b6bd88aca960e96e15679a7908720d316321e319021624834a97c4c SHA512 37686cbb102eeb15de3f76d0607cf64210b11f5272ed83dbbb145650fbf11916027be3acb487cbb3e02654469b9f78167a7f18551f39af142e659cb149363d49
DIST hermit-abi-0.1.3.crate 6741 BLAKE2B 0a7edada6e7c834fdd20b804237d29558b9b413ab99b538de5647e485d36864749fba6b8f46b4a6de4c620cdaa2d711bcc6759b53f8d57438ec5c9b78da71ea8 SHA512 ca85d69192ddd2c1cf0f12d6abc7eaa70a71956df5b55aaf1d3780c6e40207c33bb188a92a5f4769478c4ce13bd93cfd6b4134a21e245781b4ab4e3cb3eabe87
DIST hmac-0.7.1.crate 9765 BLAKE2B abf46bbac094d80d90d8a7c4ce8346a841957b33ff86997889b111a801d53dd68222885c2cff8c8eb430ea72c7f3b752010a59c72cb462d7c0469d90eb00619f SHA512 d1054cf7f24c892af4091464d8bd885a0914a24f31963e5cadc5f32d05742ac8ec558d754ab7f60c4b0997f4e437289a68aed79fc6e8ea45159f8775513a6d9d
-DIST http-0.1.14.crate 97027 BLAKE2B 02f83c006d6a9fd4176ad7d564688b81505d8c75cc1ccb7655ea33dadf72f1d13be81408f57626d96752fd53be5819ea197d846b730d3cd36107f2c9e9fcea58 SHA512 7cfc8fe2e3890a0cc430e5bdc8a88afacb185462381c63670acba59607bf89952f823a16c627010bc17e037881b14be5fe2f2ffddf85aeaf781a31f516bcfcf5
DIST http-0.1.21.crate 103053 BLAKE2B 78b888c4aeb641399bdf5696b53b596041b3d7236fb9596b6d6676f98563fbe8cda4d3f6fd5837d852b4235c862c42303977be5f092adfc00df1fe3634e0e859 SHA512 edb1ef74c8f73c89dc7b0ebc83a6c5985ee6b1223001403d1b8c1b2c3ffa3556c80df7f28575620c8145a35dc3846b05a263dbeafb3c62547c0f17c3ac6c82ab
DIST http-body-0.1.0.crate 4618 BLAKE2B 2320b5b52a64cfa32550ffeebd950fb56135a0dbb8e43122521a760cfd574083b19a5a41ead0809f5ae764d797eca7007397931b2e63a79dbd9b4a26055d81bd SHA512 b1c9fff799f6581160ef232ceff82a0c222a9f1ed3ec24760fb6b156d42739e06512086e4819323aee7e19b1d0b30ac8915f775f9c36d63b4f901546d331cc80
-DIST httparse-1.3.3.crate 23689 BLAKE2B 17aac3985a19a3cbcbf1072e134cfa15644367d15186ed924ff7f76205bca42ffa0fa96a46236d7387d599a0153e31d9727d40bf177736bf1ed116adda120225 SHA512 b7c3486fde1ec34c07b317df1ad03be6585c3a114a8abcc593dad4244ba372ff4faca9c25151c5c896609dce72523a9daceebd554efc396a937a0c80f87a2087
DIST httparse-1.3.4.crate 23739 BLAKE2B 3abeb8bd0ca381ec3e7ef73ae51e1ff803583094d0cb12f5f4641fc4b8a312c3e1bf176a5d500a9770057fc9f9e925d437ce5173d99052d97439e773b70773c4 SHA512 97ff294eaf55684412d4e5a00c4077bd517fb1d51c420231281af09cc1dfa65a64adb4a18441db426db41cca91bd7032fbeb9fda02c1b0343466caa9dea8d457
-DIST humantime-1.1.1.crate 16689 BLAKE2B fe9d8ef8ad396bb8452f1e28c4a122e3918c61042f0cee8c5769683f9b321f82514474a100aecc5bfc39422bfaadacfb35bf9f14bd3814d1de62fd0b7517e67e SHA512 b18608d088519df5e0c531c8756635f41bb6515ed7463891e6145b9a78ca2bc45c0698789015c093463c704b240434d1b54ab327fc4182a06a8b1d01f50430c6
DIST humantime-1.3.0.crate 17020 BLAKE2B 37efaacedac293197ff7acc8b0446a73243a2d90ed8dbdcecd9cb0af6e901f135e1d92aa1a642460f531a6811a5f08075f8aabaa9941e96eddef301e205fdbe1 SHA512 2589bfdac96108951882b7ee497528b9084ddd344a67914810ea9961a1e319167d5cab959c66cbb26e398e75ca50d488a251694fff35f3c2f69a88b6f22844da
-DIST hyper-0.11.27.crate 155617 BLAKE2B 56b7a1b60b1b900dd7468cf623f48cb2af9d939660ceb62fa1167bedd50d8db563ce6cc7e27e65cd51935a46874eecdddb3f621562b9313538af4bcc3ba671e9 SHA512 912713166f601d086a7aa68507143c143ac69c31bca23948e0446eeab2c7eac09fc75c5f2e61aeeed312f2ed54b91b0f212d8e46e30ecccd3be1af60dfcbd59f
-DIST hyper-0.12.16.crate 111412 BLAKE2B a3161814bc0928227e305bc66b1b7fbb17b6d5ddadbe8590f4c12e7c10822cef5b6bac4ba819a66c69fa6fb31ef5df85b07d10d2571e7475e116b222c6990864 SHA512 6dfa6e96a2664f1fc505b593ad281858e43cdde8e08c6d5aee00b6268383e27d9b7fe6398c521957db5d027b8ac405a20622c52e6ccac3054fcef47ba99f4219
DIST hyper-0.12.35.crate 127971 BLAKE2B bd2b1cf87d30fba32fe96312164b5a55d595bb6f6495df4c0b219f9756c1ae9180f9380191ca202f5cfc49002416ccf05d4799bba62c7038578c59860c36a4ec SHA512 40f3285b4de23ac8404b191a44a78399ed3186d9e6abf77d759615cc4678292411df798cbe4c2d5405677cd5c108468c015d6b42fd8d833484f8ca9c1128f68c
-DIST hyper-tls-0.1.4.crate 8137 BLAKE2B 92e9f0c3f852e80b69b977d313f4c6d74d9bd437ba1d1e5d1966acb5d768f8cfd73c9d1b9d2a2fceea22b36fb8296f14ddfbbcb00fd39264e8f639c3567275c3 SHA512 3cbcd0048e11d33aede6c27a816d9adb89abad9c29d09c62bf8a6b0235df3698a632786f53aee8ea4d539d553e0eb1862b54e3b547f753fd4808bdabeeb04a0e
-DIST hyper-tls-0.3.1.crate 8836 BLAKE2B c678f9ecb89f51d1beca7ebfcc258162dd6f87d444bf83f6c5b82a28070320bfe9d4b118571b3762ba3803d4fdfdfef70bdd780116154ae95542547ed08abc87 SHA512 3094057eadabd596ce7909c45aa24f6ed5a5dbbce4773fc20293ddf95c712234065253d38422a17e24c3fe674ff94d0bffb95e4034a97dfc46d4402b9add396c
DIST hyper-tls-0.3.2.crate 8901 BLAKE2B 2b3810160156c584057101a25c8f7decec4fb4632631f4c048353d3d2f90a37cec7b20a85ceef61941f02c5264932c8d0255823c2d615825d2499951f5e25a0c SHA512 9179878b95e8e390b17d45bb02c24219066405f671fddc4e044ecac0a00646e9ae03e7cda31b0f6f7beddd8fbccfc873d28d52e6b46aab2d252a2472302a483c
DIST hyperx-0.12.0.crate 80997 BLAKE2B 20441f370d04eae79f6fbe5988b9f63806ac4c9e7d93af998f7cc322c2c9963cf7f536139a552a251a8567070e311f05a926262a9aed1ff8a179ceddea6e44b1 SHA512 85ea65b3bbc7c86af5cb97948674b5aa41a3277699334f07a6d072c28f53771059d4ddc8833e83fe3a525bf41c2773f5957601dc445d75b8fe97f62ae7021234
DIST idna-0.1.5.crate 258735 BLAKE2B 31f2506f76e9bbab68c0da6222db214865dc37994851d91eab8c6e7f0220e6bcebe50ce3a571866bc03f3ad1b337f25c3a02c7e7f1494553d91e85c1bf042950 SHA512 217bc49f667242bd89eff708fef395fd46cfe3d24440bfb76869086fb93805c4f49d718251fb1c35ac40d5588ec98cf8b8b516fda53d6d7fd3da1ab04b0d173a
DIST idna-0.2.0.crate 257203 BLAKE2B d26117124891f90b5e36af291c9038e2f4d46402c41380a6a89758459fd73839137e6faa401502be12dd81292cd9e12ec82fc611c0ff7a150510d19010767558 SHA512 375d6d73537a5c9cebfc850a2b561d57e748d80059ca27fe5e35c058cc12a5938cfbb39a76cfe57fbe589f7e36f89ccd91ccdb8899458c322e277c299293bc7d
-DIST indexmap-1.0.2.crate 38255 BLAKE2B 78d99087e4f282fe4e4789c131621bfe5d873be801cc105629aa8932a3e4c8a519180560b0bd83463d808eb3b75194b551e39166260a1b9056e822fac07fed94 SHA512 cfae9d222efcce9ab15c5a8368db2865fbdb6819b4fc317ca0aed55c32ea312b5c5ca13130d4aabf08af1803c34d465a1a1209dabbce37e7a1a911faf5cfcfe8
DIST indexmap-1.3.0.crate 47086 BLAKE2B b05b127c459c3107123037e6044eed24fa58bba492b230ffb9df7b8bb84f6c86f2241e87afa7c43e133957845b1092d7450534ab74b507eb187b0e509045f18e SHA512 41c933a78a5cd5e62aac2c4c8aaf20bd3fb394b9fa41fb9c59a69afa9b4039dfab82b3d1fb1b0c67f28f0cc7657cea6310db126dd4d84e3473d2c231fecc2331
-DIST iovec-0.1.2.crate 8565 BLAKE2B c1ff225d7e8cb8b7efc2be01763740c4f0c1188a5f1f27c5fd3fc34104b2280bee59915d71812756bfd36832fb807374d531792936ed8a7228d52ab98d622a50 SHA512 3e523bcb8b9891be66398f44c97933d246b7a7fbfc4f315bfda6cdb22ca2786ccc82139ee1b646b4c24f6f50f57fba38f9b1fb7c75e859722e9e9c789b458223
DIST iovec-0.1.4.crate 8720 BLAKE2B aa1b4cd98ebe47901c0959cf1d8eb2586a803d0453e2a8bdd5c63442b32886dbcb37650aa218c748fd45c9fe3a7fdf20569eae5b19716487b139caae1526da4c SHA512 e23fcaac239807daea20ddcf2cdd4fb858ba1aa970ce6248f70f0fba5bff7ebdb27247c0997ac0ff2791178f86ff9657e473d8f64b86c644763e5b3474edd158
DIST itertools-0.7.11.crate 78722 BLAKE2B c3a61cb938e9e761af9d9caf6ff862b121345c2721a1905ad94b133b8d93988023a083cb7de1a6f161fae1b40c00fa698304cad88430cb9fd1decf9bb93e14c0 SHA512 29951da2e976befacaeab91a1016a935e81cfc05d4eec04910de6710b14d0ca3a865ab6b5cbf4ec78a0ccbee1c025b6ef0c93f4e0b7be3f7dc3f4eaea408fc87
-DIST itertools-0.7.9.crate 78365 BLAKE2B 484565266bbaec5373654bb22f64d7071d6f4a0326f33b0bdde87b2d98019e6c19cde7023f5e87f3c5e0b892fdf6fd615c523ebb0b2be22e2a079da171236c6f SHA512 07543ec2c9bcda6c9a0f24d8be5e0add1ab8cf4182156a246822dbcb9fcdfa74aef194aa5b308cfd329efa04cbe87a6847e6aaecffcc0bc2e293d431342d3fa7
DIST itoa-0.3.4.crate 9921 BLAKE2B b2cc97b6b50164bfab0ccf3afb53ec827ec3247a8111814f9e2e3181394515abda1f452168d11b518d771701f6ce9a2936a0ed69e9b82e1a842c51c1e74df536 SHA512 1cecca0c6c6d9602e692e16cb6dce850c0f7c7ac5ec1defe1f5b8a17ed325abe41eaba56c1d973dc63bc476b52d436a90b266f6eff99c618b6581cbffcaa278f
-DIST itoa-0.4.3.crate 11061 BLAKE2B 76ab02d37c62453ddfee00788ed83805c3c57a66120fcd266401806c005bb55c00b90e074a39a0cdf99d8018181c5bd3f7c3a4fffcefcdc762e19191f0a362e6 SHA512 da1d1c988c2c81f37de8d048ca8f8fb8787c48c34e815dc64616368cb787990ae0255cf1a3259f87ad02964c9b3e1e20c759072442c18c7d32db1deac11b52c1
DIST itoa-0.4.4.crate 11147 BLAKE2B bb6f1caf1e58dc313bd3cfa2cf81252cb2ebc15e1f4c9adfcdedf46c5fa79811d5b0cbd58f1e91d1f62bf85d7b941b0dba535814fb43b5b70a38db791b45717c SHA512 f5e04bd908457e7592243ce64a99c5283428b767f4cc17d77946770411b06fccb0250625263c3e84a02a018ea7e8a0e4216e1929a71988bab8e1dbf603d3801d
-DIST jobserver-0.1.11.crate 19687 BLAKE2B 1ab784f253bc3a0108c30f1ebb02106e6c7d86f1654973d65c84adccc52cf4cc1f48447e8d40bcc8b9ab5cbbc9dc0becf35f9e7c81c8c6340b1dc41121b4dd9a SHA512 daf8e7e994fcbf7df5265e78d3d95f2e1d3e26d2deaa43213d75e33d5a2bc1c7c7bf66aae42a0ecde7aa59514cf70d16bcdc6198fd84f244d197bb1d09f15fd3
DIST jobserver-0.1.19.crate 20656 BLAKE2B e2cd785178522564d2130c21a351d16e8cea229f0858641f5b362a4b19c13994c749cb2efd3fb5d9791efff3e03052b3b54354d09100471786f932c5c6f56d8d SHA512 9beecd11eecc52f24d060c56267f78dc240c473b99dfe5c2752f19cf9724e8bf3b790c0c557d4dc3d0d9038058996abf416b1e0afd18126ef6fd9cb45a585efd
-DIST jsonwebtoken-5.0.1.crate 16414 BLAKE2B 4df3357a76a8ce5666a05ee2e9bcf836677b47a8ef49026bcc688ea316ec4e622b912cdb1a10911466d32bf15d6675f8c866c3317d1d4bf86c731cfa8d6e9dbb SHA512 a031fdbe2778f2447746eeabd29879ed8e1aa178a5df037e25735e984ac84f46d5143b3d05b8c5dd6af7c813340d9bfb0454c165b05bb9c2e7879648a32272be
DIST jsonwebtoken-6.0.1.crate 17095 BLAKE2B eb6d69d7d22d27c55b55efb752010d78baa23a433f3d1f0863009f3d07d9cb83837829293221bfc89c660f9ce7b5cd3d0557f649158feb9b14bbb2e85f869d7d SHA512 8366d8f8f12b7b9644d389b59a12582ea91b09f7f556b801724fbf5e53c981e284ef2b1a7e16aa4e0fecc8571f4502dfc57419d279abc97fcac078dc71948e4c
DIST kernel32-sys-0.2.2.crate 24537 BLAKE2B dfc4a1e31d3ec9e2ac62b890839919fb7fed1444070c1dcd75bb75acfb53556d6cf2eddf5a6639e7852a3df2a0cc715c5ce1d3fc898ef16a1687020d98f715bc SHA512 682bc7c629aefd035966a2873518fd60719121cca7d63d89d6c97ff5306f24d8b5055a3c91b4eedaec22b1d5dd3fb8b48ff7341a05bbd72d86e06c422dab473b
DIST language-tags-0.2.2.crate 12754 BLAKE2B ea59a130fa723b1537e451d5a51914391fc0d375d40df1d8b3ccda64819e918332e344585523d3ba61bb0394899fc1663cf7a452aafd4a7e694f8d70627f1bc1 SHA512 54a6c7d1bc985860c194c842d7b5ec731d0e06f9c77ead8cb0156bd34addd957d0bbf8b6a9dfc6bef5ea31e39f84ab447d1ccec3c178a6c18c4a222a51e1abc6
-DIST lazy_static-0.2.11.crate 12361 BLAKE2B 3fe6a480c30a792448a3a2b378e05634ec59603f07baa03c0881fe5af85ecde5a172bb0733e7043fb6c43eabc261635b23410658d48add09eef6d807a750d22f SHA512 c85ac434d1b7d41d638e76a142a43d925b96bdddda112b1abeca1bae160d828262a85cd333d72499fe1dc7ae9574d3db226106acb433328c056028eb8c42bfe6
-DIST lazy_static-1.2.0.crate 10840 BLAKE2B ab0adcf0421131ddd35e95a31a0053e2ffccb03dfc0f46ca4bbb6341f40bdd56d01aed0987489e5e73aa5f7289f3c323d1de0db353a30bb0a75acf53ce8436f8 SHA512 0d80334da99292d68fb2ea9879540676fd45788547b7170b6df1b0a606c1645a07188837f9414196eb44ac63010a3c84fe5c4319478f6fc2cef837295a255edc
DIST lazy_static-1.4.0.crate 10443 BLAKE2B 25b2e61bbac48f0dcbc79c81d7bf01f2403d8269ecb6be3ea6147bd00f7a588df15a91f44dfc18ada19b21faa71de4637c7d493a8628cbecd0e547d74e616a23 SHA512 e124c0521ec7c950f3c4a066821918da7a9c6e711115d98009ae7c351928fdddead852e7596fea5937a9c30e4e4ce8eee7099b20248b5d6e3b2494b6a6d88cb8
-DIST lazycell-1.2.0.crate 11259 BLAKE2B 87eaa99fcdd691237c54c06f870a71e55ecabcd2d2de06551d2b718c138cdd9ea085b445f0d6a7b773b4a025b2fb9a7a04576cbd7f74be23af4916d8e8d2e7e3 SHA512 194e538f8e2be6748ca56463c9b6e83c7a4598bcc9d3f2680f8e35e391f61e36e0d9aba92bcf8e312f286a5d309f0d83be06e879a52e405bf2c89ec13d3a545d
-DIST libc-0.2.44.crate 347920 BLAKE2B 04fd82a1aab02a25a1201f6c463c0b30547e69dbca161f9b0ad87bfcc5b9b8427267fad3534c0a900c23fdb808b8477e20047dac396c8d000657266753786abf SHA512 fda87b206acb1a65be60784516c7d4f4aacb1ce53063e3c67a6a5335a02b3a7232867d11b0cdc574131d562fd98471df8bd0427cc5790c4add0556b2a090b284
DIST libc-0.2.66.crate 457815 BLAKE2B 5da379ea738b75189e106d4be821c999394043303b8bb6a9caecdb1b53e449f11a58edc4589193611b76e7baf00e155ba1077bcca4d0cfae30826e946a0075f0 SHA512 5bf5645a7cbe626108cd71e1d189286ed161fcd3ea12cd34f4e392be4cf93bf78feb6128b1101bedc41a71091398f26771f3efd3880f779ee0be00f706914975
-DIST libflate-0.1.18.crate 35142 BLAKE2B 59fbc83847c8cf2a0a5c68d242764a85ba440967b16205a225d9cd8b2e26859fac1989fea5d99520edc70f6177b0f66039d6b33cb59b775196fafbacd97f0fe9 SHA512 921c3650de299bfb52a5f4375cb16ea43bb0ef0722f9e9e4522fc2bd6c2b43f88dcc88033ace7ce29699245daf70c875cfbae3fe95d582b2570487eb894c0f22
-DIST libmount-0.1.11.crate 20894 BLAKE2B b33cb52058c8ff542242be01f0a092b2794cba35bbf761bbbc035330e192cd5d064aed6deb35ec6b8960b36c153cae81f70ebccefe1b105a1071af67b4f1dcbb SHA512 4a24807c0fc5785ec91aed7881dcd9684bbc85d68280b629af39ae62a02fe6f3c2ee29138e3810e1d4c6c8cfa9bbb783b1e9a6971040c006049f0a3d339a5a3c
DIST libmount-0.1.15.crate 22892 BLAKE2B add6012440cb6b654d292c6ce38f7f1326c1338c1459514a8f7cb0a9478127c963805541c259d6c5d3e0c5f221c9458200a290f49155e5d77e7e365332f35a8b SHA512 0528969a3f4e0779e23154e5aa46f16fb4ee5e6d0db97564b697443d75fd66494e496bfa95cca4c1d4536b9554d05fbe3c8bf1fc44072b6a37a6c5152e7ae078
DIST libz-sys-1.0.25.crate 650151 BLAKE2B dc11dc65c95f6c1f409ffbd0c9b12a809eaca5899da1073d8f302a752f9bb538b419cdf2f540b34b6f72c7ac36719e8fe21a1480533829cee305019304523520 SHA512 3c1d0754230c327876fadbaf3770f52282fedc6b373c92fba386a80261c577f6bea2983db7d3a40a231fbcfee40e560d8f738d25b634d270e2132b3162497547
DIST linked-hash-map-0.2.1.crate 13672 BLAKE2B 76ea32f13ba113656afb26f41155d0d4c41a1190e809a070608bfc116eefdf8d79f605e4e13d8bf0be5fe6ec8dd34c3d9e24146008626ad87837356eb1730e3d SHA512 3e18c9e1cfb90ac3c6b65a57d63eaf3b0510e70d3b046043dab0a48b57fd83f2b11c98d474d4779a17e7bf2fa3a95ed92919634b1101ee0190c5209e2ced4182
DIST local-encoding-0.2.0.crate 10531 BLAKE2B bff98eabd71a70643198ce82ca0131228a6266d21c24fcec7fd4c0ac2f46aef71275891e85a9669a611f76ff9206d0a193b346a19e5c9e3b760c4710250a75f2 SHA512 d27146411d059d71a83a88726238ac6ccac775c806f8c6621ec91bef70042045ebe398da76d1b6ff14a690383b92a7893274710cf5a4da2a98096c2efb6bd9b2
-DIST lock_api-0.1.5.crate 16967 BLAKE2B c44ebe24fa6074394d0719b293d447ab67a9a23788821f2ba816b5e5b7a6b09d543c630a946b956811dd199144bf43568b52da5ebdd5e8b674e489f9efd2234d SHA512 e6049a8a840c11f00b6505dc9d01d1f759aa7bee47520f86e36caf6c52ca476236b09609b0a5cab0f4c247a40a4736f8fc04cf26fce0962cbbf2956ad4adbfde
DIST lock_api-0.3.2.crate 18404 BLAKE2B bb7dfe778cc1fe3ca300bd2c35817cd217083a8de59a5fa7c615a29ca5d31293129b80ca68565f4172d296164b7bb327c6e0e0e7744171f98ed4a51711ad1706 SHA512 2cc7a8ba1679d345adac9dd68b4485c2e947e3a6248b935c0a41762a896920c40cd87d4e7bacf00f0b78ac44df89a411dc32eb6fd7f4235eecb080eca7763d74
DIST log-0.3.9.crate 16686 BLAKE2B 543a8a2425c88bd3cf00d4cd2b4790ef344f9743b61776d65f1d8aaaa1ee1069933e33aec114a2dcaada5cf698bbd983fb22354aa50bca58b161a36b2f1efc47 SHA512 1d49a0dcff0a17c1238aba6a6cbc485a61986e8c4768805ded912c5014d0fba6ca38c9bd038f3f53900a6309d41fc0216682f137362e63715878195453d2de6f
-DIST log-0.4.6.crate 22303 BLAKE2B 3b1ad5e1cc1cf7bb223df569a6024b5749fdc973bb99a2a1f11772774cb384cc98214366e62d846b57c7d150f925cdf0e906f8113039204a82fbf001ae15133a SHA512 3844c771f97531ae7312c6bb0cf74ccaab94925f68bf1172419cc44fa4b5373f3ac6b42fb6d0ba636a970b295ea5d1b5abbe72b4da67a103e8dc4ed48a0cc5cb
DIST log-0.4.8.crate 31297 BLAKE2B 31037fdc2fc94f4ab8a6e89a251b0bc29975027dc7efb7cc86a8e848dfc8e2ae50acdb177b7ba9f7c1f20ec01e50798f89abb772d67a33f1b060ac617cf9a8ab SHA512 0b71f97d5964134b5eea1332347e177806b2f171d0be5c410c0ff1539470b242ba9f0933fafd853e4171a43b5e373a150af18918924be431c7216022553a8a3b
-DIST lru-disk-cache-0.3.0.crate 10560 BLAKE2B b027b7b84a553e47cbe46520d0271025bbb9067e9f0f5a0539b01cded949f0b32e3dec390b84211a603efc92e729059801a6d675e01fb798f9be4e7c0592a268 SHA512 d8aac241e43140984500c443ae61f30ce33a1532b6200d63f122a3b2aed9aad8c9a790f6387644947df2accafcd060b5bc75a0fa9c19e14b1f99dd86d870e50d
DIST lru-disk-cache-0.4.0.crate 10813 BLAKE2B fb88c3efa2d9f815ada63e7ffb31c6e818d9b5160d65afc896ee8dc20a2a37172d2126c5abc1506859814d64f091defd07fd9b17e665247c37b7bca01fa12d36 SHA512 314381bcc3f2c17f846e70e673bd0bced1c144dee14822798b36468ba88be13912f9c6c0f798d855375b6a51502a925bb6d1a564d482fc4569fd4685fc25f44d
DIST matches-0.1.8.crate 2216 BLAKE2B f18176110921b1cf6e58d52d12f1d1a3455ce2dc04421fbf1b392f66cdd81a88e924571fa27e307a06301d83b04f3b8a0ca3ae40d2da6f2decb8aac4e2801fbb SHA512 98b58f6a2694b03a7dd1be69ebf7e3ad14483fc8e4cb6e6c26a4937e4e660e843efb4dd04a7312dd9659ca02acd3775678f73b8faac44a76ffafaf873c22f590
DIST maybe-uninit-2.0.0.crate 11809 BLAKE2B 5e517b8c59f9ae4f1a4f86b48679ea64d62450ec2519c8caaa914479ce9e5b3aff24707e2e37272ba74bb60499afdc602fff17756337b0c50a9184edbd8b8805 SHA512 3006fc009c7c743d9147a4122e677cdeb2546f7bb46963b2f266839614eb906f9d763c161044fd0bf3f7b54124ac0734ac9ae7f7151b1a7a5f45cbc739976434
@@ -182,21 +119,13 @@ DIST md-5-0.8.0.crate 13122 BLAKE2B cb74805b5b939e4261deb85de94b57ca0b64da032142
DIST md5-0.3.8.crate 6177 BLAKE2B ccfe37b9ec1284e5b7a1532d521ac2a96f3a77488166a71b5e57ac5d848db6db9a3b43cda0a5f8d2ec35f353b0576f4c16f50a6fb5041844c668462f0afcd05a SHA512 3cff7965ac287077803a1cae6e808f8157ed182ab282c948fae6f936692b08ce904ecdf53d37b83989aaf57dceaf1e82984c749ca27a2ca83f8eed2945f36398
DIST memcached-rs-0.3.0.crate 19015 BLAKE2B e50bfe0f85ad0706fc90aa46c1f36f6291377e5d4ce0da1e242a050420ac35e53cd5f5dbe21659ea69b0077bfc248ad2b9ae8bff05ae7bbf54d5760f31a0c8c0 SHA512 bdba069d806d7d032eec08c0328f9bf8a388746d1072e7a654b9c4ca2fce34f164ad1ffd1d91239eaf8e34c821b83bfe6a46ec5c81f7768874627a26183b24f5
DIST memchr-1.0.2.crate 8639 BLAKE2B 3177eb1792892c0a74c5a7696ba6a4543fd5fabbea60d77e9b55e9d7eed365f3ed1b6dce44911246b52b8ad9a05e51679f42f9ffd4e6bbdbb5d01b5155eef280 SHA512 322b70bb881bcc2f9046f2daac5d939fd581370fee82b7e0500e27738d1d91e11c3f65fbf4576e0d987043cd08e5cd2b39a5ecf66d0ba7d95f48b6fee502bc24
-DIST memchr-2.1.1.crate 19591 BLAKE2B dc612eec81f7f802692859cbb63d61e9a92578bb42402062c628e044367df6b02028f0e63f0b577119cd8935e0dc8a78569a1d45c81584ac69678ba49d3b39ac SHA512 62f8ff395a695416b147c600de62aa7acd4dc47aa195fe78001dce7ad13afec45608a1e1f69999048806acf97f8ae61a449caa16115062b0070f2a965b2b12f8
DIST memchr-2.2.1.crate 20862 BLAKE2B 79c8b7772f6c4e76ef98e416cab1a87648fe1f78f77eb31a894a2b1611fcf2d8336e361ab3d692cd03579b33f6bc5adb20d42418475dac5441b8bf356e38e442 SHA512 0f5e11507a4235edaa8ef639753abf62f1c187c8c6e35b0c80c9306958e41893492d4995e28bf28e5710e8739c7e75bb75a515507ec87870741a3b426ba8f44d
-DIST memoffset-0.2.1.crate 4618 BLAKE2B f04c4e5e1747d5516dff26fb045d91f01a2eea6011974a342c1830ad2aa6b203d5c6cd4db464177797f799197656085f980c00e78d0257efe5d3377188a8b8ee SHA512 4901eca49eb20acc53d1120548925d691d5e0a0ee899f5c26f55f8b997549cea3b819b1f9b4f5495f4bc73fbcaa386cda50cefdc0036c097c4eeca8086568530
DIST memoffset-0.5.3.crate 6107 BLAKE2B edafda6ce36dc8bad6bb1f2d824d6c6726b24effaaf8b6e1e612bb95c506d9f0aede29fbc7c5cd71b27b624ec4f4295b0f09842e6b66257093df8db076b7b974 SHA512 a647140f4218bae56c48119a21c96edefb214a10329bdb91f16382e2b85854dffae33c6c3d55bbad3dd7c82424f0a10e5d97a9010ccfe84b7339bc5f16c4786c
DIST mime-0.2.6.crate 6719 BLAKE2B e9c859193c3360dc6a779640c4323129171a3e7f0ef07007b0cf8f38e9a745ac4f252ff7d2dda5a67348a98447e25d04f1909cae289db8c8e959dde6b118dc18 SHA512 30e0cd95c8961ddce61759fa2c7273dfd37d490f96a5715d558c6c7775457560268309c3ad1222ff8150beab8f328b3a958dc05729d9550233d3efa0a1e13137
-DIST mime-0.3.12.crate 14815 BLAKE2B c4d3a50b93e8f240085610135395d3d72ff15b4030d6338e08577e83c1a5e8a83ad25717b6a5a33800ee8ad3974d2dc6a6e559329b9688efd1a4dbb831d5ce07 SHA512 d270cc42029e50ac00f20c468121e05e614ff5b5a21d599414cce07244ca888a3bcd7eab4c8f2233a28d5d832590fbf39281573c14b14bacf59c128dd50a43e2
DIST mime-0.3.14.crate 15035 BLAKE2B ab9fcc2247637465d99006899fc120ff60fb4b61f603ea65b15da594bef80ed2b9788e2d893126ed46c5e8cecc0aad2a93be855a043f9224ac07c07fd601734d SHA512 7079ac27a2a7c5534ab8af24f1d84ce78d9b3906a56107198e5ac43e7b6cc74a980a38bffee0f988e7b4a9b8d3bc052797bcbaecfae4c9470073ac34674f6471
-DIST mime_guess-1.8.6.crate 17437 BLAKE2B 13dbc6521fed028b3c3c2c9fc92da0a70782866c904c770ccd7b8edd83d4b58151fe8e0d3c30285d028b1c2281bc05d0f7b9bba9b8087762bc06c0f050883d34 SHA512 4835570090ae40031fa36f98f1461ae11e488690bf291e65b1416234cb6170b51f9fe054df866fce70838c013cdc28f471cc8991c884655c80f55968832b2e37
DIST mime_guess-1.8.7.crate 17774 BLAKE2B c207a6c2c4894cb2a63d395069c9280cf9cfb12a769b6ec05d44e4a7391633d549173af7ee21d32c06ea397ed8c5a51157ff7fd7a81a59d2e827144c718551db SHA512 d40083e53cb463071e598a650efbf7573fd94293dec851c5dd9a6fe33472d557f02fea9a758a6ac9d4e3c2c82c8e9fe77bf3ccba118fba81e732e18e7e2cac6a
-DIST mime_guess-2.0.0-alpha.6.crate 17579 BLAKE2B b480910ab11e5709e428433c2ed7b462530fa709cd1fe241eff957b4e337901f42f678c9e5468016a643c0f79755a6158d371eabd9ae8f4a7ca0d852ed846442 SHA512 b32bdea0942443aede186317a7e3b3d2e36e3bda56e43794c040aad6ddc1fb847bd380f514299800e449f188208c218680d4d07f16ab30c9c7cbab02c5245733
DIST mime_guess-2.0.1.crate 26646 BLAKE2B e0ef30850cb07de190677229161bb9ce37c7f7cfeda2cd2c54c6ebf8b7009e56a9c84935c55e5ed0430f546d4b259867132a702bcd29d3f25a2dd1b3a59da5ca SHA512 c4d83d8c05b1173c531eea48073762dcc5e80efc2609e06dfc1413ae2f3a3f7d89e533453aeaa75182a8b663c51c7ad0d4eb0b5b4450afc8e11fd74b84a9799f
-DIST miniz_oxide-0.2.0.crate 49387 BLAKE2B 2d41698d8dd4861991bbf66c853fdc163c63d4aae86e72383fb89d32ad714d7114c485c2f3da749ad382c4aec1c8dad74679c87603d92ae7b02348c05c48b9a2 SHA512 479aefdd98b5e7518053a81c4c2e0c86be1998158b6aca8467338b1593f282471e88f25168af0853a44448e46cdb68face063a449604e929e4f5ef9695df1464
DIST miniz_oxide-0.3.5.crate 54531 BLAKE2B 858a8a47d26e3e06d59547f820f156d28556055f68527e2b19d7516b86d8a4133c225c06b2a3cbb0c2e25f2450358293d54db65ae85bbead1abbdb90f5dd42bd SHA512 6aee406798316986f836822d3d0942ee40f0d3ff707827a6cd407a7565628ad3e5e0b2f072de732bbe0b2d4dc2cf151f8d46f0ff4950c4b1d873ec90ab9f435c
-DIST miniz_oxide_c_api-0.2.0.crate 166923 BLAKE2B ff226f5fc3c0a40a462ccb642dc1fbd2a418f6f5f1866fbb9ed2ddb249c1f3bbeccd4dbc7b6d73918d664341a4ca130ffba8ed4b2dcaf9dfffdf37cbbd4da2ee SHA512 9c557372aeadfc916dbcd9237d54817732ce1b8a5f87afa62f0e5bf95e8512099a9a96b322852f39b44472b94d0d638af6405a2832c4c9d67f3dcaa7300f0055
-DIST mio-0.6.16.crate 126174 BLAKE2B 34e8634e11959b61abc52842b1c0afe9034cdfbe9923f8a0e65e9d4efdb0c13c46ee5d7272e86595ad8a1d3d9e987dd9b47e1074d7c66cee3f9d889401fdee64 SHA512 ca9290edfdbd4659c686a9f47d7bcd2177001fbfe02ce1fcf6e8aaff4c6e4ba52abb0d698b103337e4587789e7e31945886a90f5e334651d27ac7b109f560c95
DIST mio-0.6.21.crate 129233 BLAKE2B cb39ed9e9d3b5f456bee86e33d8f0a8cf4784bed826b7ee7f40dd66a98a12b1113fc150fa3d1ea98bf0eb2778caa367abe193dbbdcc0d82b96207ef8682ac982 SHA512 2bc68f6ff424d3ae2ef67a6a1a708b4c42b05f616cad1b0061dce3157c6a46d0666173e65c6f8b7960051e21b526ab5acbdc835833b5496fda280719ad139c77
DIST mio-named-pipes-0.1.6.crate 14766 BLAKE2B a372fc2f2393917811bd56c35cfe6616b879e59b220c7a56b92caaf1d68227ea2b388f0507b696b738c7e470041e84ec86e422066738a3cc5c52ac90c9c057ce SHA512 02e33e7b2d33eba7865ddb158bbf5e72b8eebf728e4f06831d71db431d9e444307f42ca490ea2d9a0388fab1734e1ef4dda99127036e58fabd1f7186221a3b61
DIST mio-uds-0.6.7.crate 14389 BLAKE2B b01fbe5ba2e2f58d2bc513ef577c70890ab0a556313dc8e980d4f51d4622be9180215e2e9655e3f02aced40823bdf69b94a8b63c6b2624e28cd24fb5dd89b0c4 SHA512 fe16c8702eef599c2379a2b72a0408970c3318e240d6ed59077c7fcae142bfcda4d9e342e3185338671b82719f7c2ab156bb28a54818a54c249216dbb0f8bb04
@@ -204,227 +133,139 @@ DIST miow-0.2.1.crate 21133 BLAKE2B a60f04feb5bd98eaafe6123f7579ffb0287b0a3d1de0
DIST miow-0.3.3.crate 22850 BLAKE2B edfbbda60206d0e25eaa2d8972290feffe989bc2b6d98099fe3042bd0480d63a0cdb54df1abd55827790996bdbdb61f241b7fad8d325cdd64891513876ae913d SHA512 f2b8c5f31bfa2d831f1a6c0aaa9e526dde3ef8a2ac363da5180592cdf7a30e9e0898de680692db00406a48f4ee068ec97e3d42787c807335f7d47faac9c563aa
DIST msdos_time-0.1.6.crate 8445 BLAKE2B a9d2b0f5b353895fdd48ba9a7112b9d030964a97a17a739d0a079a3a4a2b594163bccfce423ab0ba963b0fd3cc4afcf76da6084a301cf9b1e487e2a406b587b6 SHA512 c6e053673a9ebdf442ff064b5353b7af9c660f1a498f487da7893d31cc7a0b6debff4ee9e134299eb94e3fbebfd16d7561940b302b1ce976ea5c7bfd5cc19fd3
DIST multipart-0.13.6.crate 46966 BLAKE2B 9451ced730f74d77b114014cba065b935e2ecbcefc0a3fed5f3ad7c1c547b18cc552114261a688710a8afc90ad558e1ebcde9ddd0941d12a93ea6a8700d890d7 SHA512 751ccde3727b6c54d87a54111972c03ec397e2fb66f03958ebaee1ddd9d6d297e285c93c8fe8161d469aa281d52a46088eb165f740de3a110dd20e752fb94769
-DIST native-tls-0.1.5.crate 24838 BLAKE2B 4e24ecaa32f7f5c64e7725325296836a56b2ddf7a5ba4fdc8a246df618140e718a6784bb4b54555e6f8a1284563f9656dae403032f4c6e9f8eca570d6259399c SHA512 867b73e360625df1a803c80c9b89cbfa5d0ae09a82b1c041d3326b3d73e04821a22eb2ffa25ff6876dcaf50906012755d7712cc3049c15b70d135852561577de
-DIST native-tls-0.2.2.crate 29238 BLAKE2B f8407b3989be8c24181cb5134838b2b9532c6e00f310915cb8fb7d92721d3c9ba29c8b92d12d71c02b9862f064a0ec8c819981513a981b47132f7498a3d41f9a SHA512 4bff0f1e1833e46d069818ee53a74eed8d792430d222cccc9aadf28ce57246b3b9901f095d97e3567eddff85f59739ec02e1662955d23bba8060febcd7eecdc9
DIST native-tls-0.2.3.crate 29087 BLAKE2B 0304db852e3b1261a791a5a8aba5dc6fd2e13bc32e6ade5ab0f58403583ea45324a4ae4359061c2a9137cc7f127404ef663702a22fe64f2489691de71eafc914 SHA512 9964d627c922261ea730076a2c8447784e0ceebd8e6218f5a61093021f10682c2fa25815c10711831b7d41c84b7c77cc1128a663669058882b0af6d70ac0bc09
DIST net2-0.2.33.crate 20936 BLAKE2B ddbc96e7cc4877b8a66d019e7e65a260379cce19c87bf507701ddf1b00208e7a321d34882282fa650a52f6b9d878605a6fc3be461fbb7e10182dda04a04e5806 SHA512 e522b399071daf1a9b913429e2eee52503d9604114feaf6987e97b85c128246b9137e3dcf03f45ca93d623ca6a4b295c9b703db4c319af47498e07d7714c07a9
-DIST nix-0.11.0.crate 162039 BLAKE2B d468eebf5bcd55f0e46e533de6cd318e3f1e0f5c457c7f6d0424e3a71fb60b93e9bf9b2ee4c80d5fdc68b7f3360048a9b832f2181ad69dffc14269470cad4d47 SHA512 bb3ffc5ae6a8de37a96e9951e182c2916016678265a3c4efdee2ca4d26bc5f4192f4facabeac2978788143d2707094dc0517c13b08833cc1ddcdb6fc1125c874
DIST nix-0.11.1.crate 162326 BLAKE2B 96885b9054153d9244cc1fd5c346bbc9df4a35a39c84c7e8c9ea8b5c91bddec71cf330470ca06367f3bb89bb20a15c6d43488675c3abb2a43c6c1e26ba72ade6 SHA512 6ac6c7e95d23bb20ba94b7908b429f4a57551f816835f34cb2c273fbdcee29400689f689b697767572bbe4e7cb55ddbf49bcaffc42db820995b8b595506ab6a2
DIST nix-0.14.1.crate 185227 BLAKE2B ecd12ae7580879c960cd828a22109e5a7f209a24c4208bc04d4392f36726886b66b147dbd3a1f3705edd35e53187553c125dfd47589a326c032aab0a3d3c9ba2 SHA512 c6393f47cdff2134cd51ca3d6becf0309697a11ac9956e3979a2d6cd00a86545d1af4efd63f6d5e417a80b2d9b247a7416b7182156d9966e00c6da25a3bfdcb3
-DIST nodrop-0.1.13.crate 7508 BLAKE2B 6918c8ea7f2b84d1a30e8159ac6cf9d061270bf8cf60fb2ee7c96f9d8a5566f1922a3222f80c769fceedd65637d6ee76a4d45b533d5b02aa0decb8114f6cb11a SHA512 2648c0aec970c99f001dbd8169939731610ccff6433acba8c71c669bea5078613b2a785d3ac5ce5a839fcec714b5bc55f2cc83522ab4cc09560c846f4cf8023e
DIST normalize-line-endings-0.2.2.crate 5299 BLAKE2B 3d0cfdcf94f7beaa24bfe5b332f952b96bd915ecb4943b912cdcd20e02b4ee6274c7c3fa9bb39743a0a09990901cb8406b2a6a583ad62ab61800f33df48ad32e SHA512 d1581fce8b99e2dc6ac187255722e8aa07c6d03daab536b41d483fb961afdcf043c8fd92843ae3a0835c36c39e403b6bf263d5fb6bc0342d88c4be0e9a4fc1c5
-DIST num-integer-0.1.39.crate 17881 BLAKE2B 1398b54766719f6fe298fb20489373ef774f1466349bcb96479610c00bb0f6f54b1a794def2841a0bf70558f6e5a080b528071ad5c64baa82bfac084354fa203 SHA512 1e00ef9fe5adcc312b4b8a59923015eb1387d90e6b3d7239b3aabcd83a9e67f2384b3a383d84ce8cdc82a470770f56373a89f0a679727a5fcc8f5bdb1f1209e3
DIST num-integer-0.1.41.crate 19399 BLAKE2B 44b96c8f1295f0d3021303d7e3b49474b86fa7287a1f284867e18883617d642fbbb8725ddae0fd68b1ec70276977b87f4d040bc457e037562f4de374d042f178 SHA512 f979ace06e3c109e9b5217a85341117ad12bb6e8da1b7ad799d91a967e3da1eb785fb114294f049ed8a2022cd5269c1ff771bc319af3da0899df97a1e412297f
DIST num-traits-0.1.43.crate 7659 BLAKE2B 313221a4364b18eb29e2d4c480209766c56b1ca2587a0ab8f668c71cfdefcd733d64be1430bea1846a77f075a26137fbe71f2f4d9be79688374cdbe9e0274ba4 SHA512 35ee0a41f8ae33b1e6656935585f540956a8155045992e7b488b9fdbcf0eb9c9adc90ed8128d45f248b9ac583114cf518c4c7de719b8c6627b29f2fbbac91f17
DIST num-traits-0.2.10.crate 41810 BLAKE2B b1968facdefb08c2ceae9ca6c3818f03e781e8524488fea26f1a992d3c40af38376d3e732d2dd75c6f666a38d15dce20d9590c432558d65e8fc585e33ea12d3e SHA512 5f945c8310a9b3e78d59a070639dcc1831a80ba682860bade38e738beb36b0496d268d50cde6623d3d20b8f5e68f6ada53d0f21554dab1c18fc225d397ef3761
-DIST num-traits-0.2.6.crate 39923 BLAKE2B 7bd781368c553622620f0d62a09f2c82fd26d4e6378ea8fc51b0e655dcf0561701881027f46f7a98da1bc25b777c62ab7338387c776a9e5e3463ea53a7efe922 SHA512 db638c662737972f07bc7ab82b923bece8a6c04719199ec0c7ca90140ac11e4fd1e4eb3748a69ddd3ad2791d4f5f5f69a00ce8aae92a647d9015d130f85b6b4c
DIST num_cpus-1.11.1.crate 11798 BLAKE2B e395b63d0c7050e06d4e70dd9581c0c005a673a1534b49fd4a257c3a210d3f48a32fb467aa4f05c69e1324ba0c1e117f3d0802df2cb54080d27ebf9d31d2117f SHA512 c3a943f5ff82eccee6f2e8af73e12fc83a82590030381cfdfa52c79b2f53012012b246fe8fa682606b7ddc011892d72d5579bc17ed072498170b51060c7e7f5b
-DIST num_cpus-1.8.0.crate 10539 BLAKE2B df0b759bb2e1f6b31081968b190a804f168973a3c12b162106218ab0487421238021f15f6d97c4efdcec712277ab35873439e41ceff7ccc9c0bbc2fea0620bf5 SHA512 cd25a8da1a7c2639f33c3d36382580788d8056bce30f87b89993b92f39ea6ccce0527a907eb38dfdbe9219ae3a2bf86449dcb43ece978f834679dd4a8f8f2ea8
DIST number_prefix-0.2.8.crate 5493 BLAKE2B 4f3a159e1805030887d912016ca5af654dbb976bef9ac9b3c086c8c18333840c1405d06ba907a0dedd04c39d3a8d773749447162eb15fe52b0f9d857f3babe4c SHA512 7b8745e6bf91cdfdd11dac33187359272149981d2b25a960316dabc2f34c162fe33ab2755efd82dc22faa0f208b1fa4046989e887fd93b8630b37239b6b59974
DIST opaque-debug-0.2.3.crate 5643 BLAKE2B fc0cf1ca373f2eef8a37f6d7eb02acc7cbe4d71f7844e01453c036c7595121272c207023f43ae5287b343756ca0a8bddc53c5e0186e95c75c019268a5f716087 SHA512 7aa44aedd3fa5a6ed3d60239c23dce4cb7b27693e110140e6b332579bf1c1b773244f12271ced975e53caf68f3f381a7edaada573efb982d2e13d638a3a6dd40
-DIST openssl-0.10.15.crate 167961 BLAKE2B 64dac45c9274dcfb9610204593d9932e8b6261e2b0bde0d69a1ef7fb06111b8469b187e1e7f380a39176cb66766a2d7065201072eba793f748def707b93a1c94 SHA512 fc9a0d57848012d0937efc677cf2beda8182cdce2a01e22a00d6aeefe9ac98704608c22a152465ff2ca9f62668af4d25982fb67b90aff98a90be12192fb60b42
DIST openssl-0.10.26.crate 186994 BLAKE2B f95162ec44905c5da7606cfce2d343ab9538b03774559aa8ab18ee8a9935f2dee542bd26a0ed8704c4bf808ef46569f19e405ac8c2acbd7b05e1cc89ec241a71 SHA512 6a0c2202b4b5d3099712a2badd464eb6e8d310abdeb265050272f7526fb5bf5575ad4a5a5a4f798a5e834b59f223a6a76fa3b2f9bbfc08bbf43b88c3635bd38a
-DIST openssl-0.9.24.crate 149235 BLAKE2B cb5c1d735aacea51e7cfcdda283a3466cace755a50282ea43e648dd09d37bff066bf9b6d8c1688a5415ad1d2bc2f11aa64d891fa5770b3e79c8a3502cb36d505 SHA512 3e969e0986b820ce83afa49ad38402d5d56591181fa3d01100ca5911b040949c5344afa3f78658a553dbf77d61eaf302cc35c901b9d160dd782015e08b6add27
DIST openssl-probe-0.1.2.crate 6427 BLAKE2B 8df00c8ab6af7887a88dd1672bf2c40c6aed5867b0b8d07dacc94b80591814e2fee4ac5dc775ea0e98cc33641b9eeebb6d5979d34717ba400b907358ceb2a469 SHA512 4001eeea5c4f859559475b4b1df8248611bd44273116b31e7ef775e02918cc989825989868f331f0f0e387787680c1e4ba721ac0fd4695f7363005ccc0815d9a
-DIST openssl-sys-0.9.39.crate 43147 BLAKE2B 0e32347bbbc21c24d8b756f3a7b837d8c6b4cd5bb04e605c5633bedf07de8fc54e1de49bd020296289680c7179f5bf1180ec7d6a17e971779023f151c4feca81 SHA512 f22bffd75a95a60358bdc1296f4d5dbe5f193b27f0de3f391e9a72e663881678b71a7f11145b2a0a4649273cb383f21a1bf86ed26dd9781869403b4036d76426
DIST openssl-sys-0.9.53.crate 45434 BLAKE2B 42fef72ebbf3bfcb8eeb6499d2965e297c4e4712ba06354020ae322aded58917e02a77028ddb165b5210e1352a29d74380a7ed93c1b6cb56aa722e803e0bfc70 SHA512 da0b34b5a58abf1b7e40dcdc1d9f4f6f0f8a4d5d8bb7b7417025a6ecf73145e80304541d2944050c162d7a9b1835434a9d7d2fb670d5cf1065055c09e35f940d
-DIST owning_ref-0.4.0.crate 12233 BLAKE2B c50343d2bbc99c4c8035e1251c2ab31609e8209fe5b6bbdca8bdb0cc5fe7749ce29ef2aae77c90798e2f2f201e12ad81e6607c34c2797195890b5587178dd194 SHA512 51bb1cb259452f7395bce0ac4e7d2d6f3733dfe7a8a1a46d50179516ef921924f745a248e4816da5e434b589b5956a20ca554f9a93790b2ed1c55451b9b885ba
-DIST parking_lot-0.6.4.crate 31890 BLAKE2B 95024d434bc988a3612d231e83808efc96a4184d059b51a1c2a9c86e661fbd3d75ef284381f0fe168e73a1c811754a6386ff6410ea2e248434e524ff9de54de0 SHA512 e2d91dcddb872d09d1f4a9d7fff21ca53c0c8b15f49e46b68e4a59f2ccffe1e852214860bd99d9407a66e4b6ecf102fb96ad792bb3e9676ecde349d728f16028
DIST parking_lot-0.9.0.crate 35170 BLAKE2B 3de9050c5dbbc7a0b98a5cad05dd485142bb2a22e65216a20f6e87deb6d124b4502cdb3837dbdc992ff5ea62c67e1545bab269237988832d365fba265149d245 SHA512 148da5edc08da3b27bfcc94a1c0578f228ccfbdf7a7a6f3aa73ac34e290d795f4169553bc7c2b20227e095e8ac75446db51979b595e4d77fa7c76f743138a331
-DIST parking_lot_core-0.3.1.crate 26635 BLAKE2B c0da77758b3b4a1a5b7982f1304e3cd74b4345bfe4ab1e9dccfcaee828e1024419fc20c6069efad2ee2dcad0180350d240ae689a5b700e4b47a0b3b3808b6539 SHA512 3cca0091e839cb0b63dd17f989c1d3d196e9706b4adb227f9308cd2b43b68806dfdf0b7ea098592cdc520bff249ddcadf23d0c0a7c23eda179ac11594c26e127
DIST parking_lot_core-0.6.2.crate 30598 BLAKE2B 048e87b1a785da927afc368290c2e1dd762d98239d862a1aad4850d9498b91e8d64c399bfda0586c23f02fd8839723af1d5e2ef3e714cd932ac11a111b978543 SHA512 5de5d9cac290d7d6e6a3e1fbba2784cce8b4ed163481e1cc6ec36498884b5e3cf0225c718551289be164d1a4e192de390201a083560898e4a42a4068661c0689
DIST percent-encoding-1.0.1.crate 10057 BLAKE2B 6dbfea557cb7a604a99b6fa694ed24b1555fec34bfed54503d98fa4b285a91aab1405b7156bd00be0001b10bf15706878b7bfb4f73cc34560166e0e8f004d944 SHA512 6e884d7172e8cadcf6e39056c9f92b70252f56a8062af0e792179dcf990344f47553c04e2fce84841f20f5c28557d7768727f60c862b9876d29cabffd4ad19e9
DIST percent-encoding-2.1.0.crate 9748 BLAKE2B f3ff35ac683724b15e40c85e0fb8ececb07b61beeea82b7020f02d27df05a8a3535f157b3cd688533e414d6541de7de8640ef4756706d8061af0fec94ba04ab3 SHA512 98af4dfa7c6a3cf0d5aa929c436f9eb1ba1b576a944513f1284e6df2ad06be7cab9eba145d888d50af88f8c970bacc702b323041bec6d4fa1dc34095186c628a
-DIST phf-0.7.23.crate 3841 BLAKE2B 9b5b3305687626f79c3846f4d24f3d2e8bda91af4284d61ae397ab1fbac1611725f7dad42aa026f6c7c57e23482ffc2e217df5b6736081d3552eec91257b3285 SHA512 8bc773f2c8993a1b2aa3d555fa56cda736b6574b602a3eac5a48faf3d937ba99a140d9d8d98b998caba432d8346364194849947a84df52bb86eb1bead31da8d4
DIST phf-0.7.24.crate 4318 BLAKE2B 7bf1794bcc75b265c5d9a213eca653e857f1693ede35df6d53b3ffbc7c1493f0bfa241472e57bd235f18d9390232e53364a9bf5cbb18e67610392f5baed9f9dd SHA512 0140e9acb7dbf6ac2d17110e8efc9ef515e2f54b1b3b213d98507da6b9e9e3eb0995173c69b31c34f536ca9b06eab108015ac26d2207af79bec4e20d19d62e44
-DIST phf_codegen-0.7.23.crate 2866 BLAKE2B 40260597f05867b579d4d96fa686774a1d7e2e0d59d1adafd1b21c9403718f0c42aa1cd77c6266b7c9805c76ba1bdbc47a3f20bf4db3912df89d569a9c2504db SHA512 64142b8403f5b966ac17dca51bcb52a89cde6d365b5475c3e9aba5e6a808efa6bc9d5eac512dcaf9648ff02af0c2c06aba22b5ea8614b7c32a9a50cb630dfe23
DIST phf_codegen-0.7.24.crate 2946 BLAKE2B 25edbfd08f0d585d594e68bf8ea085a4ab603b50efcda4bcfaf81e044e0718c4122bea3cdf4f039b78bd8ef9eb56c1e5f7545d888ec63d8b816a074d78c845d8 SHA512 2f01538937b89c0bb3e4f779b4347ae0d0515e6a99a6692a57898b8c97e33a02dbf918757b95800333cbbb60748593471e40260b767f8b87cb48e2a23a90d664
-DIST phf_generator-0.7.23.crate 2219 BLAKE2B 40ed4a207e9eeead6e243911682471a896d75b55cc31f38a508e16389533a4b5ac209557b595331a0cf0f9521f9f8874d2afa44447e406d79a204c3ef4c0a6ac SHA512 0837d40f937f11c2902112f754003fa7465ba710ad86d397b3c33cf949d0b50ce3693030d40a5e1b7bbb21445983cdc63f2f8be615a7d4bdc33ee4d970341671
DIST phf_generator-0.7.24.crate 2261 BLAKE2B 30d1404517acd99c74584267d007d89fca6b7292ca9f286f5d26329351eef6a85abee4e2ba68b3b3e820232846f93eefe88c8d0a90e96ad2bcb95328b9b7ce02 SHA512 793d8d46fd2848f165099324ba36d6ee074a54e1c20236afa5c5429894bafd23740d1cb41f00b87e4d21fea1f78be7151ace7590e2e7cbc906d565e5eb7225f7
-DIST phf_shared-0.7.23.crate 2084 BLAKE2B c9299cea4778e0931268a669a558d99a242bc8dc4ba1f558d143e9690509562d917ae4e9cfc86ef7c7a90d73cda00f8668f0c77c0ded473e47d9caaee8f56403 SHA512 ae5036273bf2c724fe7661db59b3b537073b9291d1e20e0e8dc055fb144ea9d19fa769887cc7c6576c52eac47b7cd7075ffe7dbaaa83fccedaf4576223736a25
DIST phf_shared-0.7.24.crate 2170 BLAKE2B d31ce11599253d92045464efb1b578df8a20a936cea60cbd295f13473406948b44c68ef42c605eeaee401a05c32b6282d5d62d48fdff70af400356e5e064cde8 SHA512 5d46e738eb9afa2c77c5d123ef47dc1f7ae767baa043cf3a937118faa64696e714dac57f01861bf58a39dac67048c55a301dd24401cbb1976a7f753873e49cca
-DIST pkg-config-0.3.14.crate 13565 BLAKE2B bc457c2bee4034e7b5a5303bddf078e0b3e52018eb7513c5fa610ec9b272b95fab6cbbe35281e86bf0f97883526d91dcf8c156ea83e7dc23da0924a395b6c811 SHA512 bf120f0694f44d7b83b431eb28fe14ef3aca4d08ae0c2c9edbf8f184c145ba3faa479a6ab25e2d7e9f9d9f2d9a3fc21674fd4ddfe88bcc4fadad40bd8285656d
DIST pkg-config-0.3.17.crate 14533 BLAKE2B 729b15209bbbee8a6d3854e30a89b3e6041ca3cf7b1460ff6008e37866e326d9ec8b4ac582c125676e31eefa048b143beda33432b95f00a8f51cc7fa33ee4986 SHA512 42be78556adc07dffa8933ab1436d5d6a776018898377d58dfdc9f961981f9f21397301b41536c55d8a3772bf74a38069899d1a5cddce5c24a032017137044bc
DIST podio-0.1.6.crate 10186 BLAKE2B 30f1ccfce0a1026ccbffbbbfae035fd3575b43c9226b6fb05c1dc7cceb31ec02de1dfed3cc497dd4fbcc611a767e3b5cfa3c751598663dd5c30ec457c6b5d946 SHA512 91901b941780db01f01848ed63fe44decf3543dd5163804fbd0118435ea60b43baba9d24bb1d182e929744a32ab4b2a0bb7fa9b6e9f3d32966bdd6b8ccc631f7
DIST ppv-lite86-0.2.6.crate 20522 BLAKE2B 6e1e4f3d0daa02148df390be19d3575626e66f6a78dbf27c1275f097c4307b80d8182f7795a270aa2c34d8c31c8c3eecc88e9507a6c9def0e91af11233aba90b SHA512 b9764a841364eb89157c828a183fdf6aeeb63d1d35e4f5dcba79e5d8e20eee8f22c845636c5c7bc980da1d141d838528d5f190546b23aa5e4e51e626a0ddce3d
DIST predicates-0.9.1.crate 24557 BLAKE2B 3559f5108a622d022f2ef4c0a99f7b41797e6d7b543810414b0ed86b1ef1b91c454e0153528c7b381c43dd9821614974a98054cfc3a7e418697d184345299ac6 SHA512 bd0dd5bddb524f669658b3670238b2dd87ff2d1c0620cbe8e17cd6e2d0e6b3b3e1bb8cef77968d106beb576b6564394a1e205fcc9286d87299c4f40afa4085f1
DIST predicates-core-0.9.0.crate 8053 BLAKE2B aa05c5b838b4e419cd094cb1d920c4f0d1e817598c1cf22546727c1df1d1e58f179296a32d59b7ad9477684598f9ea007b67d26b620f25b5c60d527f467c1118 SHA512 d24fd091f5dadde6c3b3d9ca36f638640b50b194dd50ad6b7f8aacd53a51c08b4e188256596fdec5342ea6ad20549f046cd4591e2c7336c7b7fd01df23d71777
DIST predicates-tree-0.9.0.crate 6240 BLAKE2B cf972038b40a5f3a6d970ddd53ab80d6e814734dbf7c59c341dd77bca6dbdf2fce1f673e3f44068d316e2b2b4d19c8f5e03662ef8c6fd392829b8f2bc415b377 SHA512 254dd3d05f17b9b72d7b007041176ac1732c76fab2cd67f7653c6a3f83fae48e466d04ad45a77b38098b807c291f14d56f02694755cfacb5e559326c067d7ed4
-DIST proc-macro2-0.4.24.crate 30970 BLAKE2B d6b0a5fe633c5773e6d8b4bc2c9f32c66f8072f85ff48bf449fd3d8ada87e639ee730f8bd3d3170acd1528806698bcf1c329c57f102cd79833f96e2fd1bb7e0e SHA512 57ae6a761fcc14f22277df025db6b09f1173035e1496d1c4906d9af9231c19f0b93750abf36e4013ae82799069869047a7e3f1b3e095344e55c603fe5a462d03
DIST proc-macro2-1.0.6.crate 35414 BLAKE2B abec56bdf8bf2109337e007c59c7c9c78ff0af3848c9b45567b2ee1d5120ace78fdf327c61becf917ef64366e5947792608631f197d182753eeeaf81ffd2a1cd SHA512 d0a6358eb6f9334128a5b47c096bfc57452e13d603c9514df433409069c00468fa2b3c76761d7f3696abb061c1c3ba24150e0cf9be2c5d571d580238d2d27853
DIST publicsuffix-1.5.4.crate 17028 BLAKE2B 9a75a854731d335c7351db5497b0a5231a1df53dcf000c6e87b2034be65d5d1dd8c5cd3f05b320074eb8c98f6f9fcc3be4723864e6f5394fc041a288861c8baa SHA512 39378405187d65d75e5519c24f8f74d226d13cb993aeae30d551872937a95fae5118be1ed3f93b336e3701de2425123ea46350a465158c5358bf2fc58162ea9a
DIST pulldown-cmark-0.0.3.crate 44672 BLAKE2B 89c8545c930ecc50ca23569d29cf7d69aabd3c33b877077db2a8d84510c03d46eb473e354ca124e9df8f2acaeeb802f68d9482c80db9908f82faf62663efd4fb SHA512 522f75fff95e80a2db5a86bbb7d1dd89f86acaedb87e4f95634862e1b4d58e0717318dea85613eef912208e097a4a59a914da211e9e77bf904c062037267fb67
DIST quick-error-1.2.2.crate 15132 BLAKE2B 0c35f1d0145d4a3bc4b835f203cc4348e1d9e8f6f7c1ef887d923bf8a9a63f896929da67e27978f0d797a9455be5aa868078bccfb8eac480569d62ad64e0fee8 SHA512 f4ed283635e1fb72bd30929457ac04b1b79c36b4b08603af6266a3ea6e18f12c834cb88ac090e42bb869c8a608f7521812de81932a81073a34f16fc882c6148b
DIST quote-0.3.15.crate 12041 BLAKE2B c5796b464539b018351b41b5e2287398681ccb2ca76f46178b4f310e61a8184afe9ea2b8dd7638f27bf5bf37f60458895497e51c82b31326abf6feb4f69404d7 SHA512 2e5dbe725c0f76a81c6624181b43b60b95dceac208e2babaad3fa6d1487794805169e2ffd967659e4bb4e1abebe96505be5a1007c514d10f2a63ef282d699ea7
-DIST quote-0.6.10.crate 15795 BLAKE2B f81cf2cc13efb42bcf90f4c9cce832d94b2138428d133516d579a0eed157bacda9f5b29cd1c604a89261390ec011fe4825c31788486db007efd97fbb3de261f6 SHA512 92250a3664fe872175ee8c8aa7c4fec121ffe6fcec11a957646fab1297e9e946be03924ce1d7897125cdc0d4883400ac05774ed55a32f943a129fa8d48a1a162
DIST quote-1.0.2.crate 23023 BLAKE2B 4091809b4fc9b8d0b56be814b127d6ffd7c1507becba85dc905606cbe85f46233dc4b429c1e865e7c7de336cb936d956169ceb5dd45b489b7722022ccf818a3a SHA512 67778dff9dc5c4edcdd6454b74ad9353bb6c0c4e51c16cb82f2e393a7d7a0cde084d3c93279b718a8398c40af0a9377ebfae5321e69e635efd8390c125b75ce4
-DIST rand-0.3.22.crate 11318 BLAKE2B 6a8d7bd3a7044a8c1bf8d9e2701a65770365304338ab6b48ccdffdead493213cd7e442dd5a6dae3b5f372d3004c382cd073c60a924f4b2ce50f9e1d5964a996b SHA512 1b3af2048992341ce5a3bb5d5c9bc2580949dc5e92f7aa14d17bc3eb3cde4ff4ffc9201ff2c4dcc02dbfefd5307f0731775ec46825032dc1b576a2d77cb4cee5
DIST rand-0.3.23.crate 11318 BLAKE2B 5ad9b187fcdfc515c606a73bd1e9aa3215e367659c35a013c9d4d0f80f9832331dfb971ca370a627c0a2afe2b8860514740e00b1d7572e221a557b5570cff6ff SHA512 a4f46fb7dfe39677dfc112eeb56fb3c28cec4cdaaf95f336f2a494f0b2b30fdf22ceb9ea956f90e13c7ffe711a68aef9fc1a80d9a911d93221ae263c243fb2c3
-DIST rand-0.4.3.crate 76094 BLAKE2B 3889a26c9c41fd6b0b5bfdc75961aa4f74dd22aa61060914b0391361129a7557b504f3f23777cfddba6c2f71092ef9f2a76359245c0d594988c5ae7aa2968ad4 SHA512 d287faa583d07134a10db61d1dad30a3ac006624815240d50a8a21faca49085c3ef5c01c3741def25b3e93cb52507fff36497521caacf525e106f419013381d3
DIST rand-0.4.6.crate 76401 BLAKE2B 5593ad2d7fb8214d917e2eb734f5eee548f48fd699c9fccc0de9c0c6ee49803a426492a25fda2ffcf844169e2bca00709d4dcd9ceede72a4667ec431f5502fda SHA512 a91c6da7188b426bf9cb832892ee2af87c4cd65fad505c34e9c63343da71efe8c0c67b75c405dca5345317b7940d1d0fc0b20be85afd6b3089203e5698d86f0a
-DIST rand-0.5.5.crate 137359 BLAKE2B ca594d61b964b3511cc0c995dadf1aa270ea3f962367e2faab3d73ba5caef8557b5404756f7997aaeda0511184d3a8ec0f35197bbf7d3d507152f1f7c63825a1 SHA512 e135a9c97943662bcea9c4730f19ec6e01ea73303801101592c14e97b59adbbc3457ed7a3dd57843776f5febb6fa34890aad9d1c2c596ae89416e1a281062cc8
DIST rand-0.5.6.crate 137236 BLAKE2B 26ce5ac8fa86492fed467b68047a6a47f17af3720099410a3498c95531efe9d8329998df0ce693190c63d371c2efc67f07df9c1bed624ada18b5365f555b6c5c SHA512 0e2a643eadf6cd9f035eb720b540b838a00d6c790b1a99b36cec349c2e24dcaadcae6607f99fe86957e77b244d356dfba436a03c1d4d0756d6f8362c19087b64
-DIST rand-0.6.1.crate 126613 BLAKE2B e7779ba6b13aa58edc3632f250787d35ad486185d3307d17528b12bb6d2adf6eef8aa91c5f51f021fb8e037d4ab1fb64fa364ec093fae0a5bd79095d51e06791 SHA512 dab500d25d538d28bac5b9b60e3b262f64e9d0581c5c17f165890497f7cb459603b815e8a43451610e75d8f5390aa41aad57dcb532307c479ebb99f475f4d4a4
DIST rand-0.6.5.crate 104814 BLAKE2B 8d94c6f135ff4b07a2236cd7b0c2ff2b80f3d391e330590bf0ece15b08a8c8a5175ea32d9d12832eeb485822446515e14408171d5f1476a27e2b9ed97aa7986f SHA512 2eb84bed29708b8ba109f4329bf6f1cac6caed9d91b2aaf185d68dd2eda73d3fb7be2897d0596fb28352e799ccf92c161ee44599d5cb426ba9c3b8c747831904
DIST rand-0.7.2.crate 111438 BLAKE2B c9e81a0b2bcf5a3d425865dad2babd90187da55b9c70fce4aea4ed2e2ffe9cfe4e66bb280f1acee11e1f1ad17d3a73e906ac6cd35e6a2124852b66093293bd48 SHA512 d29d10e9788f0f44b56b2981aca01a115eca1018e6afe2428fca088cc9432f27d014c6f1f0c819317052f4c64a9c54cee8834eb08e081f292ad65160dcdd014c
-DIST rand_chacha-0.1.0.crate 11637 BLAKE2B 423f7e835d9c69f49f991ef2ad00c40c8af929935de531821ef32054b39bed54991709e04b352a9f429c7c49f17548084f703353df3a768f1f31a655111b8ebd SHA512 b911dea149eeb859e532d17074a4db8527da2d048b6f59b0d58fdbb51dfe3e839092e1c614e748f471a7381d28605e994ef8783643bb419eedb2c4e04f3dd0a3
DIST rand_chacha-0.1.1.crate 11703 BLAKE2B 125fbb623b5d829c48e5b492c36585037e7fc6f12eb9090f946d05343fe867ce65db8eac913762dc20b6af2a4856e957ff43916897f3e385cc22eae64911b0a2 SHA512 200d39362ffd6d91cfe80634e951c7323a5df8a382c91e3afcef1ecb143a16dc47a17db7f1a746b18e4ea8bfd36bc31ceaeff6d0116e166f8b34e4a8530b3c1b
DIST rand_chacha-0.2.1.crate 11475 BLAKE2B 698f830845e24b85fe52b11e9a1c621dcdbe4232bc22f3dc0b1d2fcd4427045f302f74134d9b451fc5b4f9ac559fb2bc06f3d0eec5eddb6fd6cf3e6d3030855e SHA512 30933fdb94ca8d4bf040a7e08a42944a0d7c2f3f6a9a3d547e74bc32f922b0eb79d85afb1f6c85c78dc115170e70bdf96b36f0478d61ba5651876d5350ad18f6
-DIST rand_core-0.2.2.crate 15450 BLAKE2B 407d86fff0cefa6786f4132a032c52d0c81291e3f1ad7f3de6a4b58f12cb744535d14d1be44244c3a21a4c562b8c48c1de5e096786d0f7da817bf4242b0fa310 SHA512 fc06e20d22751c55cf869707b527a55709c48d04d498b4301b4d629e4fde2e2ad0d9009734ad20f64f188f55b2e4d5f0ed8a81b7e681a8a0890a4900d63a0bde
-DIST rand_core-0.3.0.crate 20581 BLAKE2B fe46ab0ef5fe8f5f5695906336683350abd7aca246a537e2e4bc9fcf10686d39aaac259584f17c022200ec1139e01e817f71caf33933ad3f353baa10e6cd11ab SHA512 a476510ef936571e3351f42e0f1c615530732b7c66f41975fef10dc6b8f4d8536a6d8166bb90d6da2bb997108ee3e87f4d80884264b239680e6ffd3494dcb748
DIST rand_core-0.3.1.crate 15483 BLAKE2B 2e09b3b3306514c29bd7588498e79be7353de656d8cdeeb4dfc6a1ad092f15a861c2ac20591ff71f7f60d986de9a09c860de4a9f06799f04e736b31bc70a5fbe SHA512 5a7ae601124502bede760fd3179c2b28059ebc3b5983bfcb6b8fa62fb58df95cedc1aeb2734e792d894dfa4620801c13c29702f9cbee64243121575d4b6b9114
DIST rand_core-0.4.2.crate 20243 BLAKE2B 22fee5e44127eee047ad8abcd9dd828befd0feee77ee9a0bcd4dd42174b1e650f2a19f1f3b39fde937e58c17afaabf7231e2aabf214c2eb22edf3f85b73f6eec SHA512 f7ae3b690e2cc1fbf2707ee04b752bc5472433f737ab581f9872f7c5660966bc6be45f0c5d2cd8771105df6d4a9d206c55f5cc6ffc1693b46e1ae03a2883b028
DIST rand_core-0.5.1.crate 21116 BLAKE2B e74791f941a79971f2741172d489d546373c9abcb0dfbffcb7b97b858ec800b2e0c97df4ac636f3aa1b8dd6c14685edf317336d577f31b5c6cb7d89a157e547a SHA512 4f7500b35e165e6c817fdd67a50745d5497d24e554bb554705097e37258751e8755c4d6b8a69fcb5e1977708ba78620bc35d640e4e018fcd4e88d9dbdbebdcbf
DIST rand_hc-0.1.0.crate 11644 BLAKE2B 24e9db27c6673ce657dd18e0bb5ac092c4340b818e79edf4a3ebfbd9a49759d3969c22f4357be5884192b6e6375528831683be54e1283112eb94097ff38d7d88 SHA512 808d8c167daa66a2608884d5d3f1444cdb21f8ca1c61e59fc9bdfb506a634ebb22c0143cfc0574e15313f82559fd2d117a46910eba3b4eb7e0052ec280f5cd2f
DIST rand_hc-0.2.0.crate 11670 BLAKE2B 55fd048f2524cecd4f0e17927a81111e3070a8cc6a5b0234a46445400ad5527194edf8c91fb5ad6538f4958d53044ab02424f61a38adb2931e2cb7568c458ee8 SHA512 bca185612bed5cee4da76fb68fe854105da276f5bf2da464e596d586b925df798cc692ed881e276ab77c36b4b0551930966c93656be122ad05899d87853533b0
-DIST rand_isaac-0.1.0.crate 16011 BLAKE2B 84cd447debff595683ceb97ae2b03cb31ca6e342769dc1ccfca0a20e5bc8474ca3c40cce4bfc3be59b2bc0c849b74848f8916a2bfcf9bf7c0d54b2e8b5ae3c67 SHA512 addd5b4fb2bfdafec8b3d50f607099ce8d9fd7c5cb5cfcd6603368e5022dda7562e2deb2efcf4d5f3304f248629160f906554ed40a0d7cbb19c4b807a36dc74e
DIST rand_isaac-0.1.1.crate 16020 BLAKE2B a720ac67770133f6051720afb6681623c1b3700be9ab8f663fa8ea852132a81c1404e34aed6829c197b92996007997cbc9105cea0e125e5ff3fc931306c55da4 SHA512 9e8f6c79abc53352c971f8182dcaa7979904d5649eec9008262bb0aaf0585b4c4817351cd80ffa8d07f172ff4c82d85a09ef2642a08f608fc6be3e246ed7f82e
DIST rand_jitter-0.1.4.crate 18409 BLAKE2B f346f6856128218aad0e70e8b4b70a19f39b4b3161ae2199d893f6427ea1e2b7aed4024de311add4ea9a19de898f5b34668a4c7727c9e7b32325663eb6ddbf51 SHA512 fe3791612cf82bd0ad1a115c442b4a007141647eecd48f49dff9a5d326c374663d9bd2e511c8d292e1dba44665359b522cd5d57ccd3a18598e88e42ee1670e4a
DIST rand_os-0.1.3.crate 18965 BLAKE2B 3cd93b10a46a70e0e3ccaf1fb8ee52230d74b7d790351652a8e39323bf0dcb446d14e9229e13c14a84e93394a22e0a127f50ded11db1df8ffc0a6bd564af63a7 SHA512 01e81a692b78df3b2bd65bc285e5052ccaf208c7d0ace414f251db4fcff7f9ae1502ee60ca5745c95e778d3d5efe15fa84153c17c422b6b6bfee829376c14575
-DIST rand_pcg-0.1.1.crate 10881 BLAKE2B adafb2f28603e4c1ccced838b1946b4d0de94f7d11c85b1a0fdd69a1de3a7c3e1b3030af25b600441c08e2eb73595ff4bad195e5d2ef04f3fa2da5f9614e14f8 SHA512 5104d9a3352f631eb7775218fae6da430d0b26c500aa10a333baa0b1b3d4ff7ff6e8a0162cfe8f514382b0a9342a00e3d2ad6b0313047c5e0c324f3184cfa9e3
DIST rand_pcg-0.1.2.crate 10844 BLAKE2B 14150260cb41d57c59aa7251000acb1af9225b015ef8596527e1c313cb5943bc3e6c995e31b9db5a5bac41e30f36a6f7fce5a24b21d6413e74d0b3f9732cdad4 SHA512 6bc684778ba60c2e48793d4759b40cb0d35b0bc20ca0fc39fdff7c3f8fe9082dd7b5d5f26a7f17bafc6f3568924eac1bbe45820b1c2b09c91731ea5487d76d9c
-DIST rand_xorshift-0.1.0.crate 9194 BLAKE2B e35999cedfb58b4c2192fcb0d4b606b1535a4ff32cf0f9a8d337f029704cff285af741b507c98afa27040e04f2be23d53a7c749fbd86242469a4a85d61939f64 SHA512 6bdec89da3e3c07c8fe42ba4ce5c24d76ea81b522fad533ae172c5d402f109fd9ce793bc13647dc1db188202bd78f48a9ad55f0caa43f1b88c711f3f2c18a0bb
DIST rand_xorshift-0.1.1.crate 8997 BLAKE2B 314192d23072fba2ac66130604d92150bf946c6f6cf88a4b337314c51777af36d8cb6189b92284e451ea078e0ca66e6a5b91a90c0c2b0ad2353ecd3e08667f68 SHA512 3205499ed2584467dedb4641a48f3ca8fedc263b1d9431d36a251af0bc4701d99ce4b5219d515b9b24210dd3ef2faace6efa886aa50f361e07f53dd0fb0841e5
DIST rdrand-0.4.0.crate 6456 BLAKE2B 330ee64d998a0358f95a3dce50b3e1bbda531a3b613db7e5ba4038a1cf7191b60be3a0f33416e05380c41040704ce52727928915e9d2f4565d39984d1c86fcd6 SHA512 6476275d124bee28747191471e8d8f321a3b1c148c1f2a7ece4175f5244a7de90afe5f99d2eba5244d886b92e38232398864bf90e6d434b09494533942c8d894
DIST redis-0.9.1.crate 52038 BLAKE2B 6fbc116442e0489c3b033a96eba2d39363a0b9e2b34aeaff6a52355cb2c2c5162a3707901d09b255aaf45f634a44b44ea0d14feea6285651e61908f2d6e19193 SHA512 b4f9a0c442268e1637aff4b65e11c6d23f3889b0aee9ad3d42f63286def2d470cfc99c2c2c525b7696493f99b6d73c5e9b47af633d5c86e0b0ef431e7a2b901f
-DIST redox_syscall-0.1.42.crate 14962 BLAKE2B 5a2992cb131f4750287148eccb0920584fab3e0366b2d5a486dce1b9400a933a9a53342815a4c75af4cf529f40163c41817009f76780002fbb108048109e136b SHA512 63747e029680b889aecbd8d3bd5c1e12e0218322a7384e090702e0c3d569dd7fb7c411b3e75f2a6b71361fedb1d5d0fc559248d1b8b826bba92595a591fabfe0
DIST redox_syscall-0.1.56.crate 17117 BLAKE2B 57b1b01ef3cbc6f55def6c9a0dcde16bd98e83badcef993e26ae3ce849abcd1b1c10f4da931c605970d77f92471734764a537e7329291a221343fde23f3591eb SHA512 17a3044327aa733c830dd74e210d6bda32622617d1c5af9d70d7647232d8569ad0b04ccb14042cbabb5d97ad98e3f1f5a9968a75387354ffb4d175e9577115a1
-DIST redox_termios-0.1.1.crate 3227 BLAKE2B 0b109d34e942735e804dd3da2a9639506e8bf6eb5b1f69ae021b115b0b75ae5159e8457abdf647dabfc19d5119cd3a44b8966635d7862cc66a8a997e4468e1ab SHA512 201d051900e919e2c6c6769ef252e51979d90133df16b6605e2a2f424cfb2e6e505e21add75ef5854fe5e0cab1ed1f1c1451010f072ae4bc8703c585a4323981
DIST redox_users-0.3.1.crate 12557 BLAKE2B 42810692ff093b9ce056e5b539834ec3fcecdd5cea6a1ec750fa456c4293ce483a9de6105eeddc6b6f41c591c7f292b744b4f12de65eb634ac4b855e6fb450a6 SHA512 086a01e32fa5b5fbccd2d84e23141e3ee5a50e5ddd6135b579c75db5a0eb7df676dfaa8e2582038ef19c09d123fc68e9d0e99667d4ea46f5011d4e7fcf5692a5
-DIST regex-1.0.6.crate 239455 BLAKE2B 0e81b18a220c6e81fb9185391f15faba2451b0fdebc7facc06a3ea76534ae32a76a6c573a686a72c62b30399939529fde08e6c33c4fe0d126df9cf5e11204456 SHA512 4779fe3896c131b418b07ec2622888b2b8dc64172744e6ff91c46a957646c796c46fcc5b1c37b5349f0c7a5adccee2e7af1e07121dfd2b59976bd0fde5b60bb4
DIST regex-1.3.1.crate 234662 BLAKE2B 41643af1321748db717b37bd4985916afae3a84e19f628ce5d5c194de42620e6b02221083c7e4b35bea5a6749c265575b2c0318dd58ea26b8bcf8d01768e1a27 SHA512 6530767ca2896db30599e5b3e2bf46a785d9c95bda3e530e82c659e5a98345effe5424738fec7545fa5edad12729a396938a9c1dd3a680c0405dab6000fc19f7
DIST regex-syntax-0.6.12.crate 289531 BLAKE2B c1736b335844d8695e2795a869b538300a9bcfc92ca41e4e9840fc90c133553da4f2929b0f39fdbc7488551a8477b2adb20b83e728a3d847171579e20c925acf SHA512 671e4ecd9dbe58ab5938e0b55890ef0ab2c033221bf549ae0df3b6e831b57099b4c16f8577ca134a758999a1bfc0840aff49be138fb6a19e0b081089f66fa0ec
-DIST regex-syntax-0.6.3.crate 240173 BLAKE2B 03e33c25c9e7fb90cba231e0ab655bc35135c0f0602de9f977f967de7a9a40a2aba9a48a30f49eb98dedae4277a03b17a64dbd59f0b14023ba9df764d0c9e721 SHA512 95e8556d13337ec25a9baff923528c0d1af10ac3e88cfbb6f5bcc40fb90f962cb473c88a8e3a7007ab9fa36cb063cc2348e79368296baedcc6053bfdf6bc7b6c
-DIST relay-0.1.1.crate 7331 BLAKE2B ca5d025d76f85b05a8453e264045871a5d552632db7f8bc61428798bd5b539ad27eec191ac153addbc86c77ec771df6058ad84d29395ddfc39558c416d8d9d91 SHA512 81b2aa587529ebf364d4b1a566acfd867623a33d32fe20c94551dc248ef28950de61094d7e1acfca618205c731cb3cb955bc8106d9a4c5c7c84f9c38b35b2261
-DIST remove_dir_all-0.5.1.crate 8726 BLAKE2B b654deae9905c03b068f07d17b5fe3715393cf7c495ee017467fe1cdf955bf44781516d0e6aaa1dd738ace3b3bdd4fb38f7edaaab062eeba02baf50a1250ed0f SHA512 9ee9a11717d45aebd28cd2f50719a2183cc623bdb1af099701e4edbdb9c98bc14cf2278ba06aca4658bfeddaffff00d0d1464c82d175fba7d6fb272918dd6928
DIST remove_dir_all-0.5.2.crate 8907 BLAKE2B 585f49f83db3ace90dd0b4fc77aab7525844194c82d36cc33ab8999aaa6226d24a130c30f55e2c46a08273cc554d9d4c8bc51958aa7dbf1045085b2e22639e4e SHA512 d19a45398a93adbcef9f233f6b3eaf4a63ae95f5bbae00c880b40c5edd34449e7f798ebcd4d11843c68ddfa15e11bed21d434b224e4a175dcb64ae011c13c8cd
-DIST reqwest-0.8.8.crate 55825 BLAKE2B b4bbde5f4229f1ebf797d47a4447fb9e882067f0b93d9eed645ec4eed5dad9aa96b14b439111107901ae45c9bedf341b55afe3a72cd4298704223dd97a030551 SHA512 3bd09864fd1bacd2d5868a25745c586e4287f24497338b74405e617faeb11ea6d132e222d10f9d3b36010708a68e6ce4d80dddadf6b44a9f9bf2ba53044a5ca7
DIST reqwest-0.9.22.crate 105923 BLAKE2B dcdd1630f59469783c9b26d89640027820785e34cffbd226d4466bac62d5b50650b2e49ce744756cac10e1848215d2c865e6291e27baf4fba8bcfd961c2b3e97 SHA512 7a72bb0ac26314160b27a9c74c4c2e5249375095344b065a50513fc1f0bf782d35d51add67d3cfba591590abef3839c39c6cd873abda6606aae72ba0137b4281
-DIST reqwest-0.9.5.crate 63819 BLAKE2B f8f2a524cd542b234966712a07d7178ff24d57fe2fe809c9830f08e91f994575f7f6cb3accaf9e12188033ab9becd384b7c1b654862409cb42b65928d6e2d9dc SHA512 c63ee8937bc91427e6a40539cace7d91722660e517ee789e57584be49efe299f0a7e3ff7a8addcd74109fb69d8ec4cc0697508bda577a94eea6b471815a00de8
DIST retry-0.4.0.crate 3875 BLAKE2B 2484122c3aeb1cbeb5b6152a2c3e9d329945530d3c7f01a8d4b9b83bcb7466ced9b0052acd523872192f7ce63c9b4f9d01dc7b86739c1e2ed0e44fab609397bc SHA512 e7581bf4b3d6217246a9fad57a3af5225c3cd0ef7916ab9cc4b4cd78b040ba5e708d04b0315237a7cbc61f644c5435e24006346f43016cedf1affded1b839be2
-DIST ring-0.13.5.crate 5419321 BLAKE2B 8f81b3fd2ef84574ec7763d40c1f37d7d8c324c8d00f49d181f152412ca084b0f765abfb09f5c380c6fd2b116eb9706acd96c724030d71f7950368a902ce1de4 SHA512 18c2bfa44fdbdd8006b114dc97b66979dd24bde852d793f67b8107c3a2fc73934a3817d4911d5e1dc9d0bf70053c7467c657fa87577d9608d10a4b7a9e63ba6c
DIST ring-0.14.6.crate 5428922 BLAKE2B d544d611edba8c89351e8c2d5cba3e759512e2852afeddbc02881ba93c32e17172174ace446486656792bea226ce0f9592dfa2a6f806cbd652ccfd2ff0579fe4 SHA512 43a52861816a5a9e812ce2f9fff3ce47b14f17eac0df9657d4dc2cd6eae9540da6251882d8319738831124185d9ff18476a60f2bcefd09861868184872ee04c6
DIST rouille-2.2.0.crate 71003 BLAKE2B d6ab434e666e471f019533ca394bfe66a1c4e23ea3c66dbefc7f5e8c37d9651ad013c0bc25d8f8c0742819b28fae028606a666ba741e0b424062acbe3d549c42 SHA512 b9b105d59f24773f9a29ddd293be671b8544790cacf83e6e53601d186c7f8b14f5f52556fc5424c1d060e54ba1c8dc1ec492f6a9b698404d7a4c41839bb6ca56
DIST rust-argon2-0.5.1.crate 27795 BLAKE2B ee178d0009a4c367d813e3e4a6c6f765334a0c366b8f0d98f40d55c6fdcfb64284cc7c490c6185d419430f702a4cd051971463c7994ea3323f331eb6c6eb0132 SHA512 80c1c48db1463e1506bbc8147c147c8e37a8cf26d6297399a8e645c8fe81b6ed9be9048a3b3dda67cbdbd505085e9ae79d50faa2a846021ba65f959160465f4c
-DIST rust-crypto-0.2.36.crate 857879 BLAKE2B c486a2e43eb9ac9d2558bb39a249dcd689e86eef51d9a7613a3964baa633cebec824d5a490254dc06eca7a5faa471126de92452d62c522a3dbf494b9940a13e1 SHA512 0fac026d8799ecde523f20e7b34b9486343e48b95e79cd76bb6c8bfaeaebed550e45d59d85d8a3a58595f10c02a4a5e55691da15c203a4336a9bdb5480cd2e90
DIST rustc-demangle-0.1.16.crate 19137 BLAKE2B 04226ff97786b81c90130b48cf6542ea448661af9ea7afed179e71d04abf52cfd3c53fab26d4d35bdf2c1d5a735882da7703527aa48ba7b77f337599c2324150 SHA512 36a63a28a72c710d08524adbb7d11def37db23fe123fb6ea848623b4207c7f80d8415bbbe951488ceccfb8f4f1cdb66a8edfc4c0eecdaa62c87df9e032f4c063
-DIST rustc-demangle-0.1.9.crate 11463 BLAKE2B 3f03fab938d2778f4a74c101da6adec0eed5033bf06e724a5978de16cabf0341790df5da9c68376ba1d85a048575ff644e14297767950ef15d68c337a5d865b8 SHA512 7047907a0246384eb672bb8fd69a201a205b18460bab857e481606d1b9e25c2629c2898118edd72391da1d1f83b6caf4fb2a78eda19edb6dc7025eadebcc13f1
-DIST rustc-serialize-0.3.24.crate 45926 BLAKE2B 11dee8dac7eb007067ee0eb19d122bf45d912e6cefa95fd5ae3db7a4585a3f37e66b123c8c7bb761cc451b402cb9191dd5c974618331bb9aa9efbe9215115abc SHA512 60b40a0b41678287627cf5898e0ff6ac5668865f1ce5a482190ecd7539b59a955a73c675fedac76e68a5126efb92ff0cf1d1b4f24359a932463434bb76d9e884
DIST rustc_version-0.2.3.crate 10210 BLAKE2B 1f707d1c66d907c9b1d2ef6d0bc6bc9c89990a7b922a6dfc2041865940ff3854c4d0e1daf558279fd5871af5818d4000457a32c949104f46538312fbf730443b SHA512 01fa7a758dcaa4f15c18628a0d5ee5adde5ade96a8b7dde0908e39e27b290d1e9adb20d44e2adcd379341d2d4a0c34a80dc12553a3bb4efa4758988f28989779
-DIST ryu-0.2.7.crate 41382 BLAKE2B 267fc35f85a118384ff716f5e3d4045678f0addb74f1eb82e6d81bee2ecbb27472a8e31d9b279352496a622f040ad057ae2d132fba125be784d332d6bc818408 SHA512 94805952eabddc1c295b76e5b6d5b441748763b41d9371f3a2116c0bce6fa933767a3c1682a39d339d4430b86190c84e9421b5f3acd4d3274998d0d96bf229a4
DIST ryu-1.0.2.crate 42001 BLAKE2B c25f0454bfac40de3150b8c263c6d2842e64f86f441a69ab5e5722a2383a9a07c7539837f6e50996619eb0c4a5da212556a4dd21a761a250785fe0a9c4e18a3c SHA512 c681e037f1eea488bad7fb5ecc79af52377bd4b9eeed95eb213201219d7f100702000f81947aff8f18641235fb62c138a30eb20c1f93ae518a4d9960a598bb64
DIST safemem-0.2.0.crate 6450 BLAKE2B 44598e47fa6185ec0890b4ba6d0e7b5f52f8892875741c3819559dfa61491736d4326fa1713916ca41d6daac72829ad31d0905f2e339a069a987d9715f340795 SHA512 71901f472668572e849504a8a830d4dd9a742729b0158d2c6865a5ad86e65cae8b5bb83707240ba03a7a74c610ace87f8b59bde68998d2bd66c19849aec4fc8a
-DIST safemem-0.3.0.crate 6947 BLAKE2B 1f3e86944eda42c890a5f5792b7e0a50fe6574b1cbb077b7f08aca7dfd33e26deb0fccb3aa96056de3d637d014658b682aa47b523f0efb1f8145af7bf34ce3a7 SHA512 c7d56204b29e9c0fcf925ccc43a2c910f6cd74d232c500b61996559a783ced3938cefa058128d72759e94edea683bb8922ac5ea631d16e31b58de093d6650b0f
DIST safemem-0.3.3.crate 7778 BLAKE2B 6ebc0e234054919687e8a369bc30ca6b007d0e4f8147157ba1a90c290b7f0b490e5c21a6d4406671e26ac073f9e4e06a2bc9b1f21eb152b05c4022a3a4ef3793 SHA512 2e4852ca91160f9f1e764b75145d794726a5f6c162cc99ecbf9cae20474a06cb3a0dfc245b895c51342240f6875423010b33e36d038b8b419a37e4820a9caf72
DIST same-file-0.1.3.crate 7078 BLAKE2B 175390d4c7cbe5b98b27b6d23adcef78beda50277f0035eb58d630591023fff92756e928d2089e915e166c5da6a8b1d5b3184e82576eab5145c1681d46b4e953 SHA512 2d3d03ab0dd4add93cd32e7ca43041d541bee41000fd8d98575a58cbd192fe4498234ab80baa3c4791de9f3d4214feae90f628fd655e3510ede61f757be3a82c
-DIST sccache-0.2.12.tar.gz 244128 BLAKE2B 7d20af625ba954c950e4e54f789b3f755178b73d700453361a2a9c8603aa89a6044bd85dcb7895837cb2898ba3adbf5167bb023857b439e73c164cb70f924994 SHA512 1f7495aa7c0749c4bfbd85a88a304a6ed18cc9bfcd341f0f1a668a743ae31d355bc8c5b3199b048d8bcab3ce8e9c8b844a609e4c3009d4e5497dd080aa881a45
DIST sccache-0.2.13.crate 244888 BLAKE2B c7326559d06afd2ae663836c302d597a6c094037c01172ca9453e0a589e79b117f6605a77ccdd6bce12f11aff3b136867bed94b51331d281a909413ecd587648 SHA512 1703f58c23be57c4d621cb7173a5fed1c7499ef558928b8ec3177d02c4a2f13052feae36b61bc292d209e846296d6cf77c43a848ca4d304c7b173df11d8c8eba
DIST sccache-0.2.13.tar.gz 256562 BLAKE2B 46e2d5a494e870954faf8167087478dd90a16c87ffa4c99c59d7ef4c4451e7f639e6d0c0ec2514da90079d2c77192705b13603719746617bcc9c601d43b78ff4 SHA512 83c5a88e0ad6641edbe68f5756b5c5f0b21b60d2a07731ad32de6c23e2eaf751e544fca52ac36378ecc576bcf36cfd2a013ee3b16c743f0527db8661696f6ead
-DIST schannel-0.1.14.crate 38833 BLAKE2B 8825f6325f65c5aa4031a2260c4c54ad2a65634d2ce349bf6c31fc10a76f539dfe58d4de1e04fe6e48e885fabf5f720f5b4e4625f4a511e96c7cfe9837c901fa SHA512 550623a87f01c3c6181dad44d44397f172aa07c1b262a78d6eb38ca0676d68bcb8f231970c4eac87e93286225e17acae09551b07128c43b576ea77caae18c0b7
DIST schannel-0.1.16.crate 39153 BLAKE2B f06cb0dcb3d93ac1debf396b23faf5df2b87ce98732ccf5c0ef78af0c36fc9825f2b716f0a5772dc71cd2b2e6ecb477a81c2dbfb6bbd4f84bf3d1187dd7cf187 SHA512 11bb68e759e2ac0bb57a214e64d86fcc49903dc70f9e0582ac4bd0343e94da44d8d34d22649ffae41dc975b4390e7d10f3adcf79d9fe8c9fc95c747c58947b2b
-DIST scoped-tls-0.1.2.crate 9079 BLAKE2B 35e15480e05c48d5b886bf94f2fc58f79e7b5f6132c8e81ca8f37140f58d21e8a30dab56de35cc395b1878083f9e7b187af7e580bc61f8f38975b2e1193abb57 SHA512 9e1a517994f06dcdafa05f3ebe67958ed5bc751e6180cff6c891f48fbc143f3279aa841e6109be2c403b492162bdd90b23cf74aeb2154a34748c5d495789fd73
-DIST scopeguard-0.3.3.crate 9605 BLAKE2B 2379e45123c1c6ef456001cccbcec3298d6d32a5197ee9ac51e0233522cc24e8dff1900f1a70fe4d8a7889348b0c668e8e5c8956ec0add0898c719ae8e2a0a5d SHA512 57ce8e32dbe342040a63ec65fbef3680d66d439f0f704c5d485670041505905cfc602e7e3580748b4b4a55ce892d17a453e6d2f853cf0de4c6a2082f0fe95719
DIST scopeguard-1.0.0.crate 11304 BLAKE2B 5871f050bbed81b50b05407926d66ef8ecedf21bf9617ee85a425b1f2694c14ec35014fda39dfbedae061d15dc2d7efb39b10f10b5697e854154358eef1e389e SHA512 4f2ca06ee2d9c46e42ab4c72596bc7c99fb7ed8db8e09bdceec010de51aae21497151c01fa72ec55f3bdf81ce964ba682ec64ee96586c5c315a5daa8bcee0b37
-DIST security-framework-0.1.16.crate 38648 BLAKE2B 73b1d36e8c977185485d21e5c13eeae034137e1e3d9c1db193a893129229ee10ee4e7103aafba5772467d6d751c59bd9aded0c6f828ebd937c18aff677348f25 SHA512 c7c51d0bc54255f02945d970f918a3e378adce2563b6a5ed81eaff1c50fa6610e17ce18bc3491c74e1481519f5b9007d9052f476602a7b96b319637d92672c42
-DIST security-framework-0.2.1.crate 39220 BLAKE2B 271e0cecf9bfb0fc0aa305d96e9bee753c6dddaba201e40beed76b3db0471e170dad447181068994b0fd8065604133fabcf88588a1a7a1ecb20049f4d97da635 SHA512 877f432af0e531d98028f01cdc3bf3efb4747c78b447face9335ed5039ba16da1b893a5bec77705cd1e5b2151f4d6674f6c6baeddabe46180b67a031031ed82a
DIST security-framework-0.3.4.crate 48568 BLAKE2B 2502bbd48ad17114fba8cd88f9f8f2416856a7340e27c8271d70ecaeebe2b4f5dadc56e8222d1a5451bbd601581c7864211cce7987901a0c0ff805d8c983df5a SHA512 4c23e76834c0a2d013a2785030a8ce85658bbb144318eede6ea790029f8cc848045aa69f3ce8895eb2eb6708a50cf62a5dffb908d5fc5eee53bc203f9cf8ae46
-DIST security-framework-sys-0.1.16.crate 7754 BLAKE2B 713b72887d95a85182052b1706706551b6d11279647fb55cfeabde1377b2940fe9ea680a6977873ce96aa7661cd17b3d793ee292cb0a0f4ef94cb1da5636eb24 SHA512 5a5084bd0b63e831a13882723a7e7487460c718c871552dea09d4c6bc0a0535c3becb535260b7623a7e009aff026a49490b7dc0bb4699f2f69d21fd929938709
-DIST security-framework-sys-0.2.1.crate 7790 BLAKE2B 20fdafdfb5ae59033fc6b893f35219d84c758658f1f6b5a376d23064dc8ea357778b2c3c856bb43aa751b08f5ababf289b6882b4dab71b062ff9ea3d94e4d94f SHA512 ca18ddee68178f49cf8b50f79391dc43c6269dc879d14950b13fa510e5b46959a8af78cbd007f8445fd510866d79570f25eb0dddc0a72b1f7b4390285cd93f84
DIST security-framework-sys-0.3.3.crate 9554 BLAKE2B 851c1c7e7d972b9f74d7278fc501c3894ffa0fea31954fdd2ef5e070c28c080cce04d35acfbdec9871c4544b218ad420ebd42bf6f426142046d805ea99dadc27 SHA512 a78a9affbdff5c44e63e555970748724a4cf1fb1e47a6a5645294f70b2c0960d3ef93d3289c3695d5de31c8f7a9b093e3ffb801a1631b474b5ac68e0b68bfe22
DIST selenium-rs-0.1.1.crate 6546 BLAKE2B 7fe5ed7e62b7d6ead066ed2e6a731a9da16ee6accf466b81a7d2661e54f36470f648aa0fea00b5655638f080383e8cd50f679d96a3eb586ab67466b510f56983 SHA512 bd31dcf5fee7aa64a5868923329e4bf4c4e39d1b87c90bc7704b8f961b67b11001377a6288239e70a3d523113f37cf2b37552465f9e3365f37ac96a11cf7352e
DIST semver-0.9.0.crate 17344 BLAKE2B ae782bc78f29e45577de8574ee58959c70b54bb0b6f45a5a7b09cc4d358d9a0a80bbefc6e0f2a330e2b55adfbbe5c1f64f4ec9bb94c4adf7bb3e4fc9c142db6c SHA512 03a2ea563456f812c301721c3572370fe4934a22db60079da0dd6ffa33fa789e5e2436ef09e62fc35e0b742b06fabc290992c74eed80419a353c9de9449928dc
DIST semver-parser-0.7.0.crate 10268 BLAKE2B e46b7cf9d292f8fc54561fca4df8534dc96f6be920a5c869c405ddb31b9d1a18eab0799207113cf4910a52cc0df5017ab1bc1883a7c3787ebf2d60f09ac0ab4f SHA512 17320468ec6b9862d595f358d70c09ac6e09db7885fe0ead7a1e596f79350a6306e8bfde5bbd6512008a7c5454da1c7ae55fe1e3bc1c1ff02ac9df54c0a6121f
DIST serde-1.0.103.crate 73256 BLAKE2B fc7a2cefd3281b6a562e492d37e1f157de534fe078505467c43b34c6d86ec8e629b21dae9c11334ecdf024c16947e4924ef643c387fd48a9741f5270bb488c6a SHA512 49adac8e0df0cc74dd6fb6efbeb28876335cd9d58cbc5026a97555d1e9424ebeefa227cb2cd7a9ec6919e0b82c840e390aa207383c2a8166888b7eb28c32c4e4
-DIST serde-1.0.80.crate 73057 BLAKE2B 13a4a49db02b91eba4ff731a2cdbadca0998d46d4f8781d8a2b134e1db0298d3aad4239590e753b6c1f79838754fbd6715279ee0c33425bece03e683e578b079 SHA512 0606758eb1f29310fb2863e1b22c554d9ff290af9365787fd7d0bd76217c81ed9dbd95f3b55c782293db38127dd272368fb59e3b1b9a1e2bf053d69c9ca3abe9
DIST serde_derive-1.0.103.crate 49652 BLAKE2B 8134c992b7d9d073e0f3a325b80307e11e2d9d75db40c0b80d15381658864d58e05bfbc601ae36d118ad174d0dfb59e6cb6d1f48b30af21fe7b03811b06e07d7 SHA512 5ec22c59ef496b6f5d91cbe7f6085ef6501e8ca43c62805835c76f53b0b649662c8899eac49fce2b281ea2a27f0baa348b5d0f1fba8809b478f68d823ca4ff04
-DIST serde_derive-1.0.80.crate 47136 BLAKE2B 467b36ef2ef78a41e05aa2adb1efe865cf2be755d2440039e666e40c6aafb8d7f34e4894b3665655426c4cac4d2ba904cdd9ea521983ec97ea640877481274e5 SHA512 e16bf0af19d325bb86a68eeecf34fb809f16666bce78c4dc281f24264e7977faba8c659cae3829082d8d6045fa347a405ccf68e9d27108debad7c695317e1e34
-DIST serde_json-1.0.33.crate 69738 BLAKE2B 72b396a31b156164c6f300d03a52f501dfc385e55f0abc7b2faf3c83ac361c595a1991e4342bf0e014970713ebf353d24a2233aa3941921e4546bd9779ada8e0 SHA512 5864c5922bed9f6c34db2163a14374fde73653f323ee69622f15510572cb88e8a645b4153ddb1e12e64bbf0e60f37895bb68982df68ac68a1a66c83df6cda2e0
DIST serde_json-1.0.44.crate 70325 BLAKE2B c8f5836e3448bbf5fd666b30e747b90f84eb7dbaaf078026456082b5403bbcc1931c70528abbf0e605872271861c1e7dabfe1f42d5a13c2b02f5abb28b342e61 SHA512 ce1c68bfd2ceaa8b7f45cd34cfbc71dcfe3905b06fa47032403c54aa9eed0e618cd526938eb78dbc201e9480dbd64b4bfb405f2119478229f5cea12056dcf5e4
-DIST serde_urlencoded-0.5.4.crate 12552 BLAKE2B b4f7b852afdbc961a99100838745948b1e61032b171d78f9c80f39a78ef0d40ac00ebc147b63e378b7b7ec1e4b28ce2ce6db6467e6ac2c1093fae0363832a425 SHA512 b32c2cf86c9c023b18ce5627992692e53a0848a1d44508c510e553731e6a4fb1ad30aef8f2cafac6ab0cf3faa45eb5f1df42cf8cbce36b673d2aa6754d3ef45b
DIST serde_urlencoded-0.5.5.crate 12429 BLAKE2B e91e4c6a41d2077a45656814b6291de75dd361e0be39bc952ddb23e06b1b2f29f0fb612fef472bbf6fe10b089639417b3aa8603ca09c70b471c6804e8772c0c0 SHA512 9c4a82907619aa211a5768628ae1cc749980b2df267f325cc1457031720d4166edb0b67e2144324e7f655384000583ac2ddeda33f7ab995a390324e2ef4de145
DIST sha-1-0.8.1.crate 10410 BLAKE2B 77528ab00684cd96d09862d045f0afb99c4eef4bd7c863cc71a435d9eed78dca3e77ca1895426587de5ec88d8ad2b62f746eb9643f1b9922b1483945c8cf0b69 SHA512 7446e7564b5903e588911008f9367f9d9b0d96ae883d299ee4f10ec3d7a30abf1af1bc9c4f2172226f09071413116c12a8a67419246f7a7de95e9fdeec3aacb1
DIST sha1-0.6.0.crate 9244 BLAKE2B d992f1803fc17f8f8081ccbafd07ebb9d78056a705444b45dd51b2f57cbdaaf071685b8e6ad9f4fa21e032cc78b4305c8101b079594c7bf6e67894bb798b16b3 SHA512 32081c99a0cd5fd6e651deb711eb4c9a8bc71c12e26b25a72b2dba9a3286502e56b23d068a2899764ce1cc0c615c2c1b22a6c7aae63e07a758745b533e70ff0c
DIST sha2-0.8.0.crate 17302 BLAKE2B ed37c8567479bade08207b73d61cb1af15b58a930b42cf422ee960e24a3caf76a6f3c08ea28ebd925f6d24835f2d0045bf7b0321df4c86923531d8fad253a320 SHA512 6d95888b40c7f84b245864891d4a3e8c06ed3e0cde1aaeacde2ef75c969e00b524fe6045aa9b978d0036b315cc74502f88aab0da67c6708b2450efa9119abdad
DIST signal-hook-0.1.12.crate 25979 BLAKE2B 71670771ae8cde6c6e1b1746da0fd94041c56392b91f148e3c77ef0660c2c9dc33bf7ab25d632c8a270c51c3e500724bfcd49f13372d12c3c739b9af1afc0242 SHA512 e2b2308562491fa5e500aa4edc5f75eb40beb4c9263273c77da9f02e95331086cb80ece09b9a903bf775cb5a355957e01086bb5c0bffde7f5d1cb96969eac70e
-DIST signal-hook-0.1.6.crate 22576 BLAKE2B 92f667610fbfb62eef7ecff2f920828ab9497f9185dc3008f385070064bf3753baa4436cf46ef0b97d05b65d938bcd5b581f2f640519b4d3033e293ce0683cac SHA512 5cac2cf5220846ff6bab848d00735ee714c12ed9dea2e9868041ddd276ebfab9f37a93a682bccac21e0de73dc75a0c95a7f94102b4200b3a55dbad6aaa4c7cdc
DIST signal-hook-registry-1.2.0.crate 14490 BLAKE2B 52c56376f5572787d78d4691201d51d219c623d2eedf912625128d6da8fb01f6930dbecbc5e5c021de098fb0a194fd6b35a9452f92a484095e9606ce96fac135 SHA512 f4552fbeb50f66a2ee1d9826fd74a8ecb3e6d242913c20ca7099d165afb55ecd359a44427b8c3eb73bfc4e3c887d972853b49a842472389454988060dd4aaa07
DIST siphasher-0.2.3.crate 8717 BLAKE2B dc5f80933bf9a172dc3747d702ecc47827c18543a1955811c22ab15a3bd21ed8ff1bb6a99f96115231daa2184526fe6a12cd9f73d91655315077aa6b9c3fadd5 SHA512 7bccf3a0c988da97c36d5f80518a5adaca58385f7000697cf10771ab246e88509746e2ec9a356122d25c98f0acd98eef97fb97f81a92959622ed51dff61b37d0
DIST skeptic-0.4.0.crate 3166 BLAKE2B d6a8dcd04896e3717469bdf407869e8dbed45fc1c2c326532e623d4283caa8c8bb0b48300e237c691a247cdd15b72569eb92f658152b70beddde65e10d0cfee5 SHA512 60eec263eea294a7b6bf2df43f3aa09141399f18eca90855f4f8caf05d8d87f489dfc73fc2a8aa330419ca0520935df7b61b0da2e44a8ac404bde8a255ff82cc
-DIST slab-0.4.1.crate 9479 BLAKE2B 3695c01f8aa9786edc64d2566abab20be6c155bd479b3da08e9c405028a4021e1ca8f937f1f29714b6f26513a0e753a602469c1e57a2bf84098e29c539551786 SHA512 ff8a967579f8d91548c03002f05f6612c6660796cd6fc35b325994f9bd48148ae124d58d9b991fe0b1d7bc111e9a6e43d4ae0be7a31a9faa126ef96ce82a248f
DIST slab-0.4.2.crate 10136 BLAKE2B e30cad459bbbb69c4b56a573c47f4188714e0da298d87015c35a86c9315dc2d4308f27d7758846069b0cf94c93f10c44b0f8895427cdf1c93ae20adbb21b5977 SHA512 f9fd70d0cc5180393cebbe87fe984de0c103db1c2c2648fb7a0ee22cdabf37a7338fd511538f00e9a5564365cce2879afe19bf77c435870197bd6cafef5d6661
DIST smallvec-0.6.13.crate 22760 BLAKE2B 83e573aadf1742122bbe1897bee09867d9225624474cf8c9a1bdd087a8e69eecf9567e8bdd2bcecdc8cc08f5f4c4f081bcf718ab062ee399c9a09b7f8c54948f SHA512 497e1a77414d545b44f099a69529c6c9a8be8cbc80a84bdc9e85428263518e6949b81498b9ce6ab2795508b1c3beb5e7e5aaa3623bbed2c041f8c3f4a0adfe33
-DIST smallvec-0.6.6.crate 21395 BLAKE2B a3fb3dca2ccacce5e88deaac19ba5e01cc2d78194f0b3ee35a7ea60e1534785845269eb742dedc11d5340bc8224e12cc280a4e16e643d1a63caef70a7459ab04 SHA512 922e67f2b6fd9b27ccc68c4a7dc2c99d5622b778fbd3723503f5a840956eb3b99528d9beee66425a4cce949dc867d675a8071b17b7b98df729ccf07637fac2c4
DIST smallvec-1.0.0.crate 22962 BLAKE2B bbeb8bffe14faa66331c88b40e369912f5c75aaef3608b0fe5bf69301b5fdd9c6513ff18924d5200723943b5ae2ab0ec25708788f9b0efb870c598c1b64b4f8c SHA512 55cac16305ef45257d78536cce7a3f59321eabf5702e405c6e27a0ece0a8f0447a5ccadad60a1ef4286f9991609abd9293768507550557f5958545d788b60ee2
DIST socket2-0.3.11.crate 27725 BLAKE2B 75c2b2ba7ac8981bb7111bb7780fcaae03c670abcc5dd464c2121fe8d3c592fb19faa2b759ff8f8d9a60f954c6059ae600cbad5a6b4592a23888b5264d7e1d25 SHA512 6b29b2e4e36fcc165f658da5a2e92980713134d3b68a43b993e4f1cd049530b7c0a119918c4a9528d8d2be27cf8642fd8b6d3ebc2469ca5525045da56022a91c
-DIST socket2-0.3.8.crate 30379 BLAKE2B ab805dbd3bf53e6ee59e117129b064e31a2bd92f3baf472af1975dd67fc97149fafc480fba4f29c0b7e2fe8d8f101c09d2cc5bc7c5d635418277ff7c3a883a42 SHA512 b543633e3acf6e8fe661f0162375619841346d5f1e51eb622e045712153e2d331bf32c90bd9a8c0cd7e84034f5d2827433788b54b3342f3eaacb537013f86a87
DIST spin-0.5.2.crate 12004 BLAKE2B d67d9156ca6dbcf4022711cce797cd423a4977115abac4cafaa507aa2e1071b637275637a20934d4d0d6d2bf82c98c74a4506720326d1804952aa0fd5fc4895c SHA512 fc57f7906da2b7a298c5f89215e881e8827b4d9f934dbf138338e0ee30122d8459483be566268fa374b41d63d8dbf65d42e0b322535ba35c827d7edb2176f267
-DIST stable_deref_trait-1.1.1.crate 8007 BLAKE2B 35bb1e1b24f36a0958aa3fd3972d0f30b3849f8bcd41f0221e2a893b1d17b0029369e21e8b735b7c29884a67ba6c9b2ff1558f544b500ed7c119d8bcdabe5602 SHA512 ca224226d612e1c4eb178271cee0d18b44fc036959e528d720e33f65c3ecd7a40c20d32f294c029d0d7b74dc6ce57d19aadfe3cf02c5f894e94ddb3bb06898e4
-DIST string-0.1.2.crate 3989 BLAKE2B 56fe4a944186fdca6d0c1153f179f20ae1be7c052f3e984e48df5b5c064c1f3d2610eedc04cf2e35f3a8fba18bd43ba8d5581eb234c6eac12df40168ae424824 SHA512 1c147d5f0be85e9b0821411864e3f4b71678d9b910506f98376108136cf4b6a3f65cc7d2a34d132becee33216b7cd4215f83023221a7863df3e8ef9cc3219881
DIST string-0.2.1.crate 5081 BLAKE2B 27f02ed6a6545eac02d0b98852b2c362711dffe6dace552a24f8f3d69b8c9b0b60a147837c538f2fbdaeaab16b27eb7c554e9bc1aad6c2563b08f3c1a759ef9e SHA512 4d7ab65f12d63065e895947285d5aa1b9003324002b0f657e7ded975c90eebd63c1033ae9a01969c42d446b0ea878571af62776bcb4a8834cace173f908c76cd
DIST strip-ansi-escapes-0.1.0.crate 7972 BLAKE2B 39f227ba45b044bced56e944fc0ef147be93338bbfd76be5feb90e73e1faa0e0b337b6ebc6d57fe14dce11ad13e48f6db87d24c28f06b09978520c71b0e3f047 SHA512 6a8da540a7f3f820d64202024e449da7b0dc45832c4c3637cf4c8d6136098579463a1b7108c03923d2582479193e52dbf23039c4b4d0f875384066a611514a45
-DIST strsim-0.7.0.crate 8435 BLAKE2B 6869075bc3949fbdec1b74548b816560d1bf3759ba4c3e972a84f885e6732edd25596d75a4b6f6b85d93821f559757d096cb5f0b0eb04dabd8bb974d214f3188 SHA512 3f92df0f444129b16fbb15c533b7bc1d6f18970b487b57345f74747fb7f41e3dc0cb61255712e94d419a5777b8f6a9cdf1a716718698c479eb98dfb6464d1983
DIST strsim-0.8.0.crate 9309 BLAKE2B 40a8be506c43ee1ffe006ddc7dee98c3d418bdd205d57b78f5d1e4c9312feb57e1eaf952e02d92d4e0932db240c6fba45beb06ea8c4fc6de1cf1faa8b6a3a939 SHA512 1d55a8d946cd55f5f37d06aea536549ded95739fa58c0f2da285a0041154c181f663682bdcac643aa198b3e762d694a04f058db985c62ebe22b5c16327ba6d34
DIST subtle-1.0.0.crate 8097 BLAKE2B f810268d1d5e435ff51134f0e1cf07fcd86191a0e482d6b426a87a147624e8ec0f4b37585965c65a8f4a569688cad33a4f41e3c154bd01ae461de676df55c69b SHA512 cda69e4023749e75068f0aa6c46e839073f5daba24c5988ac79ace48ee21108de1e179e40745443c7cc57c3b74aada1d388845d9c0bba1f234937ee958e0aa34
DIST syn-0.11.11.crate 63309 BLAKE2B ee33d3f02af356faafd0c03539d1c86ade1f46db8bc30054f76536c1cf537b8fa0d990c78f86b1e5187392b31c5d7364ad5767ae96de5844e252c9c7c41ec962 SHA512 285bdc1f9b53fe791bd35b10a06fc106231c4eca908244f7ba7366a865452ec2dc8bbff275a52725d29c48d2065790ff6eb37c6eb9c1968aeb0af38c028d173e
-DIST syn-0.15.21.crate 146845 BLAKE2B 843c3d7a4853c50be188f7c67a329220cf8e65a467e9a63b3a28ad88fe89063bbde3873f10bbf81357cc5f192756c0c4b43162fe4412471edf914d7e5d0509e8 SHA512 606ffd4bcd74920e7023b2fc83a83087f4a559a9dec0a4a0d5fb6667b9887f98c413191a84b81ddba68e869dfc9fa7d31a3018f90eaed0ad96a039fc46074391
DIST syn-1.0.11.crate 193782 BLAKE2B 17e0b40ee69575efea77249343af2fa67af0990f08ac8efced152ebb88ad1301211306a2317ec163219d485a097878f8552ca353f43f35ffd5d172e6c92da0df SHA512 6b361c6cb27aebb3da5e81db270e7cd0fe8bfb11289c25ce46127214e222c2b64f53164c8869de41b77e9b780f967454ed5d7c5b73442ae292eadc4dea77494c
DIST synom-0.11.3.crate 17120 BLAKE2B 30c6bdaff48eb2f3c28a348f737ad4b9ebf4b385de75ec2510aa9fef3b426a8a00041d0dd1649d11a9ba39cd4b9363e0e3f7d808cd0b2d588a38edb395be86d5 SHA512 a9c75d667be94c82c7f545e0569bb5858afd1bfca6e045fd52f4ae18ec4fd440e7d374ef45dafc97bda6c749cd4b4e185d8192b833661657323229803ef4a28e
-DIST synstructure-0.10.1.crate 17836 BLAKE2B d80745963f581c02a3b9587d45586e2098632a4c21de22547ae97531bbc4f30a1b02989306999c67584c507a5b07978a48f65ad5e00ff55f39e8e0bb4fdbfa8e SHA512 5830eea0eab15c7ed737bfa14c7bbfc73f28af6964ce3148542066fb9760a80dbba82fd9a55078426346ba757e0aaba9addecadb1d0f75eac4f029a6e4c7cc19
DIST synstructure-0.12.3.crate 17788 BLAKE2B cd122d9c374b59501efb3b38da1f867b86a41d5c7d3f2e854100297ebf193ecd3fb4a64a74f0fe186645de2ad2c95fbf6e96b4872b76f6140400307ab69d1196 SHA512 919f908c679439cb9c2e60ee8672484504f03781412fd13f5cbd745a86ed794691665bcd7ea995667e89344d0eab725125fb0027c60f240290b300d04be26a59
DIST syslog-4.0.1.crate 7131 BLAKE2B a6555d6eed6a0701cca7d58554f2ee612a5d18975dc1979414ac536128e0e7d4a67dde0ad2e40b5ffec823f7edd55dc45d646097fcd457fa6124de95411b4c55 SHA512 faff2117fbf377343149e30a4b338fdd799fb7e4bf425962c2523423f8322aae75f180e4a4c42f1497239400cc60a49cfcf65c00c48433ac956ff17e52063341
-DIST tar-0.4.20.crate 45525 BLAKE2B 43e29895b6c22b919ce1178ec763fedbf6565d88156630507099da7def5b61352aa0b988265c39d235dcf791098ae8c4a05405a1dd22a1cc0f32221c583871ff SHA512 0786f88e54f88ad99131450e55d5840832dac11d7a7f7d9a2e8bb69695ea2e98a568bf263a3ea5af08013c9da2b768a36698391cb52f9c8b84cdee5ae98bc13a
DIST tar-0.4.26.crate 42689 BLAKE2B 174baa480caac4734282003b5277004d87ccf9d5519b0adc3a02ceb0831e053483eb4cb7d21170ba792e2a573748aaa9589a261ffa8050d8bf2bc36e86451e16 SHA512 83ee187b253347068121d04242a488ac44ca6da159c6f9029f3e063b04544b7fa3ed40fed7e251692ffd73553dd369edb413f52f3b3718396451ec916eba15ab
DIST tempdir-0.3.7.crate 11468 BLAKE2B 65850a69a07c5c7e5c25d77bfc9881c994b1fe8466b1712b904d9758b234f8d12db6e1b740d461a48b13667bdeca8178e75c956fd6eaa0c0d5aca5aa1ac7523b SHA512 e5b02f7d260ff594fc2dbbd441eb8adfa36ede937f32c8c812b458167c0e49f5cf493c6ebf83ce8007a0aeb97016169fda7f5d2996fecc72f9409d6f463d9bbe
-DIST tempfile-3.0.4.crate 21125 BLAKE2B 27781b6755ef3ea66e31f42e89931e9d5439dc71456da95c399c00b1e5dd5037b17a7f5901fb8cfb33284b2bfc506b6dc5890704722f4154947ee413777f2564 SHA512 54890e6632f7fe81914b013fb63951eb651f7c833c6857db7dc701ca719108131acf97dfd5af4c821d32902618bd9e256ec4dd39edaa42f57f9f459a246b2770
DIST tempfile-3.1.0.crate 25823 BLAKE2B a34721369923771d5f9a2fc64adaff2bff41da97a0ce79e01aaedb8d6670867220c671c0d23f7a8a9c71b09c0559efe4e7c9bab1f7f9d890866be1de1ce050a9 SHA512 a87ee51c36a81a8a8eb8f091eb57926682f38b707f7f641332d8752170e6c139a656ae49c6861f51e07c2fab5c86cc9b2ac158f5d89c6bff15d18934dd4e7ba5
-DIST term-0.5.1.crate 39105 BLAKE2B 508ad7194a76c0526c750a2cab87f69d31cbad6a30114c914d4ddbce63f428f9b1e9fc02bff80d91d4774202c3dedd65ad7b258a8a5af8049f60f4ee79ea5a21 SHA512 cbfe1f3653a31f07a8bdc0b46a5093f45e38b587b639b8683d361480937d65c531abab7c3af3ec2cc8aa3ac41cc3ccd93e31868fd7b327152e878a10070733b0
DIST term-0.5.2.crate 37638 BLAKE2B 58a496673b9033416f40e29a0a53c0b8d50e413d3922d3685252c96fd880659961b4ee48281ece5b9d6d97e895d81839cdf886fb0a6945af25b873a905b09700 SHA512 421b04f067f66ddecb615d715c828c98d3fa351b3490ec76bfa02bf430039717da5a168c20033399d5544ded5aed35c2aa4c9e6ea5018211bfe615389d18f3d6
-DIST termcolor-1.0.4.crate 14416 BLAKE2B 373701dd2b8a3d584a44d1429e5fd3a697eb7b9138ca6c76eadbf642976e73a701d565a93d77ead3f5cc542c204b3bdce9cc5101b2778b3e32272db9c419edd7 SHA512 cc2f90f453834666b3dcf96c48695cc1fc48c6aacf71437bab635678f486cf02ba6e1c040ff011be078a17b50f9f6d2c09fec771e362d8d2d07526b0f040df6b
DIST termcolor-1.0.5.crate 14526 BLAKE2B c799a73787fdc764ce634731c5cb7232a4696a88797aedad8d2bce72d9d193b099ed80240a03259dccffc5ac2df8b4acc8b60f916dce6ddf63913e2cf0eaec84 SHA512 d729ef6da68be8e2ce19ef02336193d8baea97a28cc8789806587da829471222a0c7669b4485ef81b1d52e85096d787dcfd4f064c894904602b595aa024fcdca
-DIST termion-1.5.1.crate 20659 BLAKE2B 5b4291c2c26a074c16eac2e7bcb40467380181bac69c941e5c958059dc239cbbfd74872d9bd3da65245d010f9fc39804c43dc96f4caab2499b021cf35977a6b0 SHA512 1d1536f08600c7c1f414b4579a1a6e7eff91f4c105504125118d3cadf71c7886a352d1c5f7e07f3d7c28aa8b4752f07b51eddb4d9adc6a9286f7b6bade2bec76
-DIST textwrap-0.10.0.crate 15986 BLAKE2B bcbd40fe4c8322e459c505e0f175b5b088322c33ba56d8c4b294788950681c2407ba08fae2c15711f8f0d5e1f0afed38f82deaffe1c2b16a4f4ab14723b71bb4 SHA512 cb50cc73f3f5ab704ef9e6d526b751f7e66de213fa534206e5b4e9da829f19aedda9f23f262f865fdb3247c703aeaa87f38099f6c575d1961ec923d62a9b2293
DIST textwrap-0.11.0.crate 17322 BLAKE2B 257428908342774593bbd3528fcdae710712ff54e8a711393a24356d8ba0e16e466a4b20c05f942c48ca76b3b5b5aaa90ec202f782cad892caa8b71ccf124da6 SHA512 f5c0fe4f28ff1a3a0931e8e235b5157a45f67967985bcc752418c5ec3481fca44a8ae4800088889b37e8cd0533f53d3c456d5ffd19b767b3f83a87b49a2e209a
DIST thread_local-0.3.6.crate 12388 BLAKE2B 290c35e5327e80a5cdca5609252b1efd1b78a654fc9ab4ba68eeaa3c2769d844f725d17d91cbb15048dbaac84913c51edcb39bb402882c9e7b4d0c4e4811518d SHA512 cd783d3d9caec43868da1f6118d4c4d520e03b9f1049d8f15d2c12482989401d3aee748e04a149953d35e5d6487355c2891d44569ef688bc1d45f01b6461d253
DIST threadpool-1.7.1.crate 15756 BLAKE2B b3451aa6cf8f8f1b86e19c91370fe48f73d02c9552c91fede4f6440b0b29c4d180ca8a3d7d95fc6f6e6ab6eb04113813c767367d64e171be7633545a4b966118 SHA512 e46733ea55a27a32868596562bbaf1e50508dea58359006cabd160b06cec4854c97b5d253cdcb8bfd60c7b3a33e496bec4159d0621efaa3cdcbc77255be4f275
-DIST time-0.1.40.crate 29518 BLAKE2B 9102a29eeeda597100e8e9f1e6a021df99678383d02264c8b94b07f5bef73aac5f0cc77345aa5d7d5db3f33d67581b4970e5a80597773afc726bcf73d1415b5b SHA512 a14753e598ae9def3f479741968bfba028e55debdfb1243cd1becfbf468d2c5fd8457aca720197e16a6a2c63e58e07c51cab5712327ad8ae37605a2825a29bc9
DIST time-0.1.42.crate 30005 BLAKE2B 6d85ae2e56612b5c6955921b671ac62ad10c174fa9fd382e2d76018fc2789253836397b980f8e6d0db4f1b19da244c64d3bffb4fa6c25ac0b66e7ba9876590d4 SHA512 4df662212377093b0fd8fcd88ddc30b20a8af7d989c2e100c0cf64f9741e88eea6e858e1aa4220be6b76b0cf8b62c8116b492010d74d1ebef197c66aa130aa83
DIST tiny_http-0.6.2.crate 36408 BLAKE2B 00844e26df97404fbdda1ea2988e953d914df32b57622c5aaeae261ec9e9eaec6e41ddb441db0f27af691e76992840482fc4681bd8302360aedd96a652e4f9cd SHA512 bf7136a217d23f379b69429c07a47736e0660e9ffae3514f7f77adc43b9a28d2e732e6850e549429246e21a3f6c8a00e86e49d5d37bf13857478fa3c2cb62673
-DIST tokio-0.1.13.crate 79248 BLAKE2B fb2b76385c2ec8e05ff2e321f9c09fbdb4ea8589b80a5688ea155fee1c9b06342dff40e5aa9446b69cb7c6ae7804621ec4938055472c644752003a56bc3730d9 SHA512 9014af3d1cdd9f63790318f5a71d4a1b991c7721f453adfb067eede32e4d8f410f38e28109ac3f42de93013a46885808026102b134ec89e53580e64c46ca73c4
DIST tokio-0.1.22.crate 70031 BLAKE2B 44a6d1ff8bbedfea304e4f44b5c4bf998876a632adfe611c3d851aa64ad092b7b0150c2b39ebeae8bb34cca6824922300bb3fb762cce6b5a1fcfa852ed8d86f1 SHA512 d92b8527bbeec84bb306686a7d29b705c36b59e9c0995154ed95d483c84952c838691f8c11615f481abb6c4fba470ba8968860a74a88b77dd67ccf659bf4e4e1
DIST tokio-buf-0.1.1.crate 10815 BLAKE2B 0d3970a3722e3be109f8808bb7e26db618ceb22a8a1156ce219e6af9930b7f9f9948dab61fa4fa146e5eefcb7deb1332fcd643e0c3e64a879ce32305d0efeb94 SHA512 42f5db4f9ff1d0c6728c9ca899b85e40eaa92910d23f01dd7570c5988178879f3977ee2ad14f0f224562fa73ff8b01687dc963def2c62e93ac471903d5ce4e81
DIST tokio-codec-0.1.1.crate 7617 BLAKE2B 868f45ddaa16cef0ec7143ae7d25d422fa4fd7fe59bc99a7ae4b97f700dd6418610b917a880f1fa5c939799168d8c31901d7186a0195c7b72bd130a01c787b7a SHA512 9c868545e8adc234a51b81966836b786019181ea25907bf14887ce26ed1cf5866f5df8898bbf6bb7c8d3626f145ce0465d3a79050d53f8dcffe98f71886f9044
-DIST tokio-core-0.1.17.crate 73933 BLAKE2B 055028a3c6fa910bb94f3a40c445b65103f87661655489c3e40e24cad0040c2e2c11e28cd6e14ba61269eb7bd091e93b68e718c9343ae09325aa320e998fbf48 SHA512 ecf3a38f88bcce8003cd334292217efb406e31e9cdeea115fd2b2c79c126cfac615aa6c975d5b08be30ac449e5bffa552e2b002b1b9a5e2f4e3969cdfe19d520
-DIST tokio-current-thread-0.1.4.crate 19400 BLAKE2B 1eadd257b7e6da5cba623f6b9365cab7f44864c344564d90b073f6ee32ad7a8f7176d2e8072323781ce1953a3a5f53a97c2305caa0565fd99dfd44ecefe16a98 SHA512 2d6c0af55470795b3ad237a2fd3e59b3d75831b04841219f57033556372f2d31af71500374022359fc661f7d606967c6b922a06c1e71e5bcea0759eea7c0ace3
DIST tokio-current-thread-0.1.6.crate 19339 BLAKE2B c3fe401178089864fe59286566b84a325d8a4101b0b72dda11fefef945d5e14b5e6b6c7de7d87cf222f0ea3d1c95aa65f2c43fe37c2e766f8d70da66c7d060ec SHA512 321d8b99ea18827400a6b7899755eea5a8299e53985f5640a6fd82bf6c3c5c45c68e9d125666968976d05be407d6c15401380870adc231233cc532eb979353f6
-DIST tokio-executor-0.1.5.crate 10540 BLAKE2B 34a515a160907a64e177880e5d319e191a79c92a30dd12616d23b7e0b33a342651ae1943c4ac8c00658b64f1d4c2076f8ccc48adaf62ebf324bd2232069546a2 SHA512 488b75570e1f07c521972bd33b6313926c0e763385872f50858a58af1e738f2ea1a276e8899263a25a4788f641ba94f9280ad55c32978a97af9337bb0c8af987
DIST tokio-executor-0.1.9.crate 12037 BLAKE2B 74a563d290276afca6c250f91ec54498629c7208d941a0ec7dc355cdc95c00e0fe09823c3ab83d7751d13673785676f1fb23af172cca4d612a381c21887f179e SHA512 c0f6a2c96fda364fff0a83cfd4c44a0c2ae1de712a355afd222e6b28f6e863e09645efe84d71b45cfe46f1d7bdb0a4f33fdabbeee6de01bc69f40a49e07d6786
-DIST tokio-fs-0.1.4.crate 12706 BLAKE2B dc09d985a2f242c00283cddd93842a1d9566953af60fcd389f1c574655b572c06b9ae93c8c483782076c630ff5ba4a3d86b31476a09fde46ec4089578771e860 SHA512 aa9393f9f9cf32ccba258821b22d6f3a7297ff2b4a84db934abfc66cd421239de581ad3d756815e47095435d045dcfcf6897124e0414f1fca7452f28644844d8
DIST tokio-fs-0.1.6.crate 16102 BLAKE2B 4b31d365a898ad0fb20c6ae315aa60236d6423357997e34a5069597d72b146d7528a7ab974ff2e7f62d60c46461c1bd6c4b74208f61b2452088c4d8f9bf63aaa SHA512 8a123bdee5f2a6cacbe68f25baa5810a7686fefef8262b0a6b67e217ca6594a585dca52de581d33f4b71725bf03e003dc500f75ace88dba5cda00a52ce544279
-DIST tokio-io-0.1.10.crate 33143 BLAKE2B ed90d1aa36a90469fcdb95f59e0b9a5817945207002bde1cdd43adde936c854ce04dc60d62acb94955c4fcdb2669e7975e23ad5c3ab60880fb7511c8f381ddd5 SHA512 6e5327e5d555fa5b84bbe361219e2a1cf3c47ae8ca2f26bf38b258176e00af6e4c3602bbe0dc2636241730e0735482189edc5ac5300bf411c9963546f103792d
DIST tokio-io-0.1.12.crate 33555 BLAKE2B 5646f1d0c226d223fdbf648d95cd690ad6f755c5dfa9a6bc4d5fe4b5df634029db6178d852d3a4c2d481d06eec763985186753088157557871e5ba6e8aa650af SHA512 57c675ade48f2885ab8f42dac7297bf4bc5f7abef2302f7964dc145ce29d503c09e3ff890de01aedcf0c860fe22d2161f9837d658457695b6205e601fac74149
DIST tokio-named-pipes-0.1.0.crate 7055 BLAKE2B 3864a722160dc7f77c6cceb3c9cbc97f406873810163a3060419ab48d0c5e93542d6d7fdebab8ecc0d2f2169cb823d49d3c12b9537d8b0b7298f96e67a61fed0 SHA512 59726719949fbfbc9bd079ab0ffaed0b3ba570d4bbb8b1bc7fba83ef716423ac44ba43a95fd5cf7e625ea73a6da7c3723a42ccacfb530df3a06124d42926a604
-DIST tokio-process-0.2.3.crate 19886 BLAKE2B d1ba991041bc306d87b93e686da5f1a70d5f16a877c6b4c14ccd6d9aa2b795b120e2f55cfbe468240353d465ab248a727fd7dead085e0c74a810faaf28a33ea2 SHA512 d3fdef06ec7517f0ea708c3d3d17c63fc3bebd772b93683e1e09ea12a5b1d996774dfa8881d45ea77ba27d94d4149a42b455547a5c01402958a5dcd892bee232
DIST tokio-process-0.2.4.crate 24856 BLAKE2B 7626c0800d53524679f36ddfaf70bb4245070ccf49e3fa5167b142258e201fd3cdef44561d24dcc0dc72e3ec5261970e58195296098f2c8675438b2bbe0f20a3 SHA512 a2018350db00f11499bbdd91a98ace58353a8363c464f11a4f517f9b63fb59113e963861bf61b34ca1f01184f31e501ed6e4133fa39852a2eb3246956cf9812f
DIST tokio-reactor-0.1.11.crate 20789 BLAKE2B 441bfc33be1674710d73a0fa351f6a8750fab53d673ee43c52b0d1c9e7ca1903a524b2737e20740474e8fc1894339b00df4242d45e79b4e956a5f7b9b37eb010 SHA512 dd4d81d7ecd5ff5c5f597b28e9480613c760b5fac4b76946810ec2849bca11067ecf8de907dc5256eeb413b1041e4b2779cc0dca129f83a099af824acb75fb1e
-DIST tokio-reactor-0.1.7.crate 23740 BLAKE2B 8a8f499ae181809c0988d2baf6f843474ef884fe56c4e25f6786f524307845bc18c808f58f4299850402020dc3ccd1ed3e8d997169410a8e465323c85f8ab3ea SHA512 4859751a0eb2d423ad1216c0a63248b6dccfcd987e3d9c58cf4277d47c5123e9ae2e9a0e8a4f3178d83b46fd4d89c14a0e09a4ef3b7b10a3ff3a662be794077a
DIST tokio-serde-0.1.0.crate 10150 BLAKE2B cd8a6f405e3ea4e6723001b6e751317a493bff497666e35004df5a9c2f3b39276cf496882a1afd4de1a0fca68f0f8b557bc9378eab0699594c893074d1a603b9 SHA512 3478bfbdcac2d3e88fb7481c6ecde0f93e4ba41ae2c9d939e59b9aeac3152fa5313067c22f78eeb9e58520da6cd87057de3be7f1a08a9028dcfc00094b09be41
DIST tokio-serde-bincode-0.1.1.crate 3216 BLAKE2B 80075d235e91b9b68bc69fc175170cf7dab8264114c7d9c6ac182dcc92e774b4f3e4f2a9ba4d6493ccc78b47594c7c776e1780a93f86009eba5fd6ac23ac44f3 SHA512 56629c475cf6ee98bf5edfba4516f18926684fe8ec0dc5224dbd224d28f36de66b23176329604ba638d0bc29c1cdb0ba8d8e808fb3879d8389d096fcc1f3bde8
-DIST tokio-service-0.1.0.crate 8376 BLAKE2B bb2193af371d14c19a7f79760d4544bc5ebcba46d38d9b2836e46b6041c4b0c68f7902af51dcd3c83970084f271b1f29591b1fa461b854cb1bcc46b4db2c4d4c SHA512 a22b5a33fc957abeb8556ad1f01c6574a855b24053f7bf1ec23376df42b1e83f2fa0a538828742f24f586456e0e1314abe74ca3ac62d364f905b74c2e45903c8
DIST tokio-signal-0.2.7.crate 15122 BLAKE2B af992448564696dbbcc01d85aa88f247e6e480dc95ea9d9a720dbeb3fb7ea4aec23639f4c43f67bb0302dc0a34d21ca1245dffc72bf28753e488fcb29ada60df SHA512 60cc31f9ea58853498dd19d858a7ec72bbccb0255c7d7f316b55c7e4aa21291f5609611ce5ccd2751d505417d8a3860d7374d6377916cbacf52a18c649448d9f
DIST tokio-sync-0.1.7.crate 41666 BLAKE2B 80a29da76709a7d2ca7c1c2bb1a18e25218ded0383006f5be2f518c1abdbb476974709c16111b42820050e66f75bc3498a1bb835cfcefb76be302d5977476ab3 SHA512 041803a7e6056c7c3a0218e754a7ac2104ebe2ac9953a7ad7f0dfe6fa9c8f23cdefec0941912df3bef11ed129e85a13206279e3ed0d88424b18b367c2494b973
-DIST tokio-tcp-0.1.2.crate 10633 BLAKE2B 0298c8831f44500640f5362cb7a426e7215878e63376c05ff24a726fcd745e1f02678c0047b6525b55b3b508693388b1e266a414cb732d5ff12e49365af5993b SHA512 d250eeff3a1e8133cf20201dd3c54ba2a6f057407f051cda3da195437d0cb8eb0592e9467343145d85f916276bc76910434a5190af476cc845ff6e7e0e66e8b1
DIST tokio-tcp-0.1.3.crate 12629 BLAKE2B 16a2763eeb2b65edd07f9b998535812efaa25584bfed5fd66fb1b2952893fa3ed330f597032b4140daf9635ba4f49e77aeabc2cea82c997dfc971bd97fa4f5d0 SHA512 ae42facabed1589764a8e4f789dabf5c7adfb3a67880a8bb6d7b0b6c082302a84b6acd8ec5f444dc59284407acad61518d60818eaeb34f874380f9593d540336
DIST tokio-threadpool-0.1.17.crate 54547 BLAKE2B d86230fc8818550df958a08bb611f9697ee7effb323f3fefa54bd64d97b9a7cf77f638f6519e55f43d088931413739bc9c7a6923d63888459a41a0cce3f25fd2 SHA512 270b6e90e3a99e178293fbbd9fb7b0b51e2e5f5c094afd15eb0af21d24dfd74a1250225b9a686e12b02eb984cc671979eed2b9b08ddc13f57de69f7801bc4e86
-DIST tokio-threadpool-0.1.9.crate 48778 BLAKE2B 3bb9d6ae52fc7c12307e80e3af203cf2732180d8c013a8440be144c3ea70f10557d6ba10817e67906e889cedc7550e660f3746e441e388fa18bc7d53c2cbe141 SHA512 b2f4f2951bb581d6e1110f6c39fee1341dfec6605717e93bdd9fa1958c4ebb2b849af0e068521478b07f9fadb7384807d6f8922a4be4637c18d4d4e47793c13d
DIST tokio-timer-0.2.12.crate 37615 BLAKE2B d712825ade0c356a2a6d012aee7f4eb966735227f0d16d1b734904d279cc645798964bdbca14f7715dde9accfb57ee1261e886eea388059b57e7d116ced30f8e SHA512 1b5dd8f5b14b86e1ca726047a656d199621dc33c6422a0fed183b34ebe69c049d65847e25ac7bccd369e03d89597f7e3dc05b0349dffbcf61646e738a0d3b8da
-DIST tokio-timer-0.2.8.crate 36835 BLAKE2B eb154c609a0d9a58794d90e4429775ca7a0f1f4752853825eb1fe0b9f75b86ec01b6bddef442e28cb5c85449534ed18b130ac5af03483b217713dca38a530c63 SHA512 5542ffdabb01f3d64774b87e2bfb124e09e3c0ac0edcb3ec5ba9dede09f26a6a43cd0266cc8e1b3e7c35892d3497a1916e9caa7b4119781163e75dc24f742030
-DIST tokio-tls-0.1.4.crate 25780 BLAKE2B 5d643d0cfd8d8093e61224f6be23563d955188735b7c98cf53c7a162a64e3bc2d1f14c11575f1cfd69133e1b02aceba090f3061eea842a97627398ed11be9e4c SHA512 d1308ffaa7ff1f2fe59e4ea9484d79bdfcb09d19c01d9b4599613d450ca304d27117ed535806394fa219fcd6ea4a859ffa1491b5905bb419c7a8478664e29cc3
-DIST tokio-udp-0.1.3.crate 10227 BLAKE2B 8080306c695b694ba9f25252474a9370279f7ee28dddee14575f73d36cb5731743bf0101736624eafd97f55e6f83f6be9806b8ad748411eaa382a2f90d7e874e SHA512 a2fd724ebe46b8fc8757558b6d267491b86ed5625ff91b212a6c77448231c72fa2b8e5c389cb27e93f2b924f48c88c154f23eb8721ecb93e7c1820c7c4dbead2
DIST tokio-udp-0.1.5.crate 11529 BLAKE2B 4782a2d75852bcc972f7049e40f3f56927052a27e912f3126903a1438ab4be8b949d223baf4d30c68ceb1c9d1f14a3a0f85d58d4f9c08236beb189cfde4a753d SHA512 24b5eba25117ba3344d90329134f15be8631d1d9bae06a94f4df7f05b1bf6e1b309b776a0f2685fff2b7567a80331450a2027cb4bd264dbd5fd202913db6055f
-DIST tokio-uds-0.2.4.crate 11837 BLAKE2B 2419656eaa25c41320f51660a6d67134824cb3a1001c6164c440483ed7a002ca5ab59df8388b117b9a5a3addca3b47f5e450d5733dbf2b9eb2e741aa3aef62c0 SHA512 d59bcecd7a92c847cddfc5e5624828a7063dc1bac5515771a16e0d6987ad6a8777e779b45ed6395abb7588bad807695704c2d600e93f6617e09dcac1ae83d472
DIST tokio-uds-0.2.5.crate 11808 BLAKE2B 03f37a5f68479955176d1df673c43d6e3d77a84025620fd83bfeee6439046a1c1b62bc9606164690ac21da5fab8de12cbd534664481c3d530d0ec178ad9c4e46 SHA512 964648b9ada5e072ce90bb7a20deed48a517a0e4c6b808b1fb8440755efdc35269b5a30ad312a5e228603e8f1f8d4b8e2f19f4aab10f75ea5b569ad402bfeb61
DIST toml-0.4.10.crate 47534 BLAKE2B 853aee7f7d9261d2d0daa755e6c158e2b3a173a6e9d8d96cd0d78d75f2ecb1eea341cb8be8b3df9ef1ec34129b77e4f45b4aa849e8c33e6a1f07a3f832993a4f SHA512 15bc40159478207d204e46ff2459dd3146d8f5508f07399f310ec8266190df8a1375e860fc8a7b3fb372b01e9d0f65eaecdc1b896ac2a921070ce76fde82f160
-DIST toml-0.4.9.crate 44116 BLAKE2B 079db18da9e3dd6ae448179f2e4d676ad9e8c3169366afdaaecc27b599c0ae624419014a52cd1237eda8e36fcc43be2fbf9a3e0bc502c12054638fbf30cd5b28 SHA512 3dc96d2f8ed72372bcbce960cc07391a674b80a9b40264ce0f8fd3feb05ea0eeaa81f7c0c85b4e1bba5b1bca89278e321f6e78328bbbf9321ce401b78d606b19
DIST tower-0.1.1.crate 5910 BLAKE2B 30a81ce444e9877e967b5c63c02580c94a0f14cce66aa16742df25659e46bca027fd5c45151321d230900475963bdc12a696a8d6c3c7bb07bcd116cfd2f77759 SHA512 96b3bfd7af32c3809b663d8c58124e5ff9a7feb4bbd1184f4b1850caa002385228796fef224bec833b0974881474e29802dd8750b829c34e1b732251a57b8cc2
DIST tower-buffer-0.1.2.crate 8924 BLAKE2B d5a3137767c8ce9014c92058898c1340d5f63778a20855c944e3cc032592e7ed4dcda8bc4f08a42e0553317ea115e2ad07dc48982844c211e02f21c7218fc3aa SHA512 388ada1c5fe5eebb665db66486c7b6dd99d10cf0ed17fa82b93fe4ef114368c7589b922e9bd82adf83ff2e448d4de925e83d9fd7b6e6f14d7a11131d4fbb9cd6
DIST tower-discover-0.1.0.crate 3255 BLAKE2B f641d08f9810f4afb6a93b588e7a4a4ff248f8828a4db55d111b06387c7847264fac0570abb3934f6f540867e47c1b45f1820b251a0845756b32e9f645ec89e0 SHA512 459b0f37f9fbbcca5b63430b18d85aa30bb43570bf4f048088e99ed8616856d0c5fd512ba2b38c4bad9ae6702951f70f09d1a1dda1a94b3b938683730c02f6e8
@@ -439,58 +280,41 @@ DIST tracing-0.1.10.crate 45624 BLAKE2B 469642b7219cf8b753cabd1a59e236200274153a
DIST tracing-attributes-0.1.5.crate 7763 BLAKE2B 0bbd8321d07a597f5e9f25ade9ee65f2b93ff82a9d2b8602196bc0d6192589148b89a43ac84db44abaa7cb5ba80113ac22e6d259eded975eaf63e2458a879c32 SHA512 a464a20ff7ecdd3e764bc5fcd07bb1337d95d5e806e4f05622139efa56073cb4236987ce020239ea3f75d5d6db1d731ef1b6b17197bbe21434e2401e1f7ef5ac
DIST tracing-core-0.1.7.crate 32540 BLAKE2B e57a1a809176d2656f7745af40fd02653a90db008c18c9e1a6cbd2bb145ac5fc61f79676775d0c7057d0d3e6e37ba5a169bfcc280caac252464a973862f4961c SHA512 04b5307b40260aa4f0835de3518440071c8c9bb1aeb69235784f68cddc7cc27f524eeea6aa0e19e531f474c6563f85e8b0d85d53aeb1669e4939f0a46d127257
DIST treeline-0.1.0.crate 3855 BLAKE2B 3347bee24c686a6b6890f85b60429d36b14f2738e6a5e5adcd493d099b097a8087f7c61f4c155fd8b3af3982a97da31740353b4d036ae451ed8944a9b0feaf75 SHA512 37a7c7e95855fdf0fafe5b529eed6c6cfc641da799bc6738a5649a9a0c3db2ef3e63d692862a987bc19263f33b6df2e8ae71b49fe30160d6d470cbb804511824
-DIST try-lock-0.1.0.crate 3195 BLAKE2B 70a97d35322f488382ba0bca516a672d464f963ea9c91ed0696aabbf3a14fcd759fa3b06dac4005026213cff1091326e57f25e9df919cef48794c1fa5c679690 SHA512 bb00cfa02cae996fab0d94623c71d261a73d6f8b189b75ca9c1636739c53b700e8bd915311eae54851b5f184f0999209bb45ab748828666b2cd2a9b4d3803d1f
DIST try-lock-0.2.2.crate 3638 BLAKE2B fdd33b9760b12db5c90dd9c34980e62d061e1a691eab760ed80dafdcd1ae82055b4ccac7313babb43dc9f2f38d3cac3bbf3f586b26f407fbd035c5c3dfca168d SHA512 aeb54abe3cc02d5dfd0d13010558454e5caab2568bd923a035dfef5ed5d3394b4bab9f7ab21dbaf82f1c20ccd95955bcf6ac2bdc976a824d9508d6f2a27ef330
DIST try_from-0.3.2.crate 4264 BLAKE2B 13a4f1698e711981c183478b4bd4138cc90e8451000e56c965691e7d0be96e3cd7ae78aca891ae4a0d6726ef9a1d3beb26e4a4c18042b409a232a467ac36c11a SHA512 a619b8fefaf8c25037f1e2e7f8e64506144c8a7080ad930138fc3c4a2541dc7fc83ffd9c9a8c762ddd57028072cfd8dcb9db0c590e3ac30a4863f8d4fbb63739
DIST twoway-0.1.8.crate 31774 BLAKE2B 68402b15e61212c986c06322851985201e4a24dd3f06eae607c2581940670c476b330d61d48cc5edb54c7622590f2e75139f0d4460873262d8efd958dd21e5d4 SHA512 326a7954891ef399b85e4e7bf1a0afda0cc9057883e7a19c4590492921ef3570916fb50929071b2e3825e57282482525f4adf2f6b49ee12dc0adf8186ffa4629
DIST typenum-1.11.2.crate 31853 BLAKE2B 1781840c29726a8df614fdcd620924b4cb5a11ad8b5af7c633e70b459b4cdcb9d6a7ccb02b08b78a0cfb3f73382d3ce9d93c56296f93ad588546aeb81a74540c SHA512 c301bc123421e47d39b50e39c42c04e35c7f12a549283d51e1942d1a8d54aa3e49e6177ba4610659d8e68a1d30fb1b2aa5af57c7bb652ab3f70ab7a28ef8b59a
-DIST ucd-util-0.1.3.crate 25897 BLAKE2B d67d250603625d7fe55b1bd17a8bff03ddf2e48b531e8f754f51dcd49370a2b66d0915842fb2fce85a69df2c38f9c086ac3c36115d40c5a8138e5451f71a1cfe SHA512 50a796feb198012241d73001bb53c8e3d3168df379de91d7ecaccfd829b08a356afe3db736fb8cced8748141d7a9e4b157440442c425816c78c0615c08e20f2e
DIST unicase-1.4.2.crate 3907 BLAKE2B 0800a061c30d4d32e36ba0f07045e8d6073eb1fc492c3e4130e9a08e9e3fcc0c4f971bc928a2bd35590d51a9c432b34a5f2e95fad41b3e89d1e357787c55a6a3 SHA512 f92ceb4b9b4757a813fcf23949c8a9770e5169aec19d43c7ea9c3b49b365a2d4ef619255693b5dc30b974e6fe5bed857fa0743caec0ad88abd5b5c80df96fcac
-DIST unicase-2.2.0.crate 19587 BLAKE2B f83ab62d23aaec93555ed1c342c720bbcadf9d6b14a443bf956c8b8a930136ca55fed66a7f412ea39c6a936e8da535fe20f83e564c08b924d7290b39cc32b86e SHA512 7aad01e881c18536d1f758303661d9ddeaecdccd13c7e41ae2f11f7d1030fe36dd164234aa1b4a9ef3c0e4dd847f451423a80b68e80c17663286b9c803de20c7
DIST unicase-2.6.0.crate 23478 BLAKE2B 6e580108ac81b1cbee70e5bd331f43b12f266dae4f4f758bb8f5f073bd1af61943ee0de34cc27769525b19da8c24f8dea4941d0f5454594ab0cc8b78071ff053 SHA512 7e76a5f344e32c56cf87223585d87a56c79627b52bba0b29eb6de82de874b2964accededa8e9b5741f57944b6750fba5c61e679a50d4fd5a5646f431e2f4f188
DIST unicode-bidi-0.3.4.crate 32228 BLAKE2B 853a85b29d1ac2025b7a28af64ead9387e3b4b1e790ad719d4374e349c1853ddbb5959a2890d9d6c94a5c28e4523fc3324deb6b1ed1aeb5e917f21b0e2516f6c SHA512 170ce083fa82bed13ecc62d85cb882fdd6491ae721e1633d3c1a5d3cee69422153afcf6695765c0e8fc7035440d0370d34afac9e978cb27f7506c07cba300e1e
DIST unicode-normalization-0.1.11.crate 91048 BLAKE2B 2dd12260a77d9ec10af73bc46178cd49144a8c5206fbd7240c6bd933eb9cb854efedb947b63af165cec51e1677671ddcf2924bb55c4b759dfd2d0939db09f290 SHA512 bee8fd546d4d1ad1179b31790fb5a087daece8a0435d8ba85def9c1d1827a8ce1ca643924863f01515e8fa6f78a47041e1bcda644a33427c65a50c4eb47d5d81
-DIST unicode-normalization-0.1.7.crate 330545 BLAKE2B abffe09db26d75c7ff8d09a485c0966e3a6ff1192b5edbbf4fd1e6915bbc9214242d6ae9d99dccf304c0d75b61006b4edbcd680d7823cdd47b8ed5a7075ef685 SHA512 4b4d3737244b1425ef8000318316decf8e167d3c92524e92bdd3c34798cf6fd1388ba7651da67d565f07d4640e9881145334fbcdfb8f20c33873d6e40ef3630e
-DIST unicode-width-0.1.5.crate 15761 BLAKE2B 575e6bfe8b8b70cb0e5a167bf546df2964361a223b03a65bdc588c32d4cf9f01194daa8d6d1c90319f1f9981aa5b092dce67c9c97450be4ea630784d834cdbe2 SHA512 bd5ac5f0433953d79408074239edc7c43ce23d56659d467805d81ab01c576a3cf77ccedb3bba41d48bc4ad46a8905ac8a1927b99312053ef6295fd940a6766d2
DIST unicode-width-0.1.7.crate 16644 BLAKE2B 8cc5ee2dfeeda8ffe3405a0d4f1576d2b3b8ede1a42cbefb0ba3bd0d71b53a92ceade86c4a06e9d5b31382955dc6e1152ae5cd279dc26dbc51f478dad1d0f64d SHA512 39b8a539c9009d0421f54ae68b139f21456c9cb03d743b58535a977f98bc9655cf42eaacfadbcff796c187a6f315ae16259ee22be9c2da5aa042172c6b464d84
DIST unicode-xid-0.0.4.crate 16034 BLAKE2B 7ce4752eab109f457a1f8cdd3a9bebfe637652d7e2c0625b6c6f76dcd2d5f3e8b66c89dc4ca158282044dc1a2b030adb1b28e3a44b5a462c7e206cd25d925e66 SHA512 7a3a60936a18d54001dc477f6da1c9784bec53263f13e5c21ba00228ae4ff09f7bb8445cfb39febde957b8500bd1a4a998cc5cfd18046aacbc68e9993510e091
-DIST unicode-xid-0.1.0.crate 16000 BLAKE2B 159004a7bbb7476b39e982b51dbf615717095fd5946536e757653aa941bbf1b774f331db744ecc33bb2ead4b0a6d254fde86cfd6cd8b83ab9983fa89928eddbe SHA512 cc5343e2166938322cfd7c73f1f918f2a9c46846ac0ef55933d1e44cdfaf6f7da2b7ff18b68e356c47b6d8ba5565eda0db42c347dcbde830683f341ac2b1849d
DIST unicode-xid-0.2.0.crate 14994 BLAKE2B e66b4255798f0ef1c81fb852613fee396a042d780d2158a171dbb5e7dedad0b3d2522f5401ae5d215f89ab8be4f5c371b046e4845693a65554c2a6eedc5d1e28 SHA512 590f727d8d8354023062ae5fe7ac5bed1bcf79d86b883effd7f33b3ea3b1c8922998a63d621ca6962a969e890fa6edd009871f21cd57b1969264f41ba3f78359
DIST unix_socket-0.5.0.crate 12261 BLAKE2B 833c47f6359554cb76cbac50ed91380a2dbe406f75e6b366a29a807f6981973fc84560ce83f8483743ad31bc0c53d8be40f215f7cf0822b7405195bee474e79b SHA512 dcd3589f042491540a69176dde6944710deea7317ed0de6912725686473ca15b34dda0a67490252bc8ef5c1ffdf7aecd7b76aa81a27a34b3c4870305c89412e5
DIST unreachable-1.0.0.crate 6355 BLAKE2B c41706721e8124c695259c12741ee95f98d3599871bb7fae2f8cb0d63a04f0cff11e01ab0376867de4de8707fd50fbd02f8b6d9c19bedda84bb5938876c5d803 SHA512 054e0a471d1068b7703853d838c7c381ac6865ac1f8abae08747581e3754416ccec5b80a5b04fedbcd01e68bfeba286b849e3b8ea67bbe62444f2974655e4948
DIST untrusted-0.6.2.crate 7526 BLAKE2B 6886853aa5a9152a47534ff6ceb419782163d3c57a06b2f592cb7d00d07eebfee38a87f198c25bd3a4ad3b9f406afbed1993b4001c0af179d099723a07d5b779 SHA512 45ef8c556a13868a13d5bc6aac26281677edc7bc647b03b51a1294cf83d7699c712c1bc0a1453dbea643207f9aede11550aa7b16750d83048f88ac7a8c93b574
DIST url-1.7.2.crate 68597 BLAKE2B d8d7a4b05e956a956c745dbb536ff94abbe81af22e53af3d7baccf01ed7e556cc4f1f8e0a0d97c258c1f1a23209e1ae494079948de9f0d402901c0b6cdafc373 SHA512 c53d7c397416cb1f3c9f7654a8a0653f350c28d41880859f29f681cd6269848890c1396b7ccdf571ec84212a8f3959138f47193ac0595a97bf98972b58e1ed04
DIST url-2.1.0.crate 64776 BLAKE2B aefc8cd2be90818c757312c354a0bd39ae08a52fb7d5a2a4552ffac3488a4bbc60c3f502ea5cd861aefbab02b0748e4bf35c49592b8fba4377cc17207c666d0c SHA512 1736f512039771b4a365df84937f039e1a0a3c90b827614af47403934ccc4af60077ae13ab585bfb1dc5bd88222edfc890b4ac2ab31872adca2e31bdf5ae45c3
-DIST utf8-ranges-1.0.2.crate 8510 BLAKE2B 877ff38444aec99bf8e0d09c6880d4835eb453c8c7e38fa5e7f8fe3cadd5b34b11a030193e46fe97b19fd90e94de156c0eaf12c613aae7cee47f0f016a3fb96d SHA512 ac168b908a34c4814a682b77502d2e5aa3130acb01fa87e29c78b760a61ba61b01f9fa2d67202604ac9824e0b2fe92143b72c0d4100a62ff9f53e4b00a4a12fb
DIST utf8parse-0.1.1.crate 13995 BLAKE2B 6b1de4afdb2837a76637de72f6e6a81e73aa683d8da04ebc94cf7ee3c542845d2244e721840511ee2725320f2f882722e2bea67914435131d7af1ab29291d1eb SHA512 543d4daddce8248b181deb1c3952ca15303d78616480b23af163ca6253a059b5ce9494652839a051c48a47816c3dd719465bbe5bb7930db676a16bcdac47c517
-DIST uuid-0.6.5.crate 26185 BLAKE2B 60e120be31fcfe5f3fffc7a89b394889d20ac2f7adea486bcfa619c361ab925c630ca8dd9b28d8400da40eb967d64879aac6ef0fa59bfe3d4097e79daeb07915 SHA512 e69530284377ded546f9face98af6fe312664a152fa6a8aefaa4030b978e098ba55ff8ab8fcd2d54abf344e9d45a8f2188c4d7d4092baa213c11f74491f79d80
-DIST uuid-0.7.1.crate 32775 BLAKE2B b5d5d558a3b9091dd9c938a8f493de1ba11bb805829881acde4fc7f97cd565d3a87cd793c36dcf0503a33961ad44cb08e25b9b64d76fc884b760a7120947f5e0 SHA512 6559d538ee7a0ec8ec01f86dfc650a46aea8c7dd7c828c3e6c907c252573ec088261726eade02b89fa626b1058a6a5b3f679f507a506cc75ef838c885194453d
DIST uuid-0.7.4.crate 36325 BLAKE2B cc27afbfb37e01cf83ffbfe239e175019cc1ba77ac14d6392bff833b3482712a8d808cf17aa4e922a24e4728cfa60bc96bf03b0053b0126b65fb7fb583adc1c3 SHA512 5c0d5f85b05db505ba6736437c78fc62e7a961ec1fd7d262749c282ae41bc1b1adda373644790de64ebebf59a200f8e610767f3e5fe0caf87305ecd5a229c265
-DIST vcpkg-0.2.6.crate 9866 BLAKE2B c9c6e1a52e54d6d4103e0b833d77cdd4b2463123a5a12d7c15922bf782c7d56f0055ed5dc9d2bd236a14fb0ed6612c7b691d8a31a98e34b48f84228e6c10a567 SHA512 55678e3cbb7b1bf80e2589df3fc580bb595576a5f24e515819906082ed081e47a546d6825bb92fae56ed0157407244e1b77af1677f0380f2fdd15cc54853675e
DIST vcpkg-0.2.8.crate 11209 BLAKE2B e393dfbaabf1e47bc74fd89dc05e09f2dd9fd8b965a84f638edafcb2f5cf062005224d0c1b229394b40a3ecdf0fb34bfb3bf2c62a5d5b1016663e02d08bbcc8c SHA512 a239e969a02c8d8670178cc2be654bd12d6e6bb18be9eb70ec547212289fd2ef98859e6b3592aa6fbaf3178e0f2c27e2c8598d82990077a74896e739ae1374b9
DIST vec_map-0.8.1.crate 14959 BLAKE2B f5c179ccb4349d543747d5e3bb3edfca4bc9f3f64ba3c2d40fb1d9cba98433b7a0641387aafda6347c9b3603592c64bd820b217b46fbfcd37f802f298e5793ab SHA512 026cf10dc7ba98ae51dd312fc847cbaea41c25f0da5db6e0e22c2ecf75584bbf876d7bd96035fbbcf6696d702d5a3f25977e02a2d77cf519aa21e3ed05710e40
DIST version-compare-0.0.10.crate 15171 BLAKE2B 37360c74f73ad9916dc9cd40794d0f26679406b7b85953a07bb5646330aec4ed2dd45d1a93d40a213c82d5881e14f99e176eaeabfca9e3641fb8713da2133035 SHA512 60632d563cd694a983ae8e1809d8df6e52d9cae57a5609f69eb29edb4aa4bca57c35808c4463a53bb64164d756027c61fe44c3a1f69dbd717127d58dc5a03446
-DIST version-compare-0.0.8.crate 14852 BLAKE2B 45d979e5c6ca2391f0e55260a5fea7734437731115468d3fdca29ead7433e3440b15e0619610903654bca702dfc96558550752b54b1d87dcbb550bd19f3d1b40 SHA512 15a26fdbcce0a41c8a9b89347001d26f9e1b9d682ad24f7a1ec30b0dfd1fb67d4938e5f1d45c43b7558e6682727c73932795f08d86e6fc07afead6ef7c1c9114
DIST version_check-0.1.5.crate 8173 BLAKE2B c1778a95fbc79e93bc25d6ee85c408cbcc2afc1a2317bd96b6d5e1c99862f26cc031e0a8b14451d7ea5a44d96c9b599c899bcebda36d3974effc51f9c236ca56 SHA512 cd3ca0b36108b0fe8e6a5c26614b4f3e3c36ffd13cd9eeb7693086b4a1f7b67c025613d90e79f4dd1bd3234a3e387b2ee890c6c410fe67d293b9b5503f5e9362
DIST version_check-0.9.1.crate 11459 BLAKE2B 72f002c00504f635b7d2d7ee7137e07ba9c182d2e41d32a51851896f6bf6742c5524b7f66946437ba581ccf80b9c9a57280dd4b02df0918569ac710511940fc1 SHA512 b9cf363169df2022a961f5bed4fb7da07513e0283a85aa69752f6ac567e942611ed2216ac61799db1a199e2bdf0fd9b994e35d4a40c6cd80cd26b97cbfe977cf
DIST void-1.0.2.crate 2356 BLAKE2B 41578fb5507f94e7d135f9595cec107ed00a926f4968df8b59792d1676ba5b6980cd67310f820fc37a9c14ebe43a171833fa8dfc09eac5dd42f2ebe808632a83 SHA512 1cc7d282600dc0164d7e410aa895d5dc99de1174991549c6733c94cc2027026517f66797751d737869eae58c560fa26edbf43f36b3015eb2fd99828fe40e0aa1
DIST vte-0.3.3.crate 2397439 BLAKE2B 213fccf5b1f09b2d23bca57be2abec0a3580ab01864c51dd364676f5c66decc5184ef15f0e484f9a94e892f118863655f4b2ed2a340a47276b3fe7b4db901dec SHA512 5e00e8409ef21edb5aa6fbe482785fd5969dd17a6695f82328c4ae12ea8622712dc3473f33832fdfe0cc2395411431fd47842e86e35022149d5e958c4e5f8fe9
DIST walkdir-1.0.7.crate 17883 BLAKE2B 23366528bc49b213e0926e24186b2a1240a5ff7e5cbc5be3c271a416c1417bcc5260b976746f8e0bd3265f4adea45699af661cd998dc15f3aacb878044587c37 SHA512 d5752c39c055dcd163bd74db3495a16e1865fd32e3f0cd779455fb818e78106ee4bdf0cbbcd36331f860c5ca8de658f848988a47194c5b9e130f28a77c4576d3
-DIST want-0.0.4.crate 5357 BLAKE2B 499a5394eddfa50f4fce288f6155c1a6fe664d3d52a2a23f623087655f33854ab475f67d9f748c17e437218b7c029a0ece4d3c32d4bbe061348a50fe537b4600 SHA512 4d6fa1a8c194081efeb6188646ee764da3a3de4374529a6b0af70cd5ff001491b6a87d4281f6ca40d6640308f0435f6b4b838b52e20afe3944ae58c885b6134f
-DIST want-0.0.6.crate 5434 BLAKE2B 46cc6ffc8c5edc4c0b7e48475a82e339e1ce746941823fedb3bdcd1942bfaa9d59800f465470002fa7cebf4d88614d1236cd92736c10690e04810e85aad2c1d2 SHA512 65612379ffb46e5baeae46c7f6f3f3f03133ed9a99c5746bb405fd9b1bc3715739be199cf0f4ee3fa1ac5a2f624ca59fae75bfc14de19b4d5c80270c74f82a86
DIST want-0.2.0.crate 6265 BLAKE2B 4db642e6016fcb0e2b1ae595836af4ccfa3798a1333b71347ea5fb30c95dd6aa0fb8dc827fffe274503e284abb0bc73ad11955f26dd77c5c265cc4a041ffb698 SHA512 1264e8095ba41b6cde85517538449d99f05a40207437bad9b618af3668ad675a3517b3d190e8b962820e2c302146d8d0571b665a1176c090ed75a4e83e8c5b59
DIST wasi-0.7.0.crate 33941 BLAKE2B de1e4e577a1237a233f81ff1a3bd7f888020a42d93a807187a154a3ae0593397358a8667a065f0cdd5497dd2a89889e418d33a0d42ab1631b3f99677e9ebd665 SHA512 1950e78df7f0ba21b917680633d092704f1fb906bd973de4ddc43cedb7bf449f6e881d50e3aa0d5595e8d58796915d582b69c116ef536f819b6f035affea18f0
-DIST which-2.0.0.crate 6590 BLAKE2B 4a937db99477dedabe135e9b39ba8483a5c2ad9cb71208c4ea1aedc3a3ad132e431c7ea6325e1caf0aaa6fed4e13bc84867507bb924612caa4db6cb680eadf78 SHA512 4ec91a8116c624b5edfac0c051b015e67ba71160fc5294d4f6d06909ad7261b107eefa3b3930564bb07506b07fe73a882f641b77b4917abf4c1f69be15c2c84c
DIST which-2.0.1.crate 6953 BLAKE2B 866b1ff726cdefd9b3c201ac5e0649b7b6ea1a8ce42ea26ef5afa3f557326d327728fdb50fb4955476934b0623d3cb2bdab7c57f2c0063d2dae6a7e88748fe27 SHA512 30fffa533f50031b1f0d8cf5b1d7648ee3f0f1dd3e498ab1712fc272983ed415a30198222196cd87c8c0a2a6d342a6927cdf79191f0d81a8390b054169d98a76
DIST winapi-0.2.8.crate 455145 BLAKE2B 50f3c2a0cf4eeedd6891b11392e520c1cca139a71f8f736eabaf43aa7e4b1b5d57697918978220459572d373940edf971eb8302f292cbff832283e905076319a SHA512 115e6f027cdd4a56f77ca24f4ab249d2a6cac1e1f955c826a9b6ee05db4861790a533f5e674aebbb540370fff52ed41618c2cd7c906e73200e92df213109cebe
-DIST winapi-0.3.6.crate 1029391 BLAKE2B 9a52085c3cb74d84bc66cee575da0105eeca69f6abd3c8c601a4de013bafea795f044748be10ec9ab419a9ec82a304a0b65ba4d74f6cb39baff91228f83009f1 SHA512 991eb3d6ba08d59e7f7ec81ebf469cecc56b3723b636392972d2fdc1d6f13d88f8a244ad5cbb20f6058d12b44e060ed663c12aa3fbcd1235ab511fafa105cd3c
DIST winapi-0.3.8.crate 1128308 BLAKE2B e0e8ef6121f222b0500525192ebb69b26b71cc16f9ba92186f8ad6acc9de4cb8cc7c738f9c31f5bd223d2e34c93c496e8448c973d69797776004670c70abf69c SHA512 5a899ee5f09f30d742b8b8eba78da05cd9f4c664408fdeb9370373f8756a962a23e3f1c07619e745b3270138606c9a369076c02c3f5353f657df09d203d9a736
DIST winapi-build-0.1.1.crate 669 BLAKE2B 6c8d8e0f81574c086f06fb3f234b0e6759d293d1d254857c3d491e4d43279e5c2f57f2fcfdc9d5d7b083280f4cc2a75a6ee9bc1541ec6ce8f8d904ded0567faf SHA512 8b0a239e205a5368892f41c870a8a7ea16e3468c364b03382bef7fa3a2e7159b09c07661e95b1227578f6d72c14879daa4444b28c51ae20ef15d985d59ca5a77
DIST winapi-i686-pc-windows-gnu-0.4.0.crate 2918815 BLAKE2B 4d357e4d30f9552972170d65b9a5358b69c46a3e772fe05efc22f3d4ffc1caeeaad7aacdc7abd503a7ad0545f8bd7d22bf351dcb6df76f812fa4d45c34d65df0 SHA512 a672ccefd0730a8166fef1d4e39f9034d9ae426a3f5e28d1f4169fa5c5790767693f281d890e7804773b34acdb0ae1febac33cde8c50c0044a5a6152c7209ec2
-DIST winapi-util-0.1.1.crate 7635 BLAKE2B 2a8047d0da762379f8e66578bf95309a7968d52b636a7bb57d98ce827edffcf85b20cf0441487f4fcd91dccc6db9d005a4c3d78140f0d85dcc99534f3b7aacd4 SHA512 003244d94a887d870b8eab7569f6aee432350eb9f13b5b90a0836eb105b05ac83b7835efe90d9915437f295730653b2dafe6251ab9c46011f1d8492fd4ab8a06
DIST winapi-util-0.1.2.crate 7810 BLAKE2B 511f14b606b591da19159f0f49665846e55ef8e22c7519fedaa5dd65cdc0c51134606c2a7ff0a6cbd7f24e75aaf3109959decaf2a5171fe01fbfc7ad7453fbc4 SHA512 54514420da9851f9657f888d8b198b3a97a6009b7e965d5a23ec471251f6548c2a58c716a5f48fb5d83a5775503d696da98eaed7b71fdd9ba7cd74ba6923b11a
DIST winapi-x86_64-pc-windows-gnu-0.4.0.crate 2947998 BLAKE2B 2ad1ea8b5fa07d544e910ccba043ae925269b76b26c9da356305b34b86741dd8b9aff0b9ffe3d562db4fcd7d7c46a11ce9e3168b782b1d89ae6881742b7ede82 SHA512 4a654af6a5d649dc87e00497245096b35a2894ae66f155cb62389902c3b93ddcc5cf7d0d8b9dd97b291d2d80bc686af2298e80abef6ac69883f4a54e79712513
-DIST wincolor-1.0.1.crate 4737 BLAKE2B b1519327a69d71845bc4d7ebf34205d63883aacbeb9284260e5cc89178193aac15525641546582e32c00128ca4a7c1967ba8f076fbfa98bf9d79a5fe2801555e SHA512 f9914b8b416f3810f5199e85b8088c669bff3cbc0f5b86fdb5b600bbd0554465a559bae3ac918fb7197780663e94bf645ede8f35b60ab0e6a6cf2305b1eb99e1
DIST wincolor-1.0.2.crate 4821 BLAKE2B 14fec69f86d72f6664f7ada8dfa34cbb603f5ebd0de098db69c0bd0d193f49b4bb2ebdec40a962a44e9111f656f62d9d67135ae94147ada48440dd8cd7e615ee SHA512 b902c8985b3e341cd4728fa597528740bb3d95bdd3cdc4fd70867a41ab4d95cb64c4f20efa9a9a911c1905ac9e0adb4fadd13c126ae6a808caaafa23f47d7f10
DIST winreg-0.6.2.crate 19338 BLAKE2B d866995d54b69077efc1bb900235a4c00d9e69779cb365ad2fc97686a6c13de6a91d6204856ea35a18b86a7f32e8d4ac1ea2d2c096d7dd3e42f78400752cd3e2 SHA512 a2b6a7a0fcdb1f81dab62e1626089b6fd753a2233f9496505420ccb7997765c34293ce07b724b8179646345e0f6819eca88a6c167a03d8439a386fe53e184102
DIST ws2_32-sys-0.2.1.crate 4697 BLAKE2B 52a7a3f57bcd73156730ada4d78fe12a54a498c9064e0928e09de13a95bd9237f884538e5f9368b47a7ac3c425f0f798c26bad85f20bed4ea26c2fa16c779b97 SHA512 18356861fc595efe7d0180afb8ce7649da35a4f9ba456271d2068679ab258a861af32a2e016e241fbfbf5f6ef0eb33127b26eabfc11428af39506538faa4821f
diff --git a/dev-util/sccache/sccache-0.2.12.ebuild b/dev-util/sccache/sccache-0.2.12.ebuild
deleted file mode 100644
index 188882f12843..000000000000
--- a/dev-util/sccache/sccache-0.2.12.ebuild
+++ /dev/null
@@ -1,359 +0,0 @@
-# Copyright 2017-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-# needs itoa-0.3.4 for tests
-CRATES="
-adler32-1.0.3
-aho-corasick-0.6.9
-ansi_term-0.11.0
-ar-0.6.1
-arc-swap-0.3.6
-arraydeque-0.4.3
-arrayvec-0.4.7
-ascii-0.8.7
-ascii-0.9.1
-assert_cmd-0.9.1
-atty-0.2.11
-backtrace-0.3.9
-backtrace-sys-0.1.24
-base64-0.9.3
-bincode-0.8.0
-bincode-1.0.1
-bitflags-0.9.1
-bitflags-1.0.4
-buf_redux-0.6.3
-bufstream-0.1.4
-build_const-0.2.1
-byteorder-1.2.7
-bytes-0.4.11
-case-0.1.0
-cc-1.0.25
-cfg-if-0.1.6
-chrono-0.4.6
-chunked_transfer-0.3.1
-clap-2.32.0
-cloudabi-0.0.3
-combine-3.6.3
-conhash-0.4.0
-core-foundation-0.2.3
-core-foundation-0.5.1
-core-foundation-sys-0.2.3
-core-foundation-sys-0.5.1
-counted-array-0.1.2
-crc-1.8.1
-crossbeam-deque-0.6.2
-crossbeam-epoch-0.6.1
-crossbeam-utils-0.5.0
-crossbeam-utils-0.6.1
-daemonize-0.3.0
-derive-error-0.0.3
-difference-2.0.0
-directories-1.0.2
-dtoa-0.4.3
-either-1.5.0
-encoding_rs-0.8.10
-env_logger-0.5.13
-error-chain-0.11.0
-error-chain-0.12.1
-escargot-0.3.1
-failure-0.1.3
-failure_derive-0.1.3
-filetime-0.1.15
-filetime-0.2.4
-flate2-1.0.5
-flate2-crc-0.1.1
-float-cmp-0.4.0
-fnv-1.0.6
-foreign-types-0.3.2
-foreign-types-shared-0.1.1
-fuchsia-zircon-0.3.3
-fuchsia-zircon-sys-0.3.3
-futures-0.1.25
-futures-cpupool-0.1.8
-gcc-0.3.55
-getopts-0.2.18
-h2-0.1.13
-http-0.1.14
-httparse-1.3.3
-humantime-1.1.1
-hyper-0.11.27
-hyper-0.12.16
-hyper-tls-0.1.4
-hyper-tls-0.3.1
-hyperx-0.12.0
-idna-0.1.5
-indexmap-1.0.2
-iovec-0.1.2
-itertools-0.7.9
-itoa-0.3.4
-itoa-0.4.3
-jobserver-0.1.11
-jsonwebtoken-5.0.1
-kernel32-sys-0.2.2
-language-tags-0.2.2
-lazy_static-0.2.11
-lazy_static-1.2.0
-lazycell-1.2.0
-libc-0.2.44
-libflate-0.1.18
-libmount-0.1.11
-linked-hash-map-0.2.1
-local-encoding-0.2.0
-lock_api-0.1.5
-log-0.3.9
-log-0.4.6
-lru-disk-cache-0.3.0
-matches-0.1.8
-md5-0.3.8
-memcached-rs-0.3.0
-memchr-1.0.2
-memchr-2.1.1
-memoffset-0.2.1
-mime-0.2.6
-mime-0.3.12
-mime_guess-1.8.6
-mime_guess-2.0.0-alpha.6
-miniz_oxide-0.2.0
-miniz_oxide_c_api-0.2.0
-mio-0.6.16
-mio-named-pipes-0.1.6
-mio-uds-0.6.7
-miow-0.2.1
-miow-0.3.3
-msdos_time-0.1.6
-multipart-0.13.6
-native-tls-0.1.5
-native-tls-0.2.2
-net2-0.2.33
-nix-0.11.0
-nodrop-0.1.13
-normalize-line-endings-0.2.2
-num-integer-0.1.39
-num-traits-0.1.43
-num-traits-0.2.6
-num_cpus-1.8.0
-number_prefix-0.2.8
-openssl-0.10.15
-openssl-0.9.24
-openssl-probe-0.1.2
-openssl-sys-0.9.39
-owning_ref-0.4.0
-parking_lot-0.6.4
-parking_lot_core-0.3.1
-percent-encoding-1.0.1
-phf-0.7.23
-phf_codegen-0.7.23
-phf_generator-0.7.23
-phf_shared-0.7.23
-pkg-config-0.3.14
-podio-0.1.6
-predicates-0.9.1
-predicates-core-0.9.0
-predicates-tree-0.9.0
-proc-macro2-0.4.24
-pulldown-cmark-0.0.3
-quick-error-1.2.2
-quote-0.3.15
-quote-0.6.10
-rand-0.3.22
-rand-0.4.3
-rand-0.5.5
-rand-0.6.1
-rand_chacha-0.1.0
-rand_core-0.2.2
-rand_core-0.3.0
-rand_hc-0.1.0
-rand_isaac-0.1.0
-rand_pcg-0.1.1
-rand_xorshift-0.1.0
-redis-0.9.1
-redox_syscall-0.1.42
-redox_termios-0.1.1
-regex-1.0.6
-regex-syntax-0.6.3
-relay-0.1.1
-remove_dir_all-0.5.1
-reqwest-0.8.8
-reqwest-0.9.5
-retry-0.4.0
-ring-0.13.5
-rouille-2.2.0
-rust-crypto-0.2.36
-rustc-demangle-0.1.9
-rustc-serialize-0.3.24
-rustc_version-0.2.3
-ryu-0.2.7
-safemem-0.2.0
-safemem-0.3.0
-same-file-0.1.3
-schannel-0.1.14
-scoped-tls-0.1.2
-scopeguard-0.3.3
-security-framework-0.1.16
-security-framework-0.2.1
-security-framework-sys-0.1.16
-security-framework-sys-0.2.1
-selenium-rs-0.1.1
-semver-0.9.0
-semver-parser-0.7.0
-serde-1.0.80
-serde_derive-1.0.80
-serde_json-1.0.33
-serde_urlencoded-0.5.4
-sha1-0.6.0
-signal-hook-0.1.6
-siphasher-0.2.3
-skeptic-0.4.0
-slab-0.4.1
-smallvec-0.6.6
-socket2-0.3.8
-stable_deref_trait-1.1.1
-string-0.1.2
-strip-ansi-escapes-0.1.0
-strsim-0.7.0
-syn-0.11.11
-syn-0.15.21
-synom-0.11.3
-synstructure-0.10.1
-syslog-4.0.1
-tar-0.4.20
-tempdir-0.3.7
-tempfile-3.0.4
-term-0.5.1
-termcolor-1.0.4
-termion-1.5.1
-textwrap-0.10.0
-thread_local-0.3.6
-threadpool-1.7.1
-time-0.1.40
-tiny_http-0.6.2
-tokio-0.1.13
-tokio-codec-0.1.1
-tokio-core-0.1.17
-tokio-current-thread-0.1.4
-tokio-executor-0.1.5
-tokio-fs-0.1.4
-tokio-io-0.1.10
-tokio-named-pipes-0.1.0
-tokio-process-0.2.3
-tokio-reactor-0.1.7
-tokio-serde-0.1.0
-tokio-serde-bincode-0.1.1
-tokio-service-0.1.0
-tokio-signal-0.2.7
-tokio-tcp-0.1.2
-tokio-threadpool-0.1.9
-tokio-timer-0.2.8
-tokio-tls-0.1.4
-tokio-udp-0.1.3
-tokio-uds-0.2.4
-toml-0.4.9
-treeline-0.1.0
-try-lock-0.1.0
-try-lock-0.2.2
-twoway-0.1.8
-ucd-util-0.1.3
-unicase-1.4.2
-unicase-2.2.0
-unicode-bidi-0.3.4
-unicode-normalization-0.1.7
-unicode-width-0.1.5
-unicode-xid-0.0.4
-unicode-xid-0.1.0
-unix_socket-0.5.0
-unreachable-1.0.0
-untrusted-0.6.2
-url-1.7.2
-utf8-ranges-1.0.2
-utf8parse-0.1.1
-uuid-0.6.5
-uuid-0.7.1
-vcpkg-0.2.6
-vec_map-0.8.1
-version-compare-0.0.8
-version_check-0.1.5
-void-1.0.2
-vte-0.3.3
-walkdir-1.0.7
-want-0.0.4
-want-0.0.6
-which-2.0.0
-winapi-0.2.8
-winapi-0.3.6
-winapi-build-0.1.1
-winapi-i686-pc-windows-gnu-0.4.0
-winapi-util-0.1.1
-winapi-x86_64-pc-windows-gnu-0.4.0
-wincolor-1.0.1
-ws2_32-sys-0.2.1
-xattr-0.2.2
-zip-0.4.2
-"
-
-inherit cargo optfeature
-
-DESCRIPTION="ccache/distcc like tool with support for rust and cloud storage"
-HOMEPAGE="https://github.com/mozilla/sccache/"
-SRC_URI="https://github.com/mozilla/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz
- $(cargo_crate_uris ${CRATES})"
-
-LICENSE="Apache-2.0 BSD BSD-2 Boost-1.0 ISC MIT Unlicense ZLIB"
-SLOT="0"
-KEYWORDS="~amd64"
-IUSE="azure dist-client dist-server gcs memcached redis s3"
-
-DEPEND="
- dist-server? ( dev-libs/openssl:0= )
- gcs? ( dev-libs/openssl:0= )
-"
-
-RDEPEND="${DEPEND}
- dist-server? ( sys-apps/bubblewrap )
-"
-
-QA_FLAGS_IGNORED="usr/bin/sccache*"
-
-src_configure() {
- myfeatures=(
- $(usev azure)
- $(usev dist-client)
- $(usev dist-server)
- $(usev gcs)
- $(usev memcached)
- $(usev redis)
- $(usev s3)
- )
-}
-
-src_compile() {
- cargo_src_compile ${myfeatures:+--features "${myfeatures[*]}"} --no-default-features
-}
-
-src_install() {
- cargo_src_install ${myfeatures:+--features "${myfeatures[*]}"} --no-default-features
-
- keepdir /etc/sccache
-
- einstalldocs
- dodoc -r docs/.
-
- if use dist-server; then
- newinitd "${FILESDIR}"/server.initd sccache-server
- newconfd "${FILESDIR}"/server.confd sccache-server
-
- newinitd "${FILESDIR}"/scheduler.initd sccache-scheduler
- newconfd "${FILESDIR}"/scheduler.confd sccache-scheduler
- fi
-}
-
-src_test() {
- cargo_src_test ${myfeatures:+--features "${myfeatures[*]}"} --no-default-features
-}
-
-pkg_postinst() {
- ewarn "${PN} is experimental, please use with care"
- use memcached && optfeature "memcached backend support" net-misc/memcached
- use redis && optfeature "redis backend support" dev-db/redis
-}
diff --git a/dev-util/sccache/sccache-0.2.13.ebuild b/dev-util/sccache/sccache-0.2.13.ebuild
index 4d2c3f7b8319..83a45411fda0 100644
--- a/dev-util/sccache/sccache-0.2.13.ebuild
+++ b/dev-util/sccache/sccache-0.2.13.ebuild
@@ -363,14 +363,11 @@ src_configure() {
$(usev redis)
$(usev s3)
)
-}
-
-src_compile() {
- cargo_src_compile ${myfeatures:+--features "${myfeatures[*]}"} --no-default-features
+ cargo_src_configure --no-default-features
}
src_install() {
- cargo_src_install ${myfeatures:+--features "${myfeatures[*]}"} --no-default-features
+ cargo_src_install
keepdir /etc/sccache
@@ -386,10 +383,6 @@ src_install() {
fi
}
-src_test() {
- cargo_src_test ${myfeatures:+--features "${myfeatures[*]}"} --no-default-features
-}
-
pkg_postinst() {
ewarn "${PN} is experimental, please use with care"
use memcached && optfeature "memcached backend support" net-misc/memcached
diff --git a/dev-util/sccache/sccache-9999.ebuild b/dev-util/sccache/sccache-9999.ebuild
index ea404f54b9cf..8cd33a9a3b17 100644
--- a/dev-util/sccache/sccache-9999.ebuild
+++ b/dev-util/sccache/sccache-9999.ebuild
@@ -57,14 +57,11 @@ src_configure() {
$(usev redis)
$(usev s3)
)
-}
-
-src_compile() {
- cargo_src_compile ${myfeatures:+--features "${myfeatures[*]}"} --no-default-features
+ cargo_src_configure --no-default-features
}
src_install() {
- cargo_src_install ${myfeatures:+--features "${myfeatures[*]}"} --no-default-features
+ cargo_src_install
keepdir /etc/sccache
@@ -84,7 +81,7 @@ src_test() {
if [[ "${PV}" == *9999* ]]; then
ewarn "tests are always broken for ${PV} (require network), skipping"
else
- cargo_src_test ${myfeatures:+--features "${myfeatures[*]}"} --no-default-features
+ cargo_src_test
fi
}
diff --git a/dev-util/scons/scons-4.0.1.ebuild b/dev-util/scons/scons-4.0.1.ebuild
index eaf9eb29e710..5a17def35834 100644
--- a/dev-util/scons/scons-4.0.1.ebuild
+++ b/dev-util/scons/scons-4.0.1.ebuild
@@ -21,7 +21,7 @@ SRC_URI="
LICENSE="MIT"
SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm arm64 hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 ~arm arm64 hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
IUSE="doc test"
RESTRICT="!test? ( test )"
diff --git a/dev-util/statifier/statifier-1.7.4-r1.ebuild b/dev-util/statifier/statifier-1.7.4-r1.ebuild
index 64a5975d6e72..553d4ee5f440 100644
--- a/dev-util/statifier/statifier-1.7.4-r1.ebuild
+++ b/dev-util/statifier/statifier-1.7.4-r1.ebuild
@@ -11,7 +11,7 @@ DESCRIPTION="Statifier is a tool for creating portable, self-containing Linux ex
HOMEPAGE="http://statifier.sourceforge.net"
SRC_URI="https://sourceforge.net/projects/${PN}/files/${PN}/${PV}/${P}.tar.gz"
-KEYWORDS="~amd64 x86"
+KEYWORDS="amd64 x86"
SLOT="0"
LICENSE="GPL-2"
diff --git a/dev-util/uncrustify/Manifest b/dev-util/uncrustify/Manifest
index 387d901096c2..ea9a2e1cd1a4 100644
--- a/dev-util/uncrustify/Manifest
+++ b/dev-util/uncrustify/Manifest
@@ -1,3 +1 @@
-DIST uncrustify-0.66.1.tar.gz 1208142 BLAKE2B d642eb6c8e2a147aa17bd25f4ca0ee7e9471fa4f7d288c5e06e4814d0103032989e83349377d9d9a19371047fb82ad4d6e1aeec90bea3a068e8884ec4a698e0c SHA512 edfde1d46bded9febd47b77cbff86028e1d21c41fee6a46a8b43f0928bf937259be2f88fe4606f406f414601bb757e27eda373ca738606d1bb74b6cd27335f47
-DIST uncrustify-0.69.0.tar.gz 1600390 BLAKE2B 89f194679fe0601c866cb239c8fc900bd4ddf9f5ff23bdfe82df06e284f89f02bf8513153a908aa3bea4a075010bbb022aedee8ab7cd6df8b7922364d8d5cdeb SHA512 06eb985b941bd595c037c71becd277ed68298bebb56e9cdaba5da8315812a43a1455eba8635f370e2b039e665fa89891042f520933b7de5677bdcfb2dd69e6cb
DIST uncrustify-0.71.0.tar.gz 1704631 BLAKE2B 3dc9122647e2c173a776c4ad24c93d7b88fdd00c6c4f3070e68fd7a272218335063d8563446a3c8e72ff68e41d00a265aca76682a8cea201a33230377d7e425a SHA512 220ecbebb1c1d6abadb96c339e4ca9b264a04fa08bc83e9b0fabba5fae425efd1911d175d18b635521614ec9c33aa389fadaeec62ebf28a5d71e595900a92181
diff --git a/dev-util/uncrustify/uncrustify-0.66.1.ebuild b/dev-util/uncrustify/uncrustify-0.66.1.ebuild
deleted file mode 100644
index fa3c210d52ae..000000000000
--- a/dev-util/uncrustify/uncrustify-0.66.1.ebuild
+++ /dev/null
@@ -1,34 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-if [[ $PV == *9999* ]]; then
- EGIT_REPO_URI="https://github.com/${PN}/${PN}.git"
- scm_eclass=git-r3
-else
- KEYWORDS="amd64 x86 ~amd64-linux ~ppc-macos ~x64-macos ~x64-solaris ~x86-solaris"
- SRC_URI="https://github.com/${PN}/${PN}/archive/${P}.tar.gz"
- S=${WORKDIR}/${PN}-${P}
-fi
-
-inherit cmake-utils ${scm_eclass}
-
-PYTHON_COMPAT=( python2_7 )
-
-inherit python-any-r1
-
-DESCRIPTION="C/C++/C#/D/Java/Pawn code indenter and beautifier"
-HOMEPAGE="http://uncrustify.sourceforge.net/"
-
-LICENSE="GPL-2"
-SLOT="0"
-IUSE="test"
-RESTRICT="!test? ( test )"
-
-DEPEND="test? ( ${PYTHON_DEPS} )"
-
-python_test() {
- cd tests
- ${EPYTHON} run_tests.py || die "tests failed"
-}
diff --git a/dev-util/uncrustify/uncrustify-0.69.0.ebuild b/dev-util/uncrustify/uncrustify-0.69.0.ebuild
deleted file mode 100644
index 85a400d29cc3..000000000000
--- a/dev-util/uncrustify/uncrustify-0.69.0.ebuild
+++ /dev/null
@@ -1,34 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-if [[ $PV == *9999* ]]; then
- EGIT_REPO_URI="https://github.com/${PN}/${PN}.git"
- scm_eclass=git-r3
-else
- KEYWORDS="~amd64 ~x86 ~amd64-linux ~ppc-macos ~x64-macos ~x64-solaris ~x86-solaris"
- SRC_URI="https://github.com/${PN}/${PN}/archive/${P}.tar.gz"
- S=${WORKDIR}/${PN}-${P}
-fi
-
-inherit cmake-utils ${scm_eclass}
-
-PYTHON_COMPAT=( python2_7 )
-
-inherit python-any-r1
-
-DESCRIPTION="C/C++/C#/D/Java/Pawn code indenter and beautifier"
-HOMEPAGE="http://uncrustify.sourceforge.net/"
-
-LICENSE="GPL-2"
-SLOT="0"
-IUSE="test"
-RESTRICT="!test? ( test )"
-
-DEPEND="test? ( ${PYTHON_DEPS} )"
-
-python_test() {
- cd tests
- ${EPYTHON} run_tests.py || die "tests failed"
-}
diff --git a/dev-util/uncrustify/uncrustify-0.71.0.ebuild b/dev-util/uncrustify/uncrustify-0.71.0.ebuild
index 32359683b286..f53b1ddfba62 100644
--- a/dev-util/uncrustify/uncrustify-0.71.0.ebuild
+++ b/dev-util/uncrustify/uncrustify-0.71.0.ebuild
@@ -7,7 +7,7 @@ if [[ $PV == *9999* ]]; then
EGIT_REPO_URI="https://github.com/${PN}/${PN}.git"
scm_eclass=git-r3
else
- KEYWORDS="~amd64 x86 ~amd64-linux ~ppc-macos ~x64-macos ~x64-solaris ~x86-solaris"
+ KEYWORDS="amd64 x86 ~amd64-linux ~ppc-macos ~x64-macos ~x64-solaris ~x86-solaris"
SRC_URI="https://github.com/${PN}/${PN}/archive/${P}.tar.gz"
S=${WORKDIR}/${PN}-${P}
fi
diff --git a/dev-vcs/Manifest.gz b/dev-vcs/Manifest.gz
index 47cd016ccabf..3284c815f9f9 100644
Binary files a/dev-vcs/Manifest.gz and b/dev-vcs/Manifest.gz differ
diff --git a/dev-vcs/fossil/fossil-2.12.1.ebuild b/dev-vcs/fossil/fossil-2.12.1.ebuild
index 62eb7be69f19..fdb6afa938ad 100644
--- a/dev-vcs/fossil/fossil-2.12.1.ebuild
+++ b/dev-vcs/fossil/fossil-2.12.1.ebuild
@@ -12,8 +12,8 @@ SRC_URI="https://fossil-scm.org/home/uv/fossil-src-${PV}.tar.gz"
LICENSE="BSD-2"
SLOT="0"
KEYWORDS="~amd64 ~arm ppc ppc64 ~x86"
-IUSE="debug fusefs json -legacy-mv-rm -miniz system-sqlite +ssl static
- tcl tcl-stubs tcl-private-stubs th1-docs th1-hooks"
+IUSE="debug fusefs json -miniz system-sqlite +ssl static tcl tcl-stubs
+ tcl-private-stubs th1-docs th1-hooks"
REQUIRED_USE="ssl? ( !miniz )"
@@ -23,7 +23,7 @@ RDEPEND="
sys-libs/readline:0
dev-libs/libedit
)
- system-sqlite? ( >=dev-db/sqlite-3.28.0:3 )
+ system-sqlite? ( >=dev-db/sqlite-3.33.0:3 )
ssl? ( dev-libs/openssl:0 )
tcl? ( dev-lang/tcl:0= )
"
@@ -57,8 +57,7 @@ src_configure() {
use fusefs || myconf+=' --disable-fusefs'
local u useflags
- useflags=( legacy-mv-rm miniz tcl-stubs tcl-private-stubs
- th1-docs th1-hooks )
+ useflags=( miniz tcl-stubs tcl-private-stubs th1-docs th1-hooks )
for u in ${useflags[@]} ; do
use ${u} && myconf+=" --with-${u}"
done
diff --git a/dev-vcs/gitolite-gentoo/Manifest b/dev-vcs/gitolite-gentoo/Manifest
index 31d0260f20ba..dbbccee93775 100644
--- a/dev-vcs/gitolite-gentoo/Manifest
+++ b/dev-vcs/gitolite-gentoo/Manifest
@@ -1,15 +1,2 @@
DIST gitolite-gentoo-2.3.1.tar.bz2 198849 BLAKE2B 88268e4588003cb1b8b4e340fd858a2be65b8156f3ff5033cf7f8c988d8373c4dc7c41b0d589126e143e8eaa19071fda87532f9052c06f7952f5f3ef549e486a SHA512 994ee759d87659eb4f4bfbe6618d1bd74e83df2e6c8d710ca1c929d86e05b1152639bf5c99b906f7d20f9585163f872f04d9710e29b1d73ada998595553d294e
-DIST gitolite-gentoo-2.3.3.tar.bz2 199370 BLAKE2B c42e82e36f593046c35e7828de1d1ad99bf26564ec248eb24ab7bf7f83ffc7095d893e7a6813e609368221b04d5e38881d723cd8fe6286322c11b39bb4c64158 SHA512 f9720effa816400544bf5526d896b9db734828c46356d0188e2ddb8fa8f175efb0f60b30c9e9c80a0624f6cb6dc5c5a301d8dfa35f13ad08fcd0538a0b8f77c3
-DIST gitolite-gentoo-3.5.3.1.tar.bz2 127391 BLAKE2B f9fb28cbaca4c1e13100205fef2b6cdf84cebc61ae9726048e869eca847bc2c365cfc75fd6c2a82a2df01eee843db1719cd0da9b7dab27496b60079dbdfb2ca6 SHA512 f36a270f651b2b8d4ae02fd7b3841a599b7c66d36a6f92df8974897fdec863b4c09064c384ede9309150a4a487186ba3c3079cd0037d5fd39852b452115933bb
-DIST gitolite-gentoo-3.6.1.tar.bz2 140554 BLAKE2B aa811f4922dc530f9bfd78ebfa4d48473a484ca264db0120ac3cdf722bce009d615e257c4638e9c75d29116cb6882ca426fe07d040df3a60423824289a4d711a SHA512 563f2753f4d04d8a2c5d323fbf3d15f9f12975d4aa3ae3781011b521be7ca2b2ac755f9c4247f86ee303aa7f8c9795f3fdff4504a347b9b9cd08525666bb0187
-DIST gitolite-gentoo-3.6.2.1.tar.bz2 143357 BLAKE2B f6c2440116c7a50b780e8cb9e1ba0f799fee2664c3de6bd5960beff505edd150dbe1c37e53d957dfceba450d1335ed398108f17934c2faeec3777fb3f409c6ba SHA512 53ae6549a819437d2481249707156eb0f68cccd289bbb40affedd1f7cdda620b974f8e7ee6853c196728cdccf0eb9f8f340a132538dcbf0b653fb69e08d40b9d
-DIST gitolite-gentoo-3.6.2.2.tar.bz2 143601 BLAKE2B 7033ccf65cd7fbf70dad031d838b6917f82cd273828758222877985176e91f2eea82e08a957c740ba72a987e2b703c783c0e75cf3570da5fe6bf56e2b0f867d1 SHA512 431df7002d146d321199ff5ae324177f5b14b1a0ae8e87288ff15a8670eec9e55637d8a6d28d4eac2ff2a54f3f38e3aa700257c5321c73133fcb09037fb384f8
-DIST gitolite-gentoo-3.6.2.3.tar.bz2 143658 BLAKE2B c4de16f291b2ce343eca6056a774fd234136f847e3e2bf59842df77b4a2a8190de27e0f5b786ec248e219fa42fd991470e09752aa1dc63a79a38dea891b16482 SHA512 9b8ddaad043d9c7cdbcb027fcbfd36cd09ce2cfaf0b102deee037977461d54942fd7ac019373876f9f4ab04250f78c8565c73494b7b9fc0e42e140d878cc303f
-DIST gitolite-gentoo-3.6.2.4.tar.bz2 143564 BLAKE2B 5c998a523d875c79e80ed6f03cbb885573bdcce3da17e36b683110d2b05f307166c7bf11cba51d0b13db23999eb82e730e044cf0839c594d17eee8ddba87e0b3 SHA512 ec5e62822687b1293348107df003e3c3c4a3aad9b4f461e09410aef993bb464a176daee81223ae952159572db7158267fd90b90cbc877c4be2a9fdc2ecc87fb7
-DIST gitolite-gentoo-3.6.3.2.tar.bz2 148655 BLAKE2B b2f1163f34fa25de908bf702bfea8f1dcc97fc1fc8c306756d32b6331d67fe50b162da34dec1e8af08cd24714a8318c1a5ec69e008b7aba2f20976cfbf87eb75 SHA512 deed5379316e5fc3d33b7131eb64f7850004b34e034dd37417796dafbc9c038d92f4002f8d9c2066a0859bb1052669a378e8a66387f27eed10c6ca5a73e04623
-DIST gitolite-gentoo-3.6.3.tar.bz2 147531 BLAKE2B 9a9018bc54922800aa6fe68d40ed29a5add3987ddf18f1d2f9ebe10a0ab308b8e0a9c13a7d44e6ab268116f99fb082c49a9fa8a597b86d6da34cc4d6e1a70442 SHA512 4c4f40cf608ea78f76c39701880e53e2f6486fc37478818f5b4f0946fcd9ffe30ef122463b7b6b48a0a9931271fe7ef7aecf6bf23bbce45f36cd1e217e5ec45a
-DIST gitolite-gentoo-3.6.4.1.tar.bz2 151771 BLAKE2B 70d88a20954e662fcd021c9a8625db2124bbad1b61a1e91f82e60b69b79501e4f6ec235d62fbd7b6e215dcd802d3e33109794e6a5f98b74de269e54d9eca136f SHA512 5eec313199f9d757be2c357ae07d8e3a8f7b82dd684a40024a33ec3f3d8806fd0cac7f57fcc740be888285343d965fa2497fccb971d24b0082c772cf1cb1655f
-DIST gitolite-gentoo-3.6.4.tar.bz2 151879 BLAKE2B 0b6224f8156c6a82b792a505eb66f56622991606f15ca9d8da03763cd9771c7a78763e1da47f8ef8b4d9fa4ac80e53fd9fdb07445c760e405520d13068c95c8a SHA512 dcb926f747ce43942c5678390bf0649061d4f779d416fc09980ab8a9b169a9604596f6b7800432636f43707c83aac61472df26cfb1c66cc85d1ff8eaa4db2c19
-DIST gitolite-gentoo-3.6.5.tar.bz2 153234 BLAKE2B cb92a2008f80312288b925b9a22c45593203021f47d8f057bdf2597c09d515bc66b5d4947bcc5c5d7e88582c847049d6363139369571fa32f673a107391564d7 SHA512 c32f91dcb8ff790c2c59f0cb9ce1f906b17d5012922e0efdb2da1f7b1986f9f82b85b6e232f6b6e65e4d3daecb8f247a408b664b44624a64bf876b416a7b3ca4
DIST gitolite-gentoo-3.6.6.1.tar.bz2 155262 BLAKE2B 3dfa89223824ea04be6c0598abad3c6fb982c0031507aa2ab4ad8ecb9cfc5b64846e48f1710cf4436b4947d2f7288398b2603ac8f9a732902cf17a9a168e6b3d SHA512 76765972b06e985879bd3384be62e4b57676d0d67e6d55b56a63a2d802fe3ee76576e0da20896f11764a311dfcde0bfaf4309105ddc8c55c0c09bb098ed6a1bb
-DIST gitolite-gentoo-3.6.6.tar.bz2 155267 BLAKE2B 28f09d01a550da9b56e7d2df0ee16c855dcfc66e6a7639734eee98d534d353f1ed8c3547e4a5f5d7b7cf2160b1be376e0e6c7d26b6a74635cf47626f6af3feef SHA512 cd3a34e714072b1b8792b98c023dfa141dff03cc2e225e0a006fafd3a112d98bf031a826ccfb667624b2455f1253def6c487ffba1134ad6cc8c981987437a9d6
diff --git a/dev-vcs/gitolite-gentoo/gitolite-gentoo-2.3.3-r1.ebuild b/dev-vcs/gitolite-gentoo/gitolite-gentoo-2.3.3-r1.ebuild
deleted file mode 100644
index 7445c714339b..000000000000
--- a/dev-vcs/gitolite-gentoo/gitolite-gentoo-2.3.3-r1.ebuild
+++ /dev/null
@@ -1,76 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-inherit eutils perl-module user
-
-DESCRIPTION="Highly flexible server for git directory version tracker, Gentoo fork"
-HOMEPAGE="https://cgit.gentoo.org/proj/gitolite-gentoo.git"
-SRC_URI="mirror://gentoo/${P}.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="contrib vim-syntax"
-
-DEPEND="dev-lang/perl
- virtual/perl-File-Path
- virtual/perl-File-Temp
- >=dev-vcs/git-1.6.6"
-RDEPEND="${DEPEND}
- !dev-vcs/gitolite
- dev-perl/Net-SSH-AuthorizedKeysFile
- vim-syntax? ( app-vim/gitolite-syntax )"
-
-pkg_setup() {
- enewgroup git
- enewuser git -1 /bin/bash /var/lib/gitolite git
-}
-
-src_prepare() {
- rm Makefile doc/COPYING || die
- rm -rf contrib/{gitweb,vim} || die
-
- echo "${PF}-gentoo" > conf/VERSION
-}
-
-src_install() {
- local gl_bin="${D}/usr/bin"
- gl_bin=${gl_bin/\/\//\/}
-
- dodir /usr/share/gitolite/{conf,hooks} /usr/bin
-
- export PATH="${gl_bin}:${PATH}"
- ./src/gl-system-install ${gl_bin} \
- "${D}"/usr/share/gitolite/conf "${D}"/usr/share/gitolite/hooks || die
- sed -i -e "s:${D}::g" "${D}/usr/bin/gl-setup" \
- "${D}/usr/share/gitolite/conf/example.gitolite.rc" || die
-
- rm "${D}"/usr/bin/*.pm
- insinto "${VENDOR_LIB}"
- doins src/*.pm
-
- dodoc README.mkd doc/*
-
- if use contrib; then
- insinto /usr/share/doc/${PF}
- doins -r contrib/
- fi
-
- keepdir /var/lib/gitolite
- fowners git:git /var/lib/gitolite
- fperms 750 /var/lib/gitolite
-}
-
-pkg_postinst() {
- # bug 352291
- ewarn
- elog "Please make sure that your 'git' user has the correct homedir (/var/lib/gitolite)."
- elog "Especially if you're migrating from gitosis."
- ewarn
- ewarn
- elog "If you use the umask feature and upgrade from <=gitolite-gentoo-1.5.9.1"
- elog "then please check the permissions of all repositories using the umask feature"
- ewarn
-}
diff --git a/dev-vcs/gitolite-gentoo/gitolite-gentoo-3.5.3.1.ebuild b/dev-vcs/gitolite-gentoo/gitolite-gentoo-3.5.3.1.ebuild
deleted file mode 100644
index 7460fb092445..000000000000
--- a/dev-vcs/gitolite-gentoo/gitolite-gentoo-3.5.3.1.ebuild
+++ /dev/null
@@ -1,90 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-inherit perl-module user versionator
-
-DESCRIPTION="Highly flexible server for git directory version tracker, Gentoo fork"
-HOMEPAGE="https://cgit.gentoo.org/proj/gitolite-gentoo.git"
-SRC_URI="mirror://gentoo/${P}.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="tools vim-syntax"
-
-DEPEND="dev-lang/perl
- virtual/perl-File-Path
- virtual/perl-File-Temp
- >=dev-vcs/git-1.6.6"
-RDEPEND="${DEPEND}
- !dev-vcs/gitolite
- dev-perl/Net-SSH-AuthorizedKeysFile
- vim-syntax? ( app-vim/gitolite-syntax )"
-
-pkg_setup() {
- enewgroup git
- enewuser git -1 /bin/sh /var/lib/gitolite git
-}
-
-src_prepare() {
- echo "${PF}-gentoo" > src/VERSION
-}
-
-src_install() {
- local uexec=/usr/libexec/${PN}
-
- rm -rf src/lib/Gitolite/Test{,.pm}
- insinto $VENDOR_LIB
- doins -r src/lib/Gitolite
-
- dodoc README.txt CHANGELOG
-
- insopts -m0755
- insinto $uexec
- doins -r src/{commands,syntactic-sugar,triggers,VREF}/
-
- insopts -m0644
- doins src/VERSION
-
- exeinto $uexec
- doexe src/gitolite{,-shell}
-
- dodir /usr/bin
- for bin in gitolite{,-shell}; do
- dosym /usr/libexec/${PN}/${bin} /usr/bin/${bin}
- done
-
- if use tools; then
- dobin check-g2-compat convert-gitosis-conf
- fi
-
- keepdir /var/lib/gitolite
- fowners git:git /var/lib/gitolite
- fperms 750 /var/lib/gitolite
-
- fperms 0644 ${uexec}/VREF/MERGE-CHECK # It's meant as example only
-}
-
-pkg_postinst() {
- if [ "$(get_major_version $REPLACING_VERSIONS)" = "2" ]; then
- ewarn
- elog "***NOTE*** This is a major upgrade and will likely break your existing gitolite-2.x setup!"
- elog "Please read http://gitolite.com/gitolite/migr.html first!"
- ewarn
- elog "***NOTE*** If you're using the \"umask\" feature of ${PN}-2.x:"
- elog "You'll have to replace each \"umask = ...\" option by \"option umask = ...\""
- elog "And you'll also have to enable the \"RepoUmask\" module in your .gitolite.rc"
- ewarn
- fi
-
- # bug 352291
- gitolite_home=$(awk -F: '$1 == "git" { print $6 }' /etc/passwd)
- if [ -n "${gitolite_home}" -a "${gitolite_home}" != "/var/lib/gitolite" ]; then
- ewarn
- elog "Please make sure that your 'git' user has the correct homedir (/var/lib/gitolite)."
- elog "Especially if you're migrating from gitosis."
- ewarn
- fi
-}
diff --git a/dev-vcs/gitolite-gentoo/gitolite-gentoo-3.6.1-r1.ebuild b/dev-vcs/gitolite-gentoo/gitolite-gentoo-3.6.1-r1.ebuild
deleted file mode 100644
index fb86e51f1c28..000000000000
--- a/dev-vcs/gitolite-gentoo/gitolite-gentoo-3.6.1-r1.ebuild
+++ /dev/null
@@ -1,104 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-[[ ${PV} == *9999 ]] && SCM="git-2"
-EGIT_REPO_URI="git://git.gentoo.org/proj/gitolite-gentoo"
-EGIT_MASTER=master
-
-inherit perl-module user versionator ${SCM}
-
-DESCRIPTION="Highly flexible server for git directory version tracker, Gentoo fork"
-HOMEPAGE="https://cgit.gentoo.org/proj/gitolite-gentoo.git"
-if [[ ${PV} != *9999 ]]; then
- SRC_URI="mirror://gentoo/${P}.tar.bz2"
- KEYWORDS="~amd64 ~x86"
-else
- SRC_URI=""
- KEYWORDS=""
-fi
-
-LICENSE="GPL-2"
-SLOT="0"
-IUSE="tools vim-syntax"
-
-DEPEND="dev-lang/perl
- virtual/perl-File-Path
- virtual/perl-File-Temp
- >=dev-vcs/git-1.6.6"
-RDEPEND="${DEPEND}
- !dev-vcs/gitolite
- vim-syntax? ( app-vim/gitolite-syntax )
- dev-perl/Net-SSH-AuthorizedKeysFile
- dev-perl/JSON"
-
-pkg_setup() {
- enewgroup git
- enewuser git -1 /bin/sh /var/lib/gitolite git
-}
-
-src_prepare() {
- echo "${PF}-gentoo" > src/VERSION
-}
-
-src_install() {
- local uexec=/usr/libexec/${PN}
-
- rm -rf src/lib/Gitolite/Test{,.pm}
- insinto $VENDOR_LIB
- doins -r src/lib/Gitolite
-
- dodoc README.markdown CHANGELOG
- # These are meant by upstream as examples, you are strongly recommended to
- # customize them for your needs.
- dodoc contrib/utils/ipa_groups.pl contrib/utils/ldap_groups.sh
-
- insopts -m0755
- insinto $uexec
- doins -r src/{commands,syntactic-sugar,triggers,VREF}/
- doins -r contrib/{commands,triggers}
-
- insopts -m0644
- doins src/VERSION
-
- exeinto $uexec
- doexe src/gitolite{,-shell}
-
- dodir /usr/bin
- for bin in gitolite{,-shell}; do
- dosym /usr/libexec/${PN}/${bin} /usr/bin/${bin}
- done
-
- if use tools; then
- dobin check-g2-compat convert-gitosis-conf
- dobin contrib/utils/rc-format-v3.4
- fi
-
- keepdir /var/lib/gitolite
- fowners git:git /var/lib/gitolite
- fperms 750 /var/lib/gitolite
-
- fperms 0644 ${uexec}/VREF/MERGE-CHECK # It's meant as example only
-}
-
-pkg_postinst() {
- if [[ "$(get_major_version $REPLACING_VERSIONS)" == "2" ]]; then
- ewarn
- elog "***NOTE*** This is a major upgrade and will likely break your existing gitolite-2.x setup!"
- elog "Please read http://gitolite.com/gitolite/migr.html first!"
- ewarn
- elog "***NOTE*** If you're using the \"umask\" feature of ${PN}-2.x:"
- elog "You'll have to replace each \"umask = ...\" option by \"option umask = ...\""
- elog "And you'll also have to enable the \"RepoUmask\" module in your .gitolite.rc"
- ewarn
- fi
-
- # bug 352291
- gitolite_home=$(awk -F: '$1 == "git" { print $6 }' /etc/passwd)
- if [ -n "${gitolite_home}" -a "${gitolite_home}" != "/var/lib/gitolite" ]; then
- ewarn
- elog "Please make sure that your 'git' user has the correct homedir (/var/lib/gitolite)."
- elog "Especially if you're migrating from gitosis."
- ewarn
- fi
-}
diff --git a/dev-vcs/gitolite-gentoo/gitolite-gentoo-3.6.1.ebuild b/dev-vcs/gitolite-gentoo/gitolite-gentoo-3.6.1.ebuild
deleted file mode 100644
index 7460fb092445..000000000000
--- a/dev-vcs/gitolite-gentoo/gitolite-gentoo-3.6.1.ebuild
+++ /dev/null
@@ -1,90 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-inherit perl-module user versionator
-
-DESCRIPTION="Highly flexible server for git directory version tracker, Gentoo fork"
-HOMEPAGE="https://cgit.gentoo.org/proj/gitolite-gentoo.git"
-SRC_URI="mirror://gentoo/${P}.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="tools vim-syntax"
-
-DEPEND="dev-lang/perl
- virtual/perl-File-Path
- virtual/perl-File-Temp
- >=dev-vcs/git-1.6.6"
-RDEPEND="${DEPEND}
- !dev-vcs/gitolite
- dev-perl/Net-SSH-AuthorizedKeysFile
- vim-syntax? ( app-vim/gitolite-syntax )"
-
-pkg_setup() {
- enewgroup git
- enewuser git -1 /bin/sh /var/lib/gitolite git
-}
-
-src_prepare() {
- echo "${PF}-gentoo" > src/VERSION
-}
-
-src_install() {
- local uexec=/usr/libexec/${PN}
-
- rm -rf src/lib/Gitolite/Test{,.pm}
- insinto $VENDOR_LIB
- doins -r src/lib/Gitolite
-
- dodoc README.txt CHANGELOG
-
- insopts -m0755
- insinto $uexec
- doins -r src/{commands,syntactic-sugar,triggers,VREF}/
-
- insopts -m0644
- doins src/VERSION
-
- exeinto $uexec
- doexe src/gitolite{,-shell}
-
- dodir /usr/bin
- for bin in gitolite{,-shell}; do
- dosym /usr/libexec/${PN}/${bin} /usr/bin/${bin}
- done
-
- if use tools; then
- dobin check-g2-compat convert-gitosis-conf
- fi
-
- keepdir /var/lib/gitolite
- fowners git:git /var/lib/gitolite
- fperms 750 /var/lib/gitolite
-
- fperms 0644 ${uexec}/VREF/MERGE-CHECK # It's meant as example only
-}
-
-pkg_postinst() {
- if [ "$(get_major_version $REPLACING_VERSIONS)" = "2" ]; then
- ewarn
- elog "***NOTE*** This is a major upgrade and will likely break your existing gitolite-2.x setup!"
- elog "Please read http://gitolite.com/gitolite/migr.html first!"
- ewarn
- elog "***NOTE*** If you're using the \"umask\" feature of ${PN}-2.x:"
- elog "You'll have to replace each \"umask = ...\" option by \"option umask = ...\""
- elog "And you'll also have to enable the \"RepoUmask\" module in your .gitolite.rc"
- ewarn
- fi
-
- # bug 352291
- gitolite_home=$(awk -F: '$1 == "git" { print $6 }' /etc/passwd)
- if [ -n "${gitolite_home}" -a "${gitolite_home}" != "/var/lib/gitolite" ]; then
- ewarn
- elog "Please make sure that your 'git' user has the correct homedir (/var/lib/gitolite)."
- elog "Especially if you're migrating from gitosis."
- ewarn
- fi
-}
diff --git a/dev-vcs/gitolite-gentoo/gitolite-gentoo-3.6.2.1.ebuild b/dev-vcs/gitolite-gentoo/gitolite-gentoo-3.6.2.1.ebuild
deleted file mode 100644
index fb86e51f1c28..000000000000
--- a/dev-vcs/gitolite-gentoo/gitolite-gentoo-3.6.2.1.ebuild
+++ /dev/null
@@ -1,104 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-[[ ${PV} == *9999 ]] && SCM="git-2"
-EGIT_REPO_URI="git://git.gentoo.org/proj/gitolite-gentoo"
-EGIT_MASTER=master
-
-inherit perl-module user versionator ${SCM}
-
-DESCRIPTION="Highly flexible server for git directory version tracker, Gentoo fork"
-HOMEPAGE="https://cgit.gentoo.org/proj/gitolite-gentoo.git"
-if [[ ${PV} != *9999 ]]; then
- SRC_URI="mirror://gentoo/${P}.tar.bz2"
- KEYWORDS="~amd64 ~x86"
-else
- SRC_URI=""
- KEYWORDS=""
-fi
-
-LICENSE="GPL-2"
-SLOT="0"
-IUSE="tools vim-syntax"
-
-DEPEND="dev-lang/perl
- virtual/perl-File-Path
- virtual/perl-File-Temp
- >=dev-vcs/git-1.6.6"
-RDEPEND="${DEPEND}
- !dev-vcs/gitolite
- vim-syntax? ( app-vim/gitolite-syntax )
- dev-perl/Net-SSH-AuthorizedKeysFile
- dev-perl/JSON"
-
-pkg_setup() {
- enewgroup git
- enewuser git -1 /bin/sh /var/lib/gitolite git
-}
-
-src_prepare() {
- echo "${PF}-gentoo" > src/VERSION
-}
-
-src_install() {
- local uexec=/usr/libexec/${PN}
-
- rm -rf src/lib/Gitolite/Test{,.pm}
- insinto $VENDOR_LIB
- doins -r src/lib/Gitolite
-
- dodoc README.markdown CHANGELOG
- # These are meant by upstream as examples, you are strongly recommended to
- # customize them for your needs.
- dodoc contrib/utils/ipa_groups.pl contrib/utils/ldap_groups.sh
-
- insopts -m0755
- insinto $uexec
- doins -r src/{commands,syntactic-sugar,triggers,VREF}/
- doins -r contrib/{commands,triggers}
-
- insopts -m0644
- doins src/VERSION
-
- exeinto $uexec
- doexe src/gitolite{,-shell}
-
- dodir /usr/bin
- for bin in gitolite{,-shell}; do
- dosym /usr/libexec/${PN}/${bin} /usr/bin/${bin}
- done
-
- if use tools; then
- dobin check-g2-compat convert-gitosis-conf
- dobin contrib/utils/rc-format-v3.4
- fi
-
- keepdir /var/lib/gitolite
- fowners git:git /var/lib/gitolite
- fperms 750 /var/lib/gitolite
-
- fperms 0644 ${uexec}/VREF/MERGE-CHECK # It's meant as example only
-}
-
-pkg_postinst() {
- if [[ "$(get_major_version $REPLACING_VERSIONS)" == "2" ]]; then
- ewarn
- elog "***NOTE*** This is a major upgrade and will likely break your existing gitolite-2.x setup!"
- elog "Please read http://gitolite.com/gitolite/migr.html first!"
- ewarn
- elog "***NOTE*** If you're using the \"umask\" feature of ${PN}-2.x:"
- elog "You'll have to replace each \"umask = ...\" option by \"option umask = ...\""
- elog "And you'll also have to enable the \"RepoUmask\" module in your .gitolite.rc"
- ewarn
- fi
-
- # bug 352291
- gitolite_home=$(awk -F: '$1 == "git" { print $6 }' /etc/passwd)
- if [ -n "${gitolite_home}" -a "${gitolite_home}" != "/var/lib/gitolite" ]; then
- ewarn
- elog "Please make sure that your 'git' user has the correct homedir (/var/lib/gitolite)."
- elog "Especially if you're migrating from gitosis."
- ewarn
- fi
-}
diff --git a/dev-vcs/gitolite-gentoo/gitolite-gentoo-3.6.2.2.ebuild b/dev-vcs/gitolite-gentoo/gitolite-gentoo-3.6.2.2.ebuild
deleted file mode 100644
index fb86e51f1c28..000000000000
--- a/dev-vcs/gitolite-gentoo/gitolite-gentoo-3.6.2.2.ebuild
+++ /dev/null
@@ -1,104 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-[[ ${PV} == *9999 ]] && SCM="git-2"
-EGIT_REPO_URI="git://git.gentoo.org/proj/gitolite-gentoo"
-EGIT_MASTER=master
-
-inherit perl-module user versionator ${SCM}
-
-DESCRIPTION="Highly flexible server for git directory version tracker, Gentoo fork"
-HOMEPAGE="https://cgit.gentoo.org/proj/gitolite-gentoo.git"
-if [[ ${PV} != *9999 ]]; then
- SRC_URI="mirror://gentoo/${P}.tar.bz2"
- KEYWORDS="~amd64 ~x86"
-else
- SRC_URI=""
- KEYWORDS=""
-fi
-
-LICENSE="GPL-2"
-SLOT="0"
-IUSE="tools vim-syntax"
-
-DEPEND="dev-lang/perl
- virtual/perl-File-Path
- virtual/perl-File-Temp
- >=dev-vcs/git-1.6.6"
-RDEPEND="${DEPEND}
- !dev-vcs/gitolite
- vim-syntax? ( app-vim/gitolite-syntax )
- dev-perl/Net-SSH-AuthorizedKeysFile
- dev-perl/JSON"
-
-pkg_setup() {
- enewgroup git
- enewuser git -1 /bin/sh /var/lib/gitolite git
-}
-
-src_prepare() {
- echo "${PF}-gentoo" > src/VERSION
-}
-
-src_install() {
- local uexec=/usr/libexec/${PN}
-
- rm -rf src/lib/Gitolite/Test{,.pm}
- insinto $VENDOR_LIB
- doins -r src/lib/Gitolite
-
- dodoc README.markdown CHANGELOG
- # These are meant by upstream as examples, you are strongly recommended to
- # customize them for your needs.
- dodoc contrib/utils/ipa_groups.pl contrib/utils/ldap_groups.sh
-
- insopts -m0755
- insinto $uexec
- doins -r src/{commands,syntactic-sugar,triggers,VREF}/
- doins -r contrib/{commands,triggers}
-
- insopts -m0644
- doins src/VERSION
-
- exeinto $uexec
- doexe src/gitolite{,-shell}
-
- dodir /usr/bin
- for bin in gitolite{,-shell}; do
- dosym /usr/libexec/${PN}/${bin} /usr/bin/${bin}
- done
-
- if use tools; then
- dobin check-g2-compat convert-gitosis-conf
- dobin contrib/utils/rc-format-v3.4
- fi
-
- keepdir /var/lib/gitolite
- fowners git:git /var/lib/gitolite
- fperms 750 /var/lib/gitolite
-
- fperms 0644 ${uexec}/VREF/MERGE-CHECK # It's meant as example only
-}
-
-pkg_postinst() {
- if [[ "$(get_major_version $REPLACING_VERSIONS)" == "2" ]]; then
- ewarn
- elog "***NOTE*** This is a major upgrade and will likely break your existing gitolite-2.x setup!"
- elog "Please read http://gitolite.com/gitolite/migr.html first!"
- ewarn
- elog "***NOTE*** If you're using the \"umask\" feature of ${PN}-2.x:"
- elog "You'll have to replace each \"umask = ...\" option by \"option umask = ...\""
- elog "And you'll also have to enable the \"RepoUmask\" module in your .gitolite.rc"
- ewarn
- fi
-
- # bug 352291
- gitolite_home=$(awk -F: '$1 == "git" { print $6 }' /etc/passwd)
- if [ -n "${gitolite_home}" -a "${gitolite_home}" != "/var/lib/gitolite" ]; then
- ewarn
- elog "Please make sure that your 'git' user has the correct homedir (/var/lib/gitolite)."
- elog "Especially if you're migrating from gitosis."
- ewarn
- fi
-}
diff --git a/dev-vcs/gitolite-gentoo/gitolite-gentoo-3.6.2.3.ebuild b/dev-vcs/gitolite-gentoo/gitolite-gentoo-3.6.2.3.ebuild
deleted file mode 100644
index 3f6d38426043..000000000000
--- a/dev-vcs/gitolite-gentoo/gitolite-gentoo-3.6.2.3.ebuild
+++ /dev/null
@@ -1,104 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-[[ ${PV} == *9999 ]] && SCM="git-2"
-EGIT_REPO_URI="git://git.gentoo.org/proj/gitolite-gentoo"
-EGIT_MASTER=master
-
-inherit perl-module user versionator ${SCM}
-
-DESCRIPTION="Highly flexible server for git directory version tracker, Gentoo fork"
-HOMEPAGE="https://cgit.gentoo.org/proj/gitolite-gentoo.git"
-if [[ ${PV} != *9999 ]]; then
- SRC_URI="mirror://gentoo/${P}.tar.bz2"
- KEYWORDS="~amd64 ~x86"
-else
- SRC_URI=""
- KEYWORDS=""
-fi
-
-LICENSE="GPL-2"
-SLOT="0"
-IUSE="tools vim-syntax"
-
-DEPEND="dev-lang/perl
- virtual/perl-File-Path
- virtual/perl-File-Temp
- >=dev-vcs/git-1.6.6"
-RDEPEND="${DEPEND}
- !dev-vcs/gitolite
- vim-syntax? ( app-vim/gitolite-syntax )
- >=dev-perl/Net-SSH-AuthorizedKeysFile-0.17
- dev-perl/JSON"
-
-pkg_setup() {
- enewgroup git
- enewuser git -1 /bin/sh /var/lib/gitolite git
-}
-
-src_prepare() {
- echo "${PF}-gentoo" > src/VERSION
-}
-
-src_install() {
- local uexec=/usr/libexec/${PN}
-
- rm -rf src/lib/Gitolite/Test{,.pm}
- insinto $VENDOR_LIB
- doins -r src/lib/Gitolite
-
- dodoc README.markdown CHANGELOG
- # These are meant by upstream as examples, you are strongly recommended to
- # customize them for your needs.
- dodoc contrib/utils/ipa_groups.pl contrib/utils/ldap_groups.sh
-
- insopts -m0755
- insinto $uexec
- doins -r src/{commands,syntactic-sugar,triggers,VREF}/
- doins -r contrib/{commands,triggers}
-
- insopts -m0644
- doins src/VERSION
-
- exeinto $uexec
- doexe src/gitolite{,-shell}
-
- dodir /usr/bin
- for bin in gitolite{,-shell}; do
- dosym /usr/libexec/${PN}/${bin} /usr/bin/${bin}
- done
-
- if use tools; then
- dobin check-g2-compat convert-gitosis-conf
- dobin contrib/utils/rc-format-v3.4
- fi
-
- keepdir /var/lib/gitolite
- fowners git:git /var/lib/gitolite
- fperms 750 /var/lib/gitolite
-
- fperms 0644 ${uexec}/VREF/MERGE-CHECK # It's meant as example only
-}
-
-pkg_postinst() {
- if [[ "$(get_major_version $REPLACING_VERSIONS)" == "2" ]]; then
- ewarn
- elog "***NOTE*** This is a major upgrade and will likely break your existing gitolite-2.x setup!"
- elog "Please read http://gitolite.com/gitolite/migr.html first!"
- ewarn
- elog "***NOTE*** If you're using the \"umask\" feature of ${PN}-2.x:"
- elog "You'll have to replace each \"umask = ...\" option by \"option umask = ...\""
- elog "And you'll also have to enable the \"RepoUmask\" module in your .gitolite.rc"
- ewarn
- fi
-
- # bug 352291
- gitolite_home=$(awk -F: '$1 == "git" { print $6 }' /etc/passwd)
- if [ -n "${gitolite_home}" -a "${gitolite_home}" != "/var/lib/gitolite" ]; then
- ewarn
- elog "Please make sure that your 'git' user has the correct homedir (/var/lib/gitolite)."
- elog "Especially if you're migrating from gitosis."
- ewarn
- fi
-}
diff --git a/dev-vcs/gitolite-gentoo/gitolite-gentoo-3.6.2.4.ebuild b/dev-vcs/gitolite-gentoo/gitolite-gentoo-3.6.2.4.ebuild
deleted file mode 100644
index 3f6d38426043..000000000000
--- a/dev-vcs/gitolite-gentoo/gitolite-gentoo-3.6.2.4.ebuild
+++ /dev/null
@@ -1,104 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-[[ ${PV} == *9999 ]] && SCM="git-2"
-EGIT_REPO_URI="git://git.gentoo.org/proj/gitolite-gentoo"
-EGIT_MASTER=master
-
-inherit perl-module user versionator ${SCM}
-
-DESCRIPTION="Highly flexible server for git directory version tracker, Gentoo fork"
-HOMEPAGE="https://cgit.gentoo.org/proj/gitolite-gentoo.git"
-if [[ ${PV} != *9999 ]]; then
- SRC_URI="mirror://gentoo/${P}.tar.bz2"
- KEYWORDS="~amd64 ~x86"
-else
- SRC_URI=""
- KEYWORDS=""
-fi
-
-LICENSE="GPL-2"
-SLOT="0"
-IUSE="tools vim-syntax"
-
-DEPEND="dev-lang/perl
- virtual/perl-File-Path
- virtual/perl-File-Temp
- >=dev-vcs/git-1.6.6"
-RDEPEND="${DEPEND}
- !dev-vcs/gitolite
- vim-syntax? ( app-vim/gitolite-syntax )
- >=dev-perl/Net-SSH-AuthorizedKeysFile-0.17
- dev-perl/JSON"
-
-pkg_setup() {
- enewgroup git
- enewuser git -1 /bin/sh /var/lib/gitolite git
-}
-
-src_prepare() {
- echo "${PF}-gentoo" > src/VERSION
-}
-
-src_install() {
- local uexec=/usr/libexec/${PN}
-
- rm -rf src/lib/Gitolite/Test{,.pm}
- insinto $VENDOR_LIB
- doins -r src/lib/Gitolite
-
- dodoc README.markdown CHANGELOG
- # These are meant by upstream as examples, you are strongly recommended to
- # customize them for your needs.
- dodoc contrib/utils/ipa_groups.pl contrib/utils/ldap_groups.sh
-
- insopts -m0755
- insinto $uexec
- doins -r src/{commands,syntactic-sugar,triggers,VREF}/
- doins -r contrib/{commands,triggers}
-
- insopts -m0644
- doins src/VERSION
-
- exeinto $uexec
- doexe src/gitolite{,-shell}
-
- dodir /usr/bin
- for bin in gitolite{,-shell}; do
- dosym /usr/libexec/${PN}/${bin} /usr/bin/${bin}
- done
-
- if use tools; then
- dobin check-g2-compat convert-gitosis-conf
- dobin contrib/utils/rc-format-v3.4
- fi
-
- keepdir /var/lib/gitolite
- fowners git:git /var/lib/gitolite
- fperms 750 /var/lib/gitolite
-
- fperms 0644 ${uexec}/VREF/MERGE-CHECK # It's meant as example only
-}
-
-pkg_postinst() {
- if [[ "$(get_major_version $REPLACING_VERSIONS)" == "2" ]]; then
- ewarn
- elog "***NOTE*** This is a major upgrade and will likely break your existing gitolite-2.x setup!"
- elog "Please read http://gitolite.com/gitolite/migr.html first!"
- ewarn
- elog "***NOTE*** If you're using the \"umask\" feature of ${PN}-2.x:"
- elog "You'll have to replace each \"umask = ...\" option by \"option umask = ...\""
- elog "And you'll also have to enable the \"RepoUmask\" module in your .gitolite.rc"
- ewarn
- fi
-
- # bug 352291
- gitolite_home=$(awk -F: '$1 == "git" { print $6 }' /etc/passwd)
- if [ -n "${gitolite_home}" -a "${gitolite_home}" != "/var/lib/gitolite" ]; then
- ewarn
- elog "Please make sure that your 'git' user has the correct homedir (/var/lib/gitolite)."
- elog "Especially if you're migrating from gitosis."
- ewarn
- fi
-}
diff --git a/dev-vcs/gitolite-gentoo/gitolite-gentoo-3.6.3.2.ebuild b/dev-vcs/gitolite-gentoo/gitolite-gentoo-3.6.3.2.ebuild
deleted file mode 100644
index 2df90f3a53b1..000000000000
--- a/dev-vcs/gitolite-gentoo/gitolite-gentoo-3.6.3.2.ebuild
+++ /dev/null
@@ -1,105 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-[[ ${PV} == *9999 ]] && SCM="git-2"
-EGIT_REPO_URI="git://git.gentoo.org/proj/gitolite-gentoo"
-EGIT_MASTER=master
-
-inherit perl-module user versionator ${SCM}
-
-DESCRIPTION="Highly flexible server for git directory version tracker, Gentoo fork"
-HOMEPAGE="https://cgit.gentoo.org/proj/gitolite-gentoo.git"
-if [[ ${PV} != *9999 ]]; then
- SRC_URI="mirror://gentoo/${P}.tar.bz2"
- KEYWORDS="~amd64 ~x86"
-else
- SRC_URI=""
- KEYWORDS=""
-fi
-
-LICENSE="GPL-2"
-SLOT="0"
-IUSE="selinux tools vim-syntax"
-
-DEPEND="dev-lang/perl
- virtual/perl-File-Path
- virtual/perl-File-Temp
- >=dev-vcs/git-1.6.6"
-RDEPEND="${DEPEND}
- !dev-vcs/gitolite
- vim-syntax? ( app-vim/gitolite-syntax )
- selinux? ( sec-policy/selinux-gitosis )
- >=dev-perl/Net-SSH-AuthorizedKeysFile-0.17
- dev-perl/JSON"
-
-pkg_setup() {
- enewgroup git
- enewuser git -1 /bin/sh /var/lib/gitolite git
-}
-
-src_prepare() {
- echo "${PF}-gentoo" > src/VERSION
-}
-
-src_install() {
- local uexec=/usr/libexec/${PN}
-
- rm -rf src/lib/Gitolite/Test{,.pm}
- insinto $VENDOR_LIB
- doins -r src/lib/Gitolite
-
- dodoc README.markdown CHANGELOG
- # These are meant by upstream as examples, you are strongly recommended to
- # customize them for your needs.
- dodoc contrib/utils/ipa_groups.pl contrib/utils/ldap_groups.sh
-
- insopts -m0755
- insinto $uexec
- doins -r src/{commands,syntactic-sugar,triggers,VREF}/
- doins -r contrib/{commands,triggers}
-
- insopts -m0644
- doins src/VERSION
-
- exeinto $uexec
- doexe src/gitolite{,-shell}
-
- dodir /usr/bin
- for bin in gitolite{,-shell}; do
- dosym /usr/libexec/${PN}/${bin} /usr/bin/${bin}
- done
-
- if use tools; then
- dobin check-g2-compat convert-gitosis-conf
- dobin contrib/utils/rc-format-v3.4
- fi
-
- keepdir /var/lib/gitolite
- fowners git:git /var/lib/gitolite
- fperms 750 /var/lib/gitolite
-
- fperms 0644 ${uexec}/VREF/MERGE-CHECK # It's meant as example only
-}
-
-pkg_postinst() {
- if [[ "$(get_major_version $REPLACING_VERSIONS)" == "2" ]]; then
- ewarn
- elog "***NOTE*** This is a major upgrade and will likely break your existing gitolite-2.x setup!"
- elog "Please read http://gitolite.com/gitolite/migr.html first!"
- ewarn
- elog "***NOTE*** If you're using the \"umask\" feature of ${PN}-2.x:"
- elog "You'll have to replace each \"umask = ...\" option by \"option umask = ...\""
- elog "And you'll also have to enable the \"RepoUmask\" module in your .gitolite.rc"
- ewarn
- fi
-
- # bug 352291
- gitolite_home=$(awk -F: '$1 == "git" { print $6 }' /etc/passwd)
- if [ -n "${gitolite_home}" -a "${gitolite_home}" != "/var/lib/gitolite" ]; then
- ewarn
- elog "Please make sure that your 'git' user has the correct homedir (/var/lib/gitolite)."
- elog "Especially if you're migrating from gitosis."
- ewarn
- fi
-}
diff --git a/dev-vcs/gitolite-gentoo/gitolite-gentoo-3.6.3.ebuild b/dev-vcs/gitolite-gentoo/gitolite-gentoo-3.6.3.ebuild
deleted file mode 100644
index 3f6d38426043..000000000000
--- a/dev-vcs/gitolite-gentoo/gitolite-gentoo-3.6.3.ebuild
+++ /dev/null
@@ -1,104 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-[[ ${PV} == *9999 ]] && SCM="git-2"
-EGIT_REPO_URI="git://git.gentoo.org/proj/gitolite-gentoo"
-EGIT_MASTER=master
-
-inherit perl-module user versionator ${SCM}
-
-DESCRIPTION="Highly flexible server for git directory version tracker, Gentoo fork"
-HOMEPAGE="https://cgit.gentoo.org/proj/gitolite-gentoo.git"
-if [[ ${PV} != *9999 ]]; then
- SRC_URI="mirror://gentoo/${P}.tar.bz2"
- KEYWORDS="~amd64 ~x86"
-else
- SRC_URI=""
- KEYWORDS=""
-fi
-
-LICENSE="GPL-2"
-SLOT="0"
-IUSE="tools vim-syntax"
-
-DEPEND="dev-lang/perl
- virtual/perl-File-Path
- virtual/perl-File-Temp
- >=dev-vcs/git-1.6.6"
-RDEPEND="${DEPEND}
- !dev-vcs/gitolite
- vim-syntax? ( app-vim/gitolite-syntax )
- >=dev-perl/Net-SSH-AuthorizedKeysFile-0.17
- dev-perl/JSON"
-
-pkg_setup() {
- enewgroup git
- enewuser git -1 /bin/sh /var/lib/gitolite git
-}
-
-src_prepare() {
- echo "${PF}-gentoo" > src/VERSION
-}
-
-src_install() {
- local uexec=/usr/libexec/${PN}
-
- rm -rf src/lib/Gitolite/Test{,.pm}
- insinto $VENDOR_LIB
- doins -r src/lib/Gitolite
-
- dodoc README.markdown CHANGELOG
- # These are meant by upstream as examples, you are strongly recommended to
- # customize them for your needs.
- dodoc contrib/utils/ipa_groups.pl contrib/utils/ldap_groups.sh
-
- insopts -m0755
- insinto $uexec
- doins -r src/{commands,syntactic-sugar,triggers,VREF}/
- doins -r contrib/{commands,triggers}
-
- insopts -m0644
- doins src/VERSION
-
- exeinto $uexec
- doexe src/gitolite{,-shell}
-
- dodir /usr/bin
- for bin in gitolite{,-shell}; do
- dosym /usr/libexec/${PN}/${bin} /usr/bin/${bin}
- done
-
- if use tools; then
- dobin check-g2-compat convert-gitosis-conf
- dobin contrib/utils/rc-format-v3.4
- fi
-
- keepdir /var/lib/gitolite
- fowners git:git /var/lib/gitolite
- fperms 750 /var/lib/gitolite
-
- fperms 0644 ${uexec}/VREF/MERGE-CHECK # It's meant as example only
-}
-
-pkg_postinst() {
- if [[ "$(get_major_version $REPLACING_VERSIONS)" == "2" ]]; then
- ewarn
- elog "***NOTE*** This is a major upgrade and will likely break your existing gitolite-2.x setup!"
- elog "Please read http://gitolite.com/gitolite/migr.html first!"
- ewarn
- elog "***NOTE*** If you're using the \"umask\" feature of ${PN}-2.x:"
- elog "You'll have to replace each \"umask = ...\" option by \"option umask = ...\""
- elog "And you'll also have to enable the \"RepoUmask\" module in your .gitolite.rc"
- ewarn
- fi
-
- # bug 352291
- gitolite_home=$(awk -F: '$1 == "git" { print $6 }' /etc/passwd)
- if [ -n "${gitolite_home}" -a "${gitolite_home}" != "/var/lib/gitolite" ]; then
- ewarn
- elog "Please make sure that your 'git' user has the correct homedir (/var/lib/gitolite)."
- elog "Especially if you're migrating from gitosis."
- ewarn
- fi
-}
diff --git a/dev-vcs/gitolite-gentoo/gitolite-gentoo-3.6.4.1-r1.ebuild b/dev-vcs/gitolite-gentoo/gitolite-gentoo-3.6.4.1-r1.ebuild
deleted file mode 100644
index 7120a4c7c21d..000000000000
--- a/dev-vcs/gitolite-gentoo/gitolite-gentoo-3.6.4.1-r1.ebuild
+++ /dev/null
@@ -1,105 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-[[ ${PV} == *9999 ]] && SCM="git-2"
-EGIT_REPO_URI="git://git.gentoo.org/proj/gitolite-gentoo"
-EGIT_MASTER=master
-
-inherit perl-module user versionator ${SCM}
-
-DESCRIPTION="Highly flexible server for git directory version tracker, Gentoo fork"
-HOMEPAGE="https://cgit.gentoo.org/proj/gitolite-gentoo.git"
-if [[ ${PV} != *9999 ]]; then
- SRC_URI="mirror://gentoo/${P}.tar.bz2"
- KEYWORDS="~amd64 ~x86"
-else
- SRC_URI=""
- KEYWORDS=""
-fi
-
-LICENSE="GPL-2"
-SLOT="0"
-IUSE="selinux tools vim-syntax"
-
-DEPEND="dev-lang/perl
- virtual/perl-File-Path
- virtual/perl-File-Temp
- >=dev-vcs/git-1.6.6"
-RDEPEND="${DEPEND}
- !dev-vcs/gitolite
- vim-syntax? ( app-vim/gitolite-syntax )
- selinux? ( sec-policy/selinux-gitosis )
- >=dev-perl/Net-SSH-AuthorizedKeysFile-0.17
- dev-perl/JSON"
-
-pkg_setup() {
- enewgroup git
- enewuser git -1 /bin/sh /var/lib/gitolite git
-}
-
-src_prepare() {
- echo "${PF}-gentoo" > src/VERSION
-}
-
-src_install() {
- local uexec=/usr/libexec/${PN}
-
- rm -rf src/lib/Gitolite/Test{,.pm}
- insinto $VENDOR_LIB
- doins -r src/lib/Gitolite
-
- dodoc README.markdown CHANGELOG
- # These are meant by upstream as examples, you are strongly recommended to
- # customize them for your needs.
- dodoc contrib/utils/ipa_groups.pl contrib/utils/ldap_groups.sh
-
- insopts -m0755
- insinto $uexec
- doins -r src/{commands,syntactic-sugar,triggers,VREF}/
- doins -r contrib/{commands,triggers,hooks}
-
- insopts -m0644
- doins src/VERSION
-
- exeinto $uexec
- doexe src/gitolite{,-shell}
-
- dodir /usr/bin
- for bin in gitolite{,-shell}; do
- dosym /usr/libexec/${PN}/${bin} /usr/bin/${bin}
- done
-
- if use tools; then
- dobin check-g2-compat convert-gitosis-conf
- dobin contrib/utils/rc-format-v3.4
- fi
-
- keepdir /var/lib/gitolite
- fowners git:git /var/lib/gitolite
- fperms 750 /var/lib/gitolite
-
- fperms 0644 ${uexec}/VREF/MERGE-CHECK # It's meant as example only
-}
-
-pkg_postinst() {
- if [[ "$(get_major_version $REPLACING_VERSIONS)" == "2" ]]; then
- ewarn
- elog "***NOTE*** This is a major upgrade and will likely break your existing gitolite-2.x setup!"
- elog "Please read http://gitolite.com/gitolite/migr.html first!"
- ewarn
- elog "***NOTE*** If you're using the \"umask\" feature of ${PN}-2.x:"
- elog "You'll have to replace each \"umask = ...\" option by \"option umask = ...\""
- elog "And you'll also have to enable the \"RepoUmask\" module in your .gitolite.rc"
- ewarn
- fi
-
- # bug 352291
- gitolite_home=$(awk -F: '$1 == "git" { print $6 }' /etc/passwd)
- if [ -n "${gitolite_home}" -a "${gitolite_home}" != "/var/lib/gitolite" ]; then
- ewarn
- elog "Please make sure that your 'git' user has the correct homedir (/var/lib/gitolite)."
- elog "Especially if you're migrating from gitosis."
- ewarn
- fi
-}
diff --git a/dev-vcs/gitolite-gentoo/gitolite-gentoo-3.6.4.1.ebuild b/dev-vcs/gitolite-gentoo/gitolite-gentoo-3.6.4.1.ebuild
deleted file mode 100644
index 2df90f3a53b1..000000000000
--- a/dev-vcs/gitolite-gentoo/gitolite-gentoo-3.6.4.1.ebuild
+++ /dev/null
@@ -1,105 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-[[ ${PV} == *9999 ]] && SCM="git-2"
-EGIT_REPO_URI="git://git.gentoo.org/proj/gitolite-gentoo"
-EGIT_MASTER=master
-
-inherit perl-module user versionator ${SCM}
-
-DESCRIPTION="Highly flexible server for git directory version tracker, Gentoo fork"
-HOMEPAGE="https://cgit.gentoo.org/proj/gitolite-gentoo.git"
-if [[ ${PV} != *9999 ]]; then
- SRC_URI="mirror://gentoo/${P}.tar.bz2"
- KEYWORDS="~amd64 ~x86"
-else
- SRC_URI=""
- KEYWORDS=""
-fi
-
-LICENSE="GPL-2"
-SLOT="0"
-IUSE="selinux tools vim-syntax"
-
-DEPEND="dev-lang/perl
- virtual/perl-File-Path
- virtual/perl-File-Temp
- >=dev-vcs/git-1.6.6"
-RDEPEND="${DEPEND}
- !dev-vcs/gitolite
- vim-syntax? ( app-vim/gitolite-syntax )
- selinux? ( sec-policy/selinux-gitosis )
- >=dev-perl/Net-SSH-AuthorizedKeysFile-0.17
- dev-perl/JSON"
-
-pkg_setup() {
- enewgroup git
- enewuser git -1 /bin/sh /var/lib/gitolite git
-}
-
-src_prepare() {
- echo "${PF}-gentoo" > src/VERSION
-}
-
-src_install() {
- local uexec=/usr/libexec/${PN}
-
- rm -rf src/lib/Gitolite/Test{,.pm}
- insinto $VENDOR_LIB
- doins -r src/lib/Gitolite
-
- dodoc README.markdown CHANGELOG
- # These are meant by upstream as examples, you are strongly recommended to
- # customize them for your needs.
- dodoc contrib/utils/ipa_groups.pl contrib/utils/ldap_groups.sh
-
- insopts -m0755
- insinto $uexec
- doins -r src/{commands,syntactic-sugar,triggers,VREF}/
- doins -r contrib/{commands,triggers}
-
- insopts -m0644
- doins src/VERSION
-
- exeinto $uexec
- doexe src/gitolite{,-shell}
-
- dodir /usr/bin
- for bin in gitolite{,-shell}; do
- dosym /usr/libexec/${PN}/${bin} /usr/bin/${bin}
- done
-
- if use tools; then
- dobin check-g2-compat convert-gitosis-conf
- dobin contrib/utils/rc-format-v3.4
- fi
-
- keepdir /var/lib/gitolite
- fowners git:git /var/lib/gitolite
- fperms 750 /var/lib/gitolite
-
- fperms 0644 ${uexec}/VREF/MERGE-CHECK # It's meant as example only
-}
-
-pkg_postinst() {
- if [[ "$(get_major_version $REPLACING_VERSIONS)" == "2" ]]; then
- ewarn
- elog "***NOTE*** This is a major upgrade and will likely break your existing gitolite-2.x setup!"
- elog "Please read http://gitolite.com/gitolite/migr.html first!"
- ewarn
- elog "***NOTE*** If you're using the \"umask\" feature of ${PN}-2.x:"
- elog "You'll have to replace each \"umask = ...\" option by \"option umask = ...\""
- elog "And you'll also have to enable the \"RepoUmask\" module in your .gitolite.rc"
- ewarn
- fi
-
- # bug 352291
- gitolite_home=$(awk -F: '$1 == "git" { print $6 }' /etc/passwd)
- if [ -n "${gitolite_home}" -a "${gitolite_home}" != "/var/lib/gitolite" ]; then
- ewarn
- elog "Please make sure that your 'git' user has the correct homedir (/var/lib/gitolite)."
- elog "Especially if you're migrating from gitosis."
- ewarn
- fi
-}
diff --git a/dev-vcs/gitolite-gentoo/gitolite-gentoo-3.6.4.ebuild b/dev-vcs/gitolite-gentoo/gitolite-gentoo-3.6.4.ebuild
deleted file mode 100644
index 2df90f3a53b1..000000000000
--- a/dev-vcs/gitolite-gentoo/gitolite-gentoo-3.6.4.ebuild
+++ /dev/null
@@ -1,105 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-[[ ${PV} == *9999 ]] && SCM="git-2"
-EGIT_REPO_URI="git://git.gentoo.org/proj/gitolite-gentoo"
-EGIT_MASTER=master
-
-inherit perl-module user versionator ${SCM}
-
-DESCRIPTION="Highly flexible server for git directory version tracker, Gentoo fork"
-HOMEPAGE="https://cgit.gentoo.org/proj/gitolite-gentoo.git"
-if [[ ${PV} != *9999 ]]; then
- SRC_URI="mirror://gentoo/${P}.tar.bz2"
- KEYWORDS="~amd64 ~x86"
-else
- SRC_URI=""
- KEYWORDS=""
-fi
-
-LICENSE="GPL-2"
-SLOT="0"
-IUSE="selinux tools vim-syntax"
-
-DEPEND="dev-lang/perl
- virtual/perl-File-Path
- virtual/perl-File-Temp
- >=dev-vcs/git-1.6.6"
-RDEPEND="${DEPEND}
- !dev-vcs/gitolite
- vim-syntax? ( app-vim/gitolite-syntax )
- selinux? ( sec-policy/selinux-gitosis )
- >=dev-perl/Net-SSH-AuthorizedKeysFile-0.17
- dev-perl/JSON"
-
-pkg_setup() {
- enewgroup git
- enewuser git -1 /bin/sh /var/lib/gitolite git
-}
-
-src_prepare() {
- echo "${PF}-gentoo" > src/VERSION
-}
-
-src_install() {
- local uexec=/usr/libexec/${PN}
-
- rm -rf src/lib/Gitolite/Test{,.pm}
- insinto $VENDOR_LIB
- doins -r src/lib/Gitolite
-
- dodoc README.markdown CHANGELOG
- # These are meant by upstream as examples, you are strongly recommended to
- # customize them for your needs.
- dodoc contrib/utils/ipa_groups.pl contrib/utils/ldap_groups.sh
-
- insopts -m0755
- insinto $uexec
- doins -r src/{commands,syntactic-sugar,triggers,VREF}/
- doins -r contrib/{commands,triggers}
-
- insopts -m0644
- doins src/VERSION
-
- exeinto $uexec
- doexe src/gitolite{,-shell}
-
- dodir /usr/bin
- for bin in gitolite{,-shell}; do
- dosym /usr/libexec/${PN}/${bin} /usr/bin/${bin}
- done
-
- if use tools; then
- dobin check-g2-compat convert-gitosis-conf
- dobin contrib/utils/rc-format-v3.4
- fi
-
- keepdir /var/lib/gitolite
- fowners git:git /var/lib/gitolite
- fperms 750 /var/lib/gitolite
-
- fperms 0644 ${uexec}/VREF/MERGE-CHECK # It's meant as example only
-}
-
-pkg_postinst() {
- if [[ "$(get_major_version $REPLACING_VERSIONS)" == "2" ]]; then
- ewarn
- elog "***NOTE*** This is a major upgrade and will likely break your existing gitolite-2.x setup!"
- elog "Please read http://gitolite.com/gitolite/migr.html first!"
- ewarn
- elog "***NOTE*** If you're using the \"umask\" feature of ${PN}-2.x:"
- elog "You'll have to replace each \"umask = ...\" option by \"option umask = ...\""
- elog "And you'll also have to enable the \"RepoUmask\" module in your .gitolite.rc"
- ewarn
- fi
-
- # bug 352291
- gitolite_home=$(awk -F: '$1 == "git" { print $6 }' /etc/passwd)
- if [ -n "${gitolite_home}" -a "${gitolite_home}" != "/var/lib/gitolite" ]; then
- ewarn
- elog "Please make sure that your 'git' user has the correct homedir (/var/lib/gitolite)."
- elog "Especially if you're migrating from gitosis."
- ewarn
- fi
-}
diff --git a/dev-vcs/gitolite-gentoo/gitolite-gentoo-3.6.5.ebuild b/dev-vcs/gitolite-gentoo/gitolite-gentoo-3.6.5.ebuild
deleted file mode 100644
index 7120a4c7c21d..000000000000
--- a/dev-vcs/gitolite-gentoo/gitolite-gentoo-3.6.5.ebuild
+++ /dev/null
@@ -1,105 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-[[ ${PV} == *9999 ]] && SCM="git-2"
-EGIT_REPO_URI="git://git.gentoo.org/proj/gitolite-gentoo"
-EGIT_MASTER=master
-
-inherit perl-module user versionator ${SCM}
-
-DESCRIPTION="Highly flexible server for git directory version tracker, Gentoo fork"
-HOMEPAGE="https://cgit.gentoo.org/proj/gitolite-gentoo.git"
-if [[ ${PV} != *9999 ]]; then
- SRC_URI="mirror://gentoo/${P}.tar.bz2"
- KEYWORDS="~amd64 ~x86"
-else
- SRC_URI=""
- KEYWORDS=""
-fi
-
-LICENSE="GPL-2"
-SLOT="0"
-IUSE="selinux tools vim-syntax"
-
-DEPEND="dev-lang/perl
- virtual/perl-File-Path
- virtual/perl-File-Temp
- >=dev-vcs/git-1.6.6"
-RDEPEND="${DEPEND}
- !dev-vcs/gitolite
- vim-syntax? ( app-vim/gitolite-syntax )
- selinux? ( sec-policy/selinux-gitosis )
- >=dev-perl/Net-SSH-AuthorizedKeysFile-0.17
- dev-perl/JSON"
-
-pkg_setup() {
- enewgroup git
- enewuser git -1 /bin/sh /var/lib/gitolite git
-}
-
-src_prepare() {
- echo "${PF}-gentoo" > src/VERSION
-}
-
-src_install() {
- local uexec=/usr/libexec/${PN}
-
- rm -rf src/lib/Gitolite/Test{,.pm}
- insinto $VENDOR_LIB
- doins -r src/lib/Gitolite
-
- dodoc README.markdown CHANGELOG
- # These are meant by upstream as examples, you are strongly recommended to
- # customize them for your needs.
- dodoc contrib/utils/ipa_groups.pl contrib/utils/ldap_groups.sh
-
- insopts -m0755
- insinto $uexec
- doins -r src/{commands,syntactic-sugar,triggers,VREF}/
- doins -r contrib/{commands,triggers,hooks}
-
- insopts -m0644
- doins src/VERSION
-
- exeinto $uexec
- doexe src/gitolite{,-shell}
-
- dodir /usr/bin
- for bin in gitolite{,-shell}; do
- dosym /usr/libexec/${PN}/${bin} /usr/bin/${bin}
- done
-
- if use tools; then
- dobin check-g2-compat convert-gitosis-conf
- dobin contrib/utils/rc-format-v3.4
- fi
-
- keepdir /var/lib/gitolite
- fowners git:git /var/lib/gitolite
- fperms 750 /var/lib/gitolite
-
- fperms 0644 ${uexec}/VREF/MERGE-CHECK # It's meant as example only
-}
-
-pkg_postinst() {
- if [[ "$(get_major_version $REPLACING_VERSIONS)" == "2" ]]; then
- ewarn
- elog "***NOTE*** This is a major upgrade and will likely break your existing gitolite-2.x setup!"
- elog "Please read http://gitolite.com/gitolite/migr.html first!"
- ewarn
- elog "***NOTE*** If you're using the \"umask\" feature of ${PN}-2.x:"
- elog "You'll have to replace each \"umask = ...\" option by \"option umask = ...\""
- elog "And you'll also have to enable the \"RepoUmask\" module in your .gitolite.rc"
- ewarn
- fi
-
- # bug 352291
- gitolite_home=$(awk -F: '$1 == "git" { print $6 }' /etc/passwd)
- if [ -n "${gitolite_home}" -a "${gitolite_home}" != "/var/lib/gitolite" ]; then
- ewarn
- elog "Please make sure that your 'git' user has the correct homedir (/var/lib/gitolite)."
- elog "Especially if you're migrating from gitosis."
- ewarn
- fi
-}
diff --git a/dev-vcs/gitolite-gentoo/gitolite-gentoo-3.6.6.1.ebuild b/dev-vcs/gitolite-gentoo/gitolite-gentoo-3.6.6.1.ebuild
deleted file mode 100644
index e3537a2dee5e..000000000000
--- a/dev-vcs/gitolite-gentoo/gitolite-gentoo-3.6.6.1.ebuild
+++ /dev/null
@@ -1,105 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-[[ ${PV} == *9999 ]] && SCM="git-2"
-EGIT_REPO_URI="git://git.gentoo.org/proj/gitolite-gentoo"
-EGIT_MASTER=master
-
-inherit perl-module user versionator ${SCM}
-
-DESCRIPTION="Highly flexible server for git directory version tracker, Gentoo fork"
-HOMEPAGE="https://cgit.gentoo.org/proj/gitolite-gentoo.git"
-if [[ ${PV} != *9999 ]]; then
- SRC_URI="mirror://gentoo/${P}.tar.bz2"
- KEYWORDS="~amd64 ~x86"
-else
- SRC_URI=""
- KEYWORDS=""
-fi
-
-LICENSE="GPL-2"
-SLOT="0"
-IUSE="selinux tools vim-syntax"
-
-DEPEND="dev-lang/perl
- virtual/perl-File-Path
- virtual/perl-File-Temp
- >=dev-vcs/git-1.6.6"
-RDEPEND="${DEPEND}
- !dev-vcs/gitolite
- vim-syntax? ( app-vim/gitolite-syntax )
- selinux? ( sec-policy/selinux-gitosis )
- >=dev-perl/Net-SSH-AuthorizedKeysFile-0.17
- dev-perl/JSON"
-
-pkg_setup() {
- enewgroup git
- enewuser git -1 /bin/sh /var/lib/gitolite git
-}
-
-src_prepare() {
- echo "${PF}-gentoo" > src/VERSION
-}
-
-src_install() {
- local uexec=/usr/libexec/${PN}
-
- rm -rf src/lib/Gitolite/Test{,.pm}
- insinto $VENDOR_LIB
- doins -r src/lib/Gitolite
-
- dodoc README.markdown CHANGELOG
- # These are meant by upstream as examples, you are strongly recommended to
- # customize them for your needs.
- dodoc contrib/utils/ipa_groups.pl contrib/utils/ldap_groups.sh
-
- insopts -m0755
- insinto $uexec
- doins -r src/{commands,syntactic-sugar,triggers,VREF}/
- doins -r contrib/{commands,triggers,hooks}
-
- insopts -m0644
- doins src/VERSION
-
- exeinto $uexec
- doexe src/gitolite{,-shell}
-
- dodir /usr/bin
- for bin in gitolite{,-shell}; do
- dosym /usr/libexec/${PN}/${bin} /usr/bin/${bin}
- done
-
- if use tools; then
- dobin check-g2-compat convert-gitosis-conf
- dobin contrib/utils/rc-format-v3.4
- fi
-
- keepdir /var/lib/gitolite
- fowners git:git /var/lib/gitolite
- fperms 750 /var/lib/gitolite
-
- fperms 0644 ${uexec}/VREF/MERGE-CHECK # It's meant as example only
-}
-
-pkg_postinst() {
- if [[ "$(get_major_version $REPLACING_VERSIONS)" == "2" ]]; then
- ewarn
- elog "***NOTE*** This is a major upgrade and will likely break your existing gitolite-2.x setup!"
- elog "Please read http://gitolite.com/gitolite/migr.html first!"
- ewarn
- elog "***NOTE*** If you're using the \"umask\" feature of ${PN}-2.x:"
- elog "You'll have to replace each \"umask = ...\" option by \"option umask = ...\""
- elog "And you'll also have to enable the \"RepoUmask\" module in your .gitolite.rc"
- ewarn
- fi
-
- # bug 352291
- gitolite_home=$(awk -F: '$1 == "git" { print $6 }' /etc/passwd)
- if [ -n "${gitolite_home}" -a "${gitolite_home}" != "/var/lib/gitolite" ]; then
- ewarn
- elog "Please make sure that your 'git' user has the correct homedir (/var/lib/gitolite)."
- elog "Especially if you're migrating from gitosis."
- ewarn
- fi
-}
diff --git a/dev-vcs/gitolite-gentoo/gitolite-gentoo-3.6.6.ebuild b/dev-vcs/gitolite-gentoo/gitolite-gentoo-3.6.6.ebuild
deleted file mode 100644
index e3537a2dee5e..000000000000
--- a/dev-vcs/gitolite-gentoo/gitolite-gentoo-3.6.6.ebuild
+++ /dev/null
@@ -1,105 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-[[ ${PV} == *9999 ]] && SCM="git-2"
-EGIT_REPO_URI="git://git.gentoo.org/proj/gitolite-gentoo"
-EGIT_MASTER=master
-
-inherit perl-module user versionator ${SCM}
-
-DESCRIPTION="Highly flexible server for git directory version tracker, Gentoo fork"
-HOMEPAGE="https://cgit.gentoo.org/proj/gitolite-gentoo.git"
-if [[ ${PV} != *9999 ]]; then
- SRC_URI="mirror://gentoo/${P}.tar.bz2"
- KEYWORDS="~amd64 ~x86"
-else
- SRC_URI=""
- KEYWORDS=""
-fi
-
-LICENSE="GPL-2"
-SLOT="0"
-IUSE="selinux tools vim-syntax"
-
-DEPEND="dev-lang/perl
- virtual/perl-File-Path
- virtual/perl-File-Temp
- >=dev-vcs/git-1.6.6"
-RDEPEND="${DEPEND}
- !dev-vcs/gitolite
- vim-syntax? ( app-vim/gitolite-syntax )
- selinux? ( sec-policy/selinux-gitosis )
- >=dev-perl/Net-SSH-AuthorizedKeysFile-0.17
- dev-perl/JSON"
-
-pkg_setup() {
- enewgroup git
- enewuser git -1 /bin/sh /var/lib/gitolite git
-}
-
-src_prepare() {
- echo "${PF}-gentoo" > src/VERSION
-}
-
-src_install() {
- local uexec=/usr/libexec/${PN}
-
- rm -rf src/lib/Gitolite/Test{,.pm}
- insinto $VENDOR_LIB
- doins -r src/lib/Gitolite
-
- dodoc README.markdown CHANGELOG
- # These are meant by upstream as examples, you are strongly recommended to
- # customize them for your needs.
- dodoc contrib/utils/ipa_groups.pl contrib/utils/ldap_groups.sh
-
- insopts -m0755
- insinto $uexec
- doins -r src/{commands,syntactic-sugar,triggers,VREF}/
- doins -r contrib/{commands,triggers,hooks}
-
- insopts -m0644
- doins src/VERSION
-
- exeinto $uexec
- doexe src/gitolite{,-shell}
-
- dodir /usr/bin
- for bin in gitolite{,-shell}; do
- dosym /usr/libexec/${PN}/${bin} /usr/bin/${bin}
- done
-
- if use tools; then
- dobin check-g2-compat convert-gitosis-conf
- dobin contrib/utils/rc-format-v3.4
- fi
-
- keepdir /var/lib/gitolite
- fowners git:git /var/lib/gitolite
- fperms 750 /var/lib/gitolite
-
- fperms 0644 ${uexec}/VREF/MERGE-CHECK # It's meant as example only
-}
-
-pkg_postinst() {
- if [[ "$(get_major_version $REPLACING_VERSIONS)" == "2" ]]; then
- ewarn
- elog "***NOTE*** This is a major upgrade and will likely break your existing gitolite-2.x setup!"
- elog "Please read http://gitolite.com/gitolite/migr.html first!"
- ewarn
- elog "***NOTE*** If you're using the \"umask\" feature of ${PN}-2.x:"
- elog "You'll have to replace each \"umask = ...\" option by \"option umask = ...\""
- elog "And you'll also have to enable the \"RepoUmask\" module in your .gitolite.rc"
- ewarn
- fi
-
- # bug 352291
- gitolite_home=$(awk -F: '$1 == "git" { print $6 }' /etc/passwd)
- if [ -n "${gitolite_home}" -a "${gitolite_home}" != "/var/lib/gitolite" ]; then
- ewarn
- elog "Please make sure that your 'git' user has the correct homedir (/var/lib/gitolite)."
- elog "Especially if you're migrating from gitosis."
- ewarn
- fi
-}
diff --git a/dev-vcs/subversion/subversion-1.14.0-r1.ebuild b/dev-vcs/subversion/subversion-1.14.0-r1.ebuild
index aa394f63def1..4b8fa97efe11 100644
--- a/dev-vcs/subversion/subversion-1.14.0-r1.ebuild
+++ b/dev-vcs/subversion/subversion-1.14.0-r1.ebuild
@@ -21,7 +21,7 @@ S="${WORKDIR}/${MY_P}"
LICENSE="Subversion GPL-2"
SLOT="0"
[[ "${PV}" = *_rc* ]] || \
-KEYWORDS="~alpha ~amd64 arm arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ppc ppc64 sparc x86 ~amd64-linux ~x86-linux"
IUSE="apache2 berkdb debug doc extras gnome-keyring java kwallet nls perl ruby sasl test"
RESTRICT="!test? ( test )"
diff --git a/eclass/Manifest.gz b/eclass/Manifest.gz
index 18ff211dc86f..4922289c95f3 100644
Binary files a/eclass/Manifest.gz and b/eclass/Manifest.gz differ
diff --git a/eclass/cargo.eclass b/eclass/cargo.eclass
index ccbf87aa9a6c..6d341601a112 100644
--- a/eclass/cargo.eclass
+++ b/eclass/cargo.eclass
@@ -22,17 +22,29 @@ esac
inherit multiprocessing toolchain-funcs
-EXPORT_FUNCTIONS src_unpack src_compile src_install src_test
+EXPORT_FUNCTIONS src_unpack src_configure src_compile src_install src_test
IUSE="${IUSE} debug"
ECARGO_HOME="${WORKDIR}/cargo_home"
ECARGO_VENDOR="${ECARGO_HOME}/gentoo"
-# @ECLASS-VARIABLE: CARGO_INSTALL_PATH
+# @VARIABLE: myfeatures
+# @DEFAULT_UNSET
# @DESCRIPTION:
-# Allows overriding the default cwd to run cargo install from
-: ${CARGO_INSTALL_PATH:=.}
+# Optional cargo features defined as bash array.
+# Should be defined before calling cargo_src_configure().
+#
+# Example package that has x11 and wayland as features, and disables default.
+# @CODE
+# src_configure() {
+# local myfeatures=(
+# $(usex X x11 '')
+# $(usev wayland)
+# )
+# cargo_src_configure --no-default-features
+# }
+# @CODE
# @FUNCTION: cargo_crate_uris
# @DESCRIPTION:
@@ -112,6 +124,7 @@ cargo_live_src_unpack() {
mkdir -p "${S}" || die
pushd "${S}" > /dev/null || die
+ # need to specify CARGO_HOME before cargo_gen_config fired
CARGO_HOME="${ECARGO_HOME}" cargo fetch || die
CARGO_HOME="${ECARGO_HOME}" cargo vendor "${ECARGO_VENDOR}" || die
popd > /dev/null || die
@@ -151,6 +164,56 @@ cargo_gen_config() {
EOF
# honor NOCOLOR setting
[[ "${NOCOLOR}" = true || "${NOCOLOR}" = yes ]] && echo "color = 'never'" >> "${ECARGO_HOME}/config"
+
+ export CARGO_HOME="${ECARGO_HOME}"
+}
+
+# @FUNCTION: cargo_src_configure
+# @DESCRIPTION:
+# Configure cargo package features and arguments.
+# Extra positional arguments supplied to this function
+# will be passed to cargo in all phases.
+# Make sure all cargo subcommands support flags passed here.
+#
+# Example for package that explicitly builds only 'baz' binary and
+# enables 'barfeature' and optional 'foo' feature.
+# will pass '--features barfeature --features foo --bin baz'
+# in src_{compile,test,install}
+#
+# @CODE
+# src_configure() {
+# local myfeatures=(
+# barfeature
+# $(usev foo)
+# )
+# cargo_src_configure --bin baz
+# }
+# @CODE
+#
+# In some cases crates may need '--no-default-features' option,
+# as there is no way to disable single feature, except disabling all.
+# It can be passed directly to cargo_src_configure().
+
+cargo_src_configure() {
+ debug-print-function ${FUNCNAME} "$@"
+
+ [[ -z ${myfeatures} ]] && declare -a myfeatures=()
+ local myfeaturestype=$(declare -p myfeatures 2>&-)
+ if [[ "${myfeaturestype}" != "declare -a myfeatures="* ]]; then
+ die "myfeatures must be declared as array"
+ fi
+
+ # transform array from simple feature list
+ # to multiple cargo args:
+ # --features feature1 --features feature2 ...
+ # this format is chosen because 2 other methods of
+ # listing features (space OR comma separated) require
+ # more fiddling with strings we'd like to avoid here.
+ myfeatures=( ${myfeatures[@]/#/--features } )
+
+ readonly ECARGO_ARGS=( ${myfeatures[@]} ${@} ${ECARGO_EXTRA_ARGS} )
+
+ [[ ${ECARGO_ARGS[@]} ]] && einfo "Configured with: ${ECARGO_ARGS[@]}"
}
# @FUNCTION: cargo_src_compile
@@ -159,25 +222,32 @@ cargo_gen_config() {
cargo_src_compile() {
debug-print-function ${FUNCNAME} "$@"
- export CARGO_HOME="${ECARGO_HOME}"
+ tc-export AR CC CXX
- tc-export AR CC
-
- cargo build $(usex debug "" --release) "$@" \
- || die "cargo build failed"
+ set -- cargo build $(usex debug "" --release) ${ECARGO_ARGS[@]} "$@"
+ einfo "${@}"
+ "${@}" || die "cargo build failed"
}
# @FUNCTION: cargo_src_install
# @DESCRIPTION:
# Installs the binaries generated by cargo
+# In come case workspaces need alternative --path parameter
+# default is '--path ./' if nothing specified.
+# '--path ./somedir' can be passed directly to cargo_src_install()
+
cargo_src_install() {
debug-print-function ${FUNCNAME} "$@"
- cargo install --path ${CARGO_INSTALL_PATH} \
- --root="${ED}/usr" $(usex debug --debug "") "$@" \
- || die "cargo install failed"
- rm -f "${ED}/usr/.crates.toml"
- rm -f "${ED}/usr/.crates2.json"
+ set -- cargo install $(has --path ${@} || echo --path ./) \
+ --root "${ED}/usr" \
+ $(usex debug --debug "") \
+ ${ECARGO_ARGS[@]} "$@"
+ einfo "${@}"
+ "${@}" || die "cargo install failed"
+
+ rm -f "${ED}/usr/.crates.toml" || die
+ rm -f "${ED}/usr/.crates2.json" || die
[ -d "${S}/man" ] && doman "${S}/man" || return 0
}
@@ -188,8 +258,9 @@ cargo_src_install() {
cargo_src_test() {
debug-print-function ${FUNCNAME} "$@"
- cargo test $(usex debug "" --release) "$@" \
- || die "cargo test failed"
+ set -- cargo test $(usex debug "" --release) ${ECARGO_ARGS[@]} "$@"
+ einfo "${@}"
+ "${@}" || die "cargo test failed"
}
fi
diff --git a/games-board/Manifest.gz b/games-board/Manifest.gz
index 27731da0e065..5e0ba3abc4e3 100644
Binary files a/games-board/Manifest.gz and b/games-board/Manifest.gz differ
diff --git a/games-board/gtkboard/files/gtkboard-0.11_pre0-gcc10.patch b/games-board/gtkboard/files/gtkboard-0.11_pre0-gcc10.patch
new file mode 100644
index 000000000000..249a790f0ee7
--- /dev/null
+++ b/games-board/gtkboard/files/gtkboard-0.11_pre0-gcc10.patch
@@ -0,0 +1,14 @@
+--- a/src/engine.c 2020-09-22 23:14:49.105745203 -0000
++++ b/src/engine.c 2020-09-22 23:53:45.862582851 -0000
+@@ -47,9 +47,9 @@ byte * engine_search (Pos *);
+ static FILE *engine_fin, *engine_fout;
+
+ //! Eval fn for white (can be NULL, in which case game_eval will be used for both)
+-ResultType (*game_eval_white) (Pos *, Player, float *);
++extern ResultType (*game_eval_white) (Pos *, Player, float *);
+ //! Eval fn for black (can be NULL, in which case game_eval will be used for both)
+-ResultType (*game_eval_black) (Pos *, Player, float *);
++extern ResultType (*game_eval_black) (Pos *, Player, float *);
+
+ // FIXME: following 3 extern decls must be removed by refactoring (i.e, move all fns common to client and server to a new file)
+ extern void reset_game_params ();
diff --git a/games-board/gtkboard/gtkboard-0.11_pre0-r2.ebuild b/games-board/gtkboard/gtkboard-0.11_pre0-r2.ebuild
index 2886f2c69ada..a37e9a95e119 100644
--- a/games-board/gtkboard/gtkboard-0.11_pre0-r2.ebuild
+++ b/games-board/gtkboard/gtkboard-0.11_pre0-r2.ebuild
@@ -31,6 +31,7 @@ PATCHES=(
"${FILESDIR}"/${P}-gcc41.patch
"${FILESDIR}"/${P}-gcc45.patch
"${FILESDIR}"/${P}-stack-smash.patch
+ "${FILESDIR}"/${P}-gcc10.patch
)
src_prepare() {
diff --git a/games-engines/Manifest.gz b/games-engines/Manifest.gz
index dce8cc9e090d..cb009fec9762 100644
Binary files a/games-engines/Manifest.gz and b/games-engines/Manifest.gz differ
diff --git a/games-engines/scummvm-tools/Manifest b/games-engines/scummvm-tools/Manifest
index 67d4024f9e66..46d781ead79e 100644
--- a/games-engines/scummvm-tools/Manifest
+++ b/games-engines/scummvm-tools/Manifest
@@ -1 +1,2 @@
DIST scummvm-tools-2.1.0.tar.xz 710124 BLAKE2B e6985c2e12a31aa9b11a80193186b101e663ce7eaf95de68639482bc82e104c879518f253c40e733c829ceb75b62d4905314cf7ad959766c4b7b49c1ee9e0136 SHA512 40e0b1a545257922dd1846d520ef0c18ef7a2682a3d7bb1709bcd49b1338ed7cefea438958941586329271d84e01bf189a14e31f5758e500df607d162ee9cc15
+DIST scummvm-tools-2.2.0.tar.xz 712048 BLAKE2B bb5307ee25476c9b4042fa0704f8b9bbfc4a57c09670bc699c83b9d5ebb0a7b9cda55f7267aafa6ae57e3ce53993740a1523616e39cf0a2c0c7249b23208372e SHA512 97d23a94772809b6fe6dcfc4d1bde9e1a12c124cb49b0a465456adbbd56358a1612b9797abb9577dc350e1150fb4a70d4b7451e794c436c8e91692b4a83deb89
diff --git a/games-engines/scummvm-tools/scummvm-tools-2.2.0.ebuild b/games-engines/scummvm-tools/scummvm-tools-2.2.0.ebuild
new file mode 100644
index 000000000000..8116e88b4f60
--- /dev/null
+++ b/games-engines/scummvm-tools/scummvm-tools-2.2.0.ebuild
@@ -0,0 +1,69 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+WX_GTK_VER=3.0-gtk3
+inherit wxwidgets eutils flag-o-matic toolchain-funcs
+
+DESCRIPTION="utilities for the SCUMM game engine"
+HOMEPAGE="http://scummvm.sourceforge.net/"
+SRC_URI="http://scummvm.org/frs/scummvm-tools/${PV}/${P}.tar.xz"
+
+LICENSE="GPL-2+"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
+IUSE="flac iconv mad png vorbis"
+RESTRICT="test" # some tests require external files
+
+RDEPEND="
+ >=dev-libs/boost-1.32:=
+ sys-libs/zlib
+ x11-libs/wxGTK:${WX_GTK_VER}
+ flac? ( media-libs/flac )
+ iconv? ( virtual/libiconv media-libs/freetype:2 )
+ mad? ( media-libs/libmad )
+ png? ( media-libs/libpng:0= )
+ vorbis? ( media-libs/libvorbis )
+"
+DEPEND="
+ ${RDEPEND}
+"
+BDEPEND="
+ virtual/pkgconfig
+"
+
+PATCHES=(
+ "${FILESDIR}/${PN}-1.8.0-binprefix.patch"
+)
+
+src_prepare() {
+ default
+
+ rm -rf *.bat dists/win32 || die
+ sed -ri -e '/^(CC|CXX)\b/d' Makefile || die
+}
+
+src_configure() {
+ setup-wxwidgets
+
+ # Not an autoconf script
+ ./configure \
+ --disable-tremor \
+ --enable-verbose-build \
+ --mandir="${EPREFIX}/usr/share/man" \
+ --prefix="${EPREFIX}/usr" \
+ $(use_enable flac) \
+ $(use_enable iconv) \
+ $(use_enable iconv freetype2) \
+ $(use_enable mad) \
+ $(use_enable png) \
+ $(use_enable vorbis) || die
+}
+
+src_compile() {
+ emake STRINGS="$(tc-getSTRINGS)"
+}
+
+src_install() {
+ EXEPREFIX="${PN}-" default
+}
diff --git a/games-engines/scummvm/Manifest b/games-engines/scummvm/Manifest
index ce4c90ad0a36..a422ef4d7710 100644
--- a/games-engines/scummvm/Manifest
+++ b/games-engines/scummvm/Manifest
@@ -1 +1,2 @@
DIST scummvm-2.1.2.tar.xz 27056972 BLAKE2B 0afedd27350ea80c3610106b7e09fd57aaebc8847eebdb180628559ca30f49d005a5466bd3991a76271eff39a782e8abf3bf1a3ace25909a1d9947a1b539d6c2 SHA512 a6462bc55d90a229e32389380504d6ecf0c836c8a6733775c993f8db34918ef1f9d0559acc7c110e98719b32cf84408a01021dcfa3fe5a821fe4265c1bc49ecc
+DIST scummvm-2.2.0.tar.xz 63652348 BLAKE2B b44a07d7ad6747b136465f81122464f02e5cc655c205d6f4424555311563f8ceaa8072972d05512af85d18fabba78d5ea9396ea314581776c1ef8d88ca6ab81b SHA512 001f884b9689386ef5b69ab8f5fa2362e1e4dc5e8273f96dc8dce1963be354a2fad95e724ff33d65008be7591519f0e2bac530ba3c44a449b8b7cac862f4f81e
diff --git a/games-engines/scummvm/files/scummvm-2.2.0-ultima_engine_lua_dep.patch b/games-engines/scummvm/files/scummvm-2.2.0-ultima_engine_lua_dep.patch
new file mode 100644
index 000000000000..d73ad03820ea
--- /dev/null
+++ b/games-engines/scummvm/files/scummvm-2.2.0-ultima_engine_lua_dep.patch
@@ -0,0 +1,18 @@
+From d546389b10518eabd34fd5b4e22265069b25a966 Mon Sep 17 00:00:00 2001
+From: Paul Gilbert
+Date: Wed, 23 Sep 2020 19:10:17 -0700
+Subject: [PATCH] ULTIMA: Add lua as an engine dependency
+
+---
+ engines/ultima/configure.engine | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/engines/ultima/configure.engine b/engines/ultima/configure.engine
+index 6447e3eb7f96..704a79d1f61f 100644
+--- a/engines/ultima/configure.engine
++++ b/engines/ultima/configure.engine
+@@ -1,3 +1,3 @@
+ # This file is included from the main "configure" script
+ # add_engine [name] [desc] [build-by-default] [subengines] [base games] [deps]
+-add_engine ultima "Ultima" yes "" "" "highres 16bit freetype2"
++add_engine ultima "Ultima" yes "" "" "highres 16bit freetype2 lua"
diff --git a/games-engines/scummvm/metadata.xml b/games-engines/scummvm/metadata.xml
index 5ccc7bb685e0..0254caa74016 100644
--- a/games-engines/scummvm/metadata.xml
+++ b/games-engines/scummvm/metadata.xml
@@ -7,6 +7,7 @@